Update: Changelog for 15.0-RC3 (#14940 )

Update: Backport language changes
Change: Automatically push/pop colours when formatting a sub-string. (#14006 )
2026-07-15 15:19:52 +00:00 · 2025-12-20 14:10:15 -05:00 · 2025-12-20 19:07:50 +00:00 · 2025-12-20 19:07:50 +00:00 · 2025-12-20 19:07:50 +00:00 · 2025-12-20 19:07:50 +00:00
132 changed files with 1839 additions and 1691 deletions
@@ -1,50 +0,0 @@
-name: 'Setup vcpkg'
-description: 'Installs vcpkg and initialises binary caching via NuGet'
-inputs:
-  vcpkg-location:
-    description: 'Where to install vcpkg'
-    required: true
-  mono-install-command:
-    description: 'Command to run to install mono'
-    required: false
-
-runs:
-  using: "composite"
-  steps:
-    - name: Install vcpkg
-      shell: bash
-      run: |
-        git clone https://github.com/microsoft/vcpkg "${{ inputs.vcpkg-location }}"
-        cd "${{ inputs.vcpkg-location }}"
-        ./bootstrap-vcpkg.$(if [ "${{ runner.os }}" = "Windows" ]; then echo "bat"; else echo "sh"; fi) -disableMetrics
-
-    - name: Install mono
-      if: inputs.mono-install-command
-      shell: bash
-      run: |
-        ${{ inputs.mono-install-command }}
-        echo "MONO=mono" >> "$GITHUB_ENV"
-
-    - name: Setup NuGet Credentials
-      shell: bash
-      env:
-        FEED_URL: 'https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json'
-      run: |
-        cd "${{ inputs.vcpkg-location }}"
-        ${{ env.MONO }} $(./vcpkg fetch nuget | tail -n 1) \
-          sources add \
-          -source "${{ env.FEED_URL }}" \
-          -storepasswordincleartext \
-          -name "GitHub" \
-          -username "${{ github.repository_owner }}" \
-          -password "${{ github.token }}"
-        ${{ env.MONO }} $(./vcpkg fetch nuget | tail -n 1) \
-          setapikey "${{ github.token }}" \
-          -source "${{ env.FEED_URL }}"
-
-    - name: Setup vcpkg caching
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.exportVariable('VCPKG_BINARY_SOURCES', 'clear;nuget,GitHub,readwrite')
-
@@ -105,4 +105,4 @@ jobs:

    steps:
    - name: Check annotations
-      uses: OpenTTD/actions/annotation-check@v5
+      uses: OpenTTD/actions/annotation-check@v6
@@ -33,10 +33,8 @@ jobs:
      uses: actions/checkout@v6

    - name: Setup vcpkg
-      uses: ./.github/actions/setup-vcpkg
-      with:
-        vcpkg-location: ${{ runner.temp }}/vcpkg
-        mono-install-command: 'sudo apt-get install -y --no-install-recommends mono-complete'
+      id: vcpkg
+      uses: OpenTTD/actions/setup-vcpkg@v6

    - name: Install dependencies
      run: |
@@ -67,7 +65,7 @@ jobs:

        # We only use breakpad from vcpkg, as its CMake files
        # are a bit special. So the Ubuntu's variant doesn't work.
-        ${{ runner.temp }}/vcpkg/vcpkg install breakpad
+        ${{ steps.vcpkg.outputs.vcpkg }} install breakpad

        echo "::endgroup::"
      env:
@@ -35,10 +35,8 @@ jobs:
      uses: actions/checkout@v6

    - name: Setup vcpkg
-      uses: ./.github/actions/setup-vcpkg
-      with:
-        vcpkg-location: ${{ runner.temp }}/vcpkg
-        mono-install-command: 'brew install mono'
+      id: vcpkg
+      uses: OpenTTD/actions/setup-vcpkg@v6

    - name: Install OpenGFX
      run: |
@@ -67,7 +65,7 @@ jobs:
        cmake .. \
          -DCMAKE_OSX_ARCHITECTURES=${{ inputs.full_arch }} \
          -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-osx \
-          -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          -DCMAKE_TOOLCHAIN_FILE=${{ steps.vcpkg.outputs.vcpkg-cmake }} \
          ${{ inputs.extra-cmake-parameters }} \
          # EOF
        echo "::endgroup::"
@@ -57,4 +57,4 @@ jobs:

    steps:
    - name: Check annotations
-      uses: OpenTTD/actions/annotation-check@v5
+      uses: OpenTTD/actions/annotation-check@v6
@@ -21,9 +21,8 @@ jobs:
      uses: actions/checkout@v6

    - name: Setup vcpkg
-      uses: ./.github/actions/setup-vcpkg
-      with:
-        vcpkg-location: ${{ runner.temp }}/vcpkg
+      id: vcpkg
+      uses: OpenTTD/actions/setup-vcpkg@v6

    - name: Install OpenGFX
      shell: bash
@@ -61,7 +60,7 @@ jobs:
        cmake .. \
          -GNinja \
          -DVCPKG_TARGET_TRIPLET=${{ inputs.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+          -DCMAKE_TOOLCHAIN_FILE="${{ steps.vcpkg.outputs.vcpkg-cmake }}" \
          # EOF
        echo "::endgroup::"

@@ -28,10 +28,8 @@ jobs:
      uses: actions/checkout@v6

    - name: Setup vcpkg
-      uses: ./.github/actions/setup-vcpkg
-      with:
-        vcpkg-location: ${{ runner.temp }}/vcpkg
-        mono-install-command: 'sudo apt-get install -y --no-install-recommends mono-complete'
+      id: vcpkg
+      uses: OpenTTD/actions/setup-vcpkg@v6

    - name: Install dependencies
      run: |
@@ -61,7 +59,7 @@ jobs:

        # We only use breakpad from vcpkg, as its CMake files
        # are a bit special. So the Ubuntu's variant doesn't work.
-        ${{ runner.temp }}/vcpkg/vcpkg install breakpad
+        ${{ steps.vcpkg.outputs.vcpkg }} install breakpad

        echo "::endgroup::"
      env:
@@ -19,7 +19,7 @@ jobs:
        fetch-depth: 4

    - name: Get pull-request commits
-      uses: OpenTTD/actions/checkout-pull-request@v5
+      uses: OpenTTD/actions/checkout-pull-request@v6

    - name: Check commits
      uses: OpenTTD/OpenTTD-git-hooks@main
@@ -110,7 +110,8 @@ jobs:
        echo "::endgroup::"

    - name: Setup vcpkg
-      uses: ./.github/actions/setup-vcpkg
+      id: vcpkg
+      uses: OpenTTD/actions/setup-vcpkg@v6
      with:
        vcpkg-location: /vcpkg
        mono-install-command: 'yum install -y mono-complete'
@@ -125,7 +126,7 @@ jobs:

        echo "::group::CMake"
        cmake ${GITHUB_WORKSPACE} \
-          -DCMAKE_TOOLCHAIN_FILE=/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          -DCMAKE_TOOLCHAIN_FILE=${{ steps.vcpkg.outputs.vcpkg-cmake }} \
          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
          -DOPTION_PACKAGE_DEPENDENCIES=ON \
@@ -38,10 +38,8 @@ jobs:
      uses: Swatinem/rust-cache@v2

    - name: Setup vcpkg
-      uses: ./.github/actions/setup-vcpkg
-      with:
-        vcpkg-location: ${{ runner.temp }}/vcpkg
-        mono-install-command: 'brew install mono'
+      id: vcpkg
+      uses: OpenTTD/actions/setup-vcpkg@v6

    - name: Install dependencies
      env:
@@ -97,7 +95,7 @@ jobs:
        cmake ${GITHUB_WORKSPACE} \
          -DCMAKE_OSX_ARCHITECTURES=arm64 \
          -DVCPKG_TARGET_TRIPLET=arm64-osx \
-          -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          -DCMAKE_TOOLCHAIN_FILE=${{ steps.vcpkg.outputs.vcpkg-cmake }} \
          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
@@ -118,7 +116,7 @@ jobs:
        cmake ${GITHUB_WORKSPACE} \
          -DCMAKE_OSX_ARCHITECTURES=x86_64 \
          -DVCPKG_TARGET_TRIPLET=x64-osx \
-          -DCMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake \
+          -DCMAKE_TOOLCHAIN_FILE=${{ steps.vcpkg.outputs.vcpkg-cmake }} \
          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
@@ -46,15 +46,14 @@ jobs:
      uses: Swatinem/rust-cache@v2

    - name: Setup vcpkg
-      uses: ./.github/actions/setup-vcpkg
-      with:
-        vcpkg-location: ${{ runner.temp }}/vcpkg
+      id: vcpkg
+      uses: OpenTTD/actions/setup-vcpkg@v6

    - name: Install dependencies
      shell: bash
      run: |
        echo "::group::Install choco dependencies"
-        choco install pandoc
+        choco install pandoc nsis
        echo "::endgroup::"

        echo "::group::Install breakpad dependencies"
@@ -103,7 +102,7 @@ jobs:
        cmake ${GITHUB_WORKSPACE} \
          -GNinja \
          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+          -DCMAKE_TOOLCHAIN_FILE="${{ steps.vcpkg.outputs.vcpkg-cmake }}" \
          -DOPTION_USE_NSIS=ON \
          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@@ -133,7 +132,7 @@ jobs:
        cmake ${GITHUB_WORKSPACE} \
          -GNinja \
          -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-          -DCMAKE_TOOLCHAIN_FILE="${{ runner.temp }}\vcpkg\scripts\buildsystems\vcpkg.cmake" \
+          -DCMAKE_TOOLCHAIN_FILE="${{ steps.vcpkg.outputs.vcpkg-cmake }}" \
          -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
          -DCMAKE_BUILD_TYPE=RelWithDebInfo \
          -DOPTION_SURVEY_KEY=${{ inputs.survey_key }} \
@@ -88,7 +88,7 @@ jobs:
    - prepare

    name: Publish bundles
-    uses: OpenTTD/actions/.github/workflows/rw-cdn-upload.yml@v5
+    uses: OpenTTD/actions/.github/workflows/rw-cdn-upload.yml@v6
    secrets:
      CDN_SIGNING_KEY: ${{ secrets.CDN_SIGNING_KEY }}
      DEPLOYMENT_APP_ID: ${{ secrets.DEPLOYMENT_APP_ID }}
@@ -103,7 +103,7 @@ jobs:
    - prepare

    name: Publish symbols
-    uses: OpenTTD/actions/.github/workflows/rw-symbols-upload.yml@v5
+    uses: OpenTTD/actions/.github/workflows/rw-symbols-upload.yml@v6
    secrets:
      SYMBOLS_SIGNING_KEY: ${{ secrets.SYMBOLS_SIGNING_KEY }}
    with:
@@ -1,5 +1,24 @@
 ## 15.x

+### 15.0-RC3 (2025-12-20)
+
+- Fix #14932: [NewGRF] Increase internal badge index size to avoid overflowing BadgeIDs (#14933)
+- Fix: Crash related to object picker recolours in Scenario Editor (#14929)
+- Fix #14921: Crash during station autorefit if station doesn't accept current cargo type (#14924)
+- Fix #14917: Crash when opening house picker with no houses available (#14920)
+- Fix #14916: Duration of error message window could be too short (#14919)
+- Fix #14915: Crash due to divide-by-zero of industry probabilities (#14918)
+- Fix: Script configs were cleared by intro game (#14910)
+- Fix: [NewGRF] Automatically push/pop colours when formatting a sub-string (#14006)
+
+### 15.0-RC2 (2025-12-13)
+
+- Fix #14677: Desync due to using newgame time settings to validate savegame time settings (#14904)
+- Fix: Graph label allocated size could be too small (#14901)
+- Fix #14891: Minimum sprite zoomlevel could break in some cases showing placeholder sprites instead (#14894)
+- Fix #14889: [FluidSynth] Don't try to load a soundfont that doesn't exist (#14890)
+- Revert: Dynamic font loading changes removed (#14903)
+
 ### 15.0-RC1 (2025-12-07)

 - Feature: Automatically load extra fonts for missing glyphs (#13303, #14856)
@@ -21,7 +21,7 @@
 {
 	assert(company < MAX_COMPANIES);

-	if (_game_mode == GM_MENU) source = SSS_FORCE_NEWGAME;
+	if (source == SSS_DEFAULT && _game_mode == GM_MENU) source = SSS_FORCE_NEWGAME;

 	if (source == SSS_DEFAULT) {
 		Company *c = Company::GetIfValid(company);
@@ -2319,18 +2319,6 @@ static bool ConContent(std::span<std::string_view> argv)
 }
 #endif /* defined(WITH_ZLIB) */

-/**
- * Get string representation of a font load reason.
- * @param load_reason The font load reason.
- * @return String representation.
- */
-static std::string_view FontLoadReasonToName(FontLoadReason load_reason)
-{
-	static const std::string_view LOAD_REASON_TO_NAME[] = { "default", "configured", "language", "missing" };
-	static_assert(std::size(LOAD_REASON_TO_NAME) == to_underlying(FontLoadReason::End));
-	return LOAD_REASON_TO_NAME[to_underlying(load_reason)];
-}
-
 static bool ConFont(std::span<std::string_view> argv)
 {
 	if (argv.empty()) {
@@ -2379,18 +2367,17 @@ static bool ConFont(std::span<std::string_view> argv)
 		SetFont(argfs, font, size);
 	}

-	IConsolePrint(CC_INFO, "Configured fonts:");
-	for (uint i = 0; FontSize fs : FONTSIZES_ALL) {
-		const FontCacheSubSetting *setting = GetFontCacheSubSetting(fs);
-		IConsolePrint(CC_DEFAULT, "{}) {} font: \"{}\", size {}", i, FontSizeToName(fs), setting->font, setting->size);
-		++i;
-	}
-
-	IConsolePrint(CC_INFO, "Currently active fonts:");
-	for (uint i = 0; const auto &fc : FontCache::Get()) {
-		if (fc == nullptr) continue;
-		IConsolePrint(CC_DEFAULT, "{}) {} font: \"{}\" size {} [{}]", i, FontSizeToName(fc->GetSize()), fc->GetFontName(), fc->GetFontSize(), FontLoadReasonToName(fc->GetFontLoadReason()));
-		++i;
+	for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) {
+		FontCache *fc = FontCache::Get(fs);
+		FontCacheSubSetting *setting = GetFontCacheSubSetting(fs);
+		/* Make sure all non sprite fonts are loaded. */
+		if (!setting->font.empty() && !fc->HasParent()) {
+			FontCache::LoadFontCaches(fs);
+			fc = FontCache::Get(fs);
+		}
+		IConsolePrint(CC_DEFAULT, "{} font:", FontSizeToName(fs));
+		IConsolePrint(CC_DEFAULT, "Currently active: \"{}\", size {}", fc->GetFontName(), fc->GetFontSize());
+		IConsolePrint(CC_DEFAULT, "Requested: \"{}\", size {}", setting->font, setting->size);
 	}

 	return true;
@@ -1501,7 +1501,7 @@ static void HandleStationRefit(Vehicle *v, CargoArray &consist_capleft, Station
 				 * of 0 for all cargoes. */
 				if (refit_capacity > 0 && (consist_capleft[cargo_type] < consist_capleft[new_cargo_type] ||
 						(consist_capleft[cargo_type] == consist_capleft[new_cargo_type] &&
-						st->goods[cargo_type].GetData().cargo.AvailableCount() > st->goods[new_cargo_type].GetData().cargo.AvailableCount()))) {
+						st->goods[cargo_type].AvailableCount() > st->goods[new_cargo_type].AvailableCount()))) {
 					new_cargo_type = cargo_type;
 				}
 			}
@@ -1774,7 +1774,7 @@ static void LoadUnloadVehicle(Vehicle *front)

 			/* If there's goods waiting at the station, and the vehicle
 			 * has capacity for it, load it on the vehicle. */
-			if ((v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0 || (ge->HasData() && ge->GetData().cargo.AvailableCount() > 0)) && MayLoadUnderExclusiveRights(st, v)) {
+			if ((v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0 || ge->AvailableCount() > 0) && MayLoadUnderExclusiveRights(st, v)) {
 				if (v->cargo.StoredCount() == 0) TriggerVehicleRandomisation(v, VehicleRandomTrigger::NewCargo);
 				if (_settings_game.order.gradual_loading) cap_left = std::min(cap_left, GetLoadAmount(v));

@@ -101,22 +101,17 @@ private:
 	uint height_summary = 0; ///< Height of the #summary_msg string in pixels in the #WID_EM_MESSAGE widget.
 	uint height_detailed = 0; ///< Height of the #detailed_msg string in pixels in the #WID_EM_MESSAGE widget.
 	uint height_extra = 0; ///< Height of the #extra_msg string in pixels in the #WID_EM_MESSAGE widget.
-	TimeoutTimer<TimerWindow> display_timeout;
+
+	TimeoutTimer<TimerWindow> display_timeout = {std::chrono::seconds(_settings_client.gui.errmsg_duration), [this]() {
+		this->Close();
+	}};

 public:
 	ErrmsgWindow(const ErrorMessageData &data) :
 		Window(data.HasFace() ? _errmsg_face_desc : _errmsg_desc),
-		ErrorMessageData(data),
-		display_timeout(std::chrono::seconds(_settings_client.gui.errmsg_duration), [this]() {
-			this->Close();
-		})
+		ErrorMessageData(data)
 	{
 		this->InitNested();
-
-		/* Only start the timeout if the message is not critical. */
-		if (!this->is_critical) {
-			this->display_timeout.Reset();
-		}
 	}

 	void UpdateWidgetSize(WidgetID widget, Dimension &size, [[maybe_unused]] const Dimension &padding, [[maybe_unused]] Dimension &fill, [[maybe_unused]] Dimension &resize) override
@@ -222,6 +217,17 @@ public:
 		}
 	}

+	void OnPaint() override
+	{
+		/* Start the timeout if not already started and the message is not critical. This is handled during OnPaint so that any delay between
+		 * creating the window and displaying it does not affect how long the message is visible. */
+		if (!this->is_critical && this->display_timeout.HasFired()) {
+			this->display_timeout.Reset();
+		}
+
+		this->Window::OnPaint();
+	}
+
 	void OnMouseLoop() override
 	{
 		/* Disallow closing the window too easily, if timeout is disabled */
@@ -8,8 +8,6 @@
 /** @file fontcache.cpp Cache for characters from fonts. */

 #include "stdafx.h"
-
-#include "core/string_consumer.hpp"
 #include "fontcache.h"
 #include "blitter/factory.hpp"
 #include "gfx_layout.h"
@@ -19,14 +17,13 @@
 #include "viewport_func.h"
 #include "window_func.h"
 #include "fileio_func.h"
-#include "zoom_func.h"

 #include "safeguards.h"

 /** Default unscaled heights for the different sizes of fonts. */
 /* static */ const int FontCache::DEFAULT_FONT_HEIGHT[FS_END] = {10, 6, 18, 10};
 /** Default unscaled ascenders for the different sizes of fonts. */
-/* static */ const int FontCache::DEFAULT_FONT_ASCENDER[FS_END] = {8, 6, 15, 8};
+/* static */ const int FontCache::DEFAULT_FONT_ASCENDER[FS_END] = {8, 5, 15, 8};

 FontCacheSettings _fcsettings;

@@ -36,10 +33,10 @@ FontCacheSettings _fcsettings;
 * @param fonttype Font type requested.
 * @return FontCache of the font if loaded, or nullptr.
 */
-/* static */ std::unique_ptr<FontCache> FontProviderManager::LoadFont(FontSize fs, FontType fonttype, bool search, const std::string &font_name, std::span<const std::byte> os_handle)
+/* static */ std::unique_ptr<FontCache> FontProviderManager::LoadFont(FontSize fs, FontType fonttype)
 {
 	for (auto &provider : FontProviderManager::GetProviders()) {
-		auto fc = provider->LoadFont(fs, fonttype, search, font_name, os_handle);
+		auto fc = provider->LoadFont(fs, fonttype);
 		if (fc != nullptr) return fc;
 	}

@@ -55,10 +52,10 @@ FontCacheSettings _fcsettings;
 * @param callback The function to call to check for missing glyphs.
 * @return true if a font has been set, false otherwise.
 */
-/* static */ bool FontProviderManager::FindFallbackFont(const std::string &language_isocode, FontSizes fontsizes, MissingGlyphSearcher *callback)
+/* static */ bool FontProviderManager::FindFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, MissingGlyphSearcher *callback)
 {
 	return std::ranges::any_of(FontProviderManager::GetProviders(),
-		[&](auto *provider) { return provider->FindFallbackFont(language_isocode, fontsizes, callback); });
+		[&](auto *provider) { return provider->FindFallbackFont(settings, language_isocode, callback); });
 }

 int FontCache::GetDefaultFontHeight(FontSize fs)
@@ -66,34 +63,21 @@ int FontCache::GetDefaultFontHeight(FontSize fs)
 	return FontCache::DEFAULT_FONT_HEIGHT[fs];
 }

-/* static */ void FontCache::UpdateCharacterHeight(FontSize fs)
+/**
+ * Get the font name of a given font size.
+ * @param fs The font size to look up.
+ * @return The font name.
+ */
+std::string FontCache::GetName(FontSize fs)
 {
-	FontMetrics &metrics = FontCache::metrics[fs];
-
-	int ascender = 0;
-	int descender = 0;
-
-	for (const auto &fc : FontCache::caches) {
-		if (fc == nullptr || fc->fs != fs) continue;
-		if (fc->load_reason == FontLoadReason::MissingFallback) continue; // Avoid dynamically loaded fonts affecting widget sizes.
-		ascender = std::max(ascender, fc->ascender);
-		descender = std::min(descender, fc->descender);
+	FontCache *fc = FontCache::Get(fs);
+	if (fc != nullptr) {
+		return fc->GetFontName();
+	} else {
+		return "[NULL]";
 	}
-
-	if (ascender == 0 && descender == 0) {
-		/* It's possible that no font is loaded yet, in which case use default values. */
-		ascender = ScaleGUITrad(FontCache::DEFAULT_FONT_ASCENDER[fs]);
-		descender = ScaleGUITrad(FontCache::DEFAULT_FONT_ASCENDER[fs] - FontCache::DEFAULT_FONT_HEIGHT[fs]);
-	}
-
-	metrics.height = ascender - descender;
-	metrics.baseline = ascender;
 }

-int FontCache::GetGlyphYOffset()
-{
-	return FontCache::GetFontBaseline(this->fs) - this->ascender;
-}

 /**
 * Get height of a character for a given font size.
@@ -102,22 +86,20 @@ int FontCache::GetGlyphYOffset()
 */
 int GetCharacterHeight(FontSize size)
 {
-	uint height = FontCache::GetCharacterHeight(size);
-	if (height == 0) height = ScaleGUITrad(FontCache::GetDefaultFontHeight(FS_MONO));
-	return height;
+	return FontCache::Get(size)->GetHeight();
 }

-/* static */ FontCache::FontCaches FontCache::caches;
-/* static */ std::array<FontCache::FontMetrics, FS_END> FontCache::metrics{};
-/* static */ std::array<FontIndex, FS_END> FontCache::default_font_index{};
+
+/* static */ std::array<std::unique_ptr<FontCache>, FS_END> FontCache::caches{};

 /**
 * Initialise font caches with the base sprite font cache for all sizes.
 */
 /* static */ void FontCache::InitializeFontCaches()
 {
-	for (FontSize fs : FONTSIZES_ALL) {
-		UpdateCharacterHeight(fs);
+	for (FontSize fs = FS_BEGIN; fs != FS_END; fs++) {
+		if (FontCache::Get(fs) != nullptr) continue;
+		FontCache::Register(FontProviderManager::LoadFont(fs, FontType::Sprite));
 	}
 }

@@ -148,13 +130,19 @@ void SetFont(FontSize fontsize, const std::string &font, uint size)
 	if (!changed) return;

 	if (fontsize != FS_MONO) {
-		/* Check if fallback fonts are needed. */
+		/* Try to reload only the modified font. */
+		FontCacheSettings backup = _fcsettings;
+		for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) {
+			if (fs == fontsize) continue;
+			FontCache *fc = FontCache::Get(fs);
+			GetFontCacheSubSetting(fs)->font = fc->HasParent() ? fc->GetFontName() : "";
+		}
 		CheckForMissingGlyphs();
+		_fcsettings = std::move(backup);
 	} else {
 		FontCache::LoadFontCaches(fontsize);
 	}

-	FontCache::UpdateCharacterHeight(fontsize);
 	LoadStringWidthTable(fontsize);
 	UpdateAllVirtCoords();
 	ReInitAllWindows(true);
@@ -168,7 +156,7 @@ void SetFont(FontSize fontsize, const std::string &font, uint size)
 */
 static bool IsDefaultFont(const FontCacheSubSetting &setting)
 {
-	return setting.font.empty();
+	return setting.font.empty() && setting.os_handle == nullptr;
 }

 /**
@@ -205,7 +193,7 @@ static std::string GetDefaultTruetypeFont(FontSize fs)
 * @param fs Font size.
 * @return Full path of default font file.
 */
-std::string GetDefaultTruetypeFontFile([[maybe_unused]] FontSize fs)
+static std::string GetDefaultTruetypeFontFile([[maybe_unused]] FontSize fs)
 {
 #if defined(WITH_FREETYPE) || defined(_WIN32) || defined(WITH_COCOA)
 	/* Find font file. */
@@ -228,55 +216,18 @@ std::string GetFontCacheFontName(FontSize fs)
 	return GetDefaultTruetypeFontFile(fs);
 }

-/* static */ void FontCache::Register(std::unique_ptr<FontCache> &&fc, FontLoadReason load_reason)
+/**
+ * Register a FontCache for its font size.
+ * @param fc FontCache to register.
+ */
+/* static */ void FontCache::Register(std::unique_ptr<FontCache> &&fc)
 {
 	if (fc == nullptr) return;

 	FontSize fs = fc->fs;

-	/* Find an empty font cache slot. */
-	auto it = std::find(std::begin(FontCache::caches), std::end(FontCache::caches), nullptr);
-	if (it == std::end(FontCache::caches)) it = FontCache::caches.insert(it, nullptr);
-
-	/* Set up our font index and make us the default font cache for this font size. */
-	fc->font_index = static_cast<FontIndex>(std::distance(std::begin(FontCache::caches), it));
-	fc->load_reason = load_reason;
-	FontCache::default_font_index[fs] = fc->font_index;
-
-	/* Register this font cache in the slot. */
-	*it = std::move(fc);
-}
-
-/**
- * Add a fallback font, with optional OS-specific handle.
- * @param fontsizes Fontsizes to add fallback to.
- * @param name Name of font to add.
- * @param handle OS-specific handle or data of font.
- */
-/* static */ void FontCache::AddFallback(FontSizes fontsizes, FontLoadReason load_reason, std::string_view name, std::span<const std::byte> os_data)
-{
-	for (FontSize fs : fontsizes) {
-		GetFontCacheSubSetting(fs)->fallback_fonts.emplace_back(load_reason, std::string{name}, std::vector<std::byte>{os_data.begin(), os_data.end()});
-	}
-}
-
-/* static */ void FontCache::LoadDefaultFonts(FontSize fs)
-{
-	/* Load the sprite font, even if it's not preferred. */
-	FontCache::Register(FontProviderManager::LoadFont(fs, FontType::Sprite, false, {}, {}), FontLoadReason::Default);
-	if (!_fcsettings.prefer_sprite) {
-		/* Load the default truetype font if sprite font is not preferred. */
-		FontCache::Register(FontProviderManager::LoadFont(fs, FontType::TrueType, false, GetDefaultTruetypeFontFile(fs), {}), FontLoadReason::Default);
-	}
-}
-
-/* static */ void FontCache::LoadFallbackFonts(FontSize fs, FontLoadReason load_reason)
-{
-	const FontCacheSubSetting *setting = GetFontCacheSubSetting(fs);
-	for (auto it = setting->fallback_fonts.rbegin(); it != setting->fallback_fonts.rend(); ++it) {
-		if (it->load_reason != load_reason) continue;
-		FontCache::Register(FontProviderManager::LoadFont(fs, FontType::TrueType, false, it->name, it->os_handle), it->load_reason);
-	}
+	fc->parent = std::move(FontCache::caches[fs]);
+	FontCache::caches[fs] = std::move(fc);
 }

 /**
@@ -285,56 +236,17 @@ std::string GetFontCacheFontName(FontSize fs)
 */
 /* static */ void FontCache::LoadFontCaches(FontSizes fontsizes)
 {
-	static constexpr std::string_view FALLBACK_FONT = "fallback";
-	static constexpr std::string_view DEFAULT_FONT = "default";
-	static constexpr std::initializer_list<std::string_view> extra_prefer_default = {DEFAULT_FONT, FALLBACK_FONT};
-	static constexpr std::initializer_list<std::string_view> extra_prefer_fallback = {FALLBACK_FONT, DEFAULT_FONT};
+	FontCache::InitializeFontCaches();

 	for (FontSize fs : fontsizes) {
 		Layouter::ResetFontCache(fs);
-		FontCache::default_font_index[fs] = INVALID_FONT_INDEX;
-	}

-	/* Remove all existing FontCaches. */
-	if (fontsizes == FONTSIZES_ALL) {
-		FontCache::caches.clear();
-	} else {
-		for (auto it = std::begin(FontCache::caches); it != std::end(FontCache::caches); ++it) {
-			if (*it == nullptr) continue;
-			if (!fontsizes.Test((*it)->fs)) continue;
-			it->reset();
-		}
-	}
-
-	for (FontSize fs : fontsizes) {
-		/* Parse configured fonts, separated by ';' into a list. */
-		std::vector<std::string_view> fontnames;
-		StringConsumer consumer(GetFontCacheSubSetting(fs)->font);
-		do {
-			auto fontname = StrTrimView(consumer.ReadUntilChar(';', StringConsumer::SKIP_ONE_SEPARATOR), " \t");
-			if (!fontname.empty()) fontnames.push_back(fontname);
-		} while (consumer.AnyBytesLeft());
-
-		/* Add the default and fallback fonts as lowest priority if not manually specified. */
-		for (const auto &extra_font : _fcsettings.prefer_default ? extra_prefer_default : extra_prefer_fallback) {
-			if (std::ranges::find(fontnames, extra_font) == std::end(fontnames)) fontnames.push_back(extra_font);
+		/* Unload everything except the sprite font cache. */
+		while (FontCache::Get(fs)->HasParent()) {
+			FontCache::caches[fs] = std::move(FontCache::caches[fs]->parent);
 		}

-		/* First load fonts for missing glyphs discovered during string formatting. */
-		FontCache::LoadFallbackFonts(fs, FontLoadReason::MissingFallback);
-
-		/* Load configured fonts in reverse order so that the first entry has priority. */
-		for (auto it = fontnames.rbegin(); it != fontnames.rend(); ++it) {
-			if (*it == DEFAULT_FONT) {
-				FontCache::LoadDefaultFonts(fs);
-			} else if (*it == FALLBACK_FONT) {
-				FontCache::LoadFallbackFonts(fs, FontLoadReason::LanguageFallback);
-			} else {
-				FontCache::Register(FontProviderManager::LoadFont(fs, FontType::TrueType, true, std::string{*it}, {}), FontLoadReason::Configured);
-			}
-		}
-
-		FontCache::UpdateCharacterHeight(fs);
+		FontCache::Register(FontProviderManager::LoadFont(fs, FontType::TrueType));
 	}
 }

@@ -344,14 +256,8 @@ std::string GetFontCacheFontName(FontSize fs)
 */
 /* static */ void FontCache::ClearFontCaches(FontSizes fontsizes)
 {
-	for (const auto &fc : FontCache::caches) {
-		if (fc == nullptr) continue;
-		if (!fontsizes.Test(fc->GetSize())) continue;
-		fc->ClearFontCache();
-	}
-
 	for (FontSize fs : fontsizes) {
-		FontCache::UpdateCharacterHeight(fs);
+		FontCache::Get(fs)->ClearFontCache();
 	}
 }

@@ -360,5 +266,7 @@ std::string GetFontCacheFontName(FontSize fs)
 */
 /* static */ void FontCache::UninitializeFontCaches()
 {
-	FontCache::caches.clear();
+	for (auto &fc : FontCache::caches) {
+		fc.reset();
+	}
 }
@@ -16,43 +16,20 @@

 /** Glyphs are characters from a font. */
 typedef uint32_t GlyphID;
-using FontIndex = uint8_t;
-
-static const FontIndex INVALID_FONT_INDEX = std::numeric_limits<FontIndex>::max();
-
-enum class FontLoadReason : uint8_t {
-	Default,
-	Configured,
-	LanguageFallback,
-	MissingFallback,
-	End,
-};
+static const GlyphID SPRITE_GLYPH = 1U << 30;

 /** Font cache for basic fonts. */
 class FontCache {
 protected:
-	using FontCaches = std::vector<std::unique_ptr<FontCache>>;
-	static FontCaches caches;
-
-	struct FontMetrics {
-		int height = 0;
-		int baseline = 0;
-	};
-
-	static std::array<FontMetrics, FS_END> metrics;
-	static std::array<FontIndex, FS_END> default_font_index;
-
+	static std::array<std::unique_ptr<FontCache>, FS_END> caches; ///< All the font caches.
+	std::unique_ptr<FontCache> parent; ///< The parent of this font cache.
 	const FontSize fs; ///< The size of the font.
-	FontIndex font_index; ///< The index of the font.
-	FontLoadReason load_reason; ///< Reason why the font is loaded.
 	int height = 0; ///< The height of the font.
 	int ascender = 0; ///< The ascender value of the font.
 	int descender = 0; ///< The descender value of the font.

 	FontCache(FontSize fs) : fs(fs) {}
-	static void Register(std::unique_ptr<FontCache> &&fc, FontLoadReason load_reason);
-	static void LoadDefaultFonts(FontSize fs);
-	static void LoadFallbackFonts(FontSize fs, FontLoadReason load_reason);
+	static void Register(std::unique_ptr<FontCache> &&fc);

 public:
 	virtual ~FontCache() = default;
@@ -69,36 +46,12 @@ public:

 	static int GetDefaultFontHeight(FontSize fs);

-	static inline int GetFontBaseline(FontSize fs)
-	{
-		return FontCache::metrics[fs].baseline;
-	}
-
-	static void AddFallback(FontSizes fontsizes, FontLoadReason load_reason, std::string_view name, std::span<const std::byte> os_data = {});
-
-	/**
-	 * Add a fallback font, with OS-specific handle.
-	 * @param fontsizes Fontsizes to add fallback to.
-	 * @param name Name of font to add.
-	 * @param handle OS-specific handle or data of font.
-	 */
-	template <typename T>
-	static void AddFallbackWithHandle(FontSizes fontsizes, FontLoadReason load_reason, std::string_view name, T &handle)
-	{
-		auto os_data = std::as_bytes(std::span(&handle, 1));
-		FontCache::AddFallback(fontsizes, load_reason, name, os_data);
-	}
-
 	/**
 	 * Get the FontSize of the font.
 	 * @return The FontSize.
 	 */
 	inline FontSize GetSize() const { return this->fs; }

-	inline FontIndex GetIndex() const { return this->font_index; }
-
-	inline FontLoadReason GetFontLoadReason() const { return this->load_reason; }
-
 	/**
 	 * Get the height of the font.
 	 * @return The height of the font.
@@ -149,9 +102,10 @@ public:
 	/**
 	 * Map a character into a glyph.
 	 * @param key The character.
+	 * @param fallback Allow fallback to the parent font.
 	 * @return The glyph ID used to draw the character.
 	 */
-	virtual GlyphID MapCharToGlyph(char32_t key) = 0;
+	virtual GlyphID MapCharToGlyph(char32_t key, bool fallback = true) = 0;

 	/**
 	 * Get the native OS font handle, if there is one.
@@ -168,57 +122,25 @@ public:
 	 */
 	virtual std::string GetFontName() = 0;

-	virtual int GetGlyphYOffset();
-
-	/**
-	 * Get span of all FontCaches.
-	 * @return Span of all FontCaches.
-	 */
-	static inline std::span<const std::unique_ptr<FontCache>> Get()
-	{
-		return FontCache::caches;
-	}
-
 	/**
 	 * Get the font cache of a given font size.
 	 * @param fs The font size to look up.
 	 * @return The font cache.
 	 */
-	static inline FontCache *Get(FontIndex font_index)
+	static inline FontCache *Get(FontSize fs)
 	{
-		assert(font_index < FontCache::caches.size());
-		return FontCache::caches[font_index].get();
+		assert(fs < FS_END);
+		return FontCache::caches[fs].get();
 	}

-	static inline int GetCharacterHeight(FontSize fs)
-	{
-		return FontCache::metrics[fs].height;
-	}
+	static std::string GetName(FontSize fs);

-	static void UpdateCharacterHeight(FontSize fs);
-
-	static inline FontIndex GetDefaultFontIndex(FontSize fs)
+	/**
+	 * Check whether the font cache has a parent.
+	 */
+	inline bool HasParent()
 	{
-		return FontCache::default_font_index[fs];
-	}
-
-	static inline class FontCache *GetDefaultFontCache(FontSize fs)
-	{
-		FontIndex index = FontCache::GetDefaultFontIndex(fs);
-		if (index != INVALID_FONT_INDEX) return FontCache::Get(index);
-		NOT_REACHED();
-	}
-
-	static inline FontIndex GetFontIndexForCharacter(FontSize fs, char32_t c)
-	{
-		for (auto it = std::rbegin(FontCache::caches); it != std::rend(FontCache::caches); ++it) {
-			FontCache *fc = it->get();
-			if (fc == nullptr) continue;
-			if (fc->GetSize() != fs) continue;
-			if (fc->MapCharToGlyph(c) == 0) continue;
-			return std::distance(std::begin(FontCache::caches), std::next(it).base());
-		}
-		return INVALID_FONT_INDEX;
+		return this->parent != nullptr;
 	}

 	/**
@@ -230,33 +152,28 @@ public:
 /** Get the Sprite for a glyph */
 inline const Sprite *GetGlyph(FontSize size, char32_t key)
 {
-	FontIndex font_index = FontCache::GetFontIndexForCharacter(size, key);
-	FontCache *fc = font_index != INVALID_FONT_INDEX ? FontCache::Get(font_index) : FontCache::GetDefaultFontCache(size);
-	if (fc == nullptr) return nullptr;
+	FontCache *fc = FontCache::Get(size);
 	return fc->GetGlyph(fc->MapCharToGlyph(key));
 }

 /** Get the width of a glyph */
 inline uint GetGlyphWidth(FontSize size, char32_t key)
 {
-	FontIndex font_index = FontCache::GetFontIndexForCharacter(size, key);
-	FontCache *fc = font_index != INVALID_FONT_INDEX ? FontCache::Get(font_index) : FontCache::GetDefaultFontCache(size);
-	if (fc == nullptr) return 0;
+	FontCache *fc = FontCache::Get(size);
 	return fc->GetGlyphWidth(fc->MapCharToGlyph(key));
 }

+inline bool GetDrawGlyphShadow(FontSize size)
+{
+	return FontCache::Get(size)->GetDrawGlyphShadow();
+}
+
 /** Settings for a single font. */
 struct FontCacheSubSetting {
 	std::string font; ///< The name of the font, or path to the font.
 	uint size;        ///< The (requested) size of the font.

-	struct FontCacheFallback {
-		FontLoadReason load_reason = FontLoadReason::LanguageFallback;
-		std::string name;
-		std::vector<std::byte> os_handle;
-	};
-
-	std::vector<FontCacheFallback> fallback_fonts;
+	const void *os_handle = nullptr; ///< Optional native OS font info. Only valid during font search.
 };

 /** Settings for the four different fonts. */
@@ -267,7 +184,6 @@ struct FontCacheSettings {
 	FontCacheSubSetting mono;   ///< The mono space font used for license/readme viewers.
 	bool prefer_sprite;         ///< Whether to prefer the built-in sprite font over resizable fonts.
 	bool global_aa;             ///< Whether to anti alias all font sizes.
-	bool prefer_default; ///< Prefer OpenTTD's default font over autodetected fallback fonts.
 };

 extern FontCacheSettings _fcsettings;
@@ -313,14 +229,14 @@ public:
 		ProviderManager<FontCacheFactory>::Unregister(*this);
 	}

-	virtual std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype, bool search, const std::string &font_name, std::span<const std::byte> os_handle) const = 0;
-	virtual bool FindFallbackFont(const std::string &language_isocode, FontSizes fontsizes, class MissingGlyphSearcher *callback) const = 0;
+	virtual std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype) const = 0;
+	virtual bool FindFallbackFont(struct FontCacheSettings *settings, const std::string &language_isocode, class MissingGlyphSearcher *callback) const = 0;
 };

 class FontProviderManager : ProviderManager<FontCacheFactory> {
 public:
-	static std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype, bool search, const std::string &font_name, std::span<const std::byte> os_handle);
-	static bool FindFallbackFont(const std::string &language_isocode, FontSizes fontsizes, class MissingGlyphSearcher *callback);
+	static std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype);
+	static bool FindFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, MissingGlyphSearcher *callback);
 };

 /* Implemented in spritefontcache.cpp */
@@ -41,7 +41,7 @@ public:
 	FreeTypeFontCache(FontSize fs, FT_Face face, int pixels);
 	~FreeTypeFontCache();
 	void ClearFontCache() override;
-	GlyphID MapCharToGlyph(char32_t key) override;
+	GlyphID MapCharToGlyph(char32_t key, bool allow_fallback = true) override;
 	std::string GetFontName() override { return fmt::format("{}, {}", face->family_name, face->style_name); }
 	bool IsBuiltInFont() override { return false; }
 	const void *GetOSHandle() override { return &face; }
@@ -194,11 +194,17 @@ const Sprite *FreeTypeFontCache::InternalGetGlyph(GlyphID key, bool aa)
 }


-GlyphID FreeTypeFontCache::MapCharToGlyph(char32_t key)
+GlyphID FreeTypeFontCache::MapCharToGlyph(char32_t key, bool allow_fallback)
 {
 	assert(IsPrintable(key));

-	return FT_Get_Char_Index(this->face, key);
+	FT_UInt glyph = FT_Get_Char_Index(this->face, key);
+
+	if (glyph == 0 && allow_fallback && key >= SCC_SPRITE_START && key <= SCC_SPRITE_END) {
+		return this->parent->MapCharToGlyph(key);
+	}
+
+	return glyph;
 }

 FT_Library _ft_library = nullptr;
@@ -220,10 +226,15 @@ public:
 	 * format is 'font family name' or 'font family name, font style'.
 	 * @param fs The font size to load.
 	 */
-	std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype, bool search, const std::string &font, std::span<const std::byte> os_handle) const override
+	std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype) const override
 	{
 		if (fonttype != FontType::TrueType) return nullptr;

+		FontCacheSubSetting *settings = GetFontCacheSubSetting(fs);
+
+		std::string font = GetFontCacheFontName(fs);
+		if (font.empty()) return nullptr;
+
 		if (_ft_library == nullptr) {
 			if (FT_Init_FreeType(&_ft_library) != FT_Err_Ok) {
 				ShowInfo("Unable to initialize FreeType, using sprite fonts instead");
@@ -237,9 +248,7 @@ public:

 		/* If font is an absolute path to a ttf, try loading that first. */
 		int32_t index = 0;
-		if (os_handle.size() == sizeof(index)) {
-			index = *reinterpret_cast<const int32_t *>(os_handle.data());
-		}
+		if (settings->os_handle != nullptr) index = *static_cast<const int32_t *>(settings->os_handle);
 		FT_Error error = FT_New_Face(_ft_library, font.c_str(), index, &face);

 		if (error != FT_Err_Ok) {
@@ -251,8 +260,8 @@ public:
 		}

 #ifdef WITH_FONTCONFIG
-		/* If allowed to search, try loading based on font face name (OS-wide fonts). */
-		if (error != FT_Err_Ok && search) error = GetFontByFaceName(font, &face);
+		/* Try loading based on font face name (OS-wide fonts). */
+		if (error != FT_Err_Ok) error = GetFontByFaceName(font, &face);
 #endif /* WITH_FONTCONFIG */

 		if (error != FT_Err_Ok) {
@@ -263,10 +272,10 @@ public:
 		return LoadFont(fs, face, font, GetFontCacheFontSize(fs));
 	}

-	bool FindFallbackFont(const std::string &language_isocode, FontSizes fontsizes, MissingGlyphSearcher *callback) const override
+	bool FindFallbackFont(struct FontCacheSettings *settings, const std::string &language_isocode, class MissingGlyphSearcher *callback) const override
 	{
 #ifdef WITH_FONTCONFIG
-		if (FontConfigFindFallbackFont(language_isocode, fontsizes, callback)) return true;
+		if (FontConfigFindFallbackFont(settings, language_isocode, callback)) return true;
 #endif /* WITH_FONTCONFIG */

 		return false;
@@ -300,7 +309,7 @@ private:
 		if (error != FT_Err_Ok) {
 			FT_Done_Face(face);

-			ShowInfo("Unable to use '{}' for {} font, FreeType reported error 0x{:X}", font_name, FontSizeToName(fs), error);
+			ShowInfo("Unable to use '{}' for {} font, FreeType reported error 0x{:X}, using sprite font instead", font_name, FontSizeToName(fs), error);
 			return nullptr;
 		}

@@ -23,6 +23,16 @@

 static const int ASCII_LETTERSTART = 32; ///< First printable ASCII letter.

+/**
+ * Scale traditional pixel dimensions to font zoom level, for drawing sprite fonts.
+ * @param value Pixel amount at #ZOOM_BASE (traditional "normal" interface size).
+ * @return Pixel amount at _font_zoom (current interface size).
+ */
+static int ScaleFontTrad(int value)
+{
+	return UnScaleByZoom(value * ZOOM_BASE, _font_zoom);
+}
+
 static std::array<std::unordered_map<char32_t, SpriteID>, FS_END> _char_maps{}; ///< Glyph map for each font size.

 /**
@@ -106,48 +116,37 @@ void InitializeUnicodeGlyphMap()
 */
 SpriteFontCache::SpriteFontCache(FontSize fs) : FontCache(fs)
 {
-	this->UpdateMetrics();
+	this->height = ScaleGUITrad(FontCache::GetDefaultFontHeight(this->fs));
+	this->ascender = (this->height - ScaleFontTrad(FontCache::GetDefaultFontHeight(this->fs))) / 2;
 }

 void SpriteFontCache::ClearFontCache()
 {
 	Layouter::ResetFontCache(this->fs);
-	this->UpdateMetrics();
-}
-
-void SpriteFontCache::UpdateMetrics()
-{
-	this->height = ScaleFontTrad(DEFAULT_FONT_HEIGHT[this->fs]);
-	this->ascender = ScaleGUITrad(DEFAULT_FONT_ASCENDER[this->fs]);
-	this->descender = ScaleGUITrad(DEFAULT_FONT_ASCENDER[this->fs] - DEFAULT_FONT_HEIGHT[this->fs]);
-	this->scaled_ascender = ScaleFontTrad(DEFAULT_FONT_ASCENDER[this->fs]);
-}
-
-int SpriteFontCache::GetGlyphYOffset()
-{
-	return FontCache::GetFontBaseline(this->fs) - this->scaled_ascender;
+	this->height = ScaleGUITrad(FontCache::GetDefaultFontHeight(this->fs));
+	this->ascender = (this->height - ScaleFontTrad(FontCache::GetDefaultFontHeight(this->fs))) / 2;
 }

 const Sprite *SpriteFontCache::GetGlyph(GlyphID key)
 {
-	SpriteID sprite = static_cast<SpriteID>(key);
+	SpriteID sprite = static_cast<SpriteID>(key & ~SPRITE_GLYPH);
 	if (sprite == 0) sprite = GetUnicodeGlyph(this->fs, '?');
 	return GetSprite(sprite, SpriteType::Font);
 }

 uint SpriteFontCache::GetGlyphWidth(GlyphID key)
 {
-	SpriteID sprite = static_cast<SpriteID>(key);
+	SpriteID sprite = static_cast<SpriteID>(key & ~SPRITE_GLYPH);
 	if (sprite == 0) sprite = GetUnicodeGlyph(this->fs, '?');
 	return SpriteExists(sprite) ? GetSprite(sprite, SpriteType::Font)->width + ScaleFontTrad(this->fs != FS_NORMAL ? 1 : 0) : 0;
 }

-GlyphID SpriteFontCache::MapCharToGlyph(char32_t key)
+GlyphID SpriteFontCache::MapCharToGlyph(char32_t key, [[maybe_unused]] bool allow_fallback)
 {
 	assert(IsPrintable(key));
 	SpriteID sprite = GetUnicodeGlyph(this->fs, key);
 	if (sprite == 0) return 0;
-	return static_cast<GlyphID>(sprite);
+	return SPRITE_GLYPH | sprite;
 }

 bool SpriteFontCache::GetDrawGlyphShadow()
@@ -159,14 +158,14 @@ class SpriteFontCacheFactory : public FontCacheFactory {
 public:
 	SpriteFontCacheFactory() : FontCacheFactory("sprite", "Sprite font provider") {}

-	std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype, bool, const std::string &, std::span<const std::byte>) const override
+	std::unique_ptr<FontCache> LoadFont(FontSize fs, FontType fonttype) const override
 	{
 		if (fonttype != FontType::Sprite) return nullptr;

 		return std::make_unique<SpriteFontCache>(fs);
 	}

-	bool FindFallbackFont(const std::string &, FontSizes, class MissingGlyphSearcher *) const override
+	bool FindFallbackFont(struct FontCacheSettings *, const std::string &, class MissingGlyphSearcher *) const override
 	{
 		return false;
 	}
@@ -17,17 +17,12 @@ class SpriteFontCache : public FontCache {
 public:
 	SpriteFontCache(FontSize fs);
 	void ClearFontCache() override;
-	int GetGlyphYOffset() override;
 	const Sprite *GetGlyph(GlyphID key) override;
 	uint GetGlyphWidth(GlyphID key) override;
 	bool GetDrawGlyphShadow() override;
-	GlyphID MapCharToGlyph(char32_t key) override;
+	GlyphID MapCharToGlyph(char32_t key, bool allow_fallback = true) override;
 	std::string GetFontName() override { return "sprite"; }
 	bool IsBuiltInFont() override { return true; }
-
-private:
-	void UpdateMetrics();
-	int scaled_ascender;
 };

 #endif /* SPRITEFONTCACHE_H */
@@ -64,6 +64,8 @@ bool TrueTypeFontCache::GetDrawGlyphShadow()

 uint TrueTypeFontCache::GetGlyphWidth(GlyphID key)
 {
+	if ((key & SPRITE_GLYPH) != 0) return this->parent->GetGlyphWidth(key);
+
 	GlyphEntry *glyph = this->GetGlyphPtr(key);
 	if (glyph == nullptr || glyph->data == nullptr) {
 		this->GetGlyph(key);
@@ -75,6 +77,8 @@ uint TrueTypeFontCache::GetGlyphWidth(GlyphID key)

 const Sprite *TrueTypeFontCache::GetGlyph(GlyphID key)
 {
+	if ((key & SPRITE_GLYPH) != 0) return this->parent->GetGlyph(key);
+
 	/* Check for the glyph in our cache */
 	GlyphEntry *glyph = this->GetGlyphPtr(key);
 	if (glyph != nullptr && glyph->data != nullptr) return glyph->GetSprite();
@@ -17,7 +17,7 @@

 /* static */ GameConfig *GameConfig::GetConfig(ScriptSettingSource source)
 {
-	if (_game_mode == GM_MENU) source = SSS_FORCE_NEWGAME;
+	if (source == SSS_DEFAULT && _game_mode == GM_MENU) source = SSS_FORCE_NEWGAME;

 	auto &config = (source == SSS_FORCE_NEWGAME) ? _settings_newgame.script_config.game : _settings_game.script_config.game;
 	if (config == nullptr) config = std::make_unique<GameConfig>();
@@ -536,7 +536,7 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
 		 * another size would be chosen it won't have truncated too little for
 		 * the truncation dots.
 		 */
-		truncation_layout.emplace(GetEllipsis(), INT32_MAX, line.GetVisualRun(0).GetFont().GetFontCache().GetSize());
+		truncation_layout.emplace(GetEllipsis(), INT32_MAX, line.GetVisualRun(0).GetFont()->fc->GetSize());
 		truncation_width = truncation_layout->GetBounds().width;

 		/* Is there enough space even for an ellipsis? */
@@ -592,15 +592,15 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
 			const ParagraphLayouter::VisualRun &run = line.GetVisualRun(run_index);
 			const auto &glyphs = run.GetGlyphs();
 			const auto &positions = run.GetPositions();
-			const Font &f = run.GetFont();
+			const Font *f = run.GetFont();

-			FontCache &fc = f.GetFontCache();
-			TextColour colour = f.colour;
+			FontCache *fc = f->fc;
+			TextColour colour = f->colour;
 			if (colour == TC_INVALID || HasFlag(initial_colour, TC_FORCED)) colour = initial_colour;
 			bool colour_has_shadow = (colour & TC_NO_SHADE) == 0 && colour != TC_BLACK;
 			/* Update the last colour for the truncation ellipsis. */
 			last_colour = colour;
-			if (do_shadow && (!fc.GetDrawGlyphShadow() || !colour_has_shadow)) continue;
+			if (do_shadow && (!fc->GetDrawGlyphShadow() || !colour_has_shadow)) continue;
 			SetColourRemap(do_shadow ? TC_BLACK : colour);

 			for (int i = 0; i < run.GetGlyphCount(); i++) {
@@ -615,10 +615,13 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,

 				/* Truncated away. */
 				if (truncation && (begin_x < min_x || end_x > max_x)) continue;
-				/* Outside the clipping area. */
-				if (begin_x > dpi_right || end_x < dpi_left) continue;

-				const Sprite *sprite = fc.GetGlyph(glyph);
+				const Sprite *sprite = fc->GetGlyph(glyph);
+				/* Check clipping (the "+ 1" is for the shadow). */
+				if (begin_x + sprite->x_offs > dpi_right || begin_x + sprite->x_offs + sprite->width /* - 1 + 1 */ < dpi_left) continue;
+
+				if (do_shadow && (glyph & SPRITE_GLYPH) != 0) continue;
+
 				GfxMainBlitter(sprite, begin_x + (do_shadow ? shadow_offset : 0), top + (do_shadow ? shadow_offset : 0), BlitterMode::ColourRemap);
 			}
 		}
@@ -10,15 +10,10 @@
 #include "stdafx.h"
 #include "core/math_func.hpp"
 #include "gfx_layout.h"
-#include "gfx_func.h"
 #include "string_func.h"
 #include "strings_func.h"
 #include "core/utf8.hpp"
 #include "debug.h"
-#include "timer/timer.h"
-#include "timer/timer_window.h"
-#include "viewport_func.h"
-#include "window_func.h"

 #include "table/control_codes.h"

@@ -42,49 +37,20 @@
 /** Cache of ParagraphLayout lines. */
 std::unique_ptr<Layouter::LineCache> Layouter::linecache;

-class RuntimeMissingGlyphSearcher : public MissingGlyphSearcher {
-	std::array<std::set<char32_t>, FS_END> glyphs{};
-public:
-	RuntimeMissingGlyphSearcher() : MissingGlyphSearcher(FONTSIZES_ALL) {}
+/** Cache of Font instances. */
+Layouter::FontColourMap Layouter::fonts[FS_END];

-	FontLoadReason GetLoadReason() override { return FontLoadReason::MissingFallback; }

-	inline void Insert(FontSize fs, char32_t c)
-	{
-		this->glyphs[fs].insert(c);
-		this->search_timeout.Reset();
-	}
-
-	std::set<char32_t> GetRequiredGlyphs(FontSizes fontsizes) override
-	{
-		std::set<char32_t> r;
-		for (FontSize fs : fontsizes) {
-			r.merge(this->glyphs[fs]);
-		}
-		return r;
-	}
-
-	TimeoutTimer<TimerWindow> search_timeout{std::chrono::milliseconds(250), [this]()
-	{
-		FontSizes changed_fontsizes{};
-		for (FontSize fs = FS_BEGIN; fs != FS_END; ++fs) {
-			auto &missing = this->glyphs[fs];
-			if (missing.empty()) continue;
-
-			if (FontProviderManager::FindFallbackFont({}, fs, this)) changed_fontsizes.Set(fs);
-			missing.clear();
-		}
-
-		if (!changed_fontsizes.Any()) return;
-
-		FontCache::LoadFontCaches(changed_fontsizes);
-		LoadStringWidthTable(changed_fontsizes);
-		UpdateAllVirtCoords();
-		ReInitAllWindows(true);
-	}};
-};
-
-static RuntimeMissingGlyphSearcher _missing_glyphs;
+/**
+ * Construct a new font.
+ * @param size   The font size to use for this font.
+ * @param colour The colour to draw this font in.
+ */
+Font::Font(FontSize size, TextColour colour) :
+		fc(FontCache::Get(size)), colour(colour)
+{
+	assert(size < FS_END);
+}

 /**
 * Helper for getting a ParagraphLayouter of the given type.
@@ -105,7 +71,7 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
 	const typename T::CharType *buffer_last = buff_begin + str.size() + 1;
 	typename T::CharType *buff = buff_begin;
 	FontMap &font_mapping = line.runs;
-	Font f{state.font_index, state.cur_colour};
+	Font *f = Layouter::GetFont(state.fontsize, state.cur_colour);

 	font_mapping.clear();

@@ -114,10 +80,7 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
 	 * whenever the font changes, and convert the wide characters into a format
 	 * usable by ParagraphLayout.
 	 */
-	Utf8View view(str);
-	for (auto it = view.begin(); it != view.end(); /* nothing */) {
-		auto cur = it;
-		uint32_t c = *it++;
+	for (char32_t c : Utf8View(str)) {
 		if (c == '\0' || c == '\n') {
 			/* Caller should already have filtered out these characters. */
 			NOT_REACHED();
@@ -132,41 +95,19 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
 		} else {
 			/* Filter out non printable characters */
 			if (!IsPrintable(c)) continue;
-
-			if (IsTextDirectionChar(c)) {
-				/* Filter out text direction characters that shouldn't be drawn, and
-				 * will not be handled in the fallback case because they are mostly
-				 * needed for RTL languages which need more proper shaping support. */
-				if constexpr (!T::SUPPORTS_RTL) continue;
-
-				buff += T::AppendToBuffer(buff, buffer_last, c);
-				if (buff >= buffer_last) break;
-				continue;
-			}
-
-			FontIndex font_index = FontCache::GetFontIndexForCharacter(state.fontsize, c);
-
-			if (font_index == INVALID_FONT_INDEX) {
-				_missing_glyphs.Insert(state.fontsize, c);
-				font_index = FontCache::GetDefaultFontIndex(state.fontsize);
-			}
-
-			if (state.font_index == font_index) {
-				buff += T::AppendToBuffer(buff, buffer_last, c);
-				if (buff >= buffer_last) break;
-				continue;
-			}
-
-			/* This character goes in the next run so don't advance. */
-			state.font_index = font_index;
-
-			it = cur;
+			/* Filter out text direction characters that shouldn't be drawn, and
+			 * will not be handled in the fallback case because they are mostly
+			 * needed for RTL languages which need more proper shaping support. */
+			if (!T::SUPPORTS_RTL && IsTextDirectionChar(c)) continue;
+			buff += T::AppendToBuffer(buff, buffer_last, c);
+			if (buff >= buffer_last) break;
+			continue;
 		}

-		if (buff - buff_begin > 0 && (font_mapping.empty() || font_mapping.back().first != buff - buff_begin)) {
+		if (font_mapping.empty() || font_mapping.back().first != buff - buff_begin) {
 			font_mapping.emplace_back(buff - buff_begin, f);
 		}
-		f = {state.font_index, state.cur_colour};
+		f = Layouter::GetFont(state.fontsize, state.cur_colour);
 	}

 	/* Better safe than sorry. */
@@ -175,14 +116,6 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
 	if (font_mapping.empty() || font_mapping.back().first != buff - buff_begin) {
 		font_mapping.emplace_back(buff - buff_begin, f);
 	}
-
-	if constexpr (!std::is_same_v<T, FallbackParagraphLayoutFactory>) {
-		/* Don't layout if all runs use a built-in font and we're not using the fallback layouter. */
-		if (std::ranges::all_of(font_mapping, [](const auto &i) { return i.second.GetFontCache().IsBuiltInFont(); })) {
-			return;
-		}
-	}
-
 	line.layout = T::GetParagraphLayout(buff_begin, buff, font_mapping);
 	line.state_after = state;
 }
@@ -195,7 +128,7 @@ static inline void GetLayouter(Layouter::LineCacheItem &line, std::string_view s
 */
 Layouter::Layouter(std::string_view str, int maxw, FontSize fontsize) : string(str)
 {
-	FontState state(TC_INVALID, fontsize, FontCache::GetDefaultFontIndex(fontsize));
+	FontState state(TC_INVALID, fontsize);

 	while (true) {
 		auto line_length = str.find_first_of('\n');
@@ -405,6 +338,18 @@ ptrdiff_t Layouter::GetCharAtPosition(int x, size_t line_index) const
 	return -1;
 }

+/**
+ * Get a static font instance.
+ */
+Font *Layouter::GetFont(FontSize size, TextColour colour)
+{
+	FontColourMap::iterator it = fonts[size].find(colour);
+	if (it != fonts[size].end()) return it->second.get();
+
+	fonts[size][colour] = std::make_unique<Font>(size, colour);
+	return fonts[size][colour].get();
+}
+
 /**
 * Perform initialization of layout engine.
 */
@@ -417,9 +362,12 @@ void Layouter::Initialize()

 /**
 * Reset cached font information.
+ * @param size Font size to reset.
 */
-void Layouter::ResetFontCache([[maybe_unused]] FontSize size)
+void Layouter::ResetFontCache(FontSize size)
 {
+	fonts[size].clear();
+
 	/* We must reset the linecache since it references the just freed fonts */
 	ResetLineCache();

@@ -12,6 +12,8 @@

 #include "misc/lrucache.hpp"
 #include "fontcache.h"
+#include "gfx_func.h"
+#include "core/math_func.hpp"

 #include <string_view>

@@ -20,13 +22,12 @@
 * of the same text, e.g. on line breaks.
 */
 struct FontState {
-	FontSize fontsize; ///< Current font size.
-	FontIndex font_index; ///< Current font index.
-	TextColour cur_colour; ///< Current text colour.
+	FontSize fontsize;       ///< Current font size.
+	TextColour cur_colour;   ///< Current text colour.
 	std::vector<TextColour> colour_stack; ///< Stack of colours to assist with colour switching.

-	FontState() : fontsize(FS_END), font_index(INVALID_FONT_INDEX), cur_colour(TC_INVALID) {}
-	FontState(TextColour colour, FontSize fontsize, FontIndex font_index) : fontsize(fontsize), font_index(font_index), cur_colour(colour) {}
+	FontState() : fontsize(FS_END), cur_colour(TC_INVALID) {}
+	FontState(TextColour colour, FontSize fontsize) : fontsize(fontsize), cur_colour(colour) {}

 	auto operator<=>(const FontState &) const = default;

@@ -66,7 +67,6 @@ struct FontState {
 	inline void SetFontSize(FontSize f)
 	{
 		this->fontsize = f;
-		this->font_index = FontCache::GetDefaultFontIndex(this->fontsize);
 	}
 };

@@ -85,10 +85,9 @@ template <> struct std::hash<FontState> {
 	std::size_t operator()(const FontState &state) const noexcept
 	{
 		size_t h1 = std::hash<FontSize>{}(state.fontsize);
-		size_t h2 = std::hash<FontIndex>{}(state.font_index);
-		size_t h3 = std::hash<TextColour>{}(state.cur_colour);
-		size_t h4 = std::hash<std::vector<TextColour>>{}(state.colour_stack);
-		return h1 ^ (h2 << 1) ^ (h3 << 2) ^ (h4 << 3);
+		size_t h2 = std::hash<TextColour>{}(state.cur_colour);
+		size_t h3 = std::hash<std::vector<TextColour>>{}(state.colour_stack);
+		return h1 ^ (h2 << 1) ^ (h3 << 2);
 	}
 };

@@ -97,14 +96,14 @@ template <> struct std::hash<FontState> {
 */
 class Font {
 public:
-	FontIndex font_index = INVALID_FONT_INDEX; ///< The font we are using.
-	TextColour colour = TC_INVALID; ///< The colour this font has to be.
+	FontCache *fc;     ///< The font we are using.
+	TextColour colour; ///< The colour this font has to be.

-	inline FontCache &GetFontCache() const { return *FontCache::Get(this->font_index); }
+	Font(FontSize size, TextColour colour);
 };

 /** Mapping from index to font. The pointer is owned by FontColourMap. */
-using FontMap = std::vector<std::pair<int, Font>>;
+using FontMap = std::vector<std::pair<int, Font *>>;

 /**
 * Interface to glue fallback and normal layouter into one.
@@ -130,7 +129,7 @@ public:
 	class VisualRun {
 	public:
 		virtual ~VisualRun() = default;
-		virtual const Font &GetFont() const = 0;
+		virtual const Font *GetFont() const = 0;
 		virtual int GetGlyphCount() const = 0;
 		virtual std::span<const GlyphID> GetGlyphs() const = 0;
 		virtual std::span<const Position> GetPositions() const = 0;
@@ -206,14 +205,18 @@ private:

 	static LineCacheItem &GetCachedParagraphLayout(std::string_view str, const FontState &state);

+	using FontColourMap = std::map<TextColour, std::unique_ptr<Font>>;
+	static FontColourMap fonts[FS_END];
 public:
+	static Font *GetFont(FontSize size, TextColour colour);
+
 	Layouter(std::string_view str, int maxw = INT32_MAX, FontSize fontsize = FS_NORMAL);
 	Dimension GetBounds();
 	ParagraphLayouter::Position GetCharPosition(std::string_view::const_iterator ch) const;
 	ptrdiff_t GetCharAtPosition(int x, size_t line_index) const;

 	static void Initialize();
-	static void ResetFontCache(FontSize fs);
+	static void ResetFontCache(FontSize size);
 	static void ResetLineCache();
 };

@@ -10,7 +10,6 @@
 #include "stdafx.h"

 #include "gfx_layout_fallback.h"
-#include "gfx_func.h"
 #include "string_func.h"
 #include "zoom_func.h"

@@ -44,15 +43,15 @@ public:
 		std::vector<Position> positions; ///< The positions of the glyphs.
 		std::vector<int> glyph_to_char; ///< The char index of the glyphs.

-		Font font;       ///< The font used to layout these.
+		Font *font;       ///< The font used to layout these.

 	public:
-		FallbackVisualRun(const Font &font, const char32_t *chars, int glyph_count, int char_offset, int x);
-		const Font &GetFont() const override { return this->font; }
+		FallbackVisualRun(Font *font, const char32_t *chars, int glyph_count, int char_offset, int x);
+		const Font *GetFont() const override { return this->font; }
 		int GetGlyphCount() const override { return static_cast<int>(this->glyphs.size()); }
 		std::span<const GlyphID> GetGlyphs() const override { return this->glyphs; }
 		std::span<const Position> GetPositions() const override { return this->positions; }
-		int GetLeading() const override { return GetCharacterHeight(this->GetFont().GetFontCache().GetSize()); }
+		int GetLeading() const override { return this->GetFont()->fc->GetHeight(); }
 		std::span<const int> GetGlyphToCharMap() const override { return this->glyph_to_char; }
 	};

@@ -110,20 +109,26 @@ public:
 * @param char_offset This run's offset from the start of the layout input string.
 * @param x           The initial x position for this run.
 */
-FallbackParagraphLayout::FallbackVisualRun::FallbackVisualRun(const Font &font, const char32_t *chars, int char_count, int char_offset, int x) :
+FallbackParagraphLayout::FallbackVisualRun::FallbackVisualRun(Font *font, const char32_t *chars, int char_count, int char_offset, int x) :
 		font(font)
 {
+	const bool isbuiltin = font->fc->IsBuiltInFont();
+
 	this->glyphs.reserve(char_count);
 	this->glyph_to_char.reserve(char_count);
 	this->positions.reserve(char_count);

-	FontCache &fc = this->font.GetFontCache();
-	int y_offset = fc.GetGlyphYOffset();;
 	int advance = x;
 	for (int i = 0; i < char_count; i++) {
-		const GlyphID &glyph_id = this->glyphs.emplace_back(fc.MapCharToGlyph(chars[i]));
-		int x_advance = fc.GetGlyphWidth(glyph_id);
-		this->positions.emplace_back(advance, advance + x_advance - 1, y_offset); // No ascender adjustment.
+		const GlyphID &glyph_id = this->glyphs.emplace_back(font->fc->MapCharToGlyph(chars[i]));
+		int x_advance = font->fc->GetGlyphWidth(glyph_id);
+		if (isbuiltin) {
+			this->positions.emplace_back(advance, advance + x_advance - 1, font->fc->GetAscender()); // Apply sprite font's ascender.
+		} else if (chars[i] >= SCC_SPRITE_START && chars[i] <= SCC_SPRITE_END) {
+			this->positions.emplace_back(advance, advance + x_advance - 1, (font->fc->GetHeight() - ScaleSpriteTrad(FontCache::GetDefaultFontHeight(font->fc->GetSize()))) / 2); // Align sprite font to centre
+		} else {
+			this->positions.emplace_back(advance, advance + x_advance - 1, 0); // No ascender adjustment.
+		}
 		advance += x_advance;
 		this->glyph_to_char.push_back(char_offset + i);
 	}
@@ -228,8 +233,7 @@ std::unique_ptr<const ParagraphLayouter::Line> FallbackParagraphLayout::NextLine
 		assert(iter != this->runs.end());
 	}

-	const FontCache *fc = &iter->second.GetFontCache();
-	assert(fc != nullptr);
+	const FontCache *fc = iter->second->fc;
 	const char32_t *next_run = this->buffer_begin + iter->first;

 	const char32_t *begin = this->buffer;
@@ -247,7 +251,6 @@ std::unique_ptr<const ParagraphLayouter::Line> FallbackParagraphLayout::NextLine

 		if (this->buffer == next_run) {
 			int w = l->GetWidth();
-			assert(iter->second.font_index != INVALID_FONT_INDEX);
 			l->emplace_back(iter->second, begin, this->buffer - begin, begin - this->buffer_begin, w);
 			++iter;
 			assert(iter != this->runs.end());
@@ -26,24 +26,5 @@ public:
 	static size_t AppendToBuffer(char32_t *buff, const char32_t *buffer_last, char32_t c);
 };

-/**
- * Swap paired brackets for fallback RTL layouting.
- * @param c Character to swap.
- * @return Swapped character, or original character if it is not a paired bracket.
- */
-inline char32_t SwapRtlPairedCharacters(char32_t c)
-{
-	/* There are many more paired brackets, but for fallback purposes we only handle ASCII brackets. */
-	/* https://www.unicode.org/Public/UCD/latest/ucd/BidiBrackets.txt */
-	switch (c) {
-		case U'(': return U')';
-		case U')': return U'(';
-		case U'[': return U']';
-		case U']': return U'[';
-		case U'{': return U'}';
-		case U'}': return U'{';
-		default: return c;
-	}
-}

 #endif /* GFX_LAYOUT_FALLBACK_H */
@@ -11,9 +11,6 @@
 #include "gfx_layout_icu.h"

 #include "debug.h"
-#include "gfx_func.h"
-#include "gfx_layout_fallback.h"
-#include "string_func.h"
 #include "strings_func.h"
 #include "language.h"
 #include "table/control_codes.h"
@@ -43,7 +40,7 @@ public:
 	int length; ///< Length of the run in the buffer.
 	UBiDiLevel level; ///< Embedding level of the run.
 	UScriptCode script; ///< Script of the run.
-	Font font; ///< Font of the run.
+	Font *font; ///< Font of the run.

 	std::vector<GlyphID> glyphs; ///< The glyphs of the run. Valid after Shape() is called.
 	std::vector<int> advance; ///< The advance (width) of the glyphs. Valid after Shape() is called.
@@ -51,10 +48,9 @@ public:
 	std::vector<ParagraphLayouter::Position> positions; ///< The positions of the glyphs. Valid after Shape() is called.
 	int total_advance = 0; ///< The total advance of the run. Valid after Shape() is called.

-	ICURun(int start, int length, UBiDiLevel level, UScriptCode script, const Font &font) : start(start), length(length), level(level), script(script), font(font) {}
+	ICURun(int start, int length, UBiDiLevel level, UScriptCode script = USCRIPT_UNKNOWN, Font *font = nullptr) : start(start), length(length), level(level), script(script), font(font) {}

 	void Shape(UChar *buff, size_t length);
-	void FallbackShape(UChar *buff);
 };

 /**
@@ -70,7 +66,7 @@ public:
 		std::vector<int> glyph_to_char;

 		int total_advance;
-		Font font;
+		const Font *font;

 	public:
 		ICUVisualRun(const ICURun &run, int x);
@@ -79,8 +75,8 @@ public:
 		std::span<const Position> GetPositions() const override { return this->positions; }
 		std::span<const int> GetGlyphToCharMap() const override { return this->glyph_to_char; }

-		const Font &GetFont() const override { return this->font; }
-		int GetLeading() const override { return GetCharacterHeight(this->font.GetFontCache().GetSize()); }
+		const Font *GetFont() const override { return this->font; }
+		int GetLeading() const override { return this->font->fc->GetHeight(); }
 		int GetGlyphCount() const override { return this->glyphs.size(); }
 		int GetAdvance() const { return this->total_advance; }
 	};
@@ -145,46 +141,6 @@ ICUParagraphLayout::ICUVisualRun::ICUVisualRun(const ICURun &run, int x) :
 	}
 }

-/**
- * Manually shape a run for built-in non-truetype fonts.
- * Similar to but not quite the same as \a UniscribeRun::FallbackShape.
- * @param buff The complete buffer of the run.
- */
-void ICURun::FallbackShape(UChar *buff)
-{
-	FontCache &fc = this->font.GetFontCache();
-
-	this->glyphs.reserve(this->length);
-	this->glyph_to_char.reserve(this->length);
-
-	/* Read each UTF-16 character, mapping to an appropriate glyph. */
-	for (int i = this->start; i < this->start + this->length; i += Utf16IsLeadSurrogate(buff[i]) ? 2 : 1) {
-		char32_t c = Utf16DecodeChar(reinterpret_cast<uint16_t *>(buff + i));
-		if (this->level & 1) c = SwapRtlPairedCharacters(c);
-		this->glyphs.emplace_back(fc.MapCharToGlyph(c));
-		this->glyph_to_char.push_back(i);
-	}
-
-	/* Reverse the sequence if this run is RTL. */
-	if (this->level & 1) {
-		std::reverse(std::begin(this->glyphs), std::end(this->glyphs));
-		std::reverse(std::begin(this->glyph_to_char), std::end(this->glyph_to_char));
-	}
-
-	this->positions.reserve(this->glyphs.size());
-
-	/* Set positions of each glyph. */
-	int y_offset = fc.GetGlyphYOffset();
-	int advance = 0;
-	for (const GlyphID glyph : this->glyphs) {
-		int x_advance = fc.GetGlyphWidth(glyph);
-		this->positions.emplace_back(advance, advance + x_advance - 1, y_offset);
-		this->advance.push_back(x_advance);
-		advance += x_advance;
-	}
-	this->total_advance = advance;
-}
-
 /**
 * Shape a single run.
 *
@@ -193,20 +149,7 @@ void ICURun::FallbackShape(UChar *buff)
 */
 void ICURun::Shape(UChar *buff, size_t buff_length)
 {
-	FontCache &fc = this->font.GetFontCache();
-
-	/* Make sure any former run is lost. */
-	this->glyphs.clear();
-	this->glyph_to_char.clear();
-	this->positions.clear();
-	this->advance.clear();
-
-	if (fc.IsBuiltInFont()) {
-		this->FallbackShape(buff);
-		return;
-	}
-
-	auto hbfont = hb_ft_font_create_referenced(*(static_cast<const FT_Face *>(fc.GetOSHandle())));
+	auto hbfont = hb_ft_font_create_referenced(*(static_cast<const FT_Face *>(font->fc->GetOSHandle())));
 	/* Match the flags with how we render the glyphs. */
 	hb_ft_font_set_load_flags(hbfont, GetFontAAState() ? FT_LOAD_TARGET_NORMAL : FT_LOAD_TARGET_MONO);

@@ -227,6 +170,12 @@ void ICURun::Shape(UChar *buff, size_t buff_length)
 	auto glyph_info = hb_buffer_get_glyph_infos(hbbuf, &glyph_count);
 	auto glyph_pos = hb_buffer_get_glyph_positions(hbbuf, &glyph_count);

+	/* Make sure any former run is lost. */
+	this->glyphs.clear();
+	this->glyph_to_char.clear();
+	this->positions.clear();
+	this->advance.clear();
+
 	/* Reserve space, as we already know the size. */
 	this->glyphs.reserve(glyph_count);
 	this->glyph_to_char.reserve(glyph_count);
@@ -234,12 +183,20 @@ void ICURun::Shape(UChar *buff, size_t buff_length)
 	this->advance.reserve(glyph_count);

 	/* Prepare the glyphs/position. ICUVisualRun will give the position an offset if needed. */
-	int y_offset = fc.GetGlyphYOffset();
 	hb_position_t advance = 0;
 	for (unsigned int i = 0; i < glyph_count; i++) {
-		int x_advance = glyph_pos[i].x_advance / FONT_SCALE;
-		this->glyphs.push_back(glyph_info[i].codepoint);
-		this->positions.emplace_back(glyph_pos[i].x_offset / FONT_SCALE + advance, glyph_pos[i].x_offset / FONT_SCALE + advance + x_advance - 1, glyph_pos[i].y_offset / FONT_SCALE + y_offset);
+		int x_advance;
+
+		if (buff[glyph_info[i].cluster] >= SCC_SPRITE_START && buff[glyph_info[i].cluster] <= SCC_SPRITE_END && glyph_info[i].codepoint == 0) {
+			auto glyph = this->font->fc->MapCharToGlyph(buff[glyph_info[i].cluster]);
+			x_advance = this->font->fc->GetGlyphWidth(glyph);
+			this->glyphs.push_back(glyph);
+			this->positions.emplace_back(advance, advance + x_advance - 1, (this->font->fc->GetHeight() - ScaleSpriteTrad(FontCache::GetDefaultFontHeight(this->font->fc->GetSize()))) / 2); // Align sprite font to centre
+		} else {
+			x_advance = glyph_pos[i].x_advance / FONT_SCALE;
+			this->glyphs.push_back(glyph_info[i].codepoint);
+			this->positions.emplace_back(glyph_pos[i].x_offset / FONT_SCALE + advance, glyph_pos[i].x_offset / FONT_SCALE + advance + x_advance - 1, glyph_pos[i].y_offset / FONT_SCALE);
+		}

 		this->glyph_to_char.push_back(glyph_info[i].cluster);
 		this->advance.push_back(x_advance);
@@ -323,7 +280,7 @@ std::vector<ICURun> ItemizeBidi(UChar *buff, size_t length)
 		UBiDiLevel level;
 		ubidi_getLogicalRun(ubidi, start_pos, &logical_pos, &level);

-		runs.emplace_back(start_pos, logical_pos - start_pos, level, USCRIPT_UNKNOWN, Font{});
+		runs.emplace_back(start_pos, logical_pos - start_pos, level);
 	}

 	assert(static_cast<size_t>(count) == runs.size());
@@ -354,7 +311,7 @@ std::vector<ICURun> ItemizeScript(UChar *buff, size_t length, std::vector<ICURun
 			int stop_pos = std::min(script_itemizer.getScriptEnd(), cur_run->start + cur_run->length);
 			assert(stop_pos - cur_pos > 0);

-			runs.emplace_back(cur_pos, stop_pos - cur_pos, cur_run->level, script_itemizer.getScriptCode(), Font{});
+			runs.emplace_back(cur_pos, stop_pos - cur_pos, cur_run->level, script_itemizer.getScriptCode());

 			if (stop_pos == cur_run->start + cur_run->length) cur_run++;
 			cur_pos = stop_pos;
@@ -402,6 +359,11 @@ std::vector<ICURun> ItemizeStyle(std::vector<ICURun> &runs_current, FontMap &fon
 	/* Can't layout an empty string. */
 	if (length == 0) return nullptr;

+	/* Can't layout our in-built sprite fonts. */
+	for (auto const &[position, font] : font_mapping) {
+		if (font->fc->IsBuiltInFont()) return nullptr;
+	}
+
 	auto runs = ItemizeBidi(buff, length);
 	runs = ItemizeScript(buff, length, runs);
 	runs = ItemizeStyle(runs, font_mapping);
@@ -677,16 +677,9 @@ public:

 				/* Draw x-axis labels and markings for graphs based on financial quarters and years.  */
 				if (this->draw_dates) {
-					TimerGameEconomy::Month month = this->month;
-					TimerGameEconomy::Year year = this->year;
-					for (int i = 0; i < this->num_on_x_axis; i++) {
+					uint year = GetParamMaxValue(this->year.base(), 4, FS_SMALL);
+					for (uint month = 0; month < 12; ++month) {
 						x_label_width = std::max(x_label_width, GetStringBoundingBox(GetString(month == 0 ? STR_GRAPH_X_LABEL_MONTH_YEAR : STR_GRAPH_X_LABEL_MONTH, STR_MONTH_ABBREV_JAN + month, year)).width);
-
-						month += this->month_increment;
-						if (month >= 12) {
-							month = 0;
-							year++;
-						}
 					}
 				} else {
 					/* Draw x-axis labels for graphs not based on quarterly performance (cargo payment rates). */
@@ -2474,7 +2474,7 @@ static IndustryGenerationProbabilities GetScaledProbabilities(bool water)

 	for (IndustryType it = 0; it < NUM_INDUSTRYTYPES; it++) {
 		p.probs[it] = GetScaledIndustryGenerationProbability(it, water, &p.force_one[it]);
-		p.total += p.probs[it];;
+		p.total += p.probs[it];
 		if (p.force_one[it]) p.num_forced++;
 	}

@@ -2499,7 +2499,8 @@ void GenerateIndustries()
 		auto &p = water ? wprob : lprob;

 		/* Total number of industries scaled by land/water proportion. */
-		uint total_amount = p.total * GetNumberOfIndustries() / (lprob.total + wprob.total);
+		uint total_amount = 0;
+		if (lprob.total + wprob.total > 0) total_amount = p.total * GetNumberOfIndustries() / (lprob.total + wprob.total);

 		/* Scale land-based industries to the land proportion, unless the player has set a custom industry count. */
 		if (!water && _settings_game.difficulty.industry_density != ID_CUSTOM) total_amount = Map::ScaleByLandProportion(total_amount);
@@ -2383,6 +2383,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bou 'n s



+
 STR_STATION_CLASS_DFLT                                          :Verstek stasie
 STR_STATION_CLASS_WAYP                                          :Roetebakens

@@ -2288,10 +2288,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :الضواحي
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :الضواحي الداخلية
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :مركز المدينة

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :منع الترقيات
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :اختر ما اذا كان هذا المنزل محمي من الاستبدال مع نمو المدينة
-STR_HOUSE_PICKER_PROTECT_OFF                                    :ايقاف
-STR_HOUSE_PICKER_PROTECT_ON                                     :تفعيل
+

 STR_STATION_CLASS_DFLT                                          :المحطة القياسية
 STR_STATION_CLASS_WAYP                                          :نقطة عبور
@@ -2263,6 +2263,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Geltokia



+
 STR_STATION_CLASS_DFLT                                          :Geltoki lehenetsia
 STR_STATION_CLASS_WAYP                                          :Bidepuntuak

@@ -3100,6 +3100,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Пабу



+
 STR_STATION_CLASS_DFLT                                          :Стандартная станцыя
 STR_STATION_CLASS_DFLT_STATION                                  :Стандартная чыг. станцыя
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Стандартны прыпынак
@@ -219,15 +219,15 @@ STR_UNITS_VELOCITY_GAMEUNITS_SEC                                :{DECIMAL}{NBSP}
 STR_UNITS_VELOCITY_KNOTS                                        :{DECIMAL}{NBSP}nós

 STR_UNITS_POWER_IMPERIAL                                        :{DECIMAL}{NBSP}hp
-STR_UNITS_POWER_METRIC                                          :{DECIMAL}{NBSP}hp
+STR_UNITS_POWER_METRIC                                          :{DECIMAL}{NBSP}cv
 STR_UNITS_POWER_SI                                              :{DECIMAL}{NBSP}kW

 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL                     :{DECIMAL}{NBSP}hp/t
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC                       :{DECIMAL}{NBSP}hp/t
-STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_SI                           :{DECIMAL}{NBSP}hp/t
-STR_UNITS_POWER_METRIC_TO_WEIGHT_IMPERIAL                       :{DECIMAL}{NBSP}hp/t
-STR_UNITS_POWER_METRIC_TO_WEIGHT_METRIC                         :{DECIMAL}{NBSP}hp/t
-STR_UNITS_POWER_METRIC_TO_WEIGHT_SI                             :{DECIMAL}{NBSP}hp/t
+STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_SI                           :{DECIMAL}{NBSP}hp/Mg
+STR_UNITS_POWER_METRIC_TO_WEIGHT_IMPERIAL                       :{DECIMAL}{NBSP}cv/t
+STR_UNITS_POWER_METRIC_TO_WEIGHT_METRIC                         :{DECIMAL}{NBSP}cv/t
+STR_UNITS_POWER_METRIC_TO_WEIGHT_SI                             :{DECIMAL}{NBSP}cv/Mg
 STR_UNITS_POWER_SI_TO_WEIGHT_IMPERIAL                           :{DECIMAL}{NBSP}kW/t
 STR_UNITS_POWER_SI_TO_WEIGHT_METRIC                             :{DECIMAL}{NBSP}kW/t
 STR_UNITS_POWER_SI_TO_WEIGHT_SI                                 :{DECIMAL}{NBSP}W/kg
@@ -2135,7 +2135,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Unidades de pot
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Sempre que a potência de um veículo for exibida na interface de usuário, mostrar nessas unidades
 ###length 3
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL            :Imperial (hp)
-STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Métrico (hp)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Métrico (cv)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_SI                  :SI (kW)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT                    :Unidades de peso: {STRING}
@@ -2879,10 +2879,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Periferia Dista
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Periferia Próxima
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centro da cidade

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Não permitir atualizações
+STR_HOUSE_PICKER_PROTECT                                        :Impedir atualizações
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Escolher se essa casa será protegida contra substituição quando a cidade crescer
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Desativado
-STR_HOUSE_PICKER_PROTECT_ON                                     :Ativado
+
+STR_HOUSE_PICKER_REPLACE                                        :Substituir existentes
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Escolha se deseja remover automaticamente a casa existente no local onde esta casa será colocada

 STR_STATION_CLASS_DFLT                                          :Padrão
 STR_STATION_CLASS_DFLT_STATION                                  :Estação padrão
@@ -2823,6 +2823,7 @@ STR_HOUSE_PICKER_CLASS_ZONE4                                    :Вътрешн
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Градски център


+
 STR_STATION_CLASS_DFLT                                          :Станция по подразбиране
 STR_STATION_CLASS_DFLT_STATION                                  :Товарна станция по подразбиране
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Спирка по подразбиране
@@ -313,6 +313,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Activant
 STR_BUTTON_DEFAULT                                              :{BLACK}Predeterminat
 STR_BUTTON_CANCEL                                               :{BLACK}Cancel·la
 STR_BUTTON_OK                                                   :{BLACK}D'acord
+STR_BUTTON_MOVE                                                 :{BLACK}Mou

 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-= qwertyuiop[]asdfghjkl;'#\zxcvbnm,./ .
@@ -2862,15 +2863,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Trieu quina zon
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Trieu quin tipus de casa construir. Amb Ctrl+clic, s'afegeix o es trau l'element de la llista de desats.

 STR_HOUSE_PICKER_CAPTION                                        :Selecció de cases
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Nom: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Habitants: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}Anys: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Anys: {ORANGE}Qualssevol
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Anys: {ORANGE}De {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Anys: {ORANGE}Fins al {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Mida: {ORANGE}{NUM}x{NUM} caselles
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Càrrega acceptada: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Càrrega produïda: {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Nom: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Habitants: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Anys: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Anys: {GOLD}Qualssevol
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Anys: {GOLD}De {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Anys: {GOLD}Fins al {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Mida: {GOLD}{NUM}x{NUM} caselles
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Càrrega acceptada: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Càrrega produïda: {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Vora
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Afores
@@ -2878,10 +2879,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Suburbi exterio
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Suburbi interior
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centre de la població

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Evita les millores
+STR_HOUSE_PICKER_PROTECT                                        :Evita les millores
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Escolliu si aquesta casa s'ha de protegir i evitar que es reemplaci quan creixi la població.
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Desactivat
-STR_HOUSE_PICKER_PROTECT_ON                                     :Activat
+
+STR_HOUSE_PICKER_REPLACE                                        :Reemplaça l'existent
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Escull si cal traure automàticament la casa existent a la casella on se situa la nova casa.

 STR_STATION_CLASS_DFLT                                          :Per defecte
 STR_STATION_CLASS_DFLT_STATION                                  :Estació per defecte
@@ -3905,12 +3907,14 @@ STR_CARGO_RATING_EXCELLENT                                      :Excel·lent
 STR_CARGO_RATING_OUTSTANDING                                    :Excepcional

 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centra la vista principal al lloc de l'estació. Amb Ctrl+clic, s'obre una vista al lloc de l'estació.
+STR_STATION_VIEW_EDIT_TOOLTIP                                   :{BLACK}Canvia el nom de l'estació o mou-ne el senyal.

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostra tots els trens que tinguin aquesta estació en el seu itinerari
 STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostra tots els vehicles que tinguin aquesta estació en el seu itinerari
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostra tots els avions que tinguin aquest aeroport en el seu itinerari
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostra tots els vaixells que tinguin aquest port en el seu itinerari

+STR_STATION_VIEW_EDIT_STATION_SIGN                              :{WHITE}Edita el senyal de l'estació

 STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}Tanca l'aeroport
 STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Evita que els avions aterrin en aquest aeroport
@@ -3918,9 +3922,11 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Evita qu
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centra la vista principal al lloc del punt de pas. Amb Ctrl+clic, s'obre una vista al lloc del punt de pas.
+STR_WAYPOINT_VIEW_EDIT_TOOLTIP                                  :{BLACK}Canvia el nom del punt de pas o mou-ne el senyal.
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centra la vista principal en la boia. Amb Ctrl+clic, s'obre una vista centrada a la boia.
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Canvia el nom de la boia

+STR_WAYPOINT_VIEW_EDIT_WAYPOINT_SIGN                            :{WHITE}Edita el senyal del punt de pas

 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}Finances de {COMPANY} {BLACK}{COMPANY_NUM}
@@ -5134,6 +5140,7 @@ STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Masses e
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Massa prop d'un altre moll
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Massa prop d'un altre aeroport
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}No es pot canviar el nom de l'estació...
+STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}El senyal de l'estació no es pot moure...
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... aquesta carretera és propietat d'una població.
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... sentit de la carretera en la direcció incorrecta
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... les estacions d'autobús de pas no poden tenir cantonades
@@ -5165,6 +5172,7 @@ STR_ERROR_CAN_T_BUILD_RAIL_WAYPOINT                             :{WHITE}Aquí no
 STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT                             :{WHITE}Aquí no es pot construir un punt de pas de carretera...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Aquí no es pot situar una boia...
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}No es pot canviar el nom del punt de pas...
+STR_ERROR_CAN_T_MOVE_WAYPOINT_NAME                              :{WHITE}El senyal del punt de pas no es pot moure...

 STR_ERROR_CAN_T_REMOVE_RAIL_WAYPOINT                            :{WHITE}Aquí no es pot treure un punt de pas de tren...
 STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}Aquí no es pot traure cap punt de pas de carretera...
@@ -1067,6 +1067,7 @@ STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Вер



+
 # Signal window

 # Bridge selection window
@@ -2526,6 +2526,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Napravi



+
 STR_STATION_CLASS_DFLT                                          :Zadana postaja
 STR_STATION_CLASS_WAYP                                          :Čvorišta

@@ -329,6 +329,7 @@ STR_UNITS_FORCE_SI                                              :{DECIMAL}{NBSP}
 STR_UNITS_HEIGHT_IMPERIAL                                       :{DECIMAL}{NBSP}stop{P a y ""}
 STR_UNITS_HEIGHT_METRIC                                         :{DECIMAL}{NBSP}m
 STR_UNITS_HEIGHT_SI                                             :{DECIMAL}{NBSP}m
+STR_UNITS_HEIGHT_GAMEUNITS                                      :{DECIMAL}{NBSP}{P úroveň úrovně úrovní}

 # Time units used in string control characters
 STR_UNITS_DAYS                                                  :{COMMA}{NBSP}{P den dny dní}
@@ -342,6 +343,7 @@ STR_UNITS_YEARS                                                 :{NUM}{NBSP}{P r
 STR_UNITS_PERIODS                                               :{NUM}{NBSP}období

 STR_LIST_SEPARATOR                                              :,{SPACE}
+STR_TRUNCATION_ELLIPSIS                                         :...

 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}Filtrovat řetězec:
@@ -385,6 +387,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Zapnutí
 STR_BUTTON_DEFAULT                                              :{BLACK}Původní
 STR_BUTTON_CANCEL                                               :{BLACK}Zrušit
 STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_MOVE                                                 :{BLACK}Přesunout

 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :"+ěščřžýáíé=-\qwertyuiopú)asdfghjklů'  zxcvbnm,./ .
@@ -708,23 +711,35 @@ STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Graf hod

 STR_GRAPH_LAST_24_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Posledních 24 minut
 STR_GRAPH_LAST_72_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Posledních 72 minut
+STR_GRAPH_LAST_288_MINUTES_TIME_LABEL                           :{TINY_FONT}{BLACK}Posledních 288 minut

+STR_GRAPH_LAST_24_MONTHS                                        :{TINY_FONT}{BLACK}2 roky (měsíčně)
+STR_GRAPH_LAST_24_QUARTERS                                      :{TINY_FONT}{BLACK}6 let (čtvrtletně)
+STR_GRAPH_LAST_24_YEARS                                         :{TINY_FONT}{BLACK}24 let (ročně)

+STR_GRAPH_TOGGLE_RANGE                                          :Zobrazit nebo skrýt graf pro tento rozsah dat
+STR_GRAPH_SELECT_SCALE                                          :Změnit vodorovné měřítko grafu

 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}Ceny za přepravu nákladu
 STR_GRAPH_CARGO_PAYMENT_RATES_DAYS                              :{TINY_FONT}{BLACK}Dnů v přepravě
 STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS                           :{TINY_FONT}{BLACK}Sekund v přepravě
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}Platba za doručeni 10 jednotek (nebo 10 000 litru) nákladu do vzdálenosti 20 čtverecků
-STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Zobraz vše
-STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Vypni vše
+STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Vše
+STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Nic
 STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Zobraz všechny druhy nákladu na grafu přepravních sazeb
 STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Skryje všechny položky na grafu přepravních sazeb
-STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Zobrazit nebo skrýt graf pro určitý druh nákladu
+STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Zobrazit nebo skrýt graf pro tento druh nákladu
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}

+STR_GRAPH_INDUSTRY_CAPTION                                      :{WHITE}{INDUSTRY} - historie nákladu
 STR_GRAPH_INDUSTRY_RANGE_PRODUCED                               :Vyprodukováno
 STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED                            :Přepraveno
+STR_GRAPH_INDUSTRY_RANGE_DELIVERED                              :Doručeno
+STR_GRAPH_INDUSTRY_RANGE_WAITING                                :Čeká

+STR_GRAPH_TOWN_CARGO_CAPTION                                    :{WHITE}{TOWN} - historie nákladu
+STR_GRAPH_TOWN_RANGE_PRODUCED                                   :Dodávka
+STR_GRAPH_TOWN_RANGE_TRANSPORTED                                :Přepraveno

 STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Zobrazit podrobné hodnocení výkonu

@@ -1054,11 +1069,14 @@ STR_GAME_OPTIONS_TAB_SOUND                                      :Zvuk
 STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Zobrazit nastavení zvuku a hudby
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Sociální
 STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Zobrazit nastavení pro sociální interakci
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :Pokročilý
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Změnit pokročilá nastavení

 STR_GAME_OPTIONS_VOLUME                                         :Hlasitost
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Zvukové efekty
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Hudba

+STR_GAME_OPTIONS_SETTING                                        :{STRING}: {ORANGE}{STRING}

 STR_GAME_OPTIONS_VOLUME_MARK                                    :{NUM}%

@@ -1113,6 +1131,7 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajsijský Ri
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lotyšský lat
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Portugalské escudo
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Ukrajinská hřivna
+STR_GAME_OPTIONS_CURRENCY_VND                                   :Vietnamský Dong

 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Automatické ukládání
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Volba intervalu mezi automatickým ukládáním hry
@@ -1146,6 +1165,7 @@ STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP                            :Zaškrtní tent

 STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :Aktuální ovladač: {STRING}

+STR_GAME_OPTIONS_INTERFACE                                      :Rozhraní

 STR_GAME_OPTIONS_GUI_SCALE_FRAME                                :Velikost uživatelského rozhraní
 STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP                              :Přetažením posuvníku změníš velikost rozhraní. Drž Ctrl pro plynulé přizpůsobení
@@ -1170,6 +1190,7 @@ STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Otevře prohlí
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Náhled výsledků průzkumu
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Zobrazovat výsledek průzkumu z aktuálně běžící hry

+STR_GAME_OPTIONS_DISPLAY                                        :Displej

 STR_GAME_OPTIONS_REFRESH_RATE                                   :Obnovovací frekvence obrazovky
 STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Zvolit obnovovací frekvenci obrazovky
@@ -1191,7 +1212,7 @@ STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :Další informa
 STR_GAME_OPTIONS_ONLINE_CONTENT                                 :Získat obsah
 STR_GAME_OPTIONS_ONLINE_CONTENT_TOOLTIP                         :Zkontrolovat nový a aktualizovaný obsah ke stažení

-STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :{LTBLUE}(nejsou nainstalovány žádné zásuvné moduly pro integraci sociálních platforem)
+STR_GAME_OPTIONS_SOCIAL_PLUGINS_NONE                            :(nejsou nainstalovány žádné zásuvné moduly pro integraci sociálních platforem)

 STR_GAME_OPTIONS_SOCIAL_PLUGIN_TITLE                            :{STRING} ({STRING})
 STR_GAME_OPTIONS_SOCIAL_PLUGIN_PLATFORM                         :Platforma:
@@ -1218,6 +1239,7 @@ STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Snížit
 STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zvýšit hodnotu vlastní měny oproti libře (£)
 STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Určit směnný kurz vlastní měny oproti libře (£)

+STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Oddělovač: {ORANGE}{STRING}
 STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Vyber oddělovač pro svoji měnu

 STR_CURRENCY_PREFIX                                             :{LTBLUE}Předpona: {ORANGE}{STRING}
@@ -1384,6 +1406,9 @@ STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT                       :Výše úroků
 STR_CONFIG_SETTING_RUNNING_COSTS                                :Cena provozu: {STRING}
 STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT                       :Nastav cenu údržby a provozu vozidel a infrastruktury
 ###length 3
+STR_CONFIG_SETTING_RUNNING_COSTS_LOW                            :nízký
+STR_CONFIG_SETTING_RUNNING_COSTS_MEDIUM                         :střední
+STR_CONFIG_SETTING_RUNNING_COSTS_HIGH                           :vysoký

 STR_CONFIG_SETTING_CONSTRUCTION_SPEED                           :Rychlost výstavby: {STRING}
 STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT                  :Omezení výstavby AI
@@ -1406,6 +1431,9 @@ STR_CONFIG_SETTING_SUBSIDY_DURATION_DISABLED                    :Žádné dotace
 STR_CONFIG_SETTING_CONSTRUCTION_COSTS                           :Cena výstavby: {STRING}
 STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT                  :Nastav cenu výstavby a nákupu
 ###length 3
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS_LOW                       :nízký
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS_MEDIUM                    :střední
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HIGH                      :vysoký

 STR_CONFIG_SETTING_RECESSIONS                                   :Krize: {STRING}
 STR_CONFIG_SETTING_RECESSIONS_HELPTEXT                          :Pokud jsou krize zapnuty, mohou se občas objevit krize. Během krize je snížena veškerá produkce. Po krizi se opět vrátí do původních hodnot
@@ -1751,6 +1779,8 @@ STR_CONFIG_SETTING_SCROLLMODE_LMB                               :Pohyb v mapě p
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Plynulé posouvání po mapě: {STRING}
 STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Ovládá jak se hlavní pohled posouvá na specifické místo na mapě, kliknutím na minimapu nebo spuštěním příkazu na posun na specifický objekt na mapě. Pokud zapnuto, pohled se posouvá plynule, pokud vypnuto, skáče pohled přímo na cílové místo

+STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_AUTOSELECT                  :Tradiční chování výběru lišt: {STRING}
+STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_AUTOSELECT_HELPTEXT         :Vyberte chování výběru lišt. Když je vypnuto, lišty zůstanou otevřené, dokud nedojde k výběru. Když je zapnuto, lišty se aktivují při puštění tlačítka myši.

 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :Ukázat rozměry při použití stavebních nástrojů: {STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT                     :Zobrazovat vzdálenost a výškový rozdíl při výstavbě tahem.
@@ -1937,6 +1967,9 @@ STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT                    :Nastaví defaul
 STR_CONFIG_SETTING_SERVINT_SHIPS                                :Základní servisní interval pro lodě: {STRING}
 STR_CONFIG_SETTING_SERVINT_SHIPS_HELPTEXT                       :Nastaví defaultní servisní interval pro lodě pokud loď nemá nastaven jiný servisní interval
 ###length 3
+STR_CONFIG_SETTING_SERVINT_VALUE_DAYS                           :{COMMA}{NBSP}{P 0 den dny dnů}
+STR_CONFIG_SETTING_SERVINT_VALUE_MINUTES                        :{COMMA}{NBSP}{P 0 minuta minuty minut}
+STR_CONFIG_SETTING_SERVINT_VALUE_PERCENTAGE                     :{COMMA}{NBSP}%

 ###setting-zero-is-special
 STR_CONFIG_SETTING_SERVINT_DISABLED                             :Vypnuto
@@ -2215,6 +2248,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Kdykoliv se v u
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperiální (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrické (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_GAMEUNITS          :Herní jednotky (úrovně)

 STR_CONFIG_SETTING_LOCALISATION                                 :Překlad
 STR_CONFIG_SETTING_GRAPHICS                                     :Grafika
@@ -2273,6 +2307,8 @@ STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... neby
 STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... grafická karta způsobila pád hry. Hadwarová akcelerace byla zakázána

 # Intro window
+STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
+STR_INTRO_VERSION                                               :OpenTTD {REV}

 STR_INTRO_NEW_GAME                                              :{BLACK}Nová hra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Nahrát hru
@@ -2414,8 +2450,11 @@ STR_FACE_FACECODE_ERR                                           :{WHITE}Nelze na
 STR_FACE_SAVE                                                   :{BLACK}Uložit
 STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Uložit oblíbený obličej
 STR_FACE_SAVE_DONE                                              :{WHITE}Tato tvář bude uložena do konfiguračního souboru jako tvá oblíbená
+STR_FACE_SETTING_TOGGLE                                         :{STRING} {ORANGE}{STRING}
+STR_FACE_SETTING_NUMERIC                                        :{STRING} {ORANGE}{NUM} / {NUM}
 STR_FACE_YES                                                    :Ano
 STR_FACE_NO                                                     :Ne
+STR_FACE_STYLE                                                  :Styl:
 STR_FACE_HAIR                                                   :Vlasy:
 STR_FACE_EYEBROWS                                               :Obočí:
 STR_FACE_EYECOLOUR                                              :Barva očí:
@@ -2882,9 +2921,16 @@ STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Táhni a
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Stavět stanice pomocí tahaní myši

 STR_PICKER_MODE_ALL                                             :Vše
+STR_PICKER_MODE_ALL_TOOLTIP                                     :Zobrazení položek všech druhů
 STR_PICKER_MODE_USED                                            :Použito
+STR_PICKER_MODE_USED_TOOLTIP                                    :Zobrazení pouze existujících položek
 STR_PICKER_MODE_SAVED                                           :Uloženo
+STR_PICKER_MODE_SAVED_TOOLTIP                                   :Zobrazení pouze uložených položek

+STR_PICKER_PREVIEW_SHRINK                                       :-
+STR_PICKER_PREVIEW_SHRINK_TOOLTIP                               :Snížit výšku náhledových obrázků. Klikni s Ctrl pro minimální výšku
+STR_PICKER_PREVIEW_EXPAND                                       :+
+STR_PICKER_PREVIEW_EXPAND_TOOLTIP                               :Zvýšit výšku náhledových obrázků. Klikni s Ctrl pro maximální výšku

 STR_PICKER_STATION_CLASS_TOOLTIP                                :Vyber typ stanice pro zobrazení
 STR_PICKER_STATION_TYPE_TOOLTIP                                 :Zvol typ stanice pro stavbu. Podrž Ctrl pro přidaní nebo odebrání z oblíbených položek
@@ -2900,15 +2946,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Vyber městskou
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Zvol typ domu pro stavbu. Podrž Shift pro přidání nebo odebrání z oblíbených položek

 STR_HOUSE_PICKER_CAPTION                                        :Výběr domu
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Název: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Populace: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}Roky: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Roky: {ORANGE}Jakékoliv
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Roky: {ORANGE}Od {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Roky: {ORANGE}Do {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Velikost: {ORANGE}{NUM}x{NUM} polí
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Přijímaný náklad: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Vyprodukováno nákladu: {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Název: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Populace: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Roky: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Roky: {GOLD}Jakékoliv
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Roky: {GOLD}Od {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Roky: {GOLD}Do {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Velikost: {GOLD}{NUM}x{NUM} polí
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Přijímaný náklad: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Vyprodukováno nákladu: {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Okraj
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Periferie
@@ -2916,10 +2962,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Vnější před
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Vnitní předměstí
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centrum města

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Zabránit vylepšování
+STR_HOUSE_PICKER_PROTECT                                        :Zabránit vylepšení
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Vyber, zdali bude tento dům chráněn před nahrazením, jak se bude město rozrůstat
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Vypnuto
-STR_HOUSE_PICKER_PROTECT_ON                                     :Zapnuto
+
+STR_HOUSE_PICKER_REPLACE                                        :Nahradit stávájící
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Automaticky odstranit existující dům na poli, kde je dům pokládán

 STR_STATION_CLASS_DFLT                                          :Původní
 STR_STATION_CLASS_DFLT_STATION                                  :Původní stanice
@@ -3124,6 +3171,11 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Zvolte v
 STR_FOUND_TOWN_CITY                                             :{BLACK}Velkoměsto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Velkoměsta rostou rychleji než běžná města. V závislosti na nastavení jsou při založení větší

+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Rozšiřování města:
+STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Budovy
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Zvýšit budovy měst
+STR_FOUND_TOWN_EXPAND_ROADS                                     :Silnice
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Rozšířit silnice měst

 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Silniční síť města:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Zvolte rozvržení silniční sítě v tomto městě
@@ -3186,6 +3238,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Majitel
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Místní správa: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nic
 STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Souřadnice: {LTBLUE}{NUM} x {NUM} x {NUM}
+STR_LAND_AREA_INFORMATION_LANDINFO_INDEX                        :{BLACK}Index pole: {LTBLUE}{NUM} ({HEX})
 STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Postaveno/obnoveno: {LTBLUE}{DATE_LONG}
 STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Třída stanice: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Druh stanice: {LTBLUE}{STRING}
@@ -3463,13 +3516,18 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Severoz
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Severovýchod
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Jihovýchod
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Jihozápad
+STR_MAPGEN_NORTHWEST_TOOLTIP                                    :Voda nebo volná hrana na severozápadní hraně mapy
+STR_MAPGEN_NORTHEAST_TOOLTIP                                    :Voda nebo volná hrana na severovýchodní hraně mapy
+STR_MAPGEN_SOUTHEAST_TOOLTIP                                    :Voda nebo volná hrana na jihovýchodní hraně mapy
+STR_MAPGEN_SOUTHWEST_TOOLTIP                                    :Voda nebo volná hrana na jihozápadní hraně mapy
 STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}terén
 STR_MAPGEN_BORDER_WATER                                         :{BLACK}voda
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}náhodně

 ###length 3
-STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}náhodně
-STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}vlastní
+STR_MAPGEN_BORDER_RANDOMIZE                                     :náhodně
+STR_MAPGEN_BORDER_MANUAL                                        :vlastní
+STR_MAPGEN_BORDER_INFINITE_WATER                                :Nekonečná voda

 STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Otočení výškové mapy:
 STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Jméno výškové mapy:
@@ -3508,6 +3566,7 @@ STR_GENERATION_LANDSCAPE_GENERATION                             :{BLACK}Generov
 STR_GENERATION_RIVER_GENERATION                                 :{BLACK}Generování řek
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}Tvorba členitého a kamenitého území
 STR_GENERATION_TOWN_GENERATION                                  :{BLACK}Generování měst
+STR_GENERATION_LAND_INDUSTRY_GENERATION                         :{BLACK}Generování pozemního průmyslu
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Výstavba nepřesunutelných objektů
 STR_GENERATION_TREE_GENERATION                                  :{BLACK}Výsadba stromů
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Nastavování hry
@@ -3519,6 +3578,7 @@ STR_TOWN_DATA_ERROR_JSON_FORMATTED_INCORRECTLY                  :{WHITE}Soubor J
 STR_TOWN_DATA_ERROR_TOWN_FORMATTED_INCORRECTLY                  :{WHITE}{STRING} data mají nesprávný formát
 STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}{STRING} souřadnice mají nesprávný formát. Musejí být od 0 do 1 jako poměrná část celkového rozměru výškové mapy

+STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE} Nenalezeno platné místo pro {NUM} měst{P o a ""}. Místo nich byl{P a y y} vytvořen{P a y y} znač{P ka ky ky} na zamýšlen{P ém ých ých} míst{P ě ech ech}

 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavení grafických souborů
@@ -3603,6 +3663,9 @@ STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_ROAD_TYPE                  :Typ silnice
 STR_NEWGRF_INSPECT_QUERY_CAPTION                                :{WHITE}Hodnota NewGRF proměnné 60+x (šestnáctkově)

 # Sprite aligner window
+STR_SPRITE_ALIGNER_CAPTION_NO_ACTION                            :{WHITE}Zarovnávání spritu: ({STRING}:{NUM})
+STR_SPRITE_ALIGNER_CAPTION_ACTIONA                              :{WHITE}Zarovnávání spritu: Action 0xA, {COMMA} ({STRING}:{NUM})
+STR_SPRITE_ALIGNER_CAPTION_ACTION5                              :{WHITE}Zarovnávání spritu: Action 0x5, type {HEX}, {COMMA} ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Další sprite
 STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Jít na další normální sprite (s grafikou), přičemž se přeskakují pseudo-/barvící/znakové sprity a při dosažení konce se jde zase na začátek
 STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Jít na sprite
@@ -3745,9 +3808,15 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Vystřed
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Místní správa
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Ukázat informace o místní správě
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Přejmenovat město
+STR_TOWN_VIEW_CARGO_GRAPH                                       :Graf nákladu
+STR_TOWN_VIEW_CARGO_GRAPH_TOOLTIP                               :Zobraz graf historie nákladu města

 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Rozšířit
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Zvetšit velikost města
+STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Rozšířit budovy
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Rozšířit budovy města
+STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Rozšířit silnice
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Rozšířít silnice města
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Smaž
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Smazat celé toto město

@@ -3921,12 +3990,14 @@ STR_CARGO_RATING_EXCELLENT                                      :Vynikající
 STR_CARGO_RATING_OUTSTANDING                                    :Úžasné

 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Vystředit pohled na stanici. Ctrl+Klik otevře nový pohled na umístění stanice
+STR_STATION_VIEW_EDIT_TOOLTIP                                   :{BLACK}Přejmenovat stanici nebo přesunout značku

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Zobrazit všechny vlaky, které mají tuto stanici v jízdním řádu
 STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Zobrazit všechna silniční vozidla, která mají tuto stanici v jízdním řádu
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Zobrazit všechna letadla, která mají tuto stanici v jízdním řádu
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Zobrazit všechny lodě, které mají tuto stanici v jízdním řádu

+STR_STATION_VIEW_EDIT_STATION_SIGN                              :{WHITE}Změnit značku stanice

 STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}Uzavřít letiště
 STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Zabránit letadlu od přistání na tomto letišti
@@ -3934,9 +4005,11 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Zabráni
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Zaměřit hlavní pohled na umístění bodu na trase. Při stisknutí Ctrl+Klik otevřete nové okno na umístění bodu na trase
+STR_WAYPOINT_VIEW_EDIT_TOOLTIP                                  :{BLACK}Přejmenovat směřování nebo přesunout značku
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Vystředit pohled na bójku. Ctrl+Klik otevře nové okno náhledu
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Přejmenovat bójku

+STR_WAYPOINT_VIEW_EDIT_WAYPOINT_SIGN                            :{WHITE}Upravit značku směřování

 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}Finance - {COMPANY} {BLACK}{COMPANY_NUM}
@@ -3988,6 +4061,7 @@ STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENT_NAME}{}{GOLD}(Prezident)

 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Založeno: {WHITE}{NUM}
+STR_COMPANY_VIEW_INAUGURATED_TITLE_WALLCLOCK                    :{GOLD}Inaugurován: {WHITE}{NUM} (period {NUM})
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Barevné schéma:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vozidla:
 STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vlak{P "" y ů}
@@ -4068,6 +4142,8 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Produkce
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE                  :{BLACK}Produkce v minulé minutě:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% přepraveno)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Vystředit pohled na průmysl. Ctrl+Klik otevře nový pohled na umístění průmyslu
+STR_INDUSTRY_VIEW_CARGO_GRAPH                                   :{BLACK}graf nákladu
+STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP                           :{BLACK}Zobraz graf historie nákladu průmyslu
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Produkce: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}Průmysl oznámila blížící se uzavření!

@@ -4197,7 +4273,7 @@ STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {G
 STR_PURCHASE_INFO_COST_REFIT_SPEED                              :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} (Cena přestavby: {GOLD}{CURRENCY_LONG}{BLACK}) Rychlost: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Poháněné vagony: {GOLD}+{POWER}{BLACK} Hmotnost: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Refitovatelné na: {GOLD}{STRING}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Lze přestavět na: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Všechny druhy nákladu
 STR_PURCHASE_INFO_NONE                                          :Žádné
 STR_PURCHASE_INFO_ENGINES_ONLY                                  :Pouze lokomotivy
@@ -4205,6 +4281,7 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Všechny kromě
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. tažná síla: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Dosah: {GOLD}{COMMA} polí
 STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}Typ letadla: {GOLD}{STRING}
+STR_PURCHASE_INFO_RAILTYPES                                     :{BLACK}Druhy kolejí: {GOLD}{STRING}

 ###length 3
 STR_CARGO_TYPE_FILTER_ALL                                       :Všechny druhy nákladu
@@ -4391,6 +4468,7 @@ STR_ENGINE_PREVIEW_RUNCOST_YEAR                                 :Provozní nákl
 STR_ENGINE_PREVIEW_RUNCOST_PERIOD                               :Provozní náklady: {CURRENCY_LONG}/období
 STR_ENGINE_PREVIEW_CAPACITY                                     :Kapacita: {CARGO_LONG}
 STR_ENGINE_PREVIEW_CAPACITY_2                                   :Kapacita: {CARGO_LONG}, {CARGO_LONG}
+STR_ENGINE_PREVIEW_RAILTYPES                                    :Typ kolejí: {STRING}

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vyměňování {STRING} - {STRING}
@@ -4809,6 +4887,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Jízdní
 STR_TIMETABLE_NO_TRAVEL                                         :Nikam nejet
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Jet do (automatický; jizdní řád podle následujícího ručního příkazu)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Jet do (mimo jízdní řád)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Jet (mimo jízdní řád) maximální rychlostí {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR                                        :Jet do {STRING}
 STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Jeď {STRING} a maximálně {VELOCITY}
 STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Jeď ({STRING}, mimo jízdní řád)
@@ -4816,7 +4895,7 @@ STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Jeď ({STRING},
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :(zůstaň {STRING}, mimo jízdní řád)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(jet {STRING}, mimo jízdní řád)
 STR_TIMETABLE_STAY_FOR                                          :a zůstat {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :a jet {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}a cestovat do {STRING}

 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Tento jízdní řád bude trvat {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Tento jízdní řád bude trvat nejméně {STRING} (vozidla mimo jízdní řád)
@@ -5043,6 +5122,7 @@ STR_ERROR_FLAT_LAND_REQUIRED                                    :{WHITE}Je potř
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Země skloněna nesprávným směrem
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Tohle nelze provést...
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Budova musí být nejprve zničena
+STR_ERROR_BUILDING_IS_PROTECTED                                 :{WHITE}... budova je chráněná
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Nelze vyčistit tuto oblast...
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... nepoužitelné místo
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... již vystavěno
@@ -5143,6 +5223,7 @@ STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Příli
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Příliš blízko k jinému doku
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Příliš blízko k jinému letišti
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Nelze přejmenovat stanici...
+STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}Nelze posunout značku stanice
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... silnice vlastněná obcí
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... silnice je otočena jiným směrem
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... průjezdné zastávky nemohou být v zatáčce
@@ -5174,6 +5255,7 @@ STR_ERROR_CAN_T_BUILD_RAIL_WAYPOINT                             :{WHITE}Zde nelz
 STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT                             :{WHITE}Zde nelze postavit směrování...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Zde nelze umístit bójku...
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nelze přejmenovat směrování...
+STR_ERROR_CAN_T_MOVE_WAYPOINT_NAME                              :{WHITE}Nelze posunout značku směřování...

 STR_ERROR_CAN_T_REMOVE_RAIL_WAYPOINT                            :{WHITE}Zde nelze zbourat směrování...
 STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}Zde nelze odstranit směrovaní...
@@ -5282,6 +5364,13 @@ STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Začáte
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... oba konce mostu musí být na zemi
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... most je příliš dlouhý
 STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}Most by končil mimo mapu
+STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}Most je o {HEIGHT} moc nízko pro stanici
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}Most je o {HEIGHT} moc nízký pro konec silnice
+STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}Most je o {HEIGHT} moc nízko pro přístav
+STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE}Most s výškou {HEIGHT} moc nízko pro bójku
+STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}Most je o {HEIGHT} moc nízko pro směřování
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}Most je o {HEIGHT} moc nízko pro směřování
+STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :{WHITE}Most je o {HEIGHT} moc nízko pro zdymadlo

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Zde nelze postavit tunel...
@@ -5381,6 +5470,9 @@ STR_ERROR_CAN_T_SELL_ALL_SHIP                                   :{WHITE}Nelze pr
 STR_ERROR_CAN_T_SELL_ALL_AIRCRAFT                               :{WHITE}Nelze prodat všechna letadla...

 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}Nelze automaticky vyměnit vlaky...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}Nelze automaticky vyměnit silniční vozidla...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}Nelze automaticky vyměnit lodě...
 STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}Nepodařilo se provést automatickou náhradu letadla...

 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Příliš mnoho vozidel ve hře
@@ -6016,7 +6108,9 @@ STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STR
 STR_SAVEGAME_NAME_SPECTATOR                                     :Pozorovatel, {1:STRING}

 # Viewport strings
-STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN_POP                                           :{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN_CITY                                          :{TOWN} {CITY_ICON}
+STR_VIEWPORT_TOWN_CITY_POP                                      :{TOWN} ({COMMA}) {CITY_ICON}
 STR_VIEWPORT_STATION                                            :{STATION} {STATION_FEATURES}

 # Simple strings to get specific types of data
@@ -6038,8 +6132,11 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}

 STR_CURRENCY_SHORT_KILO                                         :{NBSP}k
 STR_CURRENCY_SHORT_MEGA                                         :{NBSP}m
+STR_CURRENCY_SHORT_GIGA                                         :{NBSP}mld
+STR_CURRENCY_SHORT_TERA                                         :{NBSP}bilion

 STR_JUST_CARGO                                                  :{CARGO_LONG}
+STR_JUST_LEFT_ARROW                                             :{LEFT_ARROW}
 STR_JUST_RIGHT_ARROW                                            :{RIGHT_ARROW}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
@@ -6079,3 +6176,11 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})

 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Otevřít nastavení odznaků
+STR_BADGE_CONFIG_RESET                                          :Obnovit
+STR_BADGE_CONFIG_ICONS                                          :{WHITE}Ikony odznaků
+STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtr odznaků
+STR_BADGE_CONFIG_PREVIEW                                        :Náhled obrázku
+STR_BADGE_CONFIG_NAME                                           :Jméno
+STR_BADGE_FILTER_ANY_LABEL                                      :{G 0 Jakýkoliv Jakákoliv Jakékoliv Jacíkoliv Jakékoliv Jakékoliv Jakékoliv} {STRING}
+STR_BADGE_FILTER_IS_LABEL                                       :{STRING} je {STRING}
@@ -254,6 +254,7 @@ STR_UNITS_FORCE_SI                                              :{DECIMAL} kN
 STR_UNITS_HEIGHT_IMPERIAL                                       :{DECIMAL} fod
 STR_UNITS_HEIGHT_METRIC                                         :{DECIMAL} m
 STR_UNITS_HEIGHT_SI                                             :{DECIMAL} m
+STR_UNITS_HEIGHT_GAMEUNITS                                      :{DECIMAL}{NBSP}level{P "" s}

 # Time units used in string control characters
 STR_UNITS_DAYS                                                  :{COMMA}{NBSP}dag{P "" s}
@@ -311,6 +312,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Ved at a
 STR_BUTTON_DEFAULT                                              :{BLACK}Standard
 STR_BUTTON_CANCEL                                               :{BLACK}Annullér
 STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_MOVE                                                 :{BLACK}Flyt

 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-= qwertyuiop[]asdfghjkl;'#\zxcvbnm,./ .
@@ -2162,6 +2164,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Når højde er
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperisk (fod)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrisk (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_GAMEUNITS          :Spillenheder (levels)

 STR_CONFIG_SETTING_LOCALISATION                                 :Lokalisering
 STR_CONFIG_SETTING_GRAPHICS                                     :Grafiksæt / Manglende grafik
@@ -2859,15 +2862,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Vælg en byzone
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Vælg en hustype at bygge. Ctrl+klik for at tilføje eller fjerne i gemte elementer

 STR_HOUSE_PICKER_CAPTION                                        :Husvalg
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Navn: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Befolkning: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}År: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}År: {ORANGE}Any
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}År: {ORANGE}Fra {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}År: {ORANGE}til {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Størrelse: {ORANGE}{NUM}x{NUM} fliser
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Gods accepteret: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Produceret last: {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Navn: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Befolkning: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}År: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}År: {GOLD}Any
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}År: {GOLD}From {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}År: {GOLD}til {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Størrelse: {GOLD}{NUM}x{NUM} fliser
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Last accepteret: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Produceret last: {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Kant
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Udkant
@@ -2875,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Ydre Forstæder
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Indre Forstæder
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Bymidte

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Forhindre opgraderinger
+STR_HOUSE_PICKER_PROTECT                                        :Forhindre opgraderinger
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Vælg om dette hus skal beskyttes mod udskiftning i takt med at byen vokser
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Slukket
-STR_HOUSE_PICKER_PROTECT_ON                                     :tændt
+
+STR_HOUSE_PICKER_REPLACE                                        :Erstat eksisterende
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Vælg om et eksisterende hus automatisk skal fjernes på den flise, hvor dette hus er placeret

 STR_STATION_CLASS_DFLT                                          :Standard station
 STR_STATION_CLASS_DFLT_STATION                                  :Standard station
@@ -3425,6 +3429,10 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordvest
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordøst
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sydøst
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sydvest
+STR_MAPGEN_NORTHWEST_TOOLTIP                                    :Skift mellem vand- eller friformskant på den nordvestlige kortkant
+STR_MAPGEN_NORTHEAST_TOOLTIP                                    :Skift mellem vand- eller friformskant på den nordøstlige kortkant
+STR_MAPGEN_SOUTHEAST_TOOLTIP                                    :Skift mellem vand- eller friformskant på den sydøstlige kortkant
+STR_MAPGEN_SOUTHWEST_TOOLTIP                                    :Skift mellem vand- eller friformskant på den sydvestlige kortkant
 STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Fri udformning
 STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vand
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Tilfældige
@@ -3471,6 +3479,8 @@ STR_GENERATION_LANDSCAPE_GENERATION                             :{BLACK}Landskab
 STR_GENERATION_RIVER_GENERATION                                 :{BLACK}Flod-generering
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generer råt og stenet område
 STR_GENERATION_TOWN_GENERATION                                  :{BLACK}By generation
+STR_GENERATION_LAND_INDUSTRY_GENERATION                         :{BLACK}Generering af jordindustrien
+STR_GENERATION_WATER_INDUSTRY_GENERATION                        :{BLACK}Generering af vandindustrien
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Ikke-flytbar generering
 STR_GENERATION_TREE_GENERATION                                  :{BLACK}Trægenerering
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Klargør spil
@@ -3679,7 +3689,7 @@ STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Match st
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Vis matchende stort/lille bogstav når der sammenlignes skiltenavne med filter teksten

 # Sign window
-STR_EDIT_SIGN_CAPTION                                           :{WHITE}Ændre skiltets tekst
+STR_EDIT_SIGN_CAPTION                                           :{WHITE}Rediger skilt
 STR_EDIT_SIGN_LOCATION_TOOLTIP                                  :{BLACK}Centrér skærmen ved skiltets placering. Ctrl+klik åbner et nyt vindue ved skiltets placering
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Gå til næste skilt
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Gå til forrige skilt
@@ -3896,12 +3906,14 @@ STR_CARGO_RATING_EXCELLENT                                      :Fortrinlig
 STR_CARGO_RATING_OUTSTANDING                                    :Enestående

 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrer skærmen over stationens lokalitet. Ctrl+Klik åbner et nyt vindue ved stationens lokalitet.
+STR_STATION_VIEW_EDIT_TOOLTIP                                   :{BLACK}Omdøb station eller flyt skilt

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Vis alle toge, som har denne station i deres ruteplan
 STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Vis alle køretøjer, som har denne station i deres ruteplan
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Vis alle fly, som har denne lufthavn i deres ruteplan
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Vis alle skibe, som har denne station i deres ruteplan

+STR_STATION_VIEW_EDIT_STATION_SIGN                              :{WHITE}Rediger stationsskilt

 STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}Luk lufthavn
 STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Forhindre at fly lander i denne lufthavn
@@ -3909,9 +3921,11 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Forhindr
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrer skærmen over rutepunktets lokalitet. Ctrl+Klik åbner et nyt vindue ved rutepunktets lokalitet.
+STR_WAYPOINT_VIEW_EDIT_TOOLTIP                                  :{BLACK}Omdøb rutepunkt eller flyt skilt
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrér skærmen ved bøjens placering. Ctrl+klik åbner et nyt vindue ved bøjens placering
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Ændr navnet på bøjen

+STR_WAYPOINT_VIEW_EDIT_WAYPOINT_SIGN                            :{WHITE}Rediger rutepunkt skilt

 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finanser {BLACK}{COMPANY_NUM}
@@ -5125,6 +5139,7 @@ STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}For mang
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}For tæt på en anden havn
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}For tæt på en anden lufthavn
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan ikke omdøbe stationen...
+STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}Kan ikke flytte stationsskiltet...
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... denne vej er ejet af en by
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... vejen peger i den forkerte retning
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... drive-through stops kan ikke have hjørner
@@ -5156,6 +5171,7 @@ STR_ERROR_CAN_T_BUILD_RAIL_WAYPOINT                             :{WHITE}Kan ikke
 STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT                             :{WHITE}Kan ikke bygge rutepunkt her...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan ikke placere en bøje her...
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan ikke omdøbe rutepunkt...
+STR_ERROR_CAN_T_MOVE_WAYPOINT_NAME                              :{WHITE}Kan ikke flytte rutepunkt skiltet...

 STR_ERROR_CAN_T_REMOVE_RAIL_WAYPOINT                            :{WHITE}Kan ikke fjerne rutepunkt for tog her...
 STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}Kan ikke fjerne rutepunkt...
@@ -5264,6 +5280,13 @@ STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start- o
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... begge ender af en bro skal være på land
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... broen er for lang
 STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}Broen ville slutte udenfor kortet
+STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}Broen er {HEIGHT} for lav til en station
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}Broen er {HEIGHT} for lav til et vej stoppested
+STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}Broen er {HEIGHT} for lav til havnen
+STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE} Broen er {HEIGHT}  for lav til en bøje
+STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}Broen er  {HEIGHT} for lav til et rutepunkt
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}Broen er {HEIGHT} for lav til et rutepunkt
+STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :{WHITE}Bro er {HEIGHT} for lav til slusen

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan ikke bygge en tunnel her...
@@ -222,7 +222,7 @@ STR_UNITS_POWER_METRIC                                          :{DECIMAL}{NBSP}
 STR_UNITS_POWER_SI                                              :{DECIMAL}{NBSP}kW

 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL                     :{DECIMAL}{NBSP}pk/t
-STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC                       :{DECIMAL}{NBSP}hp/t
+STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC                       :{DECIMAL}{NBSP}pk/t
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_SI                           :{DECIMAL}{NBSP}pk/Mg
 STR_UNITS_POWER_METRIC_TO_WEIGHT_IMPERIAL                       :{DECIMAL}{NBSP}pk/t
 STR_UNITS_POWER_METRIC_TO_WEIGHT_METRIC                         :{DECIMAL}{NBSP}pk/t
@@ -312,6 +312,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Wanneer
 STR_BUTTON_DEFAULT                                              :{BLACK}Standaard
 STR_BUTTON_CANCEL                                               :{BLACK}Annuleren
 STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_MOVE                                                 :{BLACK}Verplaatsen

 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-= qwertyuiop[]asdfghjkl;'#\zxcvbnm,./ .
@@ -386,7 +387,7 @@ STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Hiermee
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Hiermee verhoog je de spelsnelheid
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opties en instellingen
 STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Spel opslaan, laden of stoppen, afsluiten
-STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Kaart, extra kijkvenster, vrachtstroom of lijst met bordjes openen
+STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Kaart, extra kijkvenster, vrachtstroom of lijst met borden openen
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Stedenlijst openen of stad stichten
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Subsidies openen
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS            :{BLACK}Lijst met stations van het bedrijf openen
@@ -408,7 +409,7 @@ STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Wegen bo
 STR_TOOLBAR_TOOLTIP_BUILD_TRAMWAYS                              :{BLACK}Tramsporen bouwen
 STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Dokken en havens bouwen
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Vliegvelden bouwen
-STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Landschapsmenu of bomenmenu openen of bordjes plaatsen
+STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Landschapsmenu of bomenmenu openen of borden plaatsen
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Geluid-/muziekvenster openen
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Laatste (nieuws-)bericht openen, berichtengeschiedenis of alle berichten verwijderen
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Landinformatie, schermfotomenu, OpenTTD-medewerkerlijst en ontwikkelaarshulpmiddelen openen
@@ -421,7 +422,7 @@ STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Scenari
 STR_SCENEDIT_TOOLBAR_MOVE_THE_STARTING_DATE_BACKWARD_TOOLTIP    :{BLACK}Startdatum 1 jaar terugzetten
 STR_SCENEDIT_TOOLBAR_MOVE_THE_STARTING_DATE_FORWARD_TOOLTIP     :{BLACK}Startdatum 1 jaar vooruitzetten
 STR_SCENEDIT_TOOLBAR_SET_DATE_TOOLTIP                           :{BLACK}Klik om het startjaar op te geven
-STR_SCENEDIT_TOOLBAR_DISPLAY_MAP_TOWN_DIRECTORY_TOOLTIP         :{BLACK}Kaart, extra venster, lijst met bordjes, stedenlijst of lijst met industrieën openen
+STR_SCENEDIT_TOOLBAR_DISPLAY_MAP_TOWN_DIRECTORY_TOOLTIP         :{BLACK}Kaart, extra venster, lijst met borden, stedenlijst of lijst met industrieën openen
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION_TOOLTIP               :{BLACK}Menu Landschapsontwikkeling openen of nieuwe wereld genereren
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION_TOOLTIP                    :{BLACK}Steden bouwen of genereren
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION_TOOLTIP                :{BLACK}Industrieën bouwen of genereren
@@ -460,12 +461,12 @@ STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Dokken
 STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Vliegvelden
 STR_SETTINGS_MENU_STATION_NAMES_GHOST                           :Spook
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Namen van routepunten weergeven
-STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Bordjes weergeven
-STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Bordjes en namen van tegenstanders weergeven
+STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Borden weergeven
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Borden en namen van tegenstanders weergeven
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Alle animaties
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Alle details
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Transparante gebouwen
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparante bordjes
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparante borden

 # File menu
 STR_FILE_MENU_SAVE_GAME                                         :Spel opslaan
@@ -477,7 +478,7 @@ STR_FILE_MENU_EXIT                                              :Afsluiten
 STR_MAP_MENU_MAP_OF_WORLD                                       :Wereldkaart
 STR_MAP_MENU_EXTRA_VIEWPORT                                     :Extra kijkvenster
 STR_MAP_MENU_LINGRAPH_LEGEND                                    :Legenda vrachtstroom
-STR_MAP_MENU_SIGN_LIST                                          :Bordjeslijst
+STR_MAP_MENU_SIGN_LIST                                          :Lijst van borden

 # Town menu
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :Stedenlijst
@@ -2122,7 +2123,7 @@ STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT               :Vaak zijn er me
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY                  :Snelheidseenheden (land): {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_NAUTICAL         :Snelheidseenheden (nautisch): {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Wanneer een snelheid wordt weergegeven in het gebruikersscherm, gebruik dan de geselecteerde eenheden
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Imperiaal (mph)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Angelsaksisch (mph)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :Metrisch (km/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :SI (m/s)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS_DAYS   :Speleenheden (tegels/dag)
@@ -2132,35 +2133,35 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_KNOTS            :Knopen
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Voertuigkrachteenheden: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Als het verbruik van een voertuig wordt weergegeven in het gebruikersscherm, gebruik dan de geselecteerde eenheden
 ###length 3
-STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL            :Imperiaal (hp)
-STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Metrisch (hp)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL            :Angelsaksisch (pk)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Metrisch (pk)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_SI                  :SI (kW)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT                    :Gewichtseenheden: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_HELPTEXT           :Wanneer gewichten worden weergegeven in het gebruikersscherm, gebruik dan de geselecteerde eenheden
 ###length 3
-STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL           :Imperiaal (short t/ton)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL           :Angelsaksisch (short t/ton)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_METRIC             :Metrisch (t/ton)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_SI                 :SI (kg)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME                    :Volume-eenheden: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :Wanneer volumes worden weergeven in het gebruikersscherm, gebruik dan de geselecteerde eenheden
 ###length 3
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :Imperiaal (gal)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :Angelsaksisch (gal)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_METRIC             :Metrisch (l)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI                 :SI (m³)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE                     :Trekkrachteenheden: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_HELPTEXT            :Wanneer trekkracht wordt weergegeven in het gebruikersscherm, weergeven in de geselecteerde eenheden
 ###length 3
-STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL            :Imperiaal (lbf)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_IMPERIAL            :Angelsaksisch (lbf)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_METRIC              :Metrisch (kgf)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_SI                  :SI (kN)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT                    :Hoogte-eenheden: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Wanneer hoogtes worden weergegeven in het gebruikersscherm, gebruik dan de geselecteerde eenheden
 ###length 4
-STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperiaal (ft)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Angelsaksisch (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrisch (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_GAMEUNITS          :Speleenheden (niveaus)
@@ -2861,15 +2862,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Selecteer een s
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Selecteer een type huizen om te bouwen. Ctrl+klik om toe te voegen aan of te verwijderen uit opgeslagen onderdelen

 STR_HOUSE_PICKER_CAPTION                                        :Huizen selecteren
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Naam: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Bevolking: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}Jaar: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Jaar: {ORANGE}Willekeurig
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Jaar: {ORANGE}Vanaf {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Jaar: {ORANGE}Tot en met {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Grootte: {ORANGE}{NUM}x{NUM} tegels
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Geaccepteerde vracht: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Geproduceerde vracht: {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Naam: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Bevolking: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Jaar: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Jaar: {GOLD}Willekeurig
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Jaar: {GOLD}Vanaf {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Jaar: {GOLD}Tot en met {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Grootte: {GOLD}{NUM}x{NUM} tegels
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Geaccepteerde vracht: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Geproduceerde vracht: {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Rand
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Buitenwijken
@@ -2877,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Buitenste voors
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Binnenste voorsteden
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Stadscentrum

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Opwaarderen voorkomen
+STR_HOUSE_PICKER_PROTECT                                        :Opwaarderen voorkomen
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Kies of dit huis wordt beschermd tegen vervangen als de stad groeit
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Uit
-STR_HOUSE_PICKER_PROTECT_ON                                     :Aan
+
+STR_HOUSE_PICKER_REPLACE                                        :Bestaande vervangen
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Kies of je een bestaand huis op de tegel automatisch wilt verwijderen waar je dit huis plaatst

 STR_STATION_CLASS_DFLT                                          :Standaard
 STR_STATION_CLASS_DFLT_STATION                                  :Standaard station
@@ -3427,6 +3429,10 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Noordwes
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Noordoost
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Zuidoost
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Zuidwest
+STR_MAPGEN_NORTHWEST_TOOLTIP                                    :Schakelen tussen water of vrij gevormde rand aan noord-westrand
+STR_MAPGEN_NORTHEAST_TOOLTIP                                    :Schakelen tussen water of vrij gevormde rand aan noord-oostrand
+STR_MAPGEN_SOUTHEAST_TOOLTIP                                    :Schakelen tussen water of vrij gevormde rand aan zuid-oostrand
+STR_MAPGEN_SOUTHWEST_TOOLTIP                                    :Schakelen tussen water of vrij gevormde rand aan zuid-westrand
 STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Vrije vorm
 STR_MAPGEN_BORDER_WATER                                         :{BLACK}Water
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Willekeurig
@@ -3487,7 +3493,7 @@ STR_TOWN_DATA_ERROR_JSON_FORMATTED_INCORRECTLY                  :{WHITE}JSON-bes
 STR_TOWN_DATA_ERROR_TOWN_FORMATTED_INCORRECTLY                  :{WHITE}{STRING} gegevens met onjuiste indeling
 STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}{STRING} coördinaten met onjuiste indeling, moeten tussen 0 en 1 liggen als verhouding tot de totale afmeting van de hoogtekaart

-STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}Kon geen geldige locatie vinden voor het stichten van {NUM} st{P ad eden}. {P "een " ""}bordje{P "" s} geplaatst op de bedoelde locatie{P "" s}.
+STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}Kon geen geldige locatie vinden voor het stichten van {NUM} st{P ad eden}. {P "een " ""}bord{P "" en} geplaatst op de bedoelde locatie{P "" s}.

 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF-instellingen
@@ -3678,12 +3684,12 @@ STR_NEWGRF_SCAN_MESSAGE                                         :{BLACK}NewGRF's
 STR_NEWGRF_SCAN_STATUS                                          :{BLACK}{NUM} NewGRF{P "" s} gescand van een geschatte {NUM} NewGRF{P "" s}

 # Sign list window
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordjeslijst - {COMMA} bordje{P "" s}
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Lijst met borden - {COMMA} bord{P "" en}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Hoofdlettergevoelig
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Schakel hoofdlettergevoeligheid in bij het vergelijken van bordnamen met de filtertekst

 # Sign window
-STR_EDIT_SIGN_CAPTION                                           :{WHITE}Wijzig tekst van bord
+STR_EDIT_SIGN_CAPTION                                           :{WHITE}Bord bewerken
 STR_EDIT_SIGN_LOCATION_TOOLTIP                                  :{BLACK}Centreer het hoofdscherm op de locatie van het sein. Ctrl+klik opent een nieuw venster op de locatie van het sein.
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ga naar volgende bord
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ga naar vorige bord
@@ -3900,12 +3906,14 @@ STR_CARGO_RATING_EXCELLENT                                      :Uitstekend
 STR_CARGO_RATING_OUTSTANDING                                    :Voortreffelijk

 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centreer het hoofdscherm op de locatie van het station. Ctrl+klik opent een nieuw venster op de locatie van het station
+STR_STATION_VIEW_EDIT_TOOLTIP                                   :{BLACK}Station hernoemen of bord verplaatsen

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
 STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Geef alle wegvoertuigen weer die dit station in hun opdrachtenlijst hebben
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Geef alle vliegtuigen weer die dit station in hun opdrachtenlijst hebben
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben

+STR_STATION_VIEW_EDIT_STATION_SIGN                              :{WHITE}Stationsbord bewerken

 STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}Luchthaven sluiten
 STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Voorkom landen van vliegtuig op deze luchthaven
@@ -3913,9 +3921,11 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Voorkom
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centreer het hoofdscherm op het routepunt. Ctrl+klik opent nieuw venster op locatie van routepunt.
+STR_WAYPOINT_VIEW_EDIT_TOOLTIP                                  :{BLACK}Routepunt hernoemen of bord verplaatsen
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centreer het hoofdscherm op de locatie van de boei. Ctrl+klik opent een nieuw venster op de locatie van de boei.
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Naam van boei aanpassen

+STR_WAYPOINT_VIEW_EDIT_WAYPOINT_SIGN                            :{WHITE}Routepuntbord bewerken

 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Financiën {BLACK}{COMPANY_NUM}
@@ -5129,6 +5139,7 @@ STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te veel
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Te dicht bij een andere haven
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Te dicht bij een ander vliegveld
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan stationsnaam niet veranderen...
+STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}Kan stationsbord niet verplaatsen...
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... weg in eigendom van een stad
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... weg is in de verkeerde richting
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... doorrij haltes kunnen geen bochten hebben
@@ -5160,6 +5171,7 @@ STR_ERROR_CAN_T_BUILD_RAIL_WAYPOINT                             :{WHITE}Kan hier
 STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT                             :{WHITE}Kan hier geen weg-routepunt bouwen...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan boei hier niet plaatsen...
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan naam routepunt niet aanpassen...
+STR_ERROR_CAN_T_MOVE_WAYPOINT_NAME                              :{WHITE}Kan routepuntbord niet verplaatsen...

 STR_ERROR_CAN_T_REMOVE_RAIL_WAYPOINT                            :{WHITE}Kan hier geen routepunt verwijderen...
 STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}Kan hier geen weg-routepunt verwijderen...
@@ -5442,10 +5454,10 @@ STR_ERROR_TIMETABLE_INCOMPLETE                                  :{WHITE}... dien
 STR_ERROR_TIMETABLE_NOT_STARTED                                 :{WHITE}... dienstregeling is nog niet gestart

 # Sign related errors
-STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... te veel bordjes
-STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan hier geen bordje plaatsen
-STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan de naam van het bordje niet wijzigen
-STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan bordje niet verwijderen...
+STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... te veel borden
+STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan hier geen bord plaatsen
+STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan naam van bord niet wijzigen
+STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan bord niet verwijderen...

 # Translatable comment for OpenTTD's desktop shortcut
 ###external 1
@@ -1090,8 +1090,6 @@ STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Check this box

 STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Use traditional sprite font
 STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Check this box if you prefer to use the traditional fixed-size sprite font
-STR_GAME_OPTIONS_GUI_FONT_DEFAULT                               :Prefer default font
-STR_GAME_OPTIONS_GUI_FONT_DEFAULT_TOOLTIP                       :Check this box if you prefer to use the default font over discovered fallback fonts
 STR_GAME_OPTIONS_GUI_FONT_AA                                    :Anti-alias fonts
 STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :Check this box to anti-alias resizable fonts

@@ -1250,7 +1248,7 @@ STR_CONFIG_SETTING_EXPAND_ALL                                   :Expand all
 STR_CONFIG_SETTING_COLLAPSE_ALL                                 :Collapse all
 STR_CONFIG_SETTING_RESET_ALL                                    :Reset all values
 STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT            :(no explanation available)
-STR_CONFIG_SETTING_VALUE                                        :{PUSH_COLOUR}{ORANGE}{STRING1}{POP_COLOUR}
+STR_CONFIG_SETTING_VALUE                                        :{ORANGE}{STRING1}
 STR_CONFIG_SETTING_DEFAULT_VALUE                                :{LTBLUE}Default value: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_TYPE                                         :{LTBLUE}Setting type: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TYPE_CLIENT                                  :Client setting (not stored in saves; affects all games)
@@ -3658,17 +3656,17 @@ STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Found c
 STR_NEWGRF_LIST_MISSING                                         :{RED}Missing files

 # NewGRF 'it's broken' warnings
-STR_NEWGRF_BROKEN                                               :{WHITE}Behaviour of NewGRF '{PUSH_COLOUR}{0:RAW_STRING}{POP_COLOUR}' is likely to cause desyncs and/or crashes
-STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}It changed powered-wagon state for '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' when not inside a depot
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It changed vehicle length for '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' when not inside a depot
-STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}It changed vehicle capacity for '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' when not inside a depot or refitting
+STR_NEWGRF_BROKEN                                               :{WHITE}Behaviour of NewGRF '{0:RAW_STRING}' is likely to cause desyncs and/or crashes
+STR_NEWGRF_BROKEN_POWERED_WAGON                                 :{WHITE}It changed powered-wagon state for '{1:ENGINE}' when not inside a depot
+STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It changed vehicle length for '{1:ENGINE}' when not inside a depot
+STR_NEWGRF_BROKEN_CAPACITY                                      :{WHITE}It changed vehicle capacity for '{1:ENGINE}' when not inside a depot or refitting
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Train '{VEHICLE}' belonging to '{COMPANY}' has invalid length. It is probably caused by problems with NewGRFs. Game may desync or crash

-STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{PUSH_COLOUR}{0:RAW_STRING}{POP_COLOUR}' provides incorrect information
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit information for '{PUSH_COLOUR}{1:ENGINE}{POP_COLOUR}' differs from purchase list after construction. This might cause autorenew/-replace to fail refitting correctly
-STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' caused an endless loop in the production callback
+STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:RAW_STRING}' provides incorrect information
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit information for '{1:ENGINE}' differs from purchase list after construction. This might cause autorenew/-replace to fail refitting correctly
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' caused an endless loop in the production callback
 STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Callback {1:HEX} returned unknown/invalid result {2:HEX}
-STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{PUSH_COLOUR}{1:STRING}{POP_COLOUR}' returned invalid cargo type in the production callback at {2:HEX}
+STR_NEWGRF_BUGGY_INVALID_CARGO_PRODUCTION_CALLBACK              :{WHITE}'{1:STRING}' returned invalid cargo type in the production callback at {2:HEX}

 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<invalid cargo>
@@ -2878,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Outer Suburbs
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Inner Suburbs
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Town centre

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Prevent upgrades
+STR_HOUSE_PICKER_PROTECT                                        :Prevent upgrades
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Choose whether this house will be protected from replacement as the town grows
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Off
-STR_HOUSE_PICKER_PROTECT_ON                                     :On
+
+STR_HOUSE_PICKER_REPLACE                                        :Replace existing
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Choose whether to automatically remove an existing house on the tile where this house is placed

 STR_STATION_CLASS_DFLT                                          :Default
 STR_STATION_CLASS_DFLT_STATION                                  :Default station
@@ -2878,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Outer Suburbs
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Inner Suburbs
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Town center

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Prevent upgrades
+STR_HOUSE_PICKER_PROTECT                                        :Prevent upgrades
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Choose whether this house will be protected from replacement as the town grows
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Off
-STR_HOUSE_PICKER_PROTECT_ON                                     :On
+
+STR_HOUSE_PICKER_REPLACE                                        :Replace existing
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Choose whether to automatically remove an existing house on the tile where this house is placed

 STR_STATION_CLASS_DFLT                                          :Default
 STR_STATION_CLASS_DFLT_STATION                                  :Default station
@@ -2742,6 +2742,7 @@ STR_HOUSE_PICKER_CLASS_ZONE2                                    :Periferioj
 STR_HOUSE_PICKER_CLASS_ZONE3                                    :Eksteraj Antaŭurboj


+
 STR_STATION_CLASS_DFLT                                          :Defaŭlta
 STR_STATION_CLASS_DFLT_STATION                                  :Defaŭlta stacio
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Defaŭlta vojhaltejo
@@ -2847,6 +2847,7 @@ STR_HOUSE_PICKER_CLASS_ZONE4                                    :Eeslinnad
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Kesklinn


+
 STR_STATION_CLASS_DFLT                                          :Vaikimisi
 STR_STATION_CLASS_DFLT_STATION                                  :Vaikimisi jaam
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Vaikimisi peatus
@@ -2163,6 +2163,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bygg ein



+
 STR_STATION_CLASS_DFLT                                          :Vanlig støð
 STR_STATION_CLASS_WAYP                                          :Waypoint

@@ -2878,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Ulommat lähiö
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Sisemmät lähiöt
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Keskusta

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Estä uudistaminen
+STR_HOUSE_PICKER_PROTECT                                        :Estä parannukset
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Valitse, suojataanko tämä talo korvaamiselta kunnan kasvaessa
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Ei
-STR_HOUSE_PICKER_PROTECT_ON                                     :Kyllä
+
+STR_HOUSE_PICKER_REPLACE                                        :Korvaa entinen
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Valitse, poistetaanko olemassa oleva talo automaattisesti ruudulta, jolle taloa sijoitetaan

 STR_STATION_CLASS_DFLT                                          :Oletus
 STR_STATION_CLASS_DFLT_STATION                                  :Oletusasema
@@ -4638,10 +4639,10 @@ STR_ORDER_GO_VIA                                                :Mene kautta
 STR_ORDER_GO_NON_STOP_VIA                                       :Mene pysähtymättä kautta
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Muuta korostetun käskyn pysähtymiskäyttäytymistä

-STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Lastaa täyteen mikä tahansa rahtityyppi
+STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Lastaa täyteen mitä tahansa rahtia
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Lastaa jos saatavilla
 STR_ORDER_DROP_FULL_LOAD_ALL                                    :Lastaa täyteen kaikki rahtityypit
-STR_ORDER_DROP_FULL_LOAD_ANY                                    :Lastaa täyteen mikä tahansa rahtityyppi
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Lastaa täyteen mitä tahansa rahtia
 STR_ORDER_DROP_NO_LOADING                                       :Älä lastaa rahtia
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Muuta korostetun käskyn lastauskäyttäytymistä

@@ -4713,7 +4714,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Mene lähimmäl
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Mene lähimpään lentokonehalliin
 STR_ORDER_CONDITIONAL                                           :Ehdollinen hyppykäsky
 STR_ORDER_SHARE                                                 :Jaa käskyt
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Lisää uuden käskyn ennen valittua, tai lisää listan viimeiseksi. Ctrl+napsautuksella asemakäskyistä tulee ”lastaa täyteen mikä tahansa rahti”, reittipistekäskyille ”oletuksena pysähtymättä” -asetuksen vastakohta, ja veturitallikäskyistä tulee ”sumanpurku”. Napsauta toista kulkuneuvoa kopioidaksesi sen käskyt tai Ctrl+napsauta luodaksesi jaetun käskyn. Tallikäsky poistaa automaattiset huollot
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Lisää uuden käskyn ennen valittua, tai lisää listan viimeiseksi. Ctrl+napsautuksella asemakäskyistä tulee ”lastaa täyteen mitä tahansa rahtia”, reittipistekäskyillä ”oletuksena pysähtymättä” -asetuksen vastakohta, ja varikkokäskyistä tulee ”sumanpurku”. Napsauta toista kulkuneuvoa kopioidaksesi sen käskyt tai Ctrl+napsauta luodaksesi jaetun käskyn. Varikkokäsky poistaa kulkuneuvon automaattiset huollot käytöstä

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Näytä kaikki kulkuneuvot, jotka jakavat nämä käskyt

@@ -4763,7 +4764,7 @@ STR_ORDER_NO_UNLOAD_NO_LOAD                                     :{SPACE}(Ei purk

 STR_ORDER_AUTO_REFIT                                            :{SPACE}(Sovita rahdille {STRING})
 STR_ORDER_FULL_LOAD_REFIT                                       :{SPACE}(Sovita rahdille {STRING} ja lastaa täyteen)
-STR_ORDER_FULL_LOAD_ANY_REFIT                                   :{SPACE}(Sovita rahdille {STRING} ja lastaa täyteen mitä tahansa rahtia)
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :{SPACE}(Sovita rahdille {STRING} ja lastaa täyteen)
 STR_ORDER_UNLOAD_REFIT                                          :{SPACE}(Pura lasti, sovita rahdille {STRING}, ota rahti)
 STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :{SPACE}(Pura lasti, sovita rahdille {STRING}, odota täyttä lastia)
 STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :{SPACE}(Pura lasti, sovita rahdille {STRING}, odota mitä tahansa täyttä lastia)
@@ -2862,15 +2862,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Séléctionner
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Séléctionner un type de maison à construire. Ctrl+Clic pour ajouter ou retirer des éléments sauvegardés.

 STR_HOUSE_PICKER_CAPTION                                        :Séléction de maison
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Nom{NBSP}: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Population{NBSP}: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}Années{NBSP}: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Années{NBSP}: {ORANGE}Toutes
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Années{NBSP}: {ORANGE}À partir de {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Années{NBSP}: {ORANGE}Jusqu'à {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Taille{NBSP}: {ORANGE}{NUM}{NBSP}x{NBSP}{NUM} cases
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Cargaison acceptée{NBSP}: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Marchandises produites : {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Nom{NBSP}: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Population{NBSP}: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Années{NBSP}: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Années{NBSP}: {GOLD}Toutes
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Années{NBSP}: {GOLD}À partir de {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Années{NBSP}: {GOLD}Jusqu'à {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Taille{NBSP}: {GOLD}{NUM}{NBSP}x{NBSP}{NUM} cases
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Cargaison acceptée{NBSP}: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Marchandises produites : {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Bord
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Périphérie
@@ -2878,10 +2878,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Banlieue extér
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Banlieue intérieure
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centre-ville

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Empêcher les améliorations
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Définit si cette maison sera protégée contre son remplacement lors de la croissance de la ville
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Désactivé
-STR_HOUSE_PICKER_PROTECT_ON                                     :Activé
+

 STR_STATION_CLASS_DFLT                                          :Par défaut
 STR_STATION_CLASS_DFLT_STATION                                  :Stations par défaut
@@ -3684,7 +3682,7 @@ STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Respecte
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Activer ou non le respect de la casse pour la comparaison entre le texte des panneaux et l'entrée dans le filtre

 # Sign window
-STR_EDIT_SIGN_CAPTION                                           :{WHITE}Éditer le texte du panneau
+STR_EDIT_SIGN_CAPTION                                           :{WHITE}Éditer le panneau
 STR_EDIT_SIGN_LOCATION_TOOLTIP                                  :{BLACK}Centrer la vue sur le panneau. Ctrl-clic pour ouvrir une nouvelle vue sur le panneau
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Aller au panneau suivant
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Aller au panneau précédent
@@ -2264,6 +2264,7 @@ STR_STATION_BUILD_DRAG_DROP                                     :Sleepe en los l



+
 STR_STATION_CLASS_DFLT                                          :Standert stasjon
 STR_STATION_CLASS_WAYP                                          :Kontrôleposten

@@ -2565,6 +2565,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Tog stè



+
 STR_STATION_CLASS_DFLT                                          :Stèisean bunaiteach
 STR_STATION_CLASS_WAYP                                          :Puingean-turais

@@ -2879,10 +2879,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Suburbios da pe
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Suburbios interiores
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centro da vila

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Evitar melloras
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Escolle se esta casa estará protexida do remprazo a medida que a vila medra
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Desactivado
-STR_HOUSE_PICKER_PROTECT_ON                                     :Activado
+

 STR_STATION_CLASS_DFLT                                          :Por defecto
 STR_STATION_CLASS_DFLT_STATION                                  :Estación por defecto
@@ -2879,10 +2879,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Äußere Vorort
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Innere Vororte
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Stadtmitte

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Aufwertungen verhindern
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Auswählen, ob dieses Haus vor dem Ersetzen geschützt wird, wenn die Stadt wächst.
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Aus
-STR_HOUSE_PICKER_PROTECT_ON                                     :An
+

 STR_STATION_CLASS_DFLT                                          :Standard
 STR_STATION_CLASS_DFLT_STATION                                  :Standart-Haltestelle
@@ -2971,10 +2971,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Εξωτερι
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Εσωτερικά Προάστια
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Κέντρο της πόλης

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Αποτροπή αναβαθμίσεων
+STR_HOUSE_PICKER_PROTECT                                        :Αποτροπή αναβαθμίσεων
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Επιλέξτε αν αυτό το σπίτι θα προστατεύεται από αντικατάσταση καθώς η πόλη μεγαλώνει
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Ανενεργό
-STR_HOUSE_PICKER_PROTECT_ON                                     :Ενεργό
+
+STR_HOUSE_PICKER_REPLACE                                        :Αντικατάσταση υπάρχοντος
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Επιλέξτε εάν θα αφαιρεθεί αυτόματα ένα υπάρχον σπίτι στο πλακίδιο όπου τοποθετείται αυτό το σπίτι

 STR_STATION_CLASS_DFLT                                          :Προεπιλεγμένος
 STR_STATION_CLASS_DFLT_STATION                                  :Προεπιλεγμένος σταθμός
@@ -183,6 +183,7 @@ STR_LITERS                                                      :{P 0 "ליטר
 STR_ITEMS                                                       :{P 0 "פריט " ""}{COMMA}{P "" "פריטים"}
 STR_CRATES                                                      :{P 0 "ארגז " ""}{COMMA}{P "" "ארגזים"}

+STR_COLOUR_DEFAULT                                              :ברירת מחדל
 ###length 17
 STR_COLOUR_DARK_BLUE                                            :כחול כהה
 STR_COLOUR_PALE_GREEN                                           :ירוק חיוור
@@ -200,10 +201,13 @@ STR_COLOUR_ORANGE                                               :כתום
 STR_COLOUR_BROWN                                                :חום
 STR_COLOUR_GREY                                                 :אפור
 STR_COLOUR_WHITE                                                :לבן
+STR_COLOUR_RANDOM                                               :אקראי

 ###length 17
 STR_COLOUR_SECONDARY_DARK_BLUE                                  :כחול כהה
 STR_COLOUR_SECONDARY_PALE_GREEN                                 :ירוק חיוור
+STR_COLOUR_SECONDARY_SECONDARY_PINK                             :ורוד
+STR_COLOUR_SECONDARY_YELLOW                                     :צהוב
 STR_COLOUR_SECONDARY_RED                                        :אדום
 STR_COLOUR_SECONDARY_LIGHT_BLUE                                 :כחול בהיר
 STR_COLOUR_SECONDARY_GREEN                                      :ירוק
@@ -215,6 +219,7 @@ STR_COLOUR_SECONDARY_PURPLE                                     :סגול
 STR_COLOUR_SECONDARY_ORANGE                                     :כתום
 STR_COLOUR_SECONDARY_BROWN                                      :חום
 STR_COLOUR_SECONDARY_GREY                                       :אפור
+STR_COLOUR_SECONDARY_WHITE                                      :לבן
 STR_COLOUR_SECONDARY_SAME_AS_PRIMARY                            :כמו הראשי


@@ -906,7 +911,15 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TOOLTIP                        :{BLACK}העתק
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}אפשרויות משחק

 STR_GAME_OPTIONS_TAB_GENERAL                                    :כללי
+STR_GAME_OPTIONS_TAB_GENERAL_TOOLTIP                            :בחר הגדרות כלליות
 STR_GAME_OPTIONS_TAB_GRAPHICS                                   :גרפיקות
+STR_GAME_OPTIONS_TAB_GRAPHICS_TOOLTIP                           :בחר הגדרות גרפיקה
+STR_GAME_OPTIONS_TAB_SOUND                                      :שמע
+STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :בחר הגדרות שמע ומוזיקה
+STR_GAME_OPTIONS_TAB_SOCIAL                                     :חברתי
+STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :בחר הגדרות שילוב חברתי
+STR_GAME_OPTIONS_TAB_ADVANCED                                   :הגדרות מתקדמות
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :שנה את ההגדרות המתקדמות



@@ -989,6 +1002,10 @@ STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :סמן תיבה
 STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :התאם שוליים
 STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :סמן תיבה זו כדי להתאים את השוליים לפי גודל הממשק

+STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :השתמש בגופן ספרייט מסורתי
+STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :סמן תיבה זו אם אתה מעדיף להשתמש בגופן הספרייט המסורתי בעל גודל קבוע
+STR_GAME_OPTIONS_GUI_FONT_AA                                    :גופנים חלקים
+STR_GAME_OPTIONS_GUI_FONT_AA_TOOLTIP                            :סמן תיבה זו כדי להחליק גופנים בעלי גודל משתנה

 STR_GAME_OPTIONS_GUI_SCALE_MARK                                 :{DECIMAL}x

@@ -1299,9 +1316,11 @@ STR_CONFIG_SETTING_SIGNALSIDE_RIGHT                             :מימין

 ###length 2
 STR_CONFIG_SETTING_SHOWFINANCES                                 :הראה את חלון מערך הכספים בכל סוף שנה : {STRING}
+STR_CONFIG_SETTING_SHOWFINANCES_PERIOD                          :הראה את חלון מערך הכספים בכל סוף תקופה: {STRING}

 ###length 2
 STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT                        :אם מאופשר, חלון הכספים מופיע בסוף כל שנה כדי לאפשר בחינה קלה של המצב הכספי של החברה
+STR_CONFIG_SETTING_SHOWFINANCES_HELPTEXT_PERIOD                 :אם מאופשר, חלון הכספים מופיע בסוף כל תקופה כדי לאפשר בחינה קלה של המצב הכספי של החברה

 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :הוראות חדשות הם תמיד 'לא לעצור' כבחירת מחדל: {STRING}
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT_HELPTEXT                  :בדרך כלל, רכב יעצור בכל תחנה בה הוא עובר. ע"י הפעלת הגדרה זו, הוא יסע דרך כל התחנות בדרך על יעדו הסופי מבלי לעצור. שים לב, הגדרה זו רק קובעת ערך ברירת מחדל עבור הוראות חדשות. הוראות פרטניות יכולות להיות מוגדרות במפורש לכל אחת מבין ההתנהגויות בכל מקרה
@@ -1613,6 +1632,7 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{STRING}: שמ
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT            :השאר את כלי הבנייה עבור גשרים, מנהרות וכו' פתוחים אחרי השימוש

 STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS                          :הסר רמזורים אוטומטית במהלך בניית פסי רכבת: {STRING}
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT                 :הסר רמזורים אוטומטית במהלך בניית פסי רכבת אם הרמזורים נמצאים בדרך. הסרה זו עלולה לגרום לתאונות רכבת

 STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT                     :הגבלת מהירות הרצה קדימה: {STRING}
 STR_CONFIG_SETTING_FAST_FORWARD_SPEED_LIMIT_HELPTEXT            :הגבלת מהירות המשחק כאשר הרצה קדימה מופעלת. 0 = ללא הגבלה (מהר ככל שהמחשב שלך מאפשר). ערכים מתחת ל-100% מאטים את המשחק. הגבול העליון תלוי במפרט המחשב שלך ועשוי להשתנות בהתאם למשחק.
@@ -1628,9 +1648,11 @@ STR_CONFIG_SETTING_SOUND_NEWS_HELPTEXT                          :השמע צלי

 ###length 2
 STR_CONFIG_SETTING_SOUND_NEW_YEAR                               :סוף שנה: {STRING}
+STR_CONFIG_SETTING_SOUND_NEW_PERIOD                             :סוף תקופה: {STRING}

 ###length 2
 STR_CONFIG_SETTING_SOUND_NEW_YEAR_HELPTEXT                      :השמע צליל בסוף שנה המסכם את תפקוד החברה בהשוואה לשנה הקודמת
+STR_CONFIG_SETTING_SOUND_NEW_PERIOD_HELPTEXT                    :השמע צליל בסוף תקופה המסכם את תפקוד החברה במהלך התקופה בהשוואה לתקופה הקודמת

 STR_CONFIG_SETTING_SOUND_CONFIRM                                :בנייה: {STRING}
 STR_CONFIG_SETTING_SOUND_CONFIRM_HELPTEXT                       :השמע צליל בעת הצלחת בנייה או פעולות אחרות
@@ -2180,6 +2202,10 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}הצטר
 STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}רענן שרת
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}רענן את המידע המוצג לגבי השרת

+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET                  :{BLACK}חפש באינטרנט
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP          :{BLACK}חפש שרתים פומביים באינטרנט
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN                       :{BLACK}חפש ברשת המקומית
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP               :{BLACK}חפש שרתים ברשת המקורית
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}הוסף שרת
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}מוסיף שרת לרשימה שתמיד תבדק למשחקים פעילים.
 STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}הפעל שרת
@@ -2475,6 +2501,10 @@ STR_LINKGRAPH_LEGEND_SATURATED                                  :{TINY_FONT}{BLA
 STR_LINKGRAPH_LEGEND_OVERLOADED                                 :{TINY_FONT}{BLACK}העמסת יתר

 # Linkgraph tooltip
+STR_LINKGRAPH_STATS_TOOLTIP_MONTH                               :{BLACK}{CARGO_LONG} ישונעו בחודש מ{STATION} ל{STATION} ({COMMA}% מהקיבולת){STRING}
+STR_LINKGRAPH_STATS_TOOLTIP_MINUTE                              :{BLACK}{CARGO_LONG} ישונעו בדקה מ{STATION} ל{STATION} ({COMMA}% מהקיבולת){STRING}
+STR_LINKGRAPH_STATS_TOOLTIP_RETURN_EXTENSION                    :{}{CARGO_LONG} ישונעו חזרה  ({COMMA}% מהקיבולת)
+STR_LINKGRAPH_STATS_TOOLTIP_TIME_EXTENSION                      :{}זמן מסע ממוצע: {UNITS_DAYS_OR_SECONDS}

 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}הדגשת שטח הכיסוי
@@ -2549,6 +2579,7 @@ STR_PICKER_MODE_SAVED_TOOLTIP                                   :החלף הצג



+
 STR_STATION_CLASS_DFLT                                          :ברירת מחדל
 STR_STATION_CLASS_DFLT_STATION                                  :תחנת ברירת מחדל
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :תחנת ברירת מחדל
@@ -3598,6 +3629,14 @@ STR_INDUSTRY_VIEW_REQUIRES_N_CARGO                              :{BLACK}דורש
 STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}

 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}דורש:
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_SUFFIX                           :{YELLOW}{0:STRING}{BLACK}{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX                    :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} ממתינים{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX.singular           :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} ממתין{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_SUFFIX.plural             :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} ממתינים{3:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_NOSUFFIX                         :{YELLOW}{0:STRING}
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX                  :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} ממתינים
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX.singular         :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} ממתין
+STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT_NOSUFFIX.plural           :{YELLOW}{0:STRING}{BLACK}: {1:CARGO_SHORT} ממתינים

 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}שנה תפוקה (כפולות של 8, עד 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}שינוי ברמת ההפקה (עד 800% אחוז)
@@ -3809,7 +3848,7 @@ STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}מכור
 STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}החלף אוטומטית את כל הרכבות שבמוסך
 STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}החלף אוטומטית את כל הרכבים שבמוסך
 STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}החלף אוטומטית את כל כלי השייט שבמבדוק
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}החלף אוטומאטית את כל כלי הטייס שבסככה
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}החלף אוטומטית את כל כלי הטייס שבסככה

 ###length VEHICLE_TYPES
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}כלים חדשים
@@ -3878,6 +3917,8 @@ STR_ENGINE_PREVIEW_SHIP                                         :כלי שייט

 STR_ENGINE_PREVIEW_COST_WEIGHT                                  :עלות: {CURRENCY_LONG} משקל: {WEIGHT_SHORT}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED                               :עלות: {CURRENCY_LONG} מהירות מרבית: {VELOCITY}
+STR_ENGINE_PREVIEW_RUNCOST_YEAR                                 :עלות הפעלה: {CURRENCY_LONG} לשנה
+STR_ENGINE_PREVIEW_RUNCOST_PERIOD                               :עלות הפעלה: {CURRENCY_LONG} לתקופה

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}החלף {STRING} - {STRING}
@@ -4481,6 +4522,7 @@ STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... הג
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... הגעת למגבלת פינוי המשבצות
 STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... הגעת למגבלת נטיעת העצים
 STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}השם חייב להיות ייחודי
+STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}חוסם את הדרך {STRING}
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}אסור בזמן שהמשחק מושהה

 # Local authority errors
@@ -4785,12 +4827,17 @@ STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}לא נ
 ###length VEHICLE_TYPES

 ###length VEHICLE_TYPES
+STR_ERROR_CAN_T_AUTOREPLACE_TRAIN                               :{WHITE}לא ניתן להחליף את הרכבות אוטומטית...
+STR_ERROR_CAN_T_AUTOREPLACE_ROAD_VEHICLE                        :{WHITE}לא ניתן להחליף את כלי הרכב אוטומטית...
+STR_ERROR_CAN_T_AUTOREPLACE_SHIP                                :{WHITE}לא ניתן להחליף את כלי השייט אוטומטית...
+STR_ERROR_CAN_T_AUTOREPLACE_AIRCRAFT                            :{WHITE}לא ניתן להחליף את כלי הטייס אוטומטית...

 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}יותר מידי כלי תעבורה במשחק
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}לא ניתן לשנות את מרווחי הטיפול...

 STR_ERROR_VEHICLE_IS_DESTROYED                                  :{WHITE}... הרכב נהרס

+STR_ERROR_CAN_T_CLONE_VEHICLE_LIST                              :{WHITE}... לא כל כלי הרכב זהים

 STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL                          :{WHITE}כלי תחבורה לא יהיו זמינים
 STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL_EXPLANATION              :{WHITE}שנה הגדרות NewGRF
@@ -885,6 +885,7 @@ STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE                       :{BLACK}अक



+
 STR_STATION_CLASS_DFLT                                          :मानक स्टेशन
 STR_STATION_CLASS_WAYP                                          :पथ-संकेत

@@ -2942,10 +2942,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Külső kertvá
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Belső kertváros
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Városközpont

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Frissítések megelőzése
+STR_HOUSE_PICKER_PROTECT                                        :Növekedés megakadályozása
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Válaszd ki, hogy a város növekedésével ez a ház védve legyen-e a cserétől
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Ki
-STR_HOUSE_PICKER_PROTECT_ON                                     :Be
+
+STR_HOUSE_PICKER_REPLACE                                        :Meglévő kicserélése
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Válaszd ki, hogy automatikusan eltávolítsa-e a meglévő házat arról a mezőről, ahova ez a ház lerakásra kerül

 STR_STATION_CLASS_DFLT                                          :Alapértelmezett
 STR_STATION_CLASS_DFLT_STATION                                  :Alapértelmezett állomás
@@ -2214,6 +2214,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Byggja l



+
 STR_STATION_CLASS_DFLT                                          :Sjálfgefin stöð
 STR_STATION_CLASS_WAYP                                          :Millistöð

@@ -963,6 +963,7 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aceptas:



+
 # Signal window

 # Bridge selection window
@@ -2717,6 +2717,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Membangu



+
 STR_STATION_CLASS_DFLT                                          :Standar
 STR_STATION_CLASS_DFLT_STATION                                  :Stasiun standar
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Pemberhentian jalan standar
@@ -2538,6 +2538,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Tóg st



+
 STR_STATION_CLASS_DFLT                                          :Stáisiún réamhshocraithe
 STR_STATION_CLASS_WAYP                                          :Pointí bealaigh

@@ -2886,6 +2886,7 @@ STR_HOUSE_PICKER_CLASS_ZONE4                                    :Sobborghi inter
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centro città


+
 STR_STATION_CLASS_DFLT                                          :Predefinita
 STR_STATION_CLASS_DFLT_STATION                                  :Stazione predefinita
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Fermata stradale predefinita
@@ -2657,6 +2657,7 @@ STR_PICKER_MODE_ALL                                             :すべて



+
 STR_STATION_CLASS_DFLT                                          :標準駅
 STR_STATION_CLASS_WAYP                                          :中継駅

@@ -2879,10 +2879,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :바깥쪽 시
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :안쪽 시내
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :도시 중심

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :업그레이드 방지
+STR_HOUSE_PICKER_PROTECT                                        :업그레이드 방지
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :이 건물이 도시가 성장함에 따라 교체되는 것을 막을지 여부를 선택합니다
-STR_HOUSE_PICKER_PROTECT_OFF                                    :끄기
-STR_HOUSE_PICKER_PROTECT_ON                                     :켜기
+
+STR_HOUSE_PICKER_REPLACE                                        :이미 설치된 것 교체
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :이 건물이 배치된 칸에서 기존 건물을 자동으로 제거할지 여부를 선택합니다

 STR_STATION_CLASS_DFLT                                          :기본
 STR_STATION_CLASS_DFLT_STATION                                  :기본 역
@@ -2570,6 +2570,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Struere



+
 STR_STATION_CLASS_DFLT                                          :Statio solita
 STR_STATION_CLASS_WAYP                                          :Interloci

@@ -2879,10 +2879,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Ārējās priek
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Iekšējās priekšpilsētas
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Pilsētas centrs

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Novērst uzlabojumus
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Izvēlieties, vai šī māja tiks aizsargāta pret nomaiņu, pilsētai augot
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Izslēgts
-STR_HOUSE_PICKER_PROTECT_ON                                     :Ieslēgts
+

 STR_STATION_CLASS_DFLT                                          :Noklusējuma
 STR_STATION_CLASS_DFLT_STATION                                  :Noklusējuma stacija
@@ -2935,6 +2935,7 @@ STR_PICKER_MODE_ALL                                             :Visi
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Kraštas


+
 STR_STATION_CLASS_DFLT                                          :Numatytoji
 STR_STATION_CLASS_DFLT_STATION                                  :Numatytoji stotelė
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Numatytoji kelio stotelė
@@ -2878,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Aner Viruerter
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Bannescht Viruerter
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Stadzentrum

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Upgrades verhënneren
+STR_HOUSE_PICKER_PROTECT                                        :Upgrades verhënneren
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Wiel aus ob dëst Haus firun engem Ersetze geschützt gëtt wann d'Stad wiisst
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Aus
-STR_HOUSE_PICKER_PROTECT_ON                                     :Un
+
+STR_HOUSE_PICKER_REPLACE                                        :Existéiernt ersetzen
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Wiel aus fir d'existéierend Haus automatesch ewech ze huele wann dëst Haus placéiert gëtt

 STR_STATION_CLASS_DFLT                                          :Standard
 STR_STATION_CLASS_DFLT_STATION                                  :Standardstatioun
@@ -1304,6 +1304,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Изгр



+
 # Signal window
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Влез сигнализација (електрика){}Зелено е се додека има барем еден зелен излез-сигнал во продолжението на траката, во спротивно е црвено.
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Излез Сигнализација (електрика){}Се однесува на ист начин како блок-сигналот, но потребно е да ја има точната боја на влезен и комбо пресигнал.
@@ -2110,6 +2110,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bina ste



+
 STR_STATION_CLASS_DFLT                                          :Stesen lazim
 STR_STATION_CLASS_WAYP                                          :Tandatuju

@@ -892,6 +892,7 @@ STR_NETWORK_SERVER_MESSAGE                                      :*** {STRING}



+
 # Signal window

 # Bridge selection window
@@ -312,6 +312,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}I te wha
 STR_BUTTON_DEFAULT                                              :{BLACK}Taunoa
 STR_BUTTON_CANCEL                                               :{BLACK}Whakakore
 STR_BUTTON_OK                                                   :{BLACK}Ka pai
+STR_BUTTON_MOVE                                                 :{BLACK}Neke

 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-= qwertyuiop[]asdfghjkl;'#\zxcvbnm,./ .
@@ -2861,15 +2862,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Tīpakona he ro
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Tīpakona he momo whare hei hanga. Pātaki+Pāwhiri kia tāpiri, tango rānei i ngā tūemi kua puritia

 STR_HOUSE_PICKER_CAPTION                                        :Tīpakonga Whare
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Ingoa: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Taupori: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}Tau: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Tau: {ORANGE}Katoa
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Tau: {ORANGE}Mai i te {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Tau: {ORANGE}Ki te {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Rahi: {ORANGE}{NUM}x{NUM} papariki
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Utanga hei whiwhi: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Utanga hei whakaputa: {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Ingoa: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Taupori: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Tau: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Tau: {GOLD}Katoa
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Tau: {GOLD}Mai i te {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Tau: {GOLD}Ki te {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Rahi: {GOLD}{NUM}x{NUM} papariki
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Utanga hei whiwhi: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Utanga hei whakaputa: {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Tapa
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Mōwaho
@@ -2877,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Paenoho Waho
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Paenoho Roto
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Pokapū Tāone

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Āraia ngā whakamohoa
+STR_HOUSE_PICKER_PROTECT                                        :Āraia kei whakamohoa
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Kōwhiria mehemea ka tiakina tēnei whare kei whakakapi ina tupu ake te tāone
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Poko
-STR_HOUSE_PICKER_PROTECT_ON                                     :Kā
+
+STR_HOUSE_PICKER_REPLACE                                        :Whakakapia he whare e tū kē ana
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Kōwhiria mehemea ka tango aunoatia he whare kei te papariki ka makaia ai tēnei whare

 STR_STATION_CLASS_DFLT                                          :Taunoa
 STR_STATION_CLASS_DFLT_STATION                                  :Teihana taunoa
@@ -3060,9 +3062,9 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Kei te t

 # Town generation window (SE)
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Whakatūranga Tāone
-STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Tāone Hou
+STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Tāone hou
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Whakatūria he tāone hou. Pēhi hoki i te Pāhiki kia whakaatu noa iho i te whakataunga tata o te utu
-STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Tāone Matapōkere
+STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Tāone matapōkere
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Whakatūria he tāone i tētahi wāhi matapōkere
 STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Maha o ngā tāone matapōkere
 STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Hora tāone matapōkere puta noa i te mahere
@@ -3687,7 +3689,7 @@ STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Me tauri
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Hohokona te taurite a ngā pūmatua me ngā pūriki ina whakatauritea ngā ingoa o ngā tohu ki te aho tātari

 # Sign window
-STR_EDIT_SIGN_CAPTION                                           :{WHITE}Whakarerekētia te kuputuhi tohu
+STR_EDIT_SIGN_CAPTION                                           :{WHITE}Whakarerekētia te tohu
 STR_EDIT_SIGN_LOCATION_TOOLTIP                                  :{BLACK}Nekehia te tirohanga matua ki te tauwāhi o te tohu. Pātaki+Pāwhiri kia huaki i tētahi atu tirohanga i te tauwāhi o te tohu
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Haere ki te tohu ki muri
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Haere ki te tohu ki mua
@@ -3904,12 +3906,14 @@ STR_CARGO_RATING_EXCELLENT                                      :Rawe
 STR_CARGO_RATING_OUTSTANDING                                    :Kei runga rawa atu

 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Nekehia te tirohanga matua ki te tauwāhi o te teihana. Pātaki+Pāwhiri kia huaki i tētahi atu tirohanga i te tauwāhi o te teihana
+STR_STATION_VIEW_EDIT_TOOLTIP                                   :{BLACK}Tapaia anō te teihana, nekehia rānei te tohu

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Whakaaria ngā tereina katoa e toro ana i tēnei teihana i ana rārangi mahi
 STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Whakaaria ngā waka rori katoa e toro ana i tēnei teihana i ana rārangi mahi
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Whakaaria ngā waka rererangi katoa e toro ana i tēnei teihana i ana rārangi mahi
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Whakaaria ngā kaipuke katoa e toro ana i tēnei teihana i ana rārangi mahi

+STR_STATION_VIEW_EDIT_STATION_SIGN                              :{WHITE}Whakarerekētia te tohu o te teihana

 STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}Katia te taunga rererangi
 STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Āraia ngā waka rererangi kei tau ki tēnei taunga
@@ -3917,9 +3921,11 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Āraia n
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Nekehia te tirohanga matua ki te tauwāhi o te aratohu. Pātaki+Pāwhiri kia huaki i tētahi atu tirohanga i te tauwāhi o te aratohu
+STR_WAYPOINT_VIEW_EDIT_TOOLTIP                                  :{BLACK}Tapaia anō te aratohu, nekehia rānei te tohu
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Nekehia te tirohanga matua ki te tauwāhi o te kārewa. Pātaki+Pāwhiri kia huaki i tētahi atu tirohanga i te tauwāhi o te kārewa
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Panonitia te ingoa o te kārewa

+STR_WAYPOINT_VIEW_EDIT_WAYPOINT_SIGN                            :{WHITE}Whakarerekētia te tohu o te aratohu

 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}Ahumoni o {COMPANY} {BLACK}{COMPANY_NUM}
@@ -4894,9 +4900,9 @@ STR_AI_CONFIG_NAME_VERSION                                      :{STRING} {YELLO
 STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}Tatau mōrahi o ngā kaiwhakataetae: {ORANGE}{COMMA}
 STR_AI_CONFIG_COMPETITORS_INTERVAL                              :{LTBLUE}Wā i waenga i ngā tīmata a ngā kaiwhakataetae: {ORANGE}{COMMA} meneti

-STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Neke Ake
+STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Neke ake
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Nekehia ake i te rārangi te kaitākaro hangahanga kua tīpakona
-STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Neke Iho
+STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Neke iho
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Nekehia iho i te rārangi te kaitākaro hangahanga kua tīpakona

 STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Hōtuhi Kēmu
@@ -5133,6 +5139,7 @@ STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Tuhene n
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Tata rawa ki tētahi atu tauranga
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Tata rawa ki tētahi atu taunga rererangi
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Tē taea te tapa anō te teihana...
+STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}Tē taea te neke te tohu o te teihana…
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... nō tētahi tāone te rori
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... ki te ahu hē te rori
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... tē āhei ngā koki i ngā tūnga taraiwa ā-roto
@@ -5164,6 +5171,7 @@ STR_ERROR_CAN_T_BUILD_RAIL_WAYPOINT                             :{WHITE}Tē taea
 STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT                             :{WHITE}Tē taea te hanga te aratohu rori i konei...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Tē taea te maka te kārewa i konei...
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Tē taea te panoni te ingoa o te aratohu...
+STR_ERROR_CAN_T_MOVE_WAYPOINT_NAME                              :{WHITE}Tē taea te neke te tohu o te aratohu…

 STR_ERROR_CAN_T_REMOVE_RAIL_WAYPOINT                            :{WHITE}Tē taea te tango te aratohu tereina nei...
 STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}Tē taea te tango te aratohu rori nei...
@@ -1198,6 +1198,7 @@ STR_NETWORK_SERVER_MESSAGE                                      :*** {STRING}



+
 # Signal window

 # Bridge selection window
@@ -2880,10 +2880,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Ytre forsteder
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Indre forsteder
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Bysentrum

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Forhindre oppgraderinger
+STR_HOUSE_PICKER_PROTECT                                        :Forhindre oppgraderinger
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Velg hvorvidt dette huset skal være beskyttet mot å bli byttet ut når byen vokser
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Av
-STR_HOUSE_PICKER_PROTECT_ON                                     :På
+
+STR_HOUSE_PICKER_REPLACE                                        :Erstatt eksisterende
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Velg hvorvidt eksisterende hus skal fjernes automatisk på ruten hvor dette huset blir plassert

 STR_STATION_CLASS_DFLT                                          :Standard
 STR_STATION_CLASS_DFLT_STATION                                  :Standard stasjon
@@ -2286,6 +2286,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bygg sta



+
 STR_STATION_CLASS_DFLT                                          :Standard stasjon
 STR_STATION_CLASS_WAYP                                          :Kontrollpunkt

@@ -2309,10 +2309,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :حومه‌ها
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :حومه‌های داخلی
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :مرکز شهر

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :جلوگیری از ارتقا
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :انتخاب کنید که آیا این خانه با رشد شهر از جایگزینی در امان خواهد بود یا خیر
-STR_HOUSE_PICKER_PROTECT_OFF                                    :خاموش
-STR_HOUSE_PICKER_PROTECT_ON                                     :روشن
+

 STR_STATION_CLASS_DFLT                                          :ایستگاه پیش فرض
 STR_STATION_CLASS_WAYP                                          :نقطه مسیر ها
@@ -2659,7 +2659,7 @@ STR_HELP_WINDOW_README                                          :{BLACK}Plik „
 STR_HELP_WINDOW_CHANGELOG                                       :{BLACK}Lista Zmian
 STR_HELP_WINDOW_KNOWN_BUGS                                      :{BLACK}Znane Błędy
 STR_HELP_WINDOW_LICENSE                                         :{BLACK}Licencja
-STR_HELP_WINDOW_FONTS                                           :{BLACK}Fonty
+STR_HELP_WINDOW_FONTS                                           :{BLACK}Fonty (pot. czcionki)
 STR_HELP_WINDOW_MAIN_WEBSITE                                    :{BLACK}OpenTTD
 STR_HELP_WINDOW_MANUAL_WIKI                                     :{BLACK}Podręcznik / Wiki
 STR_HELP_WINDOW_BUGTRACKER                                      :{BLACK}Zgłoś Błąd
@@ -3258,10 +3258,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Przedmieścia z
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Przedmieścia wewnętrzne
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centrum miasta

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Zapobieganie modernizacji
+STR_HOUSE_PICKER_PROTECT                                        :Zapobiegaj modernizacji
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Określ, czy ten budynek ma być chroniony przed zastąpieniem w miarę rozwoju miasta
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Wył.
-STR_HOUSE_PICKER_PROTECT_ON                                     :Wł.
+
+STR_HOUSE_PICKER_REPLACE                                        :Zastąp istniejące budynki
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Określ, czy chcesz budować nowe budunki w miejscu innych budynków. Jeśli tak, to stary budunek zostanie automatycznie usunięty, jeśli nie, to w wypadku takiej próby umieszczenia zostanie wyświetlony komunikat o błędnym umiejscowieniu budunku

 STR_STATION_CLASS_DFLT                                          :Standardowa
 STR_STATION_CLASS_DFLT_STATION                                  :Standardowa stacja
@@ -3961,11 +3962,11 @@ STR_SPRITE_ALIGNER_CAPTION_NO_ACTION                            :{WHITE}Wyrówny
 STR_SPRITE_ALIGNER_CAPTION_ACTIONA                              :{WHITE}Wyrównywanie sprite'a: Action 0xA, {COMMA} ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_CAPTION_ACTION5                              :{WHITE}Wyrównywanie sprite'a: Action 0x5, typ {HEX}, {COMMA} ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Następny sprite
-STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Idź do następnego normalnego sprite'a, pomijając jakiekolwiek pseudo / przebarwione / czcionkowe sprite'y, a po ostatnim przejdź do pierwszego
+STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Idź do następnego sprite'a (pomijając sprite'y: pseudo, zmiany kolorów, fontów), a po ostatnim przejdź do pierwszego
 STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Idź do sprite'a
 STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Idź do danego sprite'a. Jeśli dany sprite nie jest normalnym spritem, przejdź do następnego normalnego sprite'a
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Poprzedni sprite
-STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Idź do poprzedniego normalnego sprite'a, pomijając jakiekolwiek pseudo / przebarwione / czcionkowe sprite'y, a po pierwszym przejdź do ostatniego
+STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Idź do poprzedniego sprite'a (pomijając sprite'y: pseudo, zmiany kolorów, fontów), a po pierwszym przejdź do ostatniego
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Prezentacja wybranego sprite'a. Wyrównanie jest ignorowane podczas rysowania tego sprite'a
 STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Poruszaj spritem, zmieniając przesunięcia X i Y. Użyj Ctrl, aby przesunąć o 8 jednostek  na raz
 STR_SPRITE_ALIGNER_SPRITE                                       :{STRING}:{NUM}
@@ -5334,8 +5335,8 @@ STR_TEXTFILE_JUMPLIST_TOOLTIP                                   :{BLACK}Przeskoc
 STR_TEXTFILE_JUMPLIST_ITEM                                      :{WHITE}{STRING}
 STR_TEXTFILE_NAVBACK_TOOLTIP                                    :{BLACK}Cofnij się w historii nawigacji
 STR_TEXTFILE_NAVFORWARD_TOOLTIP                                 :{BLACK}Powrót do przodu w historii nawigacji
-STR_TEXTFILE_WRAP_TEXT                                          :{WHITE}Zawijaj tekst
-STR_TEXTFILE_WRAP_TEXT_TOOLTIP                                  :{BLACK}Zawiń tekst w oknie, aby zmieścił się bez konieczności przewijania
+STR_TEXTFILE_WRAP_TEXT                                          :{WHITE}Zawijaj wiersze
+STR_TEXTFILE_WRAP_TEXT_TOOLTIP                                  :{BLACK}Zawiń tekst, aby zmieścił się w oknie bez konieczności przewijania w poziomie
 STR_TEXTFILE_VIEW_README                                        :{BLACK}Plik „readme”
 STR_TEXTFILE_VIEW_README_TOOLTIP                                :Wyświetl plik „readme” dla tej zawartości
 STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Lista zmian
@@ -135,7 +135,7 @@ STR_ABBREV_MAIL                                                 :CR
 STR_ABBREV_OIL                                                  :PT
 STR_ABBREV_LIVESTOCK                                            :GD
 STR_ABBREV_GOODS                                                :BN
-STR_ABBREV_GRAIN                                                :CR
+STR_ABBREV_GRAIN                                                :CE
 STR_ABBREV_WOOD                                                 :MD
 STR_ABBREV_IRON_ORE                                             :FR
 STR_ABBREV_STEEL                                                :AÇ
@@ -172,14 +172,14 @@ STR_CRATES                                                      :{COMMA}{NBSP}ca

 STR_COLOUR_DEFAULT                                              :Padrão
 ###length 17
-STR_COLOUR_DARK_BLUE                                            :Azul escuro
-STR_COLOUR_PALE_GREEN                                           :Verde claro
+STR_COLOUR_DARK_BLUE                                            :Azul Escuro
+STR_COLOUR_PALE_GREEN                                           :Verde Claro
 STR_COLOUR_PINK                                                 :Rosa
 STR_COLOUR_YELLOW                                               :Amarelo
 STR_COLOUR_RED                                                  :Vermelho
-STR_COLOUR_LIGHT_BLUE                                           :Azul claro
+STR_COLOUR_LIGHT_BLUE                                           :Azul Claro
 STR_COLOUR_GREEN                                                :Verde
-STR_COLOUR_DARK_GREEN                                           :Verde escuro
+STR_COLOUR_DARK_GREEN                                           :Verde Escuro
 STR_COLOUR_BLUE                                                 :Azul
 STR_COLOUR_CREAM                                                :Creme
 STR_COLOUR_MAUVE                                                :Malva
@@ -211,38 +211,38 @@ STR_COLOUR_SECONDARY_SAME_AS_PRIMARY                            :Igual à Primá


 # Units used in OpenTTD
-STR_UNITS_VELOCITY_IMPERIAL                                     :{DECIMAL}{NBSP}mph
+STR_UNITS_VELOCITY_IMPERIAL                                     :{DECIMAL}{NBSP}mi/h
 STR_UNITS_VELOCITY_METRIC                                       :{DECIMAL}{NBSP}km/h
 STR_UNITS_VELOCITY_SI                                           :{DECIMAL}{NBSP}m/s
 STR_UNITS_VELOCITY_GAMEUNITS_DAY                                :{DECIMAL}{NBSP}mosaicos/dia
 STR_UNITS_VELOCITY_GAMEUNITS_SEC                                :{DECIMAL}{NBSP}mosaicos/seg
 STR_UNITS_VELOCITY_KNOTS                                        :{DECIMAL}{NBSP}nó{P 0 "" s}

-STR_UNITS_POWER_IMPERIAL                                        :{DECIMAL}cv
-STR_UNITS_POWER_METRIC                                          :{DECIMAL}cv
+STR_UNITS_POWER_IMPERIAL                                        :{DECIMAL}{NBSP}hp
+STR_UNITS_POWER_METRIC                                          :{DECIMAL}{NBSP}cv
 STR_UNITS_POWER_SI                                              :{DECIMAL}kW

-STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL                     :{DECIMAL}{NBSP}hp/t
+STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_IMPERIAL                     :{DECIMAL}{NBSP}hp/tn
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_METRIC                       :{DECIMAL}{NBSP}hp/t
 STR_UNITS_POWER_IMPERIAL_TO_WEIGHT_SI                           :{DECIMAL}{NBSP}hp/Mg
-STR_UNITS_POWER_METRIC_TO_WEIGHT_IMPERIAL                       :{DECIMAL}{NBSP}hp/t
-STR_UNITS_POWER_METRIC_TO_WEIGHT_METRIC                         :{DECIMAL}{NBSP}hp/t
-STR_UNITS_POWER_METRIC_TO_WEIGHT_SI                             :{DECIMAL}{NBSP}hp/Mg
-STR_UNITS_POWER_SI_TO_WEIGHT_IMPERIAL                           :{DECIMAL}{NBSP}kW/t
+STR_UNITS_POWER_METRIC_TO_WEIGHT_IMPERIAL                       :{DECIMAL}{NBSP}cv/tn
+STR_UNITS_POWER_METRIC_TO_WEIGHT_METRIC                         :{DECIMAL}{NBSP}cv/t
+STR_UNITS_POWER_METRIC_TO_WEIGHT_SI                             :{DECIMAL}{NBSP}cv/Mg
+STR_UNITS_POWER_SI_TO_WEIGHT_IMPERIAL                           :{DECIMAL}{NBSP}kW/tn
 STR_UNITS_POWER_SI_TO_WEIGHT_METRIC                             :{DECIMAL}{NBSP}kW/t
 STR_UNITS_POWER_SI_TO_WEIGHT_SI                                 :{DECIMAL}{NBSP}W/kg

-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{DECIMAL}t
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{DECIMAL}t
-STR_UNITS_WEIGHT_SHORT_SI                                       :{DECIMAL}kg
+STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{DECIMAL}{NBSP}tn
+STR_UNITS_WEIGHT_SHORT_METRIC                                   :{DECIMAL}{NBSP}t
+STR_UNITS_WEIGHT_SHORT_SI                                       :{DECIMAL}{NBSP}kg

-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{DECIMAL}{NBSP}ton{P "" s}
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{DECIMAL}{NBSP}ton. curta{P "" s}
 STR_UNITS_WEIGHT_LONG_METRIC                                    :{DECIMAL}{NBSP}tonelada{P "" s}
 STR_UNITS_WEIGHT_LONG_SI                                        :{DECIMAL}{NBSP}kg

-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{DECIMAL}gal
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{DECIMAL}l
-STR_UNITS_VOLUME_SHORT_SI                                       :{DECIMAL}m³
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{DECIMAL}{NBSP}gal
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{DECIMAL}{NBSP}L
+STR_UNITS_VOLUME_SHORT_SI                                       :{DECIMAL}{NBSP}m³

 STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{DECIMAL}{NBSP}gal{P ão ões}
 STR_UNITS_VOLUME_LONG_METRIC                                    :{DECIMAL}{NBSP}litro{P "" s}
@@ -292,8 +292,8 @@ STR_TOOLTIP_DEFSIZE                                             :{BLACK}Redimens
 STR_TOOLTIP_STICKY                                              :{BLACK}Afixar esta janela como não-encerrável pela tecla 'Fechar Todas as Janelas'. Ctrl+Clique também guarda o estado como padrão.
 STR_TOOLTIP_RESIZE                                              :{BLACK}Clique e arraste para reajustar janela
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alternar entre janela grande/pequena
-STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de deslize - desloca a lista para cima/baixo
-STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de deslize - desloca a lista para a esquerda/direita
+STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de deslize - para deslocar a lista para cima ou para baixo
+STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de deslize - para deslocar a lista para a esquerda ou para a direita
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolir edifícios, etc, num mosaico de terreno. Ctrl+Clique+Arrastar para selecionar a área na diagonal. Pressione também Shift para apenas mostrar o custo estimado

 # Show engines button
@@ -396,7 +396,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}Abrir in
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}Abrir informação geral da empresa
 STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK                          :{BLACK}Abrir livro de história
 STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST                          :{BLACK}Abrir lista de objetivos
-STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Abrir gráficos da empresa e taxas de pagamento de carga
+STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Abrir gráficos estatísticos da empresa e taxas de pagamento de carga
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Abrir tabela de classificação de empresas
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Abrir diretório de indústrias, cadeia de indústrias, ou financiar a construção de uma nova indústria
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Abrir lista de comboios da empresa. Ctrl+Clique para mostrar ou ocultar grupos de veículos, em oposição à configuração escolhida
@@ -437,8 +437,8 @@ STR_SCENEDIT_TOOLBAR_PLACE_OBJECT_TOOLTIP                       :{BLACK}Colocar
 ###length 7
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Guardar cenário
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Abrir cenário
-STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Guardar mapa de alturas
-STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Abrir mapa de alturas
+STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Guardar mapa de altura
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Abrir mapa de altura
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Abandonar editor de cenário
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Sair
@@ -456,7 +456,7 @@ STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opções de Tra
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Mostrar nomes de localidades
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Mostrar nomes de estações
 STR_SETTINGS_MENU_STATION_NAMES_TRAIN                           :Estações de comboio
-STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Paragens de camião
+STR_SETTINGS_MENU_STATION_NAMES_LORRY                           :Terminal para camiões
 STR_SETTINGS_MENU_STATION_NAMES_BUS                             :Paragens de autocarro
 STR_SETTINGS_MENU_STATION_NAMES_SHIP                            :Docas
 STR_SETTINGS_MENU_STATION_NAMES_PLANE                           :Aeroportos
@@ -514,10 +514,10 @@ STR_RAIL_MENU_MAGLEV_CONSTRUCTION                               :Construção de

 # Road construction menu
 STR_ROAD_MENU_ROAD_CONSTRUCTION                                 :Construção de estradas
-STR_ROAD_MENU_TRAM_CONSTRUCTION                                 :Construção de carris para elétricos
+STR_ROAD_MENU_TRAM_CONSTRUCTION                                 :Construção de linhas de elétrico

 # Waterways construction menu
-STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construção de vias fluviais
+STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Construção de rotas navais

 # Aairport construction menu
 STR_AIRCRAFT_MENU_AIRPORT_CONSTRUCTION                          :Construção de aeroportos
@@ -670,7 +670,7 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER            :Gestor de Tráf
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR      :Coordenador de Transportes
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ROUTE_SUPERVISOR           :Supervisor de Rotas
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_DIRECTOR                   :Diretor
-STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHIEF_EXECUTIVE            :Chefe Executivo
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHIEF_EXECUTIVE            :Diretor Sénior
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHAIRMAN                   :Diretor Executivo
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Presidente
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnata
@@ -698,7 +698,7 @@ STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:

 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP_YEARS                   :{BLACK}Número de veículos que obtiveram lucro no último ano. Isto inclui veículos rodoviários, comboios, navios e aeronaves
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP_PERIODS                 :{BLACK}Número de veículos que obtiveram lucro no último período. Isto inclui veículos rodoviários, comboios, navios e aeronaves.
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de estações recentemente reparadas. Estações ferroviárias, paragens de autocarro, aeroportos são contabilizadas separadamente, mesmo se estiverem ligadas como uma só.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de estações utilizadas recentemente. Estações ferroviárias, paragens de autocarro, aeroportos são contabilizadas separadamente, mesmo se estiverem ligadas como uma só.
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP_YEARS                 :{BLACK}Lucro do veículo com o menor rendimento (apenas são considerados veículos com mais de dois anos)
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP_PERIODS               :{BLACK}Lucro do veículo com o menor rendimento (apenas são considerados veículos com mais de dois períodos)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Dinheiro conseguido no mês com os lucros mais baixos dos últimos 12 trimestres
@@ -710,7 +710,7 @@ STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}O montan
 STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total de pontos sobre o máximo de pontos

 # Music window
-STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Leitor de música Jazz
+STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Leitor de Música
 STR_MUSIC_PLAYLIST_ALL                                          :{TINY_FONT}{BLACK}Todos
 STR_MUSIC_PLAYLIST_OLD_STYLE                                    :{TINY_FONT}{BLACK}Antigo
 STR_MUSIC_PLAYLIST_NEW_STYLE                                    :{TINY_FONT}{BLACK}Moderno
@@ -718,7 +718,7 @@ STR_MUSIC_PLAYLIST_EZY_STREET                                   :{TINY_FONT}{BLA
 STR_MUSIC_PLAYLIST_CUSTOM_1                                     :{TINY_FONT}{BLACK}Personaliz. 1
 STR_MUSIC_PLAYLIST_CUSTOM_2                                     :{TINY_FONT}{BLACK}Personaliz. 2
 STR_MUSIC_MUSIC_VOLUME                                          :{TINY_FONT}{BLACK}Volume da Música
-STR_MUSIC_EFFECTS_VOLUME                                        :{TINY_FONT}{BLACK}Volume dos efeitos
+STR_MUSIC_EFFECTS_VOLUME                                        :{TINY_FONT}{BLACK}Volume dos Efeitos
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
 STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
@@ -734,11 +734,11 @@ STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC                            :{BLACK}Parar a
 STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC                           :{BLACK}Iniciar reprodução de música
 STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC                     :{BLACK}Arraste os cursores para ajustar o volume da música e efeitos sonoros
 STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM                     :{BLACK}Selecionar programa 'todas as faixas'
-STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC                        :{BLACK}Selecionar programa 'estilo antigo'
-STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}Selecionar programa 'estilo moderno'
-STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Selecionar programa 'Ezy Street'
-STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}Selecionar programa 'Personalizado 1'
-STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Selecionar programa 'Personalizado 2'
+STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC                        :{BLACK}Selecionar programa 'músicas de estilo antigo'
+STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}Selecionar programa 'músicas de estilo moderno'
+STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Selecionar programa 'músicas de estilo Ezy Street'
+STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}Selecionar programa 'Personalizado 1' (definido pelo utilizador)
+STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Selecionar programa 'Personalizado 2' (definido pelo utilizador)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Ligar/Desligar reprodução aleatória
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Mostrar janela de seleção de faixas de música

@@ -788,9 +788,9 @@ STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP                     :{BLACK}Mostrar
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Mostrar rotas de transporte no mapa
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Mostrar vegetação no mapa
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Mostrar proprietários do terreno no mapa
-STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Clique num tipo de indústria para alternar exibi-lo. Ctrl+Clique desativa todos os tipos, exceto a selecionada. Ctrl+Clique novamente para ativar todos os tipos de indústria
-STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK} Clique em uma empresa para alternar exibindo as suas propriedades. Ctrl+Clique desativa todas as empresas, exceto a selecionada. Ctrl+Clique nele novamente para habilitar todas as empresas
-STR_SMALLMAP_TOOLTIP_CARGO_SELECTION                            :{BLACK}Clique numa carga para alternar exibindo as suas propriedades. Ctrl+Clique desabilita todas as cargas, exceto a selecionada. Ctrl + Clique novamente para ativar todas as cargas
+STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Clique num tipo de indústria para alternar a sua exibição. Ctrl+Clique desativa todos os tipos, exceto a selecionada. Ctrl+Clique novamente para ativar todos os tipos de indústria
+STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Clique numa empresa para alternar a exibição das suas propriedades. Ctrl+Clique desativa todas as empresas, exceto a selecionada. Ctrl+Clique novamente para ativar todas as empresas
+STR_SMALLMAP_TOOLTIP_CARGO_SELECTION                            :{BLACK}Clique numa carga para alternar a exibição das suas propriedades. Ctrl+Clique desabilita todas as cargas, exceto a selecionada. Ctrl + Clique novamente para ativar todas as cargas

 STR_SMALLMAP_LEGENDA_ROADS                                      :{TINY_FONT}{BLACK}Estradas
 STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINY_FONT}{BLACK}Caminhos-de-ferro
@@ -878,8 +878,8 @@ STR_NEWS_DISASTER_SMALL_UFO                                     :{BIG_FONT}{BLAC
 STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIG_FONT}{BLACK}Explosão em refinaria de petróleo perto de {TOWN}!
 STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIG_FONT}{BLACK}Fábrica perto de {TOWN} foi destruída em circunstâncias suspeitas!
 STR_NEWS_DISASTER_BIG_UFO                                       :{BIG_FONT}{BLACK}OVNI pousa em {TOWN}!
-STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIG_FONT}{BLACK}Afundamento em mina de carvão perto de {TOWN} causa rasto de destruição!
-STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIG_FONT}{BLACK}Inundações!{}Pelo menos {COMMA} pessoa{P 0 "" s} desaparecida{P 0 "" s} ou morta{P 0 "" s} após terrível desastre!
+STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIG_FONT}{BLACK}Afundamento em mina de carvão perto de {TOWN} deixa rasto de destruição!
+STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIG_FONT}{BLACK}Inundações!{}Pelo menos {COMMA} pessoa{P 0 "" s} desaparecida{P 0 "" s}, presumivelmente morta{P 0 "" s} após terrível desastre!

 STR_NEWS_COMPANY_IN_TROUBLE_TITLE                               :{BIG_FONT}{BLACK}Empresa de transportes em dificuldades!
 STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION                         :{BIG_FONT}{BLACK}{STRING} será vendida ou declarada falida a menos que melhore os seus rendimentos em breve!
@@ -888,7 +888,7 @@ STR_NEWS_COMPANY_MERGER_DESCRIPTION                             :{BIG_FONT}{BLAC
 STR_NEWS_COMPANY_BANKRUPT_TITLE                                 :{BIG_FONT}{BLACK}Faliu!
 STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION                           :{BIG_FONT}{BLACK}{STRING} foi encerrada por credores e todos os ativos foram vendidos!
 STR_NEWS_COMPANY_LAUNCH_TITLE                                   :{BIG_FONT}{BLACK}Nova empresa de transportes!
-STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} inicia construção em {TOWN}!
+STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} inicia construção perto de {TOWN}!
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLACK}{STRING} foi adquirida por {STRING} por um valor não declarado!
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Presidente)

@@ -909,7 +909,7 @@ STR_NEWS_END_OF_RECESSION                                       :{BIG_FONT}{BLAC
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL                   :{BIG_FONT}{BLACK}{G 0 "" "O " "A " "Os " "As "}{INDUSTRY} aumenta{G 0 "" "" "" m m} a produção!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL                      :{BIG_FONT}{BLACK}Foi descoberto um novo estrato de carvão {G 0 em no na nos nas} {INDUSTRY}!{}Espera-se duplicar a produção!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL                       :{BIG_FONT}{BLACK}Novas reservas de petróleo encontradas {G 0 em no na nos nas} {INDUSTRY}!{}Espera-se duplicar a produção!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM                      :{BIG_FONT}{BLACK}Nova técnica de cultivo leva à duplicação da produção {G 0 em no na nos nas} {INDUSTRY}!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM                      :{BIG_FONT}{BLACK}Nova técnica de cultivo deverá duplicar a produção {G 0 em no na nos nas} {INDUSTRY}!
 STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH                    :{BIG_FONT}{BLACK}Produção de {STRING} {G 1 em no na nos nas} {INDUSTRY} aumenta {COMMA}%!
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL                   :{BIG_FONT}{BLACK}Produção d{G 0 e o a os as} {INDUSTRY} reduzida em 50%!
 STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM                      :{BIG_FONT}{BLACK}Praga de insetos causa estragos {G 0 em no na nos nas} {INDUSTRY}!{}A produção diminui 50%!
@@ -917,8 +917,8 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIG_FONT}{BLAC

 ###length VEHICLE_TYPES
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está a aguardar no depósito
-STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está a aguardar no depósito
-STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está a aguardar no depósito
+STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está a aguardar na garagem
+STR_NEWS_SHIP_IS_WAITING                                        :{WHITE}{VEHICLE} está a aguardar no estaleiro
 STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} está a aguardar no hangar
 ###next-name-looks-similar

@@ -927,7 +927,7 @@ STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS                             :{WHITE}{VEHICLE
 STR_NEWS_VEHICLE_HAS_VOID_ORDER                                 :{WHITE}{VEHICLE} tem uma ordem nula
 STR_NEWS_VEHICLE_HAS_DUPLICATE_ENTRY                            :{WHITE}{VEHICLE} tem ordens duplicadas
 STR_NEWS_VEHICLE_HAS_INVALID_ENTRY                              :{WHITE}{VEHICLE} tem uma ordem inválida no seu horário
-STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY                            :{WHITE}{VEHICLE} tem um aeroporto nas ordens cuja pista de aterragem é muito curta
+STR_NEWS_PLANE_USES_TOO_SHORT_RUNWAY                            :{WHITE}{VEHICLE} tem um aeroporto nas ordens cuja pista de aterragem é demasiado curta

 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} está a ficar velho
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} está a ficar demasiado velho
@@ -1037,7 +1037,7 @@ STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniano
 STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novo Rublo Russo
 STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso Mexicano
 STR_GAME_OPTIONS_CURRENCY_NTD                                   :Novo Dólar Taiwanês
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Remimbi chinês
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Remimbi Chinês
 STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dólar de Hong Kong
 STR_GAME_OPTIONS_CURRENCY_INR                                   :Rupia Indiana
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupia Indonésia
@@ -1071,7 +1071,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :outra
 STR_GAME_OPTIONS_RESOLUTION_ITEM                                :{NUM}x{NUM}

 STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :Aceleração por hardware
-STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marque esta opção para permitir que o OpenTTD tente usar a aceleração por hardware. Uma definição alterada só será aplicada após reiniciar o jogo
+STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :Marque esta opção para permitir que o OpenTTD tente usar aceleração por hardware. Se for alterada, esta configuração só terá efeito após reiniciar o jogo
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}A definição só terá efeito após reiniciar o jogo

 STR_GAME_OPTIONS_VIDEO_VSYNC                                    :VSync
@@ -1087,7 +1087,7 @@ STR_GAME_OPTIONS_GUI_SCALE_AUTO                                 :Detetar automat
 STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP                         :Marque esta opção para detetar automaticamente o tamanho do interface

 STR_GAME_OPTIONS_GUI_SCALE_BEVELS                               :Escalar rebordos
-STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marque esta opção para dimensionar os chanfros por tamanho de interface
+STR_GAME_OPTIONS_GUI_SCALE_BEVELS_TOOLTIP                       :Marque esta opção para dimensionar os rebordos das janelas em relação ao tamanho da interface

 STR_GAME_OPTIONS_GUI_FONT_SPRITE                                :Usar o tipo de letra com gráficos tradicionais
 STR_GAME_OPTIONS_GUI_FONT_SPRITE_TOOLTIP                        :Marque esta opção se prefere usar o tipo de letra tradicional de tamanho fixo
@@ -1150,7 +1150,7 @@ STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Modo de
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda personalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de conversão: {ORANGE}{CURRENCY_LONG} = £ {COMMA}
 STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Diminuir o valor da sua moeda em relação a uma Libra Britânica (£)
-STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Aumentar a quantidade da sua moeda para uma Libra (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Aumentar a quantidade da sua moeda para uma Libra Britânica (£)
 STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Definir a taxa de conversão da sua moeda para uma Libra Britânica (£)

 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador: {ORANGE}{STRING}
@@ -1168,11 +1168,11 @@ STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mudar pa
 STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mudar para o Euro mais tarde

 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Pré-visualizar: {ORANGE}{CURRENCY_LONG}
-STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Libras (£) na sua moeda
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Libras Britânicas (£) na sua moeda
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Mudar parâmetro da moeda personalizada

 STR_NONE                                                        :Nenhum
-STR_FUNDING_ONLY                                                :Financiamento apenas
+STR_FUNDING_ONLY                                                :Apenas com financiamento
 STR_MINIMAL                                                     :Mínimo
 STR_NUM_VERY_LOW                                                :Muito Baixo
 STR_NUM_LOW                                                     :Baixo
@@ -1412,7 +1412,7 @@ STR_CONFIG_SETTING_INFLATION_HELPTEXT                           :Ativar inflaç
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :Tamanho máximo das pontes: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH_HELPTEXT                   :Tamanho máximo para construção de pontes

-STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :Altura máxima de ponte: {STRING}
+STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT                            :Altura máxima das pontes: {STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_HEIGHT_HELPTEXT                   :Altura máxima para construir pontes

 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :Comprimento máximo dos túneis: {STRING}
@@ -1706,8 +1706,8 @@ STR_CONFIG_SETTING_LIVERIES_NONE                                :Nenhum
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :Só da própria empresa
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :Todas as empresas

-STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :Escolher chat de equipa com <ENTER>: {STRING}
-STR_CONFIG_SETTING_PREFER_TEAMCHAT_HELPTEXT                     :Trocar o mapeamento entre o chat interno da empresa e o chat público para <ENTER> e <Ctrl+ENTER> respetivamente
+STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :Escolher conversa em equipa com <ENTER>: {STRING}
+STR_CONFIG_SETTING_PREFER_TEAMCHAT_HELPTEXT                     :Alternar o mapeamento entre a conversa interna da empresa e a conversa pública para <ENTER> e <Ctrl+ENTER> respetivamente

 STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :Velocidade da roda do rato no mapa: {STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER_HELPTEXT              :Controlo de sensibilidade da roda de deslocamento do rato
@@ -1742,11 +1742,11 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :<CTRL> + clique
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Desligado

 STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE                        :Fechar janelas ao fazer clique direito: {STRING}
-STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT               :Fecha uma janela ao fazer clique direito dentro dela. Desativa os textos de ajuda ao fazer clique direito!
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT               :Fecha uma janela ao fazer clique do botão direito do rato dentro da mesma. Esta opção desativa a opção que faz aparecer os textos de ajuda com o clique direito!
 ###length 3
 STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_NO                     :Não
 STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES                    :Sim
-STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES_EXCEPT_STICKY      :Sim, exceto coladas
+STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_YES_EXCEPT_STICKY      :Sim, exceto janelas fixadas

 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :Usar formato de data {STRING} para jogos guardados.
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_HELPTEXT           :Formato da data nos ficheiros de jogos guardados
@@ -1972,8 +1972,8 @@ STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL                        :Original
 STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH                          :Suave
 STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN                          :Congelada

-STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :Percentagem do lucro do serviço a pagar em trajectos de um transporte que alimenta outro transporte: {STRING}
-STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :Percentagem da receita dada a trajectos intermédios em sistemas em que um transporte alimenta outro, dando maior controlo sobre a receita
+STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :Percentagem do lucro do serviço a pagar em sistemas de transbordo: {STRING}
+STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT                :Percentagem da receita distribuída em trajetos intermédios onde um transporte transfere a carga para outro, dando maior controlo sobre a receita atribuída

 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :Ao arrastar, colocar sinais a cada: {STRING}
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY_HELPTEXT                :Define a distância a que os sinais serão construídos num carril até ao próximo obstáculo (sinal, junção), se os sinais são arrastados
@@ -2086,7 +2086,7 @@ STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :Muito Rápido

 STR_CONFIG_SETTING_LARGER_TOWNS                                 :Proporção de localidades que se tornarão cidades: {STRING}
 STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT                        :Quantidade de localidades que se tornarão cidades, ou seja uma localidade que começa maior e crescerá mais depressa.
-STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 em {COMMA}
+STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 em cada {COMMA}
 ###setting-zero-is-special
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :Nenhum
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :Multiplicador inicial para a dimensão das metrópoles: {STRING}
@@ -2124,7 +2124,7 @@ STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT               :Frequentemente
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY                  :Unidades de velocidade (terrestre): {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_NAUTICAL         :Unidades de velocidade (náutica): {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT         :Quando uma velocidade é mostrada no interface de utilizador, mostrar na unidade selecionada
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Imperial (mph)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL         :Imperial (mi/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC           :Métrico (km/h)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI               :SI (m/s)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS_DAYS   :Unidades do jogo (mosaicos/dia)
@@ -2135,21 +2135,21 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER                     :Unidades de pot
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT            :Quando a potência de um veículo é mostrada no interface de utilizador, mostrar na unidade selecionada
 ###length 3
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_IMPERIAL            :Imperial (hp)
-STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Métrico (hp)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_METRIC              :Métrico (cv)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_SI                  :SI (kW)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT                    :Unidades de peso: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_HELPTEXT           :Quando um peso é mostrado na interface de utilizador, mostrar na unidade selecionada
 ###length 3
-STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL           :Imperial (short t/ton)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_IMPERIAL           :Imperial (tn/ton. curta)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_METRIC             :Métrico (t/tonelada)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_WEIGHT_SI                 :SI (kg)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME                    :Unidades de volume: {STRING}
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_HELPTEXT           :Quando uma quantidade de volume é mostrada na interface de utilizador, mostrar na unidade selecionada
 ###length 3
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :Imperial (galões)
-STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_METRIC             :Métrico (l)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_IMPERIAL           :Imperial (gal)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_METRIC             :Métrico (L)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI                 :SI (m³)

 STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE                     :Unidades de esforço de tração: {STRING}
@@ -2227,22 +2227,22 @@ STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... O co
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD
 STR_INTRO_VERSION                                               :OpenTTD {REV}

-STR_INTRO_NEW_GAME                                              :{BLACK}Novo jogo
-STR_INTRO_LOAD_GAME                                             :{BLACK}Carregar jogo
-STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Jogar cenário
-STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Jogar mapa de alturas
-STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor de cenário
-STR_INTRO_MULTIPLAYER                                           :{BLACK}Multi-jogador
+STR_INTRO_NEW_GAME                                              :{BLACK}Novo Jogo
+STR_INTRO_LOAD_GAME                                             :{BLACK}Carregar Jogo
+STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Jogar Cenário
+STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Jogar Mapa de Altura
+STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor de Cenário
+STR_INTRO_MULTIPLAYER                                           :{BLACK}Multi-Jogador

-STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opções de jogo
-STR_INTRO_HIGHSCORE                                             :{BLACK}Tabela de classificações
+STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opções de Jogo
+STR_INTRO_HIGHSCORE                                             :{BLACK}Tabela de Classificações
 STR_INTRO_HELP                                                  :{BLACK}Ajuda e Manuais
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Conteúdo Online
 STR_INTRO_QUIT                                                  :{BLACK}Sair

 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Iniciar um novo jogo. Ctrl+Clique salta a configuração do mapa
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Carregar um jogo guardado
-STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Iniciar novo jogo, usando um mapa de alturas como terreno
+STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Iniciar novo jogo, usando um mapa de altura para gerar o terreno
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Iniciar um novo jogo, utilizando um cenário personalizado guardado no disco
 STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Criar um cenário de jogo personalizado
 STR_INTRO_TOOLTIP_MULTIPLAYER                                   :{BLACK}Começar um jogo multi-jogador
@@ -2254,7 +2254,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE                             :{BLACK}Selecion

 STR_INTRO_TOOLTIP_GAME_OPTIONS                                  :{BLACK}Abrir opções de jogo
 STR_INTRO_TOOLTIP_HIGHSCORE                                     :{BLACK}Abrir tabela de classificações
-STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Obter acesso a documentação e recursos online
+STR_INTRO_TOOLTIP_HELP                                          :{BLACK}Aceder a documentação e outros recursos online
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Verificar conteúdo novo e atualizado para descarga
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair de 'OpenTTD'

@@ -2296,7 +2296,7 @@ STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Aviões
 STR_CHEAT_EDIT_MAX_HL                                           :{LTBLUE}Editar altura máxima do mapa: {ORANGE}{NUM}
 STR_CHEAT_EDIT_MAX_HL_QUERY_CAPT                                :{WHITE}Editar altura máxima de montanhas no mapa
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Alterar data: {ORANGE}{DATE_SHORT}
-STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Alterar ano atual
+STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Alterar o ano atual
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING}
 STR_CHEAT_STATION_RATING                                        :{LTBLUE}Afixar as classificações da estação em 100%: {ORANGE}{STRING}

@@ -2512,7 +2512,7 @@ STR_NETWORK_CLIENT_LIST_PLAYER_NAME                             :{BLACK}Nome
 STR_NETWORK_CLIENT_LIST_PLAYER_NAME_TOOLTIP                     :{BLACK}O seu nome de jogador
 STR_NETWORK_CLIENT_LIST_PLAYER_NAME_EDIT_TOOLTIP                :{BLACK}Editar o seu nome de jogador
 STR_NETWORK_CLIENT_LIST_PLAYER_NAME_QUERY_CAPTION               :O seu nome de jogador
-STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_TOOLTIP                    :{BLACK}Ações administrativas para executar a este cliente
+STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_TOOLTIP                    :{BLACK}Ações administrativas para executar neste cliente
 STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP                   :{BLACK}Ações administrativas para executar a esta empresa
 STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP                            :{BLACK}Juntar-se a esta empresa
 STR_NETWORK_CLIENT_LIST_COMPANY_AUTHORIZE_TOOLTIP               :{BLACK}Autorizar este cliente a ingressar na sua empresa
@@ -2524,7 +2524,7 @@ STR_NETWORK_CLIENT_LIST_NEW_COMPANY                             :(Nova empresa)
 STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP                     :{BLACK}Criar uma nova empresa e aderir à mesma
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP                :{BLACK}Este é você
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_HOST_TOOLTIP                :{BLACK}Este é o anfitrião do jogo
-STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT                    :{BLACK}{NUM} cliente{P "" s} - {NUM}/{NUM} companhi{P a as}
+STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT                    :{BLACK}{NUM} cliente{P "" s} - {NUM}/{NUM} empresa{P "" s}
 STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT_TOOLTIP            :{BLACK}O número de clientes ligados atualmente, número de empresas e número máximo de empresas permitido pelo administrador do servidor

 # Matches ConnectionType
@@ -2676,9 +2676,9 @@ STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Clique n
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Selecionar tudo
 STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marcar todo o conteúdo para ser descarregado
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Sel. atualizações
-STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marcar todo o conteúdo que seja atualização ao conteúdo existente a ser descarregado
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marcar para descarregar todo o conteúdo que seja uma atualização ao conteúdo já presente no seu sistema
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Desselecionar tudo
-STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marcar todo o conteúdo que não deva ser descarregado
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Desmarcar todo o conteúdo selecionado
 STR_CONTENT_SEARCH_EXTERNAL                                     :{BLACK}Pesquisar em páginas externas
 STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP                             :{BLACK}Escolher conteúdo não disponível no serviço de conteúdo do OpenTTD em páginas não associadas ao OpenTTD
 STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER_CAPTION                  :{WHITE}Está a sair do OpenTTD!
@@ -2698,7 +2698,7 @@ STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED                        :{SILVER}Esta de
 STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Já tem isto
 STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}Este conteúdo é desconhecido e não pode ser descarregado no OpenTTD

-STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Isto é uma substituição para uma existente {STRING}
+STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Este conteúdo é uma atualização para u{G 0 m m ma ns mas} {STRING} já existente{G 0 "" "" "" s s} no seu sistema
 STR_CONTENT_DETAIL_NAME                                         :{SILVER}Nome: {WHITE}{STRING}
 STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Versão: {WHITE}{STRING}
 STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}Descrição: {WHITE}{STRING}
@@ -2712,16 +2712,16 @@ STR_CONTENT_NO_ZLIB                                             :{WHITE}OpenTTD
 STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... não é possível fazer o descarregamento de conteúdo!

 # Order of these is important!
-STR_CONTENT_TYPE_BASE_GRAPHICS                                  :Gráficos base
-STR_CONTENT_TYPE_NEWGRF                                         :NewGRF
-STR_CONTENT_TYPE_AI                                             :IA
-STR_CONTENT_TYPE_AI_LIBRARY                                     :Biblioteca de IA
-STR_CONTENT_TYPE_SCENARIO                                       :Cenário
-STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa de alturas
-STR_CONTENT_TYPE_BASE_SOUNDS                                    :Sons base
-STR_CONTENT_TYPE_BASE_MUSIC                                     :Música base
-STR_CONTENT_TYPE_GAME_SCRIPT                                    :Script de jogo
-STR_CONTENT_TYPE_GS_LIBRARY                                     :Biblioteca de SJ
+STR_CONTENT_TYPE_BASE_GRAPHICS                                  :{G=mp}Gráficos base
+STR_CONTENT_TYPE_NEWGRF                                         :{G=m}NewGRF
+STR_CONTENT_TYPE_AI                                             :{G=f}IA
+STR_CONTENT_TYPE_AI_LIBRARY                                     :{G=f}Biblioteca de IA
+STR_CONTENT_TYPE_SCENARIO                                       :{G=m}Cenário
+STR_CONTENT_TYPE_HEIGHTMAP                                      :{G=m}Mapa de altura
+STR_CONTENT_TYPE_BASE_SOUNDS                                    :{G=mp}Sons base
+STR_CONTENT_TYPE_BASE_MUSIC                                     :{G=fp}Músicas base
+STR_CONTENT_TYPE_GAME_SCRIPT                                    :{G=m}Script de jogo
+STR_CONTENT_TYPE_GS_LIBRARY                                     :{G=f}Biblioteca de SJ

 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}A descarregar conteúdo...
@@ -2747,15 +2747,15 @@ STR_MISSING_GRAPHICS_ERROR_QUIT                                 :{BLACK}Abandond

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opções de transparência
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Comutar transparência para sinais. Ctrl+Clique para bloquear.
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Comutar transparência das árvores. Ctrl+Clique para bloquear.
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Comutar transparência das casas. Ctrl+Clique para bloquear.
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Comutar transparência das indústrias. Ctrl+Clique para bloquear.
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Alternar transparência para edificações como estações, depósitos, pontos de controlo e catenária. Ctrl+Clique para bloquear.
-STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Comutar transparência para pontes. Ctrl+Clique para bloquear.
-STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Comutar transparência para estruturas como faróis-terrestres e antenas. Ctrl+Clique parabloquear.
-STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Comutar transparência para catenária. Ctrl+Clique para bloquear.
-STR_TRANSPARENT_TEXT_TOOLTIP                                    :{BLACK}Comutar transparência do texto de carregamento e custo/receita. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Alternar transparência dos letreiros. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Alternar transparência das árvores. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Alternar transparência das casas. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Alternar transparência das indústrias. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Alternar transparência de edificações como estações, depósitos e pontos de controlo. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Alternar transparência das pontes. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Alternar transparência de estruturas como faróis e antenas. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Alternar transparência da catenária. Ctrl+Clique para bloquear.
+STR_TRANSPARENT_TEXT_TOOLTIP                                    :{BLACK}Alternar transparência do texto de carregamento e custo/receita. Ctrl+Clique para bloquear.
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Definir objetos como invisíveis em vez de transparentes

 # Linkgraph legend window
@@ -2879,10 +2879,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Subúrbios Peri
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Subúrbios Centrais
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centro da localidade

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Impedir atualizações
-STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Escolha se esta casa será protegida contra a substituição à medida que localidade cresce
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Desativado
-STR_HOUSE_PICKER_PROTECT_ON                                     :Ativado
+STR_HOUSE_PICKER_PROTECT                                        :Impedir atualizações
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Escolha se esta casa será protegida contra substituições à medida que a localidade cresce
+
+STR_HOUSE_PICKER_REPLACE                                        :Substituir existentes
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Escolha se deseja remover automaticamente a casa existente no mosaico onde esta nova casa será colocada.

 STR_STATION_CLASS_DFLT                                          :Padrão
 STR_STATION_CLASS_DFLT_STATION                                  :Estação padrão
@@ -2910,7 +2911,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Reduzir
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Aumentar a distância entre os sinais quando se arrasta

 # Bridge selection window
-STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selecione Ponte Ferroviária
+STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selecionar Ponte Ferroviária
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selecionar Ponte Rodoviária
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Seleção de ponte - clique na ponte desejada para a construir
 STR_SELECT_BRIDGE_INFO_NAME                                     :{GOLD}{STRING}
@@ -2972,7 +2973,7 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orienta
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Selecionar orientação do terminal de carga para elétricos

 # Waterways toolbar (last two for SE only)
-STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construção de Vias Fluviais
+STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Construção de Rotas Navais
 STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Canais
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Construir canais. Ctrl+Clique+Arrastar para selecionar a área diagonalmente. Pressione também Shift para apenas mostrar o custo estimado
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Construir eclusas. Pressione também Shift para apenas mostrar o custo estimado
@@ -3018,7 +3019,7 @@ STR_AIRPORT_CLASS_HELIPORTS                                     :Heliportos
 STR_STATION_BUILD_NOISE                                         :{BLACK}Ruído gerado: {GOLD}{COMMA}

 # Landscaping toolbar
-STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Terreno
+STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Paisagem
 STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Baixar um canto do terreno. Clique+Arraste para rebaixar o primeiro canto selecionado e nivelar o terreno da área selecionada para a nova altura do canto. Ctrl+Clique+Arraste para selecionar a área na diagonal. Pressione também Shift para apenas mostrar o custo estimado
 STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Elevar um canto do terreno. Clique+Arrastar para elevar o primeiro canto selecionado e nivelar a área selecionada com a altura do novo canto. Ctrl+Clique+Arrastar para selecionar a área na diagonal. Pressione também Shift para apenas mostrar o custo estimado
 STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivelar uma área de terreno até a altura do primeiro canto selecionado. Ctrl+Clique+Arrastar para selecionar a área na diagonal. Pressione também Shift para apenas mostrar o custo estimado
@@ -3330,8 +3331,8 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Guardar
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Abrir Jogo
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Guardar Cenário
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Abrir Cenário
-STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carregar mapa de alturas
-STR_SAVELOAD_SAVE_HEIGHTMAP                                     :{WHITE}Guardar mapa de alturas
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carregar mapa de altura
+STR_SAVELOAD_SAVE_HEIGHTMAP                                     :{WHITE}Guardar mapa de altura
 STR_SAVELOAD_LOAD_TOWN_DATA                                     :{WHITE}Carregar Dados da Localidade
 STR_SAVELOAD_HOME_BUTTON_TOOLTIP                                :{BLACK}Clique aqui para saltar para o diretório atual de gravação/carregamento padrão
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} livres
@@ -3343,7 +3344,7 @@ STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Guardar
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Guardar o jogo atual, usando o nome escolhido
 STR_SAVELOAD_LOAD_BUTTON                                        :{BLACK}Carregar
 STR_SAVELOAD_LOAD_TOOLTIP                                       :{BLACK}Carregar o jogo selecionado
-STR_SAVELOAD_LOAD_HEIGHTMAP_TOOLTIP                             :{BLACK}Carregar mapa de alturas selecionado
+STR_SAVELOAD_LOAD_HEIGHTMAP_TOOLTIP                             :{BLACK}Carregar mapa de altura selecionado
 STR_SAVELOAD_LOAD_TOWN_DATA_TOOLTIP                             :{BLACK}Carregar dados da localidade selecionada
 STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Detalhes do Jogo
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Nenhuma informação disponível
@@ -3364,13 +3365,13 @@ STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Gerador
 STR_MAPGEN_MAPSIZE                                              :{BLACK}Dim. do mapa:
 STR_MAPGEN_MAPSIZE_TOOLTIP                                      :{BLACK}Selecionar o tamanho do mapa em mosaicos. O número de mosaicos disponíveis será ligeiramente menor
 STR_MAPGEN_BY                                                   :{BLACK}*
-STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Num. de localidades:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Núm. de localidades:
 STR_MAPGEN_NUMBER_OF_TOWNS_TOOLTIP                              :{BLACK}Selecionar a densidade das cidades, ou um número personalizado
 STR_MAPGEN_TOWN_NAME_LABEL                                      :{BLACK}Nomes das localidades:
 STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP                           :{BLACK}Selecionar o estilo dos nomes das localidades
 STR_MAPGEN_DATE                                                 :{BLACK}Data:
 STR_MAPGEN_DATE_TOOLTIP                                         :{BLACK}Selecionar a data inicial
-STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Num. de indústrias:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Núm. de indústrias:
 STR_MAPGEN_NUMBER_OF_INDUSTRIES_TOOLTIP                         :{BLACK}Selecionar a densidade das indústrias, ou um número personalizado
 STR_MAPGEN_HEIGHTMAP_HEIGHT                                     :{BLACK}Pico mais alto:
 STR_MAPGEN_HEIGHTMAP_HEIGHT_TOOLTIP                             :{BLACK}Escolher o pico mais alto que o jogo tentará criar, medido em elevação acima do nível do mar
@@ -3453,7 +3454,7 @@ STR_MAPGEN_TERRAIN_TYPE_QUERY_CAPT                              :{WHITE}Altura d
 STR_MAPGEN_HEIGHTMAP_HEIGHT_QUERY_CAPT                          :{WHITE}Pico mais alto
 STR_MAPGEN_SNOW_COVERAGE_QUERY_CAPT                             :{WHITE}Cobertura de neve (em %)
 STR_MAPGEN_DESERT_COVERAGE_QUERY_CAPT                           :{WHITE}Cobertura do deserto (em %)
-STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Mudar ano de início
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Alterar o ano inicial

 # SE Map generation
 STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tipo de cenário
@@ -3480,7 +3481,7 @@ STR_GENERATION_RIVER_GENERATION                                 :{BLACK}A gerar
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}A gerar zonas rochosas e montanhosas
 STR_GENERATION_TOWN_GENERATION                                  :{BLACK}A gerar localidades
 STR_GENERATION_LAND_INDUSTRY_GENERATION                         :{BLACK}A gerar indústrias terrestres
-STR_GENERATION_WATER_INDUSTRY_GENERATION                        :{BLACK}A gerar indústrias fluviais
+STR_GENERATION_WATER_INDUSTRY_GENERATION                        :{BLACK}A gerar indústrias fluviais/marítimas
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}A gerar objetos
 STR_GENERATION_TREE_GENERATION                                  :{BLACK}A gerar árvores
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}A configurar jogo
@@ -3491,9 +3492,9 @@ STR_GENERATION_PREPARING_GAME                                   :{BLACK}A prepar
 STR_TOWN_DATA_ERROR_LOAD_FAILED                                 :{WHITE}Falha ao carregar dados da localidade
 STR_TOWN_DATA_ERROR_JSON_FORMATTED_INCORRECTLY                  :{WHITE}Ficheiro JSON formatado incorretamente
 STR_TOWN_DATA_ERROR_TOWN_FORMATTED_INCORRECTLY                  :{WHITE}Dados de {STRING} formatados incorretamente
-STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}Coordenadas de {STRING} mal formatadas, devem ser de 0 a 1 como uma proporção da dimensão total do mapa de alturas
+STR_TOWN_DATA_ERROR_BAD_COORDINATE                              :{WHITE}Coordenadas de {STRING} mal formatadas, devem ser de 0 a 1 como uma proporção da dimensão total do mapa de altura

-STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}Não foi possível encontrar um local válido para fundar {NUM} localidade{P "" s}. Em vez disso, fo{P i ram} colocado{P "" s} {P "um " ""}letreiro{P "" s} no{P "" s} loca{P l is} desejado{P "" s}
+STR_TOWN_DATA_ERROR_FAILED_TO_FOUND_TOWN                        :{WHITE}Não foi possível encontrar um local válido para fundar {NUM} localidade{P "" s}. Em vez disso, fo{P i ram} colocado{P "" s} {P "um " ""}letreiro{P "" s} no{P "" s} loca{P l is} pretendido{P "" s}

 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Definições NewGRF
@@ -3517,7 +3518,7 @@ STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Para Cim
 STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Move o ficheiro NewGRF selecionado para cima na lista
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Para Baixo
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move o ficheiro NewGRF selecionado para baixo na lista
-STR_NEWGRF_SETTINGS_UPGRADE                                     :{BLACK}Atualiza
+STR_NEWGRF_SETTINGS_UPGRADE                                     :{BLACK}Atualizar
 STR_NEWGRF_SETTINGS_UPGRADE_TOOLTIP                             :{BLACK}Atualiza ficheiros NewGRF para os quais tens uma versão mais recente instalada
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Uma lista dos ficheiros NewGRF que estão instalados

@@ -3581,14 +3582,14 @@ STR_NEWGRF_INSPECT_QUERY_CAPTION                                :{WHITE}Parâmet
 STR_SPRITE_ALIGNER_CAPTION_NO_ACTION                            :{WHITE}Alinhando elemento visual: ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_CAPTION_ACTIONA                              :{WHITE}Alinhando elemento visual: Ação 0xA, {COMMA} ({STRING}:{NUM})
 STR_SPRITE_ALIGNER_CAPTION_ACTION5                              :{WHITE}Alinhando elemento visual: Ação 0x5, tipo {HEX}, {COMMA} ({STRING}:{NUM})
-STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Gráfico seguinte
+STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Elemento seguinte
 STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Proceder ao elemento visual normal seguinte, ignorando quaisquer elemento visual pseudo/recolorido/tipo-de-letra e dando a volta no fim
-STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Ir para o gráfico
-STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Ir para o gráfico seguinte. Se o gráfico não for um gráfico normal, proceder ao gráfico normal seguinte
-STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Gráfico anterior
+STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Ir para o elemento
+STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Ir para o elemento visual seguinte. Se o elemento não for normal, proceder ao elemento visual normal seguinte
+STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Elemento anterior
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Proceder ao elemento visual normal anterior, ignorando quaisquer elemento visual  pseudo/recolorido/tipo-de-letra e dando a volta no início
-STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Representação do gráfico selecionado atualmente. O alinhamento é ignorado a desenhar este gráfico
-STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Desloca o gráfico, alterando os intervalos  X e Y. Ctrl+Clique desloca o gráfico 8 unidades de uma só vez
+STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Representação do elemento visual selecionado atualmente. O alinhamento é ignorado a desenhar este elemento
+STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Desloca o elemento visual, alterando os intervalos  X e Y. Ctrl+Clique desloca o elemento visual 8 unidades de uma só vez
 STR_SPRITE_ALIGNER_SPRITE                                       :{STRING}:{NUM}

 ###length 2
@@ -3601,10 +3602,10 @@ STR_SPRITE_ALIGNER_RESET_BUTTON                                 :{BLACK}Repor re
 STR_SPRITE_ALIGNER_RESET_TOOLTIP                                :{BLACK}Repor intervalos relativos atuais
 STR_SPRITE_ALIGNER_OFFSETS_ABS                                  :{BLACK}Intervalo X: {NUM}, Intervalo Y: {NUM} (Absoluto)
 STR_SPRITE_ALIGNER_OFFSETS_REL                                  :{BLACK}Intervalo X: {NUM}, Intervalo Y: {NUM} (Relativo)
-STR_SPRITE_ALIGNER_PICKER_BUTTON                                :{BLACK}Escolher gráfico
+STR_SPRITE_ALIGNER_PICKER_BUTTON                                :{BLACK}Escolher elemento
 STR_SPRITE_ALIGNER_PICKER_TOOLTIP                               :{BLACK}Escolha um gráfico de qualquer lado no ecrã

-STR_SPRITE_ALIGNER_GOTO_CAPTION                                 :{WHITE}Ir para o gráfico
+STR_SPRITE_ALIGNER_GOTO_CAPTION                                 :{WHITE}Ir para o elemento

 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3631,13 +3632,13 @@ STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém múltip
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leitura além dos limites do pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF pedidos não disponíveis (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} foi desativado por {STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato de Gráfico Inválido ou desconhecido (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato do elemento visual Inválido ou desconhecido (sprite {3:NUM})
 STR_NEWGRF_ERROR_LIST_PROPERTY_TOO_LONG                         :Demasiados elementos na lista de valores de propriedade (sprite {3:NUM}, propriedade {4:HEX})
 STR_NEWGRF_ERROR_INDPROD_CALLBACK                               :Revogação da produção industrial inválida (sprite {3:NUM}, "{2:STRING}")

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Alerta!
-STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vai alterar um jogo em andamento. O OpenTTD pode terminar abruptamente.Não envie relatórios de erros sobre estas questões.{}Tem a certeza que quer continuar?
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vai alterar um jogo em execução. O OpenTTD pode terminar abruptamente. Não envie relatórios de erros sobre estas situações.{}Tem a certeza que quer continuar?

 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Não é possível adicionar ficheiro: GRF ID duplicado
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Ficheiro correspondente não encontrado (GRF compatível carregado)
@@ -3877,10 +3878,10 @@ STR_STATION_VIEW_WAITING_STATION                                :Estação: A ag
 STR_STATION_VIEW_WAITING_AMOUNT                                 :Quantidade: A aguardar
 STR_STATION_VIEW_PLANNED_STATION                                :Estação: Planeada
 STR_STATION_VIEW_PLANNED_AMOUNT                                 :Quantidade: Planeada
-STR_STATION_VIEW_FROM                                           :{YELLOW}{CARGO_SHORT} de {STATION}
+STR_STATION_VIEW_FROM                                           :{YELLOW}{CARGO_SHORT} {G de do da dos das} {STATION}
 STR_STATION_VIEW_VIA                                            :{YELLOW}{CARGO_SHORT} via {STATION}
 STR_STATION_VIEW_TO                                             :{YELLOW}{CARGO_SHORT} para {STATION}
-STR_STATION_VIEW_FROM_ANY                                       :{RED}{CARGO_SHORT} de estação desconhecida
+STR_STATION_VIEW_FROM_ANY                                       :{RED}{CARGO_SHORT} de uma estação desconhecida
 STR_STATION_VIEW_TO_ANY                                         :{RED}{CARGO_SHORT} para qualquer estação
 STR_STATION_VIEW_VIA_ANY                                        :{RED}{CARGO_SHORT} via qualquer estação
 STR_STATION_VIEW_FROM_HERE                                      :{GREEN}{CARGO_SHORT} desta estação
@@ -3990,7 +3991,7 @@ STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraestr
 STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} secç{P ão ões} de linha ferroviária
 STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} secç{P ão ões} de estrada
 STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} mosaico{P "" s} com água
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} mosaico{P "" s} com estaç{P ão ões}
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} mosaico{P "" s} com {P "uma " ""}estaç{P ão ões}
 STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroporto{P "" s}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nenhuma

@@ -4105,10 +4106,10 @@ STR_VEHICLE_LIST_PROFIT_THIS_PERIOD_LAST_PERIOD                 :{TINY_FONT}{BLA
 STR_VEHICLE_LIST_CARGO                                          :[{CARGO_LIST}]
 STR_VEHICLE_LIST_NAME_AND_CARGO                                 :{STRING} {STRING}

-STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar para o depósito
-STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar para a garagem
-STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar para o estaleiro
-STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar para hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar para um depósito
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar para uma garagem
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar para um estaleiro
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar para um hangar

 STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os veículos na lista
 STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos na lista
@@ -4358,7 +4359,7 @@ STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Está p

 # Engine preview window
 STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Mensagem de um fabricante de veículos
-STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Desenvolvemos u{G 0 m m ma ns mas} nov{G 0 "o modelo de" o a os as} {STRING} - estaria interessado num ano de exclusividade de uso deste{G 0 "" "" "" s s} veículo{G 0 "" "" "" s s}, de modo a que possamos avaliar o {G 0 "seu " "seu " "seu " "" ""}desempenho antes de o{G 0 "" "" "" s s} disponibilizar globalmente?
+STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Desenvolvemos u{G 0 m m ma ns mas} nov{G 0 "o modelo de" o a os as} {STRING} - estaria interessado num ano de uso exclusivo deste{G 0 "" "" "" s s} veículo{G 0 "" "" "" s s}, de modo a que possamos avaliar o {G 0 "seu " "seu " "seu " "" ""}desempenho antes de o{G 0 "" "" "" s s} disponibilizar globalmente?

 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :{G=f}locomotiva ferroviária
 STR_ENGINE_PREVIEW_ELRAIL_LOCOMOTIVE                            :{G=f}locomotiva elétrica ferroviária
@@ -4494,7 +4495,7 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parado
 STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}{VELOCITY} - A parar
 STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Sem energia
 STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}A esperar por caminho livre
-STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR                             :{ORANGE}Longe de mais do próximo destino
+STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR                             :{ORANGE}Demasiado longe do próximo destino

 STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}{1:VELOCITY} - Dirige-se para {G 0 "" "o " "a " "os " "as "}{0:STATION}
 STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}{VELOCITY} - Sem ordens
@@ -4527,8 +4528,8 @@ STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Idade: {
 STR_VEHICLE_INFO_AGE_RUNNING_COST_PERIOD                        :{BLACK}Idade: {LTBLUE}{STRING}{BLACK} Custo de Circulação: {LTBLUE}{CURRENCY_LONG}/período

 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Velocidade máx.: {LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_MAX_SPEED_TYPE                                 :{BLACK}Vel. máxima: {LTBLUE}{VELOCITY} {BLACK}Tipo de Aeronave: {LTBLUE}{STRING}
-STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE                           :{BLACK}Velocidade Máx.: {LTBLUE}{VELOCITY} {BLACK}Tipo de Aeronave: {LTBLUE}{STRING} {BLACK}Alcance: {LTBLUE}{COMMA} mosaicos
+STR_VEHICLE_INFO_MAX_SPEED_TYPE                                 :{BLACK}Vel. máxima: {LTBLUE}{VELOCITY} {BLACK}Tipo de aeronave: {LTBLUE}{STRING}
+STR_VEHICLE_INFO_MAX_SPEED_TYPE_RANGE                           :{BLACK}Velocidade máx.: {LTBLUE}{VELOCITY} {BLACK}Tipo de aeronave: {LTBLUE}{STRING} {BLACK}Alcance: {LTBLUE}{COMMA} mosaicos
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Velocidade máx.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Peso: {LTBLUE}{WEIGHT_SHORT} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Velocidade máx.: {LTBLUE}{VELOCITY} {BLACK}Tração Máx.: {LTBLUE}{FORCE}

@@ -4609,16 +4610,16 @@ STR_REFIT_SHIP_LIST_TOOLTIP                                     :{BLACK}Selecion
 STR_REFIT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Selecionar tipo de carga da aeronave

 ###length VEHICLE_TYPES
-STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Converter comboio
-STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reconverter veículo
+STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Adaptar comboio
+STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Adaptar veículo
 STR_REFIT_SHIP_REFIT_BUTTON                                     :{BLACK}Adaptar navio
 STR_REFIT_AIRCRAFT_REFIT_BUTTON                                 :{BLACK}Adaptar aeronave

 ###length VEHICLE_TYPES
-STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Converter comboio para transportar a carga selecionada
-STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Reconverter veículo rodoviário para transportar o tipo de carga selecionado
-STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Adaptar navio para transportar a carga selecionada
-STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Converter aeronave para transportar a carga selecionada
+STR_REFIT_TRAIN_REFIT_TOOLTIP                                   :{BLACK}Adaptar comboio para transportar o tipo de carga selecionado
+STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP                            :{BLACK}Adaptar veículo rodoviário para transportar o tipo de carga selecionado
+STR_REFIT_SHIP_REFIT_TOOLTIP                                    :{BLACK}Adaptar navio para transportar o tipo de carga selecionado
+STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Adaptar aeronave para transportar o tipo de carga selecionado

 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordens)
@@ -4656,9 +4657,9 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Mudar o
 STR_ORDER_REFIT                                                 :{BLACK}Adaptar
 STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selecionar o tipo de carga a adaptar nesta ordem. Pressionar Ctrl e botão-esquerdo do rato para remover a instrução de adaptação
 STR_ORDER_REFIT_AUTO                                            :{BLACK}Adaptar na estação
-STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Selecione qual o tipo de mercadoria para o qual auto-adaptar nesta ordem. Ctrl+Clique para remover ordem de adaptação. Auto-adaptação só será realizada se o veículo a aceitar
-STR_ORDER_DROP_REFIT_AUTO                                       :Mercadoria fixa
-STR_ORDER_DROP_REFIT_AUTO_ANY                                   :Mercadoria disponível
+STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Selecione qual o tipo de carga para o qual auto-adaptar nesta ordem. Ctrl+Clique para remover ordem de adaptação. Auto-adaptação só será realizada se o veículo a aceitar
+STR_ORDER_DROP_REFIT_AUTO                                       :Carga fixa
+STR_ORDER_DROP_REFIT_AUTO_ANY                                   :Carga disponível

 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ir sempre
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Manutenção, se necessária
@@ -4687,7 +4688,7 @@ STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Tempo de vida r
 STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Fiabilidade máxima
 ###next-name-looks-similar

-STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Como comparar os dados do veículo com o parâmetro passado
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Como comparar os dados do veículo com o parâmetro que foi passado
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :é igual a
 STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :é diferente de
 STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :é menos que
@@ -4719,8 +4720,8 @@ STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Inserir
 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostra todos os veículos que seguem este mesmo trajecto

 # String parts to build the order string
-STR_ORDER_GO_TO_WAYPOINT                                        :Ir por {WAYPOINT}
-STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ir sem parar por {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Ir {G por pelo pela pelos pelas} {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ir sem parar {G por pelo pela pelos pelas} {WAYPOINT}

 STR_ORDER_SERVICE_AT                                            :Manutenção em
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Manutenção sem parar em
@@ -4739,7 +4740,7 @@ STR_ORDER_REFIT_ORDER                                           :{SPACE}(Adaptar
 STR_ORDER_REFIT_STOP_ORDER                                      :{SPACE}(Adaptar para transportar {STRING} e parar)
 STR_ORDER_STOP_ORDER                                            :{SPACE}(Parar)

-STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(Esperar por desagrupar)
+STR_ORDER_WAIT_TO_UNBUNCH                                       :{SPACE}(Esperar para desagrupar)

 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION}
 STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION                       :{PUSH_COLOUR}{RED}(Não pode usar a estação){POP_COLOUR} {STRING} {STATION}
@@ -4780,7 +4781,7 @@ STR_ORDER_AUTO_REFIT_ANY                                        :mercadoria disp
 ###length 3
 STR_ORDER_STOP_LOCATION_NEAR_END                                :{SPACE}[início]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :{SPACE}[meio]
-STR_ORDER_STOP_LOCATION_FAR_END                                 :{SPACE}[final]
+STR_ORDER_STOP_LOCATION_FAR_END                                 :{SPACE}[fim]

 STR_ORDER_OUT_OF_RANGE                                          :{RED} (Próximo destino está fora de alcance)

@@ -4807,7 +4808,7 @@ STR_TIMETABLE_TRAVEL_FOR_ESTIMATED                              :Viajar (durante
 STR_TIMETABLE_TRAVEL_FOR_SPEED_ESTIMATED                        :Viajar (por {STRING}, sem programação) no máximo a {VELOCITY}
 STR_TIMETABLE_STAY_FOR_ESTIMATED                                :{SPACE}(permanecer por {STRING}, sem horário)
 STR_TIMETABLE_AND_TRAVEL_FOR_ESTIMATED                          :{SPACE}(viajar durante {STRING}, sem horário)
-STR_TIMETABLE_STAY_FOR                                          :{SPACE}e ficar por {STRING}
+STR_TIMETABLE_STAY_FOR                                          :{SPACE}e permanecer por {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :{SPACE}e viajar durante {STRING}

 STR_TIMETABLE_APPROX_TIME                                       :{BLACK}Este horário levará aproximadamente {STRING} para concluir
@@ -4916,7 +4917,7 @@ STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configur
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurar os parâmetros do script

 # Available AIs window
-STR_AI_LIST_CAPTION                                             :{WHITE}Disponível {STRING}
+STR_AI_LIST_CAPTION                                             :{WHITE}{STRING} Disponíveis
 STR_AI_LIST_CAPTION_AI                                          :IAs
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Scripts de jogo
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Clique para selecionar um script
@@ -4933,7 +4934,7 @@ STR_SCREENSHOT_SCREENSHOT                                       :{BLACK}Captura
 STR_SCREENSHOT_ZOOMIN_SCREENSHOT                                :{BLACK}Ampliação máxima
 STR_SCREENSHOT_DEFAULTZOOM_SCREENSHOT                           :{BLACK}Captura de ecrã com ampliação predefinida
 STR_SCREENSHOT_WORLD_SCREENSHOT                                 :{BLACK}Mapa completo
-STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Mapa de alturas
+STR_SCREENSHOT_HEIGHTMAP_SCREENSHOT                             :{BLACK}Captura de ecrã do mapa de altura
 STR_SCREENSHOT_MINIMAP_SCREENSHOT                               :{BLACK}Captura de ecrã do minimapa

 # Script Parameters
@@ -4950,13 +4951,13 @@ STR_TEXTFILE_JUMPLIST_ITEM                                      :{WHITE}{STRING}
 STR_TEXTFILE_NAVBACK_TOOLTIP                                    :{BLACK}Recuar no histórico de navegação
 STR_TEXTFILE_NAVFORWARD_TOOLTIP                                 :{BLACK}Avançar no histórico de navegação
 STR_TEXTFILE_WRAP_TEXT                                          :{WHITE}Envolver o texto
-STR_TEXTFILE_WRAP_TEXT_TOOLTIP                                  :{BLACK}Envolve o texto da janela de forma que não é necessário deslizar listagem
+STR_TEXTFILE_WRAP_TEXT_TOOLTIP                                  :{BLACK}Envolve o texto da janela de forma em que não seja necessário deslizar o conteúdo na horizontal
 STR_TEXTFILE_VIEW_README                                        :{BLACK}Leia-me
-STR_TEXTFILE_VIEW_README_TOOLTIP                                :Ver 'Leia-me' para este conteúdo
+STR_TEXTFILE_VIEW_README_TOOLTIP                                :Ver 'Leia-me' deste conteúdo
 STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Lista de alterações
-STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP                             :Ver o registo de alterações para este conteúdo
+STR_TEXTFILE_VIEW_CHANGELOG_TOOLTIP                             :Ver o registo de alterações deste conteúdo
 STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licença
-STR_TEXTFILE_VIEW_LICENCE_TOOLTIP                               :Ver a licença para este conteúdo
+STR_TEXTFILE_VIEW_LICENCE_TOOLTIP                               :Ver a licença deste conteúdo
 ###length 5
 STR_TEXTFILE_README_CAPTION                                     :{WHITE}Leiame {STRING} de {STRING}
 STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Lista de alterações {STRING} de {STRING}
@@ -4983,7 +4984,7 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Lucro Es
 # Saveload messages
 STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Gravação ainda em curso,{}por favor aguarde!
 STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Falha ao guardar automaticamente
-STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Não é possível ler unidade
+STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Não é possível ler unidade do sistema
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Falha ao guardar jogo...
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Não é possível eliminar ficheiro
 STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}Falha ao carregar jogo...
@@ -5021,7 +5022,7 @@ STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Só foi
 STR_WARNING_SCREENSHOT_SIZE_CAPTION                             :{WHITE}Captura de ecrã enorme
 STR_WARNING_SCREENSHOT_SIZE_MESSAGE                             :{YELLOW}A captura vai ter uma resolução de {COMMA} x {COMMA} pixeis. Pode demorar algum tempo para realizar a captura. Deseja continuar?

-STR_MESSAGE_HEIGHTMAP_SUCCESSFULLY                              :{WHITE}Mapa de alturas guardado com sucesso como '{STRING}'. O pico mais alto é {NUM}
+STR_MESSAGE_HEIGHTMAP_SUCCESSFULLY                              :{WHITE}Mapa de altura guardado com sucesso como '{STRING}'. O pico mais alto é {NUM}
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Captura de ecrã gravada para o disco como '{STRING}' com sucesso
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}A captura de ecrã falhou!

@@ -5046,12 +5047,12 @@ STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... a á
 STR_ERROR_TERRAFORM_LIMIT_REACHED                               :{WHITE}... atingido o limite para terraformação
 STR_ERROR_CLEARING_LIMIT_REACHED                                :{WHITE}... limite para limpeza de mosaicos atingido
 STR_ERROR_TREE_PLANT_LIMIT_REACHED                              :{WHITE}... limite de plantação de árvores alcançado
-STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nome deve ser único
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}O nome tem que ser único
 STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{STRING} no caminho
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Não permitido durante pausa

 # Local authority errors
-STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}A autoridade local de {TOWN} não autorizou
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}A autoridade local de {TOWN} não autoriza
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}A autoridade local de {TOWN} recusa-se a permitir a construção de outro aeroporto nesta localidade
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}A autoridade local de {TOWN} não permite a construção do aeroporto devido à poluição sonora
 STR_ERROR_BRIBE_FAILED                                          :{WHITE}A sua tentativa de suborno foi descoberta por um investigador regional
@@ -5114,7 +5115,7 @@ STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... a fl
 STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE                     :{WHITE}... só se pode construir acima da linha da neve
 STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE                     :{WHITE}... só se pode construir abaixo da linha da neve

-STR_ERROR_PROSPECTING_WAS_UNLUCKY                               :{WHITE}O financiamento falhou em prospetar devido ao azar; tente novamente
+STR_ERROR_PROSPECTING_WAS_UNLUCKY                               :{WHITE}Por azar o financiamento da prospeção falhou; tente novamente
 STR_ERROR_NO_SUITABLE_PLACES_FOR_PROSPECTING                    :{WHITE}Não havia locais adequados para prospetar esta indústria
 STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES                     :{WHITE}Não foram encontrados locais adequados para '{STRING}' indústrias
 STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION         :{WHITE}Altera os parâmetros de geração do mapa para obter um mapa melhor
@@ -5138,7 +5139,7 @@ STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiad
 STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiadas estações de carga
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Muito perto de outra doca
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Demasiado perto de outro aeroporto
-STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Não pode alterar o nome da estação...
+STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Não é possível alterar o nome da estação...
 STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}Não é possível mover o letreiro da estação...
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... estrada pertence a uma localidade
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... estrada orientada na direção incorreta
@@ -5207,10 +5208,10 @@ STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Não é
 STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tipo de depósito errado

 # Depot unbunching related errors
-STR_ERROR_UNBUNCHING_ONLY_ONE_ALLOWED                           :{WHITE}... só pode ter uma ordem de desagrupar
-STR_ERROR_UNBUNCHING_NO_FULL_LOAD                               :{WHITE}... não é possível usar ordens de carga completa quando o veículo tem uma ordem de desagrupar
+STR_ERROR_UNBUNCHING_ONLY_ONE_ALLOWED                           :{WHITE}... só pode ter uma ordem para desagrupar
+STR_ERROR_UNBUNCHING_NO_FULL_LOAD                               :{WHITE}... não é possível usar ordens de carga completa quando o veículo tem uma ordem para desagrupar
 STR_ERROR_UNBUNCHING_NO_UNBUNCHING_FULL_LOAD                    :{WHITE}... não é possível desagrupar um veículo com ordem de carga completa
-STR_ERROR_UNBUNCHING_NO_CONDITIONAL                             :{WHITE}... não é possível usar ordens condicionais quando um veículo tem uma ordem de desagrupar
+STR_ERROR_UNBUNCHING_NO_CONDITIONAL                             :{WHITE}... não é possível usar ordens condicionais quando um veículo tem uma ordem para desagrupar
 STR_ERROR_UNBUNCHING_NO_UNBUNCHING_CONDITIONAL                  :{WHITE}... não é possível desagrupar um veículo com uma ordem condicional

 # Autoreplace related errors
@@ -5331,10 +5332,10 @@ STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Navio n
 STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aeronave não está disponível

 ###length VEHICLE_TYPES
-STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Não é possível converter comboio...
-STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Não é possível reconverter veículo
+STR_ERROR_CAN_T_REFIT_TRAIN                                     :{WHITE}Não é possível adaptar comboio...
+STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE                              :{WHITE}Não é possível adaptar veículo
 STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Não é possível adaptar navio...
-STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Não é possível converter aeronave...
+STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Não é possível adaptar aeronave...

 ###length VEHICLE_TYPES
 STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Não é possível renomear comboio...
@@ -5393,13 +5394,13 @@ STR_ERROR_CAN_T_CLONE_VEHICLE_LIST                              :{WHITE}... nem

 STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL                          :{WHITE}Nenhum veículo estará disponível
 STR_ERROR_NO_VEHICLES_AVAILABLE_AT_ALL_EXPLANATION              :{WHITE}Mudar a sua configuração NewGRF
-STR_ERROR_NO_VEHICLES_AVAILABLE_YET                             :{WHITE}Nenhum veículo ainda disponível
-STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION                 :{WHITE}Começar um novo jogo depois de {DATE_SHORT} ou utilizar um NewGRF que forneça veículos iniciais
+STR_ERROR_NO_VEHICLES_AVAILABLE_YET                             :{WHITE}Ainda não existe veículos disponíveis
+STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION                 :{WHITE}Começar um novo jogo depois de {DATE_SHORT} ou utilizar um NewGRF que forneça veículos iniciais nesta data

-STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL                    :{WHITE}Não está disponível nenhum tipo de estrada edificável para localidades
+STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL                    :{WHITE}Não está disponível nenhum tipo de estrada para construir em localidades
 STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL_EXPLANATION        :{WHITE}Mudar a sua configuração NewGRF
-STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET                       :{WHITE}Ainda não estão disponíveis tipos de estradas edificáveis para localidades
-STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET_EXPLANATION           :{WHITE}Começar um novo jogo depois de {DATE_SHORT} ou usar um NewGRF que forneça antecipadamente tipos de estradas edificáveis em localidades
+STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET                       :{WHITE}Ainda não estão disponíveis tipos de estradas para construir em localidades
+STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET_EXPLANATION           :{WHITE}Começar um novo jogo depois de {DATE_SHORT} ou usar um NewGRF que forneça antecipadamente tipos de estradas para construir em localidades

 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Não é possível fazer o comboio passar o sinal com perigo...
@@ -5420,7 +5421,7 @@ STR_ERROR_CAN_T_MOVE_THIS_ORDER                                 :{WHITE}Não é
 STR_ERROR_CAN_T_SKIP_ORDER                                      :{WHITE}Não é possível saltar a ordem atual...
 STR_ERROR_CAN_T_SKIP_TO_ORDER                                   :{WHITE}Não é possível saltar a ordem selecionada...
 STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... veiculo não pode ir a todas as estações
-STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... veiculo não pode ir a essa estação
+STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... veiculo não pode ir para essa estação
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... um veículo a partilhar esta ordem não pode ir a essa estação
 STR_ERROR_CAN_T_COPY_ORDER_VEHICLE_LIST                         :{WHITE}... nem todos os veículos têm as mesmas ordens
 STR_ERROR_CAN_T_SHARE_ORDER_VEHICLE_LIST                        :{WHITE}... nem todos os veículos estão a partilhar ordens
@@ -5890,7 +5891,7 @@ STR_FORMAT_DEPOT_NAME_SHIP                                      :{G=m}Estaleiro
 STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :{G=m}Estaleiro Naval de {TOWN} #{COMMA}
 ###next-name-looks-similar

-STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{G=m}Hangar de {STATION}
+STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :{G=m}Hangar {G de do da dos das} {STATION}
 # _SERIAL version of AIRACRAFT doesn't exist

 STR_UNKNOWN_STATION                                             :estação desconhecida
@@ -2833,10 +2833,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Suburbiile peri
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Suburbiile urbane
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centrul orașului

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Preveniți upgrade-urile
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Alege dacă această casă va fi protejată împotriva înlocuirii pe măsură ce orașul crește
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Oprit
-STR_HOUSE_PICKER_PROTECT_ON                                     :Pornit
+

 STR_STATION_CLASS_DFLT                                          :Implicită
 STR_STATION_CLASS_DFLT_STATION                                  :Stație implicită
@@ -2103,11 +2103,11 @@ STR_CONFIG_SETTING_NEWS_MESSAGES_SUMMARY                        :кратко
 STR_CONFIG_SETTING_NEWS_MESSAGES_FULL                           :полностью

 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :Цветные газеты появляются в {STRING} году
-STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :Обычно в газетах печатают чёрно-белые изображения, а начиная с указанного года - цветные
+STR_CONFIG_SETTING_COLOURED_NEWS_YEAR_HELPTEXT                  :В старых газетах печатают чёрно-белые изображения, а начиная с указанного года - цветные
 STR_CONFIG_SETTING_STARTING_YEAR                                :Год начала игры: {STRING}

 STR_CONFIG_SETTING_ENDING_YEAR                                  :Последний год игры: {STRING}
-STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :По прошествии указанного года рейтинг компании рассчитывается, записывается и выводится таблица рекордов. После этого игру можно продолжить.{}Если указанный год предшествует году начала игры, то таблица рекордов не отображается.
+STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT                         :Год окончания игры. В конце указанного года рейтинг компании рассчитывается, записывается и выводится таблица рекордов. После этого игру можно продолжить.{}Если указанный год предшествует году начала игры, то таблица рекордов не отображается.
 STR_CONFIG_SETTING_ENDING_YEAR_VALUE                            :{NUM}
 ###setting-zero-is-special
 STR_CONFIG_SETTING_ENDING_YEAR_ZERO                             :Никогда
@@ -3049,10 +3049,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Перифер
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Центральные районы
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Центр

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Запрет улучшений
+STR_HOUSE_PICKER_PROTECT                                        :Запретить обновление
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Вы можете указать, что это здание нельзя заменять другим, несмотря на рост и расширение города.
-STR_HOUSE_PICKER_PROTECT_OFF                                    :отключён
-STR_HOUSE_PICKER_PROTECT_ON                                     :включён
+
+STR_HOUSE_PICKER_REPLACE                                        :Автозамена
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Укажите, заменять ли автоматически уже стоящие здания

 STR_STATION_CLASS_DFLT                                          :Стандартная станция
 STR_STATION_CLASS_DFLT_STATION                                  :Стандартная ж/д станция
@@ -5274,7 +5275,7 @@ STR_ERROR_CAN_T_EXPAND_TOWN                                     :{WHITE}Нево
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... слишком близко к краю карты
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... слишком близко к другому городу
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... слишком много городов
-STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... нет места на карте
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... на карте нет места
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Идут дорожные работы...
 STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Невозможно снести город.{}{}К нему относится станция или депо, либо невозможно очистить одну из занимаемых им клеток.
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... в центре города нет места для статуи
@@ -5466,19 +5467,19 @@ STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Нача
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... оба конца моста должны опираться на землю
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... мост слишком длинный
 STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}Мост выходит за пределы карты
-STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}Высота моста {HEIGHT} недостаточна для строительства станции
-STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}Высота моста {HEIGHT} недостаточна для строительства остановки
-STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}Высота моста {HEIGHT} недостаточна для строительства пристани
-STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE}Высота моста {HEIGHT} недостаточна для установки буя
-STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}Высота моста {HEIGHT} недостаточна для строительства маршрутной точки
-STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}Высота моста {HEIGHT} недостаточна для строительства маршрутной точки
-STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :{WHITE}Высота моста {HEIGHT} недостаточна для строительства шлюза
+STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}Высота моста - {HEIGHT}, этого недостаточно для станции
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}Высота моста - {HEIGHT}, этого недостаточно для остановки
+STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}Высота моста - {HEIGHT}, этого недостаточно для пристани
+STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE}Высота моста - {HEIGHT}, этого недостаточно для буя
+STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}Высота моста - {HEIGHT}, этого недостаточно для маршрутной точки
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}Высота моста - {HEIGHT}, этого недостаточно для маршрутной точки
+STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :{WHITE}Высота моста - {HEIGHT}, этого недостаточно для шлюза

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Здесь невозможно построить туннель...
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Неподходящее место для строительства туннеля
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Сначала снесите туннель
-STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Другой туннель на пути
+STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Туннели не могут пересекаться
 STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Туннель заканчивается за пределами карты
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Невозможно поднять/опустить землю для другого конца туннеля
 STR_ERROR_TUNNEL_TOO_LONG                                       :{WHITE}... туннель слишком длинный
@@ -5585,7 +5586,7 @@ STR_ERROR_NO_VEHICLES_AVAILABLE_YET_EXPLANATION                 :{WHITE}Уста
 STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL                    :{WHITE}Отсутствуют типы дорог, которые могла бы прокладывать городская администрация
 STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_AT_ALL_EXPLANATION        :{WHITE}Измените конфигурацию установленных модулей NewGRF
 STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET                       :{WHITE}Пока что отсутствуют типы дорог, которые могла бы прокладывать городская администрация
-STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET_EXPLANATION           :{WHITE}Установите дату начала игры не ранее {DATE_SHORT} или установите модуль NewGRF, добавляющий типы дорог, которые будут доступны администрациям городов на выбранную вами дату.
+STR_ERROR_NO_TOWN_ROADTYPES_AVAILABLE_YET_EXPLANATION           :{WHITE}Установите дату начала игры не ранее {DATE_SHORT} или установите модуль NewGRF, добавляющий типы дорог, которые будут доступны для строительства на выбранную вами дату.

 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Невозможно игнорировать светофор. Опасно...
@@ -2912,6 +2912,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Gradnja



+
 STR_STATION_CLASS_DFLT                                          :Podrazumevana stanica
 STR_STATION_CLASS_WAYP                                          :Putanje

@@ -2878,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :外郊区
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :内郊区
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :城镇中心

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :防止升级
+STR_HOUSE_PICKER_PROTECT                                        :阻止重盖建筑
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :选择是否保护房屋以防止房屋随着城镇发展被替换
-STR_HOUSE_PICKER_PROTECT_OFF                                    :关闭
-STR_HOUSE_PICKER_PROTECT_ON                                     :开启
+
+STR_HOUSE_PICKER_REPLACE                                        :替换现有建筑
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :选择是否自动移除选中格子上已经存在的房屋

 STR_STATION_CLASS_DFLT                                          :默认
 STR_STATION_CLASS_DFLT_STATION                                  :默认车站
@@ -2849,6 +2849,7 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Zvoľ veľkosť
 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Okraj


+
 STR_STATION_CLASS_DFLT                                          :Pôvodná
 STR_STATION_CLASS_DFLT_STATION                                  :Predvolená stanica
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :Predvolená zastávka
@@ -2509,6 +2509,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Zgradi p



+
 STR_STATION_CLASS_DFLT                                          :Privzeta postaja
 STR_STATION_CLASS_WAYP                                          :Točke poti

@@ -255,6 +255,7 @@ STR_UNITS_FORCE_SI                                              :{DECIMAL}{NBSP}
 STR_UNITS_HEIGHT_IMPERIAL                                       :{DECIMAL}{NBSP}pies
 STR_UNITS_HEIGHT_METRIC                                         :{DECIMAL}{NBSP}m
 STR_UNITS_HEIGHT_SI                                             :{DECIMAL}{NBSP}m
+STR_UNITS_HEIGHT_GAMEUNITS                                      :{DECIMAL}{NBSP}nivel{P "" es}

 # Time units used in string control characters
 STR_UNITS_DAYS                                                  :{COMMA}{NBSP}día{P "" s}
@@ -268,6 +269,7 @@ STR_UNITS_YEARS                                                 :{NUM}{NBSP}año
 STR_UNITS_PERIODS                                               :{NUM}{NBSP}periodo{P "" s}

 STR_LIST_SEPARATOR                                              :,{SPACE}
+STR_TRUNCATION_ELLIPSIS                                         :...

 # Common window strings
 STR_LIST_FILTER_TITLE                                           :{BLACK}Filtro:
@@ -286,7 +288,7 @@ STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Cierra l
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título de la ventana - arrastra para moverla
 STR_TOOLTIP_SHADE                                               :{BLACK}Oculta la ventana - muestra sólo el título de la ventana
 STR_TOOLTIP_DEBUG                                               :{BLACK}Muestra la información de depuración NewGRF
-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_DEFSIZE                                             :{BLACK}Redimensiona la 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}Clica y arrastra para redimensionar la ventana
 STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alterna el tamaño de ventana entre grande/pequeño
@@ -311,6 +313,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Al activ
 STR_BUTTON_DEFAULT                                              :{BLACK}Por defecto
 STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
 STR_BUTTON_OK                                                   :{BLACK}Aceptar
+STR_BUTTON_MOVE                                                 :{BLACK}Mover

 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :º1234567890'¡qwertyuiop`+asdfghjklñ´ç<zxcvbnm,.- .
@@ -409,7 +412,7 @@ STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Construi
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Construir aeropuertos
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Abrir el menú de terreno para nivelar/elevar el terreno, plantar árboles, etc.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Abrir ventana de sonido/música
-STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Abrir último mensaje/noticia, historial de mensajes o borrar todos los mensajes
+STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Abrir último mensaje/noticia, historial de mensajes o eliminar todos los mensajes
 STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Abrir información del terreno, menú de capturas de pantalla, créditos de OpenTTD o herramientas de desarrollador
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Cambiar barras de herramientas

@@ -530,7 +533,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Sonido/música
 # Message menu
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Último mensaje/noticia
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Historial de mensajes
-STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Borrar todos los mensajes
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Eliminar todos los mensajes

 # About menu
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Información del terreno
@@ -622,8 +625,14 @@ STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Gráfica

 STR_GRAPH_LAST_24_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Últimos 24 minutos
 STR_GRAPH_LAST_72_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Últimos 72 minutos
+STR_GRAPH_LAST_288_MINUTES_TIME_LABEL                           :{TINY_FONT}{BLACK}Últimos 288 minutos

+STR_GRAPH_LAST_24_MONTHS                                        :{TINY_FONT}{BLACK}2 años (mensual)
+STR_GRAPH_LAST_24_QUARTERS                                      :{TINY_FONT}{BLACK}6 años (trimestral)
+STR_GRAPH_LAST_24_YEARS                                         :{TINY_FONT}{BLACK}24 años (anual)

+STR_GRAPH_TOGGLE_RANGE                                          :Alterna entre mostrar/ocultar la gráfica para este rango de datos
+STR_GRAPH_SELECT_SCALE                                          :Cambia la escala horizontal de la gráfica

 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}Tarifas de pago de cargas
 STR_GRAPH_CARGO_PAYMENT_RATES_DAYS                              :{TINY_FONT}{BLACK}Días en tránsito
@@ -631,14 +640,20 @@ STR_GRAPH_CARGO_PAYMENT_RATES_SECONDS                           :{TINY_FONT}{BLA
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}Pago por entregar 10 unidades (o 10 000 litros) de carga a una distancia de 20 casillas
 STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Todas
 STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Ninguna
-STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Muestra todos los tipos de carga en la gráfica de tarifas de pago de cargas
-STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Oculta todos los tipos de carga en la gráfica de tarifas de pago de cargas
+STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Muestra todos los tipos de carga en la gráfica
+STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Oculta todos los tipos de carga en la gráfica
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Alterna entre mostrar/ocultar la gráfica para este tipo de carga
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}

+STR_GRAPH_INDUSTRY_CAPTION                                      :{WHITE}{INDUSTRY} - Historial de Carga
 STR_GRAPH_INDUSTRY_RANGE_PRODUCED                               :Producido
 STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED                            :Transportado
+STR_GRAPH_INDUSTRY_RANGE_DELIVERED                              :Entregado
+STR_GRAPH_INDUSTRY_RANGE_WAITING                                :En espera

+STR_GRAPH_TOWN_CARGO_CAPTION                                    :{WHITE}{TOWN} - Historial de Carga
+STR_GRAPH_TOWN_RANGE_PRODUCED                                   :Suministrado
+STR_GRAPH_TOWN_RANGE_TRANSPORTED                                :Transportado

 STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Muestra detalles del nivel de desempeño

@@ -732,7 +747,7 @@ STR_PLAYLIST_MUSIC_SELECTION_SETNAME                            :{WHITE}Programa
 STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
 STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}Índice de pistas
 STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}Programa - '{STRING}'
-STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Borrar
+STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Eliminar
 STR_PLAYLIST_CHANGE_SET                                         :{BLACK}Cambiar set
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Borra el programa actual (sólo Personalizado1 y 2)
 STR_PLAYLIST_TOOLTIP_CHANGE_SET                                 :{BLACK}Cambia la selección musical a otro set instalado
@@ -969,7 +984,7 @@ STR_GAME_OPTIONS_TAB_SOUND_TOOLTIP                              :Selecciona los
 STR_GAME_OPTIONS_TAB_SOCIAL                                     :Social
 STR_GAME_OPTIONS_TAB_SOCIAL_TOOLTIP                             :Selecciona los ajustes de integración social
 STR_GAME_OPTIONS_TAB_ADVANCED                                   :Avanzado
-STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Cambiar ajustes avanzados
+STR_GAME_OPTIONS_TAB_ADVANCED_TOOLTIP                           :Cambia los ajustes avanzados

 STR_GAME_OPTIONS_VOLUME                                         :Volumen
 STR_GAME_OPTIONS_SFX_VOLUME                                     :Efectos de sonido
@@ -1030,6 +1045,7 @@ STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit malasio
 STR_GAME_OPTIONS_CURRENCY_LVL                                   :Lats letón
 STR_GAME_OPTIONS_CURRENCY_PTE                                   :Escudo portugués
 STR_GAME_OPTIONS_CURRENCY_UAH                                   :Grivna ucraniana
+STR_GAME_OPTIONS_CURRENCY_VND                                   :Dong vietnamita

 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :Autoguardado
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :Selección del intervalo entre guardados automáticos del juego
@@ -1088,9 +1104,9 @@ STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP                :Se abrirá el n
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW                     :Vista previa del resultado
 STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :Muestra el resultado de la encuesta para el juego actual

-STR_GAME_OPTIONS_DISPLAY                                        :Mostrar
+STR_GAME_OPTIONS_DISPLAY                                        :Pantalla

-STR_GAME_OPTIONS_REFRESH_RATE                                   :Mostrar frecuencia de actualización
+STR_GAME_OPTIONS_REFRESH_RATE                                   :Frecuencia de actualización de la pantalla
 STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :Selecciona la frecuencia de actualización de la pantalla
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM} Hz
 STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Las frecuencias de actualización superiores a 60 Hz pueden afectar al rendimiento.
@@ -1304,6 +1320,9 @@ STR_CONFIG_SETTING_INTEREST_RATE_HELPTEXT                       :Porcentaje de i
 STR_CONFIG_SETTING_RUNNING_COSTS                                :Costes de operación: {STRING}
 STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT                       :Permite fijar el nivel de los costes de mantenimiento y operación de vehículos e infraestructuras
 ###length 3
+STR_CONFIG_SETTING_RUNNING_COSTS_LOW                            :Bajos
+STR_CONFIG_SETTING_RUNNING_COSTS_MEDIUM                         :Medios
+STR_CONFIG_SETTING_RUNNING_COSTS_HIGH                           :Altos

 STR_CONFIG_SETTING_CONSTRUCTION_SPEED                           :Velocidad de construcción: {STRING}
 STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT                  :Limita la velocidad de las acciones de construcción para las IA
@@ -1326,6 +1345,9 @@ STR_CONFIG_SETTING_SUBSIDY_DURATION_DISABLED                    :Sin subvencione
 STR_CONFIG_SETTING_CONSTRUCTION_COSTS                           :Costes de construcción: {STRING}
 STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HELPTEXT                  :Fija el nivel de los costes de construcción y compra
 ###length 3
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS_LOW                       :Bajos
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS_MEDIUM                    :Medios
+STR_CONFIG_SETTING_CONSTRUCTION_COSTS_HIGH                      :Altos

 STR_CONFIG_SETTING_RECESSIONS                                   :Recesiones: {STRING}
 STR_CONFIG_SETTING_RECESSIONS_HELPTEXT                          :Si se activa, ocurrirán recesiones periódicamente. Durante una recesión, toda la producción es significativamente menor (volverá a su nivel anterior cuando acabe la recesión)
@@ -1406,7 +1428,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :Prospección
 STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :Área plana alrededor de industrias: {STRING}
 STR_CONFIG_SETTING_INDUSTRY_PLATFORM_HELPTEXT                   :Cantidad de espacio plano alrededor de una industria. Esto permite que haya espacio libre alrededor de las industrias para construir

-STR_CONFIG_SETTING_MULTIPINDTOWN                                :Construcción de más de una industria similar por municipio: {STRING}
+STR_CONFIG_SETTING_MULTIPINDTOWN                                :Permitir más de una industria del mismo tipo por municipio: {STRING}
 STR_CONFIG_SETTING_MULTIPINDTOWN_HELPTEXT                       :Normalmente, no se permite más de una industria del mismo tipo por municipio. Con esta opción, se permiten múltiples industrias del mismo tipo en el mismo municipio

 STR_CONFIG_SETTING_SIGNALSIDE                                   :Mostrar señales: {STRING}
@@ -1671,6 +1693,8 @@ STR_CONFIG_SETTING_SCROLLMODE_LMB                               :Mueve el mapa c
 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 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_TOOLBAR_DROPDOWN_AUTOSELECT                  :Comportamiento tradicional de selección del menú de la barra de herramientas: {STRING}
+STR_CONFIG_SETTING_TOOLBAR_DROPDOWN_AUTOSELECT_HELPTEXT         :Elige el comportamiento de los menús de la barra de herramientas. Si está desactivado, los menús permanecerán abiertos hasta que se realice una selección. Si está activado, los menús se activarán cuando se suelte el botón del ratón.

 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
@@ -2066,7 +2090,7 @@ STR_CONFIG_SETTING_LARGER_TOWNS_VALUE                           :1 de cada {COMM
 ###setting-zero-is-special
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :Ninguna
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :Multiplicador inicial del tamaño de ciudad: {STRING}
-STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :Tamaño medio de las ciudades en relación a los pueblos normales al comienzo de la partida
+STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT                :Tamaño medio de las ciudades en relación a los municipios normales al comienzo de la partida

 STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL                    :Actualizar gráfico de distribución cada {STRING}
 STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL_HELPTEXT           :Intervalo entre cálculos sucesivos del grafo de distribución. Cada cálculo planifica uno de los componentes del grafo. Esto significa que un valor X en este ajuste no implica que el grafo completo se actualice cada X segundos. Solo lo hará algún componente. Cuanto más corto sea, más tiempo de CPU será necesario para calcularlo. Cuanto más largo sea, más tiempo tardará la distribución de carga en incorporar nuevas rutas
@@ -2080,11 +2104,11 @@ STR_CONFIG_SETTING_DISTRIBUTION_MAIL_HELPTEXT                   :En una distribu
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED                        :Modo de distribución para la clase de carga BLINDADA: {STRING}
 STR_CONFIG_SETTING_DISTRIBUTION_ARMOURED_HELPTEXT               :El tipo de carga BLINDADA contiene objetos de valor en el clima templado, diamantes en el clima subtropical y oro en el clima subártico. Los NewGRFs pueden modificar esto. En una distribución "Simétrica", se envía la misma cantidad de carga de la estación A a la B que de la B a la A. En una distribución "Asimétrica" se pueden enviar cantidades arbitrarias de carga en ambas direcciones. "Manual" significa que no se realiza una distribución automática para esta carga. Se recomienda fijar esta distribución en "Asimétrica" o en "Manual" al jugar en los clima subártico y subtropical, ya que los bancos sólo reciben carga en esos climas. En el clima templado es factible escoger "Simétrica" ya que los bancos pueden enviar objetos de valor de vuelta al banco de origen
 STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT                         :Modo de distribución para otras clases de carga: {STRING}
-STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :"Asimétrico" significa que se pueden mover cantidades arbitrarias de carga en ambas direcciones. "Manual" significa que no habrá distribución automática para estos tipos de carga
+STR_CONFIG_SETTING_DISTRIBUTION_DEFAULT_HELPTEXT                :"Asimétrica" significa que se pueden mover cantidades arbitrarias de carga en ambas direcciones. "Manual" significa que no habrá distribución automática para estos tipos de carga
 ###length 3
-STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :manual
-STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :asimétrico
-STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC                       :simétrico
+STR_CONFIG_SETTING_DISTRIBUTION_MANUAL                          :Manual
+STR_CONFIG_SETTING_DISTRIBUTION_ASYMMETRIC                      :Asimétrica
+STR_CONFIG_SETTING_DISTRIBUTION_SYMMETRIC                       :Simétrica

 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY                           :Precisión de la distribución: {STRING}
 STR_CONFIG_SETTING_LINKGRAPH_ACCURACY_HELPTEXT                  :Este valor determina el tiempo de CPU empleado en calcular el grafo de distribución. Si es demasiado elevado puede producir ralentización en el juego. Si es demasiado bajo la distribución puede ser poco precisa, causando que ocasionalmente se produzcan errores en los lugares a los que se destina la carga
@@ -2141,6 +2165,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Cada vez que se
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperial (pies)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Métrico (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_GAMEUNITS          :Unidades del juego (niveles)

 STR_CONFIG_SETTING_LOCALISATION                                 :Localización
 STR_CONFIG_SETTING_GRAPHICS                                     :Gráficos
@@ -2323,27 +2348,30 @@ STR_LIVERY_FREIGHT_TRAM                                         :Tranvía de Car
 # Face selection window
 STR_FACE_CAPTION                                                :{WHITE}Selección de cara
 STR_FACE_CANCEL_TOOLTIP                                         :{BLACK}Cancela la selección de cara nueva
-STR_FACE_OK_TOOLTIP                                             :{BLACK}Aceptar selección de nueva cara
+STR_FACE_OK_TOOLTIP                                             :{BLACK}Acepta la nueva selección de cara

 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Cara Nueva
-STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generar cara al azar
+STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Genera una cara al azar
 STR_FACE_ADVANCED                                               :{BLACK}Avanzada
 STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selección avanzada de caras
 STR_FACE_SIMPLE                                                 :{BLACK}Sencilla
 STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selección simple de caras
 STR_FACE_LOAD                                                   :{BLACK}Cargar
-STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Cargar cara favorita
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Carga la cara favorita
 STR_FACE_LOAD_DONE                                              :{WHITE}Tu cara favorita ha sido cargada del fichero de configuración de OpenTTD
-STR_FACE_FACECODE                                               :{BLACK}Cara del jugador no.
-STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Ver y/o asignar número de cara de presidente
-STR_FACE_FACECODE_CAPTION                                       :{WHITE}Ver y/o asignar número de cara de presidente
-STR_FACE_FACECODE_SET                                           :{WHITE}Nuevo código de cara ha sido asignado
-STR_FACE_FACECODE_ERR                                           :{WHITE}No se puede asignar número de cara de presidente - ¡Ha de ser un número entre 0 y 4,294,967,295!
+STR_FACE_FACECODE                                               :{BLACK}Código de cara del jugador
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Muestra y/o asigna el código de cara del presidente de la empresa
+STR_FACE_FACECODE_CAPTION                                       :{WHITE}Mostrar y/o asignar el código de cara de presidente
+STR_FACE_FACECODE_SET                                           :{WHITE}Se ha asignado una nueva cara de presidente
+STR_FACE_FACECODE_ERR                                           :{WHITE}No se puede asignar el código de cara de presidente - deben ser una etiqueta y número válidos
 STR_FACE_SAVE                                                   :{BLACK}Guardar
-STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Guardar cara favorita
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Guarda como cara favorita
 STR_FACE_SAVE_DONE                                              :{WHITE}Esta cara ha sido guardada como tu favorita en el fichero de configuración
+STR_FACE_SETTING_TOGGLE                                         :{STRING} {ORANGE}{STRING}
+STR_FACE_SETTING_NUMERIC                                        :{STRING} {ORANGE}{NUM} / {NUM}
 STR_FACE_YES                                                    :Sí
 STR_FACE_NO                                                     :No
+STR_FACE_STYLE                                                  :Estilo:
 STR_FACE_HAIR                                                   :Pelo:
 STR_FACE_EYEBROWS                                               :Cejas:
 STR_FACE_EYECOLOUR                                              :Color ojos:
@@ -2719,7 +2747,7 @@ STR_MISSING_GRAPHICS_ERROR_QUIT                                 :{BLACK}Salir de

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opciones de Transparencia
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Ajustar transparencia para carteles. Ctrl+clic para bloquear
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Ajustar transparencia para letreros. 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
@@ -2816,6 +2844,10 @@ STR_PICKER_MODE_USED_TOOLTIP                                    :Muestra/Oculta
 STR_PICKER_MODE_SAVED                                           :Guardados
 STR_PICKER_MODE_SAVED_TOOLTIP                                   :Muestra/Oculta sólo los elementos guardados

+STR_PICKER_PREVIEW_SHRINK                                       :-
+STR_PICKER_PREVIEW_SHRINK_TOOLTIP                               :Reduce la altura de las imágenes de previsualización. Ctrl+clic para reducir al máximo
+STR_PICKER_PREVIEW_EXPAND                                       :+
+STR_PICKER_PREVIEW_EXPAND_TOOLTIP                               :Incrementa la altura de las imágenes de previsualización. Ctrl+clic para aumentar al máximo

 STR_PICKER_STATION_CLASS_TOOLTIP                                :Selecciona una clase de estación para mostrar
 STR_PICKER_STATION_TYPE_TOOLTIP                                 :Selecciona un tipo de estación para construir. Ctrl+clic para añadir o eliminar en elementos guardados
@@ -2831,15 +2863,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Selecciona una
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Selecciona un tipo de edificio para construir. Ctrl+clic para añadir o eliminar en elementos guardados

 STR_HOUSE_PICKER_CAPTION                                        :Selección de Edificios
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Nombre: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Población: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}Años: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Años: {ORANGE}Cualquiera
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Años: {ORANGE}Desde {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Años: {ORANGE}Hasta {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Tamaño: {ORANGE}{NUM}x{NUM} casillas
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Carga aceptada: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Carga producida: {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Nombre: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Población: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Años: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Años: {GOLD}Cualquiera
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Años: {GOLD}Desde {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Años: {GOLD}Hasta {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Tamaño: {GOLD}{NUM}x{NUM} casillas
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Carga aceptada: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Carga producida: {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Afueras
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Periferia
@@ -2847,10 +2879,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Suburbios exter
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Suburbios interiores
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centro urbano

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Evitar mejoras
-STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Selecciona si esta casa estará protegida de reemplazos cuando el municipio crezca
-STR_HOUSE_PICKER_PROTECT_OFF                                    :No
-STR_HOUSE_PICKER_PROTECT_ON                                     :Sí
+STR_HOUSE_PICKER_PROTECT                                        :Impedir mejoras
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Selecciona para que este edificio esté protegido de reemplazos cuando el municipio crezca
+
+STR_HOUSE_PICKER_REPLACE                                        :Reemplazar existentes
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Selecciona para que se elimine automáticamente un edificio existente en la casilla donde se sitúe este edificio

 STR_STATION_CLASS_DFLT                                          :Por defecto
 STR_STATION_CLASS_DFLT_STATION                                  :Estación por defecto
@@ -3056,11 +3089,11 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccio
 STR_FOUND_TOWN_CITY                                             :{BLACK}Ciudad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Las ciudades crecen más rápido que los municipios{}Dependiendo de los ajustes, son mayores al ser fundadas

-STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Expansión del pueblo:
+STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}Expansión del municipio:
 STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :Edificios
-STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Aumentar edificios de los pueblos
+STR_FOUND_TOWN_EXPAND_BUILDINGS_TOOLTIP                         :Aumenta los edificios de los municipios
 STR_FOUND_TOWN_EXPAND_ROADS                                     :Carreteras
-STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Aumentar carreteras de los pueblos
+STR_FOUND_TOWN_EXPAND_ROADS_TOOLTIP                             :Aumenta las carreteras de los municipios

 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Patrón de carretera:
 STR_FOUND_TOWN_SELECT_LAYOUT_TOOLTIP                            :{BLACK}Seleccionar patrón de carreteras para este municipio
@@ -3305,7 +3338,7 @@ STR_SAVELOAD_HOME_BUTTON_TOOLTIP                                :{BLACK}Clica aq
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} libres
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Listado de unidades, directorios y partidas guardadas
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nombre seleccionado actualmente para la partida guardado
-STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Borrar
+STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Eliminar
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Borra la partida guardada seleccionada
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Guardar
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Guarda la partida actual, usando el nombre seleccionado
@@ -3320,6 +3353,8 @@ STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF:
 STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filtro:
 STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Sobrescribir Archivo
 STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}¿Estás seguro de que quieres sobrescribir el archivo existente?
+STR_SAVELOAD_DELETE_TITLE                                       :{WHITE}Eliminar Archivo
+STR_SAVELOAD_DELETE_WARNING                                     :{YELLOW}¿Estás seguro de que quieres eliminar el archivo?
 STR_SAVELOAD_DIRECTORY                                          :{STRING} (Directorio)
 STR_SAVELOAD_PARENT_DIRECTORY                                   :{STRING} (Directorio superior)

@@ -3395,13 +3430,18 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Noroeste
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Noreste
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sureste
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Suroeste
+STR_MAPGEN_NORTHWEST_TOOLTIP                                    :Alterna entre borde de agua o borde libre en el borde noroeste del mapa
+STR_MAPGEN_NORTHEAST_TOOLTIP                                    :Alterna entre borde de agua o borde libre en el borde noreste del mapa
+STR_MAPGEN_SOUTHEAST_TOOLTIP                                    :Alterna entre borde de agua o borde libre en el borde sureste del mapa
+STR_MAPGEN_SOUTHWEST_TOOLTIP                                    :Alterna entre borde de agua o borde libre en el borde suroeste del mapa
 STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Forma libre
 STR_MAPGEN_BORDER_WATER                                         :{BLACK}Agua
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aleatorio

 ###length 3
-STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aleatorio
-STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
+STR_MAPGEN_BORDER_RANDOMIZE                                     :Aleatorio
+STR_MAPGEN_BORDER_MANUAL                                        :Manual
+STR_MAPGEN_BORDER_INFINITE_WATER                                :Agua infinita

 STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotación del mapa de alturas:
 STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nombre del mapa de alturas:
@@ -3440,6 +3480,8 @@ STR_GENERATION_LANDSCAPE_GENERATION                             :{BLACK}Generaci
 STR_GENERATION_RIVER_GENERATION                                 :{BLACK}Generación de ríos
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generación de áreas ásperas o rocosas
 STR_GENERATION_TOWN_GENERATION                                  :{BLACK}Generación de municipios
+STR_GENERATION_LAND_INDUSTRY_GENERATION                         :{BLACK}Generación de industria terrestre
+STR_GENERATION_WATER_INDUSTRY_GENERATION                        :{BLACK}Generación de industria marítima
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Generación de inamovibles
 STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generación de árboles
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Configurar juego
@@ -3464,8 +3506,8 @@ STR_NEWGRF_FILTER_TITLE                                         :{ORANGE}Filtro:
 STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Cargar la configuración seleccionada
 STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Guardar
 STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Guardar la lista actual como configuración
-STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Borrar
-STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Borrar la configuración seleccionada
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Eliminar
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Eliminar la configuración seleccionada
 STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Añadir
 STR_NEWGRF_SETTINGS_ADD_FILE_TOOLTIP                            :{BLACK}Añade el NewGRF seleccionado a tu configuración
 STR_NEWGRF_SETTINGS_RESCAN_FILES                                :{BLACK}Actualizar archivos
@@ -3648,7 +3690,7 @@ STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Mayúscu
 STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Activa/desactiva la coincidencia de mayúsculas y minúsculas al filtrar la lista de letreros

 # Sign window
-STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editar texto del letrero
+STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editar letrero
 STR_EDIT_SIGN_LOCATION_TOOLTIP                                  :{BLACK}Centra la vista principal en el letrero. Ctrl+clic abre un nuevo punto de vista en dicha posición
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ir al letrero siguiente
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ir al letrero anterior
@@ -3659,6 +3701,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Introduc
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Municipios ({COMMA} of {COMMA})
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Ninguna -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{BLACK} ({COMMA}) {YELLOW}{CITY_ICON}
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Nombres de los municipios - Clica sobre un nombre para centrar la vista principal en el municipio. Ctrl+clic abre una ventana de visualización en dicha posición
 STR_TOWN_POPULATION                                             :{BLACK}Población mundial: {COMMA}

@@ -3682,15 +3725,17 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Autoridad local
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Muestra la información sobre las autoridades locales
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Cambia el nombre del municipio
+STR_TOWN_VIEW_CARGO_GRAPH                                       :Gráfica de Carga
+STR_TOWN_VIEW_CARGO_GRAPH_TOOLTIP                               :Muestra la gráfica del historial de carga del municipio

-STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Aumentar
+STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandir
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar la población del municipio
 STR_TOWN_VIEW_EXPAND_BUILDINGS_BUTTON                           :{BLACK}Expandir edificios
-STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Aumentar edificios de los pueblos
+STR_TOWN_VIEW_EXPAND_BUILDINGS_TOOLTIP                          :{BLACK}Aumenta los edificios del municipio
 STR_TOWN_VIEW_EXPAND_ROADS_BUTTON                               :{BLACK}Expandir carreteras
-STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Aumentar carreteras de los pueblos
-STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Borrar
-STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Borrar completamente este municipio
+STR_TOWN_VIEW_EXPAND_ROADS_TOOLTIP                              :{BLACK}Aumenta las carreteras del municipio
+STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Eliminar
+STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Eliminar completamente este municipio

 STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :Renombrar Municipio

@@ -3862,12 +3907,14 @@ STR_CARGO_RATING_EXCELLENT                                      :Excelente
 STR_CARGO_RATING_OUTSTANDING                                    :Excepcional

 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centra la vista principal en la posición de la estación. Ctrl+clic abre un punto de vista en dicha posición
+STR_STATION_VIEW_EDIT_TOOLTIP                                   :{BLACK}Renombra la estación o mueve el letrero

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Muestra todos los trenes que tienen esta estación en sus órdenes
 STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Muestra todos los vehículos de carretera que tienen esta estación en sus órdenes
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Muestra todas las aeronaves que tienen esta estación en sus órdenes
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Muestra todos los barcos que tienen esta estación en sus órdenes

+STR_STATION_VIEW_EDIT_STATION_SIGN                              :{WHITE}Editar letrero de estación

 STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}Cerrar aeropuerto
 STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Evita que las aeronaves aterricen en este aeropuerto
@@ -3875,9 +3922,11 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Evita qu
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrar vista principal en la posición del punto de ruta. Ctrl+clic abre un punto de vista en dicha posición
+STR_WAYPOINT_VIEW_EDIT_TOOLTIP                                  :{BLACK}Renombra el punto de ruta o mueve el letrero
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centra la vista principal en la boya. Ctrl+clic abre una nueva vista en dicha posición
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Cambiar nombre de boya

+STR_WAYPOINT_VIEW_EDIT_WAYPOINT_SIGN                            :{WHITE}Editar letrero del punto de ruta

 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}Finanzas de {COMPANY} {BLACK}{COMPANY_NUM}
@@ -4010,6 +4059,8 @@ STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Producci
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MINUTE_TITLE                  :{BLACK}Producción el minuto anterior:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% transportado)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centra la vista principal sobre la industria. Ctrl+clic abre un punto de vista en dicha posición
+STR_INDUSTRY_VIEW_CARGO_GRAPH                                   :{BLACK}Gráfica de Carga
+STR_INDUSTRY_VIEW_CARGO_GRAPH_TOOLTIP                           :{BLACK}Mostrar la gráfica del historial de carga de la industria
 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!

@@ -4088,8 +4139,8 @@ STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renombra
 STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Cambia el color del grupo seleccionado
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Clica para evitar que los vehículos en este grupo se reemplacen automáticamente. Ctrl+clic protege también a los subgrupos

-STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Borrar Grupo
-STR_GROUP_DELETE_QUERY_TEXT                                     :{WHITE}¿Estás seguro de que quieres borrar este grupo y todos sus subgrupos?
+STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Eliminar grupo
+STR_GROUP_DELETE_QUERY_TEXT                                     :{WHITE}¿Estás seguro de que quieres eliminar este grupo y todos sus subgrupos?

 STR_GROUP_ADD_SHARED_VEHICLE                                    :Añadir vehículos con órdenes compartidas
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Quitar todos los vehículos
@@ -4147,6 +4198,7 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Todo excepto {C
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}F.T. máxima: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Alcance: {GOLD}{COMMA} casillas
 STR_PURCHASE_INFO_AIRCRAFT_TYPE                                 :{BLACK}Tipo de aeronave: {GOLD}{STRING}
+STR_PURCHASE_INFO_RAILTYPES                                     :{BLACK}Tipo de ferrocarril: {GOLD}{STRING}

 ###length 3
 STR_CARGO_TYPE_FILTER_ALL                                       :Todos las cargas
@@ -4330,6 +4382,7 @@ STR_ENGINE_PREVIEW_RUNCOST_YEAR                                 :Coste de operac
 STR_ENGINE_PREVIEW_RUNCOST_PERIOD                               :Coste operacional: {CURRENCY_LONG}/periodo
 STR_ENGINE_PREVIEW_CAPACITY                                     :Capacidad: {CARGO_LONG}
 STR_ENGINE_PREVIEW_CAPACITY_2                                   :Capacidad: {CARGO_LONG}, {CARGO_LONG}
+STR_ENGINE_PREVIEW_RAILTYPES                                    :Tipo de ferrocarril: {STRING}

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Reemplazar {STRING} - {STRING}
@@ -4421,9 +4474,9 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Ver órd
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Ver órdenes de la aeronave. Ctrl+clic muestra su horario

 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Muestra los detalles del tren. Ctrl + Click muestra su grupo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Ver detalles del vehículo. Ctrl+Clic muestra su grupo
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Muestra los detalles del barco. Ctrl + Clic para mostrar su grupo
+STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Muestra los detalles del tren. Ctrl+clic muestra su grupo
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Ver detalles del vehículo. Ctrl+clic muestra su grupo
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Muestra los detalles del barco. Ctrl+clic para mostrar su grupo
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Muesta los detalles de la aeronave

 ###length VEHICLE_TYPES
@@ -4651,11 +4704,11 @@ STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduc
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltarse
 STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}Salta la orden actual y comenienza la siguiente. Ctrl+clic para saltar a la orden seleccionada

-STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Borrar
+STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Eliminar
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}Borra la orden resaltada
 STR_ORDERS_DELETE_ALL_TOOLTIP                                   :{BLACK}Borra todas las órdenes
 STR_ORDERS_STOP_SHARING_BUTTON                                  :{BLACK}Dejar de compartir
-STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}Dejar de compartir la lista de órdenes. Ctrl+clic para borrar además todas las órdenes de este vehículo
+STR_ORDERS_STOP_SHARING_TOOLTIP                                 :{BLACK}Dejar de compartir la lista de órdenes. Ctrl+clic para eliminar además 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
@@ -4777,14 +4830,14 @@ STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Modifica
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Modifica la duración esperada de la orden seleccionada. Ctrl+clic establece la duración para todas las órdenes
 STR_TIMETABLE_CHANGE_TIME_QUERY                                 :Cambiar duración

-STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Borrar duración
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Eliminar duración
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Borra la duración de la orden resaltada.Ctrl+clic borra la duración de todas las órdenes

 STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Modificar límite de velocidad
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Cambia el límite de velocidad de la orden resaltada. Ctrl+clic establece el límite para todas las órdenes
 STR_TIMETABLE_CHANGE_SPEED_QUERY                                :Cambiar límite de velocidad

-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Borrar límite de velocidad
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Eliminar límite de velocidad
 STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Borra el límite de velocidad de la orden resaltada. Ctrl+clic borra el límite de todas las órdenes

 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reiniciar retraso
@@ -4820,7 +4873,7 @@ STR_AI_DEBUG_SETTINGS                                           :{BLACK}Configur
 STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Cambiar la configuración del script
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recargar IA
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Elimina la IA, recarga el código y reinicia la IA
-STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Activa/desactiva la pausa automática cuando un ,mensaje de registro de registro de la IA coincide con la cadena de parada
+STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Activa/desactiva la pausa automática cuando un mensaje de registro de la IA coincide con la cadena de parada
 STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Pausar con:
 STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Pausar cuando el script registre esta cadena
 STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Cuando un mensaje de log de una IA coincide con esta cadena, el juego se pausa
@@ -4933,7 +4986,7 @@ STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}El guard
 STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Error al autoguardar
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}No es posible leer la unidad
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Error al guardar la partida...
-STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}No es posible borrar el archivo
+STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}No es posible eliminar el archivo
 STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}Error al cargar la partida...
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Error interno: {STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Partida guardada corrupta - {STRING}
@@ -4985,6 +5038,7 @@ STR_ERROR_FLAT_LAND_REQUIRED                                    :{WHITE}Se requi
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Tierra inclinada en dirección errónea
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}No se puede hacer eso...
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}El edificio debe demolerse primero
+STR_ERROR_BUILDING_IS_PROTECTED                                 :{WHITE}... el edificio está protegido
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}No se puede despejar esta zona...
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... lugar no apropiado
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... ya construido
@@ -5037,7 +5091,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... dema
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... demasiados municipios
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... no hay más espacio en el mapa
 STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Obras de carretera en progreso
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}No se puede borrar este municipio...{}{}Quedan estaciones o depósitos relacionados con él, o una propiedad suya no puede ser retirada
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}No se puede eliminar este municipio...{}{}Quedan estaciones o depósitos relacionados con él, o una propiedad suya no puede ser retirada
 STR_ERROR_STATUE_NO_SUITABLE_PLACE                              :{WHITE}... no existe un lugar apropiado para una estatua en el centro de este municipio
 STR_ERROR_CAN_T_BUILD_HOUSE                                     :{WHITE}No se puede construir edificio...

@@ -5086,6 +5140,7 @@ STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiad
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Demasiado cerca de otro muelle
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Demasiado cerca de otro aeropuerto
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}No se puede renombrar estación...
+STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}No se puede mover el letrero de la estación
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... carretera propiedad del municipio
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... carretera en dirección incorrecta
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... las estaciones de autobuses de paso no pueden tener esquinas
@@ -5117,6 +5172,7 @@ STR_ERROR_CAN_T_BUILD_RAIL_WAYPOINT                             :{WHITE}No se pu
 STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT                             :{WHITE}No se puede construir punto de ruta de carretera aquí...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}No se puede colocar boya aquí...
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}No se puede cambiar el nombre del punto de ruta...
+STR_ERROR_CAN_T_MOVE_WAYPOINT_NAME                              :WHITE}No se puede mover el letrero del punto de ruta

 STR_ERROR_CAN_T_REMOVE_RAIL_WAYPOINT                            :{WHITE}No se puede retirar punto de ruta de ferrocarril aquí...
 STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}No se puede retirar punto de ruta de carretera aquí...
@@ -5225,6 +5281,13 @@ STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Comienzo
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... los dos extremos de un puente han de estar sobre tierra
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... puente demasiado largo
 STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}El puente terminaría fuera del mapa
+STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}El puente es {HEIGHT} demasiado bajo para la estación
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}El puente es {HEIGHT} demasiado bajo para la estación de carretera
+STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}El puente es {HEIGHT} demasiado bajo para el muelle
+STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE}El puente es {HEIGHT} demasiado bajo para la boya
+STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}El puente es {HEIGHT} demasiado bajo para el punto de ruta de ferrocarril
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}El puente es {HEIGHT} demasiado bajo para el punto de ruta de carretera
+STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :{WHITE}El puente es {HEIGHT} demasiado bajo para la esclusa

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}No se puede construir túnel aquí...
@@ -5246,7 +5309,7 @@ STR_ERROR_BUILD_OBJECT_LIMIT_REACHED                            :{WHITE}... lím

 # Group related errors
 STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}No se puede crear grupo...
-STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}No se puede borrar grupo...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}No se puede eliminar este grupo...
 STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}No se puede renombrar grupo...
 STR_ERROR_GROUP_CAN_T_SET_PARENT                                :{WHITE}No se puede establecer el grupo superior...
 STR_ERROR_GROUP_CAN_T_SET_PARENT_RECURSION                      :{WHITE}... No se permiten bucles en la jerarquía del grupo
@@ -5352,7 +5415,7 @@ STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}La aeron
 STR_ERROR_NO_MORE_SPACE_FOR_ORDERS                              :{WHITE}Falta espacio para más órdenes
 STR_ERROR_TOO_MANY_ORDERS                                       :{WHITE}Demasiadas órdenes
 STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}No se puede insertar una nueva orden...
-STR_ERROR_CAN_T_DELETE_THIS_ORDER                               :{WHITE}No se puede borrar esta orden...
+STR_ERROR_CAN_T_DELETE_THIS_ORDER                               :{WHITE}No se puede eliminar esta orden...
 STR_ERROR_CAN_T_MODIFY_THIS_ORDER                               :{WHITE}No se puede modificar esta orden...
 STR_ERROR_CAN_T_MOVE_THIS_ORDER                                 :{WHITE}No se puede mover esta orden...
 STR_ERROR_CAN_T_SKIP_ORDER                                      :{WHITE}No se puede saltar la orden actual...
@@ -5395,7 +5458,7 @@ STR_ERROR_TIMETABLE_NOT_STARTED                                 :{WHITE}... el h
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... demasiados letreros
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}No se puede colocar un letrero aquí...
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}No se puede cambiar el nombre del letrero...
-STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}No se puede borrar el letrero...
+STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}No se puede eliminar el letrero...

 # Translatable comment for OpenTTD's desktop shortcut
 ###external 1
@@ -5841,6 +5904,8 @@ STR_SAVEGAME_NAME_SPECTATOR                                     :observador, {1:

 # Viewport strings
 STR_VIEWPORT_TOWN_POP                                           :{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN_CITY                                          :{TOWN} {CITY_ICON}
+STR_VIEWPORT_TOWN_CITY_POP                                      :{TOWN} ({COMMA}) {CITY_ICON}
 STR_VIEWPORT_STATION                                            :{STATION} {STATION_FEATURES}

 # Simple strings to get specific types of data
@@ -5904,7 +5969,7 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})

 STR_BADGE_NAME_LIST                                             :{STRING}: {GOLD}{STRING}
-STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Abrir la configuración de insignias
+STR_BADGE_CONFIG_MENU_TOOLTIP                                   :Abre la configuración de insignias
 STR_BADGE_CONFIG_RESET                                          :Restablecer
 STR_BADGE_CONFIG_ICONS                                          :{WHITE}Iconos de insignias
 STR_BADGE_CONFIG_FILTERS                                        :{WHITE}Filtros de insignias
@@ -2871,10 +2871,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Suburbios exter
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Suburbios interiores
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Centro

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Prevenir mejoras
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Optar por que el edificio no sea reemplazado cuando el pueblo crezca
-STR_HOUSE_PICKER_PROTECT_OFF                                    :No
-STR_HOUSE_PICKER_PROTECT_ON                                     :Sí
+

 STR_STATION_CLASS_DFLT                                          :por defecto
 STR_STATION_CLASS_DFLT_STATION                                  :Estación por defecto
@@ -2878,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Yttrerförorter
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Innerförorter
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Stadskärnan

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Förhindra uppgraderingar
+STR_HOUSE_PICKER_PROTECT                                        :Hindra uppgraderingar
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Välj huruvida detta hus ska skyddas från att ersättas i samband med att staden växer
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Av
-STR_HOUSE_PICKER_PROTECT_ON                                     :På
+
+STR_HOUSE_PICKER_REPLACE                                        :Ersätt befintlig
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Välj om befintliga hus automatiskt ska tas bort när denna byggnad placeras

 STR_STATION_CLASS_DFLT                                          :Original
 STR_STATION_CLASS_DFLT_STATION                                  :Standardstation
@@ -5729,7 +5730,7 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_MAIL_TRUCK                    :MPS Postbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_REYNARD_MAIL_TRUCK                :Reynard Postbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_MAIL_TRUCK                  :Perry Postbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_MAIL_TRUCK            :MightyMover postbil
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK            :Powernaught Postbil
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_MAIL_TRUCK            :Powernaught postbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_MAIL_TRUCK               :Wizzowow Postbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_OIL_TANKER               :Witcombe Oljetanker
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_OIL_TANKER                 :Foster Oljetanker
@@ -5773,7 +5774,7 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_FRUIT_TRUCK               :Kelling Fruktla
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_RUBBER_TRUCK               :Balogh Gummidumper
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_RUBBER_TRUCK                  :Uhl Gummidumper
 STR_VEHICLE_NAME_ROAD_VEHICLE_RMT_RUBBER_TRUCK                  :RMT Gummidumper
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK           :MightyMover Sockerlastare
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_SUGAR_TRUCK           :MightyMover sockerlastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_SUGAR_TRUCK           :Powernaught sockerlastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_SUGAR_TRUCK              :Wizzowow sockerlastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COLA_TRUCK            :MightyMover kolalastare
@@ -5782,10 +5783,10 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COLA_TRUCK               :Wizzowow kolala
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_COTTON_CANDY          :MightyMover sockervaddslastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_COTTON_CANDY          :Powernaught sockervaddslastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_COTTON_CANDY_TRUCK       :Wizzowow sockervaddslastare
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK          :MightyMover Knäcklastare
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOFFEE_TRUCK          :MightyMover knäcklastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOFFEE_TRUCK          :Powernaught knäcklastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOFFEE_TRUCK             :Wizzowow knäcklastare
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOY_VAN               :MightyMover Leksaksbil
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_TOY_VAN               :MightyMover leksaksbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_TOY_VAN               :Powernaught leksaksbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOY_VAN                  :Wizzowow leksaksbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK           :MightyMover godislastare
@@ -5797,7 +5798,7 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK            :Wizzowow batter
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK           :MightyMover läsklastbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK           :Powernaught läsklastbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK        :Wizzowow läsklastbil
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK         :MightyMover Plastlastare
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK         :MightyMover plastlastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK         :Powernaught plastlastare
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK            :Wizzowow plastlastbil
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BUBBLE_TRUCK          :MightyMover bubbellastbil
@@ -2542,6 +2542,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}இழ



+
 STR_STATION_CLASS_DFLT                                          :இயல்பிருப்பு
 STR_STATION_CLASS_DFLT_STATION                                  :இயல்பிருப்பு நிலையம்
 STR_STATION_CLASS_DFLT_ROADSTOP                                 :இயல்பிருப்பு சாலை நிறுத்தம்
@@ -2399,6 +2399,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}สร



+
 STR_STATION_CLASS_DFLT                                          :สถานีมาตรฐาน
 STR_STATION_CLASS_WAYP                                          :จุดตรวจ

@@ -442,7 +442,7 @@ STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :離開編輯器
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :離開

-STR_SCENEDIT_TOWN_MENU_BUILD_TOWN                               :生成市鎮
+STR_SCENEDIT_TOWN_MENU_BUILD_TOWN                               :產生市鎮
 STR_SCENEDIT_TOWN_MENU_PACE_HOUSE                               :設置房屋

 # Settings menu
@@ -892,7 +892,7 @@ STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLAC
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(總經理)

 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} 出資贊助新市鎮「{TOWN}」的興建！
-STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}一個名叫{TOWN}的新城鎮剛剛建立了!
+STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}一個名叫{TOWN}的新市鎮剛剛建立了！

 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}新的 {STRING} 正在 {TOWN} 附近建造中！
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}新的 {STRING} 正在 {TOWN} 附近種植中！
@@ -1361,7 +1361,7 @@ STR_CONFIG_SETTING_CITY_APPROVAL                                :地方政府對
 STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT                       :選擇公司所製造的噪音和環境傷害對其在市鎮的評比及未來的建設行動會造成多大影響。

 STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT                             :地圖高度限制：{STRING}
-STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT                    :設定地圖的最大高度。選擇"(自動)"則會在地形生成後自動選取合適的數值。
+STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_HELPTEXT                    :設定地圖的最大高度。選擇「（自動）」則會在產生地形後自動選取合適的數值
 STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_VALUE                       :{NUM}
 ###setting-zero-is-special
 STR_CONFIG_SETTING_MAP_HEIGHT_LIMIT_AUTO                        :（自動）
@@ -1590,7 +1590,7 @@ STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS                          :在車輛列表
 STR_CONFIG_SETTING_SHOW_CARGO_IN_LISTS_HELPTEXT                 :如啟用此選項，車輛可運輸的負載量會於車輛列表上方顯示。

 STR_CONFIG_SETTING_LANDSCAPE                                    :場景：{STRING}
-STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :此設定決定基本的遊戲場景、可供運輸的貨物種類，以及城鎮發展的條件。然而，NewGRF 及遊戲腳本可提供更加細緻的設定。
+STR_CONFIG_SETTING_LANDSCAPE_HELPTEXT                           :此設定決定基本的遊戲場景、可供運輸的貨物種類，以及市鎮發展的條件。然而，NewGRF 及遊戲腳本可提供更加細緻的設定

 STR_CONFIG_SETTING_LAND_GENERATOR                               :地形產生器：{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_HELPTEXT                      :「原版」地圖產生器根據所使用的基本圖形集來產生固定的地形。TerraGenesis 則是一個建基於 Perlin 噪音原理的地形產生程序，支援較為細緻的地形設定。
@@ -1608,14 +1608,14 @@ STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :煉油廠與地
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE_HELPTEXT               :僅於地圖邊緣建造煉油廠，在島嶼型地圖中它們將處於海邊。在大於256格的地圖上，此數值會按比例增加

 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :雪線高度：{STRING}
-STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT                     :選擇在寒帶氣候中的雪線高度。雪量會影響工業生成與城市擴張要求。只能在場景編輯器中修改或由"雪量覆蓋率"計算得到
+STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT                     :控制寒帶氣候中的雪線高度。積雪會影響產生工業與市鎮發展需求。只能在場景編輯器中更改或由「積雪覆蓋率」計算得到

 STR_CONFIG_SETTING_SNOW_COVERAGE                                :積雪覆蓋率：{STRING}
-STR_CONFIG_SETTING_SNOW_COVERAGE_HELPTEXT                       :選擇在寒帶氣候中的大致雪量。雪量會影響工業生成與市鎮擴張要求。只在地圖生成時有效。海平面以上一格的土地永遠不會下雪
+STR_CONFIG_SETTING_SNOW_COVERAGE_HELPTEXT                       :控制寒帶氣候中的大致雪量。雪量會影響產生工業與市鎮發展需求。只在產生地圖時有效。海平面上的土地永遠沒有積雪
 STR_CONFIG_SETTING_SNOW_COVERAGE_VALUE                          :{NUM}%

 STR_CONFIG_SETTING_DESERT_COVERAGE                              :沙漠覆蓋率：{STRING}
-STR_CONFIG_SETTING_DESERT_COVERAGE_HELPTEXT                     :控制熱帶氣候中的大致沙漠量。沙漠會影響工業生成和市鎮擴張要求。只在地圖生成時有效
+STR_CONFIG_SETTING_DESERT_COVERAGE_HELPTEXT                     :控制熱帶氣候中的大致沙漠量。沙漠會影響產生工業與市鎮發展需求。只在產生地圖時有效
 STR_CONFIG_SETTING_DESERT_COVERAGE_VALUE                        :{NUM}%

 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :地形起伏度 (只適用於 TerraGenesis)：{STRING}
@@ -1705,7 +1705,7 @@ STR_CONFIG_SETTING_LIVERIES_NONE                                :不顯示
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :自家公司
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :所有公司

-STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :傾向以 <ENTER> 鍵開啟小隊交談功能：{STRING}
+STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :使用 <Enter> 與隊伍聊天：{STRING}
 STR_CONFIG_SETTING_PREFER_TEAMCHAT_HELPTEXT                     :選擇是否以 <ENTER> 鍵取代 <Ctrl+ENTER> 鍵作切換公眾交談窗與公司內部交談窗之用。

 STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :滾輪地圖捲動速度：{STRING}
@@ -1833,7 +1833,7 @@ STR_CONFIG_SETTING_SOUND_VEHICLE                                :車輛：{STRIN
 STR_CONFIG_SETTING_SOUND_VEHICLE_HELPTEXT                       :播放車輛的音效。

 STR_CONFIG_SETTING_SOUND_AMBIENT                                :環境：{STRING}
-STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT                       :播放與地貌、工業設施和城鎮有關的環境音效。
+STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT                       :播放與地貌、工業設施和市鎮有關的環境音效

 STR_CONFIG_SETTING_MAX_TRAINS                                   :公司可擁有最大列車數量：{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT                          :每所公司擁有的列車數量上限。
@@ -2026,7 +2026,7 @@ STR_CONFIG_SETTING_HOUSE_PLACER_FORBIDDEN                       :禁止
 STR_CONFIG_SETTING_HOUSE_PLACER_ALLOWED                         :允許
 STR_CONFIG_SETTING_HOUSE_PLACER_FULLY_CONSTRUCTED               :允許，完全建成

-STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :城鎮貨物生成：{STRING}
+STR_CONFIG_SETTING_TOWN_CARGOGENMODE                            :產生市鎮貨物：{STRING}
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT                   :貨物的產出速度取決於城市中的房屋，與城市的總人口數相關。{}二次方：兩倍人口的都市產出四倍量的貨物{}線性：兩倍人口的都市產出兩倍量的貨物
 ###length 2
 STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL                   :四倍（原版）
@@ -2443,8 +2443,8 @@ STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN                       :{BLACK}搜尋
 STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP               :{BLACK}搜尋本地網路中的伺服器
 STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}新增伺服器
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}新增一個伺服器到列表中。可以使用伺服器網址或邀請碼。
-STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}起動伺服器
-STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}起動您自己的伺服器
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}啟動伺服器
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}啟動本機作為伺服器

 STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}輸入您的名稱
 STR_NETWORK_SERVER_LIST_ENTER_SERVER_ADDRESS                    :{BLACK}輸入伺服器位址或邀請碼
@@ -2674,7 +2674,7 @@ STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}內容
 STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}按一下項目查看詳細資訊{}勾選前面的方塊可選擇是否下載
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}全選
 STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}將所有內容標示為要下載
-STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}選擇升級檔
+STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}選擇擴充檔
 STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}將所有已下載項目的升級檔標示為要下載
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}取消全選
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}將所有內容標示為不要下載
@@ -2878,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :遠郊
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :近郊
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :市鎮中心

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :防止升級
-STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :選擇是否要保護房屋以免房屋隨著市鎮的發展而被替換
-STR_HOUSE_PICKER_PROTECT_OFF                                    :關閉
-STR_HOUSE_PICKER_PROTECT_ON                                     :開啟
+STR_HOUSE_PICKER_PROTECT                                        :防止覆蓋建築物
+STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :選擇是否保護房屋以免房屋隨著市鎮發展而被替換
+
+STR_HOUSE_PICKER_REPLACE                                        :替換現有建築物
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :選擇是否自動移除所選該格上現存的房屋

 STR_STATION_CLASS_DFLT                                          :預設
 STR_STATION_CLASS_DFLT_STATION                                  :預設車站
@@ -3085,7 +3086,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}大型
 STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}隨機
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}選擇市鎮大小
 STR_FOUND_TOWN_CITY                                             :{BLACK}城市
-STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}城市比普通城鎮成長的更快{}你可以從進階設定中調整城市的初始規模
+STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}城市成長比一般市鎮發展得更快{}你可以從進階設定中調整城市的初始規模

 STR_FOUND_TOWN_EXPAND_MODE                                      :{YELLOW}市鎮擴展：
 STR_FOUND_TOWN_EXPAND_BUILDINGS                                 :建築物
@@ -3474,10 +3475,10 @@ STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}您確
 STR_GENERATION_PROGRESS                                         :{WHITE}完成 {NUM}%
 STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
 STR_GENERATION_WORLD_GENERATION                                 :{BLACK}產生世界
-STR_GENERATION_LANDSCAPE_GENERATION                             :{BLACK}景觀生成
+STR_GENERATION_LANDSCAPE_GENERATION                             :{BLACK}產生景觀
 STR_GENERATION_RIVER_GENERATION                                 :{BLACK}產生河流
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}產生荒地與岩石地貌
-STR_GENERATION_TOWN_GENERATION                                  :{BLACK}市鎮生成
+STR_GENERATION_TOWN_GENERATION                                  :{BLACK}產生市鎮
 STR_GENERATION_LAND_INDUSTRY_GENERATION                         :{BLACK}產生陸上工業
 STR_GENERATION_WATER_INDUSTRY_GENERATION                        :{BLACK}產生水上工業
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}無法移動
@@ -3759,13 +3760,13 @@ STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT                  :購買專屬營
 STR_LOCAL_AUTHORITY_ACTION_BRIBE                                :向地方政府行賄
 ###next-name-looks-similar

-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING            :{PUSH_COLOUR}{YELLOW}開始進行小型地方廣告活動，為您的運輸服務吸引更多乘客與貨物。{}使城鎮小範圍內的車站獲得暫時的評分增益。{} {POP_COLOUR}費用：{CURRENCY_LONG}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING           :{PUSH_COLOUR}{YELLOW}開始進行中型地方廣告活動，為您的運輸服務吸引更多乘客與貨物。{}使城鎮中等範圍內的車站獲得暫時的評分增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING            :{PUSH_COLOUR}{YELLOW}開始進行大型地方廣告活動，為您的運輸服務吸引更多乘客與貨物。{}使城鎮較大範圍內的車站獲得暫時的評分增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING            :{PUSH_COLOUR}{YELLOW}開始進行小型地方廣告活動，為您的運輸服務吸引更多乘客與貨物。{}使市鎮小範圍內的車站獲得暫時的評分增益。{} {POP_COLOUR}費用：{CURRENCY_LONG}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING           :{PUSH_COLOUR}{YELLOW}開始進行中型地方廣告活動，為您的運輸服務吸引更多乘客與貨物。{}使市鎮中等範圍內的車站獲得暫時的評分增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING            :{PUSH_COLOUR}{YELLOW}開始進行大型地方廣告活動，為您的運輸服務吸引更多乘客與貨物。{}使市鎮較大範圍內的車站獲得暫時的評分增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION_MONTHS   :{PUSH_COLOUR}{YELLOW}贊助市鎮道路網絡重建。{}這將會使到市鎮的交通阻塞 6 個月。{}{POP_COLOUR}費用︰{CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION_MINUTES  :{PUSH_COLOUR}{YELLOW}贊助市鎮道路網絡重建。{}這將會使到市鎮的交通阻塞 6 分鐘。{}{POP_COLOUR}費用︰{CURRENCY_LONG}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY            :{PUSH_COLOUR}{YELLOW}建造雕像紀念您的公司。{}使城鎮範圍內的車站獲得永久的評分增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{PUSH_COLOUR}{YELLOW}出資協助市鎮建造新的商業建築。{}使城鎮獲得暫時性的成長速度增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY            :{PUSH_COLOUR}{YELLOW}建造雕像紀念您的公司。{}使市鎮範圍內的車站獲得永久的評分增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{PUSH_COLOUR}{YELLOW}出資協助市鎮建造新的商業建築。{}使市鎮獲得暫時性的成長速度增益。{}{POP_COLOUR}費用：{CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT_MONTHS   :{PUSH_COLOUR}{YELLOW}購買該市鎮 12 個月的專屬營運權。{}市政府將不許乘客和貨物使用其他公司的車站。但如果競爭對手成功賄賂則該合約將被取消。{}{POP_COLOUR}費用：{CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT_MINUTES  :{PUSH_COLOUR}{YELLOW}購買該市鎮 12 分鐘的專屬營運權。{}市政府將不許乘客和貨物使用其他公司的車站。但如果競爭對手成功賄賂則該合約將被取消。{}{POP_COLOUR}費用：{CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{PUSH_COLOUR}{YELLOW}賄賂地方政府以提高您的評級並終止競爭對手的專屬營運權，但如果被發現，將面臨嚴厲處罰的風險。{}{POP_COLOUR}費用：{CURRENCY_LONG}
@@ -4110,7 +4111,7 @@ STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :送到船塢
 STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :送到機棚

 STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}點選此按鈕以停止清單上的所有車輛
-STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}點選此按鈕以起動清單上的所有車輛
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}點選此按鈕以啟動清單上的所有車輛
 STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}顯示此車輛類別所有可用的引擎設計

 STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}由 {COMMA} 部車輛共用的指令清單
@@ -4347,10 +4348,10 @@ STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}點選
 STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}點選可停止機棚內的所有飛機

 ###length VEHICLE_TYPES
-STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}點選可起動機廠內的所有列車
-STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}點選可起動車廠內的所有車輛
-STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}點選可起動船塢內的所有船舶
-STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}點選可起動機棚內的所有飛機
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}點選可啟動機廠內的所有列車
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}點選可啟動車廠內的所有車輛
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}點選可啟動船塢內的所有船舶
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}點選可啟動機棚內的所有飛機

 STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}將車頭拖至此即可出售整列車
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}您正準備出售車廠內的所有車輛。確定嗎？
@@ -4478,10 +4479,10 @@ STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}顯示
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}顯示飛機詳細資料。按住 <Ctrl> 點選可顯示飛機群組

 ###length VEHICLE_TYPES
-STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}目前列車狀態 - 點擊以停止／起動列車
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP         :{BLACK}目前列車狀態 - 點擊以停止／起動車輛
-STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP                 :{BLACK}目前船舶狀態 - 點擊以停止／起動船舶
-STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP             :{BLACK}目前飛機狀態 - 點擊以停止／起動飛機
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP                :{BLACK}目前列車狀態 - 點選可停止或啟動列車
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP         :{BLACK}目前列車狀態 - 點選可停止或啟動車輛
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP                 :{BLACK}目前船舶狀態 - 點選可停止或啟動船舶
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP             :{BLACK}目前飛機狀態 - 點選可停止或啟動飛機

 # Messages in the start stop button in the vehicle view
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}正在裝卸貨物
@@ -4509,7 +4510,7 @@ STR_VEHICLE_STATUS_CANNOT_REACH_DEPOT_SERVICE_VEL               :{LTBLUE}{1:VELO

 # Vehicle stopped/started animations
 STR_VEHICLE_COMMAND_STOPPED                                     :{RED}已停止
-STR_VEHICLE_COMMAND_STARTED                                     :{GREEN}已起動
+STR_VEHICLE_COMMAND_STARTED                                     :{GREEN}已啟動

 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (詳細資料)
@@ -5279,13 +5280,13 @@ STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}開始
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... 橋樑的兩端應在陸地上
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}……橋樑過長
 STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}橋的終點將會在地圖外
-STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}橋高 {HEIGHT}，不足以興建車站
-STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}橋高 {HEIGHT}，不足以興建車站
-STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}橋高 {HEIGHT}，不足以興建碼頭
-STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE}橋高 {HEIGHT}，不足以放置浮標
-STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}橋高 {HEIGHT}，不足以興建中途站
-STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}橋高 {HEIGHT}，不足以興建中途站
-STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :{WHITE}橋高 {HEIGHT}，不足以興建水閘
+STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}橋樑過低，橋高僅有 {HEIGHT}，不足以興建車站
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}橋樑過低，橋高僅有 {HEIGHT}，不足以興建車站
+STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}橋樑過低，橋高僅有 {HEIGHT}，不足以興建碼頭
+STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE}橋樑過低，橋高僅有 {HEIGHT}，不足以放置浮標
+STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}橋樑過低，橋高僅有 {HEIGHT}，不足以興建中途站
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}橋樑過低，橋高僅有 {HEIGHT}，不足以興建中途站
+STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :{WHITE}橋樑過低，橋高僅有 {HEIGHT}，不足以興建水閘

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}無法在此挖掘隧道...
@@ -5342,10 +5343,10 @@ STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}無法
 STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}無法修改飛機名稱...

 ###length VEHICLE_TYPES
-STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}無法停止／起動列車...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}無法停止／起動車輛...
-STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}無法停止／起動船舶...
-STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}無法停止／起動飛機...
+STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}無法停止或啟動列車……
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}無法停止或啟動車輛……
+STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}無法停止或啟動船舶……
+STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}無法停止或啟動飛機……

 ###length VEHICLE_TYPES
 STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT                             :{WHITE}無法將列車送往機廠...
@@ -758,7 +758,11 @@ STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Граф

 STR_GRAPH_LAST_24_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Останні 24 хвилини
 STR_GRAPH_LAST_72_MINUTES_TIME_LABEL                            :{TINY_FONT}{BLACK}Останні 72 хвилини
+STR_GRAPH_LAST_288_MINUTES_TIME_LABEL                           :{TINY_FONT}{BLACK}Останні 288 хвилин

+STR_GRAPH_LAST_24_MONTHS                                        :{TINY_FONT}{BLACK}2 роки (щомісячно)
+STR_GRAPH_LAST_24_QUARTERS                                      :{TINY_FONT}{BLACK}6 років (щоквартально)
+STR_GRAPH_LAST_24_YEARS                                         :{TINY_FONT}{BLACK}24 роки (щорічно)


 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}Тарифи доставки вантажів
@@ -775,6 +779,8 @@ STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLA
 STR_GRAPH_INDUSTRY_RANGE_PRODUCED                               :Вироблено
 STR_GRAPH_INDUSTRY_RANGE_TRANSPORTED                            :Перевезено

+STR_GRAPH_TOWN_RANGE_PRODUCED                                   :Постачання
+STR_GRAPH_TOWN_RANGE_TRANSPORTED                                :Перевезено

 STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Показати детальні оцінки ефективності

@@ -2473,13 +2479,16 @@ STR_FACE_LOAD_DONE                                              :{WHITE}Обра
 STR_FACE_FACECODE                                               :{BLACK}Обличчя №
 STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Подивитись та/чи змінити номер обличчя президента компанії
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Подивитись та/чи змінити номер обличчя президента
-STR_FACE_FACECODE_SET                                           :{WHITE}Було встановлено новий номерний код обличчя
-STR_FACE_FACECODE_ERR                                           :{WHITE}Не можна встановити номер обличчя президента - це має бути число від 0 до 4,294,967,295!
+STR_FACE_FACECODE_SET                                           :{WHITE}Встановлено нове обличчя президента
+STR_FACE_FACECODE_ERR                                           :{WHITE}Не можна встановити номер обличчя президента - мають бути допустимі назва і номер
 STR_FACE_SAVE                                                   :{BLACK}Зберегти
 STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Зберегти обране обличчя
 STR_FACE_SAVE_DONE                                              :{WHITE}Це обличчя буде збережене як обране у файлі конфігурації OpenTTD
+STR_FACE_SETTING_TOGGLE                                         :{STRING} {ORANGE}{STRING}
+STR_FACE_SETTING_NUMERIC                                        :{STRING} {ORANGE}{NUM} / {NUM}
 STR_FACE_YES                                                    :Так
 STR_FACE_NO                                                     :Ні
+STR_FACE_STYLE                                                  :Стиль:
 STR_FACE_HAIR                                                   :Волосся:
 STR_FACE_EYEBROWS                                               :Брова:
 STR_FACE_EYECOLOUR                                              :Колір очей:
@@ -2806,7 +2815,7 @@ STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED                        :{SILVER}Ця з
 STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Ви вже маєте це
 STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}Цей вміст невідомий і не може бути завантажений до OpenTTD

-STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Це заміна існуючої {STRING}
+STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Це заміна наявної {STRING}
 STR_CONTENT_DETAIL_NAME                                         :{SILVER}Назва: {WHITE}{STRING}
 STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Версія: {WHITE}{STRING}
 STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}Опис: {WHITE}{STRING}
@@ -2955,6 +2964,8 @@ STR_PICKER_MODE_USED_TOOLTIP                                    :Переклю
 STR_PICKER_MODE_SAVED                                           :Збережено
 STR_PICKER_MODE_SAVED_TOOLTIP                                   :Переключити на показ лише збережених елементів

+STR_PICKER_PREVIEW_SHRINK                                       :-
+STR_PICKER_PREVIEW_EXPAND                                       :+

 STR_PICKER_STATION_CLASS_TOOLTIP                                :Виберіть тип станцій для відображення
 STR_PICKER_STATION_TYPE_TOOLTIP                                 :Виберіть тип станції для побудови. Клацніть Ctrl+Клік, щоб додати або видалити зі списку збереженого
@@ -2986,10 +2997,10 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Передмі
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Щільне передмістя
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Центр міста

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Захист від оновлень
+STR_HOUSE_PICKER_PROTECT                                        :Заборонити оновлення
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Укажіть, чи буде захищено цю будівлю від змін у разі зростання міста
-STR_HOUSE_PICKER_PROTECT_OFF                                    :вимкнено
-STR_HOUSE_PICKER_PROTECT_ON                                     :увімкнено
+
+STR_HOUSE_PICKER_REPLACE                                        :Замінити наявний

 STR_STATION_CLASS_DFLT                                          :Звичайна
 STR_STATION_CLASS_DFLT_STATION                                  :Звичайна станція
@@ -3540,7 +3551,7 @@ STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}дові

 ###length 3
 STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}довільно
-STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}вручну
+STR_MAPGEN_BORDER_MANUAL                                        :вручну

 STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Поворот рельєфу
 STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Назва мапи висот:
@@ -6019,6 +6030,8 @@ STR_SAVEGAME_NAME_SPECTATOR                                     :Спостер

 # Viewport strings
 STR_VIEWPORT_TOWN_POP                                           :{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN_CITY                                          :{TOWN} {CITY_ICON}
+STR_VIEWPORT_TOWN_CITY_POP                                      :{TOWN} ({COMMA}) {CITY_ICON}
 STR_VIEWPORT_STATION                                            :{STATION} {STATION_FEATURES}

 # Simple strings to get specific types of data
@@ -1984,6 +1984,7 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}کھین



+
 STR_STATION_CLASS_DFLT                                          :طے شدہ اسٹیشن
 STR_STATION_CLASS_WAYP                                          :گزرگاہیں

@@ -254,6 +254,7 @@ STR_UNITS_FORCE_SI                                              :{DECIMAL}{NBSP}
 STR_UNITS_HEIGHT_IMPERIAL                                       :{DECIMAL}{NBSP}ft
 STR_UNITS_HEIGHT_METRIC                                         :{DECIMAL}{NBSP}m
 STR_UNITS_HEIGHT_SI                                             :{DECIMAL}{NBSP}m
+STR_UNITS_HEIGHT_GAMEUNITS                                      :{DECIMAL}{NBSP}mức độ

 # Time units used in string control characters
 STR_UNITS_DAYS                                                  :{COMMA}{NBSP}ngày
@@ -311,6 +312,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP                :{BLACK}Khi bậ
 STR_BUTTON_DEFAULT                                              :{BLACK}Mặc định
 STR_BUTTON_CANCEL                                               :{BLACK}Hủy bỏ
 STR_BUTTON_OK                                                   :{BLACK}Đồng ý
+STR_BUTTON_MOVE                                                 :{BLACK}Di chuyển

 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-= qwertyuiop[]asdfghjkl;'#\zxcvbnm,./ .
@@ -2162,6 +2164,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_HELPTEXT           :Khi độ cao t
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Hoàng Gia (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metric (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_GAMEUNITS          :Đơn vị trò chơi (mức độ)

 STR_CONFIG_SETTING_LOCALISATION                                 :Tiêu chuẩn đo lường
 STR_CONFIG_SETTING_GRAPHICS                                     :Đồ họa
@@ -2859,15 +2862,15 @@ STR_PICKER_HOUSE_CLASS_TOOLTIP                                  :Chọn vùng đ
 STR_PICKER_HOUSE_TYPE_TOOLTIP                                   :Chọn kiểu nhà để xây. Ctrl+Click để thêm hoặc xóa trong danh sách lưu

 STR_HOUSE_PICKER_CAPTION                                        :Chọn Kiểu Nhà
-STR_HOUSE_PICKER_NAME                                           :{BLACK}Tên: {ORANGE}{STRING}
-STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Dân số: {ORANGE}{NUM}
-STR_HOUSE_PICKER_YEARS                                          :{BLACK}Năm: {ORANGE}{NUM}-{NUM}
-STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Năm: {ORANGE}Tất cả
-STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Năm: {ORANGE}Từ {NUM}
-STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Năm: {ORANGE}Đến {NUM}
-STR_HOUSE_PICKER_SIZE                                           :{BLACK}Kích thước: {ORANGE}{NUM}x{NUM} ô
-STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Hàng hóa được chấp nhận: {ORANGE}
-STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Hàng hóa cung cấp: {ORANGE}{CARGO_LIST}
+STR_HOUSE_PICKER_NAME                                           :{BLACK}Tên: {GOLD}{STRING}
+STR_HOUSE_PICKER_POPULATION                                     :{BLACK}Dân số: {GOLD}{NUM}
+STR_HOUSE_PICKER_YEARS                                          :{BLACK}Năm: {GOLD}{NUM}-{NUM}
+STR_HOUSE_PICKER_YEARS_ANY                                      :{BLACK}Năm: {GOLD}Tất cả
+STR_HOUSE_PICKER_YEARS_FROM                                     :{BLACK}Năm: {GOLD}Từ {NUM}
+STR_HOUSE_PICKER_YEARS_UNTIL                                    :{BLACK}Năm: {GOLD}Đến {NUM}
+STR_HOUSE_PICKER_SIZE                                           :{BLACK}Kích thước: {GOLD}{NUM}x{NUM} ô
+STR_HOUSE_PICKER_CARGO_ACCEPTED                                 :{BLACK}Hàng hóa được chấp nhận: {GOLD}
+STR_HOUSE_PICKER_CARGO_PRODUCED                                 :{BLACK}Hàng hóa cung cấp: {GOLD}{CARGO_LIST}

 STR_HOUSE_PICKER_CLASS_ZONE1                                    :Ngoài rìa
 STR_HOUSE_PICKER_CLASS_ZONE2                                    :Ngoại ô
@@ -2875,10 +2878,11 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Phía ngoài ng
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Phía trong ngoại ô
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Nội thành

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Ngăn chặn nâng cấp
+STR_HOUSE_PICKER_PROTECT                                        :Ngăn chặn nâng cấp
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Chọn nếu ngôi nhà này có được bảo vệ khỏi việc bị thay thế hay không khi thị trấn phát triển
-STR_HOUSE_PICKER_PROTECT_OFF                                    :Tắt
-STR_HOUSE_PICKER_PROTECT_ON                                     :Bật
+
+STR_HOUSE_PICKER_REPLACE                                        :Thay thế hiện trạng
+STR_HOUSE_PICKER_REPLACE_TOOLTIP                                :Bật/tắt tùy chọn tự động xóa công trình cũ trên ô khi đặt công trình mới

 STR_STATION_CLASS_DFLT                                          :Mặc định
 STR_STATION_CLASS_DFLT_STATION                                  :Trạm mặc định
@@ -3425,13 +3429,18 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Tây B
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Đông Bắc
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Đông Nam
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Tây Nam
+STR_MAPGEN_NORTHWEST_TOOLTIP                                    :Bật/tắt mép nước hoặc mép tự do ở cạnh tây bắc bản đồ
+STR_MAPGEN_NORTHEAST_TOOLTIP                                    :Bật/tắt mép nước hoặc mép tự do ở cạnh đông bắc bản đồ
+STR_MAPGEN_SOUTHEAST_TOOLTIP                                    :Bật/tắt mép nước hoặc mép tự do ở cạnh đông nam bản đồ
+STR_MAPGEN_SOUTHWEST_TOOLTIP                                    :Bật/tắt mép nước hoặc mép tự do ở cạnh tây nam bản đồ
 STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Dạng Tự Do
 STR_MAPGEN_BORDER_WATER                                         :{BLACK}Nước
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Ngẫu Nhiên

 ###length 3
-STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Ngẫu Nhiên
-STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Điều Chỉnh
+STR_MAPGEN_BORDER_RANDOMIZE                                     :Ngẫu Nhiên
+STR_MAPGEN_BORDER_MANUAL                                        :Điều Chỉnh
+STR_MAPGEN_BORDER_INFINITE_WATER                                :Xung Quanh Toàn Nước

 STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Xoay bản đồ địa hình:
 STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Tên bản đồ địa hình:
@@ -3470,6 +3479,8 @@ STR_GENERATION_LANDSCAPE_GENERATION                             :{BLACK}Khởi t
 STR_GENERATION_RIVER_GENERATION                                 :{BLACK}Khởi tạo sông suối
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}Sinh đá và sự gồ ghề
 STR_GENERATION_TOWN_GENERATION                                  :{BLACK}Khởi tạo thị trấn
+STR_GENERATION_LAND_INDUSTRY_GENERATION                         :{BLACK}Khởi tạo công nghiệp trên cạn
+STR_GENERATION_WATER_INDUSTRY_GENERATION                        :{BLACK}Khởi tạo công nghiệp đường thủy
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Sinh đối tượng cứng
 STR_GENERATION_TREE_GENERATION                                  :{BLACK}Trồng cây
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Thiết lập ván chơi
@@ -3689,6 +3700,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Nhập t
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Đô Thị ({COMMA} đến {COMMA})
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Không Có -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{BLACK} ({COMMA}) {YELLOW}{CITY_ICON}
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Tên các đô thị - nháy vào tên để xem trung tâm đô thị. Ctrl+Click mở cửa sổ mới của đô thị
 STR_TOWN_POPULATION                                             :{BLACK}Dân số thế giới: {COMMA}

@@ -3894,12 +3906,14 @@ STR_CARGO_RATING_EXCELLENT                                      :Tuyệt vời
 STR_CARGO_RATING_OUTSTANDING                                    :Hoàn hảo

 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Xem trung tâm ga, bến, cảng. Ctrl+Click mở cửa sổ mới để xem
+STR_STATION_VIEW_EDIT_TOOLTIP                                   :{BLACK}Đổi tên trạm hoặc di chuyển biển hiệu

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Hiện lên tất cả các đoàn tàu có lộ trình đi qua ga này
 STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Hiện lên tất cả các xe có lộ trình đi qua bến này
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Hiện tất cả các máy bay có lộ trình đi qua sân bay này
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Hiện tất cả tàu thuỷ có lộ trình đi qua cảng này.

+STR_STATION_VIEW_EDIT_STATION_SIGN                              :{WHITE}Sửa biển hiệu của trạm

 STR_STATION_VIEW_CLOSE_AIRPORT                                  :{BLACK}Đóng cửa sân bay
 STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Không cho máy bay hạ cánh ở sân bay này
@@ -3907,9 +3921,11 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP                          :{BLACK}Không c
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Xem vị trí của điểm mốc. Ctrl+Click để mở cửa sổ mới cho điểm mốc
+STR_WAYPOINT_VIEW_EDIT_TOOLTIP                                  :{BLACK}Đổi tên điểm mốc hoặc di chuyển biển hiệu
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Xem vị trí phao hàng hải. Ctrl+Click mở cửa sổ mới vị trí phao
 STR_BUOY_VIEW_RENAME_TOOLTIP                                    :{BLACK}Đổi tên phao

+STR_WAYPOINT_VIEW_EDIT_WAYPOINT_SIGN                            :{WHITE}Đổi biển hiệu điểm mốc

 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}Tài Chính Công Ty {COMPANY} {BLACK}{COMPANY_NUM}
@@ -5123,6 +5139,7 @@ STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Quá nhi
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Quá sát với hải cảng khác
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Quá sát với sân bay khác
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Không thể đổi tên ga, bến,cảng...
+STR_ERROR_CAN_T_MOVE_STATION_NAME                               :{WHITE}Không thể di chuyển biển hiệu của trạm...
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... đây là đường sở hữu bởi địa phương
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... đường quay mặt sai hướng
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... đi qua điểm dừng không thể đi qua góc
@@ -5154,6 +5171,7 @@ STR_ERROR_CAN_T_BUILD_RAIL_WAYPOINT                             :{WHITE}Không t
 STR_ERROR_CAN_T_BUILD_ROAD_WAYPOINT                             :{WHITE}Không thể xây điểm mốc đường bộ ở đây...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Không thể xây phao hàng hải ở đây...
 STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Không thể thay đổi tên điểm mốc...
+STR_ERROR_CAN_T_MOVE_WAYPOINT_NAME                              :{WHITE}Không thể di chuyển biển hiệu của điểm mốc...

 STR_ERROR_CAN_T_REMOVE_RAIL_WAYPOINT                            :{WHITE}Không thể xoá bỏ điểm mốc tàu hoả...
 STR_ERROR_CAN_T_REMOVE_ROAD_WAYPOINT                            :{WHITE}Không thể xóa điểm mốc đường bộ ở đây...
@@ -5262,6 +5280,13 @@ STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Điểu
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... hai đầu cầu phải được gá vào đất
 STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... cầu quá dài
 STR_ERROR_BRIDGE_THROUGH_MAP_BORDER                             :{WHITE}Cầu có thể vượt quá phạm vi bản đồ
+STR_ERROR_BRIDGE_TOO_LOW_FOR_STATION                            :{WHITE}Cầu thấp hơn {HEIGHT} đơn vị cho ga
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROADSTOP                           :{WHITE}Cầu thấp hơn {HEIGHT} đơn vị cho điểm dừng chân
+STR_ERROR_BRIDGE_TOO_LOW_FOR_DOCK                               :{WHITE}Cầu thấp hơn {HEIGHT} đơn vị để xây dựng cảng
+STR_ERROR_BRIDGE_TOO_LOW_FOR_BUOY                               :{WHITE}Cầu thấp hơn {HEIGHT} đơn vị cho phao
+STR_ERROR_BRIDGE_TOO_LOW_FOR_RAIL_WAYPOINT                      :{WHITE}Cầu thấp hơn {HEIGHT} đơn vị cho điểm mốc đường ray
+STR_ERROR_BRIDGE_TOO_LOW_FOR_ROAD_WAYPOINT                      :{WHITE}Cầu thấp hơn {HEIGHT} đơn vị cho điểm mốc đường
+STR_ERROR_BRIDGE_TOO_LOW_FOR_LOCK                               :Cầu thấp hơn {HEIGHT} đơn vị, tàu không qua được khóa

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Không thể đào hầm ở đây...
@@ -2863,10 +2863,8 @@ STR_HOUSE_PICKER_CLASS_ZONE3                                    :Maestrefi Allan
 STR_HOUSE_PICKER_CLASS_ZONE4                                    :Maestrefi Mewnol
 STR_HOUSE_PICKER_CLASS_ZONE5                                    :Canol y ddinas

-STR_HOUSE_PICKER_PROTECT_TITLE                                  :Atal uwchraddiadau
 STR_HOUSE_PICKER_PROTECT_TOOLTIP                                :Dewis a fydd y tŷ yma'n cael ei amddiffyn rhag disodli wrth i'r dref tyfu
-STR_HOUSE_PICKER_PROTECT_OFF                                    :I ffwrdd
-STR_HOUSE_PICKER_PROTECT_ON                                     :Ymlaen
+

 STR_STATION_CLASS_DFLT                                          :Rhagosodiad
 STR_STATION_CLASS_DFLT_STATION                                  :Gorsaf rhagosodedig
@@ -1010,13 +1010,15 @@ struct QueryStringWindow : public Window

 	void Close([[maybe_unused]] int data = 0) override
 	{
-		if (this->parent->window_class == WC_STATION_VIEW) SetViewportStationRect(Station::Get(this->parent->window_number), false);
-		if (this->parent->window_class == WC_WAYPOINT_VIEW) SetViewportWaypointRect(Waypoint::Get(this->parent->window_number), false);
+		if (this->parent != nullptr) {
+			if (this->parent->window_class == WC_STATION_VIEW) SetViewportStationRect(Station::Get(this->parent->window_number), false);
+			if (this->parent->window_class == WC_WAYPOINT_VIEW) SetViewportWaypointRect(Waypoint::Get(this->parent->window_number), false);

-		if (!this->editbox.handled && this->parent != nullptr) {
-			Window *parent = this->parent;
-			this->parent = nullptr; // so parent doesn't try to close us again
-			parent->OnQueryTextFinished(std::nullopt);
+			if (!this->editbox.handled) {
+				Window *parent = this->parent;
+				this->parent = nullptr; // so parent doesn't try to close us again
+				parent->OnQueryTextFinished(std::nullopt);
+			}
 		}

 		this->Window::Close();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tyler Trahan	6338c487b8	Update: Changelog for 15.0-RC3 (#14940 )	2025-12-20 14:10:15 -05:00
Peter Nelson	4c0a91aac2	Update: Backport language changes	2025-12-20 19:07:50 +00:00
Peter Nelson	d04225a2fb	Change: Automatically push/pop colours when formatting a sub-string. (#14006 ) Reverts `226a44bf86`. This universally prevents the sub-string from changing colours in the outer string.	2025-12-20 19:07:50 +00:00
Peter Nelson	65902d4abe	Fix #14932 : Increase internal badge index size to avoid overflowing BadgeIDs. (#14933 )	2025-12-20 19:07:50 +00:00
mmtunligit	27fbcb3cc5	Fix `a41738e`: Picker item recolour depends on gamemode (#14929 )	2025-12-20 19:07:50 +00:00
Peter Nelson	8c6531f297	Fix #14921 : Crash during station autorefit if station doesn't accept current cargo type. (#14924 ) Add convenience helpers to correctly retrieve goods entry cargo available/totals. Avoids having to check if cargo data is available before accessing it, which was missing for autorefit.	2025-12-20 19:07:50 +00:00
Peter Nelson	88a52b60f8	Fix #14917 : Crash when opening house picker with no houses available. (#14920 )	2025-12-20 19:07:50 +00:00
Peter Nelson	aa4b5ca747	Fix #14916 : Duration of error message window could be too short. (#14919 ) The timer for automatically closing the error message was started when creating the window, instead of when first displaying the window.	2025-12-20 19:07:50 +00:00
Peter Nelson	5ce9c6cadd	Fix #14915 : Crash due to divide-by-zero of industry probabilities. (#14918 )	2025-12-20 19:07:50 +00:00
Loïc Guilloux	2027912e8f	Fix `ff08a22`: script configs were cleared by AIPL and GSDT chunks from intro game (#14910 )	2025-12-20 19:07:50 +00:00
Rubidium	dd835262ed	Codefix: possible null pointer dereference	2025-12-20 19:07:50 +00:00
Rubidium	24364c3fbc	Doc: not much is going to change in the 15.0 script APIs	2025-12-14 17:57:36 +01:00
Peter Nelson	ca42564da8	Update: Changelog for 15.0-RC2	2025-12-13 18:13:31 +00:00
Peter Nelson	9062d25456	Update: Backport language changes	2025-12-13 11:54:27 +00:00
Rubidium	4213c62edd	Fix #14677 : desync due to using newgame time settings to validate savegame time settings	2025-12-13 11:54:27 +00:00
Peter Nelson	a97587b3fe	Revert: "Change: Support side-by-side fallback FontCaches instead of hierarchical. (#13303 )" This reverts commit `1829f7926d`.	2025-12-13 11:54:27 +00:00
Peter Nelson	8ac9762a84	Revert: "Add: Automatically load fonts for missing glyphs. (#14856 )" This reverts commit `c1d37d8699`.	2025-12-13 11:54:27 +00:00
Peter Nelson	4ad85e0fe6	Fix: Graph label allocated size could be too small. (#14901 ) Set initial size based on what could be displayed, instead of what is displayed right now.	2025-12-13 11:54:27 +00:00
Loïc Guilloux	ab1ae7ec1a	Codechange: [CI] setup-vcpkg action is now in OpenTTD/actions (#14897 )	2025-12-13 11:54:27 +00:00
Peter Nelson	84c3ac6852	Fix #14891 , `a8650c6b06`: Minimum sprite zoomlevel could break in some cases. (#14894 ) Caused by sprite control flags not being reset when scanning available sprites.	2025-12-13 11:54:27 +00:00
Peter Nelson	a6994a9550	Fix #14889 : [FluidSynth] Don't try to load a soundfont that doesn't exist.	2025-12-13 11:54:27 +00:00
Peter Nelson	f22f9d8b18	Codechange: Auto-reformat fluidsynth.cpp.	2025-12-13 11:54:27 +00:00
Peter Nelson	4b701e053f	Update: Backport language changes	2025-12-08 18:06:36 +00:00
Loïc Guilloux	b575769a7f	Fix: [CI] Install NSIS for windows releases (#14885 )	2025-12-08 18:06:36 +00:00
Rubidium	04f1a114dd	Change #14155 : Erato's the winner of the title game competition	2025-12-07 22:40:14 +01:00