From beaa7c7894c1a9ebe72eebb64ebbbc3fc2c8de33 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Wed, 23 Sep 2020 19:45:38 +0200
Subject: [PATCH 01/31] Update: Translations from eints korean: 1 change by
 telk5093

---
 src/lang/korean.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 78becf4066..c2b99a8571 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -1431,7 +1431,7 @@ STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT    :열차 시간
 STR_CONFIG_SETTING_QUICKGOTO                                    :빠른 행선지 설정: {STRING}
 STR_CONFIG_SETTING_QUICKGOTO_HELPTEXT                           :경로 창을 열면 자동으로 '행선지' 버튼을 선택하여 곧바로 행선지를 지정할 수 있도록 합니다.
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE                            :철도 형식 기본값 설정 (게임 시작/불러온 후): {STRING}
-STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_HELPTEXT                   :게임을 새로 시작하거나 불러온 뒤에 사용할 철도의 종류를 선택합니다. '처음 사용 가능한 것'은 가장 오래된 철도 종류를 선택하고, '최신 기술의 철도'는 가장 최신에 나온 철도 종류를 선택하며 '가장 많이 사용한 것'은 플레이어가 가장 많이 사용한 철도 타입을 선택합니다.
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_HELPTEXT                   :게임을 새로 시작하거나 불러온 뒤에 사용할 철도의 종류를 선택합니다. '처음 사용 가능한 것'은 가장 오래된 철도 종류를 선택하고, '최신 기술의 철도'는 가장 최신에 나온 철도 종류를 선택하며 '가장 많이 사용한 것'은 현재 가장 많이 사용한 철도 종류를 선택합니다.
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST                      :처음 사용 가능한 것
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST                       :가장 최근에 개발된 철도
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :가장 많이 사용한 것

From 3ad4a6e3dae62395be100ef44ea498f301ae98b1 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Sun, 6 Sep 2020 01:57:42 +0300
Subject: [PATCH 02/31] Fix 380fd8c: Only check houses for cargo when
 generating subsidies with towns

---
 src/subsidy.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/subsidy.cpp b/src/subsidy.cpp
index 0a1af3c666..ff420455d8 100644
--- a/src/subsidy.cpp
+++ b/src/subsidy.cpp
@@ -23,6 +23,7 @@
 #include "game/game.hpp"
 #include "command_func.h"
 #include "string_func.h"
+#include "tile_cmd.h"
 
 #include "table/strings.h"
 
@@ -328,7 +329,14 @@ bool FindSubsidyTownCargoRoute()
 	const Town *src_town = Town::GetRandom();
 	if (src_town->cache.population < SUBSIDY_CARGO_MIN_POPULATION) return false;
 
-	CargoArray town_cargo_produced = GetProductionAroundTiles(src_town->xy, 1, 1, SUBSIDY_TOWN_CARGO_RADIUS);
+	/* Calculate the produced cargo of houses around town center. */
+	CargoArray town_cargo_produced;
+	TileArea ta = TileArea(src_town->xy, 1, 1).Expand(SUBSIDY_TOWN_CARGO_RADIUS);
+	TILE_AREA_LOOP(tile, ta) {
+		if (IsTileType(tile, MP_HOUSE)) {
+			AddProducedCargo(tile, town_cargo_produced);
+		}
+	}
 
 	/* Passenger subsidies are not handled here. */
 	town_cargo_produced[CT_PASSENGERS] = 0;
@@ -431,7 +439,15 @@ bool FindSubsidyCargoDestination(CargoID cid, SourceType src_type, SourceID src)
 		case ST_TOWN: {
 			/* Select a random town. */
 			const Town *dst_town = Town::GetRandom();
-			CargoArray town_cargo_accepted = GetAcceptanceAroundTiles(dst_town->xy, 1, 1, SUBSIDY_TOWN_CARGO_RADIUS);
+
+			/* Calculate cargo acceptance of houses around town center. */
+			CargoArray town_cargo_accepted;
+			TileArea ta = TileArea(dst_town->xy, 1, 1).Expand(SUBSIDY_TOWN_CARGO_RADIUS);
+			TILE_AREA_LOOP(tile, ta) {
+				if (IsTileType(tile, MP_HOUSE)) {
+					AddAcceptedCargo(tile, town_cargo_accepted, nullptr);
+				}
+			}
 
 			/* Check if the town can accept this cargo. */
 			if (town_cargo_accepted[cid] < 8) return false;

From 8f3d1ec970520d5a7d775e173ca1df2dc6867686 Mon Sep 17 00:00:00 2001
From: Berbe <4251220+Berbe@users.noreply.github.com>
Date: Tue, 5 Mar 2019 05:04:39 +0100
Subject: [PATCH 03/31] Feature: Improve restart command

When the restart command is issued, a normal map is always spawned.

This improvement takes into account the current state of _file_to_saveload to check if a savegame/scenario/heightmap was previously loaded, and loads the same resource again.
---
 src/openttd.cpp | 20 ++++++++++++++++++--
 src/openttd.h   | 23 ++++++++++++-----------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/openttd.cpp b/src/openttd.cpp
index 94c6f4a98a..337bcda4da 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1032,7 +1032,22 @@ void SwitchToMode(SwitchMode new_mode)
 			MakeNewEditorWorld();
 			break;
 
-		case SM_RESTARTGAME: // Restart --> 'Random game' with current settings
+		case SM_RESTARTGAME: // Restart --> Current settings preserved
+			if (_file_to_saveload.abstract_ftype == FT_SAVEGAME || _file_to_saveload.abstract_ftype == FT_SCENARIO) {
+				/* Restart current savegame/scenario */
+				_switch_mode = _game_mode == GM_EDITOR ? SM_LOAD_SCENARIO : SM_LOAD_GAME;
+				SwitchToMode(_switch_mode);
+				break;
+			} else if (_file_to_saveload.abstract_ftype == FT_HEIGHTMAP) {
+				/* Restart current heightmap */
+				_switch_mode = _game_mode == GM_EDITOR ? SM_LOAD_HEIGHTMAP : SM_RESTART_HEIGHTMAP;
+				SwitchToMode(_switch_mode);
+				break;
+			}
+			/* No break here, to enter the next case:
+			 * Restart --> 'Random game' with current settings */
+			FALLTHROUGH;
+
 		case SM_NEWGAME: // New Game --> 'Random game'
 			if (_network_server) {
 				seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "Random Map");
@@ -1066,11 +1081,12 @@ void SwitchToMode(SwitchMode new_mode)
 			break;
 		}
 
+		case SM_RESTART_HEIGHTMAP: // Load a heightmap and start a new game from it with current settings
 		case SM_START_HEIGHTMAP: // Load a heightmap and start a new game from it
 			if (_network_server) {
 				seprintf(_network_game_info.map_name, lastof(_network_game_info.map_name), "%s (Heightmap)", _file_to_saveload.title);
 			}
-			MakeNewGame(true, true);
+			MakeNewGame(true, new_mode == SM_START_HEIGHTMAP);
 			break;
 
 		case SM_LOAD_HEIGHTMAP: // Load heightmap from scenario editor
diff --git a/src/openttd.h b/src/openttd.h
index 6b7401cca1..664963a5da 100644
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -23,17 +23,18 @@ enum GameMode {
 /** Mode which defines what mode we're switching to. */
 enum SwitchMode {
 	SM_NONE,
-	SM_NEWGAME,         ///< New Game --> 'Random game'.
-	SM_RESTARTGAME,     ///< Restart --> 'Random game' with current settings.
-	SM_EDITOR,          ///< Switch to scenario editor.
-	SM_LOAD_GAME,       ///< Load game, Play Scenario.
-	SM_MENU,            ///< Switch to game intro menu.
-	SM_SAVE_GAME,       ///< Save game.
-	SM_SAVE_HEIGHTMAP,  ///< Save heightmap.
-	SM_GENRANDLAND,     ///< Generate random land within scenario editor.
-	SM_LOAD_SCENARIO,   ///< Load scenario from scenario editor.
-	SM_START_HEIGHTMAP, ///< Load a heightmap and start a new game from it.
-	SM_LOAD_HEIGHTMAP,  ///< Load heightmap from scenario editor.
+	SM_NEWGAME,           ///< New Game --> 'Random game'.
+	SM_RESTARTGAME,       ///< Restart --> 'Random game' with current settings.
+	SM_EDITOR,            ///< Switch to scenario editor.
+	SM_LOAD_GAME,         ///< Load game, Play Scenario.
+	SM_MENU,              ///< Switch to game intro menu.
+	SM_SAVE_GAME,         ///< Save game.
+	SM_SAVE_HEIGHTMAP,    ///< Save heightmap.
+	SM_GENRANDLAND,       ///< Generate random land within scenario editor.
+	SM_LOAD_SCENARIO,     ///< Load scenario from scenario editor.
+	SM_START_HEIGHTMAP,   ///< Load a heightmap and start a new game from it.
+	SM_LOAD_HEIGHTMAP,    ///< Load heightmap from scenario editor.
+	SM_RESTART_HEIGHTMAP, ///< Load a heightmap and start a new game from it with current settings.
 };
 
 /** Display Options */

From 0110fa12daabecfaa5e6454ba6f93b8024db552e Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Sun, 5 Jul 2020 21:18:35 +0300
Subject: [PATCH 04/31] Feature: Make news and errors close hotkeys
 configurable

---
 src/error.h       |  2 ++
 src/error_gui.cpp | 19 ++++++++++++-------
 src/main_gui.cpp  | 14 ++++++++++++++
 src/news_gui.cpp  | 22 +++++++++++-----------
 src/news_gui.h    |  1 +
 5 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/error.h b/src/error.h
index 78ee9c5918..8aa8ac2258 100644
--- a/src/error.h
+++ b/src/error.h
@@ -55,6 +55,8 @@ public:
 void ScheduleErrorMessage(const ErrorMessageData &data);
 
 void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel wl, int x = 0, int y = 0, const GRFFile *textref_stack_grffile = nullptr, uint textref_stack_size = 0, const uint32 *textref_stack = nullptr);
+bool HideActiveErrorMessage();
+
 void ClearErrorMessages();
 void ShowFirstError();
 void UnshowCriticalError();
diff --git a/src/error_gui.cpp b/src/error_gui.cpp
index 7cbe1d95e3..381d67a962 100644
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -315,13 +315,6 @@ public:
 		if (_window_system_initialized) ShowFirstError();
 	}
 
-	EventState OnKeyPress(WChar key, uint16 keycode) override
-	{
-		if (keycode != WKC_SPACE) return ES_NOT_HANDLED;
-		delete this;
-		return ES_HANDLED;
-	}
-
 	/**
 	 * Check whether the currently shown error message was critical or not.
 	 * @return True iff the message was critical.
@@ -424,6 +417,18 @@ void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel
 	}
 }
 
+
+/**
+ * Close active error message window
+ * @return true if a window was closed.
+ */
+bool HideActiveErrorMessage() {
+	ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
+	if (w == nullptr) return false;
+	delete w;
+	return true;
+}
+
 /**
  * Schedule a list of errors.
  * Note: This does not try to display the error now. This is useful if the window system is not yet running.
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 5343e2ed11..5877fb9387 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -31,6 +31,8 @@
 #include "tilehighlight_func.h"
 #include "hotkeys.h"
 #include "guitimer_func.h"
+#include "error.h"
+#include "news_gui.h"
 
 #include "saveload/saveload.h"
 
@@ -235,6 +237,8 @@ enum {
 	GHK_CHAT_ALL,
 	GHK_CHAT_COMPANY,
 	GHK_CHAT_SERVER,
+	GHK_CLOSE_NEWS,
+	GHK_CLOSE_ERROR,
 };
 
 struct MainWindow : Window
@@ -427,6 +431,14 @@ struct MainWindow : Window
 				}
 				break;
 
+			case GHK_CLOSE_NEWS: // close active news window
+				if (!HideActiveNewsMessage()) return ES_NOT_HANDLED;
+				break;
+
+			case GHK_CLOSE_ERROR: // close active error window
+				if (!HideActiveErrorMessage()) return ES_NOT_HANDLED;
+				break;
+
 			default: return ES_NOT_HANDLED;
 		}
 		return ES_HANDLED;
@@ -520,6 +532,8 @@ static Hotkey global_hotkeys[] = {
 	Hotkey(_ghk_chat_all_keys, "chat_all", GHK_CHAT_ALL),
 	Hotkey(_ghk_chat_company_keys, "chat_company", GHK_CHAT_COMPANY),
 	Hotkey(_ghk_chat_server_keys, "chat_server", GHK_CHAT_SERVER),
+	Hotkey(WKC_SPACE, "close_news", GHK_CLOSE_NEWS),
+	Hotkey(WKC_SPACE, "close_error", GHK_CLOSE_ERROR),
 	HOTKEY_LIST_END
 };
 HotkeyList MainWindow::hotkeys("global", global_hotkeys);
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index da613c55e1..a3f73d7296 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -519,16 +519,6 @@ struct NewsWindow : Window {
 		}
 	}
 
-	EventState OnKeyPress(WChar key, uint16 keycode) override
-	{
-		if (keycode == WKC_SPACE) {
-			/* Don't continue. */
-			delete this;
-			return ES_HANDLED;
-		}
-		return ES_NOT_HANDLED;
-	}
-
 	/**
 	 * Some data on this window has become invalid.
 	 * @param data Information about the changed data.
@@ -603,7 +593,6 @@ private:
 
 /* static */ int NewsWindow::duration = 0; // Instance creation.
 
-
 /** Open up an own newspaper window for the news item */
 static void ShowNewspaper(const NewsItem *ni)
 {
@@ -1033,6 +1022,17 @@ static void ShowNewsMessage(const NewsItem *ni)
 	}
 }
 
+/**
+ * Close active news message window
+ * @return true if a window was closed.
+ */
+bool HideActiveNewsMessage() {
+	NewsWindow *w = (NewsWindow*)FindWindowById(WC_NEWS_WINDOW, 0);
+	if (w == nullptr) return false;
+	delete w;
+	return true;
+}
+
 /** Show previous news item */
 void ShowLastNewsMessage()
 {
diff --git a/src/news_gui.h b/src/news_gui.h
index e6f4bb38bc..059d51ad32 100644
--- a/src/news_gui.h
+++ b/src/news_gui.h
@@ -14,6 +14,7 @@
 
 void ShowLastNewsMessage();
 void ShowMessageHistory();
+bool HideActiveNewsMessage();
 
 extern NewsItem *_latest_news;
 

From df5362a0083b571d0b8eb2879b618c3edbf9e7fc Mon Sep 17 00:00:00 2001
From: frosch <frosch@openttd.org>
Date: Sun, 20 Sep 2020 22:30:04 +0200
Subject: [PATCH 05/31] Fix #8311, b98c7763de4: Industry probability at map
 generation was scaled differently when set via property or callback.

---
 src/industry_cmd.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index bd1d28ef6c..443702993e 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -2079,13 +2079,14 @@ static Industry *CreateNewIndustry(TileIndex tile, IndustryType type, IndustryAv
 static uint32 GetScaledIndustryGenerationProbability(IndustryType it, bool *force_at_least_one)
 {
 	const IndustrySpec *ind_spc = GetIndustrySpec(it);
-	uint32 chance = ind_spc->appear_creation[_settings_game.game_creation.landscape] * 16; // * 16 to increase precision
+	uint32 chance = ind_spc->appear_creation[_settings_game.game_creation.landscape];
 	if (!ind_spc->enabled || ind_spc->layouts.empty() ||
 			(_game_mode != GM_EDITOR && _settings_game.difficulty.industry_density == ID_FUND_ONLY) ||
 			(chance = GetIndustryProbabilityCallback(it, IACT_MAPGENERATION, chance)) == 0) {
 		*force_at_least_one = false;
 		return 0;
 	} else {
+		chance *= 16; // to increase precision
 		/* We want industries appearing at coast to appear less often on bigger maps, as length of coast increases slower than map area.
 		 * For simplicity we scale in both cases, though scaling the probabilities of all industries has no effect. */
 		chance = (ind_spc->check_proc == CHECK_REFINERY || ind_spc->check_proc == CHECK_OIL_RIG) ? ScaleByMapSize1D(chance) : ScaleByMapSize(chance);

From 348c231e12d87c106bd1ab3c9d7a5ecdab6863d8 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Fri, 25 Sep 2020 12:55:25 +0100
Subject: [PATCH 06/31] Codechange: Make codestyle for CMake files consistent
 for 'control' statements

---
 CMakeLists.txt                          | 104 ++---
 cmake/AddCustomXXXTimestamp.cmake       |  38 +-
 cmake/CompileFlags.cmake                |  46 +--
 cmake/CreateGrfCommand.cmake            |   2 +-
 cmake/CreateRegression.cmake            |  12 +-
 cmake/Endian.cmake                      |   6 +-
 cmake/FindAllegro.cmake                 |   4 +-
 cmake/FindEditbin.cmake                 |  16 +-
 cmake/FindFluidsynth.cmake              |   4 +-
 cmake/FindFontconfig.cmake              |   4 +-
 cmake/FindICU.cmake                     |   6 +-
 cmake/FindLZO.cmake                     |   8 +-
 cmake/FindSSE.cmake                     |   4 +-
 cmake/FindXDG_basedir.cmake             |   4 +-
 cmake/InstallAndPackage.cmake           |  46 +--
 cmake/LinkPackage.cmake                 |   6 +-
 cmake/Options.cmake                     |  42 +-
 cmake/SourceList.cmake                  |  14 +-
 cmake/Static.cmake                      |   2 +-
 cmake/scripts/Baseset.cmake             |  16 +-
 cmake/scripts/CreateGRF.cmake           |  24 +-
 cmake/scripts/FindVersion.cmake         |  38 +-
 cmake/scripts/GenerateWidget.cmake      |  62 +--
 cmake/scripts/Regression.cmake          |  38 +-
 cmake/scripts/SquirrelExport.cmake      | 494 ++++++++++++------------
 cmake/scripts/SquirrelIncludes.cmake    |  36 +-
 media/baseset/CMakeLists.txt            |   8 +-
 media/baseset/openttd/CMakeLists.txt    |   4 +-
 media/baseset/orig_extra/CMakeLists.txt |   4 +-
 src/CMakeLists.txt                      |   4 +-
 src/blitter/CMakeLists.txt              |   4 +-
 src/lang/CMakeLists.txt                 |   2 +-
 src/music/CMakeLists.txt                |   4 +-
 src/script/api/CMakeLists.txt           |  16 +-
 src/sound/CMakeLists.txt                |   4 +-
 src/video/CMakeLists.txt                |   4 +-
 36 files changed, 565 insertions(+), 565 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf39fba384..9fd8fbc880 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,23 @@
 cmake_minimum_required(VERSION 3.5)
 
-if (NOT BINARY_NAME)
+if(NOT BINARY_NAME)
     set(BINARY_NAME openttd)
-endif (NOT BINARY_NAME)
+endif()
 
 project(${BINARY_NAME})
 
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds not allowed. Please run \"cmake ..\" from the bin directory")
-endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
 
 # Use GNUInstallDirs to allow customisation
 # but set our own default data dir
-if (NOT CMAKE_INSTALL_DATADIR)
+if(NOT CMAKE_INSTALL_DATADIR)
     set(CMAKE_INSTALL_DATADIR "share/games")
-endif (NOT CMAKE_INSTALL_DATADIR)
+endif()
 include(GNUInstallDirs)
 
 include(Options)
@@ -37,30 +37,30 @@ find_package(LibLZMA)
 find_package(LZO)
 find_package(PNG)
 
-if (NOT WIN32)
+if(NOT WIN32)
     find_package(Allegro)
-    if (NOT APPLE)
+    if(NOT APPLE)
         find_package(SDL2)
-        if (NOT SDL2_FOUND)
+        if(NOT SDL2_FOUND)
             find_package(SDL)
-        endif( NOT SDL2_FOUND)
+        endif()
         find_package(Fluidsynth)
         find_package(Freetype)
         find_package(Fontconfig)
         find_package(ICU OPTIONAL_COMPONENTS i18n lx)
         find_package(XDG_basedir)
-    else (NOT APPLE)
+    else()
         find_package(Iconv)
 
         find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
         find_library(AUDIOUNIT_LIBRARY AudioUnit)
         find_library(COCOA_LIBRARY Cocoa)
-    endif (NOT APPLE)
-endif (NOT WIN32)
+    endif()
+endif()
 
-if (MSVC)
+if(MSVC)
     find_package(Editbin REQUIRED)
-endif (MSVC)
+endif()
 
 find_package(SSE)
 find_package(Xaudio2)
@@ -69,38 +69,38 @@ find_package(Grfcodec)
 
 # IPO is only properly supported from CMake 3.9. Despite the fact we are
 # CMake 3.5, still enable IPO if we detect we are 3.9+.
-if (POLICY CMP0069)
+if(POLICY CMP0069)
     cmake_policy(SET CMP0069 NEW)
     include(CheckIPOSupported)
     check_ipo_supported(RESULT IPO_FOUND)
-endif (POLICY CMP0069)
+endif()
 
 show_options()
 
-if (UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
-    if (NOT SDL_FOUND AND NOT SDL2_FOUND)
+if(UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
+    if(NOT SDL_FOUND AND NOT SDL2_FOUND)
         message(FATAL_ERROR "SDL or SDL2 is required for this platform")
-    endif (NOT SDL_FOUND AND NOT SDL2_FOUND)
-endif (UNIX AND NOT APPLE AND NOT OPTION_DEDICATED)
-if (APPLE)
-    if (NOT AUDIOTOOLBOX_LIBRARY)
+    endif()
+endif()
+if(APPLE)
+    if(NOT AUDIOTOOLBOX_LIBRARY)
         message(FATAL_ERROR "AudioToolbox is required for this platform")
-    endif (NOT AUDIOTOOLBOX_LIBRARY)
-    if (NOT AUDIOUNIT_LIBRARY)
+    endif()
+    if(NOT AUDIOUNIT_LIBRARY)
         message(FATAL_ERROR "AudioUnit is required for this platform")
-    endif (NOT AUDIOUNIT_LIBRARY)
-    if (NOT COCOA_LIBRARY)
+    endif()
+    if(NOT COCOA_LIBRARY)
         message(FATAL_ERROR "Cocoa is required for this platform")
-    endif (NOT COCOA_LIBRARY)
-endif (APPLE)
+    endif()
+endif()
 
-if (MSVC)
+if(MSVC)
     # C++17 for MSVC
     set(CMAKE_CXX_STANDARD 17)
-else (MSVC)
+else()
     # C++11 for all other targets
     set(CMAKE_CXX_STANDARD 11)
-endif (MSVC)
+endif()
 
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_CXX_EXTENSIONS NO)
@@ -108,9 +108,9 @@ set(CMAKE_CXX_EXTENSIONS NO)
 set(CMAKE_EXPORT_COMPILE_COMMANDS YES)
 
 list(APPEND GENERATED_SOURCE_FILES "${CMAKE_BINARY_DIR}/generated/rev.cpp")
-if (WIN32)
+if(WIN32)
     list(APPEND GENERATED_SOURCE_FILES "${CMAKE_BINARY_DIR}/generated/ottdres.rc")
-endif (WIN32)
+endif()
 
 # Generate a target to determine version, which is execute every 'make' run
 add_custom_target(find_version
@@ -155,17 +155,17 @@ target_link_libraries(openttd
     Threads::Threads
 )
 
-if (IPO_FOUND)
+if(IPO_FOUND)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_MINSIZEREL True)
     set_target_properties(openttd PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO True)
-endif (IPO_FOUND)
+endif()
 set_target_properties(openttd PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/bin")
 process_compile_flags()
 
-if (APPLE OR UNIX)
+if(APPLE OR UNIX)
     add_definitions(-DUNIX)
-endif (APPLE OR UNIX)
+endif()
 
 include(LinkPackage)
 link_package(PNG TARGET PNG::PNG ENCOURAGED)
@@ -174,7 +174,7 @@ link_package(LIBLZMA TARGET LibLZMA::LibLZMA ENCOURAGED)
 link_package(LZO ENCOURAGED)
 link_package(XDG_basedir)
 
-if (NOT OPTION_DEDICATED)
+if(NOT OPTION_DEDICATED)
     link_package(Fluidsynth)
     link_package(SDL)
     link_package(SDL2 TARGET SDL2::SDL2)
@@ -183,9 +183,9 @@ if (NOT OPTION_DEDICATED)
     link_package(Fontconfig TARGET Fontconfig::Fontconfig)
     link_package(ICU_lx)
     link_package(ICU_i18n)
-endif (NOT OPTION_DEDICATED)
+endif()
 
-if (APPLE)
+if(APPLE)
     link_package(Iconv TARGET Iconv::Iconv)
 
     target_link_libraries(openttd
@@ -198,33 +198,33 @@ if (APPLE)
         -DWITH_COCOA
         -DENABLE_COCOA_QUARTZ
     )
-endif (APPLE)
+endif()
 
-if (NOT PERSONAL_DIR STREQUAL "(not set)")
+if(NOT PERSONAL_DIR STREQUAL "(not set)")
     add_definitions(
         -DWITH_PERSONAL_DIR
         -DPERSONAL_DIR="${PERSONAL_DIR}"
     )
-endif (NOT PERSONAL_DIR STREQUAL "(not set)")
+endif()
 
-if (NOT SHARED_DIR STREQUAL "(not set)")
+if(NOT SHARED_DIR STREQUAL "(not set)")
     add_definitions(
         -DWITH_SHARED_DIR
         -DSHARED_DIR="${SHARED_DIR}"
     )
-endif (NOT SHARED_DIR STREQUAL "(not set)")
+endif()
 
-if (NOT GLOBAL_DIR STREQUAL "(not set)")
+if(NOT GLOBAL_DIR STREQUAL "(not set)")
     add_definitions(
         -DGLOBAL_DATA_DIR="${GLOBAL_DIR}"
     )
-endif (NOT GLOBAL_DIR STREQUAL "(not set)")
+endif()
 
 link_package(SSE)
 
 add_definitions_based_on_options()
 
-if (WIN32)
+if(WIN32)
     add_definitions(
         -DUNICODE
         -D_UNICODE
@@ -236,11 +236,11 @@ if (WIN32)
         winmm
         imm32
     )
-endif (WIN32)
+endif()
 
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     add_definitions(-D_SQ64)
-endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
+endif()
 
 include(CreateRegression)
 create_regression()
diff --git a/cmake/AddCustomXXXTimestamp.cmake b/cmake/AddCustomXXXTimestamp.cmake
index ca93988731..c8d134e081 100644
--- a/cmake/AddCustomXXXTimestamp.cmake
+++ b/cmake/AddCustomXXXTimestamp.cmake
@@ -9,7 +9,7 @@ macro(_parse_arguments_with_multi_hack ORIGINAL_COMMAND_LINE)
 
     foreach(MULTI IN LISTS MULTIS)
         string(REPLACE "${MULTI}" "${MULTI};:::" COMMAND_LINE "${COMMAND_LINE}")
-    endforeach(MULTI)
+    endforeach()
 
     cmake_parse_arguments(PARAM "${OPTIONS}" "${SINGLES}" "${MULTIS}" ${COMMAND_LINE})
 endmacro()
@@ -19,25 +19,25 @@ macro(_reassemble_command_line)
     set(NEW_COMMAND_LINE ${PARAM_UNPARSED_ARGUMENTS})
 
     foreach(OPTION IN LISTS OPTIONS)
-        if (PARAM_${OPTION})
+        if(PARAM_${OPTION})
             list(APPEND NEW_COMMAND_LINE "${OPTION}")
-        endif (PARAM_${OPTION})
-    endforeach(OPTION)
+        endif()
+    endforeach()
 
     foreach(SINGLE IN LISTS SINGLES)
-        if (PARAM_${SINGLE})
+        if(PARAM_${SINGLE})
             list(APPEND NEW_COMMAND_LINE "${SINGLE}" "${PARAM_${SINGLE}}")
-        endif (PARAM_${SINGLE})
-    endforeach(SINGLE)
+        endif()
+    endforeach()
 
     foreach(MULTI IN LISTS MULTIS)
-        if (PARAM_${MULTI})
+        if(PARAM_${MULTI})
             # Replace our special marker with the name of the MULTI again. This
             # restores for example multiple COMMANDs again.
             string(REPLACE ":::" "${MULTI}" PARAM_${MULTI} "${PARAM_${MULTI}}")
             list(APPEND NEW_COMMAND_LINE "${PARAM_${MULTI}}")
-        endif (PARAM_${MULTI})
-    endforeach(MULTI)
+        endif()
+    endforeach()
 endmacro()
 
 # Generated files can be older than their dependencies, causing useless
@@ -72,9 +72,9 @@ function(add_custom_command_timestamp)
     # Reset the OUTPUT and BYPRODUCTS as an empty list (if needed).
     # Because they are MULTIS, we need to add our special marker here.
     set(PARAM_OUTPUT ":::")
-    if (NOT PARAM_BYPRODUCTS)
+    if(NOT PARAM_BYPRODUCTS)
         set(PARAM_BYPRODUCTS ":::")
-    endif ()
+    endif()
 
     foreach(OUTPUT IN LISTS OUTPUTS)
         # For every output, we add a 'cmake -E touch' entry to update the
@@ -91,12 +91,12 @@ function(add_custom_command_timestamp)
         # add_custom_target_timestamp() to know if we should point to the
         # '.timestamp' variant or not.
         set_source_files_properties(${OUTPUT} PROPERTIES BYPRODUCT ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILENAME}.timestamp)
-    endforeach(OUTPUT)
+    endforeach()
 
     # Reassemble and call the wrapped command
     _reassemble_command_line()
     add_custom_command(${NEW_COMMAND_LINE})
-endfunction(add_custom_command_timestamp)
+endfunction()
 
 # Generated files can be older than their dependencies, causing useless
 # regenerations. This function adds a .timestamp file for each file in DEPENDS
@@ -130,16 +130,16 @@ function(add_custom_target_timestamp)
         # Check if the output is produced by add_custom_command_timestamp()
         get_source_file_property(BYPRODUCT ${DEPEND} BYPRODUCT)
 
-        if (BYPRODUCT STREQUAL "NOTFOUND")
+        if(BYPRODUCT STREQUAL "NOTFOUND")
             # If it is not, just keep it as DEPEND
             list(APPEND PARAM_DEPENDS "${DEPEND}")
-        else (BYPRODUCT STREQUAL "NOTFOUND")
+        else()
             # If it is, the BYPRODUCT property points to the timestamp we want to depend on
             list(APPEND PARAM_DEPENDS "${BYPRODUCT}")
-        endif (BYPRODUCT STREQUAL "NOTFOUND")
-    endforeach(DEPEND)
+        endif()
+    endforeach()
 
     # Reassemble and call the wrapped command
     _reassemble_command_line()
     add_custom_target(${NEW_COMMAND_LINE})
-endfunction(add_custom_target_timestamp)
+endfunction()
diff --git a/cmake/CompileFlags.cmake b/cmake/CompileFlags.cmake
index 49ae1d767d..f371353ae1 100644
--- a/cmake/CompileFlags.cmake
+++ b/cmake/CompileFlags.cmake
@@ -3,7 +3,7 @@
 # compile_flags()
 #
 macro(compile_flags)
-    if (MSVC)
+    if(MSVC)
         # Switch to MT (static) instead of MD (dynamic) binary
 
         # For MSVC two generators are available
@@ -23,14 +23,14 @@ macro(compile_flags)
         # C++11 standard". We need C++11 for the way we use threads.
         add_compile_options(/Zc:rvalueCast)
 
-        if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             # Enable multi-threaded compilation.
             add_compile_options(/MP)
-        endif(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        endif()
 
         # Add DPI manifest to project; other WIN32 targets get this via ottdres.rc
         list(APPEND GENERATED_SOURCE_FILES "${CMAKE_SOURCE_DIR}/os/windows/openttd.manifest")
-    endif (MSVC)
+    endif()
 
     # Add some -D flags for Debug builds. We cannot use add_definitions(), because
     # it does not appear to support the $<> tags.
@@ -38,19 +38,19 @@ macro(compile_flags)
         "$<$<CONFIG:Debug>:-D_DEBUG>"
         "$<$<NOT:$<CONFIG:Debug>>:-D_FORTIFY_SOURCE=2>" # FORTIFY_SOURCE should only be used in non-debug builds (requires -O1+)
     )
-    if (MINGW)
+    if(MINGW)
         add_link_options(
             "$<$<NOT:$<CONFIG:Debug>>:-fstack-protector>" # Prevent undefined references when _FORTIFY_SOURCE > 0
         )
-    endif (MINGW)
+    endif()
 
     # Prepare a generator that checks if we are not a debug, and don't have asserts
     # on. We need this later on to set some compile options for stable releases.
     set(IS_STABLE_RELEASE "$<AND:$<NOT:$<CONFIG:Debug>>,$<NOT:$<BOOL:${OPTION_USE_ASSERTS}>>>")
 
-    if (MSVC)
+    if(MSVC)
         add_compile_options(/W3)
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         add_compile_options(
             -W
             -Wall
@@ -81,33 +81,33 @@ macro(compile_flags)
         # When we are a stable release (Release build + USE_ASSERTS not set),
         # assertations are off, which trigger a lot of warnings. We disable
         # these warnings for these releases.
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             add_compile_options(
                 "$<${IS_STABLE_RELEASE}:-Wno-unused-variable>"
                 "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-parameter>"
                 "$<${IS_STABLE_RELEASE}:-Wno-unused-but-set-variable>"
             )
-        else (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        else()
             add_compile_options(
                 "$<${IS_STABLE_RELEASE}:-Wno-unused-variable>"
                 "$<${IS_STABLE_RELEASE}:-Wno-unused-parameter>"
             )
-        endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        endif()
 
         # Ninja processes the output so the output from the compiler
         # isn't directly to a terminal; hence, the default is
         # non-coloured output. We can override this to get nicely
         # coloured output, but since that might yield odd results with
         # IDEs, we extract it to an option.
-        if (OPTION_FORCE_COLORED_OUTPUT)
-            if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        if(OPTION_FORCE_COLORED_OUTPUT)
+            if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
                 add_compile_options (-fdiagnostics-color=always)
-            elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+            elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
                 add_compile_options (-fcolor-diagnostics)
-            endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        endif (OPTION_FORCE_COLORED_OUTPUT)
+            endif()
+        endif()
 
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             include(CheckCXXCompilerFlag)
             check_cxx_compiler_flag("-flifetime-dse=1" LIFETIME_DSE_FOUND)
 
@@ -126,8 +126,8 @@ macro(compile_flags)
                 # well with our custom pool item allocator
                 "$<$<BOOL:${LIFETIME_DSE_FOUND}>:-flifetime-dse=1>"
             )
-        endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+        endif()
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
         add_compile_options(
             -Wall
             # warning #873: function ... ::operator new ... has no corresponding operator delete ...
@@ -139,12 +139,12 @@ macro(compile_flags)
             # warning #2160: anonymous union qualifier is ignored
             -wd2160
         )
-    else ()
+    else()
         message(FATAL_ERROR "No warning flags are set for this compiler yet; please consider creating a Pull Request to add support for this compiler.")
-    endif ()
+    endif()
 
-    if (NOT WIN32)
+    if(NOT WIN32)
         # rdynamic is used to get useful stack traces from crash reports.
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
-    endif (NOT WIN32)
+    endif()
 endmacro()
diff --git a/cmake/CreateGrfCommand.cmake b/cmake/CreateGrfCommand.cmake
index 25e599f568..4ad9734198 100644
--- a/cmake/CreateGrfCommand.cmake
+++ b/cmake/CreateGrfCommand.cmake
@@ -26,7 +26,7 @@ function(create_grf_command)
         )
 
         list(APPEND GRF_PNG_BINARY_FILES ${GRF_PNG_BINARY_FILE})
-    endforeach(GRF_PNG_SOURCE_FILE)
+    endforeach()
 
     add_custom_command(OUTPUT ${GRF_BINARY_FILE}
             COMMAND ${CMAKE_COMMAND}
diff --git a/cmake/CreateRegression.cmake b/cmake/CreateRegression.cmake
index 443332368a..3da3438b43 100644
--- a/cmake/CreateRegression.cmake
+++ b/cmake/CreateRegression.cmake
@@ -13,9 +13,9 @@ macro(create_regression)
         string(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/regression/" "${CMAKE_BINARY_DIR}/ai/" REGRESSION_BINARY_FILE "${REGRESSION_SOURCE_FILE}")
         string(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/regression/" "" REGRESSION_SOURCE_FILE_NAME "${REGRESSION_SOURCE_FILE}")
 
-        if ("${REGRESSION_SOURCE_FILE_NAME}" STREQUAL "regression.cfg")
+        if("${REGRESSION_SOURCE_FILE_NAME}" STREQUAL "regression.cfg")
             continue()
-        endif ("${REGRESSION_SOURCE_FILE_NAME}" STREQUAL "regression.cfg")
+        endif()
 
         add_custom_command(OUTPUT ${REGRESSION_BINARY_FILE}
                 COMMAND ${CMAKE_COMMAND} -E copy
@@ -26,7 +26,7 @@ macro(create_regression)
         )
 
         list(APPEND REGRESSION_BINARY_FILES ${REGRESSION_BINARY_FILE})
-    endforeach(REGRESSION_SOURCE_FILE)
+    endforeach()
 
     # Copy the regression configuration in a special folder, so all autogenerated
     # folders end up in the same place after running regression.
@@ -53,9 +53,9 @@ macro(create_regression)
     foreach(REGRESSION_TEST IN LISTS REGRESSION_TESTS)
         get_filename_component(REGRESSION_TEST_NAME "${REGRESSION_TEST}" NAME)
 
-        if ("${REGRESSION_TEST_NAME}" STREQUAL "regression.cfg")
+        if("${REGRESSION_TEST_NAME}" STREQUAL "regression.cfg")
             continue()
-        endif ("${REGRESSION_TEST_NAME}" STREQUAL "regression.cfg")
+        endif()
 
         add_custom_target(regression_${REGRESSION_TEST_NAME}
                 COMMAND ${CMAKE_COMMAND}
@@ -78,7 +78,7 @@ macro(create_regression)
                 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
         list(APPEND REGRESSION_TARGETS regression_${REGRESSION_TEST_NAME})
-    endforeach(REGRESSION_TEST)
+    endforeach()
 
     # Create a new target which runs the regression
     add_custom_target(regression
diff --git a/cmake/Endian.cmake b/cmake/Endian.cmake
index 00cb975445..3bfba653ca 100644
--- a/cmake/Endian.cmake
+++ b/cmake/Endian.cmake
@@ -6,9 +6,9 @@ function(add_endian_definition)
     include(TestBigEndian)
     TEST_BIG_ENDIAN(IS_BIG_ENDIAN)
 
-    if (IS_BIG_ENDIAN)
+    if(IS_BIG_ENDIAN)
         add_definitions(-DTTD_ENDIAN=TTD_BIG_ENDIAN)
-    else (IS_BIG_ENDIAN)
+    else()
         add_definitions(-DTTD_ENDIAN=TTD_LITTLE_ENDIAN)
-    endif (IS_BIG_ENDIAN)
+    endif()
 endfunction()
diff --git a/cmake/FindAllegro.cmake b/cmake/FindAllegro.cmake
index 85b2ffd392..3c90d2c4e7 100644
--- a/cmake/FindAllegro.cmake
+++ b/cmake/FindAllegro.cmake
@@ -54,10 +54,10 @@ find_package_handle_standard_args(Allegro
     VERSION_VAR Allegro_VERSION
 )
 
-if (Allegro_FOUND)
+if(Allegro_FOUND)
     set(Allegro_LIBRARIES ${Allegro_LIBRARY})
     set(Allegro_INCLUDE_DIRS ${Allegro_INCLUDE_DIR})
-endif ()
+endif()
 
 mark_as_advanced(
     Allegro_INCLUDE_DIR
diff --git a/cmake/FindEditbin.cmake b/cmake/FindEditbin.cmake
index 8ed30599f5..f4d55d7cb7 100644
--- a/cmake/FindEditbin.cmake
+++ b/cmake/FindEditbin.cmake
@@ -1,15 +1,15 @@
 # Autodetect editbin. Only useful for MSVC.
 
-if (NOT EDITBIN_DIRECTORY)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+if(NOT EDITBIN_DIRECTORY)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         get_filename_component(MSVC_COMPILE_DIRECTORY ${CMAKE_CXX_COMPILER} DIRECTORY)
         set(EDITBIN_DIRECTORY ${MSVC_COMPILE_DIRECTORY})
-    else (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    else()
         # For clang-cl build
         # find editbin.exe from environmental variable VCToolsInstallDir
         set(EDITBIN_DIRECTORY "$ENV{VCToolsInstallDir}/bin/Hostx64/x64")
-    endif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-endif (NOT EDITBIN_DIRECTORY)
+    endif()
+endif()
 
 message(CHECK_START "Finding editbin.exe")
 find_program(
@@ -17,11 +17,11 @@ find_program(
     HINTS ${EDITBIN_DIRECTORY}
 )
 
-if (EDITBIN_EXECUTABLE)
+if(EDITBIN_EXECUTABLE)
     message(CHECK_PASS "found")
-else (EDITBIN_EXECUTABLE)
+else()
     message(CHECK_FAIL "not found , please manually specify EDITBIN_DIRECTORY")
-endif (EDITBIN_EXECUTABLE)
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Editbin
diff --git a/cmake/FindFluidsynth.cmake b/cmake/FindFluidsynth.cmake
index 063726dbe5..0ac4931d78 100644
--- a/cmake/FindFluidsynth.cmake
+++ b/cmake/FindFluidsynth.cmake
@@ -54,10 +54,10 @@ find_package_handle_standard_args(Fluidsynth
     VERSION_VAR Fluidsynth_VERSION
 )
 
-if (Fluidsynth_FOUND)
+if(Fluidsynth_FOUND)
     set(Fluidsynth_LIBRARIES ${Fluidsynth_LIBRARY})
     set(Fluidsynth_INCLUDE_DIRS ${Fluidsynth_INCLUDE_DIR})
-endif ()
+endif()
 
 mark_as_advanced(
     Fluidsynth_INCLUDE_DIR
diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake
index a6f0180b37..68c557b826 100644
--- a/cmake/FindFontconfig.cmake
+++ b/cmake/FindFontconfig.cmake
@@ -55,7 +55,7 @@ find_library( Fontconfig_LIBRARY
     ${PKG_FONTCONFIG_LIBRARY_DIRS}
 )
 
-if (Fontconfig_INCLUDE_DIR AND NOT Fontconfig_VERSION)
+if(Fontconfig_INCLUDE_DIR AND NOT Fontconfig_VERSION)
   file(STRINGS ${Fontconfig_INCLUDE_DIR}/fontconfig/fontconfig.h _contents REGEX "^#define[ \t]+FC_[A-Z]+[ \t]+[0-9]+$")
   unset(Fontconfig_VERSION)
   foreach(VPART MAJOR MINOR REVISION)
@@ -70,7 +70,7 @@ if (Fontconfig_INCLUDE_DIR AND NOT Fontconfig_VERSION)
       endif()
     endforeach()
   endforeach()
-endif ()
+endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Fontconfig
diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
index 471e43c1d9..b110dbf404 100644
--- a/cmake/FindICU.cmake
+++ b/cmake/FindICU.cmake
@@ -29,7 +29,7 @@ find_package(PkgConfig QUIET)
 set(ICU_KNOWN_COMPONENTS "uc" "i18n" "le" "lx" "io")
 
 foreach(MOD_NAME IN LISTS ICU_FIND_COMPONENTS)
-    if (NOT MOD_NAME IN_LIST ICU_KNOWN_COMPONENTS)
+    if(NOT MOD_NAME IN_LIST ICU_KNOWN_COMPONENTS)
         message(FATAL_ERROR "Unknown ICU component: ${MOD_NAME}")
     endif()
     pkg_check_modules(PC_ICU_${MOD_NAME} QUIET icu-${MOD_NAME})
@@ -39,14 +39,14 @@ foreach(MOD_NAME IN LISTS ICU_FIND_COMPONENTS)
     foreach(LIBRARY IN LISTS PC_ICU_${MOD_NAME}_LIBRARIES)
         unset(PC_LIBRARY CACHE)
         find_library(PC_LIBRARY NAMES ${LIBRARY})
-        if (NOT PC_LIBRARY)
+        if(NOT PC_LIBRARY)
             unset(PC_ICU_${MOD_NAME}_FOUND)
         endif()
         list(APPEND PC_LIBRARIES ${PC_LIBRARY})
     endforeach()
     unset(PC_LIBRARY CACHE)
 
-    if (${PC_ICU_${MOD_NAME}_FOUND})
+    if(${PC_ICU_${MOD_NAME}_FOUND})
         set(ICU_COMPONENT_FOUND TRUE)
         set(ICU_${MOD_NAME}_FOUND TRUE)
         set(ICU_${MOD_NAME}_LIBRARIES ${PC_LIBRARIES})
diff --git a/cmake/FindLZO.cmake b/cmake/FindLZO.cmake
index 9a409002df..dacd9387d9 100644
--- a/cmake/FindLZO.cmake
+++ b/cmake/FindLZO.cmake
@@ -55,8 +55,8 @@ find_library(LZO_LIBRARY
 # name as the optimized file. This is not always the case, but so far
 # experiences has shown that in those case vcpkg CMake files do the right
 # thing.
-if (VCPKG_TOOLCHAIN AND LZO_LIBRARY)
-    if (LZO_LIBRARY MATCHES "/debug/")
+if(VCPKG_TOOLCHAIN AND LZO_LIBRARY)
+    if(LZO_LIBRARY MATCHES "/debug/")
         set(LZO_LIBRARY_DEBUG ${LZO_LIBRARY})
         string(REPLACE "/debug/lib/" "/lib/" LZO_LIBRARY_RELEASE ${LZO_LIBRARY})
     else()
@@ -78,10 +78,10 @@ find_package_handle_standard_args(LZO
     VERSION_VAR LZO_VERSION
 )
 
-if (LZO_FOUND)
+if(LZO_FOUND)
     set(LZO_LIBRARIES ${LZO_LIBRARY})
     set(LZO_INCLUDE_DIRS ${LZO_INCLUDE_DIR})
-endif ()
+endif()
 
 mark_as_advanced(
     LZO_INCLUDE_DIR
diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake
index d0a57ccbb2..e8dc243d9b 100644
--- a/cmake/FindSSE.cmake
+++ b/cmake/FindSSE.cmake
@@ -4,9 +4,9 @@
 include(CheckCXXSourceCompiles)
 set(CMAKE_REQUIRED_FLAGS "")
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set(CMAKE_REQUIRED_FLAGS "-msse4.1")
-endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+endif()
 
 check_cxx_source_compiles("
     #include <xmmintrin.h>
diff --git a/cmake/FindXDG_basedir.cmake b/cmake/FindXDG_basedir.cmake
index 913b425e20..a33e9760dc 100644
--- a/cmake/FindXDG_basedir.cmake
+++ b/cmake/FindXDG_basedir.cmake
@@ -54,10 +54,10 @@ find_package_handle_standard_args(XDG_basedir
     VERSION_VAR XDG_basedir_VERSION
 )
 
-if (XDG_basedir_FOUND)
+if(XDG_basedir_FOUND)
     set(XDG_basedir_LIBRARIES ${XDG_basedir_LIBRARY})
     set(XDG_basedir_INCLUDE_DIRS ${XDG_basedir_INCLUDE_DIR})
-endif ()
+endif()
 
 mark_as_advanced(
     XDG_basedir_INCLUDE_DIR
diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake
index c8cd6b44ac..eafcfc21b6 100644
--- a/cmake/InstallAndPackage.cmake
+++ b/cmake/InstallAndPackage.cmake
@@ -1,17 +1,17 @@
 include(GNUInstallDirs)
 
 # If requested, use FHS layout; otherwise fall back to a flat layout.
-if (OPTION_INSTALL_FHS)
+if(OPTION_INSTALL_FHS)
     set(BINARY_DESTINATION_DIR "${CMAKE_INSTALL_BINDIR}")
     set(DATA_DESTINATION_DIR "${CMAKE_INSTALL_DATADIR}/${BINARY_NAME}")
     set(DOCS_DESTINATION_DIR "${CMAKE_INSTALL_DOCDIR}")
     set(MAN_DESTINATION_DIR "${CMAKE_INSTALL_MANDIR}")
-else (OPTION_INSTALL_FHS)
+else()
     set(BINARY_DESTINATION_DIR ".")
     set(DATA_DESTINATION_DIR ".")
     set(DOCS_DESTINATION_DIR ".")
     set(MAN_DESTINATION_DIR ".")
-endif (OPTION_INSTALL_FHS)
+endif()
 
 install(TARGETS openttd
         RUNTIME
@@ -39,7 +39,7 @@ install(FILES
 
 # A Linux manual only makes sense when using FHS. Otherwise it is a very odd
 # file with little context to what it is.
-if (OPTION_INSTALL_FHS)
+if(OPTION_INSTALL_FHS)
     set(MAN_SOURCE_FILE ${CMAKE_SOURCE_DIR}/docs/openttd.6)
     set(MAN_BINARY_FILE ${CMAKE_BINARY_DIR}/docs/${BINARY_NAME}.6)
     install(CODE
@@ -52,26 +52,26 @@ if (OPTION_INSTALL_FHS)
                     ${MAN_BINARY_FILE}.gz
             DESTINATION ${MAN_DESTINATION_DIR}/man6
             COMPONENT manual)
-endif (OPTION_INSTALL_FHS)
+endif()
 
 # TODO -- Media files
 # TODO -- Menu files
 
-if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
     set(ARCHITECTURE "amd64")
-else (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+else()
     string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ARCHITECTURE)
-endif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+endif()
 
 # Windows is a bit more annoying to detect; using the size of void pointer
 # seems to be the most robust.
-if (WIN32)
-    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+if(WIN32)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(ARCHITECTURE "win64")
-    else (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    else()
         set(ARCHITECTURE "win32")
-    endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
-endif (WIN32)
+    endif()
+endif()
 
 set(CPACK_SYSTEM_NAME "${ARCHITECTURE}")
 
@@ -90,33 +90,33 @@ set(CPACK_PACKAGE_EXECUTABLES "openttd;OpenTTD")
 set(CPACK_STRIP_FILES YES)
 set(CPACK_OUTPUT_FILE_PREFIX "bundles")
 
-if (APPLE)
+if(APPLE)
     set(CPACK_GENERATOR "Bundle")
     include(PackageBundle)
 
     set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macosx")
-elseif (WIN32)
+elseif(WIN32)
     set(CPACK_GENERATOR "ZIP")
-    if (OPTION_USE_NSIS)
+    if(OPTION_USE_NSIS)
         list(APPEND CPACK_GENERATOR "NSIS")
         include(PackageNSIS)
-    endif (OPTION_USE_NSIS)
+    endif()
 
     set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-windows-${CPACK_SYSTEM_NAME}")
-elseif (UNIX)
+elseif(UNIX)
     # With FHS, we can create deb/rpm/... Without it, they would be horribly broken
     # and not work. The other way around is also true; with FHS they are not
     # usable, and only flat formats work.
-    if (OPTION_INSTALL_FHS)
+    if(OPTION_INSTALL_FHS)
         set(CPACK_GENERATOR "DEB")
         include(PackageDeb)
-    else (OPTION_INSTALL_FHS)
+    else()
         set(CPACK_GENERATOR "TXZ")
-    endif (OPTION_INSTALL_FHS)
+    endif()
 
     set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-linux-${CPACK_SYSTEM_NAME}")
-else ()
+else()
     message(FATAL_ERROR "Unknown OS found for packaging; please consider creating a Pull Request to add support for this OS.")
-endif ()
+endif()
 
 include(CPack)
diff --git a/cmake/LinkPackage.cmake b/cmake/LinkPackage.cmake
index f64ccfd51f..9977ecc453 100644
--- a/cmake/LinkPackage.cmake
+++ b/cmake/LinkPackage.cmake
@@ -1,10 +1,10 @@
 function(link_package NAME)
     cmake_parse_arguments(LP "ENCOURAGED" "TARGET" "" ${ARGN})
 
-    if (${NAME}_FOUND)
+    if(${NAME}_FOUND)
         string(TOUPPER "${NAME}" UCNAME)
         add_definitions(-DWITH_${UCNAME})
-        if (LP_TARGET AND TARGET ${LP_TARGET})
+        if(LP_TARGET AND TARGET ${LP_TARGET})
             target_link_libraries(openttd ${LP_TARGET})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${LP_TARGET}")
         else()
@@ -12,7 +12,7 @@ function(link_package NAME)
             target_link_libraries(openttd ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR} -- ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY}")
         endif()
-    elseif (LP_ENCOURAGED)
+    elseif(LP_ENCOURAGED)
         message(WARNING "${NAME} not found; compiling OpenTTD without ${NAME} is strongly disencouraged")
     endif()
 endfunction()
diff --git a/cmake/Options.cmake b/cmake/Options.cmake
index 4f2404b2d4..0167ad0a6c 100644
--- a/cmake/Options.cmake
+++ b/cmake/Options.cmake
@@ -5,36 +5,36 @@ include(GNUInstallDirs)
 # set_directory_options()
 #
 function(set_directory_options)
-    if (APPLE)
+    if(APPLE)
         set(DEFAULT_PERSONAL_DIR "Documents/OpenTTD")
         set(DEFAULT_SHARED_DIR "/Library/Application Support/OpenTTD")
         set(DEFAULT_GLOBAL_DIR "(not set)")
-    elseif (WIN32)
+    elseif(WIN32)
         set(DEFAULT_PERSONAL_DIR "OpenTTD")
         set(DEFAULT_SHARED_DIR "(not set)")
         set(DEFAULT_GLOBAL_DIR "(not set)")
-    elseif (UNIX)
+    elseif(UNIX)
         set(DEFAULT_PERSONAL_DIR ".${BINARY_NAME}")
         set(DEFAULT_SHARED_DIR "(not set)")
         set(DEFAULT_GLOBAL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${BINARY_NAME}")
-    else ()
+    else()
         message(FATAL_ERROR "Unknown OS found; please consider creating a Pull Request to add support for this OS.")
-    endif ()
+    endif()
 
-    if (NOT PERSONAL_DIR)
+    if(NOT PERSONAL_DIR)
         set(PERSONAL_DIR "${DEFAULT_PERSONAL_DIR}" CACHE STRING "Personal directory")
         message(STATUS "Detecting Personal Data directory - ${PERSONAL_DIR}")
-    endif (NOT PERSONAL_DIR)
+    endif()
 
-    if (NOT SHARED_DIR)
+    if(NOT SHARED_DIR)
         set(SHARED_DIR "${DEFAULT_SHARED_DIR}" CACHE STRING "Shared directory")
         message(STATUS "Detecting Shared Data directory - ${SHARED_DIR}")
-    endif (NOT SHARED_DIR)
+    endif()
 
-    if (NOT GLOBAL_DIR)
+    if(NOT GLOBAL_DIR)
         set(GLOBAL_DIR "${DEFAULT_GLOBAL_DIR}" CACHE STRING "Global directory")
         message(STATUS "Detecting Global Data directory - ${GLOBAL_DIR}")
-    endif (NOT GLOBAL_DIR)
+    endif()
 endfunction()
 
 # Set some generic options that influence what is being build.
@@ -42,11 +42,11 @@ endfunction()
 # set_options()
 #
 function(set_options)
-    if (UNIX AND NOT APPLE)
+    if(UNIX AND NOT APPLE)
         set(DEFAULT_OPTION_INSTALL_FHS ON)
-    else (UNIX AND NOT APPLE)
+    else()
         set(DEFAULT_OPTION_INSTALL_FHS OFF)
-    endif (UNIX AND NOT APPLE)
+    endif()
 
     option(OPTION_FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
 
@@ -74,17 +74,17 @@ endfunction()
 # add_definitions_based_on_options()
 #
 function(add_definitions_based_on_options)
-    if (OPTION_DEDICATED)
+    if(OPTION_DEDICATED)
         add_definitions(-DDEDICATED)
-    endif (OPTION_DEDICATED)
+    endif()
 
-    if (NOT OPTION_USE_THREADS)
+    if(NOT OPTION_USE_THREADS)
         add_definitions(-DNO_THREADS)
-    endif (NOT OPTION_USE_THREADS)
+    endif()
 
-    if (OPTION_USE_ASSERTS)
+    if(OPTION_USE_ASSERTS)
         add_definitions(-DWITH_ASSERT)
-    else (OPTION_USE_ASSERTS)
+    else()
         add_definitions(-DNDEBUG)
-    endif (OPTION_USE_ASSERTS)
+    endif()
 endfunction()
diff --git a/cmake/SourceList.cmake b/cmake/SourceList.cmake
index 6300a19a43..6e95be2017 100644
--- a/cmake/SourceList.cmake
+++ b/cmake/SourceList.cmake
@@ -10,16 +10,16 @@ function(add_files)
     cmake_parse_arguments(PARAM "" "" "CONDITION" ${ARGN})
     set(PARAM_FILES "${PARAM_UNPARSED_ARGUMENTS}")
 
-    if (PARAM_CONDITION)
-        if (NOT (${PARAM_CONDITION}))
+    if(PARAM_CONDITION)
+        if(NOT (${PARAM_CONDITION}))
             return()
-        endif (NOT (${PARAM_CONDITION}))
-    endif (PARAM_CONDITION)
+        endif()
+    endif()
 
     foreach(FILE IN LISTS PARAM_FILES)
         target_sources(openttd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${FILE})
     endforeach()
-endfunction(add_files)
+endfunction()
 
 # This function works around an 'issue' with CMake, where
 # set_source_files_properties() only works in the scope of the file. We want
@@ -42,7 +42,7 @@ function(set_compile_flags)
     endforeach()
 
     set_property(GLOBAL PROPERTY source_properties "${SOURCE_PROPERTIES}")
-endfunction(set_compile_flags)
+endfunction()
 
 # Call this macro in the same CMakeLists.txt and after add_executable().
 # This makes sure all the COMPILE_FLAGS of set_compile_flags() are set
@@ -60,4 +60,4 @@ function(process_compile_flags)
 
         set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS ${PROPERTIES})
     endforeach()
-endfunction(process_compile_flags)
+endfunction()
diff --git a/cmake/Static.cmake b/cmake/Static.cmake
index 7648d05e7f..682527aff6 100644
--- a/cmake/Static.cmake
+++ b/cmake/Static.cmake
@@ -3,7 +3,7 @@
 # set_static()
 #
 function(set_static_if_needed)
-     if (MINGW)
+     if(MINGW)
         # Let exectutables run outside MinGW environment
         # Force searching static libs
         set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" PARENT_SCOPE)
diff --git a/cmake/scripts/Baseset.cmake b/cmake/scripts/Baseset.cmake
index 4329dbdf8c..7cf60629d9 100644
--- a/cmake/scripts/Baseset.cmake
+++ b/cmake/scripts/Baseset.cmake
@@ -12,13 +12,13 @@ set(ARG_READ NO)
 while(ARGC LESS CMAKE_ARGC)
     set(ARG ${CMAKE_ARGV${ARGC}})
 
-    if (ARG_READ)
+    if(ARG_READ)
         list(APPEND LANG_SOURCE_FILES "${ARG}")
-    endif (ARG_READ)
+    endif()
 
-    if (ARG STREQUAL "--")
+    if(ARG STREQUAL "--")
         set(ARG_READ YES)
-    endif (ARG STREQUAL "--")
+    endif()
 
     math(EXPR ARGC "${ARGC} + 1")
 endwhile()
@@ -33,17 +33,17 @@ string(REGEX REPLACE "@(.*)@" "\\1" PLACE_HOLDER "${PLACE_HOLDER}")
 foreach(LANGFILE IN LISTS LANG_SOURCE_FILES)
     file(STRINGS "${LANGFILE}" LANGLINES REGEX "^(##isocode|${STR_ID})" ENCODING UTF-8)
     string(FIND "${LANGLINES}" "${STR_ID}" HAS_STR_ID)
-    if (HAS_STR_ID LESS 0)
+    if(HAS_STR_ID LESS 0)
         continue()
-    endif (HAS_STR_ID LESS 0)
+    endif()
     string(REGEX REPLACE "##isocode ([^;]+).*" "\\1" ISOCODE "${LANGLINES}")
-    if ("${ISOCODE}" STREQUAL "en_GB")
+    if("${ISOCODE}" STREQUAL "en_GB")
         string(REGEX REPLACE "[^:]*:(.*)" "${INI_KEY}       = \\1" LANGLINES "${LANGLINES}")
     else()
         string(REGEX REPLACE "[^:]*:(.*)" "${INI_KEY}.${ISOCODE} = \\1" LANGLINES "${LANGLINES}")
     endif()
     list(APPEND ${PLACE_HOLDER} ${LANGLINES})
-endforeach(LANGFILE)
+endforeach()
 list(SORT ${PLACE_HOLDER})
 string(REPLACE ";" "\n" ${PLACE_HOLDER} "${${PLACE_HOLDER}}")
 
diff --git a/cmake/scripts/CreateGRF.cmake b/cmake/scripts/CreateGRF.cmake
index f5811daf9f..8631284f33 100644
--- a/cmake/scripts/CreateGRF.cmake
+++ b/cmake/scripts/CreateGRF.cmake
@@ -5,18 +5,18 @@ cmake_minimum_required(VERSION 3.5)
 # files.
 #
 
-if (NOT NFORENUM_EXECUTABLE)
+if(NOT NFORENUM_EXECUTABLE)
     message(FATAL_ERROR "Script needs NFORENUM_EXECUTABLE defined")
-endif (NOT NFORENUM_EXECUTABLE)
-if (NOT GRFCODEC_EXECUTABLE)
+endif()
+if(NOT GRFCODEC_EXECUTABLE)
     message(FATAL_ERROR "Script needs GRFCODEC_EXECUTABLE defined")
-endif (NOT GRFCODEC_EXECUTABLE)
-if (NOT GRF_SOURCE_FOLDER)
+endif()
+if(NOT GRF_SOURCE_FOLDER)
     message(FATAL_ERROR "Script needs GRF_SOURCE_FOLDER defined")
-endif (NOT GRF_SOURCE_FOLDER)
-if (NOT GRF_BINARY_FILE)
+endif()
+if(NOT GRF_BINARY_FILE)
     message(FATAL_ERROR "Script needs GRF_BINARY_FILE defined")
-endif (NOT GRF_BINARY_FILE)
+endif()
 
 get_filename_component(GRF_SOURCE_FOLDER_NAME "${GRF_SOURCE_FOLDER}" NAME)
 
@@ -30,14 +30,14 @@ foreach(NFO_LINE IN LISTS NFO_LINES)
     # Recover the ; that was really in the text (and not a newline)
     string(REPLACE "\\;" ";" NFO_LINE "${NFO_LINE}")
 
-    if (NFO_LINE MATCHES "^#include")
+    if(NFO_LINE MATCHES "^#include")
         string(REGEX REPLACE "^#include \"(.*)\"$" "\\1" INCLUDE_FILE ${NFO_LINE})
         file(READ ${GRF_SOURCE_FOLDER}/${INCLUDE_FILE} INCLUDE_LINES)
         file(APPEND sprites/${GRF_SOURCE_FOLDER_NAME}.nfo "${INCLUDE_LINES}")
-    else (NFO_LINE MATCHES "^#include")
+    else()
         file(APPEND sprites/${GRF_SOURCE_FOLDER_NAME}.nfo "${NFO_LINE}\n")
-    endif (NFO_LINE MATCHES "^#include")
-endforeach(NFO_LINE)
+    endif()
+endforeach()
 
 execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo)
 execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf)
diff --git a/cmake/scripts/FindVersion.cmake b/cmake/scripts/FindVersion.cmake
index b53f77032f..bb754fc5b3 100644
--- a/cmake/scripts/FindVersion.cmake
+++ b/cmake/scripts/FindVersion.cmake
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.5)
 
 find_package(Git QUIET)
 # ${CMAKE_SOURCE_DIR}/.git may be a directory or a regular file
-if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     # Make sure LC_ALL is set to something desirable
     set(SAVED_LC_ALL "$ENV{LC_ALL}")
     set(ENV{LC_ALL} C)
@@ -26,7 +26,7 @@ if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
                     OUTPUT_STRIP_TRAILING_WHITESPACE
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     )
-    if (NOT IS_MODIFIED STREQUAL "")
+    if(NOT IS_MODIFIED STREQUAL "")
         set(REV_MODIFIED 2)
     endif()
 
@@ -69,34 +69,34 @@ if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     )
     string(REGEX REPLACE "\^0$" "" TAG "${TAG}")
 
-    if (REV_MODIFIED EQUAL 0)
+    if(REV_MODIFIED EQUAL 0)
         set(HASHPREFIX "-g")
-    elseif (REV_MODIFIED EQUAL 2)
+    elseif(REV_MODIFIED EQUAL 2)
         set(HASHPREFIX "-m")
-    else ()
+    else()
         set(HASHPREFIX "-u")
     endif()
 
     # Set the version string
-    if (NOT TAG STREQUAL "")
+    if(NOT TAG STREQUAL "")
         set(REV_VERSION "${TAG}")
         set(REV_ISTAG 1)
 
         string(REGEX REPLACE "^[0-9.]+$" "" STABLETAG "${TAG}")
-        if (NOT STABLETAG STREQUAL "")
+        if(NOT STABLETAG STREQUAL "")
             set(REV_ISSTABLETAG 1)
-        else ()
+        else()
             set(REV_ISSTABLETAG 0)
-        endif ()
-    else ()
+        endif()
+    else()
         set(REV_VERSION "${REV_ISODATE}-${BRANCH}${HASHPREFIX}${SHORTHASH}")
         set(REV_ISTAG 0)
         set(REV_ISSTABLETAG 0)
-    endif ()
+    endif()
 
     # Restore LC_ALL
     set(ENV{LC_ALL} "${SAVED_LC_ALL}")
-elseif (EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev")
+elseif(EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev")
     file(READ "${CMAKE_SOURCE_DIR}/.ottdrev" OTTDREV)
     string(REPLACE "\n" "" OTTDREV "${OTTDREV}")
     string(REPLACE "\t" ";" OTTDREV "${OTTDREV}")
@@ -107,7 +107,7 @@ elseif (EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev")
     list(GET OTTDREV 4 REV_ISTAG)
     list(GET OTTDREV 5 REV_ISSTABLETAG)
     list(GET OTTDREV 6 REV_YEAR)
-else ()
+else()
     message(WARNING "No version detected; this build will NOT be network compatible")
     set(REV_VERSION "norev0000")
     set(REV_ISODATE "19700101")
@@ -116,25 +116,25 @@ else ()
     set(REV_ISTAG 0)
     set(REV_ISSTABLETAG 0)
     set(REV_YEAR "1970")
-endif ()
+endif()
 
 message(STATUS "Version string: ${REV_VERSION}")
 
-if (GENERATE_OTTDREV)
+if(GENERATE_OTTDREV)
     message(STATUS "Generating .ottdrev")
     file(WRITE ${CMAKE_SOURCE_DIR}/.ottdrev "${REV_VERSION}\t${REV_ISODATE}\t${REV_MODIFIED}\t${REV_HASH}\t${REV_ISTAG}\t${REV_ISSTABLETAG}\t${REV_YEAR}\n")
-else (GENERATE_OTTDREV)
+else()
     message(STATUS "Generating rev.cpp")
     configure_file("${CMAKE_SOURCE_DIR}/src/rev.cpp.in"
             "${FIND_VERSION_BINARY_DIR}/rev.cpp")
 
-    if (WIN32)
+    if(WIN32)
         message(STATUS "Generating ottdres.rc")
         configure_file("${CMAKE_SOURCE_DIR}/src/os/windows/ottdres.rc.in"
                 "${FIND_VERSION_BINARY_DIR}/ottdres.rc")
-    endif (WIN32)
+    endif()
 
     message(STATUS "Generating CPackProperties.cmake")
     configure_file("${CMAKE_SOURCE_DIR}/CPackProperties.cmake.in"
             "${CPACK_BINARY_DIR}/CPackProperties.cmake" @ONLY)
-endif (GENERATE_OTTDREV)
+endif()
diff --git a/cmake/scripts/GenerateWidget.cmake b/cmake/scripts/GenerateWidget.cmake
index 0bb3490955..f46a67e690 100644
--- a/cmake/scripts/GenerateWidget.cmake
+++ b/cmake/scripts/GenerateWidget.cmake
@@ -15,12 +15,12 @@ cmake_minimum_required(VERSION 3.5)
 #
 #
 
-if (NOT GENERATE_SOURCE_FILE)
+if(NOT GENERATE_SOURCE_FILE)
     message(FATAL_ERROR "Script needs GENERATE_SOURCE_FILE defined")
-endif (NOT GENERATE_SOURCE_FILE)
-if (NOT GENERATE_BINARY_FILE)
+endif()
+if(NOT GENERATE_BINARY_FILE)
     message(FATAL_ERROR "Script needs GENERATE_BINARY_FILE defined")
-endif (NOT GENERATE_BINARY_FILE)
+endif()
 
 file(STRINGS ${GENERATE_SOURCE_FILE} ENUM_LINES REGEX "@enum")
 
@@ -46,38 +46,38 @@ foreach(ENUM IN LISTS ENUM_LINES)
             string(REPLACE "${RM_INDENT}" "" LINE "${LINE}")
 
             # Remember possible doxygen comment before enum declaration
-            if ((NOT ACTIVE) AND "${LINE}" MATCHES "/\\*\\*")
+            if((NOT ACTIVE) AND "${LINE}" MATCHES "/\\*\\*")
                 set(COMMENT "${ADD_INDENT}${LINE}")
                 set(ACTIVE_COMMENT 1)
-            elseif (ACTIVE_COMMENT EQUAL 1)
+            elseif(ACTIVE_COMMENT EQUAL 1)
                 string(APPEND COMMENT "\n${ADD_INDENT}${LINE}")
             endif()
 
             # Check for enum match
-            if ("${LINE}" MATCHES "^	*enum *${ENUM_PATTERN} *\{")
+            if("${LINE}" MATCHES "^	*enum *${ENUM_PATTERN} *\{")
                 # REGEX REPLACE does a REGEX MATCHALL and fails if an empty string is matched
                 string(REGEX MATCH "[^	]*" RESULT "${LINE}")
                 string(REPLACE "${RESULT}" "" RM_INDENT "${LINE}")
 
                 set(ACTIVE 1)
-                if (ACTIVE_COMMENT GREATER 0)
+                if(ACTIVE_COMMENT GREATER 0)
                      string(APPEND ${PLACE_HOLDER} "\n${COMMENT}")
-                endif (ACTIVE_COMMENT GREATER 0)
+                endif()
                 unset(ACTIVE_COMMENT)
                 unset(COMMENT)
-            endif ("${LINE}" MATCHES "^	*enum *${ENUM_PATTERN} *\{")
+            endif()
 
             # Forget doxygen comment, if no enum follows
-            if (ACTIVE_COMMENT EQUAL 2 AND NOT "${LINE}" STREQUAL "")
+            if(ACTIVE_COMMENT EQUAL 2 AND NOT "${LINE}" STREQUAL "")
                 unset(ACTIVE_COMMENT)
                 unset(COMMENT)
-            endif (ACTIVE_COMMENT EQUAL 2 AND NOT "${LINE}" STREQUAL "")
-            if (ACTIVE_COMMENT EQUAL 1 AND "${LINE}" MATCHES "\\*/")
+            endif()
+            if(ACTIVE_COMMENT EQUAL 1 AND "${LINE}" MATCHES "\\*/")
                 set(ACTIVE_COMMENT 2)
-            endif (ACTIVE_COMMENT EQUAL 1 AND "${LINE}" MATCHES "\\*/")
+            endif()
 
-            if (ACTIVE)
-                if ("${LINE}" MATCHES "^	*[A-Za-z0-9_]* *[,=]")
+            if(ACTIVE)
+                if("${LINE}" MATCHES "^	*[A-Za-z0-9_]* *[,=]")
                     # Transform enum values
                     # REGEX REPLACE does a REGEX MATCHALL and replaces too much
                     string(REGEX MATCH " *=[^,]*" RESULT "${LINE}")
@@ -92,28 +92,28 @@ foreach(ENUM IN LISTS ENUM_LINES)
                     unset(SPACES)
                     foreach(i RANGE ${LEN})
                         string(APPEND SPACES " ")
-                    endforeach(i)
+                    endforeach()
 
-                    if (CMAKE_MATCH_3)
+                    if(CMAKE_MATCH_3)
                         string(APPEND ${PLACE_HOLDER} "\n${ADD_INDENT}${CMAKE_MATCH_1}${CMAKE_MATCH_2}${SPACES} = ::${CMAKE_MATCH_2},${SPACES}${CMAKE_MATCH_3}")
-                    else (CMAKE_MATCH_3)
+                    else()
                         string(APPEND ${PLACE_HOLDER} "\n${ADD_INDENT}${CMAKE_MATCH_1}${CMAKE_MATCH_2}${SPACES} = ::${CMAKE_MATCH_2},")
-                    endif (CMAKE_MATCH_3)
-                elseif ("${LINE}" STREQUAL "")
+                    endif()
+                elseif("${LINE}" STREQUAL "")
                     string(APPEND ${PLACE_HOLDER} "\n")
-                else ()
+                else()
                     string(APPEND ${PLACE_HOLDER} "\n${ADD_INDENT}${LINE}")
-                endif ()
-            endif (ACTIVE)
+                endif()
+            endif()
 
-            if ("${LINE}" MATCHES "^	*\};")
-                if (ACTIVE)
+            if("${LINE}" MATCHES "^	*\};")
+                if(ACTIVE)
                     string(APPEND ${PLACE_HOLDER} "\n")
-                endif (ACTIVE)
+                endif()
                 unset(ACTIVE)
-            endif ("${LINE}" MATCHES "^	*\};")
-         endforeach(LINE)
-    endforeach(FILE)
- endforeach(ENUM)
+            endif()
+         endforeach()
+    endforeach()
+ endforeach()
 
 configure_file(${GENERATE_SOURCE_FILE} ${GENERATE_BINARY_FILE})
diff --git a/cmake/scripts/Regression.cmake b/cmake/scripts/Regression.cmake
index 9984396ea1..af473ea9f0 100644
--- a/cmake/scripts/Regression.cmake
+++ b/cmake/scripts/Regression.cmake
@@ -4,26 +4,26 @@ cmake_minimum_required(VERSION 3.5)
 # Runs a single regressoion test
 #
 
-if (NOT REGRESSION_TEST)
+if(NOT REGRESSION_TEST)
     message(FATAL_ERROR "Script needs REGRESSION_TEST defined (tip: use -DREGRESSION_TEST=..)")
-endif (NOT REGRESSION_TEST)
-if (NOT OPENTTD_EXECUTABLE)
+endif()
+if(NOT OPENTTD_EXECUTABLE)
     message(FATAL_ERROR "Script needs OPENTTD_EXECUTABLE defined (tip: use -DOPENTTD_EXECUTABLE=..)")
-endif (NOT OPENTTD_EXECUTABLE)
+endif()
 
-if (NOT EXISTS ai/${REGRESSION_TEST}/test.sav)
+if(NOT EXISTS ai/${REGRESSION_TEST}/test.sav)
     message(FATAL_ERROR "Regression test ${REGRESSION_TEST} does not exist (tip: check regression folder for the correct spelling)")
-endif ()
+endif()
 
 # If editbin is given, copy the executable to a new folder, and change the
 # subsystem to console. The copy is needed as multiple regressions can run
 # at the same time.
-if (EDITBIN_EXECUTABLE)
+if(EDITBIN_EXECUTABLE)
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OPENTTD_EXECUTABLE} regression/${REGRESSION_TEST}.exe)
     set(OPENTTD_EXECUTABLE "regression/${REGRESSION_TEST}.exe")
 
     execute_process(COMMAND ${EDITBIN_EXECUTABLE} /nologo /subsystem:console ${OPENTTD_EXECUTABLE})
-endif (EDITBIN_EXECUTABLE)
+endif()
 
 # Run the regression test
 execute_process(COMMAND ${OPENTTD_EXECUTABLE}
@@ -40,13 +40,13 @@ execute_process(COMMAND ${OPENTTD_EXECUTABLE}
                 OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-if (REGRESSION_OUTPUT)
+if(REGRESSION_OUTPUT)
     message(FATAL_ERROR "Unexpected output: ${REGRESSION_OUTPUT}")
-endif (REGRESSION_OUTPUT)
+endif()
 
-if (NOT REGRESSION_RESULT)
+if(NOT REGRESSION_RESULT)
     message(FATAL_ERROR "Regression did not output anything; did the compilation fail?")
-endif (NOT REGRESSION_RESULT)
+endif()
 
 # For some reason pointer can be printed as '0x(nil)', '0x0000000000000000', or '0x0x0'
 string(REPLACE "0x(nil)" "0x00000000" REGRESSION_RESULT "${REGRESSION_RESULT}")
@@ -76,21 +76,21 @@ list(LENGTH REGRESSION_EXPECTED REGRESSION_EXPECTED_LENGTH)
 foreach(RESULT IN LISTS REGRESSION_RESULT)
     list(GET REGRESSION_EXPECTED ${ARGC} EXPECTED)
 
-    if (NOT RESULT STREQUAL EXPECTED)
+    if(NOT RESULT STREQUAL EXPECTED)
         message("${ARGC}: - ${EXPECTED}")
         message("${ARGC}: + ${RESULT}'")
         set(ERROR YES)
-    endif (NOT RESULT STREQUAL EXPECTED)
+    endif()
 
     math(EXPR ARGC "${ARGC} + 1")
-endforeach(RESULT)
+endforeach()
 
-if (NOT REGRESSION_EXPECTED_LENGTH EQUAL ARGC)
+if(NOT REGRESSION_EXPECTED_LENGTH EQUAL ARGC)
     math(EXPR MISSING "${REGRESSION_EXPECTED_LENGTH} - ${ARGC}")
     message("(${MISSING} more lines were expected than found)")
     set(ERROR YES)
-endif (NOT REGRESSION_EXPECTED_LENGTH EQUAL ARGC)
+endif()
 
-if (ERROR)
+if(ERROR)
     message(FATAL_ERROR "Regression failed")
-endif (ERROR)
+endif()
diff --git a/cmake/scripts/SquirrelExport.cmake b/cmake/scripts/SquirrelExport.cmake
index 315be36c5e..3b230de00f 100644
--- a/cmake/scripts/SquirrelExport.cmake
+++ b/cmake/scripts/SquirrelExport.cmake
@@ -1,29 +1,29 @@
 cmake_minimum_required(VERSION 3.5)
 
-if (NOT SCRIPT_API_SOURCE_FILE)
+if(NOT SCRIPT_API_SOURCE_FILE)
     message(FATAL_ERROR "Script needs SCRIPT_API_SOURCE_FILE defined")
-endif (NOT SCRIPT_API_SOURCE_FILE)
-if (NOT SCRIPT_API_BINARY_FILE)
+endif()
+if(NOT SCRIPT_API_BINARY_FILE)
     message(FATAL_ERROR "Script needs SCRIPT_API_BINARY_FILE defined")
-endif (NOT SCRIPT_API_BINARY_FILE)
-if (NOT SCRIPT_API_FILE)
+endif()
+if(NOT SCRIPT_API_FILE)
     message(FATAL_ERROR "Script needs SCRIPT_API_FILE defined")
-endif (NOT SCRIPT_API_FILE)
-if (NOT APIUC)
+endif()
+if(NOT APIUC)
     message(FATAL_ERROR "Script needs APIUC defined")
-endif (NOT APIUC)
-if (NOT APILC)
+endif()
+if(NOT APILC)
     message(FATAL_ERROR "Script needs APILC defined")
-endif (NOT APILC)
+endif()
 
 macro(dump_fileheader)
     get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
     string(APPEND SQUIRREL_EXPORT "\n#include \"../${SCRIPT_API_FILE_NAME}\"")
-    if (NOT "${APIUC}" STREQUAL "Template")
+    if(NOT "${APIUC}" STREQUAL "Template")
         string(REPLACE "script_" "template_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
         string(APPEND SQUIRREL_EXPORT "\n#include \"../template/${SCRIPT_API_FILE_NAME}.sq\"")
-    endif (NOT "${APIUC}" STREQUAL "Template")
-endmacro(dump_fileheader)
+    endif()
+endmacro()
 
 macro(dump_class_templates NAME)
     string(REGEX REPLACE "^Script" "" REALNAME ${NAME})
@@ -32,9 +32,9 @@ macro(dump_class_templates NAME)
     string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${NAME} &GetParam(ForceType<${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(${NAME} *)instance; }")
     string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} *GetParam(ForceType<const ${NAME} *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (${NAME} *)instance; }")
     string(APPEND SQUIRREL_EXPORT "\n	template <> inline const ${NAME} &GetParam(ForceType<const ${NAME} &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(${NAME} *)instance; }")
-    if ("${NAME}" STREQUAL "ScriptEvent")
+    if("${NAME}" STREQUAL "ScriptEvent")
         string(APPEND SQUIRREL_EXPORT "\n	template <> inline int Return<${NAME} *>(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; }")
-    elseif ("${NAME}" STREQUAL "ScriptText")
+    elseif("${NAME}" STREQUAL "ScriptText")
         string(APPEND SQUIRREL_EXPORT "\n")
         string(APPEND SQUIRREL_EXPORT "\n	template <> inline Text *GetParam(ForceType<Text *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) {")
         string(APPEND SQUIRREL_EXPORT "\n		if (sq_gettype(vm, index) == OT_INSTANCE) {")
@@ -45,10 +45,10 @@ macro(dump_class_templates NAME)
         string(APPEND SQUIRREL_EXPORT "\n		}")
         string(APPEND SQUIRREL_EXPORT "\n		return nullptr;")
         string(APPEND SQUIRREL_EXPORT "\n	}")
-    else ()
+    else()
         string(APPEND SQUIRREL_EXPORT "\n	template <> inline int Return<${NAME} *>(HSQUIRRELVM vm, ${NAME} *res) { if (res == nullptr) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, \"${REALNAME}\", res, nullptr, DefSQDestructorCallback<${NAME}>, true); return 1; }")
-    endif ()
-endmacro(dump_class_templates)
+    endif()
+endmacro()
 
 macro(reset_reader)
     unset(ENUMS)
@@ -63,7 +63,7 @@ macro(reset_reader)
     unset(START_SQUIRREL_DEFINE_ON_NEXT_LINE)
     set(CLS_LEVEL 0)
     unset(CLS_IN_API)
-endmacro(reset_reader)
+endmacro()
 
 reset_reader()
 
@@ -71,80 +71,80 @@ file(STRINGS "${SCRIPT_API_FILE}" SOURCE_LINES)
 
 foreach(LINE IN LISTS SOURCE_LINES)
     # Ignore special doxygen blocks
-    if ("${LINE}" MATCHES "^#ifndef DOXYGEN_API")
+    if("${LINE}" MATCHES "^#ifndef DOXYGEN_API")
         set(DOXYGEN_SKIP "next")
         continue()
-    endif ()
-    if ("${LINE}" MATCHES "^#ifdef DOXYGEN_API")
+    endif()
+    if("${LINE}" MATCHES "^#ifdef DOXYGEN_API")
         set(DOXYGEN_SKIP "true")
         continue()
-    endif ()
-    if ("${LINE}" MATCHES "^#endif /\\* DOXYGEN_API \\*/")
+    endif()
+    if("${LINE}" MATCHES "^#endif /\\* DOXYGEN_API \\*/")
         unset(DOXYGEN_SKIP)
         continue()
-    endif ()
-    if ("${LINE}" MATCHES "^#else")
-        if ("${DOXYGEN_SKIP}" STREQUAL "next")
+    endif()
+    if("${LINE}" MATCHES "^#else")
+        if("${DOXYGEN_SKIP}" STREQUAL "next")
             set(DOXYGEN_SKIP "true")
         else()
             unset(DOXYGEN_SKIP)
         endif()
         continue()
-    endif ()
-    if ("${DOXYGEN_SKIP}" STREQUAL "true")
+    endif()
+    if("${DOXYGEN_SKIP}" STREQUAL "true")
         continue()
     endif()
 
-    if ("${LINE}" MATCHES "^([	 ]*)\\* @api (.*)$")
+    if("${LINE}" MATCHES "^([	 ]*)\\* @api (.*)$")
         set(LINE ${CMAKE_MATCH_2})
         # By default, classes are not selected
-        if (NOT CLS_LEVEL)
+        if(NOT CLS_LEVEL)
             set(API_SELECTED FALSE)
-        endif (NOT CLS_LEVEL)
+        endif()
 
-        if ("${APIUC}" STREQUAL "Template")
+        if("${APIUC}" STREQUAL "Template")
             set(API_SELECTED TRUE)
-            if ("${LINE}" STREQUAL "none" OR "${LINE}" STREQUAL "-all")
+            if("${LINE}" STREQUAL "none" OR "${LINE}" STREQUAL "-all")
                 set(API_SELECTED FALSE)
-            endif ("${LINE}" STREQUAL "none" OR "${LINE}" STREQUAL "-all")
+            endif()
             continue()
-        endif("${APIUC}" STREQUAL "Template")
+        endif()
 
-        if ("${LINE}" STREQUAL "none" OR "${LINE}" STREQUAL "-all")
+        if("${LINE}" STREQUAL "none" OR "${LINE}" STREQUAL "-all")
             set(API_SELECTED FALSE)
-        elseif ("${LINE}" MATCHES "-${APILC}")
+        elseif("${LINE}" MATCHES "-${APILC}")
             set(API_SELECTED FALSE)
-        elseif ("${LINE}" MATCHES "${APILC}")
+        elseif("${LINE}" MATCHES "${APILC}")
             set(API_SELECTED TRUE)
-        endif ()
+        endif()
         continue()
-    endif ("${LINE}" MATCHES "^([	 ]*)\\* @api (.*)$")
+    endif()
 
     # Remove the old squirrel stuff
-    if ("${LINE}" MATCHES "#ifdef DEFINE_SQUIRREL_CLASS")
+    if("${LINE}" MATCHES "#ifdef DEFINE_SQUIRREL_CLASS")
         set(SQUIRREL_STUFF TRUE)
         continue()
-    endif ("${LINE}" MATCHES "#ifdef DEFINE_SQUIRREL_CLASS")
-    if ("${LINE}" MATCHES "^#endif /\\* DEFINE_SQUIRREL_CLASS \\*/")
+    endif()
+    if("${LINE}" MATCHES "^#endif /\\* DEFINE_SQUIRREL_CLASS \\*/")
         unset(SQUIRREL_STUFF)
         continue()
-    endif ("${LINE}" MATCHES "^#endif /\\* DEFINE_SQUIRREL_CLASS \\*/")
-    if (SQUIRREL_STUFF)
+    endif()
+    if(SQUIRREL_STUFF)
         continue()
-    endif (SQUIRREL_STUFF)
+    endif()
 
     # Ignore forward declarations of classes
-    if ("${LINE}" MATCHES "^(	*)class(.*);")
+    if("${LINE}" MATCHES "^(	*)class(.*);")
         continue()
-    endif ("${LINE}" MATCHES "^(	*)class(.*);")
+    endif()
 
     # We only want to have public functions exported for now
-    if ("${LINE}" MATCHES "^(	*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
-        if (NOT CLS_LEVEL)
-            if (NOT DEFINED API_SELECTED)
+    if("${LINE}" MATCHES "^(	*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
+        if(NOT CLS_LEVEL)
+            if(NOT DEFINED API_SELECTED)
                 message(WARNING "Class '${CMAKE_MATCH_2}' has no @api. It won't be published to any API.")
                 set(API_SELECTED FALSE)
-            endif (NOT DEFINED API_SELECTED)
+            endif()
             unset(IS_PUBLIC)
             unset(CLS_PARAM_0)
             set(CLS_PARAM_1 1)
@@ -153,132 +153,132 @@ foreach(LINE IN LISTS SOURCE_LINES)
             unset(API_SELECTED)
             set(CLS "${CMAKE_MATCH_2}")
             set(SUPER_CLS "${CMAKE_MATCH_4}")
-        elseif (CLS_LEVEL EQUAL 1)
-            if (NOT DEFINED API_SELECTED)
+        elseif(CLS_LEVEL EQUAL 1)
+            if(NOT DEFINED API_SELECTED)
                 set(API_SELECTED ${CLS_IN_API})
-            endif (NOT API_SELECTED)
+            endif()
 
-            if (API_SELECTED)
+            if(API_SELECTED)
                 list(APPEND STRUCTS "${CLS}::${CMAKE_MATCH_2}")
-            endif (API_SELECTED)
+            endif()
             unset(API_SELECTED)
-        endif ()
+        endif()
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
         continue()
-    endif ("${LINE}" MATCHES "^(	*)class (.*) (: public|: protected|: private|:) ([^ ]*)")
-    if ("${LINE}" MATCHES "^(	*)public")
-        if (CLS_LEVEL EQUAL 1)
+    endif()
+    if("${LINE}" MATCHES "^(	*)public")
+        if(CLS_LEVEL EQUAL 1)
             set(IS_PUBLIC TRUE)
-        endif (CLS_LEVEL EQUAL 1)
+        endif()
         continue()
-    endif ("${LINE}" MATCHES "^(	*)public")
-    if ("${LINE}" MATCHES "^(	*)protected")
-        if (CLS_LEVEL EQUAL 1)
+    endif()
+    if("${LINE}" MATCHES "^(	*)protected")
+        if(CLS_LEVEL EQUAL 1)
             unset(IS_PUBLIC)
-        endif (CLS_LEVEL EQUAL 1)
+        endif()
         continue()
-    endif ("${LINE}" MATCHES "^(	*)protected")
-    if ("${LINE}" MATCHES "^(	*)private")
-        if (CLS_LEVEL EQUAL 1)
+    endif()
+    if("${LINE}" MATCHES "^(	*)private")
+        if(CLS_LEVEL EQUAL 1)
             unset(IS_PUBLIC)
-        endif (CLS_LEVEL EQUAL 1)
+        endif()
         continue()
-    endif ("${LINE}" MATCHES "^(	*)private")
+    endif()
 
     # Ignore the comments
-    if ("${LINE}" MATCHES "^#")
+    if("${LINE}" MATCHES "^#")
         continue()
-    endif ("${LINE}" MATCHES "^#")
-    if ("${LINE}" MATCHES "/\\*.*\\*/")
+    endif()
+    if("${LINE}" MATCHES "/\\*.*\\*/")
         unset(COMMENT)
         continue()
-    endif ("${LINE}" MATCHES "/\\*.*\\*/")
-    if ("${LINE}" MATCHES "/\\*")
+    endif()
+    if("${LINE}" MATCHES "/\\*")
         set(COMMENT TRUE)
         continue()
-    endif ("${LINE}" MATCHES "/\\*")
-    if ("${LINE}" MATCHES "\\*/")
+    endif()
+    if("${LINE}" MATCHES "\\*/")
         unset(COMMENT)
         continue()
-    endif ("${LINE}" MATCHES "\\*/")
-    if (COMMENT)
+    endif()
+    if(COMMENT)
         continue()
-    endif (COMMENT)
+    endif()
 
     # We need to make specialized conversions for structs
-    if ("${LINE}" MATCHES "^(	*)struct ([^ ]*)")
+    if("${LINE}" MATCHES "^(	*)struct ([^ ]*)")
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
 
         # Check if we want to publish this struct
-        if (NOT DEFINED API_SELECTED)
+        if(NOT DEFINED API_SELECTED)
             set(API_SELECTED ${CLS_IN_API})
-        endif (NOT DEFINED API_SELECTED)
-        if (NOT API_SELECTED)
+        endif()
+        if(NOT API_SELECTED)
             unset(API_SELECTED)
             continue()
-        endif (NOT API_SELECTED)
+        endif()
         unset(API_SELECTED)
 
-        if (NOT IS_PUBLIC OR NOT CLS_LEVEL EQUAL 1)
+        if(NOT IS_PUBLIC OR NOT CLS_LEVEL EQUAL 1)
             continue()
-        endif (NOT IS_PUBLIC OR NOT CLS_LEVEL EQUAL 1)
+        endif()
 
         list(APPEND STRUCTS "${CLS}::${CMAKE_MATCH_2}")
         continue()
-    endif ("${LINE}" MATCHES "^(	*)struct ([^ ]*)")
+    endif()
 
     # We need to make specialized conversions for enums
-    if ("${LINE}" MATCHES "^(	*)enum ([^ ]*)")
+    if("${LINE}" MATCHES "^(	*)enum ([^ ]*)")
         math(EXPR CLS_LEVEL "${CLS_LEVEL} + 1")
 
         # Check if we want to publish this enum
-        if (NOT DEFINED API_SELECTED)
+        if(NOT DEFINED API_SELECTED)
             set(API_SELECTED ${CLS_IN_API})
-        endif (NOT DEFINED API_SELECTED)
-        if (NOT API_SELECTED)
+        endif()
+        if(NOT API_SELECTED)
             unset(API_SELECTED)
             continue()
-        endif (NOT API_SELECTED)
+        endif()
         unset(API_SELECTED)
 
-        if (NOT IS_PUBLIC)
+        if(NOT IS_PUBLIC)
             continue()
-        endif (NOT IS_PUBLIC)
+        endif()
 
         set(IN_ENUM TRUE)
         list(APPEND ENUMS "${CLS}::${CMAKE_MATCH_2}")
         continue()
-    endif ("${LINE}" MATCHES "^(	*)enum ([^ ]*)")
+    endif()
 
     # Maybe the end of the class, if so we can start with the Squirrel export pretty soon
-    if ("${LINE}" MATCHES "};")
+    if("${LINE}" MATCHES "};")
         math(EXPR CLS_LEVEL "${CLS_LEVEL} - 1")
-        if (CLS_LEVEL)
+        if(CLS_LEVEL)
             unset(IN_ENUM)
             continue()
-        endif (CLS_LEVEL)
+        endif()
 
-        if (CLS)
+        if(CLS)
             set(START_SQUIRREL_DEFINE_ON_NEXT_LINE TRUE)
-        endif (CLS)
+        endif()
         continue()
-    endif ("${LINE}" MATCHES "};")
+    endif()
 
     # Empty/white lines. When we may do the Squirrel export, do that export.
-    if ("${LINE}" MATCHES "^([ 	]*)$")
-        if (NOT START_SQUIRREL_DEFINE_ON_NEXT_LINE)
+    if("${LINE}" MATCHES "^([ 	]*)$")
+        if(NOT START_SQUIRREL_DEFINE_ON_NEXT_LINE)
             continue()
-        endif (NOT START_SQUIRREL_DEFINE_ON_NEXT_LINE)
+        endif()
 
-        if (NOT CLS_IN_API)
+        if(NOT CLS_IN_API)
             reset_reader()
             continue()
-        endif (NOT CLS_IN_API)
+        endif()
 
-        if (NOT HAS_FILEHEADER)
+        if(NOT HAS_FILEHEADER)
             dump_fileheader()
             set(HAS_FILEHEADER TRUE)
-        endif (NOT HAS_FILEHEADER)
+        endif()
 
         unset(IS_PUBLIC)
         unset(NAMESPACE_OPENED)
@@ -288,38 +288,38 @@ foreach(LINE IN LISTS SOURCE_LINES)
 
         string(APPEND SQUIRREL_EXPORT "\n")
 
-        if ("${APIUC}" STREQUAL "Template")
+        if("${APIUC}" STREQUAL "Template")
             # First check whether we have enums to print
-            if (DEFINED ENUMS)
-                if (NOT NAMESPACE_OPENED)
+            if(DEFINED ENUMS)
+                if(NOT NAMESPACE_OPENED)
                     string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
                     set(NAMESPACE_OPENED TRUE)
-                endif (NOT NAMESPACE_OPENED)
+                endif()
                 string(APPEND SQUIRREL_EXPORT "\n	/* Allow enums to be used as Squirrel parameters */")
                 foreach(ENUM IN LISTS ENUMS)
                     string(APPEND SQUIRREL_EXPORT "\n	template <> inline ${ENUM} GetParam(ForceType<${ENUM}>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQInteger tmp; sq_getinteger(vm, index, &tmp); return (${ENUM})tmp; }")
                     string(APPEND SQUIRREL_EXPORT "\n	template <> inline int Return<${ENUM}>(HSQUIRRELVM vm, ${ENUM} res) { sq_pushinteger(vm, (int32)res); return 1; }")
-                endforeach(ENUM)
-            endif (DEFINED ENUMS)
+                endforeach()
+            endif()
 
             # Then check whether we have structs/classes to print
-            if (DEFINED STRUCTS)
-                if (NOT NAMESPACE_OPENED)
+            if(DEFINED STRUCTS)
+                if(NOT NAMESPACE_OPENED)
                     string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
                     set(NAMESPACE_OPENED TRUE)
-                endif (NOT NAMESPACE_OPENED)
+                endif()
                 string(APPEND SQUIRREL_EXPORT "\n	/* Allow inner classes/structs to be used as Squirrel parameters */")
                 foreach(STRUCT IN LISTS STRUCTS)
                     dump_class_templates(${STRUCT})
-                endforeach(STRUCT)
-            endif (DEFINED STRUCTS)
+                endforeach()
+            endif()
 
-            if (NOT NAMESPACE_OPENED)
+            if(NOT NAMESPACE_OPENED)
                 string(APPEND SQUIRREL_EXPORT "\nnamespace SQConvert {")
                 set(NAMESPACE_OPENED TRUE)
-            else (NOT NAMESPACE_OPENED)
+            else()
                 string(APPEND SQUIRREL_EXPORT "\n")
-            endif (NOT NAMESPACE_OPENED)
+            endif()
             string(APPEND SQUIRREL_EXPORT "\n	/* Allow ${CLS} to be used as Squirrel parameter */")
             dump_class_templates(${CLS})
 
@@ -327,7 +327,7 @@ foreach(LINE IN LISTS SOURCE_LINES)
 
             reset_reader()
             continue()
-        endif ("${APIUC}" STREQUAL "Template")
+        endif()
 
         string(APPEND SQUIRREL_EXPORT "\n")
         string(APPEND SQUIRREL_EXPORT "\ntemplate <> const char *GetClassName<${CLS}, ST_${APIUC}>() { return \"${API_CLS}\"; }")
@@ -337,61 +337,61 @@ foreach(LINE IN LISTS SOURCE_LINES)
         string(APPEND SQUIRREL_EXPORT "\nvoid SQ${API_CLS}_Register(Squirrel *engine)")
         string(APPEND SQUIRREL_EXPORT "\n{")
         string(APPEND SQUIRREL_EXPORT "\n	DefSQClass<${CLS}, ST_${APIUC}> SQ${API_CLS}(\"${API_CLS}\");")
-        if ("${SUPER_CLS}" STREQUAL "Text" OR "${SUPER_CLS}" STREQUAL "ScriptObject" OR "${SUPER_CLS}" STREQUAL "AIAbstractiveList::Valuator")
+        if("${SUPER_CLS}" STREQUAL "Text" OR "${SUPER_CLS}" STREQUAL "ScriptObject" OR "${SUPER_CLS}" STREQUAL "AIAbstractiveList::Valuator")
             string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine);")
-        else ("${SUPER_CLS}" STREQUAL "Text" OR "${SUPER_CLS}" STREQUAL "ScriptObject" OR "${SUPER_CLS}" STREQUAL "AIAbstractiveList::Valuator")
+        else()
             string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PreRegister(engine, \"${API_SUPER_CLS}\");")
-        endif ("${SUPER_CLS}" STREQUAL "Text" OR "${SUPER_CLS}" STREQUAL "ScriptObject" OR "${SUPER_CLS}" STREQUAL "AIAbstractiveList::Valuator")
-        if (NOT "${SUPER_CLS}" STREQUAL "ScriptEvent")
-            if ("${CLS_PARAM_2}" STREQUAL "v")
+        endif()
+        if(NOT "${SUPER_CLS}" STREQUAL "ScriptEvent")
+            if("${CLS_PARAM_2}" STREQUAL "v")
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddSQAdvancedConstructor(engine);")
-            else ("${CLS_PARAM_2}" STREQUAL "v")
+            else()
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.AddConstructor<void (${CLS}::*)(${CLS_PARAM_0}), ${CLS_PARAM_1}>(engine, \"${CLS_PARAM_2}\");")
-            endif ("${CLS_PARAM_2}" STREQUAL "v")
-        endif (NOT "${SUPER_CLS}" STREQUAL "ScriptEvent")
+            endif()
+        endif()
         string(APPEND SQUIRREL_EXPORT "\n")
 
         # Enum values
         set(MLEN 0)
         foreach(ENUM_VALUE IN LISTS ENUM_VALUES)
             string(LENGTH "${ENUM_VALUE}" LEN)
-            if (MLEN LESS LEN)
+            if(MLEN LESS LEN)
                 set(MLEN ${LEN})
-            endif (MLEN LESS LEN)
-        endforeach(ENUM_VALUE)
+            endif()
+        endforeach()
         foreach(ENUM_VALUE IN LISTS ENUM_VALUES)
             string(LENGTH "${ENUM_VALUE}" LEN)
             math(EXPR LEN "${MLEN} - ${LEN}")
             unset(SPACES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
-            endforeach(i)
+            endforeach()
             string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${ENUM_VALUE},${SPACES}\"${ENUM_VALUE}\");")
-        endforeach(ENUM_VALUE)
-        if (MLEN)
+        endforeach()
+        if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
-        endif (MLEN)
+        endif()
 
         # Const values
         set(MLEN 0)
         foreach(CONST_VALUE IN LISTS CONST_VALUES)
             string(LENGTH "${CONST_VALUE}" LEN)
-            if (MLEN LESS LEN)
+            if(MLEN LESS LEN)
                 set(MLEN ${LEN})
-            endif (MLEN LESS LEN)
-        endforeach(CONST_VALUE)
+            endif()
+        endforeach()
         foreach(CONST_VALUE IN LISTS CONST_VALUES)
             string(LENGTH "${CONST_VALUE}" LEN)
             math(EXPR LEN "${MLEN} - ${LEN}")
             unset(SPACES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
-            endforeach(i)
+            endforeach()
             string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQConst(engine, ${CLS}::${CONST_VALUE},${SPACES}\"${CONST_VALUE}\");")
-        endforeach(CONST_VALUE)
-        if (MLEN)
+        endforeach()
+        if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
-        endif (MLEN)
+        endif()
 
         # Mapping of OTTD strings to errors
         set(MLEN 0)
@@ -399,10 +399,10 @@ foreach(LINE IN LISTS SOURCE_LINES)
             string(REPLACE ":" ";" ENUM_STRING_TO_ERROR "${ENUM_STRING_TO_ERROR}")
             list(GET ENUM_STRING_TO_ERROR 0 ENUM_STRING)
             string(LENGTH "${ENUM_STRING}" LEN)
-            if (MLEN LESS LEN)
+            if(MLEN LESS LEN)
                 set(MLEN ${LEN})
-            endif (MLEN LESS LEN)
-        endforeach(ENUM_STRING_TO_ERROR)
+            endif()
+        endforeach()
         foreach(ENUM_STRING_TO_ERROR IN LISTS ENUM_STRING_TO_ERRORS)
             string(REPLACE ":" ";" ENUM_STRING_TO_ERROR "${ENUM_STRING_TO_ERROR}")
             list(GET ENUM_STRING_TO_ERROR 0 ENUM_STRING)
@@ -412,33 +412,33 @@ foreach(LINE IN LISTS SOURCE_LINES)
             unset(SPACES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
-            endforeach(i)
+            endforeach()
             string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMap(${ENUM_STRING},${SPACES}${CLS}::${ENUM_ERROR});")
-        endforeach(ENUM_STRING_TO_ERROR)
-        if (MLEN)
+        endforeach()
+        if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
-        endif (MLEN)
+        endif()
 
         # Mapping of errors to human 'readable' strings.
         set(MLEN 0)
         foreach(ENUM_ERROR_TO_STRING IN LISTS ENUM_ERROR_TO_STRINGS)
             string(LENGTH "${ENUM_ERROR_TO_STRING}" LEN)
-            if (MLEN LESS LEN)
+            if(MLEN LESS LEN)
                 set(MLEN ${LEN})
-            endif (MLEN LESS LEN)
-        endforeach(ENUM_ERROR_TO_STRING)
+            endif()
+        endforeach()
         foreach(ENUM_ERROR_TO_STRING IN LISTS ENUM_ERROR_TO_STRINGS)
             string(LENGTH "${ENUM_ERROR_TO_STRING}" LEN)
             math(EXPR LEN "${MLEN} - ${LEN}")
             unset(SPACES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
-            endforeach(i)
+            endforeach()
             string(APPEND SQUIRREL_EXPORT "\n	ScriptError::RegisterErrorMapString(${CLS}::${ENUM_ERROR_TO_STRING},${SPACES}\"${ENUM_ERROR_TO_STRING}\");")
-        endforeach(ENUM_ERROR_TO_STRING)
-        if (MLEN)
+        endforeach()
+        if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
-        endif (MLEN)
+        endif()
 
         # Static methods
         set(MLEN 0)
@@ -446,10 +446,10 @@ foreach(LINE IN LISTS SOURCE_LINES)
             string(REPLACE ":" ";" STATIC_METHOD "${STATIC_METHOD}")
             list(GET STATIC_METHOD 0 FUNCNAME)
             string(LENGTH "${FUNCNAME}" LEN)
-            if (MLEN LESS LEN)
+            if(MLEN LESS LEN)
                 set(MLEN ${LEN})
-            endif (MLEN LESS LEN)
-        endforeach(STATIC_METHOD)
+            endif()
+        endforeach()
         foreach(STATIC_METHOD IN LISTS STATIC_METHODS)
             string(REPLACE ":" ";" STATIC_METHOD "${STATIC_METHOD}")
             list(GET STATIC_METHOD 0 FUNCNAME)
@@ -457,26 +457,26 @@ foreach(LINE IN LISTS SOURCE_LINES)
             list(GET STATIC_METHOD 2 TYPES)
             string(LENGTH "${FUNCNAME}" LEN)
             math(EXPR LEN "${MLEN} - ${LEN}")
-            if ("${TYPES}" STREQUAL "v")
-                if (LEN GREATER 8)
+            if("${TYPES}" STREQUAL "v")
+                if(LEN GREATER 8)
                     math(EXPR LEN "${LEN} - 8")
-                else (LEN GREATER 8)
+                else()
                     set(LEN 0)
-                endif (LEN GREATER 8)
-            endif ("${TYPES}" STREQUAL "v")
+                endif()
+            endif()
             unset(SPACES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
-            endforeach(i)
-            if ("${TYPES}" STREQUAL "v")
+            endforeach()
+            if("${TYPES}" STREQUAL "v")
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
-            else ("${TYPES}" STREQUAL "v")
+            else()
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQStaticMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}${ARGC}, \"${TYPES}\");")
-            endif ("${TYPES}" STREQUAL "v")
-        endforeach(STATIC_METHOD)
-        if (MLEN)
+            endif()
+        endforeach()
+        if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
-        endif (MLEN)
+        endif()
 
         # Non-static methods
         set(MLEN 0)
@@ -484,10 +484,10 @@ foreach(LINE IN LISTS SOURCE_LINES)
             string(REPLACE ":" ";" METHOD "${METHOD}")
             list(GET METHOD 0 FUNCNAME)
             string(LENGTH "${FUNCNAME}" LEN)
-            if (MLEN LESS LEN)
+            if(MLEN LESS LEN)
                 set(MLEN ${LEN})
-            endif (MLEN LESS LEN)
-        endforeach(METHOD)
+            endif()
+        endforeach()
         foreach(METHOD IN LISTS METHODS)
             string(REPLACE ":" ";" METHOD "${METHOD}")
             list(GET METHOD 0 FUNCNAME)
@@ -495,26 +495,26 @@ foreach(LINE IN LISTS SOURCE_LINES)
             list(GET METHOD 2 TYPES)
             string(LENGTH "${FUNCNAME}" LEN)
             math(EXPR LEN "${MLEN} - ${LEN}")
-            if ("${TYPES}" STREQUAL "v")
-                if (LEN GREATER 8)
+            if("${TYPES}" STREQUAL "v")
+                if(LEN GREATER 8)
                     math(EXPR LEN "${LEN} - 8")
-                else (LEN GREATER 8)
+                else()
                     set(LEN 0)
-                endif (LEN GREATER 8)
-            endif ("${TYPES}" STREQUAL "v")
+                endif()
+            endif()
             unset(SPACES)
             foreach(i RANGE ${LEN})
                 string(APPEND SPACES " ")
-            endforeach(i)
-            if ("${TYPES}" STREQUAL "v")
+            endforeach()
+            if("${TYPES}" STREQUAL "v")
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQAdvancedMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\");")
-            else ("${TYPES}" STREQUAL "v")
+            else()
                 string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.DefSQMethod(engine, &${CLS}::${FUNCNAME},${SPACES}\"${FUNCNAME}\",${SPACES}${ARGC}, \"${TYPES}\");")
-            endif ("${TYPES}" STREQUAL "v")
-        endforeach(METHOD)
-        if (MLEN)
+            endif()
+        endforeach()
+        if(MLEN)
             string(APPEND SQUIRREL_EXPORT "\n")
-        endif (MLEN)
+        endif()
 
         string(APPEND SQUIRREL_EXPORT "\n	SQ${API_CLS}.PostRegister(engine);")
         string(APPEND SQUIRREL_EXPORT "\n}")
@@ -522,64 +522,64 @@ foreach(LINE IN LISTS SOURCE_LINES)
         reset_reader()
 
         continue()
-    endif ("${LINE}" MATCHES "^([ 	]*)$")
+    endif()
 
     # Skip non-public functions
-    if (NOT IS_PUBLIC)
+    if(NOT IS_PUBLIC)
         continue()
-    endif (NOT IS_PUBLIC)
+    endif()
 
     # Add enums
-    if (IN_ENUM)
+    if(IN_ENUM)
         string(REGEX MATCH "([^,	 ]+)" ENUM_VALUE "${LINE}")
         list(APPEND ENUM_VALUES "${ENUM_VALUE}")
 
         # Check if this a special error enum
         list(GET ENUMS -1 ENUM)
-        if ("${ENUM}" MATCHES ".*::ErrorMessages")
+        if("${ENUM}" MATCHES ".*::ErrorMessages")
             # syntax:
             # enum ErrorMessages {
             #	ERR_SOME_ERROR,	// [STR_ITEM1, STR_ITEM2, ...]
             # }
 
             # Set the mappings
-            if ("${LINE}" MATCHES "\\[(.*)\\]")
+            if("${LINE}" MATCHES "\\[(.*)\\]")
                 string(REGEX REPLACE "[ 	]" "" MAPPINGS "${CMAKE_MATCH_1}")
                 string(REPLACE "," ";" MAPPINGS "${MAPPINGS}")
 
                 foreach(MAPPING IN LISTS MAPPINGS)
                     list(APPEND ENUM_STRING_TO_ERRORS "${MAPPING}:${ENUM_VALUE}")
-                endforeach(MAPPING)
+                endforeach()
 
                 list(APPEND ENUM_ERROR_TO_STRINGS "${ENUM_VALUE}")
-            endif ("${LINE}" MATCHES "\\[(.*)\\]")
-        endif ("${ENUM}" MATCHES ".*::ErrorMessages")
+            endif()
+        endif()
         continue()
-    endif (IN_ENUM)
+    endif()
 
     # Add a const (non-enum) value
-    if ("${LINE}" MATCHES "^[ 	]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    if("${LINE}" MATCHES "^[ 	]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
         list(APPEND CONST_VALUES "${CMAKE_MATCH_1}")
         continue()
-    endif ("${LINE}" MATCHES "^[ 	]*static const [^ ]+ ([^ ]+) = -?\\(?[^ ]*\\)?[^ ]+;")
+    endif()
 
     # Add a method to the list
-    if ("${LINE}" MATCHES "^.*\\(.*\\).*$")
-        if (NOT CLS_LEVEL EQUAL 1)
+    if("${LINE}" MATCHES "^.*\\(.*\\).*$")
+        if(NOT CLS_LEVEL EQUAL 1)
             continue()
-        endif (NOT CLS_LEVEL EQUAL 1)
-        if ("${LINE}" MATCHES "~")
-            if (DEFINED API_SELECTED)
+        endif()
+        if("${LINE}" MATCHES "~")
+            if(DEFINED API_SELECTED)
                 message(WARNING "Destructor for '${CLS}' has @api. Tag ignored.")
                 unset(API_SELECTED)
-            endif (DEFINED API_SELECTED)
+            endif()
             continue()
-        endif ("${LINE}" MATCHES "~")
+        endif()
 
         unset(IS_STATIC)
-        if ("${LINE}" MATCHES "static")
+        if("${LINE}" MATCHES "static")
             set(IS_STATIC TRUE)
-        endif ("${LINE}" MATCHES "static")
+        endif()
 
         string(REGEX REPLACE "(virtual|static|const)[ 	]+" "" LINE "${LINE}")
         string(REGEX REPLACE "{.*" "" LINE "${LINE}")
@@ -593,75 +593,75 @@ foreach(LINE IN LISTS SOURCE_LINES)
         string(REGEX MATCH "([^ 	]+)( ([^ ]+))?" RESULT "${LINE}")
         set(FUNCTYPE "${CMAKE_MATCH_1}")
         set(FUNCNAME "${CMAKE_MATCH_3}")
-        if ("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
-            if (DEFINED API_SELECTED)
+        if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
+            if(DEFINED API_SELECTED)
                 message(WARNING "Constructor for '${CLS}' has @api. Tag ignored.")
                 unset(API_SELECTED)
-            endif (DEFINED API_SELECTED)
+            endif()
             set(CLS_PARAM_0 "${PARAM_S}")
-            if (NOT PARAM_S)
+            if(NOT PARAM_S)
                 continue()
-            endif (NOT PARAM_S)
-        elseif (NOT FUNCNAME)
+            endif()
+        elseif(NOT FUNCNAME)
             continue()
-		endif ()
+		endif()
 
         string(REPLACE "," ";" PARAMS "${PARAM_S}")
-        if (IS_STATIC)
+        if(IS_STATIC)
             set(TYPES ".")
-        else (IS_STATIC)
+        else()
             set(TYPES "x")
-        endif (IS_STATIC)
+        endif()
 
         set(LEN 1)
         foreach(PARAM IN LISTS PARAMS)
             math(EXPR LEN "${LEN} + 1")
             string(STRIP "${PARAM}" PARAM)
-            if ("${PARAM}" MATCHES "\\*|&")
-                if ("${PARAM}" MATCHES "^char")
+            if("${PARAM}" MATCHES "\\*|&")
+                if("${PARAM}" MATCHES "^char")
                     # Many types can be converted to string, so use '.', not 's'. (handled by our glue code)
                     string(APPEND TYPES ".")
-                elseif ("${PARAM}" MATCHES "^void")
+                elseif("${PARAM}" MATCHES "^void")
                     string(APPEND TYPES "p")
-                elseif ("${PARAM}" MATCHES "^Array")
+                elseif("${PARAM}" MATCHES "^Array")
                     string(APPEND TYPES "a")
-                elseif ("${PARAM}" MATCHES "^struct Array")
+                elseif("${PARAM}" MATCHES "^struct Array")
                     string(APPEND TYPES "a")
-                elseif ("${PARAM}" MATCHES "^Text")
+                elseif("${PARAM}" MATCHES "^Text")
                     string(APPEND TYPES ".")
-                else ()
+                else()
                     string(APPEND TYPES "x")
-                endif ()
-            elseif ("${PARAM}" MATCHES "^bool")
+                endif()
+            elseif("${PARAM}" MATCHES "^bool")
                 string(APPEND TYPES "b")
-            elseif ("${PARAM}" MATCHES "^HSQUIRRELVM")
+            elseif("${PARAM}" MATCHES "^HSQUIRRELVM")
                 set(TYPES "v")
-            else ()
+            else()
                 string(APPEND TYPES "i")
-            endif ()
-        endforeach(PARAM)
+            endif()
+        endforeach()
 
         # Check if we want to publish this function
-        if (NOT DEFINED API_SELECTED)
+        if(NOT DEFINED API_SELECTED)
             set(API_SELECTED ${CLS_IN_API})
-        endif (NOT DEFINED API_SELECTED)
-        if (NOT API_SELECTED)
+        endif()
+        if(NOT API_SELECTED)
             unset(API_SELECTED)
             continue()
-        endif (NOT API_SELECTED)
+        endif()
         unset(API_SELECTED)
 
-        if ("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
+        if("${FUNCTYPE}" STREQUAL "${CLS}" AND NOT FUNCNAME)
             set(CLS_PARAM_1 ${LEN})
             set(CLS_PARAM_2 "${TYPES}")
-        elseif ("${FUNCNAME}" MATCHES "^_" AND NOT "${TYPES}" STREQUAL "v")
-        elseif (IS_STATIC)
+        elseif("${FUNCNAME}" MATCHES "^_" AND NOT "${TYPES}" STREQUAL "v")
+        elseif(IS_STATIC)
             list(APPEND STATIC_METHODS "${FUNCNAME}:${LEN}:${TYPES}")
-        else ()
+        else()
             list(APPEND METHODS "${FUNCNAME}:${LEN}:${TYPES}")
-        endif ()
+        endif()
         continue()
-    endif ("${LINE}" MATCHES "^.*\\(.*\\).*$")
-endforeach(LINE)
+    endif()
+endforeach()
 
 configure_file(${SCRIPT_API_SOURCE_FILE} ${SCRIPT_API_BINARY_FILE})
diff --git a/cmake/scripts/SquirrelIncludes.cmake b/cmake/scripts/SquirrelIncludes.cmake
index d6d8b8ec3e..e64e2d25af 100644
--- a/cmake/scripts/SquirrelIncludes.cmake
+++ b/cmake/scripts/SquirrelIncludes.cmake
@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.5)
 
-if (NOT INCLUDES_SOURCE_FILE)
+if(NOT INCLUDES_SOURCE_FILE)
     message(FATAL_ERROR "Script needs INCLUDES_SOURCE_FILE defined")
-endif (NOT INCLUDES_SOURCE_FILE)
-if (NOT INCLUDES_BINARY_FILE)
+endif()
+if(NOT INCLUDES_BINARY_FILE)
     message(FATAL_ERROR "Script needs INCLUDES_BINARY_FILE defined")
-endif (NOT INCLUDES_BINARY_FILE)
-if (NOT APILC)
+endif()
+if(NOT APILC)
     message(FATAL_ERROR "Script needs APILC defined")
-endif (NOT APILC)
-if (NOT APIUC)
+endif()
+if(NOT APIUC)
     message(FATAL_ERROR "Script needs APIUC defined")
-endif (NOT APIUC)
+endif()
 
 set(ARGC 1)
 set(ARG_READ NO)
@@ -21,32 +21,32 @@ set(ARG_READ NO)
 while(ARGC LESS CMAKE_ARGC)
     set(ARG ${CMAKE_ARGV${ARGC}})
 
-    if (ARG_READ)
+    if(ARG_READ)
         list(APPEND SCRIPT_API_BINARY_FILES "${ARG}")
-    endif (ARG_READ)
+    endif()
 
-    if (ARG STREQUAL "--")
+    if(ARG STREQUAL "--")
         set(ARG_READ YES)
-    endif (ARG STREQUAL "--")
+    endif()
 
     math(EXPR ARGC "${ARGC} + 1")
 endwhile()
 
 foreach(FILE IN LISTS SCRIPT_API_BINARY_FILES)
     file(STRINGS "${FILE}" LINES REGEX "^void SQ${APIUC}.*_Register\\(Squirrel \\*engine\\)$")
-    if (LINES)
+    if(LINES)
         string(REGEX REPLACE ".*api/${APILC}/(.*)" "#include \"\\1\"" FILE "${FILE}")
         list(APPEND SQUIRREL_INCLUDES "${FILE}")
         foreach(LINE IN LISTS LINES)
-            if ("${LINE}" MATCHES "SQ${APIUC}(List|Controller)_Register")
+            if("${LINE}" MATCHES "SQ${APIUC}(List|Controller)_Register")
                 continue()
-            endif ("${LINE}" MATCHES "SQ${APIUC}(List|Controller)_Register")
+            endif()
             string(REGEX REPLACE "^.*void " "	" LINE "${LINE}")
             string(REGEX REPLACE "Squirrel \\*" "" LINE "${LINE}")
             list(APPEND SQUIRREL_REGISTER "${LINE}")
-        endforeach(LINE)
-    endif (LINES)
-endforeach(FILE)
+        endforeach()
+    endif()
+endforeach()
 
 list(SORT SQUIRREL_INCLUDES)
 string(REPLACE ";" "\n" SQUIRREL_INCLUDES "${SQUIRREL_INCLUDES}")
diff --git a/media/baseset/CMakeLists.txt b/media/baseset/CMakeLists.txt
index c3fe34ce4e..48aa443a5b 100644
--- a/media/baseset/CMakeLists.txt
+++ b/media/baseset/CMakeLists.txt
@@ -20,13 +20,13 @@ set(BASESET_OTHER_SOURCE_FILES
 )
 
 # Done by the subdirectories, if nforenum / grfcodec is installed
-if (GRFCODEC_FOUND)
+if(GRFCODEC_FOUND)
     set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/openttd.grf PROPERTIES GENERATED TRUE)
     set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/orig_extra.grf PROPERTIES GENERATED TRUE)
 
     list(APPEND BASESET_BINARY_FILES openttd.grf)
     list(APPEND BASESET_BINARY_FILES orig_extra.grf)
-endif (GRFCODEC_FOUND)
+endif()
 
 set(BASESET_EXTRAGRF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/orig_extra.grf)
 
@@ -54,7 +54,7 @@ foreach(BASESET_SOURCE_FILE IN LISTS BASESET_SOURCE_FILES)
     )
 
     list(APPEND BASESET_BINARY_FILES ${BASESET_BINARY_FILE})
-endforeach(BASESET_SOURCE_FILE)
+endforeach()
 
 # Walk over all the other baseset files, and generate a command to copy them
 foreach(BASESET_OTHER_SOURCE_FILE IN LISTS BASESET_OTHER_SOURCE_FILES)
@@ -70,7 +70,7 @@ foreach(BASESET_OTHER_SOURCE_FILE IN LISTS BASESET_OTHER_SOURCE_FILES)
     )
 
     list(APPEND BASESET_BINARY_FILES ${BASESET_OTHER_BINARY_FILE})
-endforeach(BASESET_OTHER_SOURCE_FILE)
+endforeach()
 
 # Create a new target which generates all baseset metadata files
 add_custom_target_timestamp(baseset_files
diff --git a/media/baseset/openttd/CMakeLists.txt b/media/baseset/openttd/CMakeLists.txt
index c4f8d61ade..5a98b73f5c 100644
--- a/media/baseset/openttd/CMakeLists.txt
+++ b/media/baseset/openttd/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This is mainly because not many people have both of these tools installed,
 # so it is cheaper to cache them in git, and only regenerate when you are
 # working on it / have the tools installed.
-if (GRFCODEC_FOUND)
+if(GRFCODEC_FOUND)
     include(CreateGrfCommand)
     create_grf_command()
-endif (GRFCODEC_FOUND)
+endif()
diff --git a/media/baseset/orig_extra/CMakeLists.txt b/media/baseset/orig_extra/CMakeLists.txt
index 36a25329f5..f71d8d4b49 100644
--- a/media/baseset/orig_extra/CMakeLists.txt
+++ b/media/baseset/orig_extra/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This is mainly because not many people have both of these tools installed,
 # so it is cheaper to cache them in git, and only regenerate when you are
 # working on it / have the tools installed.
-if (GRFCODEC_FOUND)
+if(GRFCODEC_FOUND)
     include(CreateGrfCommand)
     create_grf_command(
         # We share some files with 'openttd' grf
@@ -11,4 +11,4 @@ if (GRFCODEC_FOUND)
         ${CMAKE_CURRENT_SOURCE_DIR}/../openttd/canals.png
         ${CMAKE_CURRENT_SOURCE_DIR}/../openttd/chars.png
     )
-endif (GRFCODEC_FOUND)
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0ccf650abf..0a0ac406a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,11 +24,11 @@ add_files(
     viewport_sprite_sorter_sse4.cpp
     CONDITION SSE_FOUND
 )
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set_compile_flags(
         viewport_sprite_sorter_sse4.cpp
         COMPILE_FLAGS -msse4.1)
-endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+endif()
 
 add_files(
     aircraft.h
diff --git a/src/blitter/CMakeLists.txt b/src/blitter/CMakeLists.txt
index 2abe6aec0e..0aff381413 100644
--- a/src/blitter/CMakeLists.txt
+++ b/src/blitter/CMakeLists.txt
@@ -32,7 +32,7 @@ add_files(
     CONDITION NOT OPTION_DEDICATED AND SSE_FOUND
 )
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     set_compile_flags(
         32bpp_anim_sse2.cpp
         32bpp_sse2.cpp
@@ -44,7 +44,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clan
         32bpp_anim_sse4.cpp
         32bpp_sse4.cpp
         COMPILE_FLAGS -msse4.1)
-endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+endif()
 
 add_files(
     base.hpp
diff --git a/src/lang/CMakeLists.txt b/src/lang/CMakeLists.txt
index 00b554126f..d9243b5311 100644
--- a/src/lang/CMakeLists.txt
+++ b/src/lang/CMakeLists.txt
@@ -78,7 +78,7 @@ foreach(LANG_SOURCE_FILE IN LISTS LANG_SOURCE_FILES)
     )
 
     list(APPEND LANG_BINARY_FILES ${LANG_BINARY_FILE})
-endforeach(LANG_SOURCE_FILE)
+endforeach()
 
 # Create a new target which compiles all language files
 add_custom_target(language_files
diff --git a/src/music/CMakeLists.txt b/src/music/CMakeLists.txt
index 0ae15fde26..b20f8aaf7c 100644
--- a/src/music/CMakeLists.txt
+++ b/src/music/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT OPTION_DEDICATED)
+if(NOT OPTION_DEDICATED)
     add_files(
         allegro_m.cpp
         allegro_m.h
@@ -42,7 +42,7 @@ if (NOT OPTION_DEDICATED)
         os2_m.h
         CONDITION OPTION_OS2
     )
-endif (NOT OPTION_DEDICATED)
+endif()
 
 add_files(
     midi.h
diff --git a/src/script/api/CMakeLists.txt b/src/script/api/CMakeLists.txt
index c228679282..e294cfd05c 100644
--- a/src/script/api/CMakeLists.txt
+++ b/src/script/api/CMakeLists.txt
@@ -8,7 +8,7 @@ foreach(ENUM IN LISTS ENUM_LINES)
     string(REGEX REPLACE ".* ([^ @]+)@.*" "\\1" FILE_PATTERN "${ENUM}")
     file(GLOB FILENAMES "${FILE_PATTERN}")
     list(APPEND DEPENDENCIES ${FILENAMES})
-endforeach(ENUM)
+endforeach()
 list(REMOVE_DUPLICATES DEPENDENCIES)
 
 # Add a command to generate script_window.hpp
@@ -40,9 +40,9 @@ foreach(API "ai;AI" "game;GS" "template;Template")
     list(GET API 1 APIUC)
 
     foreach(SCRIPT_API_FILE IN LISTS SCRIPT_API_FILES)
-        if ("${SCRIPT_API_FILE}" MATCHES ".*script_controller.*")
+        if("${SCRIPT_API_FILE}" MATCHES ".*script_controller.*")
             continue()
-        endif ("${SCRIPT_API_FILE}" MATCHES ".*script_controller.*")
+        endif()
         get_filename_component(SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE}" NAME)
         string(REPLACE "script_" "${APILC}_" SCRIPT_API_FILE_NAME "${SCRIPT_API_FILE_NAME}")
         set(SCRIPT_API_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${SCRIPT_API_FILE_NAME}.sq")
@@ -62,7 +62,7 @@ foreach(API "ai;AI" "game;GS" "template;Template")
                 COMMENT "Generating ${APILC}/${SCRIPT_API_FILE_NAME}.sq"
         )
         list(APPEND SCRIPT_${APIUC}_BINARY_FILES ${SCRIPT_API_BINARY_FILE})
-    endforeach(SCRIPT_API_FILE)
+    endforeach()
 
     add_custom_target_timestamp(script_${APILC}
             DEPENDS
@@ -72,7 +72,7 @@ foreach(API "ai;AI" "game;GS" "template;Template")
             script_window
     )
 
-    if (NOT "${APILC}" STREQUAL "template")
+    if(NOT "${APILC}" STREQUAL "template")
         list(APPEND SCRIPT_${APIUC}_BINARY_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${APILC}/${APILC}_controller.hpp.sq")
         set(INCLUDES_BINARY_FILE "${CMAKE_BINARY_DIR}/generated/script/api/${APILC}/${APILC}_includes.hpp")
         add_custom_command_timestamp(OUTPUT ${INCLUDES_BINARY_FILE}
@@ -100,11 +100,11 @@ foreach(API "ai;AI" "game;GS" "template;Template")
         add_dependencies(script_api
                 script_${APILC}_includes
         )
-    else (NOT "${APILC}" STREQUAL "template")
+    else()
         add_dependencies(script_api
                 script_${APILC}
         )
-    endif (NOT "${APILC}" STREQUAL "template")
+    endif()
 
     target_include_directories(script_api
             INTERFACE
@@ -112,7 +112,7 @@ foreach(API "ai;AI" "game;GS" "template;Template")
             ${CMAKE_BINARY_DIR}/generated/script/api/${APILC}
             ${CMAKE_CURRENT_SOURCE_DIR}/${APILC}
     )
-endforeach(API)
+endforeach()
 
 add_library(openttd::script_api ALIAS script_api)
 
diff --git a/src/sound/CMakeLists.txt b/src/sound/CMakeLists.txt
index 24a38e409f..bff33deda3 100644
--- a/src/sound/CMakeLists.txt
+++ b/src/sound/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (NOT OPTION_DEDICATED)
+if(NOT OPTION_DEDICATED)
     add_files(
         allegro_s.cpp
         allegro_s.h
@@ -34,7 +34,7 @@ if (NOT OPTION_DEDICATED)
         xaudio2_s.h
         CONDITION WIN32 AND XAUDIO2_FOUND
     )
-endif (NOT OPTION_DEDICATED)
+endif()
 
 add_files(
     sound_driver.hpp
diff --git a/src/video/CMakeLists.txt b/src/video/CMakeLists.txt
index c6251e9391..a5d862e9b6 100644
--- a/src/video/CMakeLists.txt
+++ b/src/video/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(cocoa)
 
-if (NOT OPTION_DEDICATED)
+if(NOT OPTION_DEDICATED)
     add_files(
         allegro_v.cpp
         allegro_v.h
@@ -24,7 +24,7 @@ if (NOT OPTION_DEDICATED)
         win32_v.h
         CONDITION WIN32
     )
-endif (NOT OPTION_DEDICATED)
+endif()
 
 add_files(
     dedicated_v.cpp

From 49b75d67bd3b13016d06f884bb66c14063d3f722 Mon Sep 17 00:00:00 2001
From: stormcone <48624099+stormcone@users.noreply.github.com>
Date: Fri, 25 Sep 2020 16:35:48 +0200
Subject: [PATCH 07/31] Fix 70f9c3c6: The *_filter_criteria variables contain
 an index, not a cargo. (#8320)

---
 src/industry_gui.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 87fa97d3b5..a795b6a0ed 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -1254,14 +1254,14 @@ protected:
 
 	CargoID cargo_filter[NUM_CARGO + 2];        ///< Available cargo filters; CargoID or CF_ANY or CF_NONE
 	StringID cargo_filter_texts[NUM_CARGO + 3]; ///< Texts for filter_cargo, terminated by INVALID_STRING_ID
-	CargoID produced_cargo_filter_criteria;     ///< Selected produced cargo filter
-	CargoID accepted_cargo_filter_criteria;     ///< Selected accepted cargo filter
+	byte produced_cargo_filter_criteria;        ///< Selected produced cargo filter index
+	byte accepted_cargo_filter_criteria;        ///< Selected accepted cargo filter index
 
 	/**
 	 * Set cargo filter list item index.
 	 * @param index The index of the cargo to be set
 	 */
-	void SetProducedCargoFilterIndex(int index)
+	void SetProducedCargoFilterIndex(byte index)
 	{
 		if (this->produced_cargo_filter_criteria != index) {
 			this->produced_cargo_filter_criteria = index;
@@ -1278,7 +1278,7 @@ protected:
 	 * Set cargo filter list item index.
 	 * @param index The index of the cargo to be set
 	 */
-	void SetAcceptedCargoFilterIndex(int index)
+	void SetAcceptedCargoFilterIndex(byte index)
 	{
 		if (this->accepted_cargo_filter_criteria != index) {
 			this->accepted_cargo_filter_criteria = index;
@@ -1296,7 +1296,7 @@ protected:
 	 */
 	void SetCargoFilterArray()
 	{
-		uint filter_items = 0;
+		byte filter_items = 0;
 
 		/* Add item for disabling filtering. */
 		this->cargo_filter[filter_items] = CF_ANY;

From 933d02dce217d13074e189284bb1b3654b9186ac Mon Sep 17 00:00:00 2001
From: Galigator <Galigator@users.noreply.github.com>
Date: Fri, 25 Sep 2020 09:26:37 +0200
Subject: [PATCH 08/31] Change: Service depot also reset breakdown chance.

---
 src/vehicle.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index a458b1c650..3ed7cb1b00 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -170,6 +170,7 @@ void VehicleServiceInDepot(Vehicle *v)
 		v->reliability = v->GetEngine()->reliability;
 		/* Prevent vehicles from breaking down directly after exiting the depot. */
 		v->breakdown_chance /= 4;
+		if (_settings_game.difficulty.vehicle_breakdowns == 1) v->breakdown_chance = 0; // on reduced breakdown
 		v = v->Next();
 	} while (v != nullptr && v->HasEngineType());
 }

From 85ca1c535e0d22a19a9a2157f0269f3a84c14059 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Thu, 24 Sep 2020 17:48:03 +0100
Subject: [PATCH 09/31] Codechange: Set CMAKE_BUILD_TYPE to default to debug if
 not otherwise set

---
 CMakeLists.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fd8fbc880..2c7131df08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,11 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds not allowed. Please run \"cmake ..\" from the bin directory")
 endif()
 
+# Debug mode by default.
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Debug)
+endif()
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
 

From d58531ec8465178d34e7ea872cb056a148590778 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Sat, 26 Sep 2020 10:12:43 +0000
Subject: [PATCH 10/31] Update: Translations from eints german: 1 change by
 frosch123

---
 src/lang/german.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lang/german.txt b/src/lang/german.txt
index 26062c4fb1..38b74869e6 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -3491,6 +3491,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Fahrzeug
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Schiff kaufen
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Flugzeug kaufen
 
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Schiff kaufen und umrüsten
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Angewähltes Fahrzeug kaufen. Shift+Klick zeigt einen Kostenvoranschlag
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Ausgewähltes Fahrzeug kaufen. Shift+Klick zeigt einen Kostenvoranschlag

From 4279620aef3008e414bbac856810fc4d7c29794e Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Sat, 26 Sep 2020 17:51:50 +0000
Subject: [PATCH 11/31] Update: Translations from eints turkish: 28 changes by
 nullaf dutch: 1 change by rcpaul

---
 src/lang/dutch.txt   |  2 +-
 src/lang/turkish.txt | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 3d4a0f7d12..c1e3acc5d7 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1304,7 +1304,7 @@ STR_CONFIG_SETTING_ERRMSG_DURATION_HELPTEXT                     :Duur voor het w
 STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE                        :{COMMA} seconde{P 0 "" n}
 STR_CONFIG_SETTING_HOVER_DELAY                                  :Knopinfo weergeven: {STRING}
 STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT                         :Vertraging voordat knopinfo worden weergegeven wanneer je de muis boven een besturingselement houdt. Wanneer de waarde 0 is, wordt knopinfo aan de rechtermuisknop gebonden.
-STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :Muis stilhouden gedurende {COMMA} seconde{P 0 "" n}
+STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :Muis stilhouden gedurende {COMMA} milliseconde{P 0 "" n}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Rechtsklik
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Inwoneraantal bij stad weergeven: {STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Aantal inwoners van een stad weergeven bij naam op de kaart
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 8193f2970e..d8a3b3528d 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -236,6 +236,8 @@ STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Süzme k
 STR_BUTTON_SORT_BY                                              :{BLACK}Sırala
 STR_BUTTON_LOCATION                                             :{BLACK}Göster
 STR_BUTTON_RENAME                                               :{BLACK}Yeni ad
+STR_BUTTON_CATCHMENT                                            :{BLACK}Kapsama alanı
+STR_TOOLTIP_CATCHMENT                                           :{BLACK}Kapsama alanını göstermeyi aç/kapa
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Pencereyi kapat
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Pencere başlığı - pencereyi hareket ettirmek için sürükle
@@ -357,6 +359,7 @@ STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Peyzaj y
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Şehir yapımı
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Fabrika yapımı
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Yol yapımı
+STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION                          :{BLACK} Tramvay yapımı
 STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Ağaç dik. Shift ile tıklama maliyet tahminini gösterir
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Tabela koy
 STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Nesneyi yerleştirin. Shift ile tıklama maliyet tahminini gösterir
@@ -927,6 +930,8 @@ STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gürcistan Lari
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :İran Riyali (IRR)
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Yeni Rus Rublesi (RUB)
 STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksika Pezosu (MXN)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Yeni Tayvan Doları (NTD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Hindistan Rupisi (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Karayolu taşıtları
@@ -993,6 +998,7 @@ STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :Arayüz boyutun
 
 STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normal
 STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Yazı iki kat büyük
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Dört kat büyük
 
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Temel grafik kümesi
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kullanılacak temel grafik kümesini seçin
@@ -1535,6 +1541,7 @@ STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :Yüzeysel ekono
 STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT                      :Etkinleştirildiğinde, endüstri üretim miktarı daha sık ve daha küçük adımlarla değişir. Eğer endüstriler bir NewGRF dosyası tarafından sağlanıyorsa bu özellik genellikle etkisiz kalır
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Diğer şirketlerin hisseleri alınabilsin: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Etkinleştirildiğinde, şirketlerin hisse senetlerinin alınıp satılması mümkün olur. Hisse senetleri sadece belli bir yaşa ulaşan şirketler için geçerlidir
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT                :Bir şirketin hisselerinin satılabileceği ve diğer şirketlerin alabileceği minimum şirket yaşını belirleyin.
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :Besleme sistemlerinde, bölümlerden elde edilen kardan ödenecek yüzde: {STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :Besleme sistemlerinde, sistemi oluşturan ara bölümlere verilen kar yüzdesi. Böylece kar miktarı üzerinde daha fazla kontrol elde edilmiş olur
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :Fare sürüklendiğinde sinyal yerleştirme sıklığı: {STRING}
@@ -1575,6 +1582,7 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :Bu seçeneği e
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Yasak
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :İzin verildi
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :İzin verildi, özel kasaba yerleşimi
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Şehrin genel nüfusuna oranla, şehirlerdeki evler tarafından ne kadar kargo üretiliyor.{}Üstel büyüme: İki katı büyüklükteki bir şehir dört katı büyüklükte yolcuya sahip olur.{}Lineer büyüme: İki katı büyüklükteki bir şehir iki katı büyüklükte yolcuya sahip olur.
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Oyunda ağaç dikme: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Oyundaki rastgele ağaçların görünümünü kontrol eder. Bu, ağaçların büyümesine bağımlı olan endüstrileri etkileyebilir, örneğin keresteciler gibi
@@ -2417,6 +2425,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Tünel Y
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Tramvay tüneli yap. Shift ile tıklama maliyet tahminini gösterir
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Yol yap/sil arasında geçiş yap
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Tramvay yapımı/yıkımı
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Yol türünü Dönüştür/Geliştir. Shift ile tıklama maliyet tahminini gösterir
 
 
 # Road depot construction window
@@ -2602,6 +2611,8 @@ STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF:
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}İstenen: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 STR_LANG_AREA_INFORMATION_RAIL_TYPE                             :{BLACK}Ray türü: {LTBLUE}{STRING}
+STR_LANG_AREA_INFORMATION_ROAD_TYPE                             :{BLACK}Yol türü: {LTBLUE}{STRING}
+STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Tramvay tipi: {LTBLUE}{STRING}
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Ray hız sınırı: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Yol hız sınırı: {LTBLUE}{VELOCITY}
 
@@ -2720,6 +2731,8 @@ STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL}
 STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} kare/s
 STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} kare/s
 STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} kare/s
+STR_FRAMERATE_BYTES_GOOD                                        :{LTBLUE}{BYTES}
+STR_FRAMERATE_BYTES_WARN                                        :{YELLOW}{BYTES}
 STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
 STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 ############ Leave those lines in this order!!
@@ -2750,6 +2763,7 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Grafik işleme
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Dünya görüş alanı derleme
 STR_FRAMETIME_CAPTION_VIDEO                                     :Video çıkışı
 STR_FRAMETIME_CAPTION_SOUND                                     :Ses karıştırma
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Oyun betiği
 ############ End of leave-in-this-order
 
 
@@ -3080,6 +3094,7 @@ STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :İsim değişti
 
 # Town local authority window
 STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}{TOWN} belediyesi
+STR_LOCAL_AUTHORITY_ZONE_TOOLTIP                                :{BLACK}Bölgeyi yerel yönetim sınırları içinde göster
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Taşıma şirketi değerlendirmeleri:
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Yapılabilecekler:
@@ -3349,6 +3364,9 @@ STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Fabrikal
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Hiçbiri -
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
 STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Fabrika adları - görüntüyü fabrikada merkezlemek için adına tıklayın. Ctrl ile tıklama fabrikanın konumunu gösteren yeni bir pencere açar
+STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER                    :{BLACK}Üretilmiş kargo: {SILVER}{STRING}
+STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES                         :Tüm kargo tipleri
+STR_INDUSTRY_DIRECTORY_FILTER_NONE                              :Hiçbiri
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -3442,6 +3460,7 @@ STR_BUY_VEHICLE_TRAIN_MONORAIL_CAPTION                          :Yeni Monoray
 STR_BUY_VEHICLE_TRAIN_MAGLEV_CAPTION                            :Yeni Maglev
 
 STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION                            :Yeni Karayolu Araçları
+STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION                            :Yeni Tramvay Araçları
 
 ############ range for vehicle availability starts
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Trenler
@@ -3450,6 +3469,7 @@ STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Yeni Hava Arac
 ############ range for vehicle availability ends
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Fiyat: {GOLD}{CURRENCY_LONG}{BLACK} Ağırlık: {GOLD}{WEIGHT_SHORT}
+STR_PURCHASE_INFO_COST_REFIT_WEIGHT                             :{BLACK}Maliyet: {GOLD}{CURRENCY_LONG}{BLACK} (Tamir maliyeti: {GOLD}{CURRENCY_LONG}{BLACK}) Ağırlık: {GOLD}{WEIGHT_SHORT}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hız: {GOLD}{VELOCITY}{BLACK} Güç: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Hız: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}Okyanus hızı: {GOLD}{VELOCITY}
@@ -3462,6 +3482,7 @@ STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Aza. Gü
 STR_PURCHASE_INFO_COST                                          :{BLACK}Fiyat: {GOLD}{CURRENCY_LONG}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Ağırlık: {GOLD}{WEIGHT_SHORT} ({WEIGHT_SHORT})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Fiyat: {GOLD}{CURRENCY_LONG}{BLACK} Hız: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_COST_REFIT_SPEED                              :{BLACK}Maliyet: {GOLD}{CURRENCY_LONG}{BLACK} (Tamir maliyeti: {GOLD}{CURRENCY_LONG}{BLACK}) Hız: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasite: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Güç Veren Vagonlar: {GOLD}+{POWER}{BLACK} Ağırlık: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Dönüştürülebildiği kargolar: {GOLD}{STRING}
@@ -3488,6 +3509,9 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}İşaret
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Seçili gemiyi satın al. Shift ile tıklama satın almadan tahmini maliyeti gösterir
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Seçili uçağı satın al. Shift ile tıklama satın almadan tahmini maliyeti gösterir
 
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP          :{BLACK}Seçili karayolu aracını satın alın. Shift ile tıklama satın almadan tahmini maliyeti gösterir
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}Seçili gemiyi satın al. Shift ile tıklama satın almadan tahmini maliyeti gösterir
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}Seçili uçağı satın al. Shift ile tıklama satın almanın tahmini maliyetini gösterir
 
 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Yeni isim
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}İsim
@@ -3644,6 +3668,7 @@ STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Lokomoti
 STR_REPLACE_ENGINES                                             :Lokomotifler
 STR_REPLACE_WAGONS                                              :Vagon
 STR_REPLACE_ALL_RAILTYPE                                        :Tüm demiryolu araçları
+STR_REPLACE_ALL_ROADTYPE                                        :Tüm karayolu araçları
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Lokomatiflerini değiştireceğiniz ray türünü seçin
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Soldaki değiştiriliyorsa neyle değiştirildiğini göster
@@ -4103,6 +4128,7 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vurgulan
 STR_AI_LIST_CANCEL                                              :{BLACK}İptal
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Betiği değiştirme
 
+STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Tüm haritanın ekran görüntüsünü al
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parametreler
@@ -4395,6 +4421,7 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Yol bura
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Tramvay kaldırılamaz...
 STR_ERROR_THERE_IS_NO_ROAD                                      :{WHITE}... karayolu yok
 STR_ERROR_THERE_IS_NO_TRAMWAY                                   :{WHITE}... tramvay yolu yok
+STR_ERROR_NO_SUITABLE_ROAD                                      :{WHITE} Uygun yol yok
 
 # Waterway construction errors
 STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Buraya kanal yapılamaz...
@@ -4447,6 +4474,7 @@ STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Grup olu
 STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Bu grup silinemiyor...
 STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Grubun ismi değiştirilemiyor...
 STR_ERROR_GROUP_CAN_T_SET_PARENT                                :{WHITE}Üst grup ayarlanamıyor...
+STR_ERROR_GROUP_CAN_T_SET_PARENT_RECURSION                      :{WHITE}Grup hiyerarşisinde döngülere izin verilmez
 STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Bu gruptaki bütün araçlar çıkartılamıyor...
 STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Araç bu gruba eklenemiyor...
 STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Paylaşılan araçlar bu gruba eklenemiyor...

From 5584bf6bbb87f022528615fc9dc2bc3f998989e4 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Sun, 27 Sep 2020 17:51:48 +0000
Subject: [PATCH 12/31] Update: Translations from eints portuguese (brazilian):
 22 changes by Lucas559-noob polish: 6 changes by pAter-exe

---
 src/lang/brazilian_portuguese.txt | 23 ++++++++++++++++++++++-
 src/lang/polish.txt               | 12 ++++++------
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index fc27d76282..eaaaae0c8f 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -188,6 +188,7 @@ STR_COLOUR_ORANGE                                               :Laranja
 STR_COLOUR_BROWN                                                :Marrom
 STR_COLOUR_GREY                                                 :Cinza
 STR_COLOUR_WHITE                                                :Branco
+STR_COLOUR_RANDOM                                               :Aleatório
 
 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mph
@@ -857,6 +858,7 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLAC
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nov{G o a} {STRING} já está disponível!  -  {ENGINE}
 
+STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Abrir a janela do grupo focado no grupo do veículo
 
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} não aceita mais {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} não aceita mais {STRING} ou {STRING}
@@ -923,6 +925,8 @@ STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Personalizado..
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari da Georgia
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniano
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novo Rublo Russo (RUB)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso Mexicano (MXN)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dollar de Hong Kong  (HKD)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Automóveis
@@ -985,6 +989,7 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dobro
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quádruplo
 
+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Tamanho da fonte
 
 
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos base
@@ -1464,6 +1469,7 @@ STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :Permitir IA em
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT                   :Permite jogadores controlados pelo computador participar em jogos multijogador
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :#opcodes antes de scripts serem suspensos: {STRING}
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT                  :Número máximo de passos de computação que um script pode tomar em um turno
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT                   :Quanta memória um único script pode consumir antes de ser encerrado à força. Isso pode precisar ser aumentado para mapas grandes.
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Os intervalos de serviço são em percentagem: {STRING}
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Define se a manutenção de veículos é ativada pelo tempo passado desde a última manutenção ou quando a confiabilidade alcança um certo valor
@@ -1566,6 +1572,7 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :Se ativado, per
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Proibido
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Permitido
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Permitido, layout de cidades customizável
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :Quadrático (original)
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Posicionamento de árvores: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Controla o nascimento aleatório de árvores durante o jogo. Isso pode afetar indústrias que dependem do crescimento de árvores, como serrarias
@@ -2240,7 +2247,7 @@ STR_CONTENT_TYPE_AI_LIBRARY                                     :Biblioteca de I
 STR_CONTENT_TYPE_SCENARIO                                       :Cenário
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa topográfico
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :Sons padrão
-STR_CONTENT_TYPE_BASE_MUSIC                                     :Músicsas padrão
+STR_CONTENT_TYPE_BASE_MUSIC                                     :Músicas padrão
 STR_CONTENT_TYPE_GAME_SCRIPT                                    :Script do jogo
 STR_CONTENT_TYPE_GS_LIBRARY                                     :Biblioteca de GS's
 
@@ -2591,6 +2598,7 @@ STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF:
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceita: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 STR_LANG_AREA_INFORMATION_RAIL_TYPE                             :{BLACK}Tipo de ferrovia: {LTBLUE}{STRING}
+STR_LANG_AREA_INFORMATION_ROAD_TYPE                             :{BLACK}Tipo de estrada: {LTBLUE}{STRING}
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Velocidade limite do trilho: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Limite de velocidade da rua: {LTBLUE}{VELOCITY}
 
@@ -2759,6 +2767,7 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Detalhes
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Nenhuma informação disponível
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Tem certeza de que deseja substituir o arquivo existente?
 
 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Coloque o nome para o jogo salvo
 
@@ -3082,6 +3091,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Suborna
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Objetivos
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Objetivos globais
+STR_GOALS_SPECTATOR                                             :Objetivos Globais
 STR_GOALS_GLOBAL_TITLE                                          :{G=m}{BLACK}Objetivos globais:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{G=m}{ORANGE}- Nenhum -
@@ -3321,6 +3331,7 @@ STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Indústr
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Nenhum -
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
 STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomes das indústrias - clique no nome para centralizar a visçao principal na indústria. Ctrl+Clique abre uma nova janela na localização da indústria
+STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER                    :{BLACK}Carga aceita: {SILVER}{STRING}
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -3410,9 +3421,11 @@ STR_BUY_VEHICLE_TRAIN_MONORAIL_CAPTION                          :Nova Locomotiva
 STR_BUY_VEHICLE_TRAIN_MAGLEV_CAPTION                            :Nova Locomotiva Maglev
 
 STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION                            :Novos Automóveis
+STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION                            :Novo Veículo Elétrico
 
 ############ range for vehicle availability starts
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Trens
+STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION                        :Novo Veículo Terrestre
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :Novas Embarcações
 STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Nova Aeronave
 ############ range for vehicle availability ends
@@ -3449,12 +3462,15 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Comprar
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Comprar Embarcação
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Comprar Aeronave
 
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Comprar e Repor Navio
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Compra o veículo ferroviário selecionado. Shift+Clique mostra preço estimado sem a compra
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Compra o veículo selecionado. Shift+Clique mostra preço estimado sem a compra
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Compra a embarcação selecionada. Shift+Clique mostra preço estimado sem a compra
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Compra a aeronave selecionada. Shift+Clique mostra o preço estimado sem a compra
 
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Compre e troque o trem destacado. Shift+Click mostra os custos estimados sem comprar
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :Compre e reponha o navio em destaque. Shift+Clique mostra o custo estimado sem comprar
 
 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Renomear
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Renomear
@@ -3619,6 +3635,7 @@ STR_REPLACE_ELRAIL_VEHICLES                                     :Locomotivas El
 STR_REPLACE_MONORAIL_VEHICLES                                   :Monotrilho
 STR_REPLACE_MAGLEV_VEHICLES                                     :Maglevs
 
+STR_REPLACE_ROAD_VEHICLES                                       :Veículos terrestres
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Remoção de vagões: {ORANGE}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Faz autosubstituição manter o tamanho do trem removendo vagões (começando pela frente), se ao substituir a locomotiva o trem ficar maior
@@ -4069,6 +4086,9 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecion
 STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar o script
 
+STR_SCREENSHOT_CAPTION                                          :{WHITE}Tirar uma captura de tela
+STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Zoom máximo na captura de tela
+STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Captura de tela do mapa todo
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parâmetros
@@ -4342,6 +4362,7 @@ STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Tipo de
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Remova a ferrovia antes
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Rua é mão única ou está bloqueada
 STR_ERROR_CROSSING_DISALLOWED_RAIL                              :{WHITE}Cruzamentos de nível não são permitidos para esse tipo de trilho
+STR_ERROR_CROSSING_DISALLOWED_ROAD                              :{WHITE}Passagens de nível não permitidas para este tipo de estrada
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Impossível construir sinais aqui...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Impossível construir ferrovia aqui...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Impossível remover a ferrovia daqui...
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index bcbfd24967..f84ac2af2d 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -857,7 +857,7 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Przełącz konsolę
 STR_ABOUT_MENU_AI_DEBUG                                         :Debugowanie SI / Game Script
 STR_ABOUT_MENU_SCREENSHOT                                       :Zrzut ekranu
-STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Pokaż ilość klatek na sekundę
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Pokaż liczbę klatek na sekundę
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Info o 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Wyrównywanie sprite'ów
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Włącz/wyłącz ramki
@@ -3120,7 +3120,7 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-{STRING} Zespół OpenTTD
 
 # Framerate display window
-STR_FRAMERATE_CAPTION                                           :{WHITE}Ilość klatek na sekundę
+STR_FRAMERATE_CAPTION                                           :{WHITE}Liczba klatek na sekundę
 STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
 STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Tempo symulacji: {STRING}
 STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Liczba ticków gry symulowanych na sekundę.
@@ -4293,7 +4293,7 @@ STR_ORDERS_END_OF_ORDERS                                        :- - Koniec pole
 STR_ORDERS_END_OF_SHARED_ORDERS                                 :- - Koniec współdzielonych poleceń - -
 
 # Order bottom buttons
-STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
+STR_ORDER_NON_STOP                                              :{BLACK}Bezpośrednio
 STR_ORDER_GO_TO                                                 :Idź do
 STR_ORDER_GO_NON_STOP_TO                                        :Idź bezpośrednio do
 STR_ORDER_GO_VIA                                                :Idź przez
@@ -4304,7 +4304,7 @@ STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Pełny z
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Załaduj jeśli dostępne
 STR_ORDER_DROP_FULL_LOAD_ALL                                    :Pełny załadunek wszystkiego
 STR_ORDER_DROP_FULL_LOAD_ANY                                    :Pełny załadunek któregoś z towarów
-STR_ORDER_DROP_NO_LOADING                                       :Nie ładować
+STR_ORDER_DROP_NO_LOADING                                       :Nie ładuj
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Zmień sposób załadunku w podświetlonym poleceniu
 
 STR_ORDER_TOGGLE_UNLOAD                                         :{BLACK}Rozładuj i załaduj
@@ -4375,7 +4375,7 @@ STR_ORDER_GO_TO_WAYPOINT                                        :Idź przez {WAY
 STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Idź bezpośrednio poprzez {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Serwisuj w
-STR_ORDER_SERVICE_NON_STOP_AT                                   :Serwisuj non-stop w
+STR_ORDER_SERVICE_NON_STOP_AT                                   :Serwisuj bezpośrednio w
 
 STR_ORDER_NEAREST_DEPOT                                         :najbliższego
 STR_ORDER_NEAREST_HANGAR                                        :najbliższego hangaru
@@ -4395,7 +4395,7 @@ STR_ORDER_IMPLICIT                                              :(sugerowany)
 
 STR_ORDER_FULL_LOAD                                             :(Pełny załadunek)
 STR_ORDER_FULL_LOAD_ANY                                         :(Pełny załadunek dowolnego towaru)
-STR_ORDER_NO_LOAD                                               :(Nie ładować)
+STR_ORDER_NO_LOAD                                               :(Nie ładuj)
 STR_ORDER_UNLOAD                                                :(Rozładuj i zabierz ładunek)
 STR_ORDER_UNLOAD_FULL_LOAD                                      :(Rozładuj i czekaj na pełny załadunek)
 STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Rozładuj i czekaj na pełny załadunek któregoś z towarów)

From d9b0e6c550c25b4d02c254f3fb5d85ce39e55aa0 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Mon, 28 Sep 2020 17:52:03 +0000
Subject: [PATCH 13/31] Update: Translations from eints romanian: 7 changes by
 ALEX11BR portuguese (brazilian): 44 changes by Lucas559-noob

---
 src/lang/brazilian_portuguese.txt | 45 ++++++++++++++++++++++++++++++-
 src/lang/romanian.txt             |  7 +++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index eaaaae0c8f..49a1b301c9 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -235,6 +235,8 @@ STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selecion
 STR_BUTTON_SORT_BY                                              :{BLACK}Classificar por
 STR_BUTTON_LOCATION                                             :{BLACK}Local
 STR_BUTTON_RENAME                                               :{BLACK}Renomear
+STR_BUTTON_CATCHMENT                                            :{BLACK}Cobertura
+STR_TOOLTIP_CATCHMENT                                           :{BLACK}Alternar a visão da área de cobertura
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fechar janela
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título da janela - arraste isto para mover a janela
@@ -263,6 +265,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Ao ativa
 STR_BUTTON_DEFAULT                                              :{BLACK}Padrão
 STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
 STR_BUTTON_OK                                                   :{BLACK}OK
+STR_WARNING_PASSWORD_SECURITY                                   :{YELLOW}Aviso: os administradores do servidor podem ler qualquer texto inserido aqui.
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -336,6 +339,7 @@ STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Ampliar
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Reduzir a visão
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Construir linha ferroviária
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Construir rodovias
+STR_TOOLBAR_TOOLTIP_BUILD_TRAMWAYS                              :{BLACK}Construir bondes
 STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Construir docas
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Construir aeroportos
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Abrir a barra de paisagismo para elevar ou abaixar terreno, plantar árvores, etc.
@@ -464,6 +468,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Som/música
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Última mensagem/notícia
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Histórico de Mensagens
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Apagar todas as mensagens
 ############ range ends here
 
 ############ range for about menu starts
@@ -926,7 +931,10 @@ STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari da Georgia
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniano
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novo Rublo Russo (RUB)
 STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso Mexicano (MXN)
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dollar de Hong Kong  (HKD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Novo dólar de Taiwan (NTD)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi chinês (CNY)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dólar de Hong Kong (HKD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Rúpia Indiana (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Automóveis
@@ -991,6 +999,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quádruplo
 
 STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Tamanho da fonte
 
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Tamanho duplo
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Tamanho quádruplo
 
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecionar o conjunto de gráficos base para usar
@@ -1174,6 +1184,7 @@ STR_CONFIG_SETTING_AUTOSLOPE                                    :Permitir paisag
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Permite paisagismo sob edifícios e vias sem precisar removê-las
 STR_CONFIG_SETTING_CATCHMENT                                    :Dimensionamento mais realista das áreas de abrangência: {STRING}
 STR_CONFIG_SETTING_CATCHMENT_HELPTEXT                           :Exibe áreas de abrangência de para diferentes tipos de estações e aeroportos
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :Quando habilitado, os setores com estações conectadas (como plataformas de petróleo) também podem ser atendidos por estações de propriedade da empresa construídas nas proximidades. Quando desativados, esses setores só podem ser atendidos por suas estações anexas. Qualquer estação próxima da empresa não será capaz de atendê-los, nem a estação anexa servirá qualquer outra coisa que não seja a indústria
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :Permitir a remoção de mais rodovias, pontes, etc. das cidades: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT                       :Torna mais fácil remover infraestrutura e edifícios de cidades
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :Tamanho máximo de trens: {STRING}
@@ -1259,6 +1270,7 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Impossí
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Manutenção de Infraestrutura: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Quando ativado, infraestrutura gera custos de manutenção. O custo aumenta proporcionalmente à malha de transportes, afetando companhias maiores mais do que as menores
 
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :Escolha a cor inicial para a empresa
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Aeroportos nunca saem de linha: {STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :Ativando essa config. mantém todos os tipos de aeroportos disponíveis à construção após sua introdução
@@ -1293,6 +1305,7 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Exibir populaç
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Exibe a população das cidades nos nomes, no mapa
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Espessura das linhas nos gráficos: {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Espessura da linha nos gráficos. Linhas finas são mais precisas, enquanto linhas grossas são mais fáceis de distinguir.
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT                    :Adicione uma linha à janela de construção do veículo, mostrando de qual NewGRF o veículo selecionado vem.
 
 STR_CONFIG_SETTING_LANDSCAPE                                    :Terreno: {STRING}
 STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :O terreno define a jogabilidade básica com diferentes cargas e requerimentos para o crescimento das cidades. NewGRF's e Scripts de Jogo permitem um controle mais fino
@@ -1528,6 +1541,8 @@ STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :Completa
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :Noticias coloridas aparecem em: {STRING}
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :Ano a partir do qual os jornais são impressos em cor. Antes disso, serão em preto-e-branco
 STR_CONFIG_SETTING_STARTING_YEAR                                :Data de início: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Ano em que o jogo termina para fins de pontuação. No final deste ano, a pontuação da empresa é registrada e a tela de pontuação máxima é exibida, mas os jogadores podem continuar jogando depois disso.{} Se isso for antes do ano inicial, a tela de pontuação máxima nunca será exibida.
+STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Nunca
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :Ativar economia regular (alterações menores): {STRING}
 STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT                      :Quando ativado, a produção de indústrias muda com mais frequência, e mais sutilmente
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Permite comprar ações de outras empresas: {STRING}
@@ -1572,6 +1587,7 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :Se ativado, per
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Proibido
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :Permitido
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :Permitido, layout de cidades customizável
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Quanta carga é produzida pelas casas nas cidades, em relação à população geral da cidade.{} Crescimento quadrático: uma cidade com o dobro do tamanho gera quatro vezes mais passageiros.{} Crescimento linear: uma cidade com o dobro do tamanho gera o dobro da quantidade de passageiros.
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :Quadrático (original)
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Posicionamento de árvores: {STRING}
@@ -1814,6 +1830,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Mudar an
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING}
 
 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} - Esquema de cores
 
 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Exibir esquemas de cor gerais
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Exibe esquemas de cor de trens
@@ -2073,6 +2090,7 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desconec
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor está protegido. Digite a senha
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa está protegida. Digite a senha
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Lista de clientes
 
 # Network company list added strings
 STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
@@ -2413,7 +2431,10 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Construi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Construir túnel de bonde. Shift altera construção/preço estimado
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Alternar construir/remover para contrução rodoviária
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Alternar construir/remover linhas de bonde e sinais
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Converter/atualizar o tipo de estrada. Shift altera construção/exibição de estimativa de custo
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Converter/Melhorar o tipo de bonde. Shift troca construção/amostra custo estimado
 
+STR_ROAD_NAME_TRAM                                              :Bonde
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientação da Garagem
@@ -2710,6 +2731,7 @@ STR_FRAMERATE_SPEED_FACTOR                                      :{WHITE}Fator de
 STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Quão rápido o jogo está sendo executado, comparado com a velocidade esperada na simulação normal
 STR_FRAMERATE_CURRENT                                           :{WHITE}Atual
 STR_FRAMERATE_AVERAGE                                           :{WHITE}Médio
+STR_FRAMERATE_MEMORYUSE                                         :{WHITE}Memória
 STR_FRAMERATE_DATA_POINTS                                       :{WHITE}Dados baseados em {COMMA} medidas
 STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL}{WHITE} ms
 STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL}{WHITE} ms
@@ -2726,12 +2748,15 @@ STR_FRAMERATE_GL_ROADVEHS                                       :{WHITE}  Tiques
 STR_FRAMERATE_GL_SHIPS                                          :{WHITE}  Tiques de embarcação:
 STR_FRAMERATE_GL_AIRCRAFT                                       :{WHITE}  Tiques de aeronave:
 STR_FRAMERATE_GL_LANDSCAPE                                      :{WHITE}  Tiques do mundo:
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}  Atraso no gráfico de link:
 STR_FRAMERATE_DRAWING                                           :{WHITE}Renderizações de gráficos:
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{WHITE}  Visualizações do mundo:
 STR_FRAMERATE_VIDEO                                             :{WHITE}Saída de vídeo:
 STR_FRAMERATE_SOUND                                             :{WHITE}Mixagem de áudio:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK} Script do jogo:
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Loop de jogo
 STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Manuseio de carga
 STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Tiques de trem
 STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Tiques de automóveis
@@ -2767,6 +2792,7 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Detalhes
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Nenhuma informação disponível
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Substituir ficheiro
 STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Tem certeza de que deseja substituir o arquivo existente?
 
 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Coloque o nome para o jogo salvo
@@ -2885,6 +2911,7 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Versão:
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Mín. versão compatível: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}SomaMD5 (verf. de segurança): {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Padrão (D)
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parâmetros: {SILVER}{STRING}
 
 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Sem informação disponível
@@ -2997,6 +3024,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}O NewGRF
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informação de carga/readaptação para '{1:ENGINE}' difere da lista de aquisição após a construção. Isso pode causar a autorenovação/-substituição à falhar a readaptação corretamente.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' causou um loop infinito no callback da produção
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Retorno {1:HEX} retornou um resultado desconhecido/inválido {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' retornou tipo de carga inválido no retorno de chamada de produção em {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<carga inválida>
@@ -3332,6 +3360,8 @@ STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Nenhu
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
 STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomes das indústrias - clique no nome para centralizar a visçao principal na indústria. Ctrl+Clique abre uma nova janela na localização da indústria
 STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER                    :{BLACK}Carga aceita: {SILVER}{STRING}
+STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES                         :Todos os tipos de carga
+STR_INDUSTRY_DIRECTORY_FILTER_NONE                              :Nenhum
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -3399,6 +3429,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupos -
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Clique para criar um grupo
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Remove o grupo selecionado
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renomeia o grupo selecionado
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Alterar a pintura do grupo selecionado
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Clique para excluir esse grupo da substituição automática
 
 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Remover grupo
@@ -3447,6 +3478,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacida
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Adaptável para: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Todos as cargas
+STR_PURCHASE_INFO_NONE                                          :Nenhum
 STR_PURCHASE_INFO_ALL_BUT                                       :Todas menos {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Tração máx : {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Alcance: {GOLD}{COMMA} quadrados
@@ -3462,7 +3494,9 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Comprar
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Comprar Embarcação
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Comprar Aeronave
 
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON           :{BLACK}Comprar e Trocar Veículos
 STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Comprar e Repor Navio
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Comprar e reequipar aeronaves
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Compra o veículo ferroviário selecionado. Shift+Clique mostra preço estimado sem a compra
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Compra o veículo selecionado. Shift+Clique mostra preço estimado sem a compra
@@ -3471,6 +3505,7 @@ STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Compra a
 
 STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Compre e troque o trem destacado. Shift+Click mostra os custos estimados sem comprar
 STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :Compre e reponha o navio em destaque. Shift+Clique mostra o custo estimado sem comprar
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}Comprar e repor a aeronave destacada. Shift+Clique mostra o custo estimado sem comprar
 
 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Renomear
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Renomear
@@ -3582,6 +3617,7 @@ STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Mensagem
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Projetamos um novo {STRING} - estaria interessado em um ano de exclusividade do uso deste veículo, de modo a que possamos avaliar a sua performance antes de o disponibilizar para todos ?
 
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :locomotiva ferroviária
+STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE                            :locomotiva ferroviária eletrificada
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotiva monotrilho
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotiva maglev
 
@@ -3856,6 +3892,7 @@ STR_ORDER_CONDITIONAL_AGE                                       :Idade (anos)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Necessita de manutenção
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Sempre
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Tempo de vida restante (anos)
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Confiabilidade máxima
 
 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Como comprarar os dados do veículo com o valor fornecido
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :é igual a
@@ -4087,8 +4124,10 @@ STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar o script
 
 STR_SCREENSHOT_CAPTION                                          :{WHITE}Tirar uma captura de tela
+STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captura de tela normal
 STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Zoom máximo na captura de tela
 STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Captura de tela do mapa todo
+STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captura de tela do minimapa
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parâmetros
@@ -4382,6 +4421,10 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Impossí
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Impossível remover bonde daqui...
 STR_ERROR_THERE_IS_NO_ROAD                                      :{WHITE}...não há rodovias
 STR_ERROR_THERE_IS_NO_TRAMWAY                                   :{WHITE}...não há linha de bonde
+STR_ERROR_CAN_T_CONVERT_ROAD                                    :{WHITE}Não é possível converter o tipo de estrada aqui ...
+STR_ERROR_NO_SUITABLE_ROAD                                      :{WHITE}Sem estrada adequada
+STR_ERROR_NO_SUITABLE_TRAMWAY                                   :{WHITE}Nenhum bonde adequado
+STR_ERROR_INCOMPATIBLE_TRAMWAY                                  :{WHITE}... bonde incompatível
 
 # Waterway construction errors
 STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Impossível construir canais aqui...
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 2842dd4fec..8be8b275ed 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -187,6 +187,7 @@ STR_COLOUR_ORANGE                                               :Portocaliu
 STR_COLOUR_BROWN                                                :Maro
 STR_COLOUR_GREY                                                 :Gri
 STR_COLOUR_WHITE                                                :Alb
+STR_COLOUR_DEFAULT                                              :Prestabilit
 
 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mph
@@ -233,6 +234,7 @@ STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Alegeți
 STR_BUTTON_SORT_BY                                              :{BLACK}Ordonează
 STR_BUTTON_LOCATION                                             :{BLACK}Locație
 STR_BUTTON_RENAME                                               :{BLACK}Nume nou
+STR_BUTTON_CATCHMENT                                            :Arie de acoperire
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Închide fereastra
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titlul ferestrei - trage de aici pentru a muta fereastra
@@ -1444,6 +1446,7 @@ STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :Permite Intelig
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT                   :Permite ca jucătorii controlați de AI să participe în jocuri multiplayer
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :Număr opcodes înainte de suspendarea scripturilor: {STRING}
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT                  :Numărul maxim de instrucțiuni pe care un script le poate executa pe parcursul unei ture
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE                      :{COMMA} MiB
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Intervaluri de service în procente: {STRING}
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Alege dacă întreținerea vehiculelor este activată de trecerea unei anumite perioade de timp, sau scăzând un anumit procent din gradul de rezistență al vehiculului
@@ -1647,6 +1650,7 @@ STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Câmpur
 STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Construcţie
 STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Știri / Consilieri
 STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Companie
+STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Contabilitate
 STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Vehicule
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Direcţionare
 STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Dezastre / Accidente
@@ -2554,6 +2558,7 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME                      :{BLACK}Numele d
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Încărcături acceptate: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
+STR_LANG_AREA_INFORMATION_RAIL_TYPE                             :{BLACK}Tip șină: {LTBLUE}{STRING}
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Limită viteză pe calea ferată: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Viteza limită a drumului: {LTBLUE}{VELOCITY}
 
@@ -2664,6 +2669,7 @@ STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COM
 STR_FRAMERATE_VIDEO                                             :{BLACK}Ieșire video:
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Manipularea încărcăturilor
 ############ End of leave-in-this-order
 
 
@@ -4434,6 +4440,7 @@ STR_BASESOUNDS_WIN_DESCRIPTION                                  :Setul de sunete
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :Un set de sunete fără nici un sunet inclus.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Setul de muzică original al Transport Tycoon Deluxe pentru Windows.
 STR_BASEMUSIC_DOS_DESCRIPTION                                   :Setul de muzică original al Transport Tycoon Deluxe pentru DOS.
+STR_BASEMUSIC_TTO_DESCRIPTION                                   :Setul de muzică original al Transport (Original/World Editor) pentru DOS.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Un set de muzică fără muzică inclusă.
 
 ##id 0x2000

From bdaf596373b62fc6443d70dac8939f2638bff8c9 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Wed, 30 Sep 2020 17:52:14 +0000
Subject: [PATCH 14/31] Update: Translations from eints german: 1 change by
 matthiasradde polish: 17 changes by yazalo

---
 src/lang/german.txt |  1 +
 src/lang/polish.txt | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/lang/german.txt b/src/lang/german.txt
index 38b74869e6..80e8ffa7a7 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -3450,6 +3450,7 @@ STR_BUY_VEHICLE_TRAIN_MONORAIL_CAPTION                          :Neue Einschiene
 STR_BUY_VEHICLE_TRAIN_MAGLEV_CAPTION                            :Neue Magnetbahnfahrzeuge
 
 STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION                            :Neue Fahrzeuge
+STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION                            :Neue Straßenbahnen
 
 ############ range for vehicle availability starts
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Neue Schienenfahrzeuge
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index f84ac2af2d..cd265afca8 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -1586,11 +1586,11 @@ STR_CONFIG_SETTING_PERCENTAGE                                   :{COMMA}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :Nachylenie stoków dla pojazdów drogowych: {STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT        :Pochylenie pola stoku dla pojazdów drogowych. Wyższa wartość utrudnia podjazd pod górę
 STR_CONFIG_SETTING_FORBID_90_DEG                                :Zabroń pociągom skręcać o 90 stopni: {STRING}
-STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :90-stopniowy zakręt występuje wtedy, gdy bezpośrednio po poziomym odcinku toru występuje odcinek pionowy na sąsiadującym polu zmuszając pociąg do skrętu o 90 stopni pokonując krawędź pola zamiast normalnego, 45-stopniowego skrętu w innych kombinacjach torów.
+STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :90-stopniowy zakręt występuje wtedy, gdy bezpośrednio po poziomym odcinku toru występuje odcinek pionowy (lub na odwrót), zmuszając pociąg do ostrzejszego skrętu (zamiast normalnego, 45-stopniowego skrętu w innych kombinacjach torów)
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :Pozwól na łączenie stacji nie sąsiadujących bezpośrednio: {STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT               :Pozwalaj na dodawanie części stacji nie stykających się ze sobą. Naciśnij Ctrl przed postawieniem nowej części
 STR_CONFIG_SETTING_INFLATION                                    :Inflacja: {STRING}
-STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Włącz inflację w ekonomii, gdzie koszty rosną nieco szybciej niż zapłaty
+STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Włącz lub wyłącz inflację (sytuacja ekonomiczna, w związku z którą koszty rosną nieco szybciej niż zapłaty)
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Maksymalna długość mostu: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :Maksymalna długość budowanych mostów
 STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :Maksymalna wysokość mostu: {STRING}
@@ -1598,7 +1598,7 @@ STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT                   :Maksymalna wyso
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Maksymalna długość tunelu: {STRING}
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH_HELPTEXT                   :Maksymalna długość budowanych tuneli
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :Budowa przedsiębiorstw wydobywczych: {STRING}
-STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT    :Metoda finansowania podstawowego przemysłu. 'żadne' oznacza brak możliwości finansowania czegokolwiek, 'obiecujące' oznacza, że finansowanie jest możliwe, ale konstrukcja pojawi się w losowym miejscu na mapie oraz losowo budowa może zakończyć się porażką, 'jak inne gałęzi przemysłu' oznacza, że przemysł wydobywczy może być budowany tak jak fabryki przetwórcze, w dowolnym miejscu
+STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_HELPTEXT    :Metoda finansowania podstawowych przedsiębiorstw. 'Niedostępna' oznacza brak możliwości finansowania czegokolwiek, 'poszukiwania' oznacza, że finansowanie jest możliwe, ale konstrukcja pojawi się w losowym miejscu na mapie (oraz losowo budowa może zakończyć się porażką), 'jak inne przedsiębiorstwa' oznacza, że przemysł wydobywczy może być budowany tak jak fabryki przetwórcze, w dowolnym miejscu
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :Niedostępna
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :Jak inne przedsiębiorstwa
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Poszukiwania
@@ -1614,7 +1614,7 @@ STR_CONFIG_SETTING_SIGNALSIDE_RIGHT                             :Po prawej
 STR_CONFIG_SETTING_SHOWFINANCES                                 :Pokazuj okno finansów na koniec roku: {STRING}
 STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT                        :Jeśli włączone, to okienko finansowe pokazuje się na zakończenie każdego roku, by ułatwić śledzenie sytuacji finansowej firmy
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :Nowe polecenia są domyślnie 'bez zatrzymywania się': {STRING}
-STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT                  :Normalnie pojazd zatrzyma się na każdej stacji, przez którą przejeżdża. Włączając tę opcję, pojazd przejedzie do swojego celu bez zatrzymywania się. Zwróć uwagę na to, że to ustawienie ma wpływ tylko na nowe rozkazy. Indywidualne rozkazy mogą być ustalane bez względu na wartość tej opcji
+STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT                  :Normalnie pojazd zatrzyma się na każdej stacji, przez którą przejeżdża. Po włączeniu tej opcji, pojazd przejedzie do swojego celu bez zatrzymywania się. Zwróć uwagę na to, że to ustawienie ma wpływ tylko na nowe polecenia. Pojedyncze polecenia mogą być ustalane bez względu na wartość tej opcji
 STR_CONFIG_SETTING_STOP_LOCATION                                :Rozkazy nowego pociągu kończą się domyślnie na {STRING} peronu
 STR_CONFIG_SETTING_STOP_LOCATION_HELPTEXT                       :Miejsce, w którym pociąg domyślnie zatrzyma się na peronie. 'Bliższy koniec' oznacza blisko kierunku przyjazdu, 'środek' oznacza środkową część peronu, a 'daleki koniec' oznacza daleko od kierunku przyjazdu. Zapamiętaj, że to ustawienie określa tylko domyślną wartość dla nowych rozkazów. Wszystkie rozkazy mogą być zmienione, bez względu na wartość ustawienia
 STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :początku
@@ -1647,9 +1647,9 @@ STR_CONFIG_SETTING_PLANE_CRASHES_NONE                           :Brak*
 STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :Zredukowana
 STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :Normalna
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :Pozwól na budowę przystanków przelotowych na drogach miejskich: {STRING}
-STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT                   :Pozwalaj budować przystanki przelotowe na drogach własnościowych miast
-STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :Pozwól na przejazd przez przystanki należące do przeciwników: {STRING}
-STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :Pozwalaj budować przystanki przelotowe na drogach własnościowych innych graczy
+STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD_HELPTEXT                   :Pozwalaj budować przystanki przelotowe na drogach będących własnością miast
+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :Pozwól na budowę przystanków przelotowych na drogach innych firm: {STRING}
+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD_HELPTEXT             :Pozwalaj budować przystanki przelotowe na drogach będących własnością innych graczy
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Zmiana tego ustawienia nie jest możliwa, gdy znajdują się tutaj pojazdy
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Utrzymywanie infrastruktury: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Kiedy włączone, utrzymanie infrastruktury jest naliczane w kosztach. Koszty wzrastają nadproporcjonalnie do rozmiarów sieci połączeń, a więc dotykają bardziej duże niż małe firmy
@@ -1690,8 +1690,8 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Pokaż populacj
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Wyświetlaj populację miast w ich etykietach na mapie
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Grubość linii na wykresie: {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Grubość linii na wykresach. Cienka linia jest dokładniejsza, grubsza linia jest bardziej widoczna a kolory łatwiejsze do odróżnienia
-STR_CONFIG_SETTING_SHOW_NEWGRF_NAME                             :Pokaż nazwę tego NewGRF'a w oknie pojazdu budowlanego: {STRING}
-STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT                    :Dodaj linię do okna pojazdów budowlanych, pokazujących z którego NewGRF wybrany pojazd pochodzi.
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME                             :Pokaż nazwę NewGRF'a w oknie budowy pojazdu: {STRING}
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT                    :Dodaj linię do okna budowy pojazdów, pokazujących z którego NewGRF'a wybrany pojazd pochodzi.
 
 STR_CONFIG_SETTING_LANDSCAPE                                    :Krajobraz: {STRING}
 STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Krajobrazy określają podstawowe scenariusze gry, które różnią się przedsiębiorstwami, towarami i wymogami dla rozwoju miast. Pliki NewGRF i skrypty umożliwiają dokładniejszą kontrolę warunków rozgrywki
@@ -1752,8 +1752,8 @@ STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Wygładź przes
 STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Zdecyduj, jak główny widok przesuwa się do konkretnej lokacji, gdy klikasz na mini-mapie lub gdy używasz komendy do przesunięcia do danego obiektu na mapie. Kiedy włączone, widok przesuwa się płynnie, kiedy wyłączone, następuje skok bezpośrednio do wybranego miejsca
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :Pokaż dymek z pomiarem podczas używania różnych narzędzi: {STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT                     :Wyświetlaj długość budowanych odcinków i różnicę wysokości przy przeciąganiu w trakcie operacji budowlanych
-STR_CONFIG_SETTING_LIVERIES                                     :Pokaż barwy firm wg typu pojazdu: {STRING}
-STR_CONFIG_SETTING_LIVERIES_HELPTEXT                            :Kontrolka stosowania schematu kolorów pojazdów specyficznych dla typów pojazdów (w przeciwieństwie do specyfiki firmy)
+STR_CONFIG_SETTING_LIVERIES                                     :Pokaż barwy pojazdów wg grup: {STRING}
+STR_CONFIG_SETTING_LIVERIES_HELPTEXT                            :Wyłączenie tego ustawienia powoduje, że jeśli gracz ustawił, oprócz koloru firmy, różne kolory dla różnych grup pojazdów, kolory te nie są widoczne (pokazywany jest w ich miejscu domyślny kolor firmy)
 STR_CONFIG_SETTING_LIVERIES_NONE                                :brak
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :własnej firmy
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :wszystkich firm
@@ -1794,7 +1794,7 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :Automatycznie włącz pauzę przy rozpoczęciu nowej gry: {STRING}
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME_HELPTEXT                   :Kiedy włączone, gra zostanie automatycznie zatrzymana na samym początku, pozwalając na lepsze rozpoznanie mapy
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :Zezwól w czasie wstrzymania gry na: {STRING}
-STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT                 :Wybierz, jakich akcji można dokonywac, gdy gra jest wstrzymana
+STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT                 :Wybierz, jakich akcji można dokonywać, gdy gra jest wstrzymana (włączona jest pauza)
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :Brak działań
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_CONSTRUCTION     :Wszystkie niezwiązane z konstrukcją
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :Wszystkie oprócz modyfikowania terenu
@@ -1953,12 +1953,12 @@ STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI_HELPTEXT                   :Wyświetlaj okn
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :Domyślny typ sygnalizatorów: {STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE_HELPTEXT                 :Domyślny typ semaforów
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :sygnalizatory blokowe
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :sygnalizatory jazdy
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :sygnalizatory jazdy - jednokierunkowe
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :sygnalizatory trasy
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :sygnalizatory trasy - jednokierunkowe
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :Przełączaj typy sygnalizatorów: {STRING}
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT                  :Wybierz, między jakimi typami semaforów przełączać, po naciśnięciu Ctrl+klik przy budowaniu semaforów
 STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :tylko sygnalizatory blokowe
-STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :tylko sygnalizatory jazdy
+STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :tylko sygnalizatory trasy
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :wszystkie
 
 STR_CONFIG_SETTING_TOWN_LAYOUT                                  :Układ dróg dla nowych miast: {STRING}
@@ -2038,7 +2038,7 @@ STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :"Symetryczna" o
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :Tryb dystrybucji dla poczty: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :"Symetryczna" oznacza, że mniej więcej tyle samo poczty będzie wysłane ze stacji A do stacji B, co z B do A. "Asymetryczna" znaczy, że narzucone ilości poczty mogą być wysłane w obu kierunkach. "Ręczna" oznacza, że nie będzie automatycznej dystrybucji dla poczty.
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :Typ dystrybucji dla CHRONIONEJ klasy towarów: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :CHRONIONA klasa towarów zawiera kosztowności w umiarkowanym, diamenty w tropikalnym lub złoto w arktycznym klimacie. NewGRF-y mogą to zmieniać. "Symetryczna" oznacza, że mniej więcej tyle samo towaru będzie wysłane ze stacji A do stacji B, co z B do A. "Asymetryczna" znaczy, że narzucone ilości towarów mogą być wysłane w obu kierunkach. "Ręczna" oznacza, że nie będzie automatycznej dystrybucji dla tych towarów. Rekomendowane ustawienie to asymetryczne lub ręczne dla klimatu arktycznego, ponieważ banki nie będą wysyłać złota spowrotem do kopalni złota. Dla umiarkowanego i tropikalnego klimatu możesz także wybrać symetryczne, ponieważ banki będą wysyłać kosztowności spowrotem do banku, z którego pochodzi część kosztowności.
+STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :CHRONIONA klasa towarów zawiera kosztowności w umiarkowanym, diamenty w tropikalnym lub złoto w arktycznym klimacie. NewGRF-y mogą to zmieniać. "Symetryczna" oznacza, że mniej więcej tyle samo towaru będzie wysłane ze stacji A do stacji B, co z B do A. "Asymetryczna" znaczy, że narzucone ilości towarów mogą być wysłane w obu kierunkach. "Manualna" oznacza, że nie będzie automatycznej dystrybucji dla tych towarów. Rekomendowane ustawienie to asymetryczne lub ręczne dla klimatu arktycznego, ponieważ banki nie będą wysyłać złota spowrotem do kopalni złota. Dla umiarkowanego i tropikalnego klimatu możesz także wybrać symetryczne, ponieważ banki będą wysyłać kosztowności spowrotem do banku, z którego pochodzi część kosztowności.
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT                         :Tryb dystrybucji dla innych typów ładunku: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :"asymetrycznie" oznacza, że określone ilości ładunków mogą być wysłane w obu kierunkach. "manualnie" oznacza, że dystrybucja nie będzie odbywać się automatycznie.
 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY                           :Dokładność dystrybucji: {STRING}
@@ -2046,7 +2046,7 @@ STR_CONFIG_SETTING_LINKGRAPH_ACCURACY_HELPTEXT                  :Im wyżej ustaw
 STR_CONFIG_SETTING_DEMAND_DISTANCE                              :Wpływ odległości na dystrybucję: {STRING}
 STR_CONFIG_SETTING_DEMAND_DISTANCE_HELPTEXT                     :Jeśli ładunki z jednej stacji trafiają na kilka różnych stacji, na ich dystrybucję wpływ ma odległość. Im wyższą wartość ustawisz, tym bliższe stacje będą preferowane. Zerowa wartość ustawienia sprawi, że odległość nie będzie wpływała na podział dystrybucji.
 STR_CONFIG_SETTING_DEMAND_SIZE                                  :Ilość powracającego ładunku dla trybu symetrycznego: {STRING}
-STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT                         :Ustawiając to na mniej niż 100% powoduje, że symetryczna dystrybucja zachowuje się podobnie do asymetrycznej. Mniej towaru będzie zwróconego jeśli pewna ilość zostanie wysłana do stacji. Jeśli ustawisz to na 0%, to symetryczna dystrybucja zachowuje się jak asymetryczna.
+STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT                         :Ustawienie tego na mniej niż 100% powoduje, że symetryczna dystrybucja zachowuje się podobnie do asymetrycznej. Mniej towaru będzie zwróconego jeśli pewna ilość zostanie wysłana do stacji. Jeśli ustawisz to na 0%, to symetryczna dystrybucja zachowuje się jak asymetryczna.
 STR_CONFIG_SETTING_SHORT_PATH_SATURATION                        :Zapełnienie krótkich tras przed wybraniem tras o dużej przepustowości: {STRING}
 STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT               :Często są różne trasy pomiędzy dwoma stacjami. Cargodist zapełni najpierw najkrótsza trasę, później wykorzystuje kolejną z najkrótszych tras aż ta jest pełna itd. Zapełnienie jest określone przez obliczenie pojemności wraz z planowanym użyciem. Kiedy już wszystkie trasy są zapełnione, a istnieje wciąż zapotrzebowanie, przepełni wszystkie trasy, preferując jednak te z dużą pojemnością.Jednak w większości algorytm oblicza pojemności niedokładnie. Te ustawienia pozwolą Ci sprecyzować, jaki ma być procent zapełnienia krótszych tras zanim zostaną wybrane dłuższe. Ustaw na mniej niż 100% w celu uniknięcia przepełnienia stacji w razie zawyżenia pojemności.
 

From 53f36f4afae2210b508699c043992c17d54b8140 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Thu, 1 Oct 2020 17:52:06 +0000
Subject: [PATCH 15/31] Update: Translations from eints czech: 1 change by
 LubosKolouch german: 18 changes by matthiasradde

---
 src/lang/czech.txt  |  1 +
 src/lang/german.txt | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index 2dfe6c4aef..c00ccfbac6 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -951,6 +951,7 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLAC
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nov{G ý á é í é é á} {STRING} k dispozici!  -  {ENGINE}
 
+STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Otevřít okno skupin s předvybranou skupinou daného vozidla
 
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} už dále nepřijímá {STRING.acc}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} už dále nepřijímá {STRING.acc} ani {STRING.acc}
diff --git a/src/lang/german.txt b/src/lang/german.txt
index 80e8ffa7a7..1599e2b171 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -236,6 +236,8 @@ STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Filterkr
 STR_BUTTON_SORT_BY                                              :{BLACK}Sortieren nach
 STR_BUTTON_LOCATION                                             :{BLACK}Standort
 STR_BUTTON_RENAME                                               :{BLACK}Umbenennen
+STR_BUTTON_CATCHMENT                                            :{BLACK}Einzugsgebiet
+STR_TOOLTIP_CATCHMENT                                           :{BLACK}Anzeige des Einzugsgebietes umschalten
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fenster schließen
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titelleiste klicken und ziehen, um das Fenster zu verschieben
@@ -926,6 +928,10 @@ STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgischer Lar
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranischer Rial (IRR)
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Russische Rubel (RUB)
 STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexikanischer Peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Neuer Taiwan-Dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinesischer Yuan (CNY)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkong-Dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indische Rupie (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Fahrzeuge
@@ -1473,6 +1479,7 @@ STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :Rechenoperation
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT                  :Maximale Anzahl Rechenschritte, die ein Skript in einer Runde zur Verfügung hat
 STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY                            :Maximaler Arbeitsspeicher pro Script: {STRING}
 STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT                   :Wie viel Arbeitsspeicher ein Script maximal benutzen darf bevor es terminiert wird. Diese Wert muss eventuell vergrößert werden für größere Maps.
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE                      :{COMMA} MiB
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Wartungsintervalle in Prozent: {STRING}
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Lege fest, ob Fahrzeuge zur Wartung geschickt werden basierend auf der verstrichenen Zeit seit der letzten Wartung oder dem Absinken der Zuverlässigkeit auf einen gewissen Prozentsatz der maximalen Zuverlässigkeit des Fahrzeugtyps
@@ -2718,6 +2725,7 @@ STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Aktuelle
 STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Wie schnell das Spiel aktuell läuft, verglichen mit der erwarteten Geschwindigkeit bei normaler Simulationsrate.
 STR_FRAMERATE_CURRENT                                           :{WHITE}Momentan
 STR_FRAMERATE_AVERAGE                                           :{WHITE}Durchschnitt
+STR_FRAMERATE_MEMORYUSE                                         :{WHITE}Arbeitsspeicher
 STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Daten basierend auf {COMMA} Messungen
 STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
 STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
@@ -2725,6 +2733,8 @@ STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL}
 STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} Bilder/s
 STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} Bilder/s
 STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} Bilder/s
+STR_FRAMERATE_BYTES_GOOD                                        :{LTBLUE}{BYTES}
+STR_FRAMERATE_BYTES_WARN                                        :{YELLOW}{BYTES}
 STR_FRAMERATE_BYTES_BAD                                         :{RED}{BYTES}
 STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
 STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
@@ -3164,6 +3174,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klick au
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}Chronik für {COMPANY}
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Allgemeine Chronik
+STR_STORY_BOOK_SPECTATOR                                        :Allgemeine Chronik
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Seite {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Springt zur gewünschten Seite, wenn diese im Auswahlmenü angeklickt wird
@@ -3656,6 +3667,7 @@ STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Umschalt
 STR_REPLACE_ENGINES                                             :Schienenfahrzeuge
 STR_REPLACE_WAGONS                                              :Waggons
 STR_REPLACE_ALL_RAILTYPE                                        :Alle Schienenfahrzeuge
+STR_REPLACE_ALL_ROADTYPE                                        :Alle Straßenfahrzeuge
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Gleistyp auswählen, für den Loks ersetzt werden sollen
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Hier wird angezeigt, gegen welches Fahrzeug das auf der linken Seite gewählte ersetzt wird
@@ -4116,6 +4128,9 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Ausgewä
 STR_AI_LIST_CANCEL                                              :{BLACK}Abbrechen
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Skript nicht wechseln
 
+STR_SCREENSHOT_CAPTION                                          :{WHITE}Sreenshot erzeugen
+STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normaler Screenshot
+STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Screenshot des ganzen Spielfeldes
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parameter
@@ -4389,6 +4404,7 @@ STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Keine ge
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Gleise müssen erst abgerissen werden
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Einbahnstraße oder blockierter Weg
 STR_ERROR_CROSSING_DISALLOWED_RAIL                              :{WHITE}Bahnübergänge sind für diesen Schienentyp nicht erlaubt
+STR_ERROR_CROSSING_DISALLOWED_ROAD                              :{WHITE}Bahnübergänge sind für diesen Straßentyp nicht erlaubt
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Signal kann hier nicht aufgestellt werden...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Gleise können hier nicht verlegt werden...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Gleise können nicht abgerissen werden...
@@ -4408,7 +4424,9 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Diese St
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Straßenbahngleise können hier nicht entfernt werden...
 STR_ERROR_THERE_IS_NO_ROAD                                      :{WHITE}...hier ist keine Straße
 STR_ERROR_THERE_IS_NO_TRAMWAY                                   :{WHITE}...hier ist kein Straßenbahngleis
+STR_ERROR_CAN_T_CONVERT_ROAD                                    :{WHITE}Straßentyp kann hier nicht geändert werden...
 STR_ERROR_CAN_T_CONVERT_TRAMWAY                                 :{WHITE}Straßenbahngleistyp kann hier nicht geändert werden...
+STR_ERROR_NO_SUITABLE_TRAMWAY                                   :{WHITE}Keine geeigneten Straßenbahnschienen
 
 # Waterway construction errors
 STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kanal kann hier nicht gebaut werden...

From a0307652f37474cb0bba1143a644e8692b3b23f0 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Fri, 25 Sep 2020 22:41:34 +0100
Subject: [PATCH 16/31] Fix: Work around cmake bug by stripping link target
 strings

---
 cmake/LinkPackage.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmake/LinkPackage.cmake b/cmake/LinkPackage.cmake
index 9977ecc453..0f62d3296c 100644
--- a/cmake/LinkPackage.cmake
+++ b/cmake/LinkPackage.cmake
@@ -4,10 +4,15 @@ function(link_package NAME)
     if(${NAME}_FOUND)
         string(TOUPPER "${NAME}" UCNAME)
         add_definitions(-DWITH_${UCNAME})
+        # Some libraries' cmake packages (looking at you, SDL2) leave trailing whitespace in the link commands,
+        # which (later) cmake considers to be an error. Work around this with by stripping the incoming string.
         if(LP_TARGET AND TARGET ${LP_TARGET})
+            string(STRIP "${LP_TARGET}" LP_TARGET)
             target_link_libraries(openttd ${LP_TARGET})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${LP_TARGET}")
         else()
+            string(STRIP "${${NAME}_LIBRARY}" ${NAME}_LIBRARY)
+            string(STRIP "${${NAME}_LIBRARIES}" ${NAME}_LIBRARIES)
             include_directories(${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR})
             target_link_libraries(openttd ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY})
             message(STATUS "${NAME} found -- -DWITH_${UCNAME} -- ${${NAME}_INCLUDE_DIRS} ${${NAME}_INCLUDE_DIR} -- ${${NAME}_LIBRARIES} ${${NAME}_LIBRARY}")

From 5af98c69e6206379df80f895fb90ff98839e22d1 Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Sat, 5 Oct 2019 22:25:07 +0200
Subject: [PATCH 17/31] Add: [Actions] CI build workflow

---
 .github/workflows/ci-build.yml | 138 +++++++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 .github/workflows/ci-build.yml

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
new file mode 100644
index 0000000000..8ab2783e9e
--- /dev/null
+++ b/.github/workflows/ci-build.yml
@@ -0,0 +1,138 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+
+jobs:
+  linux:
+    name: Linux
+
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [clang, gcc]
+        include:
+          - compiler: clang
+            cxxcompiler: clang++
+          - compiler: gcc
+            cxxcompiler: g++
+    env:
+      CTEST_OUTPUT_ON_FAILURE: 1
+      CC: ${{ matrix.compiler }}
+      CXX: ${{ matrix.cxxcompiler }}
+
+    steps:
+    - name: Install dependencies
+      run: |
+        sudo apt-get install -y --no-install-recommends \
+          libfontconfig-dev \
+          libicu-dev \
+          liblzma-dev \
+          liblzo2-dev \
+          libsdl1.2-dev \
+          libsdl2-dev \
+          libxdg-basedir-dev \
+          zlib1g-dev \
+          # EOF
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Get OpenGFX
+      run: |
+        mkdir -p ~/.local/share/openttd/baseset
+        cd ~/.local/share/openttd/baseset
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        unzip opengfx-all.zip
+        rm -f opengfx-all.zip
+
+    - name: CMake
+      run: mkdir build && cd build && cmake ..
+
+    - name: Build
+      run: cd build && make -j2
+
+    - name: Test
+      run: cd build && make -j2 test
+
+  windows:
+    name: Windows
+
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86, x64]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Prepare vcpkg (with cache)
+      uses: lukka/run-vcpkg@v4
+      with:
+        vcpkgDirectory: 'c:/vcpkg'
+        doNotUpdateVcpkg: true
+        vcpkgArguments: 'liblzma libpng lzo zlib'
+        vcpkgTriplet: '${{ matrix.arch }}-windows-static'
+
+    - name: 'Build'
+      uses: lukka/run-cmake@v3
+      with:
+        cmakeListsOrSettingsJson: CMakeListsTxtBasic
+        useVcpkgToolchainFile: true
+        buildDirectory: '${{ runner.workspace }}/build'
+
+    - name: Install OpenGFX
+      run: |
+        mkdir -p "C:/Users/Public/Documents/OpenTTD/baseset"
+        cd "C:/Users/Public/Documents/OpenTTD/baseset"
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        unzip opengfx-all.zip
+        rm -f opengfx-all.zip
+      shell: bash
+
+    - name: Test
+      run: |
+        cd ${{ runner.workspace }}/build
+        ctest -C Debug
+
+  macos:
+    name: Mac OS
+
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+    env:
+      CTEST_OUTPUT_ON_FAILURE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: brew install pkg-config lzo xz libpng freetype
+      env:
+        HOMEBREW_NO_AUTO_UPDATE: 1
+
+    - name: Install OpenGFX
+      run: |
+        mkdir -p ~/Documents/OpenTTD/baseset
+        cd ~/Documents//OpenTTD/baseset
+        curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
+        unzip opengfx-all.zip
+        rm -f opengfx-all.zip
+
+    - name: CMake
+      run: mkdir build && cd build && cmake ..
+
+    - name: Build
+      run: cd build && make -j2
+
+    - name: Test
+      run: cd build && make -j2 test

From bef9e3fcfae897f28601844aad1ea45a6b900233 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Tue, 29 Sep 2020 18:40:41 +0100
Subject: [PATCH 18/31] Remove: Old Azure Pipelines CI

---
 azure-pipelines-ci.yml                      | 93 ---------------------
 azure-pipelines/templates/ci-git-rebase.yml | 10 ---
 azure-pipelines/templates/ci-opengfx.yml    | 13 ---
 3 files changed, 116 deletions(-)
 delete mode 100644 azure-pipelines-ci.yml
 delete mode 100644 azure-pipelines/templates/ci-git-rebase.yml
 delete mode 100644 azure-pipelines/templates/ci-opengfx.yml

diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
deleted file mode 100644
index 463d09b8b4..0000000000
--- a/azure-pipelines-ci.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-trigger:
-- master
-- release/*
-pr:
-- master
-- release/*
-
-jobs:
-- job: windows
-  displayName: 'Windows'
-  pool:
-    vmImage: 'VS2017-Win2016'
-
-  strategy:
-    matrix:
-      Win32:
-        BuildArch: 'Win32'
-        VcpkgTargetTriplet: 'x86-windows-static'
-      Win64:
-        BuildArch: 'x64'
-        VcpkgTargetTriplet: 'x64-windows-static'
-
-  steps:
-  - template: azure-pipelines/templates/ci-git-rebase.yml
-  - template: azure-pipelines/templates/windows-dependencies.yml
-  - template: azure-pipelines/templates/ci-opengfx.yml
-    parameters:
-      SharedFolder: C:/Users/Public/Documents/OpenTTD
-  - template: azure-pipelines/templates/windows-build.yml
-    parameters:
-      BuildArch: $(BuildArch)
-      VcpkgTargetTriplet: $(VcpkgTargetTriplet)
-      BuildConfiguration: 'Debug'
-  - task: VSBuild@1
-    displayName: 'Prepare regression files'
-    inputs:
-      solution: build/regression_files.vcxproj
-      configuration: 'Debug'
-  - task: VSBuild@1
-    displayName: 'Test'
-    inputs:
-      solution: build/RUN_TESTS.vcxproj
-      configuration: 'Debug'
-
-
-- job: linux
-  displayName: 'Linux'
-  pool:
-    vmImage: 'ubuntu-16.04'
-
-  strategy:
-    matrix:
-      linux-amd64-clang-3.9:
-        Tag: 'linux-amd64-clang-3.9'
-      linux-amd64-gcc-6:
-        Tag: 'linux-amd64-gcc-6'
-      linux-i386-gcc-6:
-        Tag: 'linux-i386-gcc-6'
-
-  steps:
-  - template: azure-pipelines/templates/ci-git-rebase.yml
-  # The dockers already have the dependencies installed
-  - template: azure-pipelines/templates/ci-opengfx.yml
-    parameters:
-      SharedFolder: /usr/local/share/games/openttd
-      PrefixCommand: sudo
-  - template: azure-pipelines/templates/linux-build.yml
-    parameters:
-      Image: compile-farm-ci
-      Tag: $(Tag)
-
-- job: macos
-  displayName: 'MacOS'
-  pool:
-    vmImage: 'macOS-10.14'
-
-  variables:
-    MACOSX_DEPLOYMENT_TARGET: 10.9
-
-  steps:
-  - template: azure-pipelines/templates/ci-git-rebase.yml
-  - template: azure-pipelines/templates/osx-dependencies.yml
-  - template: azure-pipelines/templates/ci-opengfx.yml
-    parameters:
-      SharedFolder: /Library/Application Support/OpenTTD
-      PrefixCommand: sudo
-  - template: azure-pipelines/templates/osx-build.yml
-  - script: |
-      set -ex
-
-      cd build
-      CTEST_OUTPUT_ON_FAILURE=1 make test
-    displayName: 'Test'
diff --git a/azure-pipelines/templates/ci-git-rebase.yml b/azure-pipelines/templates/ci-git-rebase.yml
deleted file mode 100644
index 96a23a5401..0000000000
--- a/azure-pipelines/templates/ci-git-rebase.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-steps:
-# Rebase to target branch for every PR. This means users don't have to
-# rebase every time target branch changes. As long as the PR applies cleanly, we
-# will validate it.
-- bash: |
-    git config user.email 'info@openttd.org'
-    git config user.name 'OpenTTD CI'
-    git rebase origin/${SYSTEM_PULLREQUEST_TARGETBRANCH}
-  displayName: 'Rebase to target branch'
-  condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
diff --git a/azure-pipelines/templates/ci-opengfx.yml b/azure-pipelines/templates/ci-opengfx.yml
deleted file mode 100644
index 60231e3869..0000000000
--- a/azure-pipelines/templates/ci-opengfx.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
-  SharedFolder: '/usr/local/share/games/openttd'
-  PrefixCommand: ''
-
-steps:
-- bash: |
-    set -ex
-    ${{ parameters.PrefixCommand }} mkdir -p "${{ parameters.SharedFolder }}/baseset"
-    cd "${{ parameters.SharedFolder }}/baseset"
-    ${{ parameters.PrefixCommand }} curl -L https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip -o opengfx-all.zip
-    ${{ parameters.PrefixCommand }} unzip opengfx-all.zip
-    ${{ parameters.PrefixCommand }} rm -f opengfx-all.zip
-  displayName: 'Install OpenGFX'

From 80f7937e4208cc449247d14000f85e45feb2fa13 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Sat, 3 Oct 2020 17:51:47 +0000
Subject: [PATCH 19/31] Update: Translations from eints korean: 8 changes by
 telk5093

---
 src/lang/korean.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index c2b99a8571..61cac93d64 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -1652,22 +1652,22 @@ STR_CONFIG_SETTING_LINKGRAPH_INTERVAL_HELPTEXT                  :다음 연결 
 STR_CONFIG_SETTING_LINKGRAPH_TIME                               :화물 분배 연결 상태를 {STRING}일마다 다시 계산
 STR_CONFIG_SETTING_LINKGRAPH_TIME_HELPTEXT                      :각 연결 상태 요소의 재계산을 위해 필요한 시간입니다. 재계산이 시작될 때, 이 날짜만큼 작동하는 스레드가 생성됩니다. 이 값이 작으면 작을수록, 스레드가 끝나야할 때에 스레드가 끝나지 않게 됩니다. 그러면 게임이 랙에 걸려 멈추게 됩니다. 값을 크게 설정할수록 경로가 바뀔 때 분배 상태가 업데이트 되는 시간이 오래 걸리게 됩니다.
 STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :수동
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :불균형
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC                       :균형
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :비대칭
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC                       :대칭
 STR_CONFIG_SETTING_DISTRIBUTION_PAX                             :승객에 대한 분배 형식: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :"균형"은 A역에서 B역으로 가려는 승객의 수가 B에서 A로 가려는 승객의 수와 비슷하다는 뜻입니다. "불균형"은 승객이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 승객 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다.
+STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT                    :"대칭"은 A역에서 B역으로 가려는 승객의 수가 B에서 A로 가려는 승객의 수와 비슷하다는 뜻입니다. "비대칭"은 승객이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 승객 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다.
 STR_CONFIG_SETTING_DISTRIBUTION_MAIL                            :우편에 대한 분배 형식: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :"균형"은 A역에서 B역으로 가려는 우편물의 수가 B에서 A로 가려는 우편물의 수와 비슷하다는 뜻입니다. "불균형"은 우편물이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 우편물 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다.
+STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :"대칭"은 A역에서 B역으로 가려는 우편물의 수가 B에서 A로 가려는 우편물의 수와 비슷하다는 뜻입니다. "비대칭"은 우편물이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 우편물 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다.
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :장갑 화물에 대한 분배 형식: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :장갑 화물은 온대 기후의 귀금속, 아열대 기후의 다이아몬드 또는 아한대 기후의 금을 말합니다. NewGRF을 사용하면 달라질 수 있습니다. "균형"은 A역에서 B역으로 가려는 화물의 수가 B에서 A로 가려는 화물의 수와 비슷하다는 뜻입니다. "불균형"은 화물이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 화물 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다. 아한대 기후에서는 균형으로 설정하면 은행이 금광으로 금을 보내지 않으려 하기 때문에 불균형이나 수동으로 설정하는 것을 추천합니다. 온대 기후나 아열대 기후에서는 은행이 일부 적재한 귀금속을 원래 은행으로 보내려고 하기 때문에 균형을 선택해도 됩니다.
+STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :장갑 화물은 온대 기후의 귀금속, 아열대 기후의 다이아몬드 또는 아한대 기후의 금을 말합니다. NewGRF을 사용하면 달라질 수 있습니다. "대칭"은 A역에서 B역으로 가려는 화물의 수가 B에서 A로 가려는 화물의 수와 비슷하다는 뜻입니다. "비대칭"은 화물이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 화물 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다. 아한대 기후에서는 대칭으로 설정하면 은행이 금광으로 금을 보내지 않으려 하기 때문에 비대칭이나 수동으로 설정하는 것을 추천합니다. 온대 기후나 아열대 기후에서는 은행이 일부 적재한 귀금속을 원래 은행으로 보내려고 하기 때문에 대칭을 선택해도 됩니다.
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT                         :다른 화물에 대한 분배 형식: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :"불균형"은 화물이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 화물 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다. 특별한 이유가 없는 한, "불균형"이나 "수동"으로 설정하십시오.
+STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :"비대칭"은 화물이 아무 방향이나 임의의 양만큼 가게 됨을 뜻합니다. "수동"은 자동적인 화물 분배가 일어나지 않고 기존 방식을 사용하겠음을 뜻합니다. 특별한 이유가 없는 한, "비대칭"이나 "수동"으로 설정하십시오.
 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY                           :분배 정확도: {STRING}
 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY_HELPTEXT                  :값이 높으면 높을수록 CPU가 연결 상태를 계산하는 시간이 더 오래 걸립니다. 만약 이 시간이 너무 오래 걸리면 게임이 버벅일 것입니다. 하지만, 낮은 값으로 설정하면 분배가 부정확하게 일어나서, 화물이 원하는 곳으로 분배되지 않을 수 있습니다.
 STR_CONFIG_SETTING_DEMAND_DISTANCE                              :거리에 따른 수요 효과: {STRING}
 STR_CONFIG_SETTING_DEMAND_DISTANCE_HELPTEXT                     :이 값을 0보다 크게 설정하면, 어떤 화물이 있는 A역과 목적지가 될 수 있는 역 B 사이의 거리는 A에서 B로 가는 화물의 양에 영향을 미치게 됩니다. A역에서 B역이 더 멀리 떨어질 수록 이동하는 화물의 양은 적어질 것입니다. 값이 크면 클 수록 화물은 멀리 이동하지 않고 가까운 역으로 가게 됩니다.
-STR_CONFIG_SETTING_DEMAND_SIZE                                  :균형 모드에서 되돌아오는 화물의 양: {STRING}
-STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT                         :이 값을 100%보다 작게 설정할 수록 균형 분배는 불균형 분배와 비슷해집니다. 특정 양의 화물을 역으로 보내면 그보다 더 적은 화물이 강제로 되돌아오게 됩니다. 이 값을 0%로 설정하면 균형 분배는 불균형 분배와 똑같습니다.
+STR_CONFIG_SETTING_DEMAND_SIZE                                  :대칭 모드에서 되돌아오는 화물의 양: {STRING}
+STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT                         :이 값을 100%보다 작게 설정할 수록 대칭 분배는 비대칭 분배와 비슷해집니다. 특정 양의 화물을 역으로 보내면 그보다 더 적은 화물이 강제로 되돌아오게 됩니다. 이 값을 0%로 설정하면 대칭 분배는 비대칭 분배와 똑같습니다.
 STR_CONFIG_SETTING_SHORT_PATH_SATURATION                        :다음으로 짧은 경로를 사용하기 위한 경로의 포화도: {STRING}
 STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT               :종종 두 역 사이에는 여러 가지 경로가 존재할 수 있습니다. 이 경우, 화물 분배 기능은 먼저 가장 짧은 경로로 화물을 보내고, 그 경로가 포화 상태에 이르면 그 다음으로 짧은 경로를 사용하는 식으로 화물을 분배합니다. 포화도는 경로의 수송 능력과 예정 사용량을 추정하여 계산됩니다. 일단 모든 경로가 포화 상태가 되었는데 아직 수요가 남아있다면, 수송 능력이 높은 경로를 사용하면서 모든 경로를 과부하 상태로 만들게 됩니다. 하지만, 이 알고리즘은 수송량을 대부분 정확히 추정하지는 않습니다. 이 설정을 이용해서, 화물 분배 기능이 짧은 경로의 포화 상태가 몇 퍼센트가 되어야 다음으로 짧은 경로에 화물을 분배할 것인지를 지정할 수 있습니다. 과대평가된 수송량의 경우 너무 붐비는 역이 생기지 않도록 하기 위해서는 이 값을 100%보다 작게 설정하십시오.
 

From 3723207d649fa9f37b8e17ea8e23fec1c6de8d30 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Sun, 4 Oct 2020 17:51:56 +0000
Subject: [PATCH 20/31] Update: Translations from eints slovak: 23 changes by
 FuryPapaya turkish: 66 changes by ozcanakdora

---
 src/lang/slovak.txt  | 44 +++++++++++++++--------------
 src/lang/turkish.txt | 66 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 21 deletions(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 20ab973b84..b000f8ae3e 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -27,13 +27,13 @@ STR_JUST_NOTHING                                                :Nič
 # Cargo related strings
 # Plural cargo name
 STR_CARGO_PLURAL_NOTHING                                        :
-STR_CARGO_PLURAL_PASSENGERS                                     :Cestujúcich
-STR_CARGO_PLURAL_PASSENGERS.g                                   :cestujucich
+STR_CARGO_PLURAL_PASSENGERS                                     :Cestujúci
+STR_CARGO_PLURAL_PASSENGERS.g                                   :cestujúcich
 STR_CARGO_PLURAL_COAL                                           :Uhlie
 STR_CARGO_PLURAL_COAL.g                                         :uhlia
-STR_CARGO_PLURAL_MAIL                                           :Poštu
+STR_CARGO_PLURAL_MAIL                                           :Pošta
 STR_CARGO_PLURAL_MAIL.g                                         :pošty
-STR_CARGO_PLURAL_OIL                                            :Ropu
+STR_CARGO_PLURAL_OIL                                            :Ropa
 STR_CARGO_PLURAL_OIL.g                                          :ropy
 STR_CARGO_PLURAL_LIVESTOCK                                      :Dobytok
 STR_CARGO_PLURAL_LIVESTOCK.g                                    :dobytka
@@ -51,7 +51,7 @@ STR_CARGO_PLURAL_VALUABLES                                      :Cennosti
 STR_CARGO_PLURAL_VALUABLES.g                                    :cennosti
 STR_CARGO_PLURAL_COPPER_ORE                                     :Medená ruda
 STR_CARGO_PLURAL_COPPER_ORE.g                                   :medenej rudy
-STR_CARGO_PLURAL_MAIZE                                          :Kukuricu
+STR_CARGO_PLURAL_MAIZE                                          :Kukurica
 STR_CARGO_PLURAL_MAIZE.g                                        :kukurice
 STR_CARGO_PLURAL_FRUIT                                          :Ovocie
 STR_CARGO_PLURAL_FRUIT.g                                        :ovocia
@@ -63,9 +63,9 @@ STR_CARGO_PLURAL_PAPER                                          :Papier
 STR_CARGO_PLURAL_PAPER.g                                        :papiera
 STR_CARGO_PLURAL_GOLD                                           :Zlato
 STR_CARGO_PLURAL_GOLD.g                                         :zlata
-STR_CARGO_PLURAL_WATER                                          :Vodu
+STR_CARGO_PLURAL_WATER                                          :Voda
 STR_CARGO_PLURAL_WATER.g                                        :vody
-STR_CARGO_PLURAL_WHEAT                                          :Pšenicu
+STR_CARGO_PLURAL_WHEAT                                          :Pšenica
 STR_CARGO_PLURAL_WHEAT.g                                        :pšenice
 STR_CARGO_PLURAL_RUBBER                                         :Kaučuk
 STR_CARGO_PLURAL_RUBBER.g                                       :kaučuku
@@ -75,9 +75,9 @@ STR_CARGO_PLURAL_TOYS                                           :Hračky
 STR_CARGO_PLURAL_TOYS.g                                         :hračiek
 STR_CARGO_PLURAL_CANDY                                          :Cukríky
 STR_CARGO_PLURAL_CANDY.g                                        :cukríkov
-STR_CARGO_PLURAL_COLA                                           :Kofolu
+STR_CARGO_PLURAL_COLA                                           :Kofola
 STR_CARGO_PLURAL_COLA.g                                         :kofoly
-STR_CARGO_PLURAL_COTTON_CANDY                                   :Cukrovú vatu
+STR_CARGO_PLURAL_COTTON_CANDY                                   :Cukrová vata
 STR_CARGO_PLURAL_COTTON_CANDY.g                                 :cukrovej vaty
 STR_CARGO_PLURAL_BUBBLES                                        :Bublinky
 STR_CARGO_PLURAL_BUBBLES.g                                      :bubliniek
@@ -87,13 +87,13 @@ STR_CARGO_PLURAL_BATTERIES                                      :Baterky
 STR_CARGO_PLURAL_BATTERIES.g                                    :bateriek
 STR_CARGO_PLURAL_PLASTIC                                        :Umelina
 STR_CARGO_PLURAL_PLASTIC.g                                      :umeliny
-STR_CARGO_PLURAL_FIZZY_DRINKS                                   :Malinovky
-STR_CARGO_PLURAL_FIZZY_DRINKS.g                                 :Malinoviek
+STR_CARGO_PLURAL_FIZZY_DRINKS                                   :Malinovka
+STR_CARGO_PLURAL_FIZZY_DRINKS.g                                 :malinoviek
 
 # Singular cargo name
 STR_CARGO_SINGULAR_NOTHING                                      :
 STR_CARGO_SINGULAR_PASSENGER                                    :Cestujúci
-STR_CARGO_SINGULAR_PASSENGER.g                                  :cestujucich
+STR_CARGO_SINGULAR_PASSENGER.g                                  :cestujúceho
 STR_CARGO_SINGULAR_COAL                                         :Uhlie
 STR_CARGO_SINGULAR_COAL.g                                       :uhlia
 STR_CARGO_SINGULAR_MAIL                                         :Pošta
@@ -112,7 +112,7 @@ STR_CARGO_SINGULAR_IRON_ORE                                     :Železná ruda
 STR_CARGO_SINGULAR_IRON_ORE.g                                   :zeleznej rudy
 STR_CARGO_SINGULAR_STEEL                                        :Oceľ
 STR_CARGO_SINGULAR_STEEL.g                                      :ocele
-STR_CARGO_SINGULAR_VALUABLES                                    :Cennosti
+STR_CARGO_SINGULAR_VALUABLES                                    :Cennosť
 STR_CARGO_SINGULAR_VALUABLES.g                                  :cennosti
 STR_CARGO_SINGULAR_COPPER_ORE                                   :Medená ruda
 STR_CARGO_SINGULAR_COPPER_ORE.g                                 :medenej rudy
@@ -121,7 +121,7 @@ STR_CARGO_SINGULAR_MAIZE.g                                      :kukurice
 STR_CARGO_SINGULAR_FRUIT                                        :Ovocie
 STR_CARGO_SINGULAR_FRUIT.g                                      :ovocia
 STR_CARGO_SINGULAR_DIAMOND                                      :Diamant
-STR_CARGO_SINGULAR_DIAMOND.g                                    :diamantov
+STR_CARGO_SINGULAR_DIAMOND.g                                    :diamantu
 STR_CARGO_SINGULAR_FOOD                                         :Jedlo
 STR_CARGO_SINGULAR_FOOD.g                                       :jedla
 STR_CARGO_SINGULAR_PAPER                                        :Papier
@@ -133,13 +133,13 @@ STR_CARGO_SINGULAR_WATER.g                                      :vody
 STR_CARGO_SINGULAR_WHEAT                                        :Pšenica
 STR_CARGO_SINGULAR_WHEAT.g                                      :psenice
 STR_CARGO_SINGULAR_RUBBER                                       :Kaučuk
-STR_CARGO_SINGULAR_RUBBER.g                                     :kaucuku
+STR_CARGO_SINGULAR_RUBBER.g                                     :kaučuku
 STR_CARGO_SINGULAR_SUGAR                                        :Cukor
 STR_CARGO_SINGULAR_SUGAR.g                                      :cukru
 STR_CARGO_SINGULAR_TOY                                          :Hračka
-STR_CARGO_SINGULAR_TOY.g                                        :hraciek
+STR_CARGO_SINGULAR_TOY.g                                        :hračky
 STR_CARGO_SINGULAR_CANDY                                        :Cukrík
-STR_CARGO_SINGULAR_CANDY.g                                      :cukrikov
+STR_CARGO_SINGULAR_CANDY.g                                      :cukríka
 STR_CARGO_SINGULAR_COLA                                         :Kofola
 STR_CARGO_SINGULAR_COLA.g                                       :kofoly
 STR_CARGO_SINGULAR_COTTON_CANDY                                 :Cukrová vata
@@ -157,9 +157,9 @@ STR_CARGO_SINGULAR_FIZZY_DRINK.g                                :malinovky
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA}{NBSP}cestujuci{P "" "" ch}
+STR_QUANTITY_PASSENGERS                                         :{COMMA}{NBSP}cestujúci{P "" "" ch}
 STR_QUANTITY_COAL                                               :{WEIGHT_LONG} uhlia
-STR_QUANTITY_MAIL                                               :{COMMA} balik{P "" y ov} pošty
+STR_QUANTITY_MAIL                                               :{COMMA} balík{P "" y ov} pošty
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} ropy
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} kus{P "" y ov} dobytka
 STR_QUANTITY_GOODS                                              :{COMMA} deb{P na ny ien} tovaru
@@ -180,7 +180,7 @@ STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} p
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} kaučuku
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} cukru
 STR_QUANTITY_TOYS                                               :{COMMA} hrač{P ka ky iek}
-STR_QUANTITY_SWEETS                                             :{COMMA} deb{P na ny ien} cukrikov
+STR_QUANTITY_SWEETS                                             :{COMMA} deb{P na ny ien} cukríkov
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} kofoly
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} cukrovej vaty
 STR_QUANTITY_BUBBLES                                            :{COMMA} bublin{P ka ky iek}
@@ -245,12 +245,14 @@ STR_COLOUR_GREEN                                                :Zelená
 STR_COLOUR_DARK_GREEN                                           :Tmavozelená
 STR_COLOUR_BLUE                                                 :Modrá
 STR_COLOUR_CREAM                                                :Krémová
-STR_COLOUR_MAUVE                                                :Ružová
+STR_COLOUR_MAUVE                                                :Svetlofialová
 STR_COLOUR_PURPLE                                               :Fialová
 STR_COLOUR_ORANGE                                               :Oranžová
 STR_COLOUR_BROWN                                                :Hnedá
 STR_COLOUR_GREY                                                 :Šedá
 STR_COLOUR_WHITE                                                :Biela
+STR_COLOUR_RANDOM                                               :Náhodná
+STR_COLOUR_DEFAULT                                              :Predvolená
 
 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} mph
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index d8a3b3528d..9d5129571a 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -266,6 +266,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Bu düğ
 STR_BUTTON_DEFAULT                                              :{BLACK}Varsayılan
 STR_BUTTON_CANCEL                                               :{BLACK}İptal
 STR_BUTTON_OK                                                   :{BLACK}Tamam
+STR_WARNING_PASSWORD_SECURITY                                   :{YELLOW}Uyarı: Sunucu yöneticileri buraya yazılan yazıları okuyabilir.
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :"1234567890*-\qwertyuıopğüasdfghjklşi,'  zxcvbnmöç. .
@@ -339,6 +340,7 @@ STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Yakınla
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Uzaklaş
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Demiryolu yapımı
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Karayolu yapımı
+STR_TOOLBAR_TOOLTIP_BUILD_TRAMWAYS                              :{BLACK}Tramvay inşa et
 STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Rıhtım yapımı
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Havalimanı yapımı
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Arazi düzenleme araç çubuğunu aç (ağaç dikme, alçaltma/yükseltme vb. için).
@@ -863,6 +865,7 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLAC
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Yeni {STRING} artık kullanılabilir! - {ENGINE}
 
+STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Aracın grubuna odaklanmış grup penceresini açın
 
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} artık {STRING} kabul etmiyor
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} artık {STRING} veya {STRING} kabul etmiyor
@@ -931,6 +934,8 @@ STR_GAME_OPTIONS_CURRENCY_IRR                                   :İran Riyali (I
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Yeni Rus Rublesi (RUB)
 STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksika Pezosu (MXN)
 STR_GAME_OPTIONS_CURRENCY_NTD                                   :Yeni Tayvan Doları (NTD)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Çin Yuanı (CNY)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Doları (HKD)
 STR_GAME_OPTIONS_CURRENCY_INR                                   :Hindistan Rupisi (INR)
 ############ end of currency region
 
@@ -994,6 +999,7 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :İki kat büyük
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Dört kat büyük
 
+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Yazı boyutu
 STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :Arayüz boyutunu seç
 
 STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normal
@@ -1182,6 +1188,8 @@ STR_CONFIG_SETTING_AUTOSLOPE                                    :Binaların, yol
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Binaları ve yolları kaldırmaksızın altlarında yeryüzü şekillendirmesi yapılmasına izin ver
 STR_CONFIG_SETTING_CATCHMENT                                    :İstasyon kapsama alanlarının daha gerçeğe yakın ölçülerde olmasına izin ver: {STRING}
 STR_CONFIG_SETTING_CATCHMENT_HELPTEXT                           :Farklı istasyon ve hava limanları için farklı büyüklükte alanlar gerekir
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES                     :Şirket istasyonları, bağlı nötr istasyonları olan endüstrilere hizmet edebilir: {STRING}
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :Etkinleştirildiğinde, bağlı istasyonları olan endüstrilere (Petrol Kuleleri gibi) yakınlarda kurulan şirkete ait istasyonlar da hizmet verebilir. Devre dışı bırakıldığında, bu sektörlere yalnızca bağlı istasyonları tarafından hizmet verilebilir. Yakındaki herhangi bir şirket istasyonu onlara hizmet veremeyecek ve ekli istasyon sektör dışında başka bir şeye hizmet etmeyecek
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :Şehirlere ait köprülerin, yolların ve tünellerin yıkılmasına izin vermeleri için, şehir yetkililerinin toleransını arttır: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT                       :Belediyelerin sahip olduğu altyapı ve binaların yıkımını kolaylaştır
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :En yüksek tren uzunluğu: {STRING}
@@ -1303,6 +1311,8 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Şehir nüfusun
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Haritadaki şehir etiketlerinde nüfus bilgisini görüntüle
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Grafiklerdeki çizgi kalınlığı: {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Grafiklerdeki çizginin genişliği. İnce çizgiler daha hassas şekilde okunabilir, koyu çizgileri ise görmek ve renklerini ayırt etmek daha kolay olur.
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME                             :NewGRF'nin adını araç inşa penceresinde  göster: {STRING}
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT                    :Araç inşa penceresine, seçilen aracın hangi NewGRF'den geldiğini gösteren bir satır ekleyin.
 
 STR_CONFIG_SETTING_LANDSCAPE                                    :İklim: {STRING}
 STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :İklimler farklı kargo ve şehir gelişme gereksinimlerini belirleyen temel oynanış senaryolarını tanımlar. NewGRF ve Oyun Betikleri daha ince ayarlar yapmanızı sağlar
@@ -1479,6 +1489,9 @@ STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :Çok oyunculuda
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT                   :YZ (yapay zeka) bilgisayar oyuncularının çok oyunculu oyunlara katılmasına izin ver
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :Betikler duraklatılıncaya kadar çalıştırılacak opkod sayısı: {STRING}
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT                  :Bir betiğin bir elde kullanabileceği azami hesaplama adımı sayısı
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY                            :Script başına kullanılabilecek maksimum bellek: {STRING}
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT                   :Tek bir betiğin zorla durdurulmadan önce ne kadar bellek kullanabileceğini gösterir. Bu değerin büyük haritalarda arttırılması gerekebilir.
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE                      :{COMMA} MiB
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Servis gecikmeleri yüzde ile: {STRING}
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Araçlara bakım yapılmasına bir önceki bakımın üzerinden geçen zamana göre mi, yoksa aracın güvenilirlik değerinin azami güvenilirliğe kıyasla belli bir yüzde oranında düşmesine bağlı olarak mı karar verileceğini seçin
@@ -1537,10 +1550,15 @@ STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :Tam
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :Renkli gazete şu senede çıksın: {STRING}
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :Gazete haberlerinin renkli olarak basılmaya başlandığı yıl. Bu tarihe kadar gazete siyah/beyaz olarak basılır
 STR_CONFIG_SETTING_STARTING_YEAR                                :Başlangıç tarihi: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR                                  :Yıl sonu puanı: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Oyunun puan sonucuna göre bittiği yıl. Bu yılın sonunda, şirketin puanı kaydedilir ve yüksek puan ekranında gösterilir ama oyuncular oynamaya devam edebilir.{}Eğer bu başlama yılından önce ise, yüksek puan ekranı gösterilmez.
+STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
+STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Asla
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :Yüzeysel ekonomi (daha çok ve küçük çapta değişiklikler): {STRING}
 STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT                      :Etkinleştirildiğinde, endüstri üretim miktarı daha sık ve daha küçük adımlarla değişir. Eğer endüstriler bir NewGRF dosyası tarafından sağlanıyorsa bu özellik genellikle etkisiz kalır
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Diğer şirketlerin hisseleri alınabilsin: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Etkinleştirildiğinde, şirketlerin hisse senetlerinin alınıp satılması mümkün olur. Hisse senetleri sadece belli bir yaşa ulaşan şirketler için geçerlidir
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Hisse satmak için gerekli minimum şirket yaşı: {STRING}
 STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT                :Bir şirketin hisselerinin satılabileceği ve diğer şirketlerin alabileceği minimum şirket yaşını belirleyin.
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :Besleme sistemlerinde, bölümlerden elde edilen kardan ödenecek yüzde: {STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :Besleme sistemlerinde, sistemi oluşturan ara bölümlere verilen kar yüzdesi. Böylece kar miktarı üzerinde daha fazla kontrol elde edilmiş olur
@@ -1582,7 +1600,10 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :Bu seçeneği e
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :Yasak
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :İzin verildi
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :İzin verildi, özel kasaba yerleşimi
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Şehrin kargo üretimi: {STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Şehrin genel nüfusuna oranla, şehirlerdeki evler tarafından ne kadar kargo üretiliyor.{}Üstel büyüme: İki katı büyüklükteki bir şehir dört katı büyüklükte yolcuya sahip olur.{}Lineer büyüme: İki katı büyüklükteki bir şehir iki katı büyüklükte yolcuya sahip olur.
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :İkinci dereceden (orjinall)
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Doğrusal
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Oyunda ağaç dikme: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Oyundaki rastgele ağaçların görünümünü kontrol eder. Bu, ağaçların büyümesine bağımlı olan endüstrileri etkileyebilir, örneğin keresteciler gibi
@@ -2149,6 +2170,7 @@ STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Yanlış
 STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Sunucu dolu
 STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sunucuya girmeniz yasaklandı
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Oyundan atıldınız
+STR_NETWORK_ERROR_KICK_MESSAGE                                  :{WHITE}Sebep: {STRING}
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Bu sunucuda hileler kapalı
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Sunucuya çok fazla komut gönderiyordunuz
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Şifre girmeniz çok uzun sürdü
@@ -2208,6 +2230,7 @@ STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} ş
 STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** {1:STRING} oyuncusuna {2:CURRENCY_LONG} verdiniz
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Sunucu kapandı
 STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Sunucu baştan başlatılıyor...{}Lütfen bekleyin...
+STR_NETWORK_MESSAGE_KICKED                                      :*** {STRING} atıldı. Sebep: ({STRING})
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}İçerik indirme
@@ -2426,7 +2449,10 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Tramvay
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Yol yap/sil arasında geçiş yap
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Tramvay yapımı/yıkımı
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Yol türünü Dönüştür/Geliştir. Shift ile tıklama maliyet tahminini gösterir
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Tramvay türünü dönüştür / yükselt. Shift'e basma maliyet tahmini gösterir.
 
+STR_ROAD_NAME_ROAD                                              :Yol
+STR_ROAD_NAME_TRAM                                              :Tramvay
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Garaj Yönü
@@ -2615,6 +2641,7 @@ STR_LANG_AREA_INFORMATION_ROAD_TYPE                             :{BLACK}Yol tür
 STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Tramvay tipi: {LTBLUE}{STRING}
 STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Ray hız sınırı: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Yol hız sınırı: {LTBLUE}{VELOCITY}
+STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Tramvay hız limiti: {LTBLUE}{VELOCITY}
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kayalar
@@ -2724,6 +2751,7 @@ STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Şu anki
 STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Beklenen normal simülasyon hızı yerine, şu anda oyunun ne kadar hızlı çalıştığı.
 STR_FRAMERATE_CURRENT                                           :{WHITE}Geçerli
 STR_FRAMERATE_AVERAGE                                           :{WHITE}Ortalama
+STR_FRAMERATE_MEMORYUSE                                         :{WHITE}Bellek
 STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Veriler {COMMA} ölçümlerine dayanır
 STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
 STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
@@ -2733,6 +2761,7 @@ STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMA
 STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} kare/s
 STR_FRAMERATE_BYTES_GOOD                                        :{LTBLUE}{BYTES}
 STR_FRAMERATE_BYTES_WARN                                        :{YELLOW}{BYTES}
+STR_FRAMERATE_BYTES_BAD                                         :{RED}{BYTES}
 STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
 STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 ############ Leave those lines in this order!!
@@ -2748,7 +2777,9 @@ STR_FRAMERATE_DRAWING                                           :{BLACK}Grafik i
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Dünya görüş alanları:
 STR_FRAMERATE_VIDEO                                             :{BLACK}Video çıkışı:
 STR_FRAMERATE_SOUND                                             :{BLACK}Ses karıştırma:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Oyun Betiği/Yapay Zeka toplam:
 STR_FRAMERATE_GAMESCRIPT                                        :Oyun scripti
+STR_FRAMERATE_AI                                                :{BLACK}   YZ {NUM} {STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Oyun döngüsü
@@ -2763,7 +2794,9 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Grafik işleme
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Dünya görüş alanı derleme
 STR_FRAMETIME_CAPTION_VIDEO                                     :Video çıkışı
 STR_FRAMETIME_CAPTION_SOUND                                     :Ses karıştırma
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Oyun Betiği/Yapay Zeka betikleri toplam
 STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Oyun betiği
+STR_FRAMETIME_CAPTION_AI                                        :YZ {NUM} {STRING}
 ############ End of leave-in-this-order
 
 
@@ -3028,6 +3061,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}'{1:ENGINE}' için kargo tür değişim bilgisi yapımdan sonraki alım listesinden farklı. Bu otomatik yenileme-değiştirmenin kargo türünü doğru şekilde değiştirmesine engel olabilir
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' üretim yordamında sonsuz döngüye neden oldu
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}{1:HEX} adlı callback hata ya da geçersiz sonuç döndü {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' üretim geri çağırımında, geçerli olmayan kargo türü geri döndü {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<geçersiz kargo>
@@ -3094,6 +3128,7 @@ STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :İsim değişti
 
 # Town local authority window
 STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}{TOWN} belediyesi
+STR_LOCAL_AUTHORITY_ZONE                                        :{BLACK}Bölge
 STR_LOCAL_AUTHORITY_ZONE_TOOLTIP                                :{BLACK}Bölgeyi yerel yönetim sınırları içinde göster
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Taşıma şirketi değerlendirmeleri:
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING}
@@ -3352,6 +3387,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}{COMPANY
 STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Demiryolu parçaları:
 STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Sinyaller
 STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Karayolu parçaları:
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT                       :{GOLD}Tramvay parçaları:
 STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Su kareleri:
 STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Kanallar
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}İstasyonlar:
@@ -3362,8 +3398,14 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENC
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Fabrikalar
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Hiçbiri -
+STR_INDUSTRY_DIRECTORY_ITEM_INFO                                :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% taşındı){BLACK}
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD1                               :{ORANGE}{INDUSTRY} {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD2                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD3                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE                            :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} ve {NUM} daha...
 STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Fabrika adları - görüntüyü fabrikada merkezlemek için adına tıklayın. Ctrl ile tıklama fabrikanın konumunu gösteren yeni bir pencere açar
+STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER                    :{BLACK}Kabul edilen kargo: {SILVER}{STRING}
 STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER                    :{BLACK}Üretilmiş kargo: {SILVER}{STRING}
 STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES                         :Tüm kargo tipleri
 STR_INDUSTRY_DIRECTORY_FILTER_NONE                              :Hiçbiri
@@ -3432,6 +3474,7 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Gruplanmamış
 STR_GROUP_DEFAULT_SHIPS                                         :Gruplanmamış gemiler
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Gruplanmamış uçaklar
 
+STR_GROUP_COUNT_WITH_SUBGROUP                                   :{TINY_FONT}{COMMA} (+{COMMA})
 
 STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Gruplar - gruba ait araçları listelemek için grubun üzerine tıklayın. Hiyerarşiyi düzenlemek için grupları sürükleyip bırakın.
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Grup oluşturmak için tıklayın
@@ -3464,6 +3507,7 @@ STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION                            :Yeni Tramvay Ar
 
 ############ range for vehicle availability starts
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Trenler
+STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION                        :Yeni yol araçları
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :Yeni gemi
 STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Yeni Hava Aracı
 ############ range for vehicle availability ends
@@ -3480,6 +3524,7 @@ STR_PURCHASE_INFO_REFITTABLE                                    :(modifiyeli)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Yapım yılı: {GOLD}{NUM}{BLACK} Ömür: {GOLD}{COMMA} sene
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Aza. Güvenilirlik: {GOLD}%{COMMA}
 STR_PURCHASE_INFO_COST                                          :{BLACK}Fiyat: {GOLD}{CURRENCY_LONG}
+STR_PURCHASE_INFO_COST_REFIT                                    :{BLACK}Maliyet: {GOLD}{CURRENCY_LONG}{BLACK} (Tamirat Maliyeti: {GOLD}{CURRENCY_LONG}{BLACK})
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Ağırlık: {GOLD}{WEIGHT_SHORT} ({WEIGHT_SHORT})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Fiyat: {GOLD}{CURRENCY_LONG}{BLACK} Hız: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_COST_REFIT_SPEED                              :{BLACK}Maliyet: {GOLD}{CURRENCY_LONG}{BLACK} (Tamir maliyeti: {GOLD}{CURRENCY_LONG}{BLACK}) Hız: {GOLD}{VELOCITY}
@@ -3503,12 +3548,17 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Araç Sa
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Gemi Satın Al
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Uçak Satın Al
 
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON                  :{BLACK}Araç satın alın ve yenileyin.
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON           :{BLACK}Aracı satın alın ve yenileyin.
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Gemi satın al ve yenile
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Uçağı satın al veya sahip olduğunla değiştir.
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Seçili treni satın al. Shift ile tıklama satın almadan tahmini maliyeti gösterir.
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}İşaretli aracı al. Shift ile tıklama satın almadan tahmini maliyeti gösterir
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Seçili gemiyi satın al. Shift ile tıklama satın almadan tahmini maliyeti gösterir
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Seçili uçağı satın al. Shift ile tıklama satın almadan tahmini maliyeti gösterir
 
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Gösterilen treni satın al. Shift+Click satın almadan tahmini maliyeti gösterir
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP          :{BLACK}Seçili karayolu aracını satın alın. Shift ile tıklama satın almadan tahmini maliyeti gösterir
 STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}Seçili gemiyi satın al. Shift ile tıklama satın almadan tahmini maliyeti gösterir
 STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}Seçili uçağı satın al. Shift ile tıklama satın almanın tahmini maliyetini gösterir
@@ -3623,10 +3673,12 @@ STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Araç ü
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Yeni bir {STRING} tasarladık - bizim için bunu bir yıl denemeyi kabul ediyor musunuz?
 
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :lokomotif
+STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE                            :Elektrikli demiryolu lokomotifi
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :monoray lokomotifi
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev lokomotifi
 
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :karayolu aracı
+STR_ENGINE_PREVIEW_TRAM_VEHICLE                                 :Tramvay aracı
 
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :uçak
 STR_ENGINE_PREVIEW_SHIP                                         :gemi
@@ -3671,12 +3723,15 @@ STR_REPLACE_ALL_RAILTYPE                                        :Tüm demiryolu
 STR_REPLACE_ALL_ROADTYPE                                        :Tüm karayolu araçları
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Lokomatiflerini değiştireceğiniz ray türünü seçin
+STR_REPLACE_HELP_ROADTYPE                                       :{BLACK}Motorlarını değiştirmek istediğin yol tipini seç
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Soldaki değiştiriliyorsa neyle değiştirildiğini göster
 STR_REPLACE_RAIL_VEHICLES                                       :Demiryolu Araçları
 STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrikli Trenler
 STR_REPLACE_MONORAIL_VEHICLES                                   :Monoray Araçları
 STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev Araçları
 
+STR_REPLACE_ROAD_VEHICLES                                       :Yol Araçları
+STR_REPLACE_TRAM_VEHICLES                                       :Tramvay Araçları
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagon kaldırma: {ORANGE}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Otomatik yenilemede tren boyutunun artması gerekiyorsa vagonları kaldır (en önden başlayarak yeterli sayıda vagon silinir)
@@ -4128,7 +4183,13 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vurgulan
 STR_AI_LIST_CANCEL                                              :{BLACK}İptal
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Betiği değiştirme
 
+STR_SCREENSHOT_CAPTION                                          :{WHITE}Ekran görüntüsü al
+STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal ekran görüntüsü
+STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Ekran görüntüsünü tamamen yakınlaştırdı
+STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT                           :{BLACK}Varsayılan yakınlıkta ekran görüntüsü
 STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Tüm haritanın ekran görüntüsünü al
+STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Yükseklik haritası ekran görüntüsü
+STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Küçük harita ekran görüntüsü
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parametreler
@@ -4402,6 +4463,7 @@ STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Uygun ra
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Önce ray kaldırılmalı
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Yol tek yönlü veya kapalı
 STR_ERROR_CROSSING_DISALLOWED_RAIL                              :{WHITE}Bu ray türü için hemzemin geçit yapılamaz
+STR_ERROR_CROSSING_DISALLOWED_ROAD                              :{WHITE}Hemzemin geçite bu yol tipinde izin verilmemektedir.
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Buraya sinyal yapılamıyor...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Buraya ray yapılamıyor...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Buradan ray kaldırılamıyor...
@@ -4421,7 +4483,11 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Yol bura
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Tramvay kaldırılamaz...
 STR_ERROR_THERE_IS_NO_ROAD                                      :{WHITE}... karayolu yok
 STR_ERROR_THERE_IS_NO_TRAMWAY                                   :{WHITE}... tramvay yolu yok
+STR_ERROR_CAN_T_CONVERT_ROAD                                    :{WHITE}Buradaki yol tipi değiştirilemiyor...
+STR_ERROR_CAN_T_CONVERT_TRAMWAY                                 :{WHITE}Tramvay türünü burada değiştiremezsiniz
 STR_ERROR_NO_SUITABLE_ROAD                                      :{WHITE} Uygun yol yok
+STR_ERROR_NO_SUITABLE_TRAMWAY                                   :{WHITE}Uygun olmayan tramvay
+STR_ERROR_INCOMPATIBLE_TRAMWAY                                  :{WHITE}... uyumsuz tramvay
 
 # Waterway construction errors
 STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Buraya kanal yapılamaz...

From e01143edf825ba9be45806523404f50930924955 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Mon, 5 Oct 2020 17:51:44 +0000
Subject: [PATCH 21/31] Update: Translations from eints italian: 1 change by
 AlphaJack romanian: 13 changes by ALEX11BR finnish: 6 changes by VeeraKoo
 slovak: 202 changes by FuryPapaya spanish: 240 changes by MontyMontana

---
 src/lang/finnish.txt  |   9 +-
 src/lang/italian.txt  |   1 +
 src/lang/romanian.txt |  14 +-
 src/lang/slovak.txt   | 328 ++++++++++++++++++------------
 src/lang/spanish.txt  | 451 ++++++++++++++++++++++--------------------
 5 files changed, 462 insertions(+), 341 deletions(-)

diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 1828c9026e..ebf5765400 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -935,6 +935,7 @@ STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksikon peso (
 STR_GAME_OPTIONS_CURRENCY_NTD                                   :Uusi Taiwanin dollari (TWD)
 STR_GAME_OPTIONS_CURRENCY_CNY                                   :Kiinan renminbi (CNY)
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkongin dollari (HKD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Intian rupia (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Kulkuneuvot
@@ -2168,6 +2169,7 @@ STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Väärä
 STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Palvelin on täynnä
 STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sinut on kielletty palvelimelta
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sinut potkittiin pihalle palvelimelta
+STR_NETWORK_ERROR_KICK_MESSAGE                                  :{WHITE}Syy: {STRING}
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Huijaaminen ei ole sallittua tällä palvelimella
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Lähetit liian monta komentoa palvelimelle
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Käytit liian paljon aikaa salasanan syöttämiseen
@@ -2227,6 +2229,7 @@ STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} an
 STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Annoit yhtiölle {1:STRING} {2:CURRENCY_LONG}
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Palvelin sulki istunnon
 STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Palvelin käynnistyy uudelleen...{}Odota, ole hyvä...
+STR_NETWORK_MESSAGE_KICKED                                      :{STRING} potkaistiin ulos. Syy: ({STRING})
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Sisällön lataus
@@ -3668,10 +3671,10 @@ STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Olet my
 STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Viesti kulkuneuvovalmistajalta
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Olemme juuri suunnitelleet uuden {STRING} – oletteko kiinnostunut vuoden yksinoikeutetusta kokeilusta, jotta näemme miten tuote suoriutuu ennen kuin julkistamme sen yleiseen käyttöön?
 
-STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :veturin
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :veturi
 STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE                            :sähköradan veturi
-STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :yksiraiteisen veturin
-STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev-veturin
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :yksiraiteisen veturi
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :Maglev-veturi
 
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :ajoneuvon
 STR_ENGINE_PREVIEW_TRAM_VEHICLE                                 :raitiovaunun
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 7e9d8e3056..9855a0150a 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -937,6 +937,7 @@ STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso messicano
 STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nuovo dollaro taiwanese (NTD)
 STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi cinese (CNY)
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dollaro di Hong Kong (HKD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Rupia indiana (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Automezzi
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index 8be8b275ed..cbb2f5a285 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -838,6 +838,7 @@ STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS                             :{WHITE}{VEHICLE
 STR_NEWS_VEHICLE_HAS_VOID_ORDER                                 :{WHITE}{VEHICLE} nu are nici un ordin
 STR_NEWS_VEHICLE_HAS_DUPLICATE_ENTRY                            :{WHITE}{VEHICLE} are ordine duplicate
 STR_NEWS_VEHICLE_HAS_INVALID_ENTRY                              :{WHITE}{VEHICLE} are o staţie invalidă în ordine
+STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY                            :{WHITE}{VEHICLE} are în ordinele sale un aeroport a cărui pistă este prea scurtă
 
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} este vechi
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} este foarte vechi
@@ -2664,11 +2665,13 @@ STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Număr d
 STR_FRAMERATE_AVERAGE                                           :{WHITE}Medie
 STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Date bazate pe măsurători {COMMA}
 STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} cadre/s
 STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
 ############ Leave those lines in this order!!
 STR_FRAMERATE_VIDEO                                             :{BLACK}Ieșire video:
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Buclă de joc
 STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Manipularea încărcăturilor
 ############ End of leave-in-this-order
 
@@ -3326,6 +3329,7 @@ STR_GROUP_REMOVE_ALL_VEHICLES                                   :Elimină toate
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Redenumeşte un grup
 
+STR_GROUP_PROFIT_THIS_YEAR                                      :Profitul pe anul acesta:
 STR_GROUP_OCCUPANCY                                             :Utilizare curentă:
 STR_GROUP_OCCUPANCY_VALUE                                       :{NUM}%
 
@@ -3374,6 +3378,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Cumpăr
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Cumpără navă
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Cumpără aeronavă
 
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Cumpără și schimbă marfa transportată de aeronavă
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Cumpără vehiculul feroviar selectat. Shift+Click arată costul estimat fără să cumpere vehiculul
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Cumpără autovehiculul selectat. Shift+Click arată costul estimat fără să cumpere autovehiculul
@@ -3986,6 +3991,13 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Alege sc
 STR_AI_LIST_CANCEL                                              :{BLACK}Anulează
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nu schimba scriptul
 
+STR_SCREENSHOT_CAPTION                                          :{WHITE}Capturează ecranul
+STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captură de ecran obișnuită
+STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Captură de hartă la mărime maximă
+STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT                           :{BLACK}Captură de hartă la mărime normală
+STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Captură de hartă întreagă
+STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Captură de hartă topografică
+STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captură de hartă a lumii
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parametrii
@@ -4070,7 +4082,7 @@ STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Doar un
 
 # Screenshot related messages
 STR_WARNING_SCREENSHOT_SIZE_CAPTION                             :{WHITE}Imagine de dimensiune foarte mare
-STR_WARNING_SCREENSHOT_SIZE_MESSAGE                             :{YELLOW}Imaginea capturata va avea o dimensiune de {COMMA} x {COMMA} pixeli. Realizarea unei capturi va dura puțin timp. Dorești să continui?
+STR_WARNING_SCREENSHOT_SIZE_MESSAGE                             :{YELLOW}Imaginea capturată va avea o dimensiune de {COMMA} x {COMMA} pixeli. Realizarea unei capturi va dura ceva timp. Dorești să continui?
 
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Imagine salvată cu succes pe disc în fişierul '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Imaginea nu a putut fi capturată!
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index b000f8ae3e..0d1be6d7f5 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -299,6 +299,8 @@ STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Vybrať
 STR_BUTTON_SORT_BY                                              :{BLACK}Usporiadať
 STR_BUTTON_LOCATION                                             :{BLACK}Poloha
 STR_BUTTON_RENAME                                               :{BLACK}Premenovať
+STR_BUTTON_CATCHMENT                                            :Pokrytie
+STR_TOOLTIP_CATCHMENT                                           :Prepnúť zobrazenie oblasti pokrytia
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zavrieť okno
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Nadpis okna - potiahni pre posun okna
@@ -324,9 +326,10 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP                    :{BLACK}Zapnutí
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Zapnutím tohoto tlačítka sa budú zobrazovať aj skyté lietadlá
 
 # Query window
-STR_BUTTON_DEFAULT                                              :{BLACK}Štandardné
+STR_BUTTON_DEFAULT                                              :{BLACK}Predvolené
 STR_BUTTON_CANCEL                                               :{BLACK}Zrušiť
 STR_BUTTON_OK                                                   :{BLACK}OK
+STR_WARNING_PASSWORD_SECURITY                                   :{YELLOW}Upozornenie: Administrátori serveru môžu prečítať tento text.
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :;+ľščťžýáíé='qwertzuiopúäasdfghjklô§ň\ yxcvbnm,.-
@@ -346,19 +349,19 @@ STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Dátum
 STR_SORT_BY_NAME                                                :Meno
 STR_SORT_BY_PRODUCTION                                          :Produkcia
 STR_SORT_BY_TYPE                                                :Typ
-STR_SORT_BY_TRANSPORTED                                         :Prepravované
+STR_SORT_BY_TRANSPORTED                                         :Prepravené
 STR_SORT_BY_NUMBER                                              :Číslo
-STR_SORT_BY_PROFIT_LAST_YEAR                                    :Zisk v poslednom roku
-STR_SORT_BY_PROFIT_THIS_YEAR                                    :Zisk v tomto roku
+STR_SORT_BY_PROFIT_LAST_YEAR                                    :Profit v minulom roku
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :Profit v tomto roku
 STR_SORT_BY_AGE                                                 :Vek
 STR_SORT_BY_RELIABILITY                                         :Spoľahlivosť
-STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Úplná kapacita podľa typu nákladu
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Kapacita podľa typu nákladu
 STR_SORT_BY_MAX_SPEED                                           :Maximálna rýchlosť
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Hodnota
 STR_SORT_BY_LENGTH                                              :Dlžka
 STR_SORT_BY_LIFE_TIME                                           :Zostávajúca životnost
-STR_SORT_BY_TIMETABLE_DELAY                                     :Oneskorenie cestovného poriadku
+STR_SORT_BY_TIMETABLE_DELAY                                     :Oneskorenie cest. poriadku
 STR_SORT_BY_FACILITY                                            :Typ stanice
 STR_SORT_BY_WAITING_TOTAL                                       :Celkový čakajúci náklad
 STR_SORT_BY_WAITING_AVAILABLE                                   :Dustupný čakajúci náklad
@@ -384,7 +387,7 @@ STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Uložiť
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Zobraziť mapu
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Zobraziť zoznam miest
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Zobraziť dotácie
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS            :{BLACK}Zoznam staníc spoločností
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS            :{BLACK}Zoznam staníc spoločnosti
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}Finančné informácie o spoločnosti
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}Informácie o spoločnosti
 STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK                          :{BLACK}Zobraziť knihu príbehov
@@ -392,10 +395,10 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST                          :{BLACK}Zobrazi
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Grafy
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Hodnotenie spoločností
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Financovať výstavbu nového priemyslu
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Zoznam vlakov spoločnosti. CTRL+klik prepína zoznam skupín/vozidiel
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Zoznam automobilov spoločnosti. CTRL+klik prepína zoznam skupín/vozidiel
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Zoznam lodí spoločnosti. CTRL+klik prepína zoznam skupín/lodí
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Zoznam lietadiel spoločnosti. CTRL+klik prepína zoznam skupín/vozidiel
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Zoznam vlakov spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Zoznam automobilov spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Zoznam lodí spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Zoznam lietadiel spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Priblížiť
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Oddialiť
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Výstavba železnice
@@ -528,6 +531,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Zvuk/Hudba
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Zobraziť poslednú správu/novinku
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Archív správ
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Vymazať všetky správy
 ############ range ends here
 
 ############ range for about menu starts
@@ -535,7 +539,8 @@ STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Informácie o p
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Zobraziť / skryť konzolu
 STR_ABOUT_MENU_AI_DEBUG                                         :Umelá inteligencia / Ladenie skriptov
-STR_ABOUT_MENU_SCREENSHOT                                       :Snímka
+STR_ABOUT_MENU_SCREENSHOT                                       :Snímka obrazovky
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Zobraziť snímkovú frekvenciu
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :O hre 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite zarovnávač
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Prepnúť okrajové boxy
@@ -638,7 +643,7 @@ STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Hodnota
 
 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}Ceny prepravy
 STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL                           :{TINY_FONT}{BLACK}Počet dní na ceste
-STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}Platba za prepravu 10 jednotiek (alebo 10 000 litrov) nákladu cez 20 štvorcov
+STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}Platba za prepravu 10 jednotiek (alebo 10 000 litrov) nákladu cez 20 políčok
 STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Povoliť všetky
 STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Zakázať všetky
 STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Zobraziť všetky tovary v grafickom prehľade cien
@@ -708,6 +713,7 @@ STR_MUSIC_EFFECTS_VOLUME                                        :{TINY_FONT}{BLA
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
 STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
+STR_MUSIC_TITLE_NOMUSIC                                         :{TINY_FONT}{DKGREEN}Hudba nieje dostupná
 STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}"{STRING}"
 STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Stopa
 STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Title
@@ -872,6 +878,7 @@ STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLAC
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Prezident)
 
 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} sponzoroval výstavbu nového mesta {TOWN}!
+STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}Nové mesto {TOWN} bolo postavené!
 
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{G=s}{BIG_FONT}{BLACK}Nov{G "ý" "á" "é"} {STRING} sa začína stavať neďaleko mesta {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{G=s}{BIG_FONT}{BLACK}Nov{G "ý" "á" "é"} {STRING} bude postaven{G "ý" "á" "é"} neďaleko mesta {TOWN}!
@@ -920,6 +927,7 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLAC
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nov{G "ý" "á" "é"} {STRING} dostupn{G "ý" "á" "é"}!  -  {ENGINE}
 
+STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Otvoriť okno skupiny zamerané na skupinu vozidla
 
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} už neprijíma {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} už neprijíma {STRING} alebo {STRING}
@@ -951,76 +959,82 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Mena
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výber menovej jednotky
 
 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra Šterlingov (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Americký Dolár (USD)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra šterlingov (GBP)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Americký dolár (USD)
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japonský Jen (JPY)
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Rakuske Silingy (ATS)
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgicke Franky (BEF)
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Svajciarske Franky (CHF)
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Ceske Koruny (CZK)
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Nemecke marky(DEM)
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danske Koruny (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Špan. Peseta (ESP)
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finske Marky (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Francuz. Frank (FRF)
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Grecke Drachny (GRD)
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Madarske Forinty (HUF)
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandske Koruny (ISK)
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Talianske Liry (ITL)
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Danske Guldeny (NLG)
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norske Koruny (NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poľský Zlotý (PLN)
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumunske Lei (RON)
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruske Ruble (RUR)
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovinske Toliare (SIT)
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Svedske Koruny (SEK)
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turecke Liry (TRY)
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovenske Koruny (SKK)
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazílske Realy (BRL)
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estónsky (EEK)
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litovsky (LTL)
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Juzná Korea - WON (KRW)
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Južná Afrika - RAND (ZAR)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japonský jen (JPY)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Rakúsky šiling (ATS)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgický frank (BEF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Švajčiarský frank (CHF)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Česká koruna (CZK)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Nemecký mark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Dánska koruna (DKK)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Španielské peso (ESP)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Fínsky mark (FIM)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Francúzsky frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Grécka drachma (GRD)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Maďarský forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandská koruna (ISK)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Talianská líra (ITL)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Holandský gulden (NLG)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Nórska koruna (NOK)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poľský zlotý (PLN)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumunský lev (RON)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruský rubeľ (RUR)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovinský toliar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Švédska koruna (SEK)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turecká líra (TRY)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovenská koruna (SKK)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazílsky real (BRL)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estónska koruna (EEK)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litovský litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Juhokórejský won (KRW)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Juhoafrický rand (ZAR)
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Vlastná ...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gruzínske Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gruzínske lari (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iránsky rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ruský rubeľ (nový) (RUB)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexické peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Taiwanský dolár (nový) (NTD)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Čínsky jüan (CNY)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkongský dolár (HKD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indická rupia (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Cestné vozidlá
-STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_TOOLTIP                 :{BLACK}Strana po ktorej jazdia cestne vozidla
-STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT                    :Jazdia nalavo
+STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_TOOLTIP                 :{BLACK}Výber strany, po ktorej jazdia cestné vozidlá
+STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT                    :Jazdia naľavo
 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_RIGHT                   :Jazdia napravo
 
 STR_GAME_OPTIONS_TOWN_NAMES_FRAME                               :{BLACK}Názvy miest
-STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP                    :{BLACK}Vyber štýl názvov miest
+STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP                    :{BLACK}Výber štýlu názvov miest
 
 ############ start of townname region
-STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH                     :Anglicke
-STR_GAME_OPTIONS_TOWN_NAME_FRENCH                               :Francuzke
-STR_GAME_OPTIONS_TOWN_NAME_GERMAN                               :Nemecke
-STR_GAME_OPTIONS_TOWN_NAME_ADDITIONAL_ENGLISH                   :Anglicke (Dalsie)
-STR_GAME_OPTIONS_TOWN_NAME_LATIN_AMERICAN                       :Latinsko-Americke
-STR_GAME_OPTIONS_TOWN_NAME_SILLY                                :Hlupe (anglicky)
-STR_GAME_OPTIONS_TOWN_NAME_SWEDISH                              :Svedske
-STR_GAME_OPTIONS_TOWN_NAME_DUTCH                                :Holandske
-STR_GAME_OPTIONS_TOWN_NAME_FINNISH                              :Finske
-STR_GAME_OPTIONS_TOWN_NAME_POLISH                               :Polske
-STR_GAME_OPTIONS_TOWN_NAME_SLOVAK                               :Slovenske
-STR_GAME_OPTIONS_TOWN_NAME_NORWEGIAN                            :Norske
-STR_GAME_OPTIONS_TOWN_NAME_HUNGARIAN                            :Madarske
-STR_GAME_OPTIONS_TOWN_NAME_AUSTRIAN                             :Rakuske
-STR_GAME_OPTIONS_TOWN_NAME_ROMANIAN                             :Rumunske
-STR_GAME_OPTIONS_TOWN_NAME_CZECH                                :Ceske
-STR_GAME_OPTIONS_TOWN_NAME_SWISS                                :Svajciarske
-STR_GAME_OPTIONS_TOWN_NAME_DANISH                               :Danske
+STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH                     :Anglické (pôvodné)
+STR_GAME_OPTIONS_TOWN_NAME_FRENCH                               :Francúzske
+STR_GAME_OPTIONS_TOWN_NAME_GERMAN                               :Nemecké
+STR_GAME_OPTIONS_TOWN_NAME_ADDITIONAL_ENGLISH                   :Anglické (ďalšie)
+STR_GAME_OPTIONS_TOWN_NAME_LATIN_AMERICAN                       :Latinsko-Americké
+STR_GAME_OPTIONS_TOWN_NAME_SILLY                                :Anglické (hlúpe)
+STR_GAME_OPTIONS_TOWN_NAME_SWEDISH                              :Švédske
+STR_GAME_OPTIONS_TOWN_NAME_DUTCH                                :Holandské
+STR_GAME_OPTIONS_TOWN_NAME_FINNISH                              :Fínske
+STR_GAME_OPTIONS_TOWN_NAME_POLISH                               :Poľské
+STR_GAME_OPTIONS_TOWN_NAME_SLOVAK                               :Slovenské
+STR_GAME_OPTIONS_TOWN_NAME_NORWEGIAN                            :Nórske
+STR_GAME_OPTIONS_TOWN_NAME_HUNGARIAN                            :Maďarské
+STR_GAME_OPTIONS_TOWN_NAME_AUSTRIAN                             :Rakúske
+STR_GAME_OPTIONS_TOWN_NAME_ROMANIAN                             :Rumunské
+STR_GAME_OPTIONS_TOWN_NAME_CZECH                                :České
+STR_GAME_OPTIONS_TOWN_NAME_SWISS                                :Švajčiarské
+STR_GAME_OPTIONS_TOWN_NAME_DANISH                               :Dánske
 STR_GAME_OPTIONS_TOWN_NAME_TURKISH                              :Turecké
-STR_GAME_OPTIONS_TOWN_NAME_ITALIAN                              :Talianske
-STR_GAME_OPTIONS_TOWN_NAME_CATALAN                              :Katalanske
+STR_GAME_OPTIONS_TOWN_NAME_ITALIAN                              :Talianské
+STR_GAME_OPTIONS_TOWN_NAME_CATALAN                              :Katalánske
 ############ end of townname region
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatické ukladanie
-STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vyber interval automatickeho ukladania
+STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Výber intervalu automatického ukladania
 
 ############ start of autosave dropdown
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Vypnuté
@@ -1034,32 +1048,37 @@ STR_GAME_OPTIONS_LANGUAGE                                       :{BLACK}Jazyk
 STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Výber jazyka rozhrania
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Celá obrazovka
-STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaskrtnite, ak chcete hrat OpenTTD na celej obrazovke
+STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaškrtnite, ak chcete hrať OpenTTD na celej obrazovke
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozlíšenie obrazovky
-STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Voľba rozlíšenia obrazovky
+STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Výber rozlíšenia obrazovky
 STR_GAME_OPTIONS_RESOLUTION_OTHER                               :iné
 
 STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :{BLACK}Veľkosť rozhrania
-STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :{BLACK}Vyberte si veľkosť prvkov rozhrania
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP                      :{BLACK}Výber veľkosti prvkov rozhrania
 
-STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normálne
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normálna
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dvojnásobná veľkosť
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Štvornásobná veľkosť
 
+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Veľkosť písma
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Výber veľkosti písma v rozhraní
 
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normálna
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Dvojnásobná veľkosť
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Štvornásobná veľkosť
 
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Základná sada grafiky
-STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zvoľte sadu grafiky, ktorá má byť použitá
+STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Výber sady grafiky, ktorá má byť použitá
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} chýbajúci/poškodený súbor{P "" "y" "ov"}
-STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatočné informácie o základnom grafickom sete
+STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatočné informácie o základnej sade grafiky
 
 STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Základná sada zvukov
-STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vyberte základné zvuky
+STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Výber sady zvukov, ktorá má byť použitá
 STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatočné informácie o základnej sade zvukov
 
 STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Základná sada hudby
-STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Zvoľte sadu základnej hudby
+STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Výber sady hudby, ktorá má byť použitá
 STR_GAME_OPTIONS_BASE_MUSIC_STATUS                              :{RED}{NUM} poškoden{P ý é ých} súbor{P "" y ov}
 STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Dodatočné informácie o základnej sade hudby
 
@@ -1074,7 +1093,7 @@ STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Znížen
 STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zvýšenie hodnoty vašej meny oproti jednej libre (£)
 STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Nastaviť kurz pre vašu menu oproti libre (£)
 
-STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddelovac: {ORANGE}{STRING}
+STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddeľovač: {ORANGE}{STRING}
 STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Nastaviť oddeľovač meny
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Predpona: {ORANGE}{STRING}
@@ -1084,11 +1103,11 @@ STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Nastavi
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Prechod na Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Prechod na Euro: {ORANGE}nikdy
-STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Nastaviť rok, kedy zmeniť menu na Euro
-STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Zmeniť skôr na Euro
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Nastaviť rok, v ktorom sa mena zmení na Euro
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Zmeniť na Euro skôr
 STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Zmeniť na Euro neskôr
 
-STR_CURRENCY_PREVIEW                                            :{LTBLUE}Nahlad: {ORANGE}{CURRENCY_LONG}
+STR_CURRENCY_PREVIEW                                            :{LTBLUE}Náhľad: {ORANGE}{CURRENCY_LONG}
 STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 libier (£) vo vašej mene
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Zmeniť parametre vlastnej meny
 
@@ -1096,13 +1115,13 @@ STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Maximá
 
 STR_NONE                                                        :Žiadny
 STR_FUNDING_ONLY                                                :Iba financovanie
-STR_MINIMAL                                                     :Minimálne
+STR_MINIMAL                                                     :Minimálny
 STR_NUM_VERY_LOW                                                :Veľmi nízky
 STR_NUM_LOW                                                     :Nízky
 STR_NUM_NORMAL                                                  :Normálny
 STR_NUM_HIGH                                                    :Vysoký
-STR_NUM_CUSTOM                                                  :Vlastné
-STR_NUM_CUSTOM_NUMBER                                           :Vlastné ({NUM})
+STR_NUM_CUSTOM                                                  :Vlastný
+STR_NUM_CUSTOM_NUMBER                                           :Vlastný ({NUM})
 
 STR_VARIETY_NONE                                                :Žiadna
 STR_VARIETY_VERY_LOW                                            :Veľmi nízka
@@ -1231,6 +1250,8 @@ STR_CONFIG_SETTING_AUTOSLOPE                                    :Povoliť úprav
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Umožňuje úpravy terénu pod budovami a traťami bez potreby ich odstránenia
 STR_CONFIG_SETTING_CATCHMENT                                    :Povoliť realistickejšiu veľkosť oblasti pokrytia: {STRING}
 STR_CONFIG_SETTING_CATCHMENT_HELPTEXT                           :Má úchytné plochy rôznych veľkostí pre rôzne typy staníc a letísk
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES                     :Stanice spoločnosti môžu obsluhovať priemysel s pripojenými neutrálnymi stanicami: {STRING}
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :Ak je povolené, priemysel s pripojenými stanicami (napríklad Ropné plošiny) môžu obsluhovať aj stanice vlastnené spoločnosťou postavené v blízkosti. Ak je zakázané, tento priemysel môžu obsluhovať iba jeho pripojené stanice. Žiadne blízke stanice vlastnené spoločnosťou ich nebudú môcť obsluhovať a pripojená stanica nebude slúžiť ničomu inému ako priemyslu
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :Odstrániť viaceré mestské cesty, mosty a tunely: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT                       :Uľahči odstraňovanie mestom vlastnených budov a infraštruktúry
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :Maximálna dĺžka vlakov: {STRING}
@@ -1316,6 +1337,8 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Zmena na
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Správa infraštruktúry: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Ak je zapnuté, infraštruktúra generuje výdavky na údržbu. Poplatky rastú proporcionálne s veľkosťou spoločnosti, čo ovplyvňuje viac veľké spoločnosti ako malé.
 
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR                      :Predvolená farba novej spoločnosti: {STRING}
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :Zvoľte začiatočnú farbu pre spoločnosť
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Letiská nikdy neexiprujú: {STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :Povoluje zachovať vsetky typy letísk navzdy.
@@ -1350,6 +1373,8 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Zobraziť poče
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Zobrazí populáciu mesta v jeho názve.
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Hrúbka čiar v grafe: {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Hrúbka čiar v grafe. Tenké čiary sú presnejšie, hrubšie zase lepšie viditeľné.
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME                             :Zobraziť názov NewGRF v okne vozidiel: {STRING}
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT                    :Pridá riadok do zoznamu vozidiel, ktorý ukazuje z akého NewGRF vozidlo pochádza.
 
 STR_CONFIG_SETTING_LANDSCAPE                                    :Krajina: {STRING}
 STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Krajiny definuje základný herný scenár s rôznymi tovarmi a veľkosťami miest. NewGRF a Herný Skript umožňujú ich lepšiu kontrolu
@@ -1363,7 +1388,7 @@ STR_CONFIG_SETTING_INDUSTRY_DENSITY                             :Hustota priemys
 STR_CONFIG_SETTING_INDUSTRY_DENSITY_HELPTEXT                    :Nastavte, koľko má byť vygenerovaného priemyslu a aká úroveň by mala byť zachovaná v priebehu hry
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :Maximálna vzdialenosť od okrajov mapy pre rafinérie: {STRING}
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT               :Rafinérie ropy sú vybudované len na okrajoch mapy, tzn na pobreží pri ostrovných mapách
-STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :Úroveň čiary snehu: {STRING}
+STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :Úroveň hranice snehu: {STRING}
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT                     :Určuje v akej výške začína sneh v subarktickej krajine. Sneh tiež ovplyvňuje generáciu priemyslu a požiadaviek rastu mesta
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :Členitosť terénu : {STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT                :(Len TerraGenesis) Vyberte hustotu kopcov: Rovinaté krajiny majú menej, viac pozdĺžných kopcov. Hornaté krajiny majú veľa kopcov, ktoré sa môžu opakovať
@@ -1400,6 +1425,12 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT                :Farby terénu n
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :Zelená
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :Tmavozelená
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Fialová
+STR_CONFIG_SETTING_SCROLLMODE                                   :Správanie pohľadu pri posúvaní myšou: {STRING}
+STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :Reakcia na posúvanie (scrollovanie) na mape
+STR_CONFIG_SETTING_SCROLLMODE_DEFAULT                           :Pohyb pohľadu s pravým tlačidlom myši, poloha myši uzamknutá
+STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :Pohyb mapy s pravým tlačidlom myši, poloha myši uzamknutá
+STR_CONFIG_SETTING_SCROLLMODE_RMB                               :Pohyb mapy s pravým tlačidlom myši
+STR_CONFIG_SETTING_SCROLLMODE_LMB                               :Pohyb mapy s ľavým tlačidlom myši
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Plynulé posúvanie pohľadu: {STRING}
 STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Nastaví ako bude reagovať posúvanie na špecifickú pozíciu po kliknutí na minimapu, alebo po zadaní príkazu na presun na zadaný objekt. Ak je zapnuté, pohľad sa presúva plynulo. Ak je vypnuté, pohľad skočí priamo na zadané miesto/objekt.
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :Zobraziť údaje o rozmeroch pri výstavbe: {STRING}
@@ -1431,6 +1462,8 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Príkaz + klik
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :CTRL + klik
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Žiadna
 
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE                        :Zatvoriť okno kliknutím pravým tlačidlom: {STRING}
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT               :Zatvorí okno kliknutím pravým tlačidlom do vnútra. Prestane ukazovať nápovedu pri kliknutí pravým tlačidlom!
 
 STR_CONFIG_SETTING_AUTOSAVE                                     :Automatické ukladanie: {STRING}
 STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT                            :Vyberte interval pre automatické ukladanie hry
@@ -1518,6 +1551,9 @@ STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :Povoliť AI-ov
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER_HELPTEXT                   :Povoliť AI počítačovým hráčom hrať "Hru viacerých hráčov".
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :#op kódov pred uspaním skriptu: {STRING}
 STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES_HELPTEXT                  :Maximálne počet krokov skriptu počas 1 ťahu.
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY                            :Maximálne využitie pamäte na skript: {STRING}
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT                   :Koľko pamäte môže jeden skript spotrebovať pred násilným ukončením. Pri veľkých mapách bude možno potrebné túto hodnotu zvýšiť.
+STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE                      :{COMMA} MiB
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Servisné intervaly v percentách: {STRING}
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Zvoľte či servisovanie vozidiel bude podliehať času od posledného servisu, alebo poklesom percenta návratnosti z celkovej maximálnej návratnosti.
@@ -1576,10 +1612,16 @@ STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :Plné
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :Zobraziť správy farebne od roku: {STRING}
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :Rok od ktorého začnú vychádzať farebné noviny. Pred týmto rokom budú noviny čierno/biele.
 STR_CONFIG_SETTING_STARTING_YEAR                                :Začiatok hry v roku: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR                                  :Rok ukončenia skórovania: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Rok v ktorom končí hra pre zaznamenanie skóre. Na konci tohto roku sa nahrá skóre spoločnosti a zobrazí sa tabuľka s najvyšším skóre, avšak hráči môžu v hre naďalej pokračovať.{}Ak je tento rok pred začiatkom hry, tabuľka sa nikdy nezobrazí.
+STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
+STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Nikdy
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :Povoliť zmeny ekonomiky (viac menších zmien): {STRING}
 STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT                      :Ak je zapnuté, zmeny v produkcii sa budú diať častejšie v malých krokoch.
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Povoliť kupovanie podielov v ostatných spoločnostiach: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Ak je zapnuté, povolí sa nákup a predaj podielov spoločností. Podiely budú prístupné len pre spoločnosti od urcitého veku.
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Minimálny vek spoločnosti na obchodovanie s podielmi: {STRING}
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT                :Určuje minimálny vek spoločnosti na to, aby od nej mohli ostatné spoločnosti kupovať a predavať podiely.
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :Percentáž profitu na zaplatenie podávacieho systému: {STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :Percento príjmov dať na strednú ´nohu´ vo feeder systémoch, získate väčšiu kontrolu nad príjmamy
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :Pri ťahaní, umiestni semafóry každý: {STRING} diel
@@ -1620,6 +1662,10 @@ STR_CONFIG_SETTING_TOWN_FOUNDING_HELPTEXT                       :Povolením nast
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :zakázané
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :povolené
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :povolené, vlastné rozloženie mesta
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :Generovanie nákladu v mestách: {STRING}
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :Množstvo nákladu produkovaného domami v mestách, podmienené celkovou populáciou mesta.{}Kvadratický rast: Mesto s dvojnásobnou veľkosťou produkuje štvornásobné množstvo cestujúcich.{}Lineárny rast: Mesto s dvojnásobnou veľkosťou produkuje dvojnásobné množstvo cestujúcich.
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :Kvadratické
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT                   :Lineárne
 
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT                         :Umiestnenie stromov počas hry: {STRING}
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT                :Riadi náhodný výskyt stromov počas hry. Toto môže ovplyvniť priemysel úzko spojený s rastom stromov ako napríklad Píla.
@@ -1819,7 +1865,8 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skontrol
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Zobraz umelú inteligenciu a nastavenia skriptu
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Ukončiť 'OpenTTD'
 
-STR_INTRO_TRANSLATION                                           :{BLACK}V preklade chýba {NUM} v{P eta ety iet}. Prosím pomôžte urobiť OpenTTD lepším a prihláste sa ako prekladateľ. Viac detailov v readme.txt
+STR_INTRO_BASESET                                               :{BLACK}Vo vybranej základnej sade grafiky chýba {NUM} prv{P ok ky kov}. Prosím skontrolujte aktualizácie sady grafiky.
+STR_INTRO_TRANSLATION                                           :{BLACK}V preklade chýba {NUM} reťaz{P ec ce cov}. Prosím pomôžte urobiť OpenTTD lepším a prihláste sa ako prekladateľ. Viac detailov v readme.txt
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Koniec
@@ -1860,6 +1907,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Zmeniť
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Povoliť zmenu objemu výroby: {ORANGE}{STRING}
 
 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} - Farebná schéma
 
 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Zobraziť všeobecné farebné schémy
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Zobraziť farebné schémy pre vlaky
@@ -2057,7 +2105,7 @@ STR_NETWORK_LANG_POLISH                                         :Polsky
 STR_NETWORK_LANG_PORTUGUESE                                     :Portugalsky
 STR_NETWORK_LANG_ROMANIAN                                       :Rumunsky
 STR_NETWORK_LANG_RUSSIAN                                        :Rusky
-STR_NETWORK_LANG_SLOVAK                                         :Slovensky
+STR_NETWORK_LANG_SLOVAK                                         :Slovenský
 STR_NETWORK_LANG_SLOVENIAN                                      :Slovinsky
 STR_NETWORK_LANG_SPANISH                                        :Spanielsky
 STR_NETWORK_LANG_SWEDISH                                        :Svédsky
@@ -2142,15 +2190,15 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vložte
 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neukladať zadané heslo
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Nastaviť spoločnosti nové heslo
-STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Heslo spolocnosti
-STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Štandardné heslo spoločnosti
-STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Použit toto heslo ako štandardné heslo spoločnosti
+STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Heslo spoločnosti
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Predvolené heslo spoločnosti
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Použit toto heslo ako predvolené pre nové spoločnosti
 
 # Network company info join/password
 STR_COMPANY_VIEW_JOIN                                           :{BLACK}Pridať sa
 STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Pridať sa a hrať za túto spoločnosť
 STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Heslo
-STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Ochráň heslom svoju spoločnosť, aby zabránilo pripojeniu neoprávnených užívateľov
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Ochrániť svoju spoločnosť heslom, aby sa zabránilo pripojeniu neoprávnených užívateľov
 STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Nastavte heslo spoločnosti
 
 # Network chat
@@ -2743,6 +2791,8 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-{STRING} team OpenTTD
 
 # Framerate display window
+STR_FRAMERATE_CAPTION                                           :Snímková frekvencia
+STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
 ############ Leave those lines in this order!!
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
@@ -2777,17 +2827,17 @@ STR_SAVELOAD_OSKTITLE                                           :{BLACK}Zadajte
 # World generation
 STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Vytvorenie krajiny
 STR_MAPGEN_MAPSIZE                                              :{BLACK}Veľkosť mapy:
-STR_MAPGEN_MAPSIZE_TOOLTIP                                      :{BLACK}Vybranie veľkosti mapy v štvorcoch. Počet dostupných štvorcov bude o trochu nižší.
+STR_MAPGEN_MAPSIZE_TOOLTIP                                      :{BLACK}Výber veľkosti mapy v políčkach. Počet dostupných políčok bude o trochu nižší
 STR_MAPGEN_BY                                                   :{BLACK}*
 STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Počet miest:
 STR_MAPGEN_DATE                                                 :{BLACK}Rok:
 STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Počet priemyslu:
-STR_MAPGEN_MAX_HEIGHTLEVEL                                      :{BLACK}Maximálna výška mapy
-STR_MAPGEN_MAX_HEIGHTLEVEL_UP                                   :{BLACK}Zvýš maximálnu výšku hôr na mape o jedno
-STR_MAPGEN_MAX_HEIGHTLEVEL_DOWN                                 :{BLACK}Zníž maximálnu výšku hôr na mape o jedno
-STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Výška línie snehu:
-STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Zvýšiť výšku snehovej čiary
-STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Znížiť výšku snehovej čiary
+STR_MAPGEN_MAX_HEIGHTLEVEL                                      :{BLACK}Maximálna výška mapy:
+STR_MAPGEN_MAX_HEIGHTLEVEL_UP                                   :{BLACK}Zvýšiť maximálnu výšku hôr na mape o jedno
+STR_MAPGEN_MAX_HEIGHTLEVEL_DOWN                                 :{BLACK}Znížiť maximálnu výšku hôr na mape o jedno
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Výška hranice snehu:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Zvýšiť výšku hranice snehu o jedno
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Znížiť výšku hranice snehu o jedno
 STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generátor krajiny:
 STR_MAPGEN_TREE_PLACER                                          :{BLACK}Generátor stromov:
 STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Typ terénu:
@@ -2815,7 +2865,7 @@ STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}Velkost:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} x {NUM}
 
 STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT                           :{WHITE}Zmeniť maximálnu výšku mapy
-STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Zmeniť výšku línie snehu
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Zmeniť výšku hranice snehu
 STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Zmenit rok zaciatku hry
 
 # SE Map generation
@@ -3033,6 +3083,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Zadajte
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Mestá
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Žiadne -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Názvy miest - kliknite na názov pre pohľad na mesto. Ctrl+klik otvorí nové okno s pohľadom na mesto
 STR_TOWN_POPULATION                                             :{BLACK}Svetová populácia: {COMMA}
 
@@ -3040,6 +3091,7 @@ STR_TOWN_POPULATION                                             :{BLACK}Svetová
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Mesto)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Obyvateľstvo: {ORANGE}{COMMA}{BLACK}  Domov: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} minulý mesiac: {ORANGE}{COMMA}{BLACK}  najviac: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Tovar potrebný k rozrastu mesta:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} potrebný
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} potrebné v zime
@@ -3064,6 +3116,8 @@ STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :Premenovať mes
 
 # Town local authority window
 STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}Miestna správa {TOWN}
+STR_LOCAL_AUTHORITY_ZONE                                        :{BLACK}Oblasť
+STR_LOCAL_AUTHORITY_ZONE_TOOLTIP                                :{BLACK}Zobraziť oblasť miestnej správy mesta
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Hodnotenie dopravných spoločností:
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Dostupné činnosti:
@@ -3092,6 +3146,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Podplat
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Ciele
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Globálne ciele
+STR_GOALS_SPECTATOR                                             :Globálne ciele
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globálne ciele:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Nič -
@@ -3273,8 +3328,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Farebná
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Stroje:
 STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vlak{P "" y ov}
 STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automobil{P "" y ov}
-STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lietad{P lo la iel}
-STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} lod{P "" e i}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lietad{P lo lá iel}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} lo{P ď de dí}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Žiadne
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Hodnota spolocnosti: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% vlastní {COMPANY})
@@ -3340,7 +3395,13 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Vycentro
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Úroveň produkcie: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}Priemysel oznámil blížiace sa uzatvorenie!
 
+STR_INDUSTRY_VIEW_REQUIRES_N_CARGO                              :{BLACK}Vyžaduje: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Produkuje: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}
 
+STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Vyžaduje:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO                                  :{YELLOW}{STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT                           :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} čak{P á ajú á}{STRING}
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmeniť produkciu (násobky 8, až do 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Zmeniť úroveň produkcie (percentuálne, až do 800%)
@@ -3348,25 +3409,25 @@ STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Zmeniť
 # Vehicle lists
 STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vlak{P "" y ov}
 STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automobil{P "" y ov}
-STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lod{P "" e i}
-STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lietad{P lo la iel}
+STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lo{P ď de dí}
+STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lietad{P lo lá iel}
 
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlaky - kliknut na vlak pre informacie
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automobily - kliknutím na vozidlo sa zobrazia detaily
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Lode - kliknut pre informacie
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lietadlo - kliknut pre informacie
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlaky - kliknúť pre zobrazenie detailov
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automobily - kliknúť pre zobrazenie detailov
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Lode - kliknúť pre zobrazenie detailov
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lietadlá - kliknúť pre zobrazenie detailov
 
-STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Zisk tento rok: {CURRENCY_LONG} (posledný rok: {CURRENCY_LONG})
+STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Profit tento rok: {CURRENCY_LONG} (minulý rok: {CURRENCY_LONG})
 
 STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :Dostupné vlaky
-STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :Dostupné vozidlá
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :Dostupné automobily
 STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :Dostupné lode
 STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :Dostupné lietadlá
-STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Zobraziť zoznam dostupných dizajnov rušňov pre tento typ.
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Zobraziť zoznam dostupných dizajnov pre tento typ vozidla
 
 STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Možnosti
-STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Zadat príkazy všetkým vozidlám v zozname
-STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vymena vozidiel
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Zadať príkazy všetkým vozidlám v zozname
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vymeniť vozidlá
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Vykonať servis
 
 STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Poslať do depa
@@ -3374,37 +3435,43 @@ STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Poslat do gará
 STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Poslat do lodenice
 STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Poslať do hangáru
 
-STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klikni pre zastavenie všetkých vozidiel v zozname
-STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klikni pre spustenie všetkých vozidiel v zozname
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Zastaviť všetky vozidlá v zozname
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Spustiť všetky vozidlá v zozname
 
-STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Zdielané príkazy {COMMA} vozid{P la iel iel}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Zdieľané príkazy {COMMA} vozid{P la iel iel}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Všetky vlaky
-STR_GROUP_ALL_ROAD_VEHICLES                                     :Všetky cestné vozidlá
+STR_GROUP_ALL_ROAD_VEHICLES                                     :Všetky automobily
 STR_GROUP_ALL_SHIPS                                             :Všetky lode
 STR_GROUP_ALL_AIRCRAFTS                                         :Všetky lietadlá
 
 STR_GROUP_DEFAULT_TRAINS                                        :Nezaradené vlaky
-STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Nezaradené vozidlá
+STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Nezaradené automobily
 STR_GROUP_DEFAULT_SHIPS                                         :Nezaradené lode
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Nezaradené lietadlá
 
+STR_GROUP_COUNT_WITH_SUBGROUP                                   :{TINY_FONT}{COMMA} (+{COMMA})
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Skupiny - klikni na skupinu pre zobrazenie všetkých vozidiel skupiny. Ťahaj a Pusti pre usporiadanie hierarchiu v skupine
-STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klikni pre vytvorenie skupiny
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Skupiny - klikni na skupinu pre zobrazenie všetkých vozidiel skupiny. Ťahaj a pusti pre usporiadanie hierarchie v skupine
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Vytvoriť skupinu
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Zrušiť vybranú skupinu
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Premenovať vybranú skupinu
-STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikni pre znemožnenie automatického nahradzovania v skupine
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Zmeniť farebnú schému vybranej skupiny
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Znemožniť automatické nahradzovanie v skupine
 
 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Vymazať skupinu
 STR_GROUP_DELETE_QUERY_TEXT                                     :{WHITE}Ste si istý, že chcete vymazať túto skupinu a jej podskupiny?
 
-STR_GROUP_ADD_SHARED_VEHICLE                                    :Pridat zdielané vozidlá
+STR_GROUP_ADD_SHARED_VEHICLE                                    :Pridať zdieľané vozidlá
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Odstrániť všetky vozidlá
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Premenovať skupinu
 
+STR_GROUP_PROFIT_THIS_YEAR                                      :Profit v tomto roku:
+STR_GROUP_PROFIT_LAST_YEAR                                      :Profit v minulom roku:
+STR_GROUP_OCCUPANCY                                             :Súčasné využitie:
+STR_GROUP_OCCUPANCY_VALUE                                       :{NUM}%
 
 # Build vehicle window
 STR_BUY_VEHICLE_TRAIN_RAIL_CAPTION                              :Nove vlaky
@@ -3930,7 +3997,7 @@ STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Skok na príkaz
 STR_ORDER_CONDITIONAL_NUM                                       :Skok na príkaz {COMMA} ak {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Skok na príkaz {COMMA} ak {STRING} {STRING}
 
-STR_INVALID_ORDER                                               :{RED} (Neplatny prikaz)
+STR_INVALID_ORDER                                               :{RED} (Neplatný príkaz)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Cestovný poriadok)
@@ -4064,6 +4131,13 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vybrať
 STR_AI_LIST_CANCEL                                              :{BLACK}Zrušiť
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemeniť skript
 
+STR_SCREENSHOT_CAPTION                                          :Vytvoriť snímku obrazovky
+STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normálna snímka
+STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Plne priblížená snímka
+STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT                           :{BLACK}Predvolene priblížená snímka
+STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Snímka celej mapy
+STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Snímka výškovej mapy
+STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Snímka minimapy
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parametre
@@ -4148,7 +4222,7 @@ STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Bola ná
 
 # Screenshot related messages
 STR_WARNING_SCREENSHOT_SIZE_CAPTION                             :{WHITE}Obrovská snímka
-STR_WARNING_SCREENSHOT_SIZE_MESSAGE                             :{YELLOW}Screenshot bude mať rozlíšenie {COMMA} x {COMMA} pixelov. Jeho vytvorenie ale môže chvíľu trvať. Naozaj chcete pokračovať
+STR_WARNING_SCREENSHOT_SIZE_MESSAGE                             :{YELLOW}Snímka bude mať rozlíšenie {COMMA} x {COMMA} pixelov. Jej vytvorenie ale môže chvíľu trvať. Naozaj chcete pokračovať?
 
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Snímka bola uložená na disk ako '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Uloženie snímky zlyhalo!
@@ -4238,9 +4312,9 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... mô
 STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... môže byť postavené len v blízkosti centra mesta
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... môže byť postavené len v nízkych oblastiach
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{G=s}{WHITE}... môže byť umiestnené len v blízkosti okrajov mapy
-STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... les sa môže sadiť len nad čiarou snehu
-STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... môže byť postavené len nad čiarou snehu
-STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... môže byť postavené len pod čiarou snehu
+STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... les sa môže sadiť len nad hranicou snehu
+STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... môže byť postavené len nad hranicou snehu
+STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... môže byť postavené len pod hranicou snehu
 
 STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES                     :{WHITE}Nenašli sa žiadne vhodné miesta pre '{STRING}'
 STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION         :{WHITE}Pre získanie lepšej mapy zmeňte parametre jej generovania
@@ -4516,8 +4590,10 @@ STR_BASEGRAPHICS_DOS_DE_DESCRIPTION                             :Pôvodná grafi
 STR_BASEGRAPHICS_WIN_DESCRIPTION                                :Pôvodná grafika Transport Tycoon Deluxe (Windows).
 STR_BASESOUNDS_DOS_DESCRIPTION                                  :Pôvodné zvuky Transport Tycoon Deluxe (DOS).
 STR_BASESOUNDS_WIN_DESCRIPTION                                  :Pôvodné zvuky Transport Tycoon Deluxe (Windows).
-STR_BASESOUNDS_NONE_DESCRIPTION                                 :Zvuková sada neobsahujúca zvuky.
+STR_BASESOUNDS_NONE_DESCRIPTION                                 :Sada zvukov neobsahujúca zvuky.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Pôvodná hudba z Transport Tycoon Deluxe (Windows).
+STR_BASEMUSIC_DOS_DESCRIPTION                                   :Pôvodná hudba z Transport Tycoon Deluxe (DOS).
+STR_BASEMUSIC_TTO_DESCRIPTION                                   :Pôvodná hudba z Transport Tycoon (DOS).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Sada hudby neobsahujúca hudbu.
 
 ##id 0x2000
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 3ea15362cb..168412a2b9 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -243,13 +243,13 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Cerrar v
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título de la ventana - arrastre para moverla
 STR_TOOLTIP_SHADE                                               :{BLACK}Ocultar ventana - mostrar solo título de la ventana
 STR_TOOLTIP_DEBUG                                               :{BLACK}Mostrar información de depuración NewGRF
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar ventana al tamaño por defecto. Ctrl+Click permite almacenar el tamaño actual como tamaño por defecto
-STR_TOOLTIP_STICKY                                              :{BLACK}Esta ventana no se cerrará tras usar el comando 'Cerrar Todas las Ventanas'. Ctrl+Click permite guardar el estado como estado por defecto
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimensionar ventana al tamaño por defecto. Ctrl+Clic permite almacenar el tamaño actual como tamaño por defecto
+STR_TOOLTIP_STICKY                                              :{BLACK}Esta ventana no se cerrará tras usar el comando 'Cerrar Todas las Ventanas'. Ctrl+Clic permite guardar el estado como estado por defecto
 STR_TOOLTIP_RESIZE                                              :{BLACK}Pulse y arrastre para redimensionar la ventana
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Cambiar entre tamaño de ventana grande/pequeño
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de desplazamiento - mueve la lista arriba/abajo
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de desplazamiento - mueve la lista izquierda/derecha
-STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demoler edificios, etc. en un área de terreno. Ctrl permite seleccionar un área diagonalmente. Shift permite mostrar una estimación del precio
+STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demoler edificios, etc. en un área de terreno. Ctrl permite seleccionar un área diagonalmente. Mayús permite mostrar una estimación del precio
 
 # Show engines button
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN                           :{BLACK}Mostrar ocultos
@@ -332,10 +332,10 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST                          :{BLACK}Mostrar
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Mostrar gráficos
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Mostrar tabla de clasificación de empresas
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Aportar fondos para construir una nueva industria
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Mostrar lista de trenes de la empresa. Ctrl+Click hace que no aparezca la lista de grupos
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Mostrar lista de vehículos de carretera de la empresa. Ctrl+Click hace que no aparezca la lista de grupos
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Mostrar lista de barcos de la empresa. Ctrl+Click hace que no aparezca la lista de grupos
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Mostrar lista de aeronaves de la empresa. Ctrl+Click hace que no aparezca la lista de grupos
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Mostrar lista de trenes de la empresa. Ctrl+Clic hace que no aparezca la lista de grupos
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Mostrar lista de vehículos de carretera de la empresa. Ctrl+Clic hace que no aparezca la lista de grupos
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Mostrar lista de barcos de la empresa. Ctrl+Clic hace que no aparezca la lista de grupos
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Mostrar lista de aeronaves de la empresa. Ctrl+Clic hace que no aparezca la lista de grupos
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Acercar vista
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Alejar vista
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Construir ferrocarril
@@ -355,16 +355,16 @@ STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Editor de escenarios
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Retrocede la fecha de inicio en un año
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Avanza la fecha de inicio en un año
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE                           :{BLACK}Click para fijar el año inicial
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE                           :{BLACK}Clic para fijar el año inicial
 STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY         :{BLACK}Mostrar mapa, guía de municipios
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Generación de terreno
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Creación de municipios
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Generación de industria
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Construcción de carreteras
 STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION                          :{BLACK}Construcción de tranvía
-STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Plantar árboles. Shift permite mostrar una estimación del precio
+STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Plantar árboles. Mayús permite mostrar una estimación del precio
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Colocar cartel
-STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Colocar objeto. Shift permite mostrar una estimación del precio
+STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Colocar objeto. Mayús permite mostrar una estimación del precio
 
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Guardar escenario
@@ -594,7 +594,7 @@ STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Mostrar
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Leyenda de los gráficos
-STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Click aquí para intercambiar la entrada de la empresa
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Clic aquí para intercambiar la entrada de la empresa
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Tabla de Clasificación de Empresas
@@ -717,9 +717,9 @@ STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP                     :{BLACK}Mostrar
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Mostrar rutas de transporte en el mapa
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Mostrar vegetación en el mapa
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Mostrar propietarios de terrenos en el mapa
-STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Click en un tipo de industria para mostrarlo/ocultarlo. Ctrl+Click oculta todos los tipos excepto el seleccionado. Ctrl+Click de nuevo en el mismo tipo muestra todos los tipos de industrias
-STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Click en una empresa para mostrar/ocultar sus propiedades. Ctrl+Click oculta todas las empresas excepto la seleccionada. Ctrl+Click de nuevo en la misma empresa muestra todas las empresas
-STR_SMALLMAP_TOOLTIP_CARGO_SELECTION                            :{BLACK}Click en una carga permite activar o desactivar su visualización. Ctrl+Click deshabilita todas las cargas excepto la seleccionada. Un segundo Ctrl+Click habilita la visualización de todos los tipos de carga
+STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Clic en un tipo de industria para mostrarlo/ocultarlo. Ctrl+Clic oculta todos los tipos excepto el seleccionado. Ctrl+Clic de nuevo en el mismo tipo muestra todos los tipos de industrias
+STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Clic en una empresa para mostrar/ocultar sus propiedades. Ctrl+Clic oculta todas las empresas excepto la seleccionada. Ctrl+Clic de nuevo en la misma empresa muestra todas las empresas
+STR_SMALLMAP_TOOLTIP_CARGO_SELECTION                            :{BLACK}Clic en una carga permite activar o desactivar su visualización. Ctrl+Clic deshabilita todas las cargas excepto la seleccionada. Un segundo Ctrl+Clic habilita la visualización de todos los tipos de carga
 
 STR_SMALLMAP_LEGENDA_ROADS                                      :{TINY_FONT}{BLACK}Carreteras
 STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINY_FONT}{BLACK}Ferrocarriles
@@ -865,6 +865,7 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLAC
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}¡Nuev{G o a} {STRING} ahora disponible!  -  {ENGINE}
 
+STR_NEWS_SHOW_VEHICLE_GROUP_TOOLTIP                             :{BLACK}Abre la lista de vehículos centrada en el grupo del vehículo
 
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} ya no acepta {STRING}
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} ya no acepta {STRING} ni {STRING}
@@ -896,45 +897,46 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unidad d
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selección de unidad de moneda
 
 ############ start of currency region
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra Británica (GBP)
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar Americano (USD)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra británica (GBP)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólar estadounidense (USD)
 STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yen Japonés (¥)
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Chelín Austriaco (ATS)
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franco Belga (BEF)
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franco Suizo (CHF)
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Corona Checa (CZK)
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marco Alemán (DEM)
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Corona Danesa (DKK)
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta Española (ESP)
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Markka Finlandés (FIM)
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franco Francés (FRF)
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma Griego (GRD)
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florín Húngaro (HUF)
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Corona Islandesa (ISK)
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Italiana (ITL)
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Florín Holandés (NLG)
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Corona Noruega(NOK)
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty Polaco (PLN)
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu Rumano (RON)
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rublo Ruso (RUR)
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tólar Esloveno (SIT)
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Corona Sueca (SEK)
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira Turca (TRY)
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Corona Eslovaca
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real Brasileño (BRL)
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Krooni Estonio (EEK)
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litas Lituana (LTL)
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Won Surcoreano (KRW)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yen japonés (¥)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Chelín austriaco (ATS)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franco belga (BEF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franco suizo (CHF)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Corona checa (CZK)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marco alemán (DEM)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Corona danesa (DKK)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta española (ESP)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Markka finlandés (FIM)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franco francés (FRF)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma griego (GRD)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florín húngaro (HUF)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Corona islandesa (ISK)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira italiana (ITL)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Florín holandés (NLG)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Corona noruega(NOK)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty polaco (PLN)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu rumano (RON)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rublo ruso (RUR)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tólar esloveno (SIT)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Corona sueca (SEK)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira turca (TRY)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Corona eslovaca
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real brasileño (BRL)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Krooni estonio (EEK)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litas lituana (LTL)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Won surcoreano (KRW)
 STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Rand sudafricano (ZAR)
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Personalizada...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiano (GEL)
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraní (IRR)
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nuevo Rublo Ruso (RUB)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari georgiano (GEL)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial iraní (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nuevo rublo ruso (RUB)
 STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso mexicano (MXN)
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nuevo Dólar de Taiwan (NTD)
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi Chino (CNY)
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dólar de Hong Kong (HKD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nuevo dólar taiwanés (NTD)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi chino (CNY)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dólar hongkonés (HKD)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Rupia india (INR)
 ############ end of currency region
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Vehículos de carretera
@@ -1207,7 +1209,7 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS_HELPTEXT        :Pendiente de la
 STR_CONFIG_SETTING_FORBID_90_DEG                                :Prohibir a trenes realizar giros de 90°: {STRING}
 STR_CONFIG_SETTING_FORBID_90_DEG_HELPTEXT                       :Los giros de 90 grados ocurren cuando una vía en sentido horizontal está seguida por una vía en sentido vertical, haciendo que el tren gire 90 grados al pasar de una a otra en lugar de los 45 grados habituales en otras combinaciones.
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :Permitir unir estaciones no adyacentes: {STRING}
-STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT               :Permite añadir partes a una estación sin tener que estar en contacto directamente con las partes existentes. Necesita pulsar Ctrl+Click al añadir las nuevas partes
+STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS_HELPTEXT               :Permite añadir partes a una estación sin tener que estar en contacto directamente con las partes existentes. Necesita pulsar Ctrl+Clic al añadir las nuevas partes
 STR_CONFIG_SETTING_INFLATION                                    :Inflación: {STRING}
 STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Activa la inflación económica, lo cual hace que los costes aumenten ligeramente más rápido que los beneficios
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Longitud máxima de puentes: {STRING}
@@ -1304,11 +1306,13 @@ STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE                        :{COMMA} segundo
 STR_CONFIG_SETTING_HOVER_DELAY                                  :Mostrar mensajes de ayuda: {STRING}
 STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT                         :Tiempo necesario con el ratón sobre un elemento de la interfaz para que esta muestre su mensaje de ayuda. De forma alternativa, se puede escoger mostrar estos mensajes al pulsar el botón derecho cuando el valor de esta opción ha sido establecido a 0.
 STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :Mantener ratón durante {COMMA} milisegundo{P 0 "" s}
-STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Click derecho
+STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :Clic derecho
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :Mostrar la población de un municipio en su etiqueta: {STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT                 :Muestra la población de los municipios en su etiqueta sobre el mapa
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :Grosor de las líneas en los gráficos: {STRING}
 STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT                :Grosor de las líneas en los gráficos. Una línea fina es más precisa, una línea más gruesa es más fácil de distinguir
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME                             :Mostrar el nombre del NewGRF en la ventana de compra de vehículos: {STRING}
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT                    :Añade una línea a la ventana de compra de vehículos, mostrando a qué NewGRF pertenece el vehículo seleccionado.
 
 STR_CONFIG_SETTING_LANDSCAPE                                    :Terreno: {STRING}
 STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :Los terrenos definen escenarios con diferentes tipos de carga y requisitos de crecimiento de municipios. Es posible modificarlos empleando NewGRF y scripts de juego
@@ -1366,7 +1370,7 @@ STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :Recorrer mapa c
 STR_CONFIG_SETTING_SCROLLMODE_RMB                               :Mueve el mapa con el botón derecho del ratón
 STR_CONFIG_SETTING_SCROLLMODE_LMB                               :Mueve el mapa con el botón izquierdo del ratón
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Desplazamiento de vista suavizado: {STRING}
-STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Controla la forma en la que la vista principal se mueve a una posición específica como resultado de hacer click en el mapa o al enviar la orden de moverse a un objeto determinado del mapa. Si se activa, la vista se mueve de forma suave. Si se desactiva, la vista se mueve directamente al destino
+STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Controla la forma en la que la vista principal se mueve a una posición específica como resultado de hacer clic en el mapa o al enviar la orden de moverse a un objeto determinado del mapa. Si se activa, la vista se mueve de forma suave. Si se desactiva, la vista se mueve directamente al destino
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :Mostrar medidas usando las herramientas de construcción: {STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT                     :Muestra distancias en número de casillas y las diferencias de altura al arrastrar durante operaciones de construcción
 STR_CONFIG_SETTING_LIVERIES                                     :Ver tipos específicos para cada vehículo: {STRING}
@@ -1386,18 +1390,18 @@ STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER_HELPTEXT              :Controla la sen
 STR_CONFIG_SETTING_OSK_ACTIVATION                               :Teclado en pantalla: {STRING}
 STR_CONFIG_SETTING_OSK_ACTIVATION_HELPTEXT                      :Permite seleccionar el método para abrir el teclado en pantalla para escribir texto empleando solamente el puntero. Esta opción está pensada para dispositivos pequeños sin teclado físico
 STR_CONFIG_SETTING_OSK_ACTIVATION_DISABLED                      :Deshabilitado
-STR_CONFIG_SETTING_OSK_ACTIVATION_DOUBLE_CLICK                  :Doble click
-STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK_FOCUS            :Un solo click (con foco)
-STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK                  :Un solo click (inmediatamente)
+STR_CONFIG_SETTING_OSK_ACTIVATION_DOUBLE_CLICK                  :Doble clic
+STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK_FOCUS            :Un solo clic (si está enfocado)
+STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK                  :Un solo clic (inmediatamente)
 
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU                          :Emulación del botón derecho: {STRING}
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT                 :Selecciona el método para emular los clicks con el botón derecho del ratón
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Command+Click
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl+Click
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT                 :Selecciona el método para emular los clics con el botón derecho del ratón
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Comando+Clic
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl+Clic
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Desactivado
 
-STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE                        :Cerrar ventana con click derecho: {STRING}
-STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT               :Cierra una ventana al hacer click derecho dentro. ¡Quita la información al hacer click derecho!
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE                        :Cerrar ventana con clic derecho: {STRING}
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT               :Cierra una ventana al hacer clic derecho dentro. ¡Desactiva la descripción emergente al hacer clic derecho!
 
 STR_CONFIG_SETTING_AUTOSAVE                                     :Autoguardado: {STRING}
 STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT                            :Selecciona el intervalo entre guardados automáticos del juego
@@ -1446,7 +1450,7 @@ STR_CONFIG_SETTING_SOUND_NEW_YEAR                               :Final del año:
 STR_CONFIG_SETTING_SOUND_NEW_YEAR_HELPTEXT                      :Reproducir sonido al mostrar el resumen anual del rendimiento de la compañía al terminar el año
 STR_CONFIG_SETTING_SOUND_CONFIRM                                :Construcción: {STRING}
 STR_CONFIG_SETTING_SOUND_CONFIRM_HELPTEXT                       :Reproducir sonido al construir con éxito o realizar otras acciones
-STR_CONFIG_SETTING_SOUND_CLICK                                  :Click de botones: {STRING}
+STR_CONFIG_SETTING_SOUND_CLICK                                  :Clic de botones: {STRING}
 STR_CONFIG_SETTING_SOUND_CLICK_HELPTEXT                         :Pitido al pulsar botones
 STR_CONFIG_SETTING_SOUND_DISASTER                               :Desastres/accidentes: {STRING}
 STR_CONFIG_SETTING_SOUND_DISASTER_HELPTEXT                      :Reproducir efectos de sonido de accidentes y desastres
@@ -1546,10 +1550,16 @@ STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :Completo
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :Noticias en color aparecen en: {STRING}
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :Año en el cual los periódicos empezarán a imprimirse en color. Antes de ese año solamente usarán una escala de grises
 STR_CONFIG_SETTING_STARTING_YEAR                                :Fecha de inicio: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR                                  :Año de clasificación final: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Año en el que finaliza el juego para establecer la clasificación. Al final de este año se guarda la puntuación de las empresas y se muestra la pantalla de las puntuaciones más altas, aunque se puede continuar jugando la partida.{}Si este año es posterior al año de comienzo, la pantalla de puntuaciones más altas no se mostrará nunca.
+STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
+STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Nunca
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :Activar economía suave (cambios más pequeños): {STRING}
 STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT                      :Si se activa, se producirán cambios de producción en las industrias más frecuentemente y en pasos menores. Si se usa un NewGRF para proveer industrias, esta opción generalmente no tiene efecto
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Permitir comprar acciones de otras empresas: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Cuando se activa, permite comprar y vender acciones de empresas. Las acciones de una empresa solamente estarán disponibles cuando la empresa cumpla una edad determinada
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Edad mínima de una empresa para comerciar con sus acciones: {STRING}
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT                :Edad mínima que tiene que tener una empresa para poder comprar y vender sus acciones.
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :Porcentaje del beneficio total a pagar en transferencias: {STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :Porcentaje de los beneficios dados a los transportes intermedios en sistemas de transferencias, dando un mayor control sobre el beneficio de cada vehículo
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :Al arrastrar, colocar señales cada: {STRING}
@@ -1560,14 +1570,14 @@ STR_CONFIG_SETTING_DRAG_SIGNALS_FIXED_DISTANCE_HELPTEXT         :Fija el comport
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :Señales mecánicas por defecto antes de: {STRING}
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE_HELPTEXT         :Fija el año a partir del cual se usarán señales eléctricas. Antes de ese año se usarán señales mecánicas (tienen la misma funcionalidad pero distinto aspecto)
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :Activar la GUI de señales: {STRING}
-STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI_HELPTEXT                   :Muestra una ventana para escoger los tipos de señales a construir, en lugar de no usar ventana y únicamente permitir el cambio de tipo de señal por rotación mediante Ctrl+Click sobre las señales ya construidas
+STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI_HELPTEXT                   :Muestra una ventana para escoger los tipos de señales a construir, en lugar de no usar ventana y únicamente permitir el cambio de tipo de señal por rotación mediante Ctrl+Clic sobre las señales ya construidas
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :Tipo de señal a construir por defecto: {STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE_HELPTEXT                 :Tipo de señal a usar por defecto
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Señales de bloque
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Señales de ruta
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Señales de ruta de un sentido
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :Cambiar entre tipos de señales: {STRING}
-STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT                  :Permite seleccionar entre qué señales se debe de cambiar al usar Ctrl+Click con la herramienta de señales
+STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES_HELPTEXT                  :Permite seleccionar entre qué señales se debe de cambiar al usar Ctrl+Clic con la herramienta de señales
 STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Solo señales de bloque
 STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Solo señales de ruta
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :Todas
@@ -1773,7 +1783,7 @@ STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenid
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Configuración de Scripts
 STR_INTRO_QUIT                                                  :{BLACK}Salir
 
-STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comenzar nuevo juego. Ctrl+Click omite la configuración del escenario
+STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comenzar nuevo juego. Ctrl+Clic omite la configuración del escenario
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Cargar un juego guardado
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Empezar juego nuevo, usando mapa de altura como terreno
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Comienza un nuevo juego, usando un escenario personalizado desde el disco
@@ -1842,9 +1852,9 @@ STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Ver esqu
 STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Ver esquema de color de los vehículos de carretera
 STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Ver esquema de color de los barcos
 STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Mostrar esquema de color de aeronaves
-STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Selecciona el color primario para el esquema seleccionado. Ctrl+Click fijará este color para todo el esquema
-STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Selecciona el color secundario para el esquema seleccionado. Ctrl+Click fijará este color para todo el esquema
-STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Selecciona un esquema de color a modificar, o selecciona varios pulsando Ctrl+Click. Pulsa en la caja para cambiar el uso del esquema
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Selecciona el color primario para el esquema seleccionado. Ctrl+Clic fijará este color para todo el esquema
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Selecciona el color secundario para el esquema seleccionado. Ctrl+Clic fijará este color para todo el esquema
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Selecciona un esquema de color a modificar, o selecciona varios pulsando Ctrl+Clic. Pulsa en la caja para cambiar el uso del esquema
 
 STR_LIVERY_DEFAULT                                              :Estación normal
 STR_LIVERY_STEAM                                                :Locomotora a Vapor
@@ -1944,7 +1954,7 @@ STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clientes
 STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clientes online / máx. clientes{}Empresas online / máximo empresas
 STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Tamaño del mapa
-STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Tamaño del mapa del juego{}Click para ordenar por área
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Tamaño del mapa del juego{}Clic para ordenar por área
 STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Fecha
 STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Fecha actual
 STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Años
@@ -2160,6 +2170,7 @@ STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Contrase
 STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}El servidor está completo
 STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Se ha prohibido tu acceso al servidor
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Has sido expulsado del servidor
+STR_NETWORK_ERROR_KICK_MESSAGE                                  :{WHITE}Razón: {STRING}
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}No se permiten trucos en este servidor
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Estabas enviando demasiados comandos al servidor
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Tardaste demasiado en introducir la contraseña
@@ -2219,6 +2230,7 @@ STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} da
 STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Entregas a la empresa {1:STRING} {2:CURRENCY_LONG}
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}El servidor ha cerrado la sesión
 STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Se está reiniciando el servidor...{}Espere por favor...
+STR_NETWORK_MESSAGE_KICKED                                      :*** {STRING} ha sido expulsado. Razón: ({STRING})
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Descarga de contenido
@@ -2295,15 +2307,15 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, sali
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opciones de Transparencia
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Ajustar transparencia para carteles. Ctrl+Click para bloquear
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Ajustar transparencia para árboles. Ctrl+Click para bloquear
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Ajustar transparencia para casas. Ctrl+Click para bloquear
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Ajustar transparencia para industrias. Ctrl+Click para bloquear
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Ajustar transparencia para construcciones como estaciones, depósitos o puntos de ruta. Ctrl+Click para bloquear
-STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Ajustar transparencia para puentes. Ctrl+Click para bloquear
-STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Ajustar transparencia para estructuras como faros o antenas. Ctrl+Click para bloquear
-STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Ajustar transparencia para catenaria. Ctrl+Click para bloquear
-STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Ajustar transparencia para los indicadores de carga. Ctrl+Click para bloquear
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Ajustar transparencia para carteles. Ctrl+Clic para bloquear
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Ajustar transparencia para árboles. Ctrl+Clic para bloquear
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Ajustar transparencia para casas. Ctrl+Clic para bloquear
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Ajustar transparencia para industrias. Ctrl+Clic para bloquear
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Ajustar transparencia para construcciones como estaciones, depósitos o puntos de ruta. Ctrl+Clic para bloquear
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Ajustar transparencia para puentes. Ctrl+Clic para bloquear
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Ajustar transparencia para estructuras como faros o antenas. Ctrl+Clic para bloquear
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Ajustar transparencia para catenaria. Ctrl+Clic para bloquear
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Ajustar transparencia para los indicadores de carga. Ctrl+Clic para bloquear
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Poner objetos invisibles en vez de transparentes
 
 # Linkgraph legend window
@@ -2340,16 +2352,16 @@ STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :Construcción F
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :Construcción de Monorraíl
 STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :Construcción de Maglev
 
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Construir tramo de ferrocarril. Ctrl permite retirar ferrocarriles. Shift permite mostrar una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Construir tramos de ferrocarril usando modo Autorraíl. Ctrl permite retirar ferrocarriles. Shift permite mostrar una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Construir depósito de trenes (para comprar y dar servicio a trenes). Shift permite mostrar una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Convertir ferrocarril a punto de ruta. Ctrl activa la unión de puntos de ruta. Shift permite mostrar una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Construir estación de ferrocarril. Ctrl activa la unión de estaciones. Shift permite mostrar una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Construir señales de ferrocarril. Ctrl cambia entre señales mecánicas y eléctricas{}Arrastrar construye señales a lo largo del tramo recto de ferrocarril seleccionado. Ctrl construye señales hasta el siguiente cruce o señal{}Ctrl+Click cambia a la ventana de selección de señales. Shift cambia entre construir/mostrar el precio estimado
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Construir puente de ferrocarril. Shift permite mostrar una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construir túnel ferroviario. Shift permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Construir tramo de ferrocarril. Ctrl permite retirar ferrocarriles. Mayús permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Construir tramos de ferrocarril usando modo Autorraíl. Ctrl permite retirar ferrocarriles. Mayús permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Construir depósito de trenes (para comprar y dar servicio a trenes). Mayús permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Convertir ferrocarril a punto de ruta. Ctrl activa la unión de puntos de ruta. Mayús permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Construir estación de ferrocarril. Ctrl activa la unión de estaciones. Mayús permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Construir señales de ferrocarril. Ctrl cambia entre señales mecánicas y eléctricas{}Arrastrar construye señales a lo largo del tramo recto de ferrocarril seleccionado. Ctrl construye señales hasta el siguiente cruce o señal{}Ctrl+Clic cambia a la ventana de selección de señales. Mayús cambia entre construir/mostrar el precio estimado
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Construir puente de ferrocarril. Mayús permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construir túnel ferroviario. Mayús permite mostrar una estimación del precio
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Cambiar entre construir/retirar ferrocarriles, señales, estaciones y puntos de ruta de ferrocarril. Mantener pulsado Ctrl retirará también el ferrocarril al retirar estaciones y puntos de ruta
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convertir/Actualizar tipo de ferrocarril. Shift permite mostrar una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convertir/Actualizar tipo de ferrocarril. Mayús permite mostrar una estimación del precio
 
 STR_RAIL_NAME_RAILROAD                                          :Ferrocarril
 STR_RAIL_NAME_ELRAIL                                            :Ferrocarril eléctrico
@@ -2395,7 +2407,7 @@ STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Señal d
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Señal combo (eléctrica){}La señal combo actúa como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Señal de ruta (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Señal de ruta de un sentido (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás
-STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Convertir señal{}Cuando es seleccionado, pulsar sobre una señal existente la convierte en el tipo y variante indicados. Pulsar Ctrl+Click permite cambiar de variante. Shift+Click muestra una estimación del precio de conversión
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Convertir señal{}Cuando es seleccionado, pulsar sobre una señal existente la convierte en el tipo y variante indicados. Pulsar Ctrl+Clic permite cambiar de variante. Mayús+Clic muestra una estimación del precio de conversión
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Distancia del arrastre de señales
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Reducir distancia del arrastre de señales
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Incrementar distancia del arrastre de señales
@@ -2403,7 +2415,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Incremen
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Seleccione Puente de Ferrocarril
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Elige puente de carretera
-STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selección de puente - Click en el puente elegido para construirlo
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selección de puente - Clic en el puente elegido para construirlo
 STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
 STR_SELECT_BRIDGE_SCENEDIT_INFO                                 :{GOLD}{STRING},{} {VELOCITY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Colgante, Acero
@@ -2419,25 +2431,25 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Tubular, Silici
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Construcción de carretera
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Construcción de tranvía
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Construir sección de carretera. Ctrl permite retirar carreteras. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Construir sección de tranvía. Ctrl permite retirar tranvías. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Construir carretera usando el modo de Autocarretera. Ctrl permite retirar carreteras. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Construir tranvías usando el modo de Autotranvías. Ctrl permite retirar tranvías. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Construir depósito de carretera (para comprar y mantener vehículos). Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Construir depósito de tranvías (para comprar y mantener vehículos). Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Construir estación de autobús. Ctrl activa la unión de estaciones. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Construir estación de tranvía de pasajeros. Ctrl activa la unión de estaciones. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Construir estación de carga para camiones. Ctrl activa la unión de estaciones. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Construir estación de tranvía de carga. Ctrl activa la unión de estaciones. Shift permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Construir sección de carretera. Ctrl permite retirar carreteras. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Construir sección de tranvía. Ctrl permite retirar tranvías. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Construir carretera usando el modo de Autocarretera. Ctrl permite retirar carreteras. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Construir tranvías usando el modo de Autotranvías. Ctrl permite retirar tranvías. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Construir depósito de carretera (para comprar y mantener vehículos). Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Construir depósito de tranvías (para comprar y mantener vehículos). Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Construir estación de autobús. Ctrl activa la unión de estaciones. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Construir estación de tranvía de pasajeros. Ctrl activa la unión de estaciones. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Construir estación de carga para camiones. Ctrl activa la unión de estaciones. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Construir estación de tranvía de carga. Ctrl activa la unión de estaciones. Mayús permite mostrar una estimación del precio
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Activar/Desactivar carreteras de un sentido
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Construir puente de carretera. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Construir puente de tranvía. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Construir túnel de carretera. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Construir túnel de tranvía. Shift permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Construir puente de carretera. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Construir puente de tranvía. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Construir túnel de carretera. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Construir túnel de tranvía. Mayús permite mostrar una estimación del precio
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Cambiar entre construir/retirar carretera
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Activar construir/quitar para construcciones de tranvía
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Convertir/Actualizar tipo de carretera. Shift permite mostrar una estimación del precio
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Convertir/Actualizar tipo de tranvía. Shift permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Convertir/Actualizar tipo de carretera. Mayús permite mostrar una estimación del precio
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Convertir/Actualizar tipo de tranvía. Mayús permite mostrar una estimación del precio
 
 STR_ROAD_NAME_ROAD                                              :Carretera
 STR_ROAD_NAME_TRAM                                              :Tranvía
@@ -2461,12 +2473,12 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Seleccio
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construcción de Canales
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Canales
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Construir canales. Shift permite mostrar una estimación del precio
-STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Construir esclusas. Shift permite mostrar una estimación del precio
-STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construir astillero (para comprar y dar servicio a barcos). Shift permite mostrar una estimación del precio
-STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construir muelles. Ctrl activa la unión de estaciones. Shift permite mostrar una estimación del precio
-STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Colocar boya que puede ser usada como punto de ruta. Shift permite mostrar una estimación del precio
-STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Construir acueducto. Shift permite mostrar una estimación del precio
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Construir canales. Mayús permite mostrar una estimación del precio
+STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Construir esclusas. Mayús permite mostrar una estimación del precio
+STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construir astillero (para comprar y dar servicio a barcos). Mayús permite mostrar una estimación del precio
+STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construir muelles. Ctrl activa la unión de estaciones. Mayús permite mostrar una estimación del precio
+STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Colocar boya que puede ser usada como punto de ruta. Mayús permite mostrar una estimación del precio
+STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Construir acueducto. Mayús permite mostrar una estimación del precio
 STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definir área de agua.{}Crea un canal, a menos que se pulse Ctrl al nivel del mar, en cuyo caso se inundarán los alrededores
 STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Colocar ríos
 
@@ -2479,7 +2491,7 @@ STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Muelle
 
 # Airport toolbar
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeropuertos
-STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construir aeropuerto. Ctrl activa la unión de estaciones. Shift permite mostrar una estimación del precio
+STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construir aeropuerto. Ctrl activa la unión de estaciones. Mayús permite mostrar una estimación del precio
 
 # Airport construction window
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Selección de aeropuerto
@@ -2506,14 +2518,14 @@ STR_STATION_BUILD_NOISE                                         :{BLACK}Ruido ge
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Terreno
-STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Bajar una esquina del terreno. Arrastrar reduce la esquina seleccionada y nivela el resto del terreno seleccionado a dicha altura. Ctrl permite seleccionar un área diagonalmente. Shift permite mostrar una estimación del precio
-STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Subir una esquina del terreno. Arrastrar eleva la esquina seleccionada y nivela el resto del terreno seleccionado a dicha altura. Ctrl permite seleccionar un área diagonalmente. Shift permite mostrar una estimación del precio
-STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivela un área de terreno a la altura de la primera esquina seleccionada. Ctrl permite seleccionar un área diagonalmente. Shift permite mostrar una estimación del precio
-STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Comprar tierra para usos futuros. Shift permite mostrar una estimación del precio
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Bajar una esquina del terreno. Arrastrar reduce la esquina seleccionada y nivela el resto del terreno seleccionado a dicha altura. Ctrl permite seleccionar un área diagonalmente. Mayús permite mostrar una estimación del precio
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Subir una esquina del terreno. Arrastrar eleva la esquina seleccionada y nivela el resto del terreno seleccionado a dicha altura. Ctrl permite seleccionar un área diagonalmente. Mayús permite mostrar una estimación del precio
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivela un área de terreno a la altura de la primera esquina seleccionada. Ctrl permite seleccionar un área diagonalmente. Mayús permite mostrar una estimación del precio
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Comprar tierra para usos futuros. Mayús permite mostrar una estimación del precio
 
 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Selección de Objeto
-STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}Seleccionar objeto a construir. Shift permite mostrar una estimación del precio
+STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}Seleccionar objeto a construir. Mayús permite mostrar una estimación del precio
 STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}Seleccione el tipo de objeto a construir
 STR_OBJECT_BUILD_PREVIEW_TOOLTIP                                :{BLACK}Vista previa del objeto
 STR_OBJECT_BUILD_SIZE                                           :{BLACK}Tamaño: {GOLD}{NUM} x {NUM} casillas
@@ -2525,7 +2537,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmisor
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Árboles
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Seleccione el tipo de árboles a plantar. Si la casilla ya tiene un árbol, se añadirán más árboles de distintos tipos sin importar el tipo elegido
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Tipo aleatorio
-STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Colocar distintos árboles al azar. Shift permite mostrar una estimación del precio
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Colocar distintos árboles al azar. Mayús permite mostrar una estimación del precio
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Árboles al azar
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Planta árboles al azar sobre el terreno
 
@@ -2546,7 +2558,7 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}¿Está
 # Town generation window (SE)
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Creación de Municipios
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nuevo Municipio
-STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Fundar nuevo municipio. Shift+Click muestra una estimación del precio
+STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Fundar nuevo municipio. Mayús+Clic muestra una estimación del precio
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Municipio al Azar
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Fundar municipio en lugar aleatorio
 STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Varios municipios al azar
@@ -2554,7 +2566,7 @@ STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Cubre el
 
 STR_FOUND_TOWN_NAME_TITLE                                       :{YELLOW}Nombre del municipio:
 STR_FOUND_TOWN_NAME_EDITOR_TITLE                                :{BLACK}Introducir nombre de municipio
-STR_FOUND_TOWN_NAME_EDITOR_HELP                                 :{BLACK}Click para introducir nombre del municipio
+STR_FOUND_TOWN_NAME_EDITOR_HELP                                 :{BLACK}Clic para introducir nombre del municipio
 STR_FOUND_TOWN_NAME_RANDOM_BUTTON                               :{BLACK}Nombre aleatorio
 STR_FOUND_TOWN_NAME_RANDOM_TOOLTIP                              :{BLACK}Generar nuevo nombre
 
@@ -2591,8 +2603,8 @@ STR_INDUSTRY_CARGOES_CARGO_CAPTION                              :{WHITE}Cadena d
 STR_INDUSTRY_CARGOES_PRODUCERS                                  :{WHITE}Industrias suministradoras
 STR_INDUSTRY_CARGOES_CUSTOMERS                                  :{WHITE}Industrias clientes
 STR_INDUSTRY_CARGOES_HOUSES                                     :{WHITE}Casas
-STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP                           :{BLACK}Click en la industria para ver sus suministradores y clientes
-STR_INDUSTRY_CARGOES_CARGO_TOOLTIP                              :{BLACK}{STRING}{}Click en la carga para mostrar sus suministradores y clientes
+STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP                           :{BLACK}Clic en la industria para ver sus suministradores y clientes
+STR_INDUSTRY_CARGOES_CARGO_TOOLTIP                              :{BLACK}{STRING}{}Clic en la carga para mostrar sus suministradores y clientes
 STR_INDUSTRY_DISPLAY_CHAIN                                      :{BLACK}Mostrar cadena
 STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP                              :{BLACK}Mostrar industrias que suministran o aceptan la carga
 STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP                            :{BLACK}Enlazar al mapa
@@ -2981,7 +2993,7 @@ STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Ir al sp
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Sprite anterior
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Saltar al sprite anterior (ignorando pseudosprites, sprites recoloreados y sprites de fuente) y pasar del primer al último sprite
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Representación del sprite seleccionado. Su alineamiento es ignorado al dibujarlo
-STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Mover el sprite, cambiando los ajustes X e Y. Ctrl+Click mueve el sprite ocho unidades de una sola vez
+STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Mover el sprite, cambiando los ajustes X e Y. Ctrl+Clic mueve el sprite ocho unidades de una sola vez
 STR_SPRITE_ALIGNER_RESET_BUTTON                                 :{BLACK}Reiniciar coordenadas relativas
 STR_SPRITE_ALIGNER_RESET_TOOLTIP                                :{BLACK}Reinicia las coordenadas relativas actuales
 STR_SPRITE_ALIGNER_OFFSETS_ABS                                  :{BLACK}Coordenada X: {NUM}, Coordenada Y: {NUM} (Absoluta)
@@ -3084,7 +3096,7 @@ STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Municipi
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Ninguna -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (Ciudad){BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Nombres de los municipios - click sobre un nombre para centrar la vista principal en él. Ctrl+Click abre una ventana de visualización en dicha posición
+STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Nombres de los municipios - Clic sobre un nombre para centrar la vista principal en él. Ctrl+Clic abre una ventana de visualización en dicha posición
 STR_TOWN_POPULATION                                             :{BLACK}Población mundial: {COMMA}
 
 # Town view window
@@ -3102,7 +3114,7 @@ STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}El munic
 STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}El municipio crece cada {ORANGE}{COMMA}{BLACK}{NBSP}día{P "" s} (edificios fundados)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}El municipio {RED}no{BLACK} está creciendo
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Nivel de ruido en municipio: {ORANGE}{COMMA}{BLACK}  Máx.: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar vista sobre el municipio. Ctrl+Click abre un punto de vista en dicha posición
+STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar vista sobre el municipio. Ctrl+Clic abre un punto de vista en dicha posición
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Autoridad local
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Mostrar información sobre autoridades locales
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Cambiar nombre del municipio
@@ -3117,10 +3129,11 @@ STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :Renombrar Munic
 # Town local authority window
 STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}{TOWN} autoridad local
 STR_LOCAL_AUTHORITY_ZONE                                        :{BLACK}Zona
+STR_LOCAL_AUTHORITY_ZONE_TOOLTIP                                :{BLACK}Mostrar zona dentro del límite de la autoridad local
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Calificación de empresas de transporte:
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Acciones disponibles:
-STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Lista de acciones posibles en este municipio - Click sobre cada línea para obtener más detalles
+STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Lista de acciones posibles en este municipio - Clic sobre cada línea para obtener más detalles
 STR_LOCAL_AUTHORITY_DO_IT_BUTTON                                :{BLACK}Hágalo
 STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Hacer lo que se ha marcado en la opción anterior
 
@@ -3153,7 +3166,7 @@ STR_GOALS_SPECTATOR_NONE                                        :{ORANGE}- No ap
 STR_GOALS_PROGRESS                                              :{ORANGE}{STRING}
 STR_GOALS_PROGRESS_COMPLETE                                     :{GREEN}{STRING}
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Metas de la compañía:
-STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Click en una meta para centrar la vista principal en la casilla, industria o municipio. Ctrl+Click abre una nueva vista en esa localización
+STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Clic en una meta para centrar la vista principal en la casilla, industria o municipio. Ctrl+Clic abre una nueva vista en esa localización
 
 # Goal question window
 STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pregunta
@@ -3189,7 +3202,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}- Ninguno -
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Líneas ya subvencionadas:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} desde {STRING} a {STRING}{YELLOW} ({COMPANY}{YELLOW}, hasta {DATE_SHORT})
-STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click sobre el servicio para centrar la vista principal en esta industria/municipio. Ctrl+Click abre un punto de vista en dicha posición
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clic sobre el servicio para centrar la vista principal en esta industria/municipio. Ctrl+Clic abre un punto de vista en dicha posición
 
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}Historial de {COMPANY}
@@ -3205,7 +3218,7 @@ STR_STORY_BOOK_NEXT_PAGE_TOOLTIP                                :{BLACK}Ir a la
 STR_STORY_BOOK_INVALID_GOAL_REF                                 :{RED}Referencia de metas inválida
 
 # Station list window
-STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nombres de estación - Click sobre un nombre para centrar la vista principal en la estación. Ctrl+Click abre un punto de vista en dicha posición
+STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nombres de estación - Clic sobre un nombre para centrar la vista principal en la estación. Ctrl+Clic abre un punto de vista en dicha posición
 STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Mantén pulsado Ctrl para seleccionar más de un elemento
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Estaciones
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
@@ -3267,7 +3280,7 @@ STR_CARGO_RATING_EXCELLENT                                      :Excelente
 STR_CARGO_RATING_OUTSTANDING                                    :Excepcional
 ############ range for rating ends
 
-STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrar vista en la posición de la estación. Ctrl+Click abre un punto de vista en dicha posición
+STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrar vista en la posición de la estación. Ctrl+Clic abre un punto de vista en dicha posición
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Cambiar nombre de la estación
 
 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostrar todos los trenes que tienen esta estación en su horario
@@ -3282,9 +3295,9 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Prevenir
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrar vista en posición del punto de ruta. Ctrl+Click abre un punto de vista en dicha posición
+STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrar vista en posición del punto de ruta. Ctrl+Clic abre un punto de vista en dicha posición
 STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Cambiar nombre del punto de ruta
-STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar vista en posición de la boya. Ctrl+Click abre un punto de vista en dicha posición
+STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar vista en posición de la boya. Ctrl+Clic abre un punto de vista en dicha posición
 STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Cambiar nombre de boya
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editar nombre del punto de ruta
@@ -3314,9 +3327,9 @@ STR_FINANCES_LOAN_TITLE                                         :{WHITE}Préstam
 STR_FINANCES_MAX_LOAN                                           :{WHITE}Préstamo Máximo: {BLACK}{CURRENCY_LONG}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY_LONG}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pedir Préstamo {CURRENCY_LONG}
-STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Incrementar préstamo. Ctrl+Click solicita todo el préstamo posible
+STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Incrementar préstamo. Ctrl+Clic solicita todo el préstamo posible
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Pagar Préstamo {CURRENCY_LONG}
-STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Pagar parte del préstamo. Ctrl+Click paga todo el préstamo posible
+STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Pagar parte del préstamo. Ctrl+Clic paga todo el préstamo posible
 STR_FINANCES_INFRASTRUCTURE_BUTTON                              :{BLACK}Infraestructura
 
 # Company view
@@ -3346,7 +3359,7 @@ STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construi
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Ver Sede
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Ver sede de la empresa
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Reubicar Sede
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Reubica la sede de la empresa a cualquier otro lugar, con el coste del 1% del valor total de la empresa. Shift+Click muestra una estimación del precio sin mover la sede
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Reubica la sede de la empresa a cualquier otro lugar, con el coste del 1% del valor total de la empresa. Mayús+Clic muestra una estimación del precio sin mover la sede
 STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Detalles
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Ver informe detallado de infraestructura
 
@@ -3361,8 +3374,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Cambiar
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Comprar un 25% de sus acciones
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender 25% de acciones
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Comprar 25% de acciones de esta empresa. Shift+Click muestra una estimación del precio sin comprar ninguna acción
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 25% acciones de esta empresa. Shift+Click muestra una estimación del beneficio sin vender ninguna acción
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Comprar 25% de acciones de esta empresa. Mayús+Clic muestra una estimación del precio sin comprar ninguna acción
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 25% acciones de esta empresa. Mayús+Clic muestra una estimación del beneficio sin vender ninguna acción
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nombre Empresa
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nombre del Presidente
@@ -3385,14 +3398,23 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENC
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrias
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Ninguna -
+STR_INDUSTRY_DIRECTORY_ITEM_INFO                                :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% transportado){BLACK}
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nombre de industrias - Click sobre un nombre para centrar la vista principal en la industria. Ctrl+Click abre un punto de vista en dicha posición
+STR_INDUSTRY_DIRECTORY_ITEM_PROD1                               :{ORANGE}{INDUSTRY} {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD2                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD3                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE                            :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} y {NUM} más...
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nombre de industrias - Clic sobre un nombre para centrar la vista principal en la industria. Ctrl+Clic abre un punto de vista en dicha posición
+STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER                    :{BLACK}Carga aceptada: {SILVER}{STRING}
+STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER                    :{BLACK}Carga producida: {SILVER}{STRING}
+STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES                         :Todos los tipos de carga
+STR_INDUSTRY_DIRECTORY_FILTER_NONE                              :Ninguna
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Producción del mes anterior:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% transportado)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrar la vista sobre la industria. Ctrl+Click abre un punto de vista en dicha posición
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrar la vista sobre la industria. Ctrl+Clic abre un punto de vista en dicha posición
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Nivel de producción: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}La industria ha anunciado su cierre inminente!
 
@@ -3413,10 +3435,10 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Barcos
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronave{P "" s}
 
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Trenes - Click en tren para información
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Vehículos de carretera - Click en el vehículo para información
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Barcos - Click en barco para información
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeronave - Click en la aeronave para información
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Trenes - Clic en tren para información
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Vehículos de carretera - Clic en el vehículo para información
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Barcos - Clic en barco para información
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeronave - Clic en la aeronave para información
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Beneficio este año: {CURRENCY_LONG} (último año: {CURRENCY_LONG})
 
@@ -3436,8 +3458,8 @@ STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar a Depós
 STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar a Astillero
 STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar al Hangar
 
-STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Click para detener todos los vehículos de la lista
-STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Click para arrancar todos los vehículos de la lista
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Clic para detener todos los vehículos de la lista
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Clic para arrancar todos los vehículos de la lista
 
 STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Órdenes compartidas de {COMMA} Vehículo{P "" s}
 
@@ -3454,12 +3476,12 @@ STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aeronaves sin a
 
 STR_GROUP_COUNT_WITH_SUBGROUP                                   :{TINY_FONT}{COMMA} (+{COMMA})
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupos - Click en un grupo para ver la lista de sus vehículos. Es posible arrastrar grupos para modificar su jerarquía.
-STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Click para crear un grupo
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupos - Clic en un grupo para ver la lista de sus vehículos. Es posible arrastrar grupos para modificar su jerarquía.
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Clic para crear un grupo
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Borrar el grupo seleccionado
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renombrar el grupo seleccionado
 STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Cambiar el color del grupo seleccionado
-STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Click para proteger este grupo del auto reemplazado global
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Clic para proteger este grupo del auto reemplazado global
 
 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Borrar Grupo
 STR_GROUP_DELETE_QUERY_TEXT                                     :{WHITE}¿Está seguro de querer borrar este grupo y todos sus subgrupos?
@@ -3516,10 +3538,10 @@ STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}F.T máx
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Alcance: {GOLD}{COMMA} casillas
 STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}Tipo de aeronave: {GOLD}{STRING}
 
-STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Lista de selección de los vehículos de ferrocarril. Click en el vehículo para más información. Ctrl+Click para mostrar/ocultar el tipo del vehículo
-STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Lista de selección de vehículos de carretera. Click en el vehículo para más información. Ctrl+Click para mostrar/ocultar el tipo del vehículo
-STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Lista de selección de barcos. Click en el barco para más información. Ctrl+Click para mostrar/ocultar el tipo del barco
-STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Lista de selección de aeronaves. Click en la aeronave para más información. Ctrl+Click para mostrar/ocultar el tipo de la aeronave
+STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Lista de selección de los vehículos de ferrocarril. Clic en el vehículo para más información. Ctrl+Clic para mostrar/ocultar el tipo del vehículo
+STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Lista de selección de vehículos de carretera. Clic en el vehículo para más información. Ctrl+Clic para mostrar/ocultar el tipo del vehículo
+STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Lista de selección de barcos. Clic en el barco para más información. Ctrl+Clic para mostrar/ocultar el tipo del barco
+STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Lista de selección de aeronaves. Clic en la aeronave para más información. Ctrl+Clic para mostrar/ocultar el tipo de la aeronave
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Comprar vehículo
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Comprar vehículo
@@ -3531,15 +3553,15 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON           :{BLACK}Comprar
 STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Comprar y Reformar Barco
 STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Comprar y Reformar Aeronave
 
-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Compra el vehículo de ferrocarril resaltado. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Comprar el vehículo de carretera resaltado. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Comprar el barco resaltado. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Comprar la aeronave resaltada. Shift+Click muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Compra el vehículo de ferrocarril resaltado. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Comprar el vehículo de carretera resaltado. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Comprar el barco resaltado. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Comprar la aeronave resaltada. Mayús+Clic muestra una estimación del precio sin realizar la compra
 
-STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Comprar y reformar el vehículo de ferrocarril resaltado. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP          :{BLACK}Comprar y reformar el vehículo resaltado. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}Comprar y reformar el barco resaltado. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}}Comprar y reformar la aeronave resaltada. Shift+Click muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Comprar y reformar el vehículo de ferrocarril resaltado. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP          :{BLACK}Comprar y reformar el vehículo resaltado. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}Comprar y reformar el barco resaltado. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}}Comprar y reformar la aeronave resaltada. Mayús+Clic muestra una estimación del precio sin realizar la compra
 
 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Renombrar
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Renombrar
@@ -3582,10 +3604,10 @@ STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehículo {P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO_LONG} ({CARGO_SHORT})
 
-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trenes - arrastrar vehículo con Click izquierdo para añadir/retirar del tren, Click derecho para mostrar información. Mantén pulsado Ctrl para usar estos comandos con el resto del tren
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehículos de carretera - Click derecho en el vehículo para información
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Barcos - Click derecho en el barco para información
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aeronave - Click derecho en la aeronave para información
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trenes - arrastrar vehículo con Clic izquierdo para añadir/retirar del tren, Clic derecho para mostrar información. Mantén pulsado Ctrl para usar estos comandos con el resto del tren
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehículos de carretera - Clic derecho en el vehículo para información
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Barcos - Clic derecho en el barco para información
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aeronave - Clic derecho en la aeronave para información
 
 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arrastrar aquí el vehículo de raíl para venderlo
 STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arrastrar aquí el vehículo de carretera para venderlo
@@ -3619,30 +3641,30 @@ STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clonar v
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clonar barco
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clonar aeronave
 
-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Esto comprará una copia del tren incluyendo todos sus vagones. Pulse este botón y después en el tren dentro o fuera del depósito. Ctrl+Click compartirá las órdenes. Shift+Click muestra el precio estimado sin realizar la compra
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Esto comprará una copia del vehículo de carretera. Pulse este botón y después en el vehículo dentro o fuera del depósito. Ctrl+Click compartirá las órdenes. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Esto comprará una copia del barco. Pulse este botón y después el barco dentro o fuera del muelle. Ctrl+Click compartirá las órdenes. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Esto comprará una copia de la aeronave. Pulse este botón y después en la aeronave dentro o fuera del hangar. Ctrl+Click compartirá las órdenes. Shift+Click muestra una estimación del precio sin realizar la compra
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Esto comprará una copia del tren incluyendo todos sus vagones. Pulse este botón y después en el tren dentro o fuera del depósito. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra el precio estimado sin realizar la compra
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Esto comprará una copia del vehículo de carretera. Pulse este botón y después en el vehículo dentro o fuera del depósito. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Esto comprará una copia del barco. Pulse este botón y después el barco dentro o fuera del muelle. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Esto comprará una copia de la aeronave. Pulse este botón y después en la aeronave dentro o fuera del hangar. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
 
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar vista en posición del depósito de trenes. Ctrl+Click abre un punto de vista en dicha posición
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar vista en posición del depósito de vehículos. Ctrl+Click abre un punto de vista en dicha posición
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar vista en posición del astillero. Ctrl+Click abre un punto de vista en dicha posición
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar vista en posición del hangar. Ctrl+Click abre un punto de vista en dicha posición
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar vista en posición del depósito de trenes. Ctrl+Clic abre un punto de vista en dicha posición
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar vista en posición del depósito de vehículos. Ctrl+Clic abre un punto de vista en dicha posición
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar vista en posición del astillero. Ctrl+Clic abre un punto de vista en dicha posición
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar vista en posición del hangar. Ctrl+Clic abre un punto de vista en dicha posición
 
 STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Obtener lista de todos los trenes con este depósito en sus órdenes
 STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Obtener lista de todos los vehículos con el depósito actual en sus órdenes
 STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Obtener lista de todos los barcos con este astillero en sus órdenes
 STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Obtener lista de todas las aeronaves con cualquier hangar de este aeropuerto en sus órdenes
 
-STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Click para detener todos los trenes dentro del depósito
-STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Click para detener todos los vehículos dentro del depósito
-STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Click para detener todos los barcos dentro del depósito
-STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Click para detener todas las aeronaves dentro del hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Clic para detener todos los trenes dentro del depósito
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Clic para detener todos los vehículos dentro del depósito
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Clic para detener todos los barcos dentro del depósito
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Clic para detener todas las aeronaves dentro del hangar
 
-STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Click para arrancar todos los trenes dentro del depósito
-STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Click para arrancar todos los vehículos dentro del depósito
-STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Click para arrancar todos los barcos dentro del astillero
-STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Click para arrancar todas las aeronaves dentro del hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Clic para arrancar todos los trenes dentro del depósito
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Clic para arrancar todos los vehículos dentro del depósito
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Clic para arrancar todos los barcos dentro del astillero
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Clic para arrancar todas las aeronaves dentro del hangar
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Está a punto de vender todos los vehículos en el depósito. ¿Está seguro?
 
@@ -3717,20 +3739,20 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Hacer qu
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrar vista en posición del tren. Ctrl+Click sigue al tren en la vista principal
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrar vista en posición del vehículo. Ctrl+Click sigue al vehículo en la vista principal
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrar vista en posición del barco. Ctrl+Click sigue al barco en la vista principal
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrar vista en posición de la aeronave. Ctrl+Click sigue a la aeronave en la vista principal
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Centrar vista en posición del tren. Ctrl+Clic sigue al tren en la vista principal
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Centrar vista en posición del vehículo. Ctrl+Clic sigue al vehículo en la vista principal
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Centrar vista en posición del barco. Ctrl+Clic sigue al barco en la vista principal
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Centrar vista en posición de la aeronave. Ctrl+Clic sigue a la aeronave en la vista principal
 
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Enviar tren al depósito. Ctrl+Click para realizar solamente mantenimiento
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Enviar vehículo al depósito. Ctrl+Click para realizar solamente mantenimiento
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Enviar barco al astillero. Ctrl+Click para realizar solamente mantenimiento
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Enviar aeronave al hangar. Ctrl+Click para realizar solamente mantenimiento
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Enviar tren al depósito. Ctrl+Clic para realizar solamente mantenimiento
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Enviar vehículo al depósito. Ctrl+Clic para realizar solamente mantenimiento
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Enviar barco al astillero. Ctrl+Clic para realizar solamente mantenimiento
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Enviar aeronave al hangar. Ctrl+Clic para realizar solamente mantenimiento
 
-STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Esto comprará una copia del tren incluyendo sus vagones. Ctrl+Click compartirá las órdenes. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Esto comprará una copia del vehículo. Ctrl+Click compartirá las órdenes. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Esto comprará una copia del barco. Ctrl+Click compartirá las órdenes. Shift+Click muestra una estimación del precio sin realizar la compra
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Esto comprará una copia de la aeronave. Ctrl+Click compartirá las órdenes. Shift+Click muestra una estimación del precio sin realizar la compra
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Esto comprará una copia del tren incluyendo sus vagones. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Esto comprará una copia del vehículo. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Esto comprará una copia del barco. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Esto comprará una copia de la aeronave. Ctrl+Clic compartirá las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forzar al tren a proceder sin esperar a la apertura de señal
 
@@ -3742,20 +3764,20 @@ STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Reformar
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Cambiar dirección del tren
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forzar vehículo a girar
 
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Ver órdenes del tren. Ctrl+Click muestra su horario
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Ver órdenes del vehículo Ctrl+Click muestra su horario
-STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Ver órdenes del barco. Ctrl+Click muestra su horario
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Ver órdenes de la aeronave. Ctrl+Click muestra su horario
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Ver órdenes del tren. Ctrl+Clic muestra su horario
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Ver órdenes del vehículo Ctrl+Clic muestra su horario
+STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Ver órdenes del barco. Ctrl+Clic muestra su horario
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Ver órdenes de la aeronave. Ctrl+Clic muestra su horario
 
 STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Ver detalles del tren
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalles del vehículo
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalles del barco
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalles de la aeronave
 
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Acción actual del tren - Click para detener/arrancar el tren. Ctrl+Click para desplazarse hasta el destino
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Acción actual del vehículo - Click para detener/arrancar vehículo. Ctrl+Click para desplazarse hasta el destino
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Acción actual del barco - Click para detener/arrancar barco. Ctrl+Click para desplazarse hasta el destino
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Acción actual de la aeronave - Click para detener/arrancar aeronave. Ctrl+Click para desplazarse hasta el destino
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Acción actual del tren - Clic para detener/arrancar el tren. Ctrl+Clic para desplazarse hasta el destino
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Acción actual del vehículo - Clic para detener/arrancar vehículo. Ctrl+Clic para desplazarse hasta el destino
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Acción actual del barco - Clic para detener/arrancar barco. Ctrl+Clic para desplazarse hasta el destino
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Acción actual de la aeronave - Clic para detener/arrancar aeronave. Ctrl+Clic para desplazarse hasta el destino
 
 # Messages in the start stop button in the vehicle view
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Cargando / Descargando
@@ -3813,8 +3835,8 @@ STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Crédito
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de mantenimiento: {LTBLUE}{COMMA}{NBSP}días{BLACK}   Último mantenimiento: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo de mantenimiento: {LTBLUE}{COMMA}%{BLACK}   Último mantenimiento: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Incrementar intervalo de mantenimiento en 10. Ctrl+Click incrementa el intervalo de mantenimiento en 5
-STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Reducir intervalo de mantenimiento en 10. Ctrl+Click reduce el intervalo de mantenimiento en 5
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Incrementar intervalo de mantenimiento en 10. Ctrl+Clic incrementa el intervalo de mantenimiento en 5
+STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Reducir intervalo de mantenimiento en 10. Ctrl+Clic reduce el intervalo de mantenimiento en 5
 
 STR_SERVICE_INTERVAL_DROPDOWN_TOOLTIP                           :{BLACK}Cambiar tipo de intervalo de mantenimiento
 STR_VEHICLE_DETAILS_DEFAULT                                     :Por defecto
@@ -3856,7 +3878,7 @@ STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nueva ca
 STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}{}{BLACK}Beneficio de reforma: {GREEN}{CURRENCY_LONG}
 STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Coste de reforma: {RED}{CURRENCY_LONG}
 STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}Nueva capacidad: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Beneficio de reforma: {GREEN}{CURRENCY_LONG}
-STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Selecciona los vehículos a reformar. Arrastrar con el ratón permite seleccionar múltiples vehículos. Hacer Click en un espacio vacío seleccionará el vehículo completo. Ctrl+Click selecciona un vehículo y la cadena que tenga a continuación
+STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Selecciona los vehículos a reformar. Arrastrar con el ratón permite seleccionar múltiples vehículos. Hacer Clic en un espacio vacío seleccionará el vehículo completo. Ctrl+Clic selecciona un vehículo y la cadena que tenga a continuación
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Elegir tipo de carga transportable para el tren
 STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Selecciona tipo de carga que transportará el vehículo de carretera
@@ -3878,7 +3900,7 @@ STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE
 STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horarios
 STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Cambiar a la vista de horarios
 
-STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Lista de órdenes - Click en una orden para resaltarla. Ctrl+Click para desplazarse a la estación de la orden
+STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Lista de órdenes - Clic en una orden para resaltarla. Ctrl+Clic para desplazarse a la estación de la orden
 STR_ORDER_INDEX                                                 :{COMMA}:{NBSP}
 STR_ORDER_TEXT                                                  :{STRING} {STRING} {STRING}
 
@@ -3908,9 +3930,9 @@ STR_ORDER_DROP_NO_UNLOADING                                     :No descargar
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Cambiar el comportamiento de descarga en la orden seleccionada
 
 STR_ORDER_REFIT                                                 :{BLACK}Reformar
-STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Click para eliminar la orden de reforma
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Clic para eliminar la orden de reforma
 STR_ORDER_REFIT_AUTO                                            :{BLACK}Reforma en la estación
-STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Click elimina la orden de reforma. La reforma solamente puede llevarse a cabo si el vehículo lo permite
+STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Clic elimina la orden de reforma. La reforma solamente puede llevarse a cabo si el vehículo lo permite
 STR_ORDER_DROP_REFIT_AUTO                                       :Carga fijada
 STR_ORDER_DROP_REFIT_AUTO_ANY                                   :Carga disponible
 
@@ -3946,20 +3968,20 @@ STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}El valor
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduce el valor a comparar
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltarse
-STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}Saltar orden actual y comenzar la siguiente. Ctrl+Click salta a la orden seleccionada
+STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}Saltar orden actual y comenzar la siguiente. Ctrl+Clic salta a la orden seleccionada
 
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Borrar
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}Borrar orden resaltada
 STR_ORDERS_DELETE_ALL_TOOLTIP                                   :{BLACK}Borrar todas las órdenes
 STR_ORDERS_STOP_SHARING_BUTTON                                  :{BLACK}Parar de compartir
-STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}Parar de compartir la lista de órdenes. Adicionalmente, Ctrl+Click borra todas las órdenes de este vehículo
+STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}Parar de compartir la lista de órdenes. Adicionalmente, Ctrl+Clic borra todas las órdenes de este vehículo
 
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ir a
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ir al depósito más cercano
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ir al hangar más cercano
 STR_ORDER_CONDITIONAL                                           :Salto de orden condicional
 STR_ORDER_SHARE                                                 :Compartir órdenes
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Añadir nueva orden antes de la orden resaltada, o añadirla al final de la lista. Ctrl sobre estaciones ordena 'Carga completa de cualquier carga', sobre puntos de ruta ordena 'sin paradas' y sobre depósitos ordena 'mantenimiento'. Ctrl o Compartir órdenes permite a este vehículo compartir órdenes con el vehículo seleccionado. Click sobre un vehículo copia las órdenes. Una órden de depósito desactiva el mantenimiento automático del vehículo
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Añadir nueva orden antes de la orden resaltada, o añadirla al final de la lista. Ctrl sobre estaciones ordena 'Carga completa de cualquier carga', sobre puntos de ruta ordena 'sin paradas' y sobre depósitos ordena 'mantenimiento'. Ctrl o Compartir órdenes permite a este vehículo compartir órdenes con el vehículo seleccionado. Clic sobre un vehículo copia las órdenes. Una órden de depósito desactiva el mantenimiento automático del vehículo
 
 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Ver todos los vehículos con el mismo calendario
 
@@ -4061,7 +4083,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED                                :{BLACK}Este hor
 STR_TIMETABLE_STATUS_START_AT                                   :{BLACK}Este horario empezará en {STRING}
 
 STR_TIMETABLE_STARTING_DATE                                     :{BLACK}Fecha de inicio
-STR_TIMETABLE_STARTING_DATE_TOOLTIP                             :{BLACK}Selecciona una fecha como punto de partida de este horario. Ctrl+Click permite fijar el punto de partida de este horario y distribuye todos los vehículos que lo compartan siempre y cuando el horario esté completo
+STR_TIMETABLE_STARTING_DATE_TOOLTIP                             :{BLACK}Selecciona una fecha como punto de partida de este horario. Ctrl+Clic permite fijar el punto de partida de este horario y distribuye todos los vehículos que lo compartan siempre y cuando el horario esté completo
 
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Cambiar Horario
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambia la cantidad de tiempo que debe tardar una orden marcada
@@ -4079,7 +4101,7 @@ STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reinicia
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reajustar el contador del retraso, así el vehículo estará en horario
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Rellenar automáticamente
-STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Rellena la tabla de horarios automáticamente con los valores de la siguiente jornada (Ctrl+Click para tratar de mantener los tiempos de espera))
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Rellena la tabla de horarios automáticamente con los valores de la siguiente jornada (Ctrl+Clic para tratar de mantener los tiempos de espera))
 
 STR_TIMETABLE_EXPECTED                                          :{BLACK}Esperado
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Programado
@@ -4150,7 +4172,7 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configur
 STR_AI_LIST_CAPTION                                             :{WHITE}Disponible {STRING}
 STR_AI_LIST_CAPTION_AI                                          :IAs
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Scripts de Juego
-STR_AI_LIST_TOOLTIP                                             :{BLACK}Click para seleccionar un script
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Clic para seleccionar un script
 
 STR_AI_LIST_AUTHOR                                              :{LTBLUE}Autor: {ORANGE}{STRING}
 STR_AI_LIST_VERSION                                             :{LTBLUE}Versión: {ORANGE}{NUM}
@@ -4161,6 +4183,13 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Seleccio
 STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No cambiar de script
 
+STR_SCREENSHOT_CAPTION                                          :Realizar captura de pantalla
+STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal
+STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Acercamiento máximo
+STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT                           :{BLACK}Acercamiento por defecto
+STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Mapa completo
+STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :Mapa de alturas
+STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimapa
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parámetros {STRING}

From a36a1b5ff53b70993ffc8486e3d2958e0bc9af2f Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Tue, 6 Oct 2020 17:51:50 +0000
Subject: [PATCH 22/31] Update: Translations from eints slovak: 193 changes by
 FuryPapaya spanish: 46 changes by MontyMontana

---
 src/lang/slovak.txt  | 333 +++++++++++++++++++++++++------------------
 src/lang/spanish.txt |  92 ++++++------
 2 files changed, 239 insertions(+), 186 deletions(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 0d1be6d7f5..31b8f81c1f 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -299,8 +299,8 @@ STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Vybrať
 STR_BUTTON_SORT_BY                                              :{BLACK}Usporiadať
 STR_BUTTON_LOCATION                                             :{BLACK}Poloha
 STR_BUTTON_RENAME                                               :{BLACK}Premenovať
-STR_BUTTON_CATCHMENT                                            :Pokrytie
-STR_TOOLTIP_CATCHMENT                                           :Prepnúť zobrazenie oblasti pokrytia
+STR_BUTTON_CATCHMENT                                            :{BLACK}Pokrytie
+STR_TOOLTIP_CATCHMENT                                           :{BLACK}Prepnúť zobrazenie oblasti pokrytia
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zavrieť okno
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Nadpis okna - potiahni pre posun okna
@@ -383,7 +383,7 @@ STR_SORT_BY_RATING                                              :Hodnotenie
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauza
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Zrýchliť priebeh hry
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Nastavenia
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Uložiť hru, opustiť hru, ukončiť
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Uložiť hru, opustiť hru, ukončiť program
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Zobraziť mapu
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Zobraziť zoznam miest
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Zobraziť dotácie
@@ -412,16 +412,16 @@ STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informá
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Prepnúť panely nástrojov
 
 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Uložiť scenár, nahrať scenár, opustiť editor scenára, koniec
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Uložiť scenár, nahrať scenár, opustiť editor scenára, ukončiť program
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Editor scenárov
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Posunúť začiatok o rok dozadu
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Posunúť začiatok o rok dopredu
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE                           :{BLACK}Kliknúť pre zadanie počiatočného roku
 STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY         :{BLACK}Zobraziť mapu, zoznam miest
-STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Vytvorenie uzemia
-STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Vytvorenie mesta
-STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Vytvorenie priemyslu
+STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Generovanie krajiny
+STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generovanie miest
+STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Generovanie priemyslu
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Stavba cesty
 STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Sadenie stromov. Shift zobrazí odhad nákladov
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Umiestniť popis
@@ -432,9 +432,9 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Uložiť scená
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Nahrať scenár
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Uložiť výškovú mapu
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Nahrať výškovú mapu
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Ukončiť editor scenára
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Opustiť editor scenára
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
-STR_SCENEDIT_FILE_MENU_QUIT                                     :Koniec
+STR_SCENEDIT_FILE_MENU_QUIT                                     :Ukončiť program
 ############ range for SE file menu starts
 
 ############ range for settings menu starts
@@ -459,7 +459,7 @@ STR_FILE_MENU_SAVE_GAME                                         :Uložiť hru
 STR_FILE_MENU_LOAD_GAME                                         :Nahrať hru
 STR_FILE_MENU_QUIT_GAME                                         :Opustiť hru
 STR_FILE_MENU_SEPARATOR                                         :
-STR_FILE_MENU_EXIT                                              :Koniec
+STR_FILE_MENU_EXIT                                              :Ukončiť program
 ############ range ends here
 
 # map menu
@@ -689,7 +689,7 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Hotovos
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Úver:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Spolu:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Počet vozidiel (automobilov, vlakov, lodí a lietadiel), ktoré zmenili zisk minulý rok
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Počet vozidiel, ktoré dosiahli v minulom roku zisk. Patria sem cestné vozidlá, vlaky, lode a lietadlá
 STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Počet nedávno obsluhovaných staníc. Železničná stanica, autobus. zastávka, letisko sa počítajú oddelene aj keď patria do rovnakej stanice
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Zisk vozidla s najnižším príjmom (zo všetkých vozidiel starších ako 2 roky)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Množstvo peňazí zarobených v kvartáli s najmenším ziskom v posledných 12 kvartáloch
@@ -846,7 +846,7 @@ STR_NEWS_CUSTOM_ITEM                                            :{BIG_FONT}{BLAC
 
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Mesto oslavuje . . .{}Prvý vlak dorazil do stanice {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}Mesto oslavuje . . .{}Prvý autobus dorazil do {STATION}!
-STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}Mesto oslavuje . . .{}Prvý automobil dorazil do {STATION}!
+STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}Mesto oslavuje . . .{}Prvý nákladný automobil dorazil do {STATION}!
 STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL                           :{BIG_FONT}{BLACK}Mesto oslavuje . . .{}Prvá električka dorazila do stanice {STATION}!
 STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL                               :{BIG_FONT}{BLACK}Mesto oslavuje . . .{}Prvá nákladná električka dorazila do stanice {STATION}!
 STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIG_FONT}{BLACK}Mesto oslavuje . . .{}Prvá loď dorazila do {STATION}!
@@ -859,7 +859,7 @@ STR_NEWS_AIRCRAFT_CRASH                                         :{BIG_FONT}{BLAC
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIG_FONT}{BLACK}Letecké nešťastie!{}Lietadlu došlo palivo, {COMMA} mŕtvych pri požiari
 
 STR_NEWS_DISASTER_ZEPPELIN                                      :{BIG_FONT}{BLACK}Zeppelin zničený pri nehode na {STATION}!
-STR_NEWS_DISASTER_SMALL_UFO                                     :{BIG_FONT}{BLACK}Automobil bol zničený pri kolízii s 'UFO'
+STR_NEWS_DISASTER_SMALL_UFO                                     :{BIG_FONT}{BLACK}Cestné vozidlo bolo zničené pri kolízii s 'UFO'
 STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIG_FONT}{BLACK}Ropná rafinéria explodovala neďaleko mesta {TOWN}!
 STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIG_FONT}{BLACK}Za nejasných okolností bola zničená továreň neďaleko mesta {TOWN}!
 STR_NEWS_DISASTER_BIG_UFO                                       :{BIG_FONT}{BLACK}'UFO' pristalo nedaleko mesta {TOWN}!
@@ -1250,8 +1250,8 @@ STR_CONFIG_SETTING_AUTOSLOPE                                    :Povoliť úprav
 STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Umožňuje úpravy terénu pod budovami a traťami bez potreby ich odstránenia
 STR_CONFIG_SETTING_CATCHMENT                                    :Povoliť realistickejšiu veľkosť oblasti pokrytia: {STRING}
 STR_CONFIG_SETTING_CATCHMENT_HELPTEXT                           :Má úchytné plochy rôznych veľkostí pre rôzne typy staníc a letísk
-STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES                     :Stanice spoločnosti môžu obsluhovať priemysel s pripojenými neutrálnymi stanicami: {STRING}
-STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :Ak je povolené, priemysel s pripojenými stanicami (napríklad Ropné plošiny) môžu obsluhovať aj stanice vlastnené spoločnosťou postavené v blízkosti. Ak je zakázané, tento priemysel môžu obsluhovať iba jeho pripojené stanice. Žiadne blízke stanice vlastnené spoločnosťou ich nebudú môcť obsluhovať a pripojená stanica nebude slúžiť ničomu inému ako priemyslu
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES                     :Stanice spoločnosti môžu obsluhovať priemysel s pripojenými stanicami: {STRING}
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :Ak je povolené, priemysel s pripojenými neutrálnymi stanicami (napríklad Ropné plošiny) môžu obsluhovať aj stanice vlastnené spoločnosťou postavené v blízkosti. Ak je zakázané, tento priemysel môžu obsluhovať iba jeho pripojené stanice. Žiadne blízke stanice vlastnené spoločnosťou ich nebudú môcť obsluhovať a pripojená stanica nebude slúžiť ničomu inému ako priemyslu
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :Odstrániť viaceré mestské cesty, mosty a tunely: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT                       :Uľahči odstraňovanie mestom vlastnených budov a infraštruktúry
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :Maximálna dĺžka vlakov: {STRING}
@@ -1525,8 +1525,8 @@ STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :Zakázať výst
 STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT         :Ak je zapnuté, infraštruktúra je k dispozícii len ak su k nej pripojené vozidlá. Toto predchádza plýtvaniu peniazmi a časom pri nepoužiteľnej infraštruktúre.
 STR_CONFIG_SETTING_MAX_TRAINS                                   :Maximálny počet vlakov na spoločnosť: {STRING}
 STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT                          :Maximálny počet vlakov ktorý môže spoločnosť vlastniť.
-STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :Maximálny počet automobilov na spoločnosť: {STRING}
-STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT                   :Maximálny počet automobilov ktorý môže spoločnosť vlastniť.
+STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :Maximálny počet cestných vozidiel na spoločnosť: {STRING}
+STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT                   :Maximálny počet cestných vozidiel ktorý môže spoločnosť vlastniť.
 STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :Maximálny počet lietadiel na spoločnosť: {STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT                        :Maximálny počet lietadiel ktorý môže spoločnosť vlastniť.
 STR_CONFIG_SETTING_MAX_SHIPS                                    :Maximálny počet lodí na spoločnosť: {STRING}
@@ -1534,8 +1534,8 @@ STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT                           :Maximálny poč
 
 STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :Zakázať vlaky pre počítač: {STRING}
 STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT                    :Povolením nastavenia znemožní počítačovým hráčom budovať vlaky.
-STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :Zakázať automobily pre počítač: {STRING}
-STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT             :Povolením nastavenia znemožní počítačovým hráčom budovať automobily.
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :Zakázať cestné vozidlá pre počítač: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT             :Povolením nastavenia znemožní počítačovým hráčom budovať cestné vozidlá.
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :Zakázať lietadlá pre počítač: {STRING}
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT                  :Povolením nastavenia znemožní počítačovým hráčom budovať lietadlá.
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :Zakázať lode pre počítač: {STRING}
@@ -1557,16 +1557,16 @@ STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE                      :{COMMA} MiB
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :Servisné intervaly v percentách: {STRING}
 STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT                   :Zvoľte či servisovanie vozidiel bude podliehať času od posledného servisu, alebo poklesom percenta návratnosti z celkovej maximálnej návratnosti.
-STR_CONFIG_SETTING_SERVINT_TRAINS                               :Štandardný interval servisu pre vlaky: {STRING}
-STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT                      :Nastav štandardný interval pre nové vlaky.Ak nie je nastavený podrobnejší interval.
+STR_CONFIG_SETTING_SERVINT_TRAINS                               :Predvolený interval servisu pre vlaky: {STRING}
+STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT                      :Nastav predvolený interval pre nové vlaky. Ak nie je nastavený podrobnejší interval.
 STR_CONFIG_SETTING_SERVINT_VALUE                                :{COMMA} deň/%
 STR_CONFIG_SETTING_SERVINT_DISABLED                             :vypnuté
-STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :Štandardný interval servisu pre automobily: {STRING}
-STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT               :Nastav štandardný interval pre nové automobily. Ak nie je nastavený podrobnejší interval.
-STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :Štandardný interval servisu pre lietadlá: {STRING}
-STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT                    :Nastav štandardný interval pre nové lietadlá. Ak nie je nastavený podrobnejší interval.
-STR_CONFIG_SETTING_SERVINT_SHIPS                                :Štandardný interval servisu pre lode: {STRING}
-STR_CONFIG_SETTING_SERVINT_SHIPS_HELPTEXT                       :Nastav štandardný interval pre nové lode. Ak nie je nastavený podrobnejší interval.
+STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :Predvolený interval servisu pre cestné vozidlá: {STRING}
+STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT               :Nastav predvolený interval pre nové cestné vozidlá. Ak nie je nastavený podrobnejší interval.
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :Predvolený interval servisu pre lietadlá: {STRING}
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT                    :Nastav predvolený interval pre nové lietadlá. Ak nie je nastavený podrobnejší interval.
+STR_CONFIG_SETTING_SERVINT_SHIPS                                :Predvolený interval servisu pre lode: {STRING}
+STR_CONFIG_SETTING_SERVINT_SHIPS_HELPTEXT                       :Nastav predvolený interval pre nové lode. Ak nie je nastavený podrobnejší interval.
 STR_CONFIG_SETTING_NOSERVICE                                    :Vypnúť servisy, ak sú vypnuté poruchy: {STRING}
 STR_CONFIG_SETTING_NOSERVICE_HELPTEXT                           :Ak je zapnuté, vozidlá nebudú servisované ak sú vypnuté poruchy.
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :Obmedzenie rýchlosti pre vagóny: {STRING}
@@ -1798,8 +1798,8 @@ STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED                  :YAPF {BLUE}(odp
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Algoritmus hľadania cesty pre vlaky: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Vyhľadávač trasy pre vlaky
-STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :Algoritmus hľadania cesty pre automobily: {STRING}
-STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_HELPTEXT        :Vyhľadávač trasy pre automobily
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :Algoritmus hľadania cesty pre cestné vozidlá: {STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_HELPTEXT        :Vyhľadávač trasy pre cestné vozidlá
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :Algoritmus hľadania cesty pre lode: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT                :Vyhľadávač trasy pre lode
 STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :Automatické obrátenie na semaforoch: {STRING}
@@ -2596,7 +2596,7 @@ STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Nahodné
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Zasadiť stromy náhodne po celej krajine
 
 # Land generation window (SE)
-STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Generovanie uzemia
+STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Generovanie územia
 STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Umiestnit nahodne skaly
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Vytvoriť oblasť púšte.{}Držaním Ctrl ju odstránite
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Pre zvýšenie/zníženie oblasti je potrebné zväčšiť územie
@@ -2791,11 +2791,62 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-{STRING} team OpenTTD
 
 # Framerate display window
-STR_FRAMERATE_CAPTION                                           :Snímková frekvencia
+STR_FRAMERATE_CAPTION                                           :{WHITE}Snímková frekvencia
 STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Frekvencia simulácie: {STRING}
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Počet herných tiknutí simulovaných za sekundu.
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}Snímková frekvencia grafiky: {STRING}
+STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}Počet video snímok vykreslených za sekundu.
+STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Súčasný násobok hernej rýchlosti: {DECIMAL}x
+STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Súčasná rýchlosť hry v porovnaní s rýchlosťou, akou by mala hra normálne bežať.
+STR_FRAMERATE_CURRENT                                           :{WHITE}Teraz
+STR_FRAMERATE_AVERAGE                                           :{WHITE}Priemer
+STR_FRAMERATE_MEMORYUSE                                         :{WHITE}Pamäť
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Dáta sú založené na {COMMA} meraniach
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
+STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
+STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} snímok/s
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} snímok/s
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} snímok/s
+STR_FRAMERATE_BYTES_GOOD                                        :{LTBLUE}{BYTES}
+STR_FRAMERATE_BYTES_WARN                                        :{YELLOW}{BYTES}
+STR_FRAMERATE_BYTES_BAD                                         :{RED}{BYTES}
+STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
+STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 ############ Leave those lines in this order!!
+STR_FRAMERATE_GAMELOOP                                          :{BLACK}Herný cyklus celkovo:
+STR_FRAMERATE_GL_ECONOMY                                        :{BLACK}  Manipulácia s nákladom:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  Tiknutia vlakov:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  Tiknutia cestných vozidiel:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Tiknutia lodí:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}  Tiknutia lietadiel:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK}  Tiknutia sveta:
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}  Oneskorenie spojovacieho grafu:
+STR_FRAMERATE_DRAWING                                           :{BLACK}Vykresľovanie grafiky:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Pohľady na svet:
+STR_FRAMERATE_VIDEO                                             :{BLACK}Výstup videa:
+STR_FRAMERATE_SOUND                                             :{BLACK}Miešanie zvukov:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Herný skript/AI spolu:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK}   Herný skript:
+STR_FRAMERATE_AI                                                :{BLACK}   AI {NUM} {STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Herný cyklus
+STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Manipulácia s nákladom
+STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Tiknutia vlakov
+STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Tiknutia cestných vozidiel
+STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Tiknutia lodí
+STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Tiknutia lietadiel
+STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :Tiknutia sveta
+STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              :Oneskorenie spojovacieho grafu
+STR_FRAMETIME_CAPTION_DRAWING                                   :Vykresľovanie grafiky
+STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Vykresľovanie pohľadu na svet
+STR_FRAMETIME_CAPTION_VIDEO                                     :Výstup videa
+STR_FRAMETIME_CAPTION_SOUND                                     :Miešanie zvukov
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Herný skript/AI spolu
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Herný skript
+STR_FRAMETIME_CAPTION_AI                                        :AI {NUM} {STRING}
 ############ End of leave-in-this-order
 
 
@@ -2884,17 +2935,17 @@ STR_GENERATION_WORLD                                            :{WHITE}Generuje
 STR_GENERATION_ABORT                                            :{BLACK}Zrušiť
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Zrušiť generovanie krajiny
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Skutočne chceš ukončiť generovanie?
-STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% hotovych
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% hotových
 STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
-STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Vytvorenie krajiny
-STR_GENERATION_RIVER_GENERATION                                 :{BLACK}Vytvorenie rieky
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generovanie sveta
+STR_GENERATION_RIVER_GENERATION                                 :{BLACK}Generovanie riek
 STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generovanie stromov
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Generovanie objektov
-STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generovanie nerovnosti a skal
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generovanie nerovností a skál
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Nastavovanie hry
-STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Spustam tile-loop
-STR_GENERATION_PREPARING_SCRIPT                                 :{BLACK}Bežiaci skript
-STR_GENERATION_PREPARING_GAME                                   :{BLACK}Priprava hry
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Spúšťanie políčkového cyklu
+STR_GENERATION_PREPARING_SCRIPT                                 :{BLACK}Spúšťanie skriptu
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Pripravovanie hry
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavenie NewGRF súborov
@@ -3296,12 +3347,12 @@ STR_FINANCES_YEAR                                               :{WHITE}{NUM}
 STR_FINANCES_SECTION_CONSTRUCTION                               :{GOLD}Výstavba
 STR_FINANCES_SECTION_NEW_VEHICLES                               :{GOLD}Nové vozidlá
 STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}Prevádzka vlakov
-STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}Prevádzka automobilov
+STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}Prevádzka cestných vozidiel
 STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Prevádzka lietadiel
 STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Prevádzka lodí
 STR_FINANCES_SECTION_PROPERTY_MAINTENANCE                       :{GOLD}Údržba majetku
 STR_FINANCES_SECTION_TRAIN_INCOME                               :{GOLD}Tržby vlakov
-STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME                        :{GOLD}Tržby automobilov
+STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME                        :{GOLD}Tržby cestných vozidiel
 STR_FINANCES_SECTION_AIRCRAFT_INCOME                            :{GOLD}Tržby lietadiel
 STR_FINANCES_SECTION_SHIP_INCOME                                :{GOLD}Tržby lodí
 STR_FINANCES_SECTION_LOAN_INTEREST                              :{GOLD}Úroky
@@ -3327,7 +3378,7 @@ STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Zvolený:
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Farebná schéma:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Stroje:
 STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vlak{P "" y ov}
-STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automobil{P "" y ov}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} cestn{P é é ých} vozid{P lo lá iel}
 STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lietad{P lo lá iel}
 STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} lo{P ď de dí}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Žiadne
@@ -3389,7 +3440,7 @@ STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Názvy p
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
-STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Produkcia za posledný mesiac
+STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Produkcia minulý mesiac:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% prepraven{P é é ých})
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Vycentrovať pohľad na pozíciu továrne. Ctrl+klik otvorí nové okno s pohľadom na továreň
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Úroveň produkcie: {YELLOW}{COMMA}%
@@ -3408,7 +3459,7 @@ STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Zmeniť
 
 # Vehicle lists
 STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Vlak{P "" y ov}
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Automobil{P "" y ov}
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Cestn{P é é ých} vozid{P lo lá iel}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lo{P ď de dí}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lietad{P lo lá iel}
 
@@ -3431,8 +3482,8 @@ STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vymeniť vozidl
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Vykonať servis
 
 STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Poslať do depa
-STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Poslat do garáže
-STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Poslat do lodenice
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Poslať do garáže
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Poslať do lodenice
 STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Poslať do hangáru
 
 STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Zastaviť všetky vozidlá v zozname
@@ -3480,9 +3531,11 @@ STR_BUY_VEHICLE_TRAIN_MONORAIL_CAPTION                          :Nové jednokoľ
 STR_BUY_VEHICLE_TRAIN_MAGLEV_CAPTION                            :Nové magnetické vlaky
 
 STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION                            :Nové automobily
+STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION                            :Nové električky
 
 ############ range for vehicle availability starts
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Železnicne vozidlá
+STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION                        :Nové cestné vozidlá
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :Nové lode
 STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Nove Lietadlo
 ############ range for vehicle availability ends
@@ -3551,7 +3604,7 @@ STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP                   :{BLACK}Prepnú
 STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP               :{BLACK}Prepnúť zobrazenie/skrytie typu lietadla
 
 STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Premenovať typ vlaku
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Premenovať typ automobilu
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Premenovať typ cestného vozidla
 STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Premenovať typ lode
 STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Premenovať typ lietadla
 
@@ -3572,7 +3625,7 @@ STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Lode - p
 STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lietadlo - pravý kliknutím na lietadlo sa zobrazia informácie
 
 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Presunutím lokomotívy bude predaná
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Automobil presunutý sem bude predaný
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Vozidlo presunuté sem bude predané
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Presunutím lode sem sa predá
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Presunutím lietadla sem sa predá
 
@@ -3594,7 +3647,7 @@ STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nové lo
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nové Lietadlo
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kúpiť nový vlak
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kúpiť nový automobil
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kúpiť nové cestné vozidlo
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Vyrobiť novú loď
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Kúpiť nové lietadlo
 
@@ -3638,7 +3691,7 @@ STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :{G=z}železnič
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=z}jednokoľajová lokomotíva
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=z}magnetická lokomotíva
 
-STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :{G=m}automobil
+STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :{G=s}cestné vozidlo
 
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :{G=s}lietadlo
 STR_ENGINE_PREVIEW_SHIP                                         :{G=z}loď
@@ -3650,7 +3703,7 @@ STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST                   :{BLACK}Cena: {C
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Výmena {STRING} - {STRING}
 STR_REPLACE_VEHICLE_TRAIN                                       :{G=m}Vlak
-STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :{G=m}Automobil
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :{G=s}Cestné vozidlo
 STR_REPLACE_VEHICLE_SHIP                                        :{G=z}Loď
 STR_REPLACE_VEHICLE_AIRCRAFT                                    :{G=s}Lietadlo
 
@@ -3721,7 +3774,7 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Zobrazi
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Zobraziť cestovné príkazy lietadla. Ctrl+klik pre zobrazenie cestovného poriadku lietadla
 
 STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Zobraziť detaily o vlaku
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Zobraziť detaily o automobile
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Zobraziť detaily o cestnom vozidle
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Zobraziť detaily o lodi
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Zobraziť detaily o lietadle
 
@@ -3758,7 +3811,7 @@ STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Meno
 
 STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Pomenovať vlak
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Premenovať automobil
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Premenovať cestné vozidlo
 STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Pomenovať loď
 STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Pomenovat lietadlo
 
@@ -3793,7 +3846,7 @@ STR_VEHICLE_DETAILS_DAYS                                        :Dni
 STR_VEHICLE_DETAILS_PERCENT                                     :Percentáž
 
 STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Premenovať vlak
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Premenovať automobil
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Premenovať cestné vozidlo
 STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Premenovať loď
 STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Premenovať lietadlo
 
@@ -4131,7 +4184,7 @@ STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vybrať
 STR_AI_LIST_CANCEL                                              :{BLACK}Zrušiť
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemeniť skript
 
-STR_SCREENSHOT_CAPTION                                          :Vytvoriť snímku obrazovky
+STR_SCREENSHOT_CAPTION                                          :{WHITE}Vytvoriť snímku obrazovky
 STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normálna snímka
 STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Plne priblížená snímka
 STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT                           :{BLACK}Predvolene priblížená snímka
@@ -4488,7 +4541,7 @@ STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nie je m
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Vlak v ceste
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Automobil v ceste
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Cestné vozidlo v ceste
 STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Loď v ceste
 STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Lietadlo v ceste
 
@@ -4498,27 +4551,27 @@ STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Nemožno
 STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Nie je možné prestavať na nový typ nákladu...
 
 STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Vlak nemožno pomenovať...
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nemožno premenovať automobil...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Nemožno premenovať cestné vozidlo...
 STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Nemožno pomenovať loď...
 STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Nie je možné pomenovať lietadlo...
 
 STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Nemožno zastaviť/spustiť vlak...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nemožno zastaviť/spustiť automobil...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Nemožno zastaviť/spustiť cestné vozidlo...
 STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Nemožno zastaviť/spustiť loď...
 STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Nemožno zastaviť/spustiť lietadlo...
 
 STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}Vlak sa nedá poslať do depa...
-STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nemožno poslať automobil do garáže...
+STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT                      :{WHITE}Nemožno poslať cestné vozidlo do garáže...
 STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Nemožno poslať loď do lodenice...
 STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Nemožno poslať lietadlo do hangáru...
 
 STR_ERROR_CAN_T_BUY_TRAIN                                       :{WHITE}Nemožno kúpiť vlak...
-STR_ERROR_CAN_T_BUY_ROAD_VEHICLE                                :{WHITE}Nie je možné zakúpiť automobil...
+STR_ERROR_CAN_T_BUY_ROAD_VEHICLE                                :{WHITE}Nie je možné zakúpiť cestné vozidlo...
 STR_ERROR_CAN_T_BUY_SHIP                                        :{WHITE}Nemožno vyrobiť loď...
 STR_ERROR_CAN_T_BUY_AIRCRAFT                                    :{WHITE}Nemožno vyrobiť lietadlo...
 
 STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Typ vlaku nemôže byť premenovaný...
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemožno premenovať typ automobilu...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Nemožno premenovať typ cestného vozidla...
 STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Nemožno premenovať typ lode...
 STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Nemožno premenovať typ lietadla...
 
@@ -4678,35 +4731,35 @@ STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=z}Cukrová b
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Bez názvu
 STR_SV_TRAIN_NAME                                               :{G=m}Vlak {COMMA}
-STR_SV_ROAD_VEHICLE_NAME                                        :{G=m}Automobil {COMMA}
+STR_SV_ROAD_VEHICLE_NAME                                        :{G=s}Cestné vozidlo {COMMA}
 STR_SV_SHIP_NAME                                                :{G=z}Loď {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :{G=s}Lietadlo {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Sever
 STR_SV_STNAME_SOUTH                                             :{STRING} Juh
-STR_SV_STNAME_EAST                                              :{STRING} Vychod
-STR_SV_STNAME_WEST                                              :{STRING} Zapad
+STR_SV_STNAME_EAST                                              :{STRING} Východ
+STR_SV_STNAME_WEST                                              :{STRING} Západ
 STR_SV_STNAME_CENTRAL                                           :{STRING} Centrum
-STR_SV_STNAME_TRANSFER                                          :{STRING} Razcestie
+STR_SV_STNAME_TRANSFER                                          :{STRING} Rázcestie
 STR_SV_STNAME_HALT                                              :{STRING} Za horou
-STR_SV_STNAME_VALLEY                                            :{STRING} Udolie
+STR_SV_STNAME_VALLEY                                            :{STRING} Údolie
 STR_SV_STNAME_HEIGHTS                                           :{STRING} Na kopci
 STR_SV_STNAME_WOODS                                             :{STRING} Lesy
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Jazera
+STR_SV_STNAME_LAKESIDE                                          :{STRING} Pri jazere
 STR_SV_STNAME_EXCHANGE                                          :{STRING} Predmestie
 STR_SV_STNAME_AIRPORT                                           :{STRING} Letisko
-STR_SV_STNAME_OILFIELD                                          :{STRING} Vrtna plosina
+STR_SV_STNAME_OILFIELD                                          :{STRING} Vrtná plošina
 STR_SV_STNAME_MINES                                             :{STRING} Bane
-STR_SV_STNAME_DOCKS                                             :{STRING} Pristav
+STR_SV_STNAME_DOCKS                                             :{STRING} Prístav
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
-STR_SV_STNAME_ANNEXE                                            :{STRING} Zastavka
+STR_SV_STNAME_ANNEXE                                            :{STRING} Zastávka
 STR_SV_STNAME_SIDINGS                                           :{STRING} Vidiek
-STR_SV_STNAME_BRANCH                                            :{STRING} Konecna
-STR_SV_STNAME_UPPER                                             :Horny {STRING}
-STR_SV_STNAME_LOWER                                             :Dolny {STRING}
+STR_SV_STNAME_BRANCH                                            :{STRING} Konečná
+STR_SV_STNAME_UPPER                                             :Horný {STRING}
+STR_SV_STNAME_LOWER                                             :Dolný {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} Les
 STR_SV_STNAME_FALLBACK                                          :{STRING} Stanica #{NUM}
@@ -4714,17 +4767,17 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stanic
 
 ##id 0x8000
 # Vehicle names
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Parny)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Parný)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MJS_250_DIESEL               :MJS 250 (Diesel)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_CHOO_CHOO         :Ploddyphut Choo-Choo
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_CHOO_CHOO          :Powernaut Choo-Choo
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MIGHTYMOVER_CHOO_CHOO        :MightyMover Choo-Choo
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_PLODDYPHUT_DIESEL            :Ploddyphut Diesel
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_POWERNAUT_DIESEL             :Powernaut Diesel
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_WILLS_2_8_0_STEAM            :Wills 2-8-0 (Parny)
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CHANEY_JUBILEE_STEAM         :Chaney 'Jubilee' (Parny)
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_GINZU_A4_STEAM               :Ginzu 'A4' (Parny)
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_8P_STEAM                  :SH '8P' (Parny)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_WILLS_2_8_0_STEAM            :Wills 2-8-0 (Parný)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_CHANEY_JUBILEE_STEAM         :Chaney 'Jubilee' (Parný)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_GINZU_A4_STEAM               :Ginzu 'A4' (Parný)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_8P_STEAM                  :SH '8P' (Parný)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MANLEY_MOREL_DMU_DIESEL      :Manley-Morel DMU (Diesel)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_DASH_DIESEL                  :'Dash' (Diesel)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_HENDRY_25_DIESEL          :SH/Hendry '25' (Diesel)
@@ -4737,10 +4790,10 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KELLING_3100_DIESEL          :Kelling 3100 (D
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_TURNER_TURBO_DIESEL          :Turner Turbo (Diesel)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MJS_1000_DIESEL              :MJS 1000 (Diesel)
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_125_DIESEL                :SH '125' (Diesel)
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_30_ELECTRIC               :SH '30' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_40_ELECTRIC               :SH '40' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_T_I_M_ELECTRIC               :'T.I.M.' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_ASIASTAR_ELECTRIC            :'AsiaStar' (Elektricky)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_30_ELECTRIC               :SH '30' (Elektrický)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_SH_40_ELECTRIC               :SH '40' (Elektrický)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_T_I_M_ELECTRIC               :'T.I.M.' (Elektrický)
+STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_ASIASTAR_ELECTRIC            :'AsiaStar' (Elektrický)
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PASSENGER_CAR                 :Vagón pre cestujúcich
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_MAIL_VAN                      :Poštový vagón
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COAL_CAR                      :Vagón na uhlie
@@ -4768,64 +4821,64 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :Vagón na hrač
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Vagón na baterky
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :Vagón na malinovku
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Vagón na umelinu
-STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC           :'X2001' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC   :'Millennium Z1' (Elektricky)
+STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC           :'X2001' (Elektrický)
+STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC   :'Millennium Z1' (Elektrický)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :Wizzowow Z99
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PASSENGER_CAR             :Vagón pre cestujúcich
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_MAIL_VAN                  :Poštový vagón
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COAL_CAR                  :Vagón na uhlie
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_OIL_TANKER                :Vagon na ropu
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_LIVESTOCK_VAN             :Vagon na dobytok
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GOODS_VAN                 :Vagon na tovar
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GRAIN_HOPPER              :Vagon na obilie
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WOOD_TRUCK                :Vagon na drevo
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_OIL_TANKER                :Vagón na ropu
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_LIVESTOCK_VAN             :Vagón na dobytok
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GOODS_VAN                 :Vagón na tovar
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_GRAIN_HOPPER              :Vagón na obilie
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WOOD_TRUCK                :Vagón na drevo
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_IRON_ORE_HOPPER           :Vagón na železnú rudu
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK               :Vagon na ocel
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :Obrneny vagon
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN                  :Vagon na jedlo
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK               :Vagon na papier
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK               :Vagón na oceľ
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :Obrnený vagón
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN                  :Vagón na jedlo
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK               :Vagón na papier
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER         :Vagón na medenú rudu
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WATER_TANKER              :Vagon na vodu
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FRUIT_TRUCK               :Vagon na ovocie
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK              :Vagon na kaucuk
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK               :Vagon na cukor
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER       :Vagon na cukrovu vatu
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER             :Vagon na karamel
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WATER_TANKER              :Vagón na vodu
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FRUIT_TRUCK               :Vagón na ovocie
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK              :Vagón na kaučuk
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK               :Vagón na cukor
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER       :Vagón na cukrovú vatu
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER             :Vagón na karamel
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN                :Vagón na bublinky
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER               :Vagon na kofolu
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN                 :Vagon na cukriky
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER               :Vagón na kofolu
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN                 :Vagón na cukríky
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN                   :Vagón na hračky
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK             :Vagón na baterky
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK         :Vagón na malinovku
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK             :Vagón na umelinu
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC    :Lev1 'Leviathan' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC      :Lev2 'Cyclops' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV3_PEGASUS_ELECTRIC      :Lev3 'Pegasus' (Elektricky)
-STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV4_CHIMAERA_ELECTRIC     :Lev4 'Chimaera' (Elektricky)
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC    :Lev1 'Leviathan' (Elektrický)
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC      :Lev2 'Cyclops' (Elektrický)
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV3_PEGASUS_ELECTRIC      :Lev3 'Pegasus' (Elektrický)
+STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV4_CHIMAERA_ELECTRIC     :Lev4 'Chimaera' (Elektrický)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_WIZZOWOW_ROCKETEER         :Wizzowow Rocketeer
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PASSENGER_CAR               :Vagon pre cestujucich
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_MAIL_VAN                    :Postovy vagon
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COAL_CAR                    :Vagon na uhlie
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_OIL_TANKER                  :Vagon na ropu
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_LIVESTOCK_VAN               :Vagon na dobytok
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GOODS_VAN                   :Vagon na tovar
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GRAIN_HOPPER                :Vagon na obilie
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WOOD_TRUCK                  :Vagon na drevo
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_IRON_ORE_HOPPER             :Vagon na zeleznu rudu
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_STEEL_TRUCK                 :Vagon na ocel
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :Obrneny vagon
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN                    :Vagon na jedlo
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK                 :Vagon na papier
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PASSENGER_CAR               :Vagón pre cestujúcich
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_MAIL_VAN                    :Poštový vagón
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COAL_CAR                    :Vagón na uhlie
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_OIL_TANKER                  :Vagón na ropu
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_LIVESTOCK_VAN               :Vagón na dobytok
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GOODS_VAN                   :Vagón na tovar
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GRAIN_HOPPER                :Vagón na obilie
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WOOD_TRUCK                  :Vagón na drevo
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_IRON_ORE_HOPPER             :Vagón na železnú rudu
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_STEEL_TRUCK                 :Vagón na oceľ
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :Obrnený vagón
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN                    :Vagón na jedlo
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK                 :Vagón na papier
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER           :Vagón na medenú rudu
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER                :Vagon na vodu
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FRUIT_TRUCK                 :Vagon na ovocie
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK                :Vagon na kaucuk
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK                 :Vagon na cukor
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER         :Vagon na cukrovu vatu
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER               :Vagon na karamel
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER                :Vagón na vodu
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FRUIT_TRUCK                 :Vagón na ovocie
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK                :Vagón na kaučuk
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK                 :Vagón na cukor
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER         :Vagón na cukrovú vatu
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER               :Vagón na karamel
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN                  :Vagón na bublinky
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER                 :Vagon na kofolu
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN                   :Vagon na cukriky
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER                 :Vagón na kofolu
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN                   :Vagón na cukríky
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN                     :Vagón na hračky
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK               :Vagón na baterky
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK           :Vagón na malinovku
@@ -4840,9 +4893,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_PLODDYPHUT_MKIII_BUS              :Ploddyphut MkII
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_COAL_TRUCK                 :Balogh - Uhlie
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COAL_TRUCK                    :Uhl - Uhlie
 STR_VEHICLE_NAME_ROAD_VEHICLE_DW_COAL_TRUCK                     :DW - Uhlie
-STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_MAIL_TRUCK                    :MPS - Posta
-STR_VEHICLE_NAME_ROAD_VEHICLE_REYNARD_MAIL_TRUCK                :Reynard - Posta
-STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK                  :Perry - Posta
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_MAIL_TRUCK                    :MPS - Pošta
+STR_VEHICLE_NAME_ROAD_VEHICLE_REYNARD_MAIL_TRUCK                :Reynard - Pošta
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK                  :Perry - Pošta
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK            :MightyMover - Pošta
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK            :Powernaught - Pošta
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK               :Wizzowow - Pošta
@@ -4864,12 +4917,12 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_MORELAND_WOOD_TRUCK               :Moreland - Drev
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_IRON_ORE_TRUCK                :MPS - Železná ruda
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_IRON_ORE_TRUCK                :Uhl - Železná ruda
 STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :Chippy - Železná ruda
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :Balogh - Ocel
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Uhl - Ocel
-STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Kelling - Ocel
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Balogh - Obrnene vozidlo
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Uhl - Obrnene vozidlo
-STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Foster - Obrnene vozidlo
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :Balogh - Oceľ
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Uhl - Oceľ
+STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Kelling - Oceľ
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_ARMORED_TRUCK              :Balogh - Obrnené vozidlo
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_ARMORED_TRUCK                 :Uhl - Obrnené vozidlo
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Foster - Obrnené vozidlo
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN                   :Foster - Jedlo
 STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN                    :Perry - Jedlo
 STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :Chippy - Jedlo
@@ -4885,18 +4938,18 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_WATER_TANKER                  :MPS - Voda
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_FRUIT_TRUCK                :Balogh - Ovocie
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_FRUIT_TRUCK                   :Uhl - Ovocie
 STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_FRUIT_TRUCK               :Kelling - Ovocie
-STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK               :Balogh - Kaucuk
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK                  :Uhl - Kaucuk
-STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK                  :RMT - Kaucuk
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK               :Balogh - Kaučuk
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK                  :Uhl - Kaučuk
+STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK                  :RMT - Kaučuk
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK           :MightyMover - Cukor
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_SUGAR_TRUCK           :Powernaught - Cukor
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK              :Wizzowow - Cukor
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COLA_TRUCK            :MightyMover - Kofola
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COLA_TRUCK            :Powernaught - Kofola
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COLA_TRUCK               :Wizzowow - Kofola
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY          :MightyMover - Cukrova vata
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY          :Powernaught - Cukrova vata
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK       :Wizzowow - Cukrova vata
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY          :MightyMover - Cukrová vata
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY          :Powernaught - Cukrová vata
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK       :Wizzowow - Cukrová vata
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK          :MightyMover - Karamel
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOFFEE_TRUCK          :Powernaught - Karamel
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOFFEE_TRUCK             :Wizzowow - Karamel
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 168412a2b9..efe012ed15 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -1346,7 +1346,7 @@ STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :Mejorado
 STR_CONFIG_SETTING_ROAD_SIDE                                    :Vehículos de carretera: {STRING}
 STR_CONFIG_SETTING_ROAD_SIDE_HELPTEXT                           :Elegir el lado de conducción
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :Rotación del Mapa de alturas: {STRING}
-STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :A la izquierda
+STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Sentido antihorario
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Sentido horario
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :El nivel de la altura del mapa plano tiene: {STRING}
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}Una o más casillas del borde norte no están vacías
@@ -1424,10 +1424,10 @@ STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :Usar grupos en
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_HELPTEXT              :Activa el uso de listas de vehículos avanzadas para agrupar vehículos
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :Usar indicadores de carga: {STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS_HELPTEXT                  :Permite escoger si se deben de mostrar indicadores de carga encima de vehículos que estén en estaciones
-STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :Mostrar horario en ticks en vez de en días: {STRING}
-STR_CONFIG_SETTING_TIMETABLE_IN_TICKS_HELPTEXT                  :Muestra los tiempos de viaje en tablas de horario en ticks en lugar de en días
-STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :Mostrar salidas y llegadas en horarios: {STRING}
-STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT    :Muestra tiempos de llegada y salida adelantados en tablas de tiempo
+STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :Mostrar horario en tics en vez de en días: {STRING}
+STR_CONFIG_SETTING_TIMETABLE_IN_TICKS_HELPTEXT                  :Muestra los tiempos de viaje en los horarios en tics en lugar de en días
+STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :Mostrar salidas y llegadas en los horarios: {STRING}
+STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE_HELPTEXT    :Muestra tiempos de llegada y salida adelantados en los horarios
 STR_CONFIG_SETTING_QUICKGOTO                                    :Creación rápida de órdenes para vehículos: {STRING}
 STR_CONFIG_SETTING_QUICKGOTO_HELPTEXT                           :Preselecciona el cursor "Ir a" al abrir la ventana de órdenes
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE                            :Raíl por defecto (juego nuevo/cargar juego): {STRING}
@@ -2744,7 +2744,7 @@ STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD
 STR_FRAMERATE_CAPTION                                           :{WHITE}Fotogramas por segundo - FPS
 STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
 STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Tasa de Simulación: {STRING}
-STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Número de ticks de juego simulados por segundo.
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Número de tics de juego simulados por segundo.
 STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}FPS de gráficos: {STRING}
 STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}Número de fotogramas renderizados por segundo.
 STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Factor de velocidad de juego actual: {DECIMAL}x
@@ -2767,11 +2767,11 @@ STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COM
 ############ Leave those lines in this order!!
 STR_FRAMERATE_GAMELOOP                                          :{BLACK}Bucles de juego totales:
 STR_FRAMERATE_GL_ECONOMY                                        :{BLACK}  Manejo de cargamento
-STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  Ticks de trenes:
-STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  Ticks de vehículos de carretera:
-STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Ticks de barcos:
-STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}  Ticks de aeronaves:
-STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK} Ticks de mapa:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  Tics de trenes:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  Tics de vehículos de carretera:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Tics de barcos:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}  Tics de aeronaves:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK} Tics de mapa:
 STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}  Retraso del gráfico de distribución:
 STR_FRAMERATE_DRAWING                                           :{BLACK}Renderizado gráfico:
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK} Ventanas de vista generales:
@@ -2784,11 +2784,11 @@ STR_FRAMERATE_AI                                                :{BLACK}   IA {N
 ############ Leave those lines in this order!!
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Bucle de juego
 STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Manejo de cargamento
-STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Ticks de trenes
-STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Ticks de vehículo de carretera
-STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Ticks de barcos
-STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Ticks de aeronaves
-STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :Ticks de mapa
+STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Tics de trenes
+STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Tics de vehículo de carretera
+STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Tics de barcos
+STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Tics de aeronaves
+STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :Tics de mapa
 STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              :Retraso del gráfico de distribución
 STR_FRAMETIME_CAPTION_DRAWING                                   :Renderizado gráfico
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Representación de la vista del Mundo
@@ -3897,8 +3897,8 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Reformar
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Órdenes)
-STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horarios
-STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Cambiar a la vista de horarios
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horario
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Cambia a la vista de horarios
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Lista de órdenes - Clic en una orden para resaltarla. Ctrl+Clic para desplazarse a la estación de la orden
 STR_ORDER_INDEX                                                 :{COMMA}:{NBSP}
@@ -4049,56 +4049,56 @@ STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Saltar a orden
 STR_ORDER_CONDITIONAL_NUM                                       :Saltar a orden {COMMA} cuando {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Saltar a orden {COMMA} cuando {STRING} {STRING}
 
-STR_INVALID_ORDER                                               :{RED} (Orden inválida)
+STR_INVALID_ORDER                                               :{RED} (Orden no válida)
 
 # Time table window
-STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horarios)
+STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horario)
 STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Órdenes
 STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Cambiar a la vista de órdenes
 
-STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horarios - pulse en una orden para marcarla
+STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horario - Pulse en una orden para marcarla
 
 STR_TIMETABLE_NO_TRAVEL                                         :Sin viaje
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viajar (automático; programado por la próxima orden manual)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viaje (sin horarios)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (sin horarios) a como máximo {2:VELOCITY}
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viajar (sin programar)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viajar (sin programar) a {2:VELOCITY} como máximo
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viajar a {STRING} con un límite de velocidad de {VELOCITY}
-STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajando (a {STRING}, sin horarios)
-STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viajando (a {STRING}, sin horario) a como máximo {VELOCITY}
-STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(permaneciendo por {STRING}, sin horarios)
-STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(viajando a {STRING}, sin horarios)
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viajar durante {STRING} a {VELOCITY} como máximo
+STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajando (durante {STRING}, sin programar)
+STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viajando (durante {STRING}, sin programar) a {VELOCITY} como máximo
+STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(permaneciendo {STRING}, sin programar)
+STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :(viajando durante {STRING}, sin programar)
 STR_TIMETABLE_STAY_FOR                                          :y esperar {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :y viajar durante {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA}{NBSP}día{P "" s}
 STR_TIMETABLE_TICKS                                             :{COMMA}{NBSP}tic{P "" s}
 
-STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Los horarios tomarán {STRING} para completarse
-STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Estos horarios tomarán {STRING} para completarse (no todos los horarios)
+STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}El horario tardará {STRING} en completarse
+STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}El horario tardará al menos {STRING} en completarse (no todas las órdenes)
 
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Este vehículo está actualmente en hora
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Este vehículo está actualmente retrasado {STRING}
-STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Este vehículo está actualmente {STRING} adelantado
+STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Este vehículo está actualmente adelantado {STRING}
 STR_TIMETABLE_STATUS_NOT_STARTED                                :{BLACK}Este horario no ha comenzado
-STR_TIMETABLE_STATUS_START_AT                                   :{BLACK}Este horario empezará en {STRING}
+STR_TIMETABLE_STATUS_START_AT                                   :{BLACK}Este horario comenzará en {STRING}
 
 STR_TIMETABLE_STARTING_DATE                                     :{BLACK}Fecha de inicio
 STR_TIMETABLE_STARTING_DATE_TOOLTIP                             :{BLACK}Selecciona una fecha como punto de partida de este horario. Ctrl+Clic permite fijar el punto de partida de este horario y distribuye todos los vehículos que lo compartan siempre y cuando el horario esté completo
 
-STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Cambiar Horario
-STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambia la cantidad de tiempo que debe tardar una orden marcada
+STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Cambiar duración
+STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambia la duración de la orden seleccionada
 
-STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Limpiar Horario
-STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Limpiar la cantidad de tiempo para la orden seleccionada
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Borrar duración
+STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Borra la duración de la orden seleccionada
 
-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Cambiar Límite de Velocidad
+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Cambiar límite de velocidad
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Cambia el límite de velocidad de la orden seleccionada
 
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Limpiar Límite de Velocidad
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Limpia el límite de velocidad de la orden seleccionada
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Borrar límite de velocidad
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Borra el límite de velocidad de la orden seleccionada
 
-STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reiniciar Retrasos
-STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reajustar el contador del retraso, así el vehículo estará en horario
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reiniciar retrasos
+STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Pone a cero el retraso del vehículo, así el vehículo estará en hora
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Rellenar automáticamente
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Rellena la tabla de horarios automáticamente con los valores de la siguiente jornada (Ctrl+Clic para tratar de mantener los tiempos de espera))
@@ -4115,9 +4115,9 @@ STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :S:
 STR_DATE_CAPTION                                                :{WHITE}Seleccionar fecha
 STR_DATE_SET_DATE                                               :{BLACK}Seleccionar fecha
 STR_DATE_SET_DATE_TOOLTIP                                       :{BLACK}Usar la fecha seleccionada como punto de inicio del horario
-STR_DATE_DAY_TOOLTIP                                            :{BLACK}Selecciona día
-STR_DATE_MONTH_TOOLTIP                                          :{BLACK}Selecciona mes
-STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Selecciona año
+STR_DATE_DAY_TOOLTIP                                            :{BLACK}Selecciona el día
+STR_DATE_MONTH_TOOLTIP                                          :{BLACK}Selecciona el mes
+STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Selecciona el año
 
 
 # AI debug window
@@ -4188,7 +4188,7 @@ STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Normal
 STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Acercamiento máximo
 STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT                           :{BLACK}Acercamiento por defecto
 STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Mapa completo
-STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :Mapa de alturas
+STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Mapa de alturas
 STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Minimapa
 
 # AI Parameters
@@ -4630,7 +4630,7 @@ STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}... dema
 STR_ERROR_AIRCRAFT_NOT_ENOUGH_RANGE                             :{WHITE}... la aeronave no tiene suficiente alcance
 
 # Timetable related errors
-STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}No se pueden asignar horarios al vehículo...
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}No se puede asignar horario al vehículo...
 STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Los vehículos solo pueden esperar en estaciones
 STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Este vehículo no va a detenerse en esta estación
 

From 6e53bf00c4aa454971b1554b0e700bb32cd71254 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Thu, 8 Oct 2020 17:51:56 +0000
Subject: [PATCH 23/31] Update: Translations from eints slovak: 56 changes by
 FuryPapaya

---
 src/lang/slovak.txt | 81 +++++++++++++++++++++++++++++++--------------
 1 file changed, 56 insertions(+), 25 deletions(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 31b8f81c1f..55307773bf 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1654,7 +1654,7 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :náhodne
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :Mestá môžu staviať cesty: {STRING}
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS_HELPTEXT                    :Povolí mestám budovať cesty kvôli potrebe rozšírenia. Vypnite na zamedzenie mestám budovať cesty kdekoľvek.
 STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS                   :Mestá umožňujú stavbu železničných priecestí: {STRING}
-STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :Povolením nastavenia umožní mestám stavať úrovňové križovania.
+STR_CONFIG_SETTING_ALLOW_TOWN_LEVEL_CROSSINGS_HELPTEXT          :Povolením nastavenia sa umožní mestám stavať železničné priecestia
 STR_CONFIG_SETTING_NOISE_LEVEL                                  :Povoliť mestom určené hlukové limity pre letiská: {STRING}
 STR_CONFIG_SETTING_NOISE_LEVEL_HELPTEXT                         :Ak je nastavenie vypnuté, potom môžu byť dve letiská v jednom meste. Ak je nastavenie zapnuté, počet letísk je obmedzený prijateľnou hlučnosťou, ktorá závisí od počtu obyvateľov a veľkosti letiska a jeho vzdialenosti od mesta
 STR_CONFIG_SETTING_TOWN_FOUNDING                                :Zakladanie nových miest počas hry: {STRING}
@@ -2382,6 +2382,7 @@ STR_LINKGRAPH_LEGEND_CAPTION                                    :{BLACK}Legenda
 STR_LINKGRAPH_LEGEND_ALL                                        :{BLACK}Všetko
 STR_LINKGRAPH_LEGEND_NONE                                       :{BLACK}Nič
 STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}Vyberte spoločnosti pre zobrazenie
+STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP                            :{BLACK}{STRING}{}{COMPANY}
 
 # Linkgraph legend window and linkgraph legend in smallmap
 STR_LINKGRAPH_LEGEND_UNUSED                                     :{TINY_FONT}{BLACK}nevyužité
@@ -2419,7 +2420,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Postavi
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Postaviť železničný most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Postaviť železničný tunel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Prepnúť stavbu/odstránenie železničných koľají, návestidiel, smerových bodov a staníc. Podržte Ctrl a budú odstránené viaceré objekty v rade za sebou
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konvertovať/vylepšiť typ železnice
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konvertovať/vylepšiť typ železnice. Shift zobrazí predpokladanú cenu
 
 STR_RAIL_NAME_RAILROAD                                          :Železnica
 STR_RAIL_NAME_ELRAIL                                            :Elektrifikovaná železnica
@@ -2506,7 +2507,11 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Postavi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postaviť tunel pre električky
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Prepnúť stavbu/odstraňovanie cesty
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Prepnúť stavbu/odstraňovanie električkovej dráhy
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Konvertovať/vylepšiť typ cesty. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Konvertovať/vylepšiť typ električkovej trate. Shift zobrazí predpokladanú cenu
 
+STR_ROAD_NAME_ROAD                                              :Cesta
+STR_ROAD_NAME_TRAM                                              :Električková trať
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientacia garaze
@@ -2690,8 +2695,12 @@ STR_LAND_AREA_INFORMATION_AIRPORTTILE_NAME                      :{BLACK}Názov l
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Prijíma náklad: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Rýchlostný limit koľají: {LTBLUE}{VELOCITY}
+STR_LANG_AREA_INFORMATION_RAIL_TYPE                             :{BLACK}Typ železnice: {LTBLUE}{STRING}
+STR_LANG_AREA_INFORMATION_ROAD_TYPE                             :{BLACK}Typ cesty: {LTBLUE}{STRING}
+STR_LANG_AREA_INFORMATION_TRAM_TYPE                             :{BLACK}Typ električkovej trate: {LTBLUE}{STRING}
+STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Rýchlostný limit železnice: {LTBLUE}{VELOCITY}
 STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Rýchlostný limit cesty: {LTBLUE}{VELOCITY}
+STR_LANG_AREA_INFORMATION_TRAM_SPEED_LIMIT                      :{BLACK}Rýchlostný limit električkovej trate: {LTBLUE}{VELOCITY}
 
 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Skaly
@@ -2729,9 +2738,9 @@ STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Železnica vlak
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Cesta
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Cesta s lampami
 STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Cesta v aleji
-STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Cestné depo
-STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Železnične priecestie
-STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Elektrickova dráha
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garáž
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Železničné priecestie
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Električková trať
 
 # Houses come directly from their building names
 STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (vo výstavbe)
@@ -2781,7 +2790,7 @@ STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvadukt
 
 STR_LAI_OBJECT_DESCRIPTION_TRANSMITTER                          :Vysielac
 STR_LAI_OBJECT_DESCRIPTION_LIGHTHOUSE                           :Maják
-STR_LAI_OBJECT_DESCRIPTION_COMPANY_HEADQUARTERS                 :Sidlo firmy
+STR_LAI_OBJECT_DESCRIPTION_COMPANY_HEADQUARTERS                 :Sídlo spoločnosti
 STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :Spoločnosťou vlastnený pozemok
 
 # About OpenTTD window
@@ -3387,19 +3396,19 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraštruktúra:
 STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} políč{P ko ka ok} železnice
 STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} políč{P ko ka ok} cesty
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} políč{P ko ka ok} vody
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} vodn{P é é ých} políč{P ko ka ok}
 STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} políč{P ko ka ok} stanice
 STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} let{P isko iská ísk}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Žiadne
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Postaviť sídlo
-STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Postaviť sídlo firmy
-STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Pozriet sidlo
-STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Pozrieť sídlo firmy
-STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Premiestnit sidlo
+STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Postaviť sídlo spoločnosti
+STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Pozrieť sídlo
+STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Pozrieť sídlo spoločnosti
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Premiestniť sídlo
 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Sídlo spoločnosti je možné premiestniť za 1% hodnoty spoločnosti. Shift+klik zobrazí predpokladanú cenu
 STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Detaily
-STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Ukázať detailné počty infraštruktúry
+STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Zobraziť podrobné políčka infraštruktúry
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nová tvár
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Vybrať novú tvár prezidenta
@@ -3425,6 +3434,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}Infrašt
 STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Políčka železnice:
 STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Semafóry
 STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Políčka cesty:
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT                       :{GOLD}Električkové políčka:
 STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Vodné políčka:
 STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Kanále
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Stanice:
@@ -3547,7 +3557,7 @@ STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}Rýchlos
 STR_PURCHASE_INFO_SPEED_CANAL                                   :{BLACK}Rýchlosť na kanály/rieke: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Prevádzkové náklady: {GOLD}{CURRENCY_LONG}/rok
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{CARGO_LONG} {STRING}
-STR_PURCHASE_INFO_REFITTABLE                                    :(mozna prestavba)
+STR_PURCHASE_INFO_REFITTABLE                                    :(možná prestavba)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyrobené: {GOLD}{NUM}{BLACK} Životnosť: {GOLD}{COMMA} rok{P "" y ov}
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spoľahlivosť: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY_LONG}
@@ -3555,28 +3565,36 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnos
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Rýchlosť: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Poháňané vagóny: {GOLD}+{POWER}{BLACK} Hmotnosť: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Prestavatelne na: {GOLD}{STRING}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Prestavateľné na: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Všetky druhy nákladu
 STR_PURCHASE_INFO_ALL_BUT                                       :Všetko okrem {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. trakčná sila: {GOLD}{FORCE}
-STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Dosah: {GOLD}{COMMA} políčok
+STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Dolet: {GOLD}{COMMA} políčok
 
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Výber vlakov. Pre získanie informácií klikni na vlak. CTRL+klik prepne skrytie typu vlaku.
 STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Výber cestných vozidiel. Pre získanie informácií klikni na vozidlo. CTRL+klik prepne skrytie typu vozidla.
 STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Zoznam lodí. Pre získanie informácií klikni na loď. CTRL+klik prepnie skrytie typu lode.
 STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Zoznam lietadiel. Pre získanie informácií klikni na lietadlo. CTRL+klik prepnie skrytie typu lietadla.
 
-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Kúpiť vozidlo
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Kúpiť vlak
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Kúpiť vozidlo
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Kúpiť loď
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Kúpiť lietadlo
 
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_BUTTON                  :{BLACK}Kúpiť a prestavať vlak
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON           :{BLACK}Kúpiť a prestavať vozidlo
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Kúpiť a prestavať loď
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Kúpiť a prestavať lietadlo
 
-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Kúpiť vybraný vlak. Shift+klik zobrazí predpokladanú cenu bez nákupu.
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Kúpiť vybraný vlak. Shift+klik zobrazí predpokladanú cenu bez nákupu
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Kúpiť vybrané vozidlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Kúpiť vybranú loď. Shift+klik zobrazí predpokladanú cenu bez nákupu
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Kúpiť vybrané lietadlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
 
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Kúpiť a prestavať vybraný vlak. Shift+klik zobrazí predpokladanú cenu bez nákupu
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP          :{BLACK}Kúpiť a prestavať vybrané vozidlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}Kúpiť a prestavať vybranú loď. Shift+klik zobrazí predpokladanú cenu bez nákupu
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}Kúpiť a prestavať vybrané lietadlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
 
 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Premenovať
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Premenovať
@@ -3688,10 +3706,12 @@ STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Správa
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Práve sme navrhli nov{G "ý" "ú" "é"} {STRING} - máte záujem o právo exkluzívneho používania na 1 rok? Chceme otestovať vlastnosti tohto modelu pred jeho uvedením na trh.
 
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :{G=z}železničná lokomotíva
+STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE                            :{G=z}elektrická lokomotíva
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=z}jednokoľajová lokomotíva
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=z}magnetická lokomotíva
 
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :{G=s}cestné vozidlo
+STR_ENGINE_PREVIEW_TRAM_VEHICLE                                 :{G=z}električka
 
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :{G=s}lietadlo
 STR_ENGINE_PREVIEW_SHIP                                         :{G=z}loď
@@ -3699,6 +3719,10 @@ STR_ENGINE_PREVIEW_SHIP                                         :{G=z}loď
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {CURRENCY_LONG} Hmotnosť: {WEIGHT_SHORT}{}Rýchlosť: {VELOCITY}  Výkon: {POWER}{}Prevádzkové náklady: {CURRENCY_LONG}/rok{}Kapacita: {CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Cena: {CURRENCY_LONG} Hmotnosť: {WEIGHT_SHORT}{}Rýchlosť: {VELOCITY}  Sila: {POWER}  Max. T.E.: {6:FORCE}{}Prevádzkové náklady: {4:CURRENCY_LONG}/yr{}Kapacita: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAP_RUNCOST                   :{BLACK}Cena: {CURRENCY_LONG} Max. Rýchlosť: {VELOCITY}{}Kapacita: {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_CAP_RUNCOST          :{BLACK}Cena: {CURRENCY_LONG} Rýchlosť: {VELOCITY}{}Typ lietadla: {STRING}{}Kapacita: {CARGO_LONG}, {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_CAP_RUNCOST              :{BLACK}Cena: {CURRENCY_LONG} Rýchlosť: {VELOCITY}{}Typ lietadla: {STRING}{}Kapacita: {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_CAP_RUNCOST    :{BLACK}Cena: {CURRENCY_LONG} Rýchlosť: {VELOCITY}{}Typ lietadla: {STRING} Dolet: {COMMA} políčok{}Kapacita: {CARGO_LONG}, {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_TYPE_RANGE_CAP_RUNCOST        :{BLACK}Cena: {CURRENCY_LONG} Rýchlosť: {VELOCITY}{}Typ lietadla: {STRING} Dolet: {COMMA} políčok{}Kapacita: {CARGO_LONG}{}Prevádzkové náklady: {CURRENCY_LONG}/rok
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Výmena {STRING} - {STRING}
@@ -3874,8 +3898,8 @@ STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Zobrazi
 STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacita: {LTBLUE}
 
 # Vehicle refit
-STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prestavat)
-STR_REFIT_TITLE                                                 :{GOLD}Vyber typ nákladu:
+STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prestavať)
+STR_REFIT_TITLE                                                 :{GOLD}Vyberte druh nákladu:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}{}{BLACK}Cena prestavby: {RED}{CURRENCY_LONG}
 STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}{}{BLACK}Príjem z prestavby: {GREEN}{CURRENCY_LONG}
 STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Cena prestavby: {RED}{CURRENCY_LONG}
@@ -3932,7 +3956,7 @@ STR_ORDER_DROP_NO_UNLOADING                                     :Nevykladaj
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Zmeniť spôsob vykladania pre označený príkaz
 
 STR_ORDER_REFIT                                                 :{BLACK}Prestavba
-STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vyberte typ nákladu na prestavbu v tomto poradí. CTRL+klik na odstránenie príkazu prestavby
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vyberte druh nákladu na prestavbu v tomto poradí. Ctrl+klik na odstránenie príkazu prestavby
 STR_ORDER_REFIT_AUTO                                            :{BLACK}Automaticky modernizovať
 STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Vyber ktorý druh tovaru sa bude automaticky nakladať. Ctrl+Klik pre odstránenie automatického nakladania. Automatické nakladanie musí byť podporované vozidlom
 STR_ORDER_DROP_REFIT_AUTO                                       :Pevný náklad
@@ -4234,8 +4258,8 @@ STR_FEEDER_INCOME_TINY                                          :{TINY_FONT}{YEL
 STR_FEEDER_INCOME                                               :{YELLOW}Prevod: {CURRENCY_LONG}{WHITE} / {GREEN}Zisk: {CURRENCY_LONG}
 STR_FEEDER_COST_TINY                                            :{TINY_FONT}{YELLOW}Prevod: {CURRENCY_LONG}{WHITE} / {RED}Náklady: {CURRENCY_LONG}
 STR_FEEDER_COST                                                 :{YELLOW}Prevod: {CURRENCY_LONG}{WHITE} / {RED}Náklady: {CURRENCY_LONG}
-STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Priblizna cena: {CURRENCY_LONG}
-STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Priblizny zisk: {CURRENCY_LONG}
+STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Predpokladaná cena: {CURRENCY_LONG}
+STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Predpokladaný zisk: {CURRENCY_LONG}
 
 # Saveload messages
 STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Ukladanie hry este bezi,{}pockajte prosim na dokoncenie!
@@ -4463,7 +4487,8 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Najprv j
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Žiadne použiteľné železničné koľaje
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Musíš najskôr odstrániť železničné koľaje
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Cesta je jednosmerná alebo blokovaná.
-STR_ERROR_CROSSING_DISALLOWED_RAIL                              :{WHITE}Nie sú povolené priecestia pre tento typ železníc
+STR_ERROR_CROSSING_DISALLOWED_RAIL                              :{WHITE}Nie sú povolené priecestia pre tento typ železnice
+STR_ERROR_CROSSING_DISALLOWED_ROAD                              :{WHITE}Nie sú povolené priecestia pre tento typ cesty
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Nemôžeš tu stavať návestidlá...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Nemôžeš tu stavať železničné koľaje...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Nemôžeš tu odstrániť železničné koľaje...
@@ -4483,6 +4508,11 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Nemôže
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Nemôžeš tu odstrániť električkovú trať...
 STR_ERROR_THERE_IS_NO_ROAD                                      :{WHITE}... nenašla sa cesta
 STR_ERROR_THERE_IS_NO_TRAMWAY                                   :{WHITE}...nenašla sa električková trať
+STR_ERROR_CAN_T_CONVERT_ROAD                                    :{WHITE}Nemôžeš tu konvertovať cestu...
+STR_ERROR_CAN_T_CONVERT_TRAMWAY                                 :{WHITE}Nemôžeš tu konvertovať električkovú trať...
+STR_ERROR_NO_SUITABLE_ROAD                                      :{WHITE}Žiadna použiteľná cesta
+STR_ERROR_NO_SUITABLE_TRAMWAY                                   :{WHITE}Žiadna použiteľná električková trať
+STR_ERROR_INCOMPATIBLE_TRAMWAY                                  :{WHITE}... nekompatibilné električkové trate
 
 # Waterway construction errors
 STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Tu sa nedá postaviť prieplav...
@@ -4526,7 +4556,7 @@ STR_ERROR_TUNNEL_TOO_LONG                                       :{WHITE}... tune
 STR_ERROR_TOO_MANY_OBJECTS                                      :{WHITE}... priveľa objektov
 STR_ERROR_CAN_T_BUILD_OBJECT                                    :{WHITE}Nemožno postaviť objekt...
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}V ceste je prekážka
-STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}... sídlo firmy v ceste
+STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}... sídlo spoločnosti v ceste
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Tento pozemok nie je možné kúpiť...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... už to vlastníš!
 
@@ -4535,6 +4565,7 @@ STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nie je m
 STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nie je možné zrušiť túto skupinu...
 STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nie je možné premenovať skupinu...
 STR_ERROR_GROUP_CAN_T_SET_PARENT                                :{WHITE}Nie je možné nastaviť rodičovskú skupinu...
+STR_ERROR_GROUP_CAN_T_SET_PARENT_RECURSION                      :{WHITE}... v skupinovej hierarchii nie sú povolené cykly
 STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nie je možné odstrániť všetky vozidlá z tejto skupiny...
 STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nie je možné pridať vozidlo do tejto skupiny
 STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nie je možné pridať zdielané vozidlo do skupiny

From 50417ab0c5a81c72602452f618d6e9284c06ec7b Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Fri, 9 Oct 2020 17:51:37 +0000
Subject: [PATCH 24/31] Update: Translations from eints slovak: 131 changes by
 FuryPapaya

---
 src/lang/slovak.txt | 220 ++++++++++++++++++++++++++------------------
 1 file changed, 131 insertions(+), 89 deletions(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 55307773bf..a4a351ac7c 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -396,14 +396,15 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Grafy
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Hodnotenie spoločností
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Financovať výstavbu nového priemyslu
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Zoznam vlakov spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Zoznam automobilov spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Zoznam cestných vozidiel spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Zoznam lodí spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Zoznam lietadiel spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Priblížiť
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Oddialiť
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Výstavba železnice
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Výstavba ciest
-STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Výstavba prístavov
+STR_TOOLBAR_TOOLTIP_BUILD_TRAMWAYS                              :{BLACK}Výstavba električkových tratí
+STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Výstavba vodných ciest
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Výstavba letísk
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Otvoriť panel nástrojov pre úpravy terénu, výsadbu stromov, a pod.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Zobraziť okno zvuku a hudby
@@ -423,6 +424,7 @@ STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Generova
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generovanie miest
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Generovanie priemyslu
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Stavba cesty
+STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION                          :{BLACK}Výstavba električkovej trate
 STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Sadenie stromov. Shift zobrazí odhad nákladov
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Umiestniť popis
 STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Umiestniť objekt. Shift zobrazí odhad nákladov
@@ -507,7 +509,7 @@ STR_RAIL_MENU_MAGLEV_CONSTRUCTION                               :Výstavba magne
 
 ############ range for road construction menu starts
 STR_ROAD_MENU_ROAD_CONSTRUCTION                                 :Výstavba cesty
-STR_ROAD_MENU_TRAM_CONSTRUCTION                                 :Výstavba električkovej dráhy
+STR_ROAD_MENU_TRAM_CONSTRUCTION                                 :Výstavba električkovej trate
 ############ range ends here
 
 ############ range for waterways construction menu starts
@@ -706,8 +708,8 @@ STR_MUSIC_PLAYLIST_ALL                                          :{TINY_FONT}{BLA
 STR_MUSIC_PLAYLIST_OLD_STYLE                                    :{TINY_FONT}{BLACK}Starý štýl
 STR_MUSIC_PLAYLIST_NEW_STYLE                                    :{TINY_FONT}{BLACK}Nový štýl
 STR_MUSIC_PLAYLIST_EZY_STREET                                   :{TINY_FONT}{BLACK}Ezy Street
-STR_MUSIC_PLAYLIST_CUSTOM_1                                     :{TINY_FONT}{BLACK}Vlastné 1
-STR_MUSIC_PLAYLIST_CUSTOM_2                                     :{TINY_FONT}{BLACK}Vlastné 2
+STR_MUSIC_PLAYLIST_CUSTOM_1                                     :{TINY_FONT}{BLACK}Vlastný1
+STR_MUSIC_PLAYLIST_CUSTOM_2                                     :{TINY_FONT}{BLACK}Vlastný2
 STR_MUSIC_MUSIC_VOLUME                                          :{TINY_FONT}{BLACK}Hlasitosť hudby
 STR_MUSIC_EFFECTS_VOLUME                                        :{TINY_FONT}{BLACK}Hlasitosť zvuk. efektov
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
@@ -715,31 +717,34 @@ STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKG
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
 STR_MUSIC_TITLE_NOMUSIC                                         :{TINY_FONT}{DKGREEN}Hudba nieje dostupná
 STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}"{STRING}"
-STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Stopa
-STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Title
+STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Skladba
+STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Názov
 STR_MUSIC_SHUFFLE                                               :{TINY_FONT}{BLACK}Náhodne
 STR_MUSIC_PROGRAM                                               :{TINY_FONT}{BLACK}Program
-STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK                        :{BLACK}Predchádzajúca stopa
-STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION               :{BLACK}Nasledujúca stopa
+STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK                        :{BLACK}Predchádzajúca skladba
+STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION               :{BLACK}Nasledujúca skladba
 STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC                            :{BLACK}Zastaviť prehrávanie hudby
 STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC                           :{BLACK}Spustiť prehrávanie hudby
-STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC                     :{BLACK}Ťahať posúvač pre nastavenie hudby a zvukových efektov
+STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC                     :{BLACK}Ťahať posúvač pre nastavenie hlasitosti hudby a zvukových efektov
 STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM                     :{BLACK}Vybrať program 'všetky skladby'
-STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC                        :{BLACK}Zvoliť 'Starý štýl'
+STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC                        :{BLACK}Vybrať 'Starý štýl'
 STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}Vybrať 'Nový štýl'
-STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Zvoliť 'Ezy Street style music' program
-STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}Zvoliť program 'Vlastný 1' (definovaný užívateľom)
-STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Zvoliť program 'Vlastný 2' (definovaný užívateľom)
+STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Vybrať 'Ezy Street'
+STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}Vybrať program 'Vlastný1' (definovaný užívateľom)
+STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Vybrať program 'Vlastný2' (definovaný užívateľom)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Prepnúť náhodný výber
-STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Zobraziť okno pre výber hudobných stôp
+STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Zobraziť okno pre výber hudobných skladieb
 
 # Playlist window
+STR_PLAYLIST_MUSIC_SELECTION_SETNAME                            :{WHITE}Hudobný program - '{STRING}'
 STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
 STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}Zoznam skladieb
 STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}Program - '{STRING}'
-STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Zmazať
-STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Vymazať aktuálny program (len Vlastný 1 a Vlastný 2 program)
-STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Kliknúť na stopu pre uloženie (len Vlastný1 a Vlastný2 program)
+STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Vymazať
+STR_PLAYLIST_CHANGE_SET                                         :{BLACK}Zmeniť sadu
+STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Vymazať aktuálny program (len program Vlastný1 alebo Vlastný2)
+STR_PLAYLIST_TOOLTIP_CHANGE_SET                                 :{BLACK}Zmeniť sadu hudby na inú nainštalovanú sadu
+STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Kliknúť na skladbu pre uloženie (len program Vlastný1 alebo Vlastný2)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kliknite na hudobnú stopu pre jej odstránenie z programu (len Vlastný1 alebo Vlastný2)
 
 # Highscore window
@@ -809,7 +814,7 @@ STR_SMALLMAP_LEGENDA_WATER                                      :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_NO_OWNER                                   :{TINY_FONT}{BLACK}Bez vlastníka
 STR_SMALLMAP_LEGENDA_TOWNS                                      :{TINY_FONT}{BLACK}Mestá
 STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINY_FONT}{BLACK}Priemysel
-STR_SMALLMAP_LEGENDA_DESERT                                     :{TINY_FONT}{BLACK}Púšt
+STR_SMALLMAP_LEGENDA_DESERT                                     :{TINY_FONT}{BLACK}Púšť
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINY_FONT}{BLACK}Sneh
 
 STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Zapnúť/vypnúť názvy miest na mape
@@ -1189,7 +1194,7 @@ STR_CONFIG_SETTING_RESTRICT_DROPDOWN_HELPTEXT                   :{BLACK}Filtruje
 STR_CONFIG_SETTING_RESTRICT_BASIC                               :Základné nastavenia
 STR_CONFIG_SETTING_RESTRICT_ADVANCED                            :Pokročilé nastavenia
 STR_CONFIG_SETTING_RESTRICT_ALL                                 :Odborné nastavenia / všetky nastavenia
-STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Nastavenia s odlišnou hodnotou ako je štandard
+STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_DEFAULT             :Nastavenia s odlišnou hodnotou ako je predvolená
 STR_CONFIG_SETTING_RESTRICT_CHANGED_AGAINST_NEW                 :Nastavenia s odlišnou hodnotou než aké má tvoja nová hra
 
 STR_CONFIG_SETTING_TYPE_DROPDOWN_HELPTEXT                       :{BLACK}Obmedzuje zoznam nižšie na niektoré typy nastavení
@@ -1202,7 +1207,7 @@ STR_CONFIG_SETTING_TYPE_DROPDOWN_COMPANY_INGAME                 :Nastavenia spol
 STR_CONFIG_SETTING_CATEGORY_HIDES                               :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING}
 STR_CONFIG_SETTING_TYPE_HIDES                                   :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia
 STR_CONFIG_SETTING_CATEGORY_AND_TYPE_HIDES                      :{BLACK}Zobrazenie všetkých výsledkov vyhľadávania nastavením{}{SILVER}kategórie {BLACK}na {WHITE}{STRING} {BLACK}a {SILVER}typu {BLACK}na {WHITE}Všetky typy nastavenia
-STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Nič -
+STR_CONFIG_SETTINGS_NONE                                        :{WHITE}- Žiadne -
 
 STR_CONFIG_SETTING_OFF                                          :nie
 STR_CONFIG_SETTING_ON                                           :áno
@@ -1541,7 +1546,7 @@ STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT                  :Povolením nast
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :Zakázať lode pre počítač: {STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT                     :Povolením nastavenia znemožní počítačovým hráčom budovať lode.
 
-STR_CONFIG_SETTING_AI_PROFILE                                   :Štandardné nastavenia profilu: {STRING}
+STR_CONFIG_SETTING_AI_PROFILE                                   :Predvolený profil nastavení: {STRING}
 STR_CONFIG_SETTING_AI_PROFILE_HELPTEXT                          :Vyberte, ktorý profil nastavení sa má použiť pre náhodných počítačových hráčov alebo pre počiatočné hodnoty pri pridávaní nových počítačových hráčov alebo Herného skriptu
 STR_CONFIG_SETTING_AI_PROFILE_EASY                              :Ľahký
 STR_CONFIG_SETTING_AI_PROFILE_MEDIUM                            :Stredný
@@ -1870,7 +1875,7 @@ STR_INTRO_TRANSLATION                                           :{BLACK}V prekla
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Koniec
-STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Si si istý, že chceš ukončiť hru a vrátiť sa do {STRING}?
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ste si istý, že chcete ukončiť hru a vrátiť sa do {STRING}?
 STR_QUIT_YES                                                    :{BLACK}Áno
 STR_QUIT_NO                                                     :{BLACK}Nie
 
@@ -1884,8 +1889,8 @@ STR_OSNAME_SUNOS                                                :SunOS
 
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Opustiť hru
-STR_ABANDON_GAME_QUERY                                          :{YELLOW}Si si istý, že chceš opustiť túto hru?
-STR_ABANDON_SCENARIO_QUERY                                      :{YELLOW}Si si istý že chceš opustiť tento scenár?
+STR_ABANDON_GAME_QUERY                                          :{YELLOW}Ste si istý, že chcete opustiť túto hru?
+STR_ABANDON_SCENARIO_QUERY                                      :{YELLOW}Ste si istý, že chcete opustiť tento scenár?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Cheaty
@@ -2167,6 +2172,7 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Odpojiť
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server je chránený. Zadaj heslo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Spoločnosť je chránená. Zadaj heslo
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Zoznam klientov
 
 # Network company list added strings
 STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Zoznam klientov
@@ -2231,6 +2237,7 @@ STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Nespravn
 STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Server je plny
 STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Si zablokovany na tomto serveri
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Bol si vyhodeny z hry
+STR_NETWORK_ERROR_KICK_MESSAGE                                  :{WHITE}Dôvod: {STRING}
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheatovanie nie je povolene na tomto serveri
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Posielali ste priveľa príkazov serveru
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Príliš dlho si zadával heslo
@@ -2290,6 +2297,7 @@ STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} da
 STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dal si {1:STRING} {2:CURRENCY_LONG}
 STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Server ukoncil relaciu
 STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Server sa reštartuje...{}Čakajte prosím...
+STR_NETWORK_MESSAGE_KICKED                                      :*** Hráč {STRING} bol vyhodený. Dôvod: ({STRING})
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Sťahovanie obsahu
@@ -2400,7 +2408,7 @@ STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Dodáva:
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Spojiť stanicu
-STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Postaviť oddelene stanicu
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Postaviť stanicu oddelene
 
 STR_JOIN_WAYPOINT_CAPTION                                       :{WHITE}Nasledovať navádzač
 STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Postaviť oddelený navádzač
@@ -2415,7 +2423,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Vybudova
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Stavba železničnej trate s režimom Autorail. Ctrl odoberie konštrukciu. Shift zobrazí výšku nákladov
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Postavit zeleznicne depo (pre nákup a opravu vlakov). So Shift-om zobrazíte odhadovanú výšku nákladov
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Konvertovať železnicu na smerové body
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Postaviť železničnú stanicu
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Postaviť železničnú stanicu. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Postaviť železničné semafóry
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Postaviť železničný most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Postaviť železničný tunel
@@ -2436,12 +2444,12 @@ STR_WAYPOINT_CAPTION                                            :{WHITE}Smerovy
 STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vyber typ kontrolneho bodu
 
 # Rail station construction window
-STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Vyber zeleznicnej stanice
-STR_STATION_BUILD_ORIENTATION                                   :{BLACK}Orientacia
+STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Výber železničnej stanice
+STR_STATION_BUILD_ORIENTATION                                   :{BLACK}Orientácia
 STR_STATION_BUILD_RAILROAD_ORIENTATION_TOOLTIP                  :{BLACK}Vybrat orientaciu zeleznicnej stanice
 STR_STATION_BUILD_NUMBER_OF_TRACKS                              :{BLACK}Počet koľají
 STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP                      :{BLACK}Počet koľají železničnej stanice
-STR_STATION_BUILD_PLATFORM_LENGTH                               :{BLACK}Dlzka nastupista
+STR_STATION_BUILD_PLATFORM_LENGTH                               :{BLACK}Dĺžka nástupišťa
 STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Dlzka zeleznicnej stanice
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Automaticky
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Automaticky postavit stanicu podla oznaceneho bloku terenu
@@ -2488,18 +2496,18 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Krytý plastov
 
 
 # Road construction toolbar
-STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba cesty
-STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba električkovej trate
+STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba ciest
+STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba električkových tratí
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Postaviť časť cesty. Ctrl prepína stavať/odobrať stavbu cesty. Shift zobrazí odhad nákladov
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Postaviť časť električkovej dráhy
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Stavať časti ciest použitím automatického módu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Stavať časti električkovej trate použitím automatického módu. Ctrl prepína stavanie/odstránenie električkovej trate
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Postaviť depo pre cestné vozidlá (na výrobu a opravy vozidiel)
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Postaviť električkové depo
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Postaviť autobusovú zastávku. Ctrl+klik umožní spájanie zastávok
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Postaviť osobnú električkovú stanicu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Postaviť vykládku
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Postaviť nákladnú električkovú stanicu. CTRL umožní.... SHIFT ukáže náklady na stavbu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Postaviť automobilovú garáž (na výrobu a opravu vozidiel). Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Postaviť električkovú garáž (na výrobu a opravu vozidiel). Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Postaviť autobusovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Postaviť električkovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Postaviť vykládku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Postaviť električkovú vykládku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Prepnút stavbu jednosmerných ciest
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Postaviť cestný most
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Postaviť most pre električky
@@ -2514,19 +2522,19 @@ STR_ROAD_NAME_ROAD                                              :Cesta
 STR_ROAD_NAME_TRAM                                              :Električková trať
 
 # Road depot construction window
-STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientacia garaze
-STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Zvoľte orientáciu garáže
-STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientácia elektrickového depa
-STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Zvoľte orientáciu električkového depa
+STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientácia garáže
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vybrať orientáciu automobilovej garáže
+STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientácia garáže
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vybrať orientáciu električkovej garáže
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientácia zastávky
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Vybrat orientaciu stanice
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Orientácia vykládky
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Vybrat orientaciu vykladky
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientácia osobnej električkovej stanice
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientácia električkovej zastávky
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Zvoľte orientáciu osobnej električkovej stanice
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientácia nákladnej električkovej stanice
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientácia električkovej vykládky
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Zvoľte orientáciu nákladnej električkovej stanice
 
 # Waterways toolbar (last two for SE only)
@@ -2534,8 +2542,8 @@ STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Výstavb
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vodné cesty
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Stavba kanálov. Shift zobrazí odhad nákladov
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Postaviť stavidlá.
-STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Postaviť lodenicu (pre výrobu a opravy lodí)
-STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Postaviť lodenicu
+STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Postaviť lodenicu (na výrobu a opravu lodí). Shift zobrazí predpokladanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Postaviť prístav. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Postavit boju pouzitelnu pre vyznacenie trasy
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postaviť akvadukt
 STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definovat oblast vody.{}Vytvorí kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
@@ -2543,34 +2551,34 @@ STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Umiestni
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientácia lodenice
-STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Vyber orientáciu prístavu
+STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Vybrať orientáciu lodenice
 
 # Dock construction window
-STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Mólo
+STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Prístav
 
 # Airport toolbar
-STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Letiská
-STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postaviť letisko. Ctrl umožňuje spájanie staníc. Shift umožňuje prepínanie medzi nákupom a zobrazením ceny
+STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Výstavba letísk
+STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postaviť letisko. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 
 # Airport construction window
-STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Vyber letiska
+STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Výber letiska
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vybrať veľkosť/typ letiska
-STR_STATION_BUILD_AIRPORT_CLASS_LABEL                           :{BLACK}Trieda lietadla
+STR_STATION_BUILD_AIRPORT_CLASS_LABEL                           :{BLACK}Trieda letiska
 STR_STATION_BUILD_AIRPORT_LAYOUT_NAME                           :{BLACK}Rozloženie{NUM}
 
-STR_AIRPORT_SMALL                                               :Male
-STR_AIRPORT_CITY                                                :Mestske
+STR_AIRPORT_SMALL                                               :Malé
+STR_AIRPORT_CITY                                                :Mestské
 STR_AIRPORT_METRO                                               :Metropolitné
 STR_AIRPORT_INTERNATIONAL                                       :Medzinárodné
-STR_AIRPORT_COMMUTER                                            :Vnutrostatne
-STR_AIRPORT_INTERCONTINENTAL                                    :Medzikontinentalne
+STR_AIRPORT_COMMUTER                                            :Vnútroštátne
+STR_AIRPORT_INTERCONTINENTAL                                    :Medzikontinentálne
 STR_AIRPORT_HELIPORT                                            :Heliport
-STR_AIRPORT_HELIDEPOT                                           :Heliport s hangarom
-STR_AIRPORT_HELISTATION                                         :Velky heliport
+STR_AIRPORT_HELIDEPOT                                           :Heliport s hangárom
+STR_AIRPORT_HELISTATION                                         :Veľký heliport
 
-STR_AIRPORT_CLASS_SMALL                                         :Male letiska
-STR_AIRPORT_CLASS_LARGE                                         :Velke letiska
-STR_AIRPORT_CLASS_HUB                                           :Najvacsie letiska
+STR_AIRPORT_CLASS_SMALL                                         :Malé letiská
+STR_AIRPORT_CLASS_LARGE                                         :Veľké letiská
+STR_AIRPORT_CLASS_HUB                                           :Najväčšie letiská
 STR_AIRPORT_CLASS_HELIPORTS                                     :Heliporty
 
 STR_STATION_BUILD_NOISE                                         :{BLACK}Vytváraný hluk: {GOLD}{COMMA}
@@ -2609,10 +2617,10 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Pre zvý
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Vygenerovať náhodné územie
 STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Vytvoriť nový scenár
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Zresetovat územie
-STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Odstránit všetok majetok vlastnený hrácom z mapy
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Odstrániť všetok majetok spoločnosti z mapy
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Zresetovat Územie
-STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Naozaj odstrániť všetok hráčov majetok z mapy?
+STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Ste si istý, že chcete odstrániť všetok majetok spoločnosti?
 
 # Town generation window (SE)
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Vytvorenie mesta
@@ -2686,7 +2694,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Vlastní
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Miestna správa: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neznáme
 STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Súradnice: {LTBLUE}{NUM} x {NUM} x {NUM} ({STRING})
-STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Postavene: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Postavené: {LTBLUE}{DATE_LONG}
 STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Trieda stanice: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Typ stanice: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_AIRPORT_CLASS                         :{BLACK}Trieda letiska: {LTBLUE}{STRING}
@@ -2746,29 +2754,29 @@ STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Električková
 STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (vo výstavbe)
 
 STR_LAI_TREE_NAME_TREES                                         :Stromy
-STR_LAI_TREE_NAME_RAINFOREST                                    :Dazdovy prales
+STR_LAI_TREE_NAME_RAINFOREST                                    :Dážďový prales
 STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusy
 
-STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Zeleznicna stanica
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Železničná stanica
 STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Letecký hangár
 STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Letisko
 STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Vykladka
 STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Stanica
-STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Pristav
-STR_LAI_STATION_DESCRIPTION_BUOY                                :Boja
-STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Smerovy bod
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Prístav
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bója
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Smerový bod
 
 STR_LAI_WATER_DESCRIPTION_WATER                                 :Voda
-STR_LAI_WATER_DESCRIPTION_CANAL                                 :Prieplav
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanál
 STR_LAI_WATER_DESCRIPTION_LOCK                                  :Stavidlo
 STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rieka
-STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Pobrezie alebo nabrezie
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Pobrežie alebo nábrežie
 STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Lodenica
 
 # Industries come directly from their industry names
 
-STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Zeleznicny tunel
-STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Cestny tunel
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Železničný tunel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Cestný tunel
 
 STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ocelovy zavesny zeleznicny most
 STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL                    :Ocelovy pilierovy zeleznicny most
@@ -2881,6 +2889,9 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Detaily
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Informácia nie je k dispozícii
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filtrovací reťazec:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Prepísanie súboru
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Ste si istý, že chcete prepísať existujúci súbor?
 
 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Zadajte názov pre uloženie hry
 
@@ -2962,7 +2973,7 @@ STR_NEWGRF_SETTINGS_INFO_TITLE                                  :{WHITE}Detailn
 STR_NEWGRF_SETTINGS_ACTIVE_LIST                                 :{WHITE}Aktívne NewGRF súbory
 STR_NEWGRF_SETTINGS_INACTIVE_LIST                               :{WHITE}Neaktívne NewGRF súbory
 STR_NEWGRF_SETTINGS_SELECT_PRESET                               :{ORANGE}Vybrať predvoľbu:
-STR_NEWGRF_FILTER_TITLE                                         :{ORANGE}Filtrovať podľa:
+STR_NEWGRF_FILTER_TITLE                                         :{ORANGE}Filtrovací reťazec:
 STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Nahrať vybraný zoznam
 STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Uložit zoznam
 STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Uložit aktuálne nastavenie ako zoznam
@@ -2998,7 +3009,12 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Verzia:
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Min. kompatibilná verzia: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Predvolené (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Predvolené (D) / 32 bpp
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY                              :Zdedené (W)
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP                        :Zdedené (W) / 32 bpp
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametre: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_NONE                              :Žiadne
 
 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Žiadne dostupné informácie
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Príslušný súbor nenájdený
@@ -3079,6 +3095,8 @@ STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čítanie za ko
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Požadované GRF prostriedky nie sú dosupné (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} bol vypnutý {STRING}
 STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Nesprávny/neznámy formát rozloženia sprite(ov) (sprite {3:NUM})
+STR_NEWGRF_ERROR_LIST_PROPERTY_TOO_LONG                         :Príliš veľa hodnôt vlastnosti v zozname (sprite {3:NUM}, vlastnosť {4:HEX})
+STR_NEWGRF_ERROR_INDPROD_CALLBACK                               :Neplatný výsledok produkčného priemyslu (sprite {3:NUM}, "{2:STRING}")
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Upozornenie!
@@ -3110,6 +3128,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informácia o zmene nákladu pre'{1:ENGINE}' sa líši od konštrukčného listu pri kúpe. Môže to spôsobiť, že nové vozidlá sa nebudú prerábať na určitý tovar korektne.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' spôsobil nekonečnú slučku v spätnom odvolávaní produkcie.
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Callback {1:HEX} vrátil neznámy alebo chybný výsledok {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' vrátil neplatný druh nákladu v produkcii v {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<neplatný náklad>
@@ -3255,6 +3274,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Kliknú
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Kniha príbehov
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Globálna kniha príbehov
+STR_STORY_BOOK_SPECTATOR                                        :Globálna kniha príbehov
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Strana {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Skočiť na určitú stranu výberom zo zoznamu
@@ -3430,7 +3450,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Meno prezidenta
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Hľadáme záujemcu o kúpu našej spoločnosti{}{}Chcete kúpiť našu spoločnosť {COMPANY} za {CURRENCY_LONG}?
 
 # Company infrastructure window
-STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}Infraštruktúra spoločnosti {COMPANY}
+STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}{COMPANY} - Infraštruktúra
 STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Políčka železnice:
 STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Semafóry
 STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Políčka cesty:
@@ -3445,8 +3465,17 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENC
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Priemysel
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Nič -
+STR_INDUSTRY_DIRECTORY_ITEM_INFO                                :{BLACK}{CARGO_LONG}{STRING}{YELLOW} ({COMMA}% prepraven{P é é ých}){BLACK}
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD1                               :{ORANGE}{INDUSTRY} {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD2                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PROD3                               :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
+STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE                            :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} a {NUM} ďalšie...
 STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Názvy priemyslu - klikni na meno pre vycentrovanie priemyslu na stred obrazovky
+STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER                    :{BLACK}Prijímaný náklad: {SILVER}{STRING}
+STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER                    :{BLACK}Produkovaný náklad: {SILVER}{STRING}
+STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES                         :Všetky druhy nákladu
+STR_INDUSTRY_DIRECTORY_FILTER_NONE                              :Žiadne
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -3474,14 +3503,14 @@ STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lietad{P lo lá iel}
 
 STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Vlaky - kliknúť pre zobrazenie detailov
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Automobily - kliknúť pre zobrazenie detailov
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Cestné vozidlá - kliknúť pre zobrazenie detailov
 STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Lode - kliknúť pre zobrazenie detailov
 STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lietadlá - kliknúť pre zobrazenie detailov
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Profit tento rok: {CURRENCY_LONG} (minulý rok: {CURRENCY_LONG})
 
 STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :Dostupné vlaky
-STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :Dostupné automobily
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :Dostupné vozidlá
 STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :Dostupné lode
 STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :Dostupné lietadlá
 STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Zobraziť zoznam dostupných dizajnov pre tento typ vozidla
@@ -3503,12 +3532,12 @@ STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Zdieľan
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Všetky vlaky
-STR_GROUP_ALL_ROAD_VEHICLES                                     :Všetky automobily
+STR_GROUP_ALL_ROAD_VEHICLES                                     :Všetky cestné vozidlá
 STR_GROUP_ALL_SHIPS                                             :Všetky lode
 STR_GROUP_ALL_AIRCRAFTS                                         :Všetky lietadlá
 
 STR_GROUP_DEFAULT_TRAINS                                        :Nezaradené vlaky
-STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Nezaradené automobily
+STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Nezaradené cestné vozidlá
 STR_GROUP_DEFAULT_SHIPS                                         :Nezaradené lode
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Nezaradené lietadlá
 
@@ -3551,6 +3580,7 @@ STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Nove Lietadlo
 ############ range for vehicle availability ends
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Hmotnosť: {GOLD}{WEIGHT_SHORT}
+STR_PURCHASE_INFO_COST_REFIT_WEIGHT                             :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} (Cena prestavby: {GOLD}{CURRENCY_LONG}{BLACK}) Hmotnosť: {GOLD}{WEIGHT_SHORT}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rýchlosť: {GOLD}{VELOCITY}{BLACK} Výkon: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Rýchlosť: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}Rýchlosť na oceáne: {GOLD}{VELOCITY}
@@ -3561,15 +3591,19 @@ STR_PURCHASE_INFO_REFITTABLE                                    :(možná presta
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Vyrobené: {GOLD}{NUM}{BLACK} Životnosť: {GOLD}{COMMA} rok{P "" y ov}
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. spoľahlivosť: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cena: {GOLD}{CURRENCY_LONG}
+STR_PURCHASE_INFO_COST_REFIT                                    :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} (Cena prestavby: {GOLD}{CURRENCY_LONG}{BLACK})
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnosť: {GOLD}{WEIGHT_SHORT} ({WEIGHT_SHORT})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Rýchlosť: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_COST_REFIT_SPEED                              :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} (Cena prestavby: {GOLD}{CURRENCY_LONG}{BLACK}) Rýchlosť: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Poháňané vagóny: {GOLD}+{POWER}{BLACK} Hmotnosť: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Prestavateľné na: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Všetky druhy nákladu
+STR_PURCHASE_INFO_NONE                                          :Žiadne
 STR_PURCHASE_INFO_ALL_BUT                                       :Všetko okrem {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. trakčná sila: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Dolet: {GOLD}{COMMA} políčok
+STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}Typ lietadla: {GOLD}{STRING}
 
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Výber vlakov. Pre získanie informácií klikni na vlak. CTRL+klik prepne skrytie typu vlaku.
 STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Výber cestných vozidiel. Pre získanie informácií klikni na vozidlo. CTRL+klik prepne skrytie typu vozidla.
@@ -3602,7 +3636,7 @@ STR_BUY_VEHICLE_SHIP_RENAME_BUTTON                              :{BLACK}Premenov
 STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON                          :{BLACK}Premenovať
 
 STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP                            :{BLACK}Premenovať typ vlaku
-STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Premenovať typ automobilu
+STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Premenovať typ cestného vozidla
 STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP                             :{BLACK}Premenovať typ lode
 STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}Premenovať typ lietadla
 
@@ -3736,8 +3770,8 @@ STR_REPLACE_VEHICLE_VEHICLES_IN_USE_TOOLTIP                     :{BLACK}Stĺpec
 STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES                          :{YELLOW}Dostupné dopravné prostriedky
 STR_REPLACE_VEHICLE_AVAILABLE_VEHICLES_TOOLTIP                  :{BLACK}Stĺpec s vozidlami, ktoré možno nahradiť
 
-STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Zvoľte typ lokomotívy na výmenu
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Zvoľte nový typ lokomotívy, ktorú chceš použiť namiesto typu z ľavého zoznamu
+STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Zvoľte typ vozidla na výmenu
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Zvoľte nový typ vozidla, ktorý chceš použiť namiesto typu z ľavého zoznamu
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Začať výmenu vozidiel
 STR_REPLACE_VEHICLES_NOW                                        :Vymeniť všetky vozidlá teraz !
@@ -3752,14 +3786,19 @@ STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Stlačte
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Prepne medzi oknami na výmenu lokomotív a vagónov
 STR_REPLACE_ENGINES                                             :Lokomotívy
 STR_REPLACE_WAGONS                                              :Vagónov
+STR_REPLACE_ALL_RAILTYPE                                        :Všetky železničné vozidlá
+STR_REPLACE_ALL_ROADTYPE                                        :Všetky cestné vozidlá
 
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vyber typ koľajníc, pre ktoré chceš vymieňať lokomotívy
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vybrať typ železnice, pre ktorú chceš vymieňať lokomotívy
+STR_REPLACE_HELP_ROADTYPE                                       :{BLACK}Vybrať typ cesty, pre ktorú chceš vymieňať vozidlá
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Zobrazí, ak existuje lokomotíva z ľavého zoznamu, ktorá sa zamení s ňou
 STR_REPLACE_RAIL_VEHICLES                                       :Lokomotívy
 STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrické lokomotívy
 STR_REPLACE_MONORAIL_VEHICLES                                   :Lokomotíva pre jednokoľajku
 STR_REPLACE_MAGLEV_VEHICLES                                     :Lokomotíva pre magnetickú dráhu
 
+STR_REPLACE_ROAD_VEHICLES                                       :Automobily
+STR_REPLACE_TRAM_VEHICLES                                       :Električky
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Odstránenie vagónu: {ORANGE}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Zachovanie pôvodnej dĺžky vlaku, odstránením vagónov (odpredu), keď by funkcia automatickej zmeny rušňa vlak predĺžila
@@ -3845,6 +3884,8 @@ STR_VEHICLE_INFO_AGE                                            :{COMMA} rok{P "
 STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} rok{P "" y ov} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. rýchlosť: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_MAX_SPEED_TYPE                                 :{BLACK}Rýchlosť: {LTBLUE}{VELOCITY} {BLACK}Typ lietadla: {LTBLUE}{STRING}
+STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE                           :{BLACK}Rýchlosť: {LTBLUE}{VELOCITY} {BLACK}Typ lietadla: {LTBLUE}{STRING} {BLACK}Dolet: {LTBLUE}{COMMA} políčok
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Hmotnosť: {LTBLUE}{WEIGHT_SHORT} {BLACK}Sila: {LTBLUE}{POWER}{BLACK} Max. rýchlosť: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Hmotnosť: {LTBLUE}{WEIGHT_SHORT} {BLACK}Sila: {LTBLUE}{POWER}{BLACK} Max. rýchlosť: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
 
@@ -3978,6 +4019,7 @@ STR_ORDER_CONDITIONAL_AGE                                       :Vek vozidla (v
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Vyžaduje servis
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Vždy
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Zostávajúca životnosť (v rokoch)
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Max. spoľahlivosť
 
 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Sposob porovnania údajov vozidla so zadanou hodnotou
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :je rovné
@@ -4175,7 +4217,7 @@ STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Skript,
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}AIs budú nastavené v ďalšej hre.
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Človek
 STR_AI_CONFIG_RANDOM_AI                                         :Náhodná AI
-STR_AI_CONFIG_NONE                                              :(none)
+STR_AI_CONFIG_NONE                                              :(žiadne)
 
 STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Posunúť vyššie
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Posunúť vyššie vybrané AI v zozname
@@ -4454,7 +4496,7 @@ STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bój
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Nemôžeš tu postaviť vlakové depo...
 STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Nemôžeš tu postaviť garáž...
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Nemôžeš tu postaviť električkové depo...
-STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nemôžeš tu postaviť lodné depo...
+STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nemôžeš tu postaviť lodenicu...
 
 STR_ERROR_CAN_T_RENAME_DEPOT                                    :{WHITE}Depo sa nedá premenovať...
 
@@ -5072,10 +5114,10 @@ STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Smerovy bod {TO
 
 STR_FORMAT_DEPOT_NAME_TRAIN                                     :Vlakové depo {TOWN}
 STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :Vlakové depo {TOWN} #{COMMA}
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :Depo cestných vozidiel {TOWN}
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :Depo cestných vozidiel {TOWN} #{COMMA}
-STR_FORMAT_DEPOT_NAME_SHIP                                      :Lodné depo {TOWN}
-STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :Lodné depo {TOWN} #{COMMA}
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :Garáž {TOWN}
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :Garáž {TOWN} #{COMMA}
+STR_FORMAT_DEPOT_NAME_SHIP                                      :Lodenica {TOWN}
+STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :Lodenica {TOWN} #{COMMA}
 STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :Letecký hangár {STATION}
 
 STR_UNKNOWN_STATION                                             :neznáma stanica

From f1ab41e3375cd605e3f43ce07438e6e25dd162e0 Mon Sep 17 00:00:00 2001
From: FuryPapaya <72335586+FuryPapaya@users.noreply.github.com>
Date: Sat, 10 Oct 2020 14:34:21 +0200
Subject: [PATCH 25/31] Fix: Slovak ownname was using the wrong form (#8326)

Noun vs Adjective
---
 src/lang/slovak.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index a4a351ac7c..bf9671eaec 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1,5 +1,5 @@
 ##name Slovak
-##ownname Slovensky
+##ownname Slovenčina
 ##isocode sk_SK
 ##plural 10
 ##textdir ltr

From 2073c8d67f6c8bee42eb49e37a89acfa8c45eac3 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Sat, 3 Oct 2020 16:20:06 +0100
Subject: [PATCH 26/31] Add: [Actions] Add problem matchers for CI platforms

---
 .github/workflows/ci-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 8ab2783e9e..ba30c2436e 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -53,6 +53,7 @@ jobs:
     - name: CMake
       run: mkdir build && cd build && cmake ..
 
+    - uses: ammaraskar/gcc-problem-matcher@master
     - name: Build
       run: cd build && make -j2
 
@@ -80,6 +81,7 @@ jobs:
         vcpkgArguments: 'liblzma libpng lzo zlib'
         vcpkgTriplet: '${{ matrix.arch }}-windows-static'
 
+    - uses: ammaraskar/msvc-problem-matcher@master
     - name: 'Build'
       uses: lukka/run-cmake@v3
       with:
@@ -131,6 +133,7 @@ jobs:
     - name: CMake
       run: mkdir build && cd build && cmake ..
 
+    - uses: ammaraskar/gcc-problem-matcher@master
     - name: Build
       run: cd build && make -j2
 

From 13e1b13a4e559f19f39d83208b151c4618381f21 Mon Sep 17 00:00:00 2001
From: Charles Pigott <charlespigott@googlemail.com>
Date: Sat, 10 Oct 2020 13:39:37 +0100
Subject: [PATCH 27/31] Fix: [Actions] Call apt-get update before trying to
 install packages

---
 .github/workflows/ci-build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index ba30c2436e..8786c079be 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -28,6 +28,7 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
+        sudo apt-get update
         sudo apt-get install -y --no-install-recommends \
           libfontconfig-dev \
           libicu-dev \

From b607f54462214f620f287b5c9dfec49525d7f08e Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Sat, 10 Oct 2020 17:51:52 +0000
Subject: [PATCH 28/31] Update: Translations from eints slovak: 35 changes by
 FuryPapaya tamil: 1 change by Ramesh78dev

---
 src/lang/slovak.txt | 70 ++++++++++++++++++++++-----------------------
 src/lang/tamil.txt  |  1 +
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index bf9671eaec..cbf7eb6b6c 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -307,10 +307,10 @@ STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Nadpis o
 STR_TOOLTIP_SHADE                                               :{BLACK}Zabaliť okno - zobraziť len názov okna
 STR_TOOLTIP_DEBUG                                               :{BLACK}Zobraziť NewGRF debugové informácie
 STR_TOOLTIP_DEFSIZE                                             :{BLACK}Zmena veľkosti okna na základnú veľkosť. Ctrl+klik uloží aktuálnu veľkosť ako základnú
-STR_TOOLTIP_STICKY                                              :{BLACK}Zamknúť toto okno, nebude sa dať zatvoriť klávesou "Zavri všetky okná". Ctrl+Click uloží stav ako predvolený
+STR_TOOLTIP_STICKY                                              :{BLACK}Zamknúť toto okno, nebude sa dať zatvoriť klávesou "Zavri všetky okná". Ctrl+klik uloží stav ako predvolený
 STR_TOOLTIP_RESIZE                                              :{BLACK}Uchop a ťahaj pre zmenu veľkosti okna
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Prepnúť veľkosť okna
-STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Navigacná lišta
+STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Navigačná lišta - posúva zoznam hore/dole
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Posuvná lišta - posúva zoznam doľava/doprava
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolácia budov atď. na rovný terén. CTRL označí oblasť diagonálne. Shift zobrazí odhad nákladov
 
@@ -480,7 +480,7 @@ STR_SUBSIDIES_MENU_SUBSIDIES                                    :Dotácie
 ############ range ends here
 
 ############ range for graph menu starts
-STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH                           :Graf prevádzkového zisku
+STR_GRAPH_MENU_OPERATING_PROFIT_GRAPH                           :Graf prevádzkového profitu
 STR_GRAPH_MENU_INCOME_GRAPH                                     :Graf tržieb
 STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH                            :Graf prepraveného nákladu
 STR_GRAPH_MENU_PERFORMANCE_HISTORY_GRAPH                        :Graf hodnotenia výkonu
@@ -491,7 +491,7 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES                              :Ceny prepravy
 ############ range for company league menu starts
 STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE                             :Hodnotenie spoločností
 STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING                      :Detailné hodnotenie výkonu
-STR_GRAPH_MENU_HIGHSCORE                                        :Hodnotenie
+STR_GRAPH_MENU_HIGHSCORE                                        :Najvyššie skóre
 ############ range ends here
 
 ############ range for industry menu starts
@@ -637,11 +637,11 @@ STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINY_FONT}{STR
 STR_GRAPH_Y_LABEL                                               :{TINY_FONT}{STRING}
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINY_FONT}{COMMA}
 
-STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf prevádzkového zisku
-STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf príjmov
-STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Dopravených jednotiek nákladu
-STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Hodnotenie produktivity spoločnosti (maximálna produktivita je 1000)
-STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Hodnota spoločnosti
+STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf prevádzkového profitu
+STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf tržieb
+STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Graf prepraveného nákladu (jednotiek nákladu)
+STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Graf hodnotenia výkonu (najvyššie hodnotenie je 1000)
+STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Graf hodnoty spoločnosti
 
 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}Ceny prepravy
 STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL                           :{TINY_FONT}{BLACK}Počet dní na ceste
@@ -660,7 +660,7 @@ STR_GRAPH_KEY_CAPTION                                           :{WHITE}Výber p
 STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Kliknúť pre zobrazenie tejto spoločnosti na grafe
 
 # Company league window
-STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Hodnotenie spoločnosti
+STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Hodnotenie spoločností
 STR_COMPANY_LEAGUE_COMPANY_NAME                                 :{ORANGE}{COMPANY} {BLACK}{COMPANY_NUM} '{STRING}'
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER                   :Inžinier
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER            :Manažér dopravy
@@ -673,8 +673,8 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Prezident
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Tycoon
 
 # Performance detail window
-STR_PERFORMANCE_DETAIL                                          :{WHITE}Detaily hodnotenia výkonu
-STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Podrobne
+STR_PERFORMANCE_DETAIL                                          :{WHITE}Detailné hodnotenie výkonu
+STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaily
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRENCY_SHORT}/{CURRENCY_SHORT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
@@ -682,18 +682,18 @@ STR_PERFORMANCE_DETAIL_SELECT_COMPANY_TOOLTIP                   :{BLACK}Ukázať
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vozidlá:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stanice:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Min. zisk:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Min. profit:
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Min. príjem:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Max. príjem:
-STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Doručené:
+STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Prepravené:
 STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Náklad:
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Hotovosť:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Úver:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Spolu:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Počet vozidiel, ktoré dosiahli v minulom roku zisk. Patria sem cestné vozidlá, vlaky, lode a lietadlá
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Počet nedávno obsluhovaných staníc. Železničná stanica, autobus. zastávka, letisko sa počítajú oddelene aj keď patria do rovnakej stanice
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Zisk vozidla s najnižším príjmom (zo všetkých vozidiel starších ako 2 roky)
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Počet nedávno obsluhovaných staníc. Železničné stanice, autobusové zastávky, letiská a pod. sa počítajú oddelene aj keď patria do rovnakej stanice
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Profit vozidla s najnižšími tržbami (zo všetkých vozidiel starších ako 2 roky)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Množstvo peňazí zarobených v kvartáli s najmenším ziskom v posledných 12 kvartáloch
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Množstvo peňazí zarobených v kvartáli s najväčším ziskom v posledných 12 kvartáloch
 STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Počet jednotiek nákladu prepravených v posledných štyroch kvartáloch
@@ -748,7 +748,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Kliknú
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kliknite na hudobnú stopu pre jej odstránenie z programu (len Vlastný1 alebo Vlastný2)
 
 # Highscore window
-STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Najlepšie spoločnosti, ktoré dosiahli {NUM}
+STR_HIGHSCORE_TOP_COMPANIES_WHO_REACHED                         :{BIG_FONT}{BLACK}Najlepšie spoločnosti, ktoré dosiahli rok {NUM}
 STR_HIGHSCORE_TOP_COMPANIES_NETWORK_GAME                        :{BIG_FONT}{BLACK}Tabuľka spoločnosti v roku {NUM}
 STR_HIGHSCORE_POSITION                                          :{BIG_FONT}{BLACK}{COMMA}.
 STR_HIGHSCORE_PERFORMANCE_TITLE_BUSINESSMAN                     :{G=z}Obchodníčka
@@ -1843,12 +1843,12 @@ STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor s
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Viacero hráčov
 
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Nastavenia hry
-STR_INTRO_HIGHSCORE                                             :{BLACK}Najlepší hráči
+STR_INTRO_HIGHSCORE                                             :{BLACK}Najvyššie skóre
 STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Nastavenia
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Nastavenia NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Skontrolovať online obsah
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Umelá inteligencia / Nastavenia skriptu
-STR_INTRO_QUIT                                                  :{BLACK}Koniec
+STR_INTRO_QUIT                                                  :{BLACK}Ukončiť
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Spustiť novú hru. Ctrl+klik preskočí nastavenie mapy
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Nahrať uloženú hru
@@ -2134,7 +2134,7 @@ STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Aktualny
 STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFO O SPOLOCNOSTI
 STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Názov spoločnosti: {WHITE}{STRING}
 STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Zalozene: {WHITE}{NUM}
-STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Hodnota spolocnosti: {WHITE}{CURRENCY_LONG}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Hodnota spoločnosti: {WHITE}{CURRENCY_LONG}
 STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Stav uctu: {WHITE}{CURRENCY_LONG}
 STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Zisk v minulom roku: {WHITE}{CURRENCY_LONG}
 STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Vykon: {WHITE}{NUM}
@@ -2421,7 +2421,7 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :Magnetická dr
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Vybudovať železničnú trať. Ctrl prepína stavať/odobrať stavbu železnice. Shift zobrazí odhad nákladov
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Stavba železničnej trate s režimom Autorail. Ctrl odoberie konštrukciu. Shift zobrazí výšku nákladov
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Postavit zeleznicne depo (pre nákup a opravu vlakov). So Shift-om zobrazíte odhadovanú výšku nákladov
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Postaviť vlakové depo (na nákup a opravu vlakov). Shift zobrazí predpokladanú cenu
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Konvertovať železnicu na smerové body
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Postaviť železničnú stanicu. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Postaviť železničné semafóry
@@ -2437,7 +2437,7 @@ STR_RAIL_NAME_MAGLEV                                            :Maglev
 
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientácia depa
-STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Vyber orientacie depa
+STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Vybrať orientáciu vlakového depa
 
 # Rail waypoint construction window
 STR_WAYPOINT_CAPTION                                            :{WHITE}Smerovy bod
@@ -2446,13 +2446,13 @@ STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vyber ty
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Výber železničnej stanice
 STR_STATION_BUILD_ORIENTATION                                   :{BLACK}Orientácia
-STR_STATION_BUILD_RAILROAD_ORIENTATION_TOOLTIP                  :{BLACK}Vybrat orientaciu zeleznicnej stanice
+STR_STATION_BUILD_RAILROAD_ORIENTATION_TOOLTIP                  :{BLACK}Vybrať orientáciu železničnej stanice
 STR_STATION_BUILD_NUMBER_OF_TRACKS                              :{BLACK}Počet koľají
 STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP                      :{BLACK}Počet koľají železničnej stanice
 STR_STATION_BUILD_PLATFORM_LENGTH                               :{BLACK}Dĺžka nástupišťa
-STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Dlzka zeleznicnej stanice
+STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Dĺžka železničnej stanice
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Automaticky
-STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Automaticky postavit stanicu podla oznaceneho bloku terenu
+STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Automaticky postaviť stanicu podľa označeného bloku terénu
 
 STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Vyberte druh stanice pre zobrazenie
 STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Vyberte typ stanice pre vystavbu
@@ -2529,13 +2529,13 @@ STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vybrať
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientácia zastávky
-STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Vybrat orientaciu stanice
+STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Vybrať orientáciu zastávky
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Orientácia vykládky
-STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Vybrat orientaciu vykladky
+STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Vybrať orientáciu vykládky
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientácia električkovej zastávky
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Zvoľte orientáciu osobnej električkovej stanice
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Vybrať orientáciu električkovej zastávky
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientácia električkovej vykládky
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Zvoľte orientáciu nákladnej električkovej stanice
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Vybrať orientáciu električkovej vykládky
 
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Výstavba vodných ciest
@@ -3365,7 +3365,7 @@ STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOIN
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Vycentrovať pohľad na umiestnenie navádzača
 STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Zmeniť meno smerového bodu
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Vycentrovať pohľad na umiestnenie bójky
-STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Zmeniť meno bójky
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Zmeniť meno bóje
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Upraviť názvy smerových bodov
 
@@ -3411,7 +3411,7 @@ STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA}
 STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lietad{P lo lá iel}
 STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} lo{P ď de dí}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Žiadne
-STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Hodnota spolocnosti: {WHITE}{CURRENCY_LONG}
+STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Hodnota spoločnosti: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% vlastní {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraštruktúra:
 STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} políč{P ko ka ok} železnice
@@ -3576,7 +3576,7 @@ STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION                            :Nové električ
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Železnicne vozidlá
 STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION                        :Nové cestné vozidlá
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :Nové lode
-STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Nove Lietadlo
+STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Nové lietadlá
 ############ range for vehicle availability ends
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Hmotnosť: {GOLD}{WEIGHT_SHORT}
@@ -3693,10 +3693,10 @@ STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Automati
 STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Automaticky nahradit všetky lode v lodenici
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Automaticky nahradit všetky lietadlá v hangári
 
-STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nové vozidlá
+STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nové vlaky
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nové vozidlá
 STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Nové lode
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nové Lietadlo
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nové lietadlá
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Kúpiť nový vlak
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Kúpiť nové cestné vozidlo
@@ -4366,7 +4366,7 @@ STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... obla
 STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... limit úpravy terénu dosiahnutý
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... limit čistenia políčok dosiahnutý
 STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... dosiahol si limit sadenia stromov
-STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Meno musí byt jedinecné
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Meno musí byť jedinečné
 STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{1:STRING} v ceste
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Nieje povolené ak je hra pozastavená
 
diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt
index 0727649df8..bb3697ce59 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -1121,6 +1121,7 @@ STR_CONFIG_SETTING_CITY_APPROVAL                                :நகர ம
 
 STR_CONFIG_SETTING_MAX_HEIGHTLEVEL                              :அதிகபட்ச வரைபட உயரம்: {STRING}
 STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT                     :இந்த வரைபடத்திலுள்ள மலைகளின் அதிகபட்ச உயரத்தினை அமை
+STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN                            :{WHITE}இந்த மதிப்புக்கு அதிகபட்ச வரைபட உயரத்தை நீங்கள் அமைக்க முடியாது. ஏனென்றால் வரைபடத்தில் குறைந்தது ஒரு மலையாவது இந்த மதிப்பை விட உயரமாக உள்ளது
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :நகரத்தின் சாலைகள், பாலங்கள் மற்றும் சுரங்கங்களை நீக்க அனுமதிக்கவும்: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT                       :நகராட்சியின் கட்டடங்கள் நீக்குவதை எளிதாக்கவும்
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :இரயில்களின் அதிகபட்ச நீளம்: {STRING}

From dcdcf6d57cdc45f39dbadda76022d536bfcb77e1 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Sun, 11 Oct 2020 17:53:38 +0000
Subject: [PATCH 29/31] Update: Translations from eints slovak: 57 changes by
 FuryPapaya tamil: 1 change by Ramesh78dev

---
 src/lang/slovak.txt | 114 ++++++++++++++++++++++----------------------
 src/lang/tamil.txt  |   2 +-
 2 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index cbf7eb6b6c..3132e46c23 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -306,13 +306,13 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zavrieť
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Nadpis okna - potiahni pre posun okna
 STR_TOOLTIP_SHADE                                               :{BLACK}Zabaliť okno - zobraziť len názov okna
 STR_TOOLTIP_DEBUG                                               :{BLACK}Zobraziť NewGRF debugové informácie
-STR_TOOLTIP_DEFSIZE                                             :{BLACK}Zmena veľkosti okna na základnú veľkosť. Ctrl+klik uloží aktuálnu veľkosť ako základnú
+STR_TOOLTIP_DEFSIZE                                             :{BLACK}Zmeniť veľkosť okna na predvolenú veľkosť. Ctrl+klik uloží aktuálnu veľkosť ako predvolenú
 STR_TOOLTIP_STICKY                                              :{BLACK}Zamknúť toto okno, nebude sa dať zatvoriť klávesou "Zavri všetky okná". Ctrl+klik uloží stav ako predvolený
 STR_TOOLTIP_RESIZE                                              :{BLACK}Uchop a ťahaj pre zmenu veľkosti okna
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Prepnúť veľkosť okna
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Navigačná lišta - posúva zoznam hore/dole
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Posuvná lišta - posúva zoznam doľava/doprava
-STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolácia budov atď. na rovný terén. CTRL označí oblasť diagonálne. Shift zobrazí odhad nákladov
+STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolovať budovy atď. na rovný terén. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
 
 # Show engines button
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN                           :{BLACK}Ukáž skryté
@@ -380,7 +380,7 @@ STR_SORT_BY_POPULATION                                          :Populácia
 STR_SORT_BY_RATING                                              :Hodnotenie
 
 # Tooltips for the main toolbar
-STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pauza
+STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pozastaviť hru
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Zrýchliť priebeh hry
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Nastavenia
 STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Uložiť hru, opustiť hru, ukončiť program
@@ -399,8 +399,8 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Zoznam v
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Zoznam cestných vozidiel spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Zoznam lodí spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Zoznam lietadiel spoločnosti. Ctrl+klik prepína zoznam skupín/vozidiel
-STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Priblížiť
-STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Oddialiť
+STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Priblížiť pohľad
+STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Oddialiť pohľad
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Výstavba železnice
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Výstavba ciest
 STR_TOOLBAR_TOOLTIP_BUILD_TRAMWAYS                              :{BLACK}Výstavba električkových tratí
@@ -425,9 +425,9 @@ STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generova
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Generovanie priemyslu
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Stavba cesty
 STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION                          :{BLACK}Výstavba električkovej trate
-STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Sadenie stromov. Shift zobrazí odhad nákladov
+STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Sadiť stromy. Shift zobrazí predpokladanú cenu
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Umiestniť popis
-STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Umiestniť objekt. Shift zobrazí odhad nákladov
+STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Umiestniť objekt. Shift zobrazí predpokladanú cenu
 
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Uložiť scenár
@@ -442,8 +442,8 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Ukončiť progr
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Nastavenia hry
 STR_SETTINGS_MENU_CONFIG_SETTINGS_TREE                          :Nastavenia
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Umelá inteligencia / Nastavenia hry
-STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Nastavenie NewGRF
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Nastavenia AI/skriptu
+STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Nastavenia NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Nastavenie priehľadnosti
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Zobraziť názvy miest
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Zobraziť názvy staníc
@@ -540,7 +540,7 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Vymazať všetk
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Informácie o pozemku
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Zobraziť / skryť konzolu
-STR_ABOUT_MENU_AI_DEBUG                                         :Umelá inteligencia / Ladenie skriptov
+STR_ABOUT_MENU_AI_DEBUG                                         :Ladenie AI/skriptu
 STR_ABOUT_MENU_SCREENSHOT                                       :Snímka obrazovky
 STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Zobraziť snímkovú frekvenciu
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :O hre 'OpenTTD'
@@ -837,7 +837,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS                          :{BLACK}Zobrazi
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Zobraziť poslednú správu alebo novinku
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
-STR_STATUSBAR_PAUSED                                            :{YELLOW}*  *  PAUZA  *  *
+STR_STATUSBAR_PAUSED                                            :{YELLOW}*  *  POZASTAVENÉ  *  *
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOULOŽENIE
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  HRA SA UKLADÁ  *  *
 
@@ -1480,7 +1480,7 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :krátky (31-12-
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)
 
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :Automatická pauza pri štarte novej hry: {STRING}
-STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME_HELPTEXT                   :Ak je zapnuté, hra sa automaticky zapauzuje ked začne nová hra. Toto umožňuje lepšie preskúmanie mapy hry pred začatím.
+STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME_HELPTEXT                   :Ak je zapnuté, hra sa automaticky pozastaví ked začne nová hra. Toto umožňuje lepšie preskúmanie mapy hry pred začatím.
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :Ak je hra pozastavená povol: {STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_HELPTEXT                 :Zvoľte ktoré akcie môžu byt vykonané keď je hra pozastavená.
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :žiadne akcie
@@ -1847,7 +1847,7 @@ STR_INTRO_HIGHSCORE                                             :{BLACK}Najvyš
 STR_INTRO_CONFIG_SETTINGS_TREE                                  :{BLACK}Nastavenia
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Nastavenia NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Skontrolovať online obsah
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Umelá inteligencia / Nastavenia skriptu
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Nastavenia AI/skriptu
 STR_INTRO_QUIT                                                  :{BLACK}Ukončiť
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Spustiť novú hru. Ctrl+klik preskočí nastavenie mapy
@@ -1864,10 +1864,10 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Vybrať
 
 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Zobraziť nastavenia hry
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Zobraziť tabuľku hráčov s najvyšším skóre
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Nastavenie zobrazenia
-STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Zobraziť NewGRF nastavenia
+STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE                          :{BLACK}Zobraziť nastavenia
+STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Zobraziť nastavenia NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skontrolovať nový a aktualizovaný obsah pre stiahnutie
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Zobraz umelú inteligenciu a nastavenia skriptu
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Zobraziť nastavenia AI/skriptu
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Ukončiť 'OpenTTD'
 
 STR_INTRO_BASESET                                               :{BLACK}Vo vybranej základnej sade grafiky chýba {NUM} prv{P ok ky kov}. Prosím skontrolujte aktualizácie sady grafiky.
@@ -2498,23 +2498,23 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Krytý plastov
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba ciest
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba električkových tratí
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Postaviť časť cesty. Ctrl prepína stavať/odobrať stavbu cesty. Shift zobrazí odhad nákladov
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Postaviť časť električkovej dráhy
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Stavať časti ciest použitím automatického módu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Stavať časti električkovej trate použitím automatického módu. Ctrl prepína stavanie/odstránenie električkovej trate
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Postaviť časť cesty. Ctrl odstráni časť cesty. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Postaviť časť električkovej trate. Ctrl odstráni časť trate. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Postaviť časť cesty v automatickom režime. Ctrl odstráni časť cesty. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Postaviť časť električkovej trate v automatickom režime. Ctrl odstráni časť trate. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Postaviť automobilovú garáž (na výrobu a opravu vozidiel). Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Postaviť električkovú garáž (na výrobu a opravu vozidiel). Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Postaviť autobusovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Postaviť električkovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Postaviť vykládku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Postaviť električkovú vykládku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Prepnút stavbu jednosmerných ciest
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Postaviť cestný most
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Postaviť most pre električky
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Postaviť cestný tunel
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postaviť tunel pre električky
-STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Prepnúť stavbu/odstraňovanie cesty
-STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Prepnúť stavbu/odstraňovanie električkovej dráhy
+STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Prepnúť stavbu jednosmernej cesty
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Postaviť cestný most. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Postaviť električkový most. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Postaviť cestný tunel. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postaviť električkový tunel. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Prepnúť na odstránenie cesty
+STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Prepnúť na odstránenie električkovej trate
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Konvertovať/vylepšiť typ cesty. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Konvertovať/vylepšiť typ električkovej trate. Shift zobrazí predpokladanú cenu
 
@@ -2540,13 +2540,13 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Vybrať
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Výstavba vodných ciest
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vodné cesty
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Stavba kanálov. Shift zobrazí odhad nákladov
-STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Postaviť stavidlá.
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Postaviť časť vodného kanálu. Shift zobrazí predpokladanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Postaviť stavidlá. Shift zobrazí predpokladanú cenu
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Postaviť lodenicu (na výrobu a opravu lodí). Shift zobrazí predpokladanú cenu
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Postaviť prístav. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
-STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Postavit boju pouzitelnu pre vyznacenie trasy
-STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postaviť akvadukt
-STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definovat oblast vody.{}Vytvorí kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
+STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Umiestniť bóju na vyznačenie trasy. Shift zobrazí predpokladanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postaviť akvadukt. Shift zobrazí predpokladanú cenu
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definovať oblasť vody.{}Vytvorí vodný kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
 STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Umiestniť rieku.
 
 # Ship depot construction window
@@ -2585,10 +2585,10 @@ STR_STATION_BUILD_NOISE                                         :{BLACK}Vytvára
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Úprava terénu
-STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Znížit roh terénu. Ťahaním znížite prvý vybraný roh a celú vybranú oblasť na novú výšku. CTRL označí oblasť diagonálne. Shift zobrazí odhad nákladov
-STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Zvýšit roh terénu. Ťahaním zvýšite prvý vybraný roh a celú vybranú oblasť na novú výšku. CTRL označí oblasť diagonálne. Shift zobrazí odhad nákladov
-STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Vyrovnať výšku terénu oblasti podľa prvého vybraného rohu. CTRL označí oblasť diagonálne. Shift zobrazí odhad nákladov
-STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Zakúpiť pozemok pre budúce použitie
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Znížiť roh políčka. Ťahaním znížite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Zvýšiť roh políčka. Ťahaním zvýšite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Vyrovnať výšku terénu podľa vybraného rohu. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Zakúpiť pozemok pre budúce použitie. Shift zobrazí predpokladanú cenu
 
 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Výber objektov
@@ -2602,10 +2602,10 @@ STR_OBJECT_CLASS_TRNS                                           :Vysielače
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Stromy
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vybrať typ stromu pre sadenie. Ak sa už strom na mieste nachádza, pridá viac stromov zmiešaných typov nezávisle od vybraného
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vybrať druh stromu na sadenie. Ak sa už strom na políčku nachádza, pridá sa viac stromov zmiešaných druhov nezávisle od vybraného druhu
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Nahodne stromy
-STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umiestniť náhodné stromy. Shift prepína nakúp a zobrazenie ceny bez nákupu
-STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Nahodné stromy
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umiestniť náhodné stromy. Shift zobrazí predpokladanú cenu
+STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Náhodné stromy
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Zasadiť stromy náhodne po celej krajine
 
 # Land generation window (SE)
@@ -2968,7 +2968,7 @@ STR_GENERATION_PREPARING_SCRIPT                                 :{BLACK}Spúšť
 STR_GENERATION_PREPARING_GAME                                   :{BLACK}Pripravovanie hry
 
 # NewGRF settings
-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavenie NewGRF súborov
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavenia NewGRF
 STR_NEWGRF_SETTINGS_INFO_TITLE                                  :{WHITE}Detailné NewGRF informácie
 STR_NEWGRF_SETTINGS_ACTIVE_LIST                                 :{WHITE}Aktívne NewGRF súbory
 STR_NEWGRF_SETTINGS_INACTIVE_LIST                               :{WHITE}Neaktívne NewGRF súbory
@@ -3001,7 +3001,7 @@ STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Prepnú
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potvrdit zmeny
 
 STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Nájsť chýbajúci obsah online
-STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Skontrolovať či chýbajúci obsah je dostupný online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Skontrolovať či je chýbajúci obsah dostupný online
 
 STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Názov súboru: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}ID GRF: {SILVER}{STRING}
@@ -3152,7 +3152,7 @@ STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Vyžadov
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Brať/nebrať do úvahy veľkosť písmen pri porovnávaní textu popisov s filtrovacím reťazcom
 
 # Sign window
-STR_EDIT_SIGN_CAPTION                                           :{WHITE}Upravit text popisu
+STR_EDIT_SIGN_CAPTION                                           :{WHITE}Upraviť text popisu
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Prejst na dalsiu znacku
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Prejsť na predchádzajúcu značku
 
@@ -3162,13 +3162,13 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Zadajte
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Mestá
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Žiadne -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (City){BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (Veľkomesto){BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Názvy miest - kliknite na názov pre pohľad na mesto. Ctrl+klik otvorí nové okno s pohľadom na mesto
 STR_TOWN_POPULATION                                             :{BLACK}Svetová populácia: {COMMA}
 
 # Town view window
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
-STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Mesto)
+STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Veľkomesto)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Obyvateľstvo: {ORANGE}{COMMA}{BLACK}  Domov: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} minulý mesiac: {ORANGE}{COMMA}{BLACK}  najviac: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Tovar potrebný k rozrastu mesta:
@@ -3456,7 +3456,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Semafór
 STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Políčka cesty:
 STR_COMPANY_INFRASTRUCTURE_VIEW_TRAM_SECT                       :{GOLD}Električkové políčka:
 STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Vodné políčka:
-STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Kanále
+STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}K Vodné kanály
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Stanice:
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}Políčka staníc
 STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}Letiská
@@ -3584,7 +3584,7 @@ STR_PURCHASE_INFO_COST_REFIT_WEIGHT                             :{BLACK}Cena: {G
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rýchlosť: {GOLD}{VELOCITY}{BLACK} Výkon: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Rýchlosť: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_SPEED_OCEAN                                   :{BLACK}Rýchlosť na oceáne: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_SPEED_CANAL                                   :{BLACK}Rýchlosť na kanály/rieke: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_SPEED_CANAL                                   :{BLACK}Rýchlosť na kanále/rieke: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Prevádzkové náklady: {GOLD}{CURRENCY_LONG}/rok
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacita: {GOLD}{CARGO_LONG} {STRING}
 STR_PURCHASE_INFO_REFITTABLE                                    :(možná prestavba)
@@ -4188,7 +4188,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Vyberte
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}Umelá inteligencia / Ladenie skriptov
+STR_AI_DEBUG                                                    :{WHITE}Ladenie AI/skriptu
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Meno skriptu
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Nastavenia
@@ -4209,12 +4209,12 @@ STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Pozri lo
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Nebolo nájdená žiadne použitelné AI.{}Toto AI je hlúpe a nebude nič robiť.{}Môžete si stiahnúť niekoľko AI cez 'Online Obsah' systém.
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jeden z bežiacich skriptov spadol. Prosím nahláste to autorovi a priložte screenshot Debugovacej obrazovky.
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Umelá inteligencia / Okno ladenia je dostupné len pre server
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Okno ladenia AI/skriptu je dostupné len pre server
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}Umelá inteligencia / Konfigurácia hry
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Nastavenia AI/skriptu
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Skript, ktorý bude načítaný v ďalšej hre
-STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}AIs budú nastavené v ďalšej hre.
+STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}AI, ktoré budú načítané v ďalšiej hre
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Človek
 STR_AI_CONFIG_RANDOM_AI                                         :Náhodná AI
 STR_AI_CONFIG_NONE                                              :(žiadne)
@@ -4225,9 +4225,9 @@ STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Posunú
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Posunúť nižšie vybrané AI v zozname
 
 STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Herný skript
-STR_AI_CONFIG_AI                                                :{SILVER}AIs
+STR_AI_CONFIG_AI                                                :{SILVER}AI (umelá inteligencia)
 
-STR_AI_CONFIG_CHANGE                                            :{BLACK}Vyber {STRING}
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Vybrať {STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :AI
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Skript
@@ -4237,7 +4237,7 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Nastavi
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Dostupné {STRING}
-STR_AI_LIST_CAPTION_AI                                          :AIs
+STR_AI_LIST_CAPTION_AI                                          :AI
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Herné skripty
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Klikni pre výber skriptu
 
@@ -4274,7 +4274,7 @@ STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING}
 STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licencia {STRING}
 STR_TEXTFILE_WRAP_TEXT                                          :{WHITE}Zalamovať text
 STR_TEXTFILE_WRAP_TEXT_TOOLTIP                                  :{BLACK}Zalamovať text v okne tak, aby ho nebolo nutné posúvať
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Zobraz čítajma
+STR_TEXTFILE_VIEW_README                                        :{BLACK}Zobraziť readme
 STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Log zmien
 STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licencia
 
@@ -4557,15 +4557,15 @@ STR_ERROR_NO_SUITABLE_TRAMWAY                                   :{WHITE}Žiadna
 STR_ERROR_INCOMPATIBLE_TRAMWAY                                  :{WHITE}... nekompatibilné električkové trate
 
 # Waterway construction errors
-STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Tu sa nedá postaviť prieplav...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Tu sa nedá postaviť vodný kanál...
 STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Tu sa nedá postaviť stavidlo...
 STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Tu nie je možné umiestniť rieku...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}... musíš postaviť na vode
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}... nemôžeš postaviť na vode
 STR_ERROR_CAN_T_BUILD_ON_SEA                                    :{WHITE}... nemôžeš postaviť na otvorenom mori
-STR_ERROR_CAN_T_BUILD_ON_CANAL                                  :{WHITE}... nemôže byť postavené na kanály
+STR_ERROR_CAN_T_BUILD_ON_CANAL                                  :{WHITE}... nemôže byť postavené na vodnom kanále
 STR_ERROR_CAN_T_BUILD_ON_RIVER                                  :{WHITE}... nemôže byť postavené na rieke
-STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Najprv sa musí zbúrať kanál
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Najprv sa musí zbúrať vodný kanál
 STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Tu nie je možné postaviť akvadukt...
 
 # Tree related errors
diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt
index bb3697ce59..ae9a20bb78 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -1121,7 +1121,7 @@ STR_CONFIG_SETTING_CITY_APPROVAL                                :நகர ம
 
 STR_CONFIG_SETTING_MAX_HEIGHTLEVEL                              :அதிகபட்ச வரைபட உயரம்: {STRING}
 STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT                     :இந்த வரைபடத்திலுள்ள மலைகளின் அதிகபட்ச உயரத்தினை அமை
-STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN                            :{WHITE}இந்த மதிப்புக்கு அதிகபட்ச வரைபட உயரத்தை நீங்கள் அமைக்க முடியாது. ஏனென்றால் வரைபடத்தில் குறைந்தது ஒரு மலையாவது இந்த மதிப்பை விட உயரமாக உள்ளது
+STR_CONFIG_SETTING_TOO_HIGH_MOUNTAIN                            :{WHITE} அதிகபட்ச வரைபட உயரமாக இந்த மதிப்பை நீங்கள் தர இயலாது. வரைபடத்தில் குறைந்தது ஒரு மலையாவது இந்த மதிப்பை விட உயரமாக உள்ளது
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :நகரத்தின் சாலைகள், பாலங்கள் மற்றும் சுரங்கங்களை நீக்க அனுமதிக்கவும்: {STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE_HELPTEXT                       :நகராட்சியின் கட்டடங்கள் நீக்குவதை எளிதாக்கவும்
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :இரயில்களின் அதிகபட்ச நீளம்: {STRING}

From 86ec74347d9150d27c4fd746812796a8ef56af53 Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Mon, 12 Oct 2020 17:51:42 +0000
Subject: [PATCH 30/31] Update: Translations from eints german: 4 changes by
 matthiasradde slovak: 23 changes by FuryPapaya

---
 src/lang/german.txt |  4 ++++
 src/lang/slovak.txt | 46 ++++++++++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/lang/german.txt b/src/lang/german.txt
index 1599e2b171..f8f2c77def 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -1538,10 +1538,13 @@ STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :Zeitung
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :Farbige Nachrichten erscheinen ab: {STRING}
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :Jahr in dem die Zeitung in Farbe herausgebracht wird. Vor diesem Jahr erscheint sie in Schwarz-Weiß-Druck
 STR_CONFIG_SETTING_STARTING_YEAR                                :Startdatum: {STRING}
+STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Nie
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :Feinere Wirtschaft aktivieren (mehrere, kleinere Veränderungen): {STRING}
 STR_CONFIG_SETTING_SMOOTH_ECONOMY_HELPTEXT                      :Wird diese Option ausgewählt, ändert sich die Produktionsmenge der Industrien häufiger, aber dafür in kleineren Schritten. Diese Einstellung hat gewöhnlicherweise KEINEN Effekt, wenn die Industrien von NewGRFs bereitgestellt werden
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :Handel mit Firmenanteilen erlauben: {STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT                        :Erlaube das Kaufen und Verkaufen von Firmenanteilen. Firmenanteile sind nur verfügbar für Firmen, die hinreichend lange existieren
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES                         :Minimales Alter einer Firma, um an der Börse gehandelt zu werden: {STRING}
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT                :Setze das minimale Alter einer Firma, ab dem Andere Firmenanteile dieser Firma kaufen und verkaufen können.
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :Prozentsatz des Profits für Teilstrecken: {STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :Um das Einkommen der einzelnen Fahrzeuge einer Lieferkette ungefähr abschätzen zu können, wird vom Transporterlös bei Ablieferung einer Fracht der gewählte Prozentsatz den Zulieferfahrzeugen zugeschlagen
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :Signalabstand beim Ziehen: {STRING}
@@ -4427,6 +4430,7 @@ STR_ERROR_THERE_IS_NO_TRAMWAY                                   :{WHITE}...hier
 STR_ERROR_CAN_T_CONVERT_ROAD                                    :{WHITE}Straßentyp kann hier nicht geändert werden...
 STR_ERROR_CAN_T_CONVERT_TRAMWAY                                 :{WHITE}Straßenbahngleistyp kann hier nicht geändert werden...
 STR_ERROR_NO_SUITABLE_TRAMWAY                                   :{WHITE}Keine geeigneten Straßenbahnschienen
+STR_ERROR_INCOMPATIBLE_TRAMWAY                                  :{WHITE}... inkompatible Straßenbahngleise
 
 # Waterway construction errors
 STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kanal kann hier nicht gebaut werden...
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 3132e46c23..07ca569202 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -522,7 +522,7 @@ STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Výstavba letis
 
 ############ range for landscaping menu starts
 STR_LANDSCAPING_MENU_LANDSCAPING                                :Úprava terénu
-STR_LANDSCAPING_MENU_PLANT_TREES                                :Výsadba stromov
+STR_LANDSCAPING_MENU_PLANT_TREES                                :Sadenie stromov
 STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Umiestnenie popisu
 ############ range ends here
 
@@ -2502,8 +2502,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Postavi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Postaviť časť električkovej trate. Ctrl odstráni časť trate. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Postaviť časť cesty v automatickom režime. Ctrl odstráni časť cesty. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Postaviť časť električkovej trate v automatickom režime. Ctrl odstráni časť trate. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Postaviť automobilovú garáž (na výrobu a opravu vozidiel). Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Postaviť električkovú garáž (na výrobu a opravu vozidiel). Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Postaviť automobilovú garáž (na výrobu a opravu vozidiel). Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Postaviť električkovú garáž (na výrobu a opravu vozidiel). Shift zobrazí odhadovanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Postaviť autobusovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Postaviť električkovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Postaviť vykládku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
@@ -2515,8 +2515,8 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Postavi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postaviť električkový tunel. Shift zobrazí predpokladanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Prepnúť na odstránenie cesty
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Prepnúť na odstránenie električkovej trate
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Konvertovať/vylepšiť typ cesty. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Konvertovať/vylepšiť typ električkovej trate. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Konvertovať/vylepšiť typ cesty. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_TRAM                           :{BLACK}Konvertovať/vylepšiť typ električkovej trate. Shift zobrazí odhadovanú cenu
 
 STR_ROAD_NAME_ROAD                                              :Cesta
 STR_ROAD_NAME_TRAM                                              :Električková trať
@@ -2542,7 +2542,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Výstavb
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vodné cesty
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Postaviť časť vodného kanálu. Shift zobrazí predpokladanú cenu
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Postaviť stavidlá. Shift zobrazí predpokladanú cenu
-STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Postaviť lodenicu (na výrobu a opravu lodí). Shift zobrazí predpokladanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Postaviť lodenicu (na výrobu a opravu lodí). Shift zobrazí odhadovanú cenu
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Postaviť prístav. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Umiestniť bóju na vyznačenie trasy. Shift zobrazí predpokladanú cenu
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postaviť akvadukt. Shift zobrazí predpokladanú cenu
@@ -2603,7 +2603,7 @@ STR_OBJECT_CLASS_TRNS                                           :Vysielače
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Stromy
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vybrať druh stromu na sadenie. Ak sa už strom na políčku nachádza, pridá sa viac stromov zmiešaných druhov nezávisle od vybraného druhu
-STR_TREES_RANDOM_TYPE                                           :{BLACK}Nahodne stromy
+STR_TREES_RANDOM_TYPE                                           :{BLACK}Náhodný druh stromov
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umiestniť náhodné stromy. Shift zobrazí predpokladanú cenu
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Náhodné stromy
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Zasadiť stromy náhodne po celej krajine
@@ -2625,7 +2625,7 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Ste si i
 # Town generation window (SE)
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Vytvorenie mesta
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nové mesto
-STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Založiť nové mesto. Shift+klik zobrazí predpokladanú cenu
+STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Založiť nové mesto. Shift+klik zobrazí odhadovanú cenu
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Nahodné mesto
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Postaviť mesto na náhodnej pozícii
 STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Veľa náhodných miest
@@ -3009,8 +3009,8 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Verzia:
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Min. kompatibilná verzia: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Predvolené (D)
-STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Predvolené (D) / 32 bpp
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Predvolená (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Predvolená (D) / 32 bpp
 STR_NEWGRF_SETTINGS_PALETTE_LEGACY                              :Zdedené (W)
 STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP                        :Zdedené (W) / 32 bpp
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametre: {SILVER}{STRING}
@@ -3035,7 +3035,7 @@ STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Uložiť
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Zmeniť NewGRF parametre
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Zatvoriť
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Resetovať
-STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Nastaviť východiskové hodnoty parametrov
+STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Nastaviť predvolené hodnoty parametrov
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Počet parametrov: {ORANGE}{NUM}
@@ -3426,7 +3426,7 @@ STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Postavi
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Pozrieť sídlo
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Pozrieť sídlo spoločnosti
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Premiestniť sídlo
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Sídlo spoločnosti je možné premiestniť za 1% hodnoty spoločnosti. Shift+klik zobrazí predpokladanú cenu
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Sídlo spoločnosti je možné premiestniť za 1% hodnoty spoločnosti. Shift+klik zobrazí odhadovanú cenu
 STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Detaily
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Zobraziť podrobné políčka infraštruktúry
 
@@ -3441,8 +3441,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Zmeniť
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kúpiť 25% podiel v spoločnosti
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Predať 25% podiel v spoločnosti
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Kúpiť 25% podiel v tejto spoločnosti. Shift+klik zobrazí predpokladanú cenu bez zakúpenia podielu.
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Predať 25% podiel v tejto spoločnosti. Shift+klik zobrazí predpokladanú cenu bez predaja podielu.
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Kúpiť 25% podiel v tejto spoločnosti. Shift+klik zobrazí odhadovanú cenu bez zakúpenia podielu.
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Predať 25% podiel v tejto spoločnosti. Shift+klik zobrazí odhadovanú cenu bez predaja podielu.
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Názov spoločnosti
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Meno prezidenta
@@ -3621,14 +3621,14 @@ STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Kúpiť
 STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Kúpiť a prestavať lietadlo
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Kúpiť vybraný vlak. Shift+klik zobrazí predpokladanú cenu bez nákupu
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Kúpiť vybrané vozidlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
-STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Kúpiť vybranú loď. Shift+klik zobrazí predpokladanú cenu bez nákupu
-STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Kúpiť vybrané lietadlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Kúpiť vybrané vozidlo. Shift+klik zobrazí odhadovanú cenu bez nákupu
+STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Kúpiť vybranú loď. Shift+klik zobrazí odhadovanú cenu bez nákupu
+STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Kúpiť vybrané lietadlo. Shift+klik zobrazí odhadovanú cenu bez nákupu
 
-STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Kúpiť a prestavať vybraný vlak. Shift+klik zobrazí predpokladanú cenu bez nákupu
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP          :{BLACK}Kúpiť a prestavať vybrané vozidlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
-STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}Kúpiť a prestavať vybranú loď. Shift+klik zobrazí predpokladanú cenu bez nákupu
-STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}Kúpiť a prestavať vybrané lietadlo. Shift+klik zobrazí predpokladanú cenu bez nákupu
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP                 :{BLACK}Kúpiť a prestavať vybraný vlak. Shift+klik zobrazí odhadovanú cenu bez nákupu
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP          :{BLACK}Kúpiť a prestavať vybrané vozidlo. Shift+klik zobrazí odhadovanú cenu bez nákupu
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP                  :{BLACK}Kúpiť a prestavať vybranú loď. Shift+klik zobrazí odhadovanú cenu bez nákupu
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP              :{BLACK}Kúpiť a prestavať vybrané lietadlo. Shift+klik zobrazí odhadovanú cenu bez nákupu
 
 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Premenovať
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Premenovať
@@ -5104,8 +5104,8 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_FORMAT_BUOY_NAME                                            :{TOWN} Bójka
-STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bójka #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Bója
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bója #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Spoločnosť {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Skupina {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}

From 313141d2f1218e487a546514831b91d794c20fde Mon Sep 17 00:00:00 2001
From: translators <translators@openttd.org>
Date: Tue, 13 Oct 2020 17:51:59 +0000
Subject: [PATCH 31/31] Update: Translations from eints slovak: 33 changes by
 FuryPapaya

---
 src/lang/slovak.txt | 66 ++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 07ca569202..0bfe919e9e 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -312,7 +312,7 @@ STR_TOOLTIP_RESIZE                                              :{BLACK}Uchop a
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Prepnúť veľkosť okna
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Navigačná lišta - posúva zoznam hore/dole
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Posuvná lišta - posúva zoznam doľava/doprava
-STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolovať budovy atď. na rovný terén. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
+STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolovať budovy atď. na rovný terén. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu
 
 # Show engines button
 STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN                           :{BLACK}Ukáž skryté
@@ -425,9 +425,9 @@ STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generova
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Generovanie priemyslu
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Stavba cesty
 STR_SCENEDIT_TOOLBAR_TRAM_CONSTRUCTION                          :{BLACK}Výstavba električkovej trate
-STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Sadiť stromy. Shift zobrazí predpokladanú cenu
+STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Sadiť stromy. Shift zobrazí odhadovanú cenu
 STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Umiestniť popis
-STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Umiestniť objekt. Shift zobrazí predpokladanú cenu
+STR_SCENEDIT_TOOLBAR_PLACE_OBJECT                               :{BLACK}Umiestniť objekt. Shift zobrazí odhadovanú cenu
 
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Uložiť scenár
@@ -2421,14 +2421,14 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :Magnetická dr
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Vybudovať železničnú trať. Ctrl prepína stavať/odobrať stavbu železnice. Shift zobrazí odhad nákladov
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Stavba železničnej trate s režimom Autorail. Ctrl odoberie konštrukciu. Shift zobrazí výšku nákladov
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Postaviť vlakové depo (na nákup a opravu vlakov). Shift zobrazí predpokladanú cenu
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Postaviť vlakové depo (na nákup a opravu vlakov). Shift zobrazí odhadovanú cenu
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Konvertovať železnicu na smerové body
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Postaviť železničnú stanicu. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Postaviť železničnú stanicu. Ctrl umožní spájanie staníc. Shift zobrazí odhadovanú cenu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Postaviť železničné semafóry
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Postaviť železničný most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Postaviť železničný tunel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Prepnúť stavbu/odstránenie železničných koľají, návestidiel, smerových bodov a staníc. Podržte Ctrl a budú odstránené viaceré objekty v rade za sebou
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konvertovať/vylepšiť typ železnice. Shift zobrazí predpokladanú cenu
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konvertovať/vylepšiť typ železnice. Shift zobrazí odhadovanú cenu
 
 STR_RAIL_NAME_RAILROAD                                          :Železnica
 STR_RAIL_NAME_ELRAIL                                            :Elektrifikovaná železnica
@@ -2498,21 +2498,21 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Krytý plastov
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba ciest
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba električkových tratí
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Postaviť časť cesty. Ctrl odstráni časť cesty. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Postaviť časť električkovej trate. Ctrl odstráni časť trate. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Postaviť časť cesty v automatickom režime. Ctrl odstráni časť cesty. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Postaviť časť električkovej trate v automatickom režime. Ctrl odstráni časť trate. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Postaviť časť cesty. Ctrl odstráni časť cesty. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Postaviť časť električkovej trate. Ctrl odstráni časť trate. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Postaviť časť cesty v automatickom režime. Ctrl odstráni časť cesty. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Postaviť časť električkovej trate v automatickom režime. Ctrl odstráni časť trate. Shift zobrazí odhadovanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Postaviť automobilovú garáž (na výrobu a opravu vozidiel). Shift zobrazí odhadovanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Postaviť električkovú garáž (na výrobu a opravu vozidiel). Shift zobrazí odhadovanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Postaviť autobusovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Postaviť električkovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Postaviť vykládku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Postaviť električkovú vykládku. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Prepnúť stavbu jednosmernej cesty
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Postaviť cestný most. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Postaviť električkový most. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Postaviť cestný tunel. Shift zobrazí predpokladanú cenu
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postaviť električkový tunel. Shift zobrazí predpokladanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Postaviť autobusovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Postaviť električkovú zastávku. Ctrl umožní spájanie staníc. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Postaviť vykládku. Ctrl umožní spájanie staníc. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Postaviť električkovú vykládku. Ctrl umožní spájanie staníc. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Prepnúť na stavbu jednosmernej cesty
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Postaviť cestný most. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Postaviť električkový most. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Postaviť cestný tunel. Shift zobrazí odhadovanú cenu
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postaviť električkový tunel. Shift zobrazí odhadovanú cenu
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Prepnúť na odstránenie cesty
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Prepnúť na odstránenie električkovej trate
 STR_ROAD_TOOLBAR_TOOLTIP_CONVERT_ROAD                           :{BLACK}Konvertovať/vylepšiť typ cesty. Shift zobrazí odhadovanú cenu
@@ -2540,12 +2540,12 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Vybrať
 # Waterways toolbar (last two for SE only)
 STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Výstavba vodných ciest
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Vodné cesty
-STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Postaviť časť vodného kanálu. Shift zobrazí predpokladanú cenu
-STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Postaviť stavidlá. Shift zobrazí predpokladanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Postaviť časť vodného kanálu. Shift zobrazí odhadovanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Postaviť stavidlá. Shift zobrazí odhadovanú cenu
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Postaviť lodenicu (na výrobu a opravu lodí). Shift zobrazí odhadovanú cenu
-STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Postaviť prístav. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
-STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Umiestniť bóju na vyznačenie trasy. Shift zobrazí predpokladanú cenu
-STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postaviť akvadukt. Shift zobrazí predpokladanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Postaviť prístav. Ctrl umožní spájanie staníc. Shift zobrazí odhadovanú cenu
+STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Umiestniť bóju na vyznačenie trasy. Shift zobrazí odhadovanú cenu
+STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postaviť akvadukt. Shift zobrazí odhadovanú cenu
 STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definovať oblasť vody.{}Vytvorí vodný kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
 STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Umiestniť rieku.
 
@@ -2558,7 +2558,7 @@ STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Prístav
 
 # Airport toolbar
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Výstavba letísk
-STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postaviť letisko. Ctrl umožní spájanie staníc. Shift zobrazí predpokladanú cenu
+STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postaviť letisko. Ctrl umožní spájanie staníc. Shift zobrazí odhadovanú cenu
 
 # Airport construction window
 STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Výber letiska
@@ -2585,10 +2585,10 @@ STR_STATION_BUILD_NOISE                                         :{BLACK}Vytvára
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Úprava terénu
-STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Znížiť roh políčka. Ťahaním znížite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
-STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Zvýšiť roh políčka. Ťahaním zvýšite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
-STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Vyrovnať výšku terénu podľa vybraného rohu. Ctrl označí oblasť diagonálne. Shift zobrazí predpokladanú cenu
-STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Zakúpiť pozemok pre budúce použitie. Shift zobrazí predpokladanú cenu
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Znížiť roh políčka. Ťahaním znížite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Zvýšiť roh políčka. Ťahaním zvýšite prvý vybraný roh a vyrovnáte celú vybranú oblasť na novú výšku. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Vyrovnať výšku terénu podľa vybraného rohu. Ctrl označí oblasť diagonálne. Shift zobrazí odhadovanú cenu
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Zakúpiť pozemok pre budúce použitie. Shift zobrazí odhadovanú cenu
 
 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Výber objektov
@@ -2604,7 +2604,7 @@ STR_OBJECT_CLASS_TRNS                                           :Vysielače
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Stromy
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vybrať druh stromu na sadenie. Ak sa už strom na políčku nachádza, pridá sa viac stromov zmiešaných druhov nezávisle od vybraného druhu
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Náhodný druh stromov
-STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umiestniť náhodné stromy. Shift zobrazí predpokladanú cenu
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umiestniť stromy náhodného druhu. Shift zobrazí odhadovanú cenu
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Náhodné stromy
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Zasadiť stromy náhodne po celej krajine
 
@@ -3620,7 +3620,7 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON           :{BLACK}Kúpiť
 STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON                   :{BLACK}Kúpiť a prestavať loď
 STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON               :{BLACK}Kúpiť a prestavať lietadlo
 
-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Kúpiť vybraný vlak. Shift+klik zobrazí predpokladanú cenu bez nákupu
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Kúpiť vybraný vlak. Shift+klik zobrazí odhadovanú cenu bez nákupu
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Kúpiť vybrané vozidlo. Shift+klik zobrazí odhadovanú cenu bez nákupu
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Kúpiť vybranú loď. Shift+klik zobrazí odhadovanú cenu bez nákupu
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Kúpiť vybrané lietadlo. Shift+klik zobrazí odhadovanú cenu bez nákupu
@@ -4300,8 +4300,8 @@ STR_FEEDER_INCOME_TINY                                          :{TINY_FONT}{YEL
 STR_FEEDER_INCOME                                               :{YELLOW}Prevod: {CURRENCY_LONG}{WHITE} / {GREEN}Zisk: {CURRENCY_LONG}
 STR_FEEDER_COST_TINY                                            :{TINY_FONT}{YELLOW}Prevod: {CURRENCY_LONG}{WHITE} / {RED}Náklady: {CURRENCY_LONG}
 STR_FEEDER_COST                                                 :{YELLOW}Prevod: {CURRENCY_LONG}{WHITE} / {RED}Náklady: {CURRENCY_LONG}
-STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Predpokladaná cena: {CURRENCY_LONG}
-STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Predpokladaný zisk: {CURRENCY_LONG}
+STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Odhadovaná cena: {CURRENCY_LONG}
+STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Odhadovaný zisk: {CURRENCY_LONG}
 
 # Saveload messages
 STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Ukladanie hry este bezi,{}pockajte prosim na dokoncenie!