diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index efd58bfbd6..81d3cd5b91 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -360,15 +360,6 @@ jobs:
name: MacOS
needs: source
- strategy:
- fail-fast: false
- matrix:
- include:
- - arch: x64
- full_arch: x86_64
- - arch: arm64
- full_arch: arm64
-
runs-on: macos-10.15
env:
MACOSX_DEPLOYMENT_TARGET: 10.9
@@ -383,22 +374,21 @@ jobs:
run: |
tar -xf source.tar.gz --strip-components=1
- # The following step can be removed and the default vcpkg installation
- # (/usr/local/share/vcpkg) restored when the build VM is updated with a revision of
- # vcpkg dating from roughly 01/01/2021 or later.
+ # The following step can be removed when the build VM is updated with a revision of
+ # vcpkg dating from roughly 01/01/2021 or later. At that point, `doNotUpdateVcpkg`
+ # can be set to `true` and the `vcpkgGitCommitId` can be removed.
- name: Update vcpkg
run: |
- cd /tmp
- git clone https://github.com/Microsoft/vcpkg
+ cd /usr/local/share/vcpkg
+ git fetch --unshallow
- name: Prepare vcpkg (with cache)
uses: lukka/run-vcpkg@v6
with:
- vcpkgDirectory: '/tmp/vcpkg'
+ vcpkgDirectory: '/usr/local/share/vcpkg'
doNotUpdateVcpkg: false
vcpkgGitCommitId: 2a42024b53ebb512fb5dd63c523338bf26c8489c
- vcpkgArguments: 'freetype liblzma lzo'
- vcpkgTriplet: '${{ matrix.arch }}-osx'
+ vcpkgArguments: 'freetype:x64-osx liblzma:x64-osx lzo:x64-osx freetype:arm64-osx liblzma:arm64-osx lzo:arm64-osx'
- name: Build tools
run: |
@@ -420,21 +410,67 @@ jobs:
- name: Install GCC problem matcher
uses: ammaraskar/gcc-problem-matcher@master
- - name: Build
+ - name: Import code signing certificates
+ uses: Apple-Actions/import-codesign-certs@v1
+ with:
+ # The certificates in a PKCS12 file encoded as a base64 string
+ p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+ # The password used to import the PKCS12 file.
+ p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+ # If this is run on a fork, there may not be a certificate set up - continue in this case
+ continue-on-error: true
+
+ - name: Build arm64
run: |
- mkdir build
- cd build
+ mkdir build-arm64
+ cd build-arm64
echo "::group::CMake"
cmake ${GITHUB_WORKSPACE} \
- -DCMAKE_OSX_ARCHITECTURES=${{ matrix.full_arch }} \
- -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-osx \
- -DCMAKE_TOOLCHAIN_FILE=/tmp/vcpkg/scripts/buildsystems/vcpkg.cmake \
+ -DCMAKE_OSX_ARCHITECTURES=arm64 \
+ -DVCPKG_TARGET_TRIPLET=arm64-osx \
+ -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
# EOF
echo "::endgroup::"
+ echo "::group::Build"
+ echo "Running on $(sysctl -n hw.logicalcpu) cores"
+ make -j$(sysctl -n hw.logicalcpu)
+ echo "::endgroup::"
+
+ - name: Build x64
+ run: |
+ mkdir build-x64
+ cd build-x64
+
+ echo "::group::CMake"
+ cmake ${GITHUB_WORKSPACE} \
+ -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+ -DVCPKG_TARGET_TRIPLET=x64-osx \
+ -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
+ -DHOST_BINARY_DIR=${GITHUB_WORKSPACE}/build-host \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCPACK_BUNDLE_APPLE_CERT_APP=${{ secrets.APPLE_DEVELOPER_CERTIFICATE_ID }} \
+ "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime" \
+ -DAPPLE_UNIVERSAL_PACKAGE=1 \
+ # EOF
+ echo "::endgroup::"
+
+ echo "::group::Build"
+ echo "Running on $(sysctl -n hw.logicalcpu) cores"
+ make -j$(sysctl -n hw.logicalcpu)
+ echo "::endgroup::"
+
+ - name: Build package
+ run: |
+ cd build-x64
+
+ # Combine the `openttd` binaries from each build into a single file
+ lipo -create -output openttd-universal ../build-*/openttd
+ mv openttd-universal openttd
+
echo "::group::Build"
echo "Running on $(sysctl -n hw.logicalcpu) cores"
make -j$(sysctl -n hw.logicalcpu) package
@@ -444,11 +480,27 @@ jobs:
# the end of this workflow.
rm -f bundles/*.sha256
+ - name: Install gon
+ env:
+ HOMEBREW_NO_AUTO_UPDATE: 1
+ HOMEBREW_NO_INSTALL_CLEANUP: 1
+ run: |
+ brew tap mitchellh/gon
+ brew install mitchellh/gon/gon
+
+ - name: Notarize
+ env:
+ AC_USERNAME: ${{ secrets.APPLE_DEVELOPER_APP_USERNAME }}
+ AC_PASSWORD: ${{ secrets.APPLE_DEVELOPER_APP_PASSWORD }}
+ run: |
+ cd build-x64
+ ../os/macosx/notarize.sh
+
- name: Store bundles
uses: actions/upload-artifact@v2
with:
- name: openttd-macos-${{ matrix.arch }}
- path: build/bundles
+ name: openttd-macos-universal
+ path: build-x64/bundles
retention-days: 5
windows:
@@ -461,6 +513,7 @@ jobs:
include:
- arch: x86
- arch: x64
+ - arch: arm64
runs-on: windows-latest
@@ -475,6 +528,18 @@ jobs:
run: |
tar -xf source.tar.gz --strip-components=1
+ # "restore-cache" which is done by "run-vcpkg" uses Windows tar.
+ # A git clone on windows marks a few files as read-only; when Windows tar
+ # tries to extract the cache over this folder, it fails, despite the files
+ # being identical. This failure shows up as an warning in the logs. We
+ # avoid this by simply removing the read-only mark from the git folder.
+ # In other words: this is a hack!
+ # See: https://github.com/lukka/run-vcpkg/issues/61
+ - name: Remove read-only flag from vcpkg git folder
+ shell: powershell
+ run: |
+ attrib -r "c:\vcpkg\.git\*.*" /s
+
- name: Prepare vcpkg (with cache)
uses: lukka/run-vcpkg@v6
with:
@@ -496,7 +561,7 @@ jobs:
uses: ammaraskar/msvc-problem-matcher@master
- name: Build (with installer)
- if: needs.source.outputs.is_tag == 'true' && matrix.arch != 'arm64'
+ if: needs.source.outputs.is_tag == 'true'
uses: lukka/run-cmake@v3
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
@@ -505,7 +570,7 @@ jobs:
cmakeAppendedArgs: ' -GNinja -DOPTION_USE_NSIS=ON -DHOST_BINARY_DIR=${{ github.workspace }}/build-host -DCMAKE_BUILD_TYPE=RelWithDebInfo'
- name: Build (without installer)
- if: needs.source.outputs.is_tag != 'true' || matrix.arch == 'arm64'
+ if: needs.source.outputs.is_tag != 'true'
uses: lukka/run-cmake@v3
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
diff --git a/README.md b/README.md
index 630c674c66..0bc54de03c 100644
--- a/README.md
+++ b/README.md
@@ -557,9 +557,6 @@ See the comments in the source files in `src/3rdparty/md5` for the complete lice
The implementations of Posix `getaddrinfo` and `getnameinfo` for OS/2 in `src/3rdparty/os2` are distributed partly under the GNU Lesser General Public License 2.1, and partly under the (3-clause) BSD license.
The exact licensing terms can be found in `src/3rdparty/os2/getaddrinfo.c` resp. `src/3rdparty/os2/getnameinfo.c`.
-The implementation of C++17 `std::optional` in `src/3rdparty/optional` is licensed under the Boost Software License - Version 1.0.
-See `src/3rdparty/optional/LICENSE_1_0.txt` for the complete license text.
-
## 4.0 Credits
diff --git a/bin/game/compat_1.10.nut b/bin/game/compat_1.10.nut
index 1c85766c0f..92cef84c53 100644
--- a/bin/game/compat_1.10.nut
+++ b/bin/game/compat_1.10.nut
@@ -6,3 +6,10 @@
*/
GSLog.Info("1.10 API compatibility in effect.");
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/bin/game/compat_1.2.nut b/bin/game/compat_1.2.nut
index c042e988b5..5fb29efedf 100644
--- a/bin/game/compat_1.2.nut
+++ b/bin/game/compat_1.2.nut
@@ -28,3 +28,10 @@ GSBridge.GetName <- function(bridge_id)
{
return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/bin/game/compat_1.3.nut b/bin/game/compat_1.3.nut
index 161f4fd0a0..7546e54c69 100644
--- a/bin/game/compat_1.3.nut
+++ b/bin/game/compat_1.3.nut
@@ -28,3 +28,10 @@ GSBridge.GetName <- function(bridge_id)
{
return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/bin/game/compat_1.4.nut b/bin/game/compat_1.4.nut
index 0ebb850675..c90b3e550b 100644
--- a/bin/game/compat_1.4.nut
+++ b/bin/game/compat_1.4.nut
@@ -20,3 +20,11 @@ GSBridge.GetName <- function(bridge_id)
{
return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
+
diff --git a/bin/game/compat_1.5.nut b/bin/game/compat_1.5.nut
index 86283cc0dd..0c62e56462 100644
--- a/bin/game/compat_1.5.nut
+++ b/bin/game/compat_1.5.nut
@@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id)
{
return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/bin/game/compat_1.6.nut b/bin/game/compat_1.6.nut
index 4a091b81ea..198b863a77 100644
--- a/bin/game/compat_1.6.nut
+++ b/bin/game/compat_1.6.nut
@@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id)
{
return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/bin/game/compat_1.7.nut b/bin/game/compat_1.7.nut
index febd335c36..76dc424353 100644
--- a/bin/game/compat_1.7.nut
+++ b/bin/game/compat_1.7.nut
@@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id)
{
return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/bin/game/compat_1.8.nut b/bin/game/compat_1.8.nut
index bd33b79f09..b9d27458a9 100644
--- a/bin/game/compat_1.8.nut
+++ b/bin/game/compat_1.8.nut
@@ -13,3 +13,10 @@ GSBridge.GetName <- function(bridge_id)
{
return GSBridge._GetName(bridge_id, GSVehicle.VT_RAIL);
}
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/bin/game/compat_1.9.nut b/bin/game/compat_1.9.nut
index ab9ffbccaf..32eec114af 100644
--- a/bin/game/compat_1.9.nut
+++ b/bin/game/compat_1.9.nut
@@ -6,3 +6,10 @@
*/
GSLog.Info("1.9 API compatibility in effect.");
+
+/* 1.11 adds a tile parameter. */
+GSCompany._ChangeBankBalance <- GSCompany.ChangeBankBalance;
+GSCompany.ChangeBankBalance <- function(company, delta, expenses_type)
+{
+ return GSCompany._ChangeBankBalance(company, delta, expenses_type, GSMap.TILE_INVALID);
+}
diff --git a/changelog.txt b/changelog.txt
index 143513dbe3..068dad577f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,232 @@
+1.11.0-beta1 (2021-01-22)
+------------------------------------------------------------------------
+Feature: [GS] Ability to set some extra text in the industry window (#8576)
+Feature: Show rainforest under vegetation on smallmap (#8562)
+Feature: Automatically determine window size on new install (#8536)
+Feature: Towns can build tunnels (#8473)
+Feature: Make maximum length of town bridges depend on population (with a minimum limit of 4) (#8439)
+Feature: New icons for renaming and go-to-location on GUI windows, and improve consistency of usage (#8455)
+Feature: Support for ARM64 on Apple Silicon and Windows (#8340, #8577, #8583)
+Feature: Add an option to disable tree growth completely (#8415)
+Feature: Support for Emscripten (play-OpenTTD-in-the-browser!) (#8355)
+Feature: Show group name as part of the default vehicle name (#8307)
+Feature: "Frozen" economy setting that stops production changes and industry closures (#8282)
+Feature: New velocity unit "tiles/day" (#8278)
+Feature: Option to automatically remove signals when placing rail (#8274)
+Feature: Increase max possible distance from border for oil refineries and rigs (#8237)
+Feature: Improve tree planting window, and allow planting 'clumps' of trees by dragging in the scenario editor (#8234)
+Feature: Indian Rupee (INR) currency (#8136)
+Feature: [GS] Ability to give a company exclusive access to an industry (#8115)
+Feature: Hotkeys for Land Info window, News window & close error window (#8053, #8266)
+Feature: Improve rendering of large viewports (#7962)
+Feature: [GS] Influence industry production changes from GameScript (#7912)
+Feature: [GS] Push-buttons on storybook pages (#7896)
+Feature: Option to group vehicle lists by shared orders (#7028)
+Feature: Drag-and-drop vehicles in group GUI for shared order groups (#7028)
+Add: [GS] A tile parameter to GSCompany::ChangeBankBalance for showing changes more visually (#8573)
+Add: [NewGRF] Allow NewGRF vehicles to query the current rail/road/tram type (#8554)
+Add: [Script] ScriptCargo::GetName for the human readable name of cargoes (#8544)
+Add: "reload" console command to reload the current scenario or heightmap (#8527)
+Add: [NewGRF] Flag to test if inflation is on or off (#8427)
+Add: [Script] Native priority queue (useful for things like pathfinders) (#8091)
+Add: [NewGRF] Industry behaviour flag to override second cargo production clamping for water industries when using smooth economy (#8079)
+Change: [SDL2] Start game on the screen where the cursor is (#8572)
+Change: Use a dark background for all profit graphs to increase contrast (#8557)
+Change: Reword warning in cheat window (#8538)
+Change: Enable the toolbar for road/rail/dock/airport, regardless of vehicle availability (#8521)
+Change: For arctic and tropical climates, make sure at least a few hills are generated (#8513)
+Change: Destroying a tunnel/bridge now sells the tracks before destroying the tunnel/bridge (#8508)
+Change: Move "give money" from client-list to company window (#8500)
+Change: [MacOS] Hide Dock and menu when in fullscreen mode (#8487)
+Change: Improve performance for complex vehicle chains by resolving sprites less frequently (#8485)
+Change: Make engine reliability independent of introduction date (#8470)
+Change: Some default settings to improve gameplay for new players - default non-stop orders on, disable inflation, quick goto orders, show track reservations, and more (#8463)
+Change: Converting town-owned road types now requires a positive town rating (#8457)
+Change: Rework server list buttons for searching LAN/internet servers (#8426)
+Change: Add some styling to GS question windows depending on the type (#8422)
+Change: [Linkgraph] Speed up game exit by allowing job threads to be aborted early (#8416)
+Change: Prevent towns from building dead-end road bridges (#8401)
+Change: Send network error to the server before making an emergency save (#8387)
+Change: Extend the allowed range for max loan setting up to £2 billion (#8386)
+Change: Don't display OS name when exiting the game (#8366)
+Change: Save openttd.cfg immediately on changing a setting (#8358)
+Change: Autorenew now defaults to on (#8352)
+Change: [NewGRF] Also use aircraft property 12 for helicopters (#8347)
+Change: Service at depot also resets breakdown chance (#8317)
+Change: Use key names instead of characters in hotkey.cfg (#8291)
+Change: Allow command cost-estimation while paused (#8222)
+Change: Always apply inflation from 1920 to 2090, no matter the game start year (#7589)
+Change: Use CMake for build system (#7270)
+Change: [Linkgraph] Pause the game when linkgraph jobs lag (#7081)
+Change: Place "Group by" above "Sort by" in station window for consistency (#7028)
+Fix #8589: Prevent desyncs with vehicle motion counters and NewGRFs (#8591)
+Fix #7670: Improve pathfinder performance when lost vehicles are blocked from moving (#8568)
+Fix: Inform user if a custom font failed to load due to missing glyphs (#8559)
+Fix: Don't allow wagon chains (without an engine) to exceed maximum train length (#8533)
+Fix #7619: Super fast NewGRF aircraft could be unable to land (#8531)
+Fix: Improve connection retries for the content server in cases of broken networking (#8530)
+Fix #7972: Show invalid orders to stations that don't accept the vehicle (#8516)
+Fix: Error when trying to clone a vehicle with invalid orders (#8515)
+Fix #8050: Various off-by-one errors in how the end-year of the game was used (#8512)
+Fix #8332: Aborting vehicle group drag & drop could cause crashes (#8511)
+Fix #8168: Allow relocating HQ partially over an existing HQ (#8510)
+Fix #8068: Allow selling tram track regardless of bank balance (#8509)
+Fix #7604: Prevent houses from wandering away from roads (#8507)
+Fix: Make the "password" button the same size as the other buttons in the Company window (#8500)
+Fix #7611: Keep news about vehicle accidents around after the vehicle is cleaned up (#8497)
+Fix: [MacOS] Full animation in fullscreen mode was reducing the height of the window (#8491)
+Fix: [MacOS] Loading custom fonts (#8484)
+Fix: Network client makes emergency saves twice if the server is disconnected (#8477)
+Fix #8462: Stop towns from trying to build roads on water (#8471)
+Fix: [NewGRF] GetCurveSpeedLimit should use the railtype from the current tile (#8466)
+Fix #8437: Crash when using certain heliports with certain rotated airports (#8458)
+Fix #8437: Planes would land at the wrong height if the top corner of the airport was lowered (#8458)
+Fix #8297: Infrastructure counters for road tunnels, bridges & depots (#8454)
+Fix #6468: Don't store the version of AIs that are started via console (#8430)
+Fix: Don't lower tree density if spreading is not enabled (#8413)
+Fix: Prevent savegame version conflicts with certain old patchpacks (#8411)
+Fix: [NewGRF] Variable 0x44 was always HZB_TOWN_EDGE for road stops (#8400)
+Fix #8313: Use correct capitalization for TTO / DOS music files in the baseset metadata (#8385)
+Fix: [NewGRF] Action 7/9 conditions 0x0F to 0x12 failed, if 'param' was 0x88 (#8382)
+Fix: Change the working-dir searchpath when using '-c' (#8367)
+Fix: Useless warning with -snull and no BaseSounds available (#8361)
+Fix: Crash trying to load TTO/TTD savegames. (#8356)
+Fix: [Script] Don't echo script exceptions to console (#8331)
+Fix: Slovak ownname was using the wrong form (#8326)
+Fix #8311: [NewGRF] Industry probability at map generation was scaled differently when set via property or callback (#8312)
+Fix: Only check houses for cargo when generating subsidies with towns (#8305)
+Fix: Sprite preview in sprite aligner was too small with scaled UI (#8288)
+Fix: Spell 'Viewport' consistently (#8260)
+Fix #7772: Show vehicle destination on mouseover when vehicle stopped (#8236, #8543)
+Fix #8232: Huge screenshot warning was shown incorrectly (#8224)
+Fix #8153: Report incompatible cargo/order when autoreplace fails (#8169)
+Fix: [Script] ScriptMarine::AreWaterTilesConnected did not work for aqueducts (#8074)
+Fix #7645: Add cost of clearing the sloped tile to the price of a dock (#7947)
+Fix #6452: Reset only editable and visible settings from GUI (#7890)
+Fix: Original terrain generator did not keep a single gap of water at the borders (#7883)
+Remove: In-game console command "content select all" (#8363)
+Remove: [OSX] Support for OSX older than 10.7, including QuickTime music driver (#8078)
+
+
+1.10.3 (2020-08-09)
+------------------------------------------------------------------------
+Change: Also make roadside trees match the tree transparency option (#8245)
+Fix: Center text and icons in the status bar vertically (#8273)
+Fix: [NRT] Set invalid road and tram types for rail tunnel ends (#8269)
+Fix #7980: Properly invalidate mouse-over station coverage highlight (#8263)
+Fix #8250: [NRT] Company infrastructure window always omits last road/tramtype (#8251)
+Fix #8162: [NRT] Improve error message when converting town owned road (#8247)
+Fix #8216: Don't show floating text on autoreplace if cost is 0 (#8244)
+Fix #8129: Crash if a news message expires while viewing the endgame screen (#8243)
+Fix #8221: Use more specific error message when a bridge is too long (#8240)
+Fix #8230: Resolve ".." when opening files in .tar (#8231)
+Fix: A few race conditions in netcode (#8227, #8228, #8229)
+Fix #7838: Crash relating to group creation and renaming (#8223)
+Fix #8104: [SDL2] Fix window resizability when going from fullscreen to windowed mode (#8211)
+Fix: Display banlist's indexes correctly (#8209)
+Fix: Possible desync with subsidy creation (#8159)
+Fix #8131: Draw small bridges pillars in more places (#8149)
+
+
+1.10.2 (2020-06-01)
+------------------------------------------------------------------------
+Add: Ubuntu 20.04 packages (#8127)
+Fix: [OSX] Possible crash on failure to set colourspace (#8181)
+Fix #8166: Prevent crash from a NewGRF with an invalid RoadType (#8180)
+Fix #8024: Make Online Content GUI more responsive while loading (#8179)
+Fix #7970: Disable event loop when generating crash dump (#8176)
+Fix: [Build] Compatibility with modern Visual Studio (#8170)
+Fix: Trees would disappear completely after a few years if tree spread was disabled (#8160)
+Fix #8155: Roadtype speed limit in scenario editor toolbar dropdown was doubled (#8156)
+Fix: Desync after house replacement (#8151)
+Fix #8137: New clients can't join (desync) after funding an industry (#8140)
+Fix #8132: Corrupted savegame with station with multiple owners caused a crash (#8134, #8142)
+Fix: Stop gamelog when recovering from a savegame load error (#8133)
+Fix: Exceptionally unlikely issue when reading MIDI files (#8125)
+Fix #8119: Docking areas were not properly updated when clearing, causing desyncs (#8124, #8130)
+Fix #8117: Memory leak for incoming admin port packets (#8122)
+Fix: Non-roadbridges potentially had roadtype information set (#8111)
+Fix #8108: Possible crash on loading TTD savegames with phantom oil rigs (#8109, #8110)
+Fix #8093: Build & refit test run changed game state and could cause desyncs (#8103)
+Fix: [Script] AreWaterTilesConnected did not handle aqueducts properly (#8074)
+
+
+1.10.1 (2020-04-13)
+------------------------------------------------------------------------
+Fix #8081: Crash when placing a ship depot next to a dock (#8082)
+Fix: [GS] A Goal's QuestionID was getting truncated (#8072)
+Fix #8064: Refit capacity could be displayed incorrectly in extreme edgecases (#8065)
+Fix #8060: Restore admin network API compatibility (#8061)
+Fix #8055: Crash when roadtype availability changes with the road construction toolbar open (#8058)
+
+
+1.10.0 (2020-04-01)
+------------------------------------------------------------------------
+Change: Open company window when clicking on a company goal (#8033)
+Change: [SDL2] Support pasting from clipboard on Linux (#8004)
+Fix: [Script] Random deviation upper bound range should be inclusive (#8052)
+Fix #8043: Incorrect handling of global road/tram hotkeys caused a crash (#8044)
+Fix #8039: [Script] SetOrderFlags and GetOrderDestination didn't work for oil rigs (#8040)
+Fix: [Script] CanBuildConnectedRoadPartsHere neighbours tiles were incorrect if you started a new game with a different world size (#8036)
+Fix: Ignore clicks on non-applicable global goals (#8035)
+Fix #7613: Limit News Window to 1024 messages to keep it usable and avoid overflowing scrollbars (#8026)
+Fix #7644: [OSX] Hopefully improve performance by manually set colorspace to sRGB (#8023)
+Fix #8020: Add missing docking tiles around industry neutral stations (#8021)
+Fix: GUI tramway icon only contained a single set of tram tracks (#8015)
+Fix: Station with multiple docks had the wrong tile area (#8014)
+Fix #8011: Crash when loading TTD scenario containing a dock (#8012)
+Fix #7998: Crash when scripts tried to access companies with invalid IDs (#8010)
+Fix: Crash when attempting to draw a string containing nonprintable characters (#8005)
+Fix #6399: Directory ~/.local/share not created if it didn't already exist (#8003)
+Fix #7958: Custom catenary missing on road bridges (#7991)
+Fix #7944: Demolishing locks built on rivers didn't always restore the river (#7946)
+
+
+1.10.0-RC1 (2020-02-09)
+------------------------------------------------------------------------
+Feature: Allow server to supply a reason to kicked/banned clients (#7859)
+Feature: [NewGRF] Station variable 6A, querying GRFID of nearby station tiles (#7956)
+Feature: Improved logic of sharing industry production between 3 or more stations (#7922)
+Feature: Highlight the item under mouse cursor in file browser (#7900)
+Feature: [GS] Methods to change town rating of companies (#7898)
+Feature: [NewGRF] Callback profiling command (#7868)
+Feature: Add a setting to show the name of the NewGRF of a vehicle in the build window (#7852)
+Feature: Ability to filter industry directory window by cargo (#7843)
+Feature: Minimap screenshot type (#7817)
+Feature: [GS] Methods to control engine availability of a specific company (#7791)
+Feature: Configurable game ending year (#7747)
+Feature: Separate window for taking screenshots (#7550)
+Change: Move autorenew setting to basic category (#7984)
+Change: Improved algorithm for transfer feeder payments (#7935)
+Change: Show volume sliders with wedges instead of boxy slider (#7902)
+Change: Auto-restart loads the original resources (e.g. save or scenario) again (#7688)
+Change: Improve readability of integer lists saved to config files (#7396)
+Fix #7976: Crash when attempting to kick the host via rcon (#7985)
+Fix #7592: Road vehicles no longer balanced between multiple road stop stations (#7979)
+Fix: Station rating effects affecting too large area (#7977)
+Fix #7974: Crash when Ctrl+click to show a collapsed vehicle group (#7975)
+Fix #7969: Crash when executing a recursive console alias (#7973)
+Fix #6566: Very long loading of the maximum "zoom out" level at high resolutions (#7968)
+Fix #7952: Crash when switching input languages (#7953)
+Fix: [OSX] Don't show a crash/assertion message box for a GUI-less video driver (#7934)
+Fix #7925: Corrupt savegames could lead to corruption of the titlegame (#7932)
+Fix: [Fluidsynth] Music notes from previous song were not properly reset (#7930)
+Fix: Invalid string usage within music window (#7928)
+Fix: Non-deterministic name sorting in industry directory window (#7915)
+Fix #7899: Various issues with town list window sorting (#7906, #7916)
+Fix #7587: Fix possible crashes when loading old save games with invalid waypoint positions (#7894)
+Fix: Avoid a crash by properly resetting timetable duration when loading old savegames (#7894)
+Fix: Possible crash when post road-works cleanup removes all road pieces (#7903)
+Fix #7891: Fix crash when loading save from 1.7.2 (#7892)
+Fix #7887: Missing sound effects for some main toolbar buttons (#7888)
+Fix #6667: Avoid confusion by also recalculating bridge costs for 'spectated' AI companies (#7884)
+Fix: Allow old NewGRF industries to hide in/out cargo slots (#7882)
+Fix: [Windows] Fix bootstrap GUI with Uniscribe but no Freetype (#7878)
+Fix: Missing keycodes for hotkeys.cfg (#7850)
+Fix #7625: Ensure road infrastructure cost is correctly updated when upgrading your own roads (#7628)
+Fix #7088: Avoid crash by closing AI/GS textfile windows when changing their in-game slot (#7094)
+
+
1.10.0-beta2 (2019-12-25)
------------------------------------------------------------------------
- Feature: [Script] More error mappings (#7857)
diff --git a/cmake/InstallAndPackage.cmake b/cmake/InstallAndPackage.cmake
index 925739fde7..de36f74a05 100644
--- a/cmake/InstallAndPackage.cmake
+++ b/cmake/InstallAndPackage.cmake
@@ -71,10 +71,15 @@ endif()
# Windows is a bit more annoying to detect; using the size of void pointer
# seems to be the most robust.
if(WIN32)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(ARCHITECTURE "win64")
+ # Check if the MSVC platform has been defined
+ if ("$ENV{Platform}" STREQUAL "arm64")
+ set(ARCHITECTURE "arm64")
else()
- set(ARCHITECTURE "win32")
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(ARCHITECTURE "win64")
+ else()
+ set(ARCHITECTURE "win32")
+ endif()
endif()
endif()
if(APPLE AND CMAKE_OSX_ARCHITECTURES)
@@ -102,7 +107,11 @@ if(APPLE)
set(CPACK_GENERATOR "Bundle")
include(PackageBundle)
- set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macosx-${CPACK_SYSTEM_NAME}")
+ if (APPLE_UNIVERSAL_PACKAGE)
+ set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-universal")
+ else()
+ set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-macos-${CPACK_SYSTEM_NAME}")
+ endif()
elseif(WIN32)
set(CPACK_GENERATOR "ZIP")
if(OPTION_USE_NSIS)
diff --git a/docs/palettes/palette_key.png b/docs/palettes/palette_key.png
new file mode 100644
index 0000000000..70e9452199
Binary files /dev/null and b/docs/palettes/palette_key.png differ
diff --git a/known-bugs.txt b/known-bugs.txt
index 440a4709ff..a687dff4a5 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
OpenTTD's known bugs
-Last updated: 2019-12-25
-Release version: 1.10.0-beta2
+Last updated: 2021-01-22
+Release version: 1.11.0-beta1
------------------------------------------------------------------------
diff --git a/media/baseset/openttd.grf b/media/baseset/openttd.grf
index 550863ff91..a63bfc4e29 100644
Binary files a/media/baseset/openttd.grf and b/media/baseset/openttd.grf differ
diff --git a/media/baseset/openttd/openttdgui.nfo b/media/baseset/openttd/openttdgui.nfo
index b458073bef..eb1313365e 100644
--- a/media/baseset/openttd/openttdgui.nfo
+++ b/media/baseset/openttd/openttdgui.nfo
@@ -4,7 +4,7 @@
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
//
-1 * 0 0C "OpenTTD GUI graphics"
- -1 * 3 05 15 \b 184 // OPENTTD_SPRITE_COUNT
+ -1 * 3 05 15 \b 186 // OPENTTD_SPRITE_COUNT
-1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal
-1 sprites/openttdgui.png 8bpp 146 8 64 31 -31 7 normal
-1 sprites/openttdgui.png 8bpp 226 8 64 31 -31 7 normal
@@ -189,3 +189,5 @@
-1 sprites/openttdgui_convert_road.png 8bpp 24 0 32 32 0 0 normal
-1 sprites/openttdgui_convert_tram.png 8bpp 0 0 20 20 0 0 normal
-1 sprites/openttdgui_convert_tram.png 8bpp 24 0 32 32 0 0 normal
+ -1 sprites/openttdgui.png 8bpp 513 440 10 10 0 0 normal
+ -1 sprites/openttdgui.png 8bpp 526 440 10 10 0 0 normal
diff --git a/media/baseset/openttd/openttdgui.png b/media/baseset/openttd/openttdgui.png
index 900a612a87..1fc02aa61e 100644
Binary files a/media/baseset/openttd/openttdgui.png and b/media/baseset/openttd/openttdgui.png differ
diff --git a/os/macosx/Info.plist.in b/os/macosx/Info.plist.in
index b3285589dd..04d6ea6d33 100644
--- a/os/macosx/Info.plist.in
+++ b/os/macosx/Info.plist.in
@@ -8,7 +8,7 @@
CFBundleDisplayName
${CPACK_BUNDLE_NAME}
CFBundleExecutable
- ${CPACK_BUNDLE_NAME}
+ openttd
CFBundleGetInfoString
#CPACK_PACKAGE_VERSION#, Copyright 2004-${CURRENT_YEAR} The OpenTTD team
CFBundleIconFile
diff --git a/os/macosx/notarize.sh b/os/macosx/notarize.sh
new file mode 100755
index 0000000000..3434c31256
--- /dev/null
+++ b/os/macosx/notarize.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+set -e
+
+# This script attempts to notarize the OpenTTD DMG generated by CPack.
+# If you are building an unofficial branch of OpenTTD, please change the bundle
+# ID in Info.plist and below.
+#
+# This uses `gon' to perform notarization:
+#
+# https://github.com/mitchellh/gon
+#
+# Follow the setup instructions on the gon site to install.
+#
+# Before executing this script, you must first configure CMake with at least the following
+# parameters:
+#
+# -DCPACK_BUNDLE_APPLE_CERT_APP={certificate ID}
+# "-DCPACK_BUNDLE_APPLE_CODESIGN_PARAMETER=--deep -f --options runtime"
+#
+# then run "make package" or "cpack".
+#
+# This will sign the application with your signing certificate, and will enable
+# the hardened runtime.
+#
+# You also need to set your Apple Developer username and password (app-specific password
+# is recommended) in the AC_USERNAME and AC_PASSWORD environment variables.
+#
+# Then, ensuring you're in your build directory and that the "bundles" directory
+# exists with a .dmg in it (clear out any old DMGs first), run:
+#
+# ../os/macosx/notarize.sh
+
+if [ -z "${AC_USERNAME}" ]; then
+ echo AC_USERNAME not set, skipping notarization.
+ exit 0
+fi;
+
+dmg_filename=(bundles/*.dmg)
+
+if [ "${dmg_filename}" = "bundles/*.dmg" ]; then
+ echo "No .dmg found in the bundles directory, skipping notarization. Please read this"
+ echo "script's source for execution instructions."
+ exit 1
+fi;
+
+cat < notarize.json
+{
+ "notarize": [
+ {
+ "path": "${dmg_filename[0]}",
+ "bundle_id": "org.openttd.openttd",
+ "staple": true
+ }
+ ]
+}
+EOF
+
+gon notarize.json
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index e10b277fe4..511ea92bdb 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -1133,7 +1133,7 @@ static bool AircraftController(Aircraft *v)
if ((amd.flag & (AMED_LAND | AMED_BRAKE)) && st != nullptr) {
assert(st->airport.HasHangar());
TileIndex hangar_tile = st->airport.GetHangarTile(0);
- airport_z = TilePixelHeight(hangar_tile) + 1; // To avoid clashing with the shadow
+ airport_z = GetTileMaxPixelZ(hangar_tile) + 1; // To avoid clashing with the shadow
}
if (amd.flag & AMED_LAND) {
diff --git a/src/command.cpp b/src/command.cpp
index a9f9489c5e..160326b936 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -341,7 +341,7 @@ static const Command _command_proc_table[] = {
DEF_CMD(CmdChangeServiceInt, 0, CMDT_VEHICLE_MANAGEMENT ), // CMD_CHANGE_SERVICE_INT
DEF_CMD(CmdBuildIndustry, CMD_DEITY, CMDT_LANDSCAPE_CONSTRUCTION), // CMD_BUILD_INDUSTRY
- DEF_CMD(CmdIndustryCtrl, CMD_DEITY, CMDT_OTHER_MANAGEMENT ), // CMD_INDUSTRY_CTRL
+ DEF_CMD(CmdIndustryCtrl, CMD_STR_CTRL | CMD_DEITY, CMDT_OTHER_MANAGEMENT ), // CMD_INDUSTRY_CTRL
DEF_CMD(CmdSetCompanyManagerFace, 0, CMDT_OTHER_MANAGEMENT ), // CMD_SET_COMPANY_MANAGER_FACE
DEF_CMD(CmdSetCompanyColour, 0, CMDT_OTHER_MANAGEMENT ), // CMD_SET_COMPANY_COLOUR
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 92f7898426..e70ae5a386 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -37,6 +37,8 @@
#include "newgrf_profiling.h"
#include "console_func.h"
#include "engine_base.h"
+#include "road.h"
+#include "rail.h"
#include "game/game.hpp"
#include "table/strings.h"
#include "aircraft.h"
@@ -2318,32 +2320,40 @@ DEF_CONSOLE_CMD(ConDumpRoadTypes)
IConsolePrintF(CC_DEFAULT, " s = not available to scripts (AI/GS)");
IConsolePrintF(CC_DEFAULT, " t = not modifiable by towns");
- extern RoadTypeInfo _roadtypes[ROADTYPE_END];
- btree::btree_set grfids;
+ btree::btree_map grfs;
for (RoadType rt = ROADTYPE_BEGIN; rt < ROADTYPE_END; rt++) {
- const RoadTypeInfo &rti = _roadtypes[rt];
- if (rti.label == 0) continue;
- uint32 grfid = GetStringGRFID(rti.strings.name);
- if (grfid != 0) grfids.insert(grfid);
+ const RoadTypeInfo *rti = GetRoadTypeInfo(rt);
+ if (rti->label == 0) continue;
+ uint32 grfid = 0;
+ const GRFFile *grf = rti->grffile[ROTSG_GROUND];
+ if (grf == nullptr) {
+ uint32 str_grfid = GetStringGRFID(rti->strings.name);
+ if (str_grfid != 0) {
+ extern GRFFile *GetFileByGRFID(uint32 grfid);
+ grf = GetFileByGRFID(grfid);
+ }
+ }
+ if (grf != nullptr) {
+ grfid = grf->grfid;
+ grfs.insert(std::pair(grfid, grf));
+ }
IConsolePrintF(CC_DEFAULT, " %02u %s %c%c%c%c, Flags: %c%c%c%c%c, Extra Flags: %c%c, GRF: %08X, %s",
(uint) rt,
RoadTypeIsTram(rt) ? "Tram" : "Road",
- rti.label >> 24, rti.label >> 16, rti.label >> 8, rti.label,
- HasBit(rti.flags, ROTF_CATENARY) ? 'c' : '-',
- HasBit(rti.flags, ROTF_NO_LEVEL_CROSSING) ? 'l' : '-',
- HasBit(rti.flags, ROTF_NO_HOUSES) ? 'X' : '-',
- HasBit(rti.flags, ROTF_HIDDEN) ? 'h' : '-',
- HasBit(rti.flags, ROTF_TOWN_BUILD) ? 'T' : '-',
- HasBit(rti.extra_flags, RXTF_NOT_AVAILABLE_AI_GS) ? 's' : '-',
- HasBit(rti.extra_flags, RXTF_NO_TOWN_MODIFICATION) ? 't' : '-',
+ rti->label >> 24, rti->label >> 16, rti->label >> 8, rti->label,
+ HasBit(rti->flags, ROTF_CATENARY) ? 'c' : '-',
+ HasBit(rti->flags, ROTF_NO_LEVEL_CROSSING) ? 'l' : '-',
+ HasBit(rti->flags, ROTF_NO_HOUSES) ? 'X' : '-',
+ HasBit(rti->flags, ROTF_HIDDEN) ? 'h' : '-',
+ HasBit(rti->flags, ROTF_TOWN_BUILD) ? 'T' : '-',
+ HasBit(rti->extra_flags, RXTF_NOT_AVAILABLE_AI_GS) ? 's' : '-',
+ HasBit(rti->extra_flags, RXTF_NO_TOWN_MODIFICATION) ? 't' : '-',
BSWAP32(grfid),
- GetStringPtr(rti.strings.name)
+ GetStringPtr(rti->strings.name)
);
}
- for (uint32 grfid : grfids) {
- extern GRFFile *GetFileByGRFID(uint32 grfid);
- const GRFFile *grffile = GetFileByGRFID(grfid);
- IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grfid), grffile ? grffile->filename : "????");
+ for (const auto &grf : grfs) {
+ IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grf.first), grf.second->filename);
}
return true;
}
@@ -2366,31 +2376,40 @@ DEF_CONSOLE_CMD(ConDumpRailTypes)
IConsolePrintF(CC_DEFAULT, " p = signal graphics callback enabled for programmable pre-signals");
IConsolePrintF(CC_DEFAULT, " r = signal graphics callback restricted signal flag enabled");
- btree::btree_set grfids;
+ btree::btree_map grfs;
for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) {
const RailtypeInfo *rti = GetRailTypeInfo(rt);
if (rti->label == 0) continue;
- uint32 grfid = GetStringGRFID(rti->strings.name);
- if (grfid != 0) grfids.insert(grfid);
+ uint32 grfid = 0;
+ const GRFFile *grf = rti->grffile[RTSG_GROUND];
+ if (grf == nullptr) {
+ uint32 str_grfid = GetStringGRFID(rti->strings.name);
+ if (str_grfid != 0) {
+ extern GRFFile *GetFileByGRFID(uint32 grfid);
+ grf = GetFileByGRFID(grfid);
+ }
+ }
+ if (grf != nullptr) {
+ grfid = grf->grfid;
+ grfs.insert(std::pair(grfid, grf));
+ }
IConsolePrintF(CC_DEFAULT, " %02u %c%c%c%c, Flags: %c%c%c%c%c%c, Ctrl Flags: %c%c, GRF: %08X, %s",
(uint) rt,
rti->label >> 24, rti->label >> 16, rti->label >> 8, rti->label,
- HasBit(rti->flags, RTF_CATENARY) ? 'c' : '-',
- HasBit(rti->flags, RTF_NO_LEVEL_CROSSING) ? 'l' : '-',
- HasBit(rti->flags, RTF_HIDDEN) ? 'h' : '-',
- HasBit(rti->flags, RTF_NO_SPRITE_COMBINE) ? 's' : '-',
- HasBit(rti->flags, RTF_ALLOW_90DEG) ? 'a' : '-',
- HasBit(rti->flags, RTF_DISALLOW_90DEG) ? 'd' : '-',
- HasBit(rti->ctrl_flags, RTCF_PROGSIG) ? 'p' : '-',
+ HasBit(rti->flags, RTF_CATENARY) ? 'c' : '-',
+ HasBit(rti->flags, RTF_NO_LEVEL_CROSSING) ? 'l' : '-',
+ HasBit(rti->flags, RTF_HIDDEN) ? 'h' : '-',
+ HasBit(rti->flags, RTF_NO_SPRITE_COMBINE) ? 's' : '-',
+ HasBit(rti->flags, RTF_ALLOW_90DEG) ? 'a' : '-',
+ HasBit(rti->flags, RTF_DISALLOW_90DEG) ? 'd' : '-',
+ HasBit(rti->ctrl_flags, RTCF_PROGSIG) ? 'p' : '-',
HasBit(rti->ctrl_flags, RTCF_RESTRICTEDSIG) ? 'r' : '-',
BSWAP32(grfid),
GetStringPtr(rti->strings.name)
);
}
- for (uint32 grfid : grfids) {
- extern GRFFile *GetFileByGRFID(uint32 grfid);
- const GRFFile *grffile = GetFileByGRFID(grfid);
- IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grfid), grffile ? grffile->filename : "????");
+ for (const auto &grf : grfs) {
+ IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grf.first), grf.second->filename);
}
return true;
}
@@ -2467,12 +2486,23 @@ DEF_CONSOLE_CMD(ConDumpCargoTypes)
IConsolePrintF(CC_DEFAULT, " c = covered/sheltered");
IConsolePrintF(CC_DEFAULT, " S = special");
- btree::btree_set grfids;
+ btree::btree_map grfs;
for (CargoID i = 0; i < NUM_CARGO; i++) {
const CargoSpec *spec = CargoSpec::Get(i);
if (!spec->IsValid()) continue;
- uint32 grfid = GetStringGRFID(spec->name);
- if (grfid != 0) grfids.insert(grfid);
+ uint32 grfid = 0;
+ const GRFFile *grf = spec->grffile;
+ if (grf == nullptr) {
+ uint32 str_grfid = GetStringGRFID(spec->name);
+ if (str_grfid != 0) {
+ extern GRFFile *GetFileByGRFID(uint32 grfid);
+ grf = GetFileByGRFID(grfid);
+ }
+ }
+ if (grf != nullptr) {
+ grfid = grf->grfid;
+ grfs.insert(std::pair(grfid, grf));
+ }
IConsolePrintF(CC_DEFAULT, " %02u Bit: %2u, Label: %c%c%c%c, Callback mask: 0x%02X, Cargo class: %c%c%c%c%c%c%c%c%c%c%c, GRF: %08X, %s",
(uint) i,
spec->bitnum,
@@ -2493,10 +2523,8 @@ DEF_CONSOLE_CMD(ConDumpCargoTypes)
GetStringPtr(spec->name)
);
}
- for (uint32 grfid : grfids) {
- extern GRFFile *GetFileByGRFID(uint32 grfid);
- const GRFFile *grffile = GetFileByGRFID(grfid);
- IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grfid), grffile ? grffile->filename : "????");
+ for (const auto &grf : grfs) {
+ IConsolePrintF(CC_DEFAULT, " GRF: %08X = %s", BSWAP32(grf.first), grf.second->filename);
}
return true;
}
@@ -3068,6 +3096,33 @@ DEF_CONSOLE_CMD(ConFindNonRealisticBrakingSignal)
return true;
}
+DEF_CONSOLE_CMD(ConDumpInfo)
+{
+ if (argc != 2) {
+ IConsoleHelp("Dump debugging information.");
+ IConsoleHelp("Usage: dump_info roadtypes|railtypes|cargotypes");
+ IConsoleHelp(" Show information about road/tram types, rail types or cargo types.");
+ return true;
+ }
+
+ if (strcasecmp(argv[1], "roadtypes") == 0) {
+ ConDumpRoadTypes(argc, argv);
+ return true;
+ }
+
+ if (strcasecmp(argv[1], "railtypes") == 0) {
+ ConDumpRailTypes(argc, argv);
+ return true;
+ }
+
+ if (strcasecmp(argv[1], "cargotypes") == 0) {
+ ConDumpCargoTypes(argc, argv);
+ return true;
+ }
+
+ return false;
+}
+
/*******************************
* console command registration
*******************************/
@@ -3252,6 +3307,7 @@ void IConsoleStdLibRegister()
/* NewGRF development stuff */
IConsoleCmdRegister("reload_newgrfs", ConNewGRFReload, ConHookNewGRFDeveloperTool);
IConsoleCmdRegister("newgrf_profile", ConNewGRFProfile, ConHookNewGRFDeveloperTool);
+ IConsoleCmdRegister("dump_info", ConDumpInfo);
IConsoleCmdRegister("do_disaster", ConDoDisaster, ConHookNewGRFDeveloperTool, true);
IConsoleCmdRegister("bankrupt_company", ConBankruptCompany, ConHookNewGRFDeveloperTool, true);
IConsoleCmdRegister("delete_company", ConDeleteCompany, ConHookNewGRFDeveloperTool, true);
diff --git a/src/cpu.cpp b/src/cpu.cpp
index bafa0f7352..b93f0fa5ed 100644
--- a/src/cpu.cpp
+++ b/src/cpu.cpp
@@ -16,11 +16,18 @@
/* rdtsc for MSC_VER, uses simple inline assembly, or _rdtsc
* from external win64.asm because VS2005 does not support inline assembly */
-#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) && !defined(RDTSC_AVAILABLE)
+#if defined(_MSC_VER) && !defined(RDTSC_AVAILABLE)
#include
+#include
uint64 ottd_rdtsc()
{
+#if defined(_M_ARM)
+ return __rdpmccntr64();
+#elif defined(_M_ARM64)
+ return _ReadStatusReg(ARM64_PMCCNTR_EL0);
+#else
return __rdtsc();
+#endif
}
#define RDTSC_AVAILABLE
#endif
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index 0d256444d7..44ce649510 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -45,7 +45,11 @@
static const NWidgetPart _nested_train_depot_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
+ NWidget(NWID_SELECTION, INVALID_COLOUR, WID_D_SHOW_RENAME), // rename button
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_DEPOT_RENAME_TOOLTIP),
+ EndContainer(),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_D_CAPTION), SetDataTip(STR_DEPOT_CAPTION, STR_NULL),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_NULL),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
NWidget(WWT_STICKYBOX, COLOUR_GREY),
@@ -70,10 +74,6 @@ static const NWidgetPart _nested_train_depot_widgets[] = {
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_BUILD), SetDataTip(0x0, STR_NULL), SetFill(1, 1), SetResize(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_D_CLONE), SetDataTip(0x0, STR_NULL), SetFill(1, 1), SetResize(1, 0),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_LOCATION), SetDataTip(STR_BUTTON_LOCATION, STR_NULL), SetFill(1, 1), SetResize(1, 0),
- NWidget(NWID_SELECTION, INVALID_COLOUR, WID_D_SHOW_RENAME), // rename button
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_RENAME), SetDataTip(STR_BUTTON_RENAME, STR_DEPOT_RENAME_TOOLTIP), SetFill(1, 1), SetResize(1, 0),
- EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_D_VEHICLE_LIST), SetDataTip(0x0, STR_NULL), SetFill(0, 1),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_STOP_ALL), SetDataTip(SPR_FLAG_VEH_STOPPED, STR_NULL), SetFill(0, 1),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_D_START_ALL), SetDataTip(SPR_FLAG_VEH_RUNNING, STR_NULL), SetFill(0, 1),
diff --git a/src/fontdetection.cpp b/src/fontdetection.cpp
index fd48bd801b..570e1aa068 100644
--- a/src/fontdetection.cpp
+++ b/src/fontdetection.cpp
@@ -347,7 +347,7 @@ static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXT
PLOGFONT os_data = MallocT(1);
*os_data = logfont->elfLogFont;
info->callback->SetFontNames(info->settings, font_name, os_data);
- if (info->callback->FindMissingGlyphs(nullptr)) return 1;
+ if (info->callback->FindMissingGlyphs()) return 1;
DEBUG(freetype, 1, "Fallback font: %s (%s)", font_name, english_name);
return 0; // stop enumerating
}
@@ -477,7 +477,7 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
/* Save result. */
callback->SetFontNames(settings, name);
- if (!callback->FindMissingGlyphs(nullptr)) {
+ if (!callback->FindMissingGlyphs()) {
DEBUG(freetype, 2, "CT-Font for %s: %s", language_isocode, name);
result = true;
break;
@@ -488,10 +488,10 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
/* For some OS versions, the font 'Arial Unicode MS' does not report all languages it
* supports. If we didn't find any other font, just try it, maybe we get lucky. */
callback->SetFontNames(settings, "Arial Unicode MS");
- result = !callback->FindMissingGlyphs(nullptr);
+ result = !callback->FindMissingGlyphs();
}
- callback->FindMissingGlyphs(nullptr);
+ callback->FindMissingGlyphs();
return result;
}
@@ -623,7 +623,7 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
callback->SetFontNames(settings, (const char*)file);
- bool missing = callback->FindMissingGlyphs(nullptr);
+ bool missing = callback->FindMissingGlyphs();
DEBUG(freetype, 1, "Font \"%s\" misses%s glyphs", file, missing ? "" : " no");
if (!missing) {
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index f99f374b9f..5783955e0a 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -325,6 +325,9 @@ protected:
/* Where to draw the X axis. Use floating point to avoid overflowing and results of zero. */
x_axis_offset = (int)((r.bottom - r.top) * (double)interval.highest / (double)interval_size);
+ /* Draw the background of the graph itself. */
+ GfxFillRect(r.left, r.top, r.right, r.bottom, GREY_SCALE(2));
+
/* Draw the vertical grid lines. */
/* Don't draw the first line, as that's where the axis will be. */
diff --git a/src/industry.h b/src/industry.h
index 5ec4ccd0b1..8805d17467 100644
--- a/src/industry.h
+++ b/src/industry.h
@@ -33,6 +33,13 @@ enum ProductionLevels {
PRODLEVEL_MAXIMUM = 0x80, ///< the industry is running at full speed
};
+enum class IndustryAction : byte {
+ SetControlFlags = 0, ///< Set IndustryControlFlags
+ SetExclusiveSupplier = 1, ///< Set exclusive supplier
+ SetExclusiveConsumer = 2, ///< Set exclusive consumer
+ SetText = 3, ///< Set additional text
+};
+
/**
* Flags to control/override the behaviour of an industry.
* These flags are controlled by game scripts.
@@ -91,6 +98,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
byte selected_layout; ///< Which tile layout was used when creating the industry
Owner exclusive_supplier; ///< Which company has exclusive rights to deliver cargo (INVALID_OWNER = anyone)
Owner exclusive_consumer; ///< Which company has exclusive rights to take cargo (INVALID_OWNER = anyone)
+ std::string text; ///< General text with additional information.
uint16 random; ///< Random value used for randomisation of all kinds of things
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index d840ba8de6..adc9804aea 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -41,6 +41,8 @@
#include "object_base.h"
#include "game/game.hpp"
#include "error.h"
+#include "cmd_helper.h"
+#include "string_func.h"
#include "table/strings.h"
#include "table/industry_land.h"
@@ -2136,16 +2138,13 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
* @param flags Type of operation.
* @param p1 IndustryID
* @param p2 various bitstuffed elements
- * - p2 = (bit 0 - 7) - action to perform:
- * 0 = set control flags
- * 1 = set exclusive supplier
- * 2 = set exclusive consumer
+ * - p2 = (bit 0 - 7) - IndustryAction to perform
* - p2 = (bit 8 - 15) - IndustryControlFlags
* (only used with set control flags)
* - p2 = (bit 16 - 23) - CompanyID to set or INVALID_OWNER (available to everyone) or
* OWNER_NONE (neutral stations only) or OWNER_DEITY (no one)
* (only used with set exclusive supplier / consumer)
- * @param text unused
+ * @param text - Additional industry text (only used with set text action)
* @return Empty cost or an error.
*/
CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
@@ -2155,10 +2154,10 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
Industry *ind = Industry::GetIfValid(p1);
if (ind == nullptr) return CMD_ERROR;
- uint8 action = GB(p2, 0, 8);
+ auto action = static_cast(GB(p2, 0, 8));
switch (action) {
- case 0: {
+ case IndustryAction::SetControlFlags: {
IndustryControlFlags ctlflags = (IndustryControlFlags)GB(p2, 8, 8) & INDCTL_MASK;
if (flags & DC_EXEC) ind->ctlflags = ctlflags;
@@ -2166,15 +2165,15 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
break;
}
- case 1:
- case 2: {
+ case IndustryAction::SetExclusiveSupplier:
+ case IndustryAction::SetExclusiveConsumer: {
Owner company_id = (Owner)GB(p2, 16, 8);
if (company_id != OWNER_NONE && company_id != INVALID_OWNER && company_id != OWNER_DEITY
&& !Company::IsValidID(company_id)) return CMD_ERROR;
if (flags & DC_EXEC) {
- if (action == 1) {
+ if (action == IndustryAction::SetExclusiveSupplier) {
ind->exclusive_supplier = company_id;
} else {
ind->exclusive_consumer = company_id;
@@ -2184,6 +2183,13 @@ CommandCost CmdIndustryCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
break;
}
+ case IndustryAction::SetText: {
+ ind->text.clear();
+ if (!StrEmpty(text)) ind->text = text;
+ InvalidateWindowData(WC_INDUSTRY_VIEW, ind->index);
+ break;
+ }
+
default:
NOT_REACHED();
}
@@ -2827,8 +2833,7 @@ static void ChangeIndustryProduction(Industry *i, bool monthly)
/* Prevent production to overflow or Oil Rig passengers to be over-"produced" */
new_prod = Clamp(new_prod, 1, 255);
-
- if (((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) != 0) && j == 1 && !(indspec->behaviour & INDUSTRYBEH_WATER_NO_CLAMP_PROD)) {
+ if (i->produced_cargo[j] == CT_PASSENGERS && !(indspec->behaviour & INDUSTRYBEH_NO_PAX_PROD_CLAMP)) {
new_prod = Clamp(new_prod, 0, 16);
}
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index a76689da98..419ebef972 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -913,6 +913,13 @@ public:
}
}
}
+
+ if (!i->text.empty()) {
+ SetDParamStr(0, i->text.c_str());
+ y += WD_PAR_VSEP_WIDE;
+ y = DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, y, UINT16_MAX, STR_JUST_RAW_STRING, TC_BLACK);
+ }
+
return y + WD_FRAMERECT_BOTTOM;
}
@@ -1114,6 +1121,7 @@ static const NWidgetPart _nested_industry_view_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_CREAM),
NWidget(WWT_CAPTION, COLOUR_CREAM, WID_IV_CAPTION), SetDataTip(STR_INDUSTRY_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_CREAM, WID_IV_GOTO), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP),
NWidget(WWT_DEBUGBOX, COLOUR_CREAM),
NWidget(WWT_SHADEBOX, COLOUR_CREAM),
NWidget(WWT_DEFSIZEBOX, COLOUR_CREAM),
@@ -1127,7 +1135,6 @@ static const NWidgetPart _nested_industry_view_widgets[] = {
NWidget(WWT_PANEL, COLOUR_CREAM, WID_IV_INFO), SetMinimalSize(260, 2), SetResize(1, 0),
EndContainer(),
NWidget(NWID_HORIZONTAL),
- NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_GOTO), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_INDUSTRY_VIEW_LOCATION_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_CREAM, WID_IV_DISPLAY), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_INDUSTRY_DISPLAY_CHAIN, STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP),
NWidget(WWT_RESIZEBOX, COLOUR_CREAM),
EndContainer(),
diff --git a/src/industrytype.h b/src/industrytype.h
index 937ff62cb9..d5f1ba96a7 100644
--- a/src/industrytype.h
+++ b/src/industrytype.h
@@ -80,7 +80,7 @@ enum IndustryBehaviour {
INDUSTRYBEH_NOBUILT_MAPCREATION = 1 << 16, ///< Do not force one instance of this type to appear on map generation
INDUSTRYBEH_CANCLOSE_LASTINSTANCE = 1 << 17, ///< Allow closing down the last instance of this type
INDUSTRYBEH_CARGOTYPES_UNLIMITED = 1 << 18, ///< Allow produced/accepted cargoes callbacks to supply more than 2 and 3 types
- INDUSTRYBEH_WATER_NO_CLAMP_PROD = 1 << 19, ///< Do not clamp production of second cargo for water industries
+ INDUSTRYBEH_NO_PAX_PROD_CLAMP = 1 << 19, ///< Do not clamp production of passengers. (smooth economy only)
};
DECLARE_ENUM_AS_BIT_SET(IndustryBehaviour)
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index 8c80537a42..bb95f36985 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Kies hoe
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Kies kriterea om volgens te rangskik
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Kies kriteria om volgens te filter
STR_BUTTON_SORT_BY :{BLACK}Sorteer volgens
-STR_BUTTON_LOCATION :{BLACK}Ligging
STR_BUTTON_RENAME :{BLACK}Hernoem
STR_BUTTON_CATCHMENT :{BLACK}Dekking
STR_TOOLTIP_CATCHMENT :{BLACK}Wissel dekking van die vertoonarea
@@ -3685,10 +3684,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Maak aut
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Skuif skerm na trein. Ctrl+klik om die skerm die trein te laat volg
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Skuif skerm na voertuig. Ctrl+klik om die skerm die voertuig te laat volg
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Skuif skerm na skip. Ctrl+klik om die skerm die skip te laat volg
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Skuif skerm na vliegtuig. Ctrl+klik om die skerm die vliegtuig te laat volg
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur trein na diensstasie. Ctrl+klik om net te diens
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur voertuig na diensstasie. Ctrl+klik om net te diens
@@ -3720,10 +3715,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Wys pad
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Wys skip se aanwyse
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Toon vliegtuig aanwyse
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Huidige treinaksie - klik hier om trein te stop/aanskakel. Ctrl+klik om na bestemming te skuif.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Huidige voertuigaksie - klik hier om voertuig to stop/aanskakel. Ctrl+klik om na bestemming te skuif.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Huidige skipaksie - klik hier om skip te stop/aanskakel. Ctrl+klik om na bestemming te skuif.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Huidige vliegtuigaksie - klik hier om vliegtuig te stop/aanskakel. Ctrl+klik om na bestemming te skuif.
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laai / Aflaai
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index f7b0b8ccf8..f2c8cea6a8 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -225,7 +225,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK} اخت
STR_TOOLTIP_SORT_CRITERIA :{BLACK} اختر نوع الترتيب
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}حدد معايير المُرَشِح
STR_BUTTON_SORT_BY :{BLACK} رتب بـ
-STR_BUTTON_LOCATION :{BLACK}الموقع
STR_BUTTON_RENAME :{BLACK}اعادة تسمية
STR_BUTTON_CATCHMENT :{BLACK}مدى التغطية
@@ -3091,10 +3090,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK} الم
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}ضع القطار في مركز شاشة العرض. مفتاح كنترول لمتابعة حركة القطار.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}وضع العربة في مركز شاشة العرض. مفتاح كنترول سيتابع حركة العربة.
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}عرض السفينة في مركز الشاشة. مفتاح كنترول سيتابع حركة السفينة.
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}وضع الطائرة في مركز الشاشة. مفتاح كنترول سيتابع حركة الطائرة
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK} ارسل القطار للورشة - مفتاح التحكم (كنترول) + الضغط سيرسله لصيانة فقط
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}ارسل العربة الى الورشة. مفتاح التحكم (كنترول) + الضغط ترسل للصيانة فقط
@@ -3126,10 +3121,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}عرض
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}عرض تفاصيل السفينة
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}عرض تفاصيل الطائرة
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}حركة القطار الحالية - اضغط هنا لايقاف / تشغيل القطار
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}حركة العربة الحالية - اضغط هنا لايقاف / تشغيل العربة
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}امر السفينة الحالي - اضغط لايقاف / تشغيل السفينة
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}وضع الطائرة الحالي - اضغط هنا لايقاف / تشغيل الطائرة
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}تحميل / تفريغ
diff --git a/src/lang/basque.txt b/src/lang/basque.txt
index 073bcd7342..c2982d45dc 100644
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -232,7 +232,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Hautatu
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Aukeratu ordenatze irizpideak
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Aukeratu iragazki irizpideak
STR_BUTTON_SORT_BY :{BLACK}Ordenatu
-STR_BUTTON_LOCATION :{BLACK}Kokapena
STR_BUTTON_RENAME :{BLACK}Berrizendatu
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lehioa itxi
@@ -3432,10 +3431,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ordezkat
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia trenean kokatu. Ktrl+klik trena ikuspegi nagusiarekin jarraitzeko
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia errepide ibilgailuan kokatu. Ktrl+klik errepide ibilgailua ikuspegi nagusiarekin jarraitzeko
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia itsasontzian kokatu. Ktrl+klik itsasontzia ikuspegi nagusiarekin jarraitzeko
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Ikuspegi nagusia hegazkinean kokatu. Ktrl+klik hegazkina ikuspegi nagusiarekin jarraitzeko
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Trena gordailura bidali. Ktrl+klik bakarrik mantenimendua egiteko
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Errepide ibilgailua gordailura bidali. Ktrl+klik bakarrik mantenimendua egiteko
@@ -3467,10 +3462,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Errepide
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Itsasontziaren xehetasunak ikusi
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Hegazkinaren xehetasunak ikusi
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trena orain egiten ari den ekitza - Klik trena gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Ibilgailua orain egiten ari duen ekitza - Klik ibilgailua gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Itsasontzia orain egiten ari duen ekitza - Klik itsasontzia gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Hegazkina orain egiten ari duen ekitza - Klik hegazkina gelditzeko/abiarazteko. Krtl+klik helmugara bideratzeko
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Kargatzen/Deskargatzen
diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt
index e55e01f9d6..f469198f5c 100644
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -545,7 +545,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Зьме
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Зьмена крытэрыю сартаваньня
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Выберыце фiльтр
STR_BUTTON_SORT_BY :{BLACK}Сартаваньне
-STR_BUTTON_LOCATION :{BLACK}Агляд
STR_BUTTON_RENAME :{BLACK}Перайменаваць
STR_BUTTON_CATCHMENT :{BLACK}Ахоп
@@ -4013,10 +4012,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Дазв
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Паказаць цягнiк у галоўным вакне. Ctrl+клік — сачыць за цягнiком у галоўным вакне.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Паказаць аўтамабiль у галоўным вакне. Ctrl+клік — сачыць за ім у галоўным вакне.
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Паказаць карабель у галоўным вакне. Ctrl+клік будзе сачыць за караблём у галоўным вакне.
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Паказаць паветранае судна у галоўным вакне. Ctrl+клік — сачыць за ім у галоўным вакне.
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Паслаць цягнiк у дэпо. Ctrl+клік — толькі для абслугоўваньня.
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Паслаць аўтамабiль у гараж. Ctrl+клік — толькі для абслугоўваньня.
@@ -4048,10 +4043,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пака
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Паказаць зьвесткі аб караблi
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Паказаць зьвесткі аб авiятранспарце
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне цягнiка; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне аўтамабiля; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне карабля; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Бягучае дзеяньне паветранага судна; клікніце для яго спыненьня/запуску. Ctrl+клік — агляд пункта прызначэньня.
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Разгрузка / Пагрузка
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index 373e30e571..634cb003c0 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selecion
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecione critério de classificação
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecione critério para filtração
STR_BUTTON_SORT_BY :{BLACK}Classificar por
-STR_BUTTON_LOCATION :{BLACK}Local
STR_BUTTON_RENAME :{BLACK}Renomear
STR_BUTTON_CATCHMENT :{BLACK}Cobertura
STR_TOOLTIP_CATCHMENT :{BLACK}Alternar a visão da área de cobertura
@@ -1443,6 +1442,7 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Manter a barra
STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Mantém as ferramentas de construção para pontes, túneis, etc abertas após o uso
STR_CONFIG_SETTING_EXPENSES_LAYOUT :Agrupar despesas na janela de financas da companhia: {STRING}
STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Define o layout para os gastos da companhia
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Automaticamente remove sinais durante a construção de ferrovias se os sinais estiverem no caminho. Note que isso pode levar a acidentes ferroviários.
STR_CONFIG_SETTING_SOUND_TICKER :Notícias: {STRING}
STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Toca um som para mensagens resumidas
@@ -1607,6 +1607,7 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Linear
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Posicionamento de árvores: {STRING}
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Controla o nascimento aleatório de árvores durante o jogo. Isso pode afetar indústrias que dependem do crescimento de árvores, como serrarias
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Crescer sem espalhar {RED}(afeta serrarias)
STR_CONFIG_SETTING_TOOLBAR_POS :Posição da barra de ferramentas principal: {STRING}
STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Posição horizontal da barra de ferramentas principal no topo da tela
@@ -1967,6 +1968,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Entrar n
STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Atualizar dados
STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Atualiza as informações sobre o servidor
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :{BLACK}Procurar na internet
STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Adicionar servidor
STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Adiciona um servidor à lista que será sempre verificada se existem jogos ocorrendo
STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Iniciar servidor
@@ -2520,6 +2522,7 @@ STR_TREES_RANDOM_TYPE :{BLACK}Árvores
STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Plantar árvores de tipo aleatório, Shift alterna entre construção/preço estimado
STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Plantar Aleatoriamente
STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Planta árvores aleatoriamente pelo terreno
+STR_TREES_MODE_FOREST_LG_TOOLTIP :{BLACK}Planta florestas grandes ao arrastar pelo terreno.
# Land generation window (SE)
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Gerar Terreno
@@ -3721,10 +3724,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Faz auto
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar visão no local do trem. Ctrl+Clique seguirá o trem na visão principal.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centralizar visualização na localização do veículo. Ctrl+Clique segue o veículo
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar visão no local da embarcação. Ctrl+Clique seguirá o navio na visão
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar visão no local da aeronave. Ctrl+Clique seguirá a aeronave na visão
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar trem para o depósito
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar veículo para a garagem. CTRL+clique irá apenas reparar
@@ -3756,10 +3755,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Exibir d
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Exibir detalhes da embarcação
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Exibir detalhes da aeronave
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual do trem - clique aqui para iniciar/parar o trem. Ctrl+Clique para mostrar o destino
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual do veículo - clique aqui para iniciar/parar veículo. Ctrl+Clique para mostrar o destino.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual da embarcação - clique aqui para iniciar/parar embarcação. Ctrl+Clique para mostrar o destino.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual da aeronave - clique aqui para iniciar/parar a aeronave. Ctrl+Clique para mostrar o destino.
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Carregando / descarregando
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 30dcb3b5a8..1b673da54b 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Избе
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Избери критерий за сортиране
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Избери критерии за филтриране
STR_BUTTON_SORT_BY :{BLACK}Сортирай по
-STR_BUTTON_LOCATION :{BLACK}Позиция
STR_BUTTON_RENAME :{BLACK}Преименувай
STR_BUTTON_CATCHMENT :{BLACK}Покритие
@@ -3514,10 +3513,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Авто
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Позициониране на главният изглед върху влака.При Ctrl+Click ще проследява влака в главният изглед
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Позициониране на главния изглед върху МПС-то. При Ctrl+Click МПС-то ще бъде проследявано в главния изглед
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Фокусирай общия план върху местонахождението на кораба
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Позициониране на главния изглед върху летателната машина. При Ctrl-click летателната машина ще бъде проследяван в главния изглед
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Изпращане влака в депо
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Изпращане на ПС в депо. CTRL+натискане ще изпрати само за преглед
@@ -3549,10 +3544,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пока
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Покажи детайлите за кораба
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Информация за самолета
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Текущо състояние на влака - натиснете за спиране/пускане. Ctrl-click за да скролирате до целта
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Текущо действие - натиснете за спиране/пускане на превозното средство. С Ctrl-click можеш да скролираш до целта
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Настоящо корабно действие - натисни тук, за да спреш/задвижиш кораба. С Ctrl-click можеш да скролираш до целта
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Състояние на самолета - натиснете за спиране/пускане. С Ctrl-click можете да скролирате до целта
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Товарене/ Разтоварване
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index dc31e79acf..40d8e59f7e 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona el criteri per ordenar la llista
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filtra per tipus de càrrega
STR_BUTTON_SORT_BY :{BLACK}Ordena per:
-STR_BUTTON_LOCATION :{G=Masculin}{BLACK}Lloc
STR_BUTTON_RENAME :{BLACK}Canvia el nom
STR_BUTTON_CATCHMENT :{BLACK}Cobertura
STR_TOOLTIP_CATCHMENT :{BLACK}Mostra/Amaga l'àrea de cobertura
@@ -750,6 +749,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Terreny irregular
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Gespa
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Terreny erm
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Selva tropical
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Camps de conreu
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Arbres
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Roques
@@ -1838,6 +1838,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}Esteu s
# Cheat window
STR_CHEATS :{WHITE}Trampes
STR_CHEATS_TOOLTIP :{BLACK}Les caselles de selecció indiquen si heu fet servir aquesta trampa.
+STR_CHEATS_NOTE :{BLACK}Nota: Qualsevol ús d'aquests paràmetres serà enregistrat per la partida guardada
STR_CHEAT_MONEY :{LTBLUE}Augmenta els diners de la companyia actual en {CURRENCY_LONG}.
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Juga amb la companyia: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Eruga màgica (treu indústries i altres objectes inamovibles): {ORANGE}{STRING}
@@ -2632,6 +2633,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Seleccio
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informació del terreny
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc on està la casella. Amb Ctrl+clic s'obre una vista nova al lloc de la casella.
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Cost de neteja: {LTBLUE}N/A
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Cost de neteja: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Ingressos en netejar: {LTBLUE}{CURRENCY_LONG}
@@ -3102,6 +3104,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Commuta
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Edita el text del senyal
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centra la vista principal en la senyal. Amb Ctrl+Clic, obre una nova vista centrada en la senyal.
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Vés al proper senyal
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Vés al senyal anterior
@@ -3758,10 +3761,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fer que
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc del tren. Ctrl+Clic per seguir el tren a la vista principal
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc del vehicle. Ctrl+Clic per seguir el vehicle a la vista principal
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc del vaixell. Ctrl+Clic per seguir el vaixell a la vista principal
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centra la vista principal al lloc de l'avió. Ctrl+Clic per seguir l'avió a la vista principal
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està el tren. Si feu doble clic, se'l seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està el tren.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està el vehicle. Si feu doble clic, se'l seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està el vehicle.
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està el vaixell. Si feu doble clic, se'l seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està el vaixell.
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centra la vista principal al lloc on està l'aeronau. Si feu doble clic, se la seguirà a la vista principal. Amb Ctrl+clic s'obre una vista nova al lloc on està l'aeronau.
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia el tren a cotxera
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia el vehicle a cotxera
@@ -3793,10 +3796,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra e
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra els detalls del vaixell
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra els detalls de l'avió
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Acció sobre el tren actual - clica aquí per parar/engegar el tren. Ctrl+Clic per saltar a la destinació
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Acció sobre el vehicle actual - clica aquí per parar/engegar el vehicle. Ctrl+Clic per saltar a la destinació
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Accions sobre el vaixell actual - clica aquí per parar/engegar el vaixell. Ctrl+Clic per saltar a la destinació
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Accions sobre l'avió actual - clica aquí per parar/engegar l'avió. Ctrl+Clic per saltar a la destinació
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Acció actual del tren - Feu clic per parar-lo o engegar-lo.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Acció actual del vehicle - Feu clic per parar-lo o engegar-lo.
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Acció actual del vaixell - Feu clic per parar-lo o engegar-lo.
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Acció actual de l'aeronau - Feu clic per parar-la o engegar-la.
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centra la vista principal a la destinació de l'ordre. Amb Ctrl+clic s'obre una vista nova al lloc de la destinació de l'ordre.
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Carregant / Descarregant
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index a1d780ad67..dd1be79180 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -329,7 +329,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Odaberi
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Odaberi kriterij za sortiranje
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Odaberi kriterij filtriranja
STR_BUTTON_SORT_BY :{BLACK}Sortiraj prema
-STR_BUTTON_LOCATION :{BLACK}Lokacija
STR_BUTTON_RENAME :{BLACK}Preimenuj
STR_BUTTON_CATCHMENT :{BLACK}Područje pokrivanja
STR_TOOLTIP_CATCHMENT :{BLACK}Uključi prikaz područja pokrivanja
@@ -3816,10 +3815,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Automats
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju vlaka. Ctrl+klik slijedi vlak u glavni prozor
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju vozila. Ctrl+klik slijedi vozilo u glavni prozor
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju broda. Ctrl+klik slijedi brod u glavni prozor
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centriranje glavnog prozora na lokaciju zrakoplova. Ctrl+klik slijedi zrakoplov u glavni prozor
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošalji vlak u spremište. CTRL+klik će samo servisirati
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošalji vozilo u spremište. Ctrl+klik će samo servisirati
@@ -3851,10 +3846,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaži
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaži detalje broda
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaži detalje zrakoplova
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja vlaka - pritisni za zaustavljanje/pokretanje vlaka. Ctrl+klik za odlazak do odredišta.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja vozila - pritisni za zaustavljanje/pokretanje vozila. Ctlr+klik za odlazak do odredišta.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja broda - pritisni za zaustavljanje/pokretanje broda. Ctrl+klik za odlazak do odredišta.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Trenutna radnja zrakoplova - pritisni za zaustavljanje/pokretanje zrakoplova. Ctrl+klik za odlazak do odredišta.
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ukrcaj / Iskrcaj
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index cd8b57009a..15580290eb 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -308,7 +308,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vyber zp
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vyber, podle čeho se má třídit
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vyber třídící podmínku
STR_BUTTON_SORT_BY :{BLACK}Řadit podle
-STR_BUTTON_LOCATION :{BLACK}Umístění
STR_BUTTON_RENAME :{BLACK}Přejmenovat
STR_BUTTON_CATCHMENT :{BLACK}Pokrytí
STR_TOOLTIP_CATCHMENT :{BLACK}Zapnout/vypnout zvýrazňování oblasti pokrytí
@@ -4346,11 +4345,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Funkce a
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na vlak. Ctrl+kliknutí otevře nový pohled
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na vozidlo. Ctrl+kliknutí otevře nový pohled
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na loď. Ctrl+kliknutí otevře nový pohled
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Vycentrovat pohled na letadlo. Ctrl+kliknutí otevře nový pohled
-
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Poslat vlak do depa. Ctrl+kliknutí pouze pro provedení oprav
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošli vozidlo do garáže. Ctrl+kliknutí pouze provede opravy
STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Poslat loď do doku
@@ -4381,10 +4375,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Ukaž de
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Ukázat detaily lodi
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Ukázat detaily letadla
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Současná činnost vlaku - když sem klikneš, vlak se zastaví nebo rozjede. Když ještě podržíš Ctrl, pohled se posune na cílovou stanici
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Současná činnost vozidla - klikni sem pro zastavení/rozjetí
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Současná činnost plavidla - pro zastavení či rozjetí, klikni sem
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Činnost letadla - stiskni pro rozjetí/zastavení letadla
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Nakládá nebo vykládá
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 6d92b05af3..a26e3486e1 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vælg so
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vælg sorteringskriterie
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vælg filtreringskriterier
STR_BUTTON_SORT_BY :{BLACK}Sortér på
-STR_BUTTON_LOCATION :{BLACK}Lokalitet
STR_BUTTON_RENAME :{BLACK}Omdøb
STR_BUTTON_CATCHMENT :{BLACK}Dækning
STR_TOOLTIP_CATCHMENT :{BLACK}Aktiver visning af dækningsområde
@@ -3721,10 +3720,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Få auto
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over togets lokalitet. Ctrl-Klik vil følge toget i hovedvinduet
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over køretøjets lokalitet. Ctrl-Klik vil følge køretøjet i hovedvinduet
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over skibets lokalitet. Ctrl-Klik vil følge skibet i hovedvinduet
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrér skærmen over flyets lokalitet. Ctrl+Klik vil følge flyet i hovedvinduet
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send toget til remise. CTRL+klik vil kun servicere
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send køretøjet til værksted. CTRL+klik vil kun servicere
@@ -3756,10 +3751,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Vis kør
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer omkring skibet
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljet omkring flyet
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at starte/stoppe toget. Ctrl+Click for at scrolle til destinationen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at stoppe/starte køretøjet. Ctrl+Click for at scrolle til destinationen
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at starte/stoppe skibet. Ctrl+Click for at scrolle til destinationen
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nuværende opførsel - klik her for at starte/stoppe flyet. Ctrl+Click for at scrolle til destinationen
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Læsser / Aflæsser
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index cdf92e512b..134b988a1f 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selectee
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecteer de sorteercriteria
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecteer de filtercriteria
STR_BUTTON_SORT_BY :{BLACK}Sorteren op
-STR_BUTTON_LOCATION :{BLACK}Locatie
STR_BUTTON_RENAME :{BLACK}Hernoemen
STR_BUTTON_CATCHMENT :{BLACK}Dekking
STR_TOOLTIP_CATCHMENT :{BLACK}Schakelt weergave van dekkingsgebied om
@@ -3756,10 +3755,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}De te ve
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van de trein. Ctrl+klik volgt de trein in het hoofdscherm
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van het wegvoertuig. Ctrl+klik volgt het voertuig in het hoofdscherm
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van het schip. Ctrl+klik volgt het schip op het hoofdscherm
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centreer het scherm op de locatie van het vliegtuig. Ctrl+klik volgt het vliegtuig op het hoofdscherm
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur trein naar depot. Ctrl+klik voor alleen onderhoud
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stuur wegvoertuig naar garage. Ctrl+klik voor alleen onderhoud
@@ -3791,10 +3786,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Details
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Details van schip weergeven
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Details van vliegtuig weergeven
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van trein - klik hier om de trein te starten-stoppen. Ctrl+klik om naar bestemming te verplaatsen.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van wegvoertuig - klik hier om voertuig te starten-stoppen. Ctrl+klik om naar bestemming te verplaatsen.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van schip - klik hier om te starten-stoppen. Ctrl+klik om naar bestemming te verplaatsen.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Huidige actie van vliegtuig - klik hier om het vliegtuig te stoppen-starten. Ctrl+klik om naar bestemming te verplaatsen.
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}In- en uitladen
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 71b3f80d5b..8ec58c420b 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria
STR_BUTTON_SORT_BY :{BLACK}Sort by
-STR_BUTTON_LOCATION :{BLACK}Location
STR_BUTTON_RENAME :{BLACK}Rename
STR_BUTTON_CATCHMENT :{BLACK}Coverage
STR_TOOLTIP_CATCHMENT :{BLACK}Toggle coverage area display
@@ -758,6 +757,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Rough Land
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Grass Land
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Bare Land
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Rainforest
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Fields
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Trees
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Rocks
@@ -3312,6 +3312,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Select t
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Land Area Information
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centre the main view on tile location. Ctrl+Click opens a new viewport on tile location
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Cost to clear: {LTBLUE}N/A
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Cost to clear: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Revenue when cleared: {LTBLUE}{CURRENCY_LONG}
@@ -3809,6 +3810,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Toggle m
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Edit sign text
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centre the main view on sign location. Ctrl+Click opens a new viewport on sign location
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Go to next sign
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Go to previous sign
@@ -4611,10 +4613,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make aut
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centre main view on train's location. Ctrl+Click will follow train in main view
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centre main view on vehicle's location. Ctrl+Click will follow vehicle in main view
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centre main view on ship's location. Ctrl+Click will follow ship in main view
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centre main view on aircraft's location. Ctrl+Click will follow aircraft in main view
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centre main view on train's location. Double click will follow train in main view. Ctrl+Click opens a new viewport on train's location
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centre main view on vehicle's location. Double click will follow vehicle in main view. Ctrl+Click opens a new viewport on vehicle's location
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centre main view on ship's location. Double click will follow ship in main view. Ctrl+Click opens a new viewport on ship's location
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centre main view on aircraft's location. Double click will follow aircraft in main view. Ctrl+Click opens a new viewport on aircraft's location
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send train to depot. Ctrl+Click will only service
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send vehicle to depot. Ctrl+Click will only service
@@ -4649,10 +4651,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Show roa
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Show ship details
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Show aircraft details
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft. Ctrl+Click to scroll to destination
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centre main view on order destination. Ctrl+Click opens a new viewport on the order destination's location
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Loading / Unloading
diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt
index 3bee0abc83..2757c46d64 100644
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria
STR_BUTTON_SORT_BY :{BLACK}Sort by
-STR_BUTTON_LOCATION :{BLACK}Location
STR_BUTTON_RENAME :{BLACK}Rename
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Close window
@@ -3486,10 +3485,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make aut
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centre main view on train's location. Ctrl+Click will follow train in main view
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centre main view on vehicle's location. Ctrl+Click will follow vehicle in main view
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centre main view on ship's location. Ctrl+Click will follow ship in main view
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centre main view on aircraft's location. Ctrl+Click will follow aircraft in main view
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send train to depot. Ctrl+Click will only service
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send vehicle to depot. Ctrl+Click will only service
@@ -3521,10 +3516,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Show roa
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Show ship details
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Show aircraft details
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft. Ctrl+Click to scroll to destination
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Loading / Unloading
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index de272e6bb1..e5523db16d 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria
STR_BUTTON_SORT_BY :{BLACK}Sort by
-STR_BUTTON_LOCATION :{BLACK}Location
STR_BUTTON_RENAME :{BLACK}Rename
STR_BUTTON_CATCHMENT :{BLACK}Coverage
STR_TOOLTIP_CATCHMENT :{BLACK}Toggle coverage area display
@@ -3707,10 +3706,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Make aut
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Center main view on train's location. Ctrl+Click will follow train in main view
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Center main view on vehicle's location. Ctrl+Click will follow vehicle in main view
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Center main view on ship's location. Ctrl+Click will follow ship in main view
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Center main view on aircraft's location. Ctrl+Click will follow aircraft in main view
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send train to depot. Ctrl+Click will only service
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send vehicle to depot. Ctrl+Click will only service
@@ -3742,10 +3737,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Show roa
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Show ship details
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Show aircraft details
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Current train action - click to stop/start train. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Current vehicle action - click to stop/start vehicle. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Current ship action - click to stop/start ship. Ctrl+Click to scroll to destination
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Current aircraft action - click to stop/start aircraft. Ctrl+Click to scroll to destination
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Loading / Unloading
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 2e48c628e7..5fea11b8e8 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -232,7 +232,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Elektu v
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Elektu ordigaj kondiĉoj
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selektu kriteriojn por filtrado
STR_BUTTON_SORT_BY :{BLACK}Ordigu laŭ
-STR_BUTTON_LOCATION :{BLACK}Loko
STR_BUTTON_RENAME :{BLACK}Alinomi
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Fermu fenestron
@@ -2966,10 +2965,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ĉe aŭt
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centre vidu trajnan lokon en la ĉefvido. Ctrl+klak sekvas trajnon en la ĉefvido
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centre vidu la veturilon en la ĉefvido. Ctrl+klak sekvas veturlilon en la ĉefvido
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centre vidu ŝipon en ĉefvido. Ctrl+klak sekvas ŝipon en la ĉefvido
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centre vidu aviadilon en la ĉefvido. Ctrl-klak sekvas aviadilon en la ĉefvido
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sendi trajnon al garaĝo. Stir+Klak nur prizorgos
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sendi veturilon al garaĝo. Stir+Klak nur prizorgos
@@ -3001,10 +2996,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Montru s
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Montru ŝipajn detalojn
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Montru aviadilajn detalojn
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Nuna trajna ago - klaku por haltigi/starti la trajnon. Ctrl+klak rulumas al trajncelo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nuna veturila ago - klaku ĉi tie por haltigi/starti veturilon. Ctrl+klak rulumas al veturilcelo
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nuna ŝipa ago - klaku ĉi tie por haltigi/starti ŝipon. Ctrl+klak rulumas al ŝipcelo
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nuna aviadila ago - klaku ĉi tie por haltigi/starti aviadilon. Ctrl+klak rulumas al aviadilcelo
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ŝarĝante / Deŝarĝante
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index f2910fd3a2..6033681335 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -284,11 +284,10 @@ STR_LIST_FILTER_OSKTITLE :{BLACK}Sisesta
STR_LIST_FILTER_TOOLTIP :{BLACK}Sisesta märksõna mida loendist otsida
STR_TOOLTIP_GROUP_ORDER :{BLACK}Vali rühmitamise järjestus
-STR_TOOLTIP_SORT_ORDER :{BLACK}Vali järjekord (kahanev/kasvav)
-STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vali järjekord
+STR_TOOLTIP_SORT_ORDER :{BLACK}Vali järjestus (kahanev/kasvav)
+STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vali järjestus
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vali sõelumisalused
-STR_BUTTON_SORT_BY :{BLACK}Järjekord:
-STR_BUTTON_LOCATION :{BLACK}Asukoht
+STR_BUTTON_SORT_BY :{BLACK}Järjestus:
STR_BUTTON_RENAME :{BLACK}Nimevahetus
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulge aken
@@ -481,7 +480,7 @@ STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Veotasude mää
############ range for company league menu starts
STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE :Ettevõtete edetabel
STR_GRAPH_MENU_DETAILED_PERFORMANCE_RATING :Täpsustatud tulemushinnang
-STR_GRAPH_MENU_HIGHSCORE :Punktitabel
+STR_GRAPH_MENU_HIGHSCORE :Edetabel
############ range ends here
############ range for industry menu starts
@@ -1042,6 +1041,7 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Tavaline
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Topeltsuurus
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Ruudu suurus
+STR_GAME_OPTIONS_FONT_ZOOM :{BLACK}Kirja suurus
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Vali kasutatav liideseelementide suurus
STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM :Ruudu suurus
@@ -1780,14 +1780,14 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Pildipuh
STR_INTRO_CAPTION :{WHITE}OpenTTD {REV}
STR_INTRO_NEW_GAME :{BLACK}Uus mäng
-STR_INTRO_LOAD_GAME :{BLACK}Jätkuv mäng
+STR_INTRO_LOAD_GAME :{BLACK}Mängu jätk
STR_INTRO_PLAY_SCENARIO :{BLACK}Stsenaarium
STR_INTRO_PLAY_HEIGHTMAP :{BLACK}Kõrguskaart
STR_INTRO_SCENARIO_EDITOR :{BLACK}Stsenaariumiredaktor
STR_INTRO_MULTIPLAYER :{BLACK}Mitmikmäng
STR_INTRO_GAME_OPTIONS :{BLACK}Liidese seadistus
-STR_INTRO_HIGHSCORE :{BLACK}Punktitabel
+STR_INTRO_HIGHSCORE :{BLACK}Edetabel
STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Seaded
STR_INTRO_NEWGRF_SETTINGS :{BLACK}NewGRF-i seadistus
STR_INTRO_ONLINE_CONTENT :{BLACK}Aineste allalaadimine
@@ -1807,7 +1807,7 @@ STR_INTRO_TOOLTIP_SUB_TROPICAL_LANDSCAPE :{BLACK}Vali 'l
STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Vali 'mänguasjamaa' maastik
STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Ava liidese seadistamine
-STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Ava punktitabel
+STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Ava edetabel
STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Ava seaded
STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}Ava NewGRF-i seadistamine
STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Otsi allalaadimiseks uusi ja uuendatud aineseid
@@ -2772,6 +2772,7 @@ STR_SAVELOAD_DETAIL_CAPTION :{BLACK}Mängust
STR_SAVELOAD_DETAIL_NOT_AVAILABLE :{BLACK}Andmed puuduvad
STR_SAVELOAD_DETAIL_COMPANY_INDEX :{SILVER}{COMMA}: {WHITE}{STRING}
STR_SAVELOAD_DETAIL_GRFSTATUS :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_FILTER_TITLE :{BLACK}Märksõna:
STR_SAVELOAD_OSKTITLE :{BLACK}Sisesta salvestatavale mängule nimi
@@ -3341,7 +3342,7 @@ STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Tööstu
# Industry view
STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY}
-STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Eelmise kuu valmistoodang:
+STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Eelmise kuu toodang:
STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% veetud)
STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Vaate keskendamine tööstusele
STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Tootlikkuse tase: {YELLOW}{COMMA}%
@@ -3350,6 +3351,7 @@ STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Tööst
STR_INDUSTRY_VIEW_REQUIRES_N_CARGO :{BLACK}Vajab: {YELLOW}{STRING}{STRING}
STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION :, {STRING}{STRING}
+STR_INDUSTRY_VIEW_REQUIRES :{BLACK}Nõuab:
STR_CONFIG_GAME_PRODUCTION :{WHITE}Tootlikuse muutmine (kaheksaga jaguv, kuni 2040)
STR_CONFIG_GAME_PRODUCTION_LEVEL :{WHITE}Muuda tootlikkuse taset (protsent, kuni 800%)
@@ -3365,7 +3367,7 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Veokid -
STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Laevad - info saamiseks klõpsa laevale
STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Lennuk - info saamiseks vajuta lennukile
-STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Kasum sellel aastal: {CURRENCY_LONG} (eelneval: {CURRENCY_LONG})
+STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Selle aasta kasum: {CURRENCY_LONG} (eelneval: {CURRENCY_LONG})
STR_VEHICLE_LIST_AVAILABLE_TRAINS :Saadaval rongid
STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES :Saadaval sõidukid
@@ -3414,7 +3416,9 @@ STR_GROUP_REMOVE_ALL_VEHICLES :Eemalda kõik s
STR_GROUP_RENAME_CAPTION :{BLACK}Rühma nime vahetamine
-STR_GROUP_PROFIT_THIS_YEAR :Kasum sellel aastal:
+STR_GROUP_PROFIT_THIS_YEAR :Selle aasta kasum:
+STR_GROUP_PROFIT_LAST_YEAR :Eelmise aasta kasum:
+STR_GROUP_OCCUPANCY :Kasutuses:
STR_GROUP_OCCUPANCY_VALUE :{NUM}%
# Build vehicle window
@@ -3640,10 +3644,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Sunni au
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Vaate viimine rongi asukohale
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskenda vaade veovahendile
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Vii vaade laeva asukohale
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Vii peavaade lennukile
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Saada rong depoosse
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Saada sõiduk garaaži. Ctrl+klõps, et ainult teenindada
@@ -3675,10 +3675,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Näita m
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Näita laeva täpsustusi
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Näita lennuki täpsustusi
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Praegune rongi tegevus - rongi käivitamiseks või peatamiseks vajuta siia. Ctrl+klõps näitab sihtkohta
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Transpordivahendi praegune tegevus - sõiduki peatamiseks või startimiseks klõpsa siia. Ctrl+klõps näitab sihtkohta
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Praegune laeva tegevus - Laeva käivitamiseks või peatamiseks vajuta siia. Ctrl+klõps näitab sihtkohta
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Praegune lennuki tegevus - lennuki peatamiseks või käivitamiseks vajuta siia. Ctrl+klõps näitab sihtkohta
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Veose ümberlaadimine
diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt
index dc2bbd3a4d..e9a25aa47c 100644
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -224,7 +224,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vel rað
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Set raðfestingar treytir
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Set filtrerings treytir
STR_BUTTON_SORT_BY :{BLACK}Sortera eftur
-STR_BUTTON_LOCATION :{BLACK}Stað
STR_BUTTON_RENAME :{BLACK}Endurdoyp
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lat glugga aftur
@@ -3161,6 +3160,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lessar / Avlessar
STR_VEHICLE_STATUS_LEAVING :{LTBLUE}Fer avstað
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index fef98500a4..ac637b1a82 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -229,12 +229,11 @@ STR_LIST_FILTER_TITLE :{BLACK}Suodatin
STR_LIST_FILTER_OSKTITLE :{BLACK}Syötä suodatinteksti
STR_LIST_FILTER_TOOLTIP :{BLACK}Syötä avainsana suodattaaksesi listan
-STR_TOOLTIP_GROUP_ORDER :{BLACK}Valitse ryhmittelyjärjestys
+STR_TOOLTIP_GROUP_ORDER :{BLACK}Valitse ryhmittelytapa
STR_TOOLTIP_SORT_ORDER :{BLACK}Valitse järjestys (laskeva/nouseva)
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Valitse järjestyskriteeri
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Valitse suodatuskriteerit
STR_BUTTON_SORT_BY :{BLACK}Lajittele
-STR_BUTTON_LOCATION :{BLACK}Sijainti
STR_BUTTON_RENAME :{BLACK}Nimeä uudelleen
STR_BUTTON_CATCHMENT :{BLACK}Vaikutusalue
STR_TOOLTIP_CATCHMENT :{BLACK}Valitse, näytetäänkö vaikutusalue
@@ -243,8 +242,8 @@ STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Sulje ik
STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Ikkunan otsake – siirrä ikkunaa vetämällä tästä
STR_TOOLTIP_SHADE :{BLACK}Pienennä ikkuna – näytä vain otsikko
STR_TOOLTIP_DEBUG :{BLACK}Näytä NewGRF-vianmääritystiedot
-STR_TOOLTIP_DEFSIZE :{BLACK}Palauta ikkunan oletuskoko. Ctrl+Klik tallentaa nykyisen koon oletukseksi
-STR_TOOLTIP_STICKY :{BLACK}Aseta ikkuna säilymään "Sulje kaikki ikkunat" -napista huolimatta. Ctrl+Klik tallentaa tilan oletukseksi
+STR_TOOLTIP_DEFSIZE :{BLACK}Palauta ikkunan oletuskoko. Ctrl+napsautus tallentaa nykyisen koon oletukseksi.
+STR_TOOLTIP_STICKY :{BLACK}Aseta ikkuna säilymään ”Sulje kaikki ikkunat” -napista huolimatta. Ctrl+napsautus tallentaa tilan oletukseksi.
STR_TOOLTIP_RESIZE :{BLACK}Napsauta ja vedä muuttaaksesi tämän ikkunan kokoa
STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Suurenna/pienennä ikkuna
STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Vierityspalkki – luettelon vieritys ylös/alas
@@ -341,10 +340,10 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST :{BLACK}Näytä
STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Näytä kuvaajat
STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Näytä yhtiökilpataulukko
STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Rahoita uuden teollisuuden rakentamista ja näytä teollisuushakemisto
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Näytä luettelo yhtiön junista. Ctrl+Klik avaa ryhmä/kulkuneuvolistan
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Näytä luettelo yhtiön ajoneuvoista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Näytä luettelo yhtiön laivoista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Näytä luettelo yhtiön ilma-aluksista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Näytä luettelo yhtiön junista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa.
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Näytä luettelo yhtiön ajoneuvoista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa.
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Näytä luettelo yhtiön laivoista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa.
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Näytä luettelo yhtiön ilma-aluksista. Ctrl+napsautus näyttää luettelon ilman ryhmäluetteloa.
STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}Lähennä näkymää
STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}Loitonna näkymää
STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Rakenna rautateitä
@@ -726,9 +725,9 @@ STR_SMALLMAP_TOOLTIP_SHOW_LINK_STATS_ON_MAP :{BLACK}Näytä
STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON :{BLACK}Näytä kuljetusreitit kartalla
STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP :{BLACK}Näytä kasvillisuus kartalla
STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP :{BLACK}Näytä maanomistajat kartalla
-STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION :{BLACK}Napsauta teollisuustyyppiä näyttääksesi sen. Ctrl+Klik näyttää valitun tyypin. Ctrl+Klik uudestaan näyttää kaikki teollisuustyypit
-STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION :{BLACK}Napsauta yhtiötä näyttääksesi sen omaisuuden. Ctrl+Klik näyttää ainoastaan valitun yhtiön. Ctrl+Klik uudestaan näyttää kaikki yhtiöt
-STR_SMALLMAP_TOOLTIP_CARGO_SELECTION :{BLACK}Napsauta rahtia näyttääksesi tai piilottaaksesi sen. Ctrl+Klik piilottaa kaikki paitsi valitun rahdin. Ctrl+Klik uudelleen palauttaa kaikki rahdit näkyviin
+STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION :{BLACK}Napsauta teollisuustyyppiä piilottaaksesi tai näyttääksesi sen. Ctrl+napsautus näyttää vain valitun tyypin. Ctrl+napsautus uudestaan näyttää kaikki teollisuustyypit.
+STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION :{BLACK}Napsauta yhtiötä piilottaaksesi tai näyttääksesi yhtiön maaomistuksen. Ctrl+napsautus näyttää ainoastaan valitun yhtiön. Ctrl+napsautus uudestaan näyttää kaikki yhtiöt.
+STR_SMALLMAP_TOOLTIP_CARGO_SELECTION :{BLACK}Napsauta rahtityyppiä näyttääksesi tai piilottaaksesi sen. Ctrl+napsautus piilottaa kaikki paitsi valitun rahdin. Ctrl+napsautus uudelleen palauttaa kaikki rahdit näkyviin.
STR_SMALLMAP_LEGENDA_ROADS :{TINY_FONT}{BLACK}Tiet
STR_SMALLMAP_LEGENDA_RAILROADS :{TINY_FONT}{BLACK}Rautatiet
@@ -749,6 +748,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Kumpuilevaa maata
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Ruohikkoa
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Paljasta maata
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Sademetsää
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Peltoja
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Puita
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Kiviä
@@ -1380,7 +1380,7 @@ STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Siirrä karttaa
STR_CONFIG_SETTING_SCROLLMODE_RMB :Siirrä karttaa hiiren oikealla painikkeella
STR_CONFIG_SETTING_SCROLLMODE_LMB :Siirrä karttaa hiiren vasemmalla painikkeella
STR_CONFIG_SETTING_SMOOTH_SCROLLING :Näkymän tasainen vieritys: {STRING}
-STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Hallitse miten päänäkymä siirtyy valittuun paikkaan karttaa klikattaessa tai käytettäessä komentoa joka muuttaa näkymän sijaintia. Mikäli käytössä, päänäkymä siirtyy uuteen sijaintiin pehmeäesti, muutoin se hyppää suoraan valittuun sijaintiin
+STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT :Hallitse, kuinka päänäkymä siirtyy valittuun paikkaan napsautettaessa karttaa tai käytettäessä näkymän sijaintia muuttavaa komentoa. Mikäli käytössä, päänäkymä siirtyy uuteen sijaintiin pehmeästi, muutoin se hyppää suoraan valittuun sijaintiin.
STR_CONFIG_SETTING_MEASURE_TOOLTIP :Näytä mittauksen työkaluvihje, kun käytetään rakennustyökaluja: {STRING}
STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT :Näytä etäisyydet ja korkeuserot vedettäessä rakennustoimintojen aikana
STR_CONFIG_SETTING_LIVERIES :Näytä kulkuneuvotyypille ominaiset tunnukset: {STRING}
@@ -1406,8 +1406,8 @@ STR_CONFIG_SETTING_OSK_ACTIVATION_SINGLE_CLICK :Yksi napsautus
STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU :Oikean painikkeen emulointi: {STRING}
STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_HELPTEXT :Valitse, miten hiiren oikean painikkeen painalluksia emuloidaan
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND :Command
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Ctrl+Klik
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND :Komento+napsautus
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL :Ctrl+napsautus
STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF :Pois
STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE :Sulje ikkuna hiiren oikealla painikkeella napsauttamalla: {STRING}
@@ -1800,7 +1800,7 @@ STR_INTRO_ONLINE_CONTENT :{BLACK}Tarkista
STR_INTRO_SCRIPT_SETTINGS :{BLACK}Tekoälyn/peliskriptin asetukset
STR_INTRO_QUIT :{BLACK}Sulje
-STR_INTRO_TOOLTIP_NEW_GAME :{BLACK}Aloita uusi peli. Ctrl+Klik ohittaa kartan asetukset
+STR_INTRO_TOOLTIP_NEW_GAME :{BLACK}Aloita uusi peli. Ctrl+napsautus ohittaa kartan asetusten valinnan.
STR_INTRO_TOOLTIP_LOAD_GAME :{BLACK}Lataa tallennettu peli
STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP :{BLACK}Aloita uusi peli, käyttäen korkeuskarttaa maastona
STR_INTRO_TOOLTIP_PLAY_SCENARIO :{BLACK}Aloita uusi peli käyttäen omaa skenaariota
@@ -1861,8 +1861,8 @@ STR_LIVERY_TRAIN_TOOLTIP :{BLACK}Näytä
STR_LIVERY_ROAD_VEHICLE_TOOLTIP :{BLACK}Näytä tieajoneuvojen väriteemat
STR_LIVERY_SHIP_TOOLTIP :{BLACK}Näytä laivojen väriteemat
STR_LIVERY_AIRCRAFT_TOOLTIP :{BLACK}Näytä ilma-alusten väriteemat
-STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Valitse valitulle teemalle ensisijainen väri. Ctrl+Klik asettaa tämän värin jokaiselle teemalle
-STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Valitse valitulle teemalle toissijainen väri. Ctrl+Klik asettaa tämän värin jokaiselle teemalle
+STR_LIVERY_PRIMARY_TOOLTIP :{BLACK}Valitse valitun kaavan ensisijainen väri. Ctrl+napsautus asettaa tämän värin kaikille kaavoille.
+STR_LIVERY_SECONDARY_TOOLTIP :{BLACK}Valitse valitun kaavan toissijainen väri. Ctrl+napsautus asettaa tämän värin kaikille kaavoille.
STR_LIVERY_PANEL_TOOLTIP :{BLACK}Valitse muutettava väriteema, tai valitse useita Ctrl pohjassa. Paina valintalaatikkoa valitaksesi teeman
STR_LIVERY_DEFAULT :Normaalit tunnusvärit
@@ -2314,15 +2314,15 @@ STR_MISSING_GRAPHICS_NO_QUIT :{BLACK}Ei, sulj
# Transparency settings window
STR_TRANSPARENCY_CAPTION :{WHITE}Läpinäkyvyysasetukset
-STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Muuta kylttien läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Muuta sähköradan johtimien läpinäkyvyyttä. Ctrl+Klik lukitaksesi
-STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+Klik lukitaksesi
+STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Muuta kylttien läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Muuta tuotantolaitosten läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Muuta majakoiden ja lähetysmastojen tapaisten rakennelmien läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Muuta sähköratarakenteiden läpinäkyvyyttä. Ctrl+napsautus lukitsee.
+STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+napsautus lukitsee.
STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Tee kohteista läpinäkyvyyden sijaan näkymättömiä
# Linkgraph legend window
@@ -2417,7 +2417,7 @@ STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Poistumi
STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Yhdistelmäopastin (valo-opastin){}Yhdistelmäopastin toimii yhtä aikaa tulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita"
STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Reittiopastin (valo-opastin){}Reittiopastin varmistaa junille turvallisen reitin ja siten mahdollistaa useampien junien yhtäaikaisen liikenteen moniraiteisissa risteyksissä. Tavalliset reittiopastimet voi ohittaa takakautta
STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Yksisuuntainen reittiopastin (valo-opastin){}Reittiopastin varmistaa junille turvallisen reitin ja siten mahdollistaa useampien junien yhtäaikaisen liikenteen moniraiteisissa risteyksissä. Yksisuuntaisia opastimia ei voi ohittaa takakautta
-STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen napsauttaminen muuntaa siitä valituntyyppisen ja -muotoisen. Ctrl+Klik vaihtaa nykyistä opastimen muotoa. Shift+Klik näyttää muuntamisen kustannusarvion
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen napsauttaminen muuntaa sen valituntyyppiseksi ja -muotoiseksi. Ctrl+napsautus vaihtaa nykyistä opastimen muotoa. Vaihto+napsautus näyttää muuntamisen kustannusarvion.
STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Opastimien väli vetämällä lisättäessä
STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Pienennä opastimien väliä vetämällä lisättäessä
STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Suurenna opastimien väliä vetämällä lisättäessä
@@ -2574,7 +2574,7 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT :{WHITE}Haluatko
# Town generation window (SE)
STR_FOUND_TOWN_CAPTION :{WHITE}Luo kuntia
STR_FOUND_TOWN_NEW_TOWN_BUTTON :{BLACK}Uusi kunta
-STR_FOUND_TOWN_NEW_TOWN_TOOLTIP :{BLACK}Perusta uusi kunta. Shift+Klik näyttää vain kustannusarvion
+STR_FOUND_TOWN_NEW_TOWN_TOOLTIP :{BLACK}Perusta uusi kunta. Vaihto+napsautus näyttää vain kustannusarvion.
STR_FOUND_TOWN_RANDOM_TOWN_BUTTON :{BLACK}Satunnainen kunta
STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP :{BLACK}Perusta kunta satunnaiseen paikkaan
STR_FOUND_TOWN_MANY_RANDOM_TOWNS :{BLACK}Monta satunnaista kuntaa
@@ -2632,6 +2632,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Valitse
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Maa-aluetiedot
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä ruudun sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan ruudun sijaintiin.
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Raivaamisen hinta: {LTBLUE}-
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Raivaamisen hinta: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Tulo kun tyhjennetty: {LTBLUE}{CURRENCY_LONG}
@@ -3009,7 +3010,7 @@ STR_SPRITE_ALIGNER_GOTO_TOOLTIP :{BLACK}Mene val
STR_SPRITE_ALIGNER_PREVIOUS_BUTTON :{BLACK}Edelinen sprite
STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP :{BLACK}Jatka edelliseen tavalliseen spriteen ja hyppää yli kaikki pseudo-/uudelleenväritetyt/fontti- spritet ja mene loppuun kun päästään ensimmäiseen
STR_SPRITE_ALIGNER_SPRITE_TOOLTIP :{BLACK}Valitun spriten näyttö. Sijaintia ei huomioida spriteä piirrettäessä
-STR_SPRITE_ALIGNER_MOVE_TOOLTIP :{BLACK}Liikuta spriteä ympäriinsä, muuttaen X- ja Y-sijainteja. Ctrl+Klik siirtää spriteä kahdeksan yksikköä kerralla
+STR_SPRITE_ALIGNER_MOVE_TOOLTIP :{BLACK}Liikuta spriteä ympäriinsä, muuttaen X- ja Y-sijainteja. Ctrl+napsautus siirtää spriteä kahdeksan yksikköä kerralla.
STR_SPRITE_ALIGNER_RESET_BUTTON :{BLACK}Nollaa suhteelliset
STR_SPRITE_ALIGNER_RESET_TOOLTIP :{BLACK}Nollaa suhteelliset erotukset
STR_SPRITE_ALIGNER_OFFSETS_ABS :{BLACK}X-erotus: {NUM}, Y-erotus: {NUM} (absoluuttinen)
@@ -3102,6 +3103,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Kytke ki
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Muokkaa kyltin tekstiä.
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä kyltin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan kyltin sijaintiin.
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Siirry seuraavaan kylttiin
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Siirry edelliseen kylttiin
@@ -3112,7 +3114,7 @@ STR_TOWN_DIRECTORY_CAPTION :{WHITE}Kunnat
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ei mitään -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (kaupunki){BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Kuntien nimet – keskitä päänäkymä kuntaan napsauttamalla nimeä. Ctrl+Klik avaa uuden näkymäikkunan kunnan sijaintiin
+STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Kuntien nimet – keskitä päänäkymä kuntaan napsauttamalla nimeä. Ctrl+napsautus avaa uuden näkymäikkunan kunnan sijaintiin.
STR_TOWN_POPULATION :{BLACK}Maailman asukasluku: {COMMA}
# Town view window
@@ -3130,7 +3132,7 @@ STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}Kunta ka
STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}Kunta kasvaa {ORANGE}{COMMA}{BLACK}{NBSP}päivän{P "" ""} välein (rahoitettu)
STR_TOWN_VIEW_TOWN_GROW_STOPPED :{BLACK}Kunta {RED}ei{BLACK} kasva
STR_TOWN_VIEW_NOISE_IN_TOWN :{BLACK}Meluraja kunnassa: {ORANGE}{COMMA}{BLACK} maks.: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä näkymä kunnan sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan kunnan sijaintiin
+STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä kunnan sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan kunnan sijaintiin.
STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON :{BLACK}Viranomaiset
STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP :{BLACK}Näytä tietoja paikallisviranomaisista
STR_TOWN_VIEW_RENAME_TOOLTIP :{BLACK}Vaihda kunnan nimeä.
@@ -3182,7 +3184,7 @@ STR_GOALS_SPECTATOR_NONE :{ORANGE}- Ei sa
STR_GOALS_PROGRESS :{ORANGE}{STRING}
STR_GOALS_PROGRESS_COMPLETE :{GREEN}{STRING}
STR_GOALS_COMPANY_TITLE :{BLACK}Yhtiön tavoitteet:
-STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Keskitä päänäkymä laitokseen/kuntaan/ruutuun napsauttamalla tavoitetta. Ctrl+Klik avaa uuden näkymän laitoksen/kunnan/ruudun sijaintiin
+STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Keskitä päänäkymä laitokseen/kuntaan/ruutuun napsauttamalla tavoitetta. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen/kunnan/ruudun sijaintiin.
# Goal question window
STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Kysymys
@@ -3218,7 +3220,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO :{ORANGE}{STRING
STR_SUBSIDIES_NONE :{ORANGE}- Ei mitään -
STR_SUBSIDIES_SUBSIDISED_TITLE :{BLACK}Käytetyt tuet:
STR_SUBSIDIES_SUBSIDISED_FROM_TO :{ORANGE}{STRING} välille {STRING}-{STRING}{YELLOW} ({COMPANY}{YELLOW}, {DATE_SHORT} asti)
-STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Napsauta palvelua keskittääksesi päänäkymän teollisuuteen/kuntaan. Ctrl+Klik avaa uuden näkymäikkunan teollisuuden/kunnan sijaintiin
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Napsauta kuljetusyhteyttä keskittääksesi päänäkymän laitokseen/kuntaan. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen/kunnan sijaintiin.
# Story book window
STR_STORY_BOOK_CAPTION :{WHITE}{COMPANY}: historia
@@ -3234,7 +3236,7 @@ STR_STORY_BOOK_NEXT_PAGE_TOOLTIP :{BLACK}Siirry s
STR_STORY_BOOK_INVALID_GOAL_REF :{RED}Virheellinen viittaus tavoitteeseen
# Station list window
-STR_STATION_LIST_TOOLTIP :{BLACK}Asemien nimet – napsauta nimeä keskittääksesi päänäkymän asemaan. Ctrl+Klik avaa uuden näkymäikkunan aseman sijaintiin
+STR_STATION_LIST_TOOLTIP :{BLACK}Asemien nimet – napsauta nimeä keskittääksesi päänäkymän asemaan. Ctrl+napsautus avaa uuden näkymäikkunan aseman sijaintiin.
STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE :{BLACK}Pidä Ctrl-näppäin painettuna valitaksesi useamman kuin yhden vaihtoehdon
STR_STATION_LIST_CAPTION :{WHITE}{COMPANY} – {COMMA} asema{P "" a}
STR_STATION_LIST_STATION :{YELLOW}{STATION} {STATION_FEATURES}
@@ -3296,7 +3298,7 @@ STR_CARGO_RATING_EXCELLENT :Mainio
STR_CARGO_RATING_OUTSTANDING :Loistava
############ range for rating ends
-STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä näkymä aseman sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan aseman sijaintiin
+STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä aseman sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan aseman sijaintiin.
STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Muuta aseman nimi
STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Näytä kaikki junat, joilla on tämä asema käskyissään
@@ -3311,9 +3313,9 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}Estä il
# Waypoint/buoy view window
STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä ruutu reittipisteen sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan reittipisteen sijaintiin
+STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä reittipisteen sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan reittipisteen sijaintiin.
STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Muuta reittipisteen nimeä
-STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä ruutu poijun sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan poijun sijaintiin
+STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä poijun sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan poijun sijaintiin.
STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Vaihda poijun nimeä
STR_EDIT_WAYPOINT_NAME :{WHITE}Muokkaa reittipisteen nimeä
@@ -3343,9 +3345,9 @@ STR_FINANCES_LOAN_TITLE :{WHITE}Laina
STR_FINANCES_MAX_LOAN :{WHITE}Laina enintään: {BLACK}{CURRENCY_LONG}
STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENCY_LONG}
STR_FINANCES_BORROW_BUTTON :{BLACK}Nosta lainaa {CURRENCY_LONG}
-STR_FINANCES_BORROW_TOOLTIP :{BLACK}Ota lisää lainaa. Ctrl+Klik nostaa lainaa niin paljon kuin mahdollista
+STR_FINANCES_BORROW_TOOLTIP :{BLACK}Ota lisää lainaa. Ctrl+napsautus nostaa lainaa niin paljon kuin mahdollista.
STR_FINANCES_REPAY_BUTTON :{BLACK}Lyhennä lainaa {CURRENCY_LONG}
-STR_FINANCES_REPAY_TOOLTIP :{BLACK}Lyhennä lainaa. Ctrl+Klik lyhentää lainaa niin paljon kuin mahdollista
+STR_FINANCES_REPAY_TOOLTIP :{BLACK}Lyhennä lainaa. Ctrl+napsautus lyhentää lainaa niin paljon kuin mahdollista.
STR_FINANCES_INFRASTRUCTURE_BUTTON :{BLACK}Infrastruktuuri
# Company view
@@ -3375,7 +3377,7 @@ STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP :{BLACK}Rakenna
STR_COMPANY_VIEW_VIEW_HQ_BUTTON :{BLACK}Näytä päämaja
STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP :{BLACK}Näytä yhtiön päämaja
STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Siirrä päämaja
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rakenna yhtiön päärakennus muualle, kustannus 1{NBSP}% yhtiön arvosta. Shift+Klik näyttää kustannusarvion sijoittamatta päärakennusta uudelleen
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Rakenna yhtiön pääkonttori muualle, kustannus 1{NBSP}% yhtiön arvosta. Vaihto+napsautus näyttää kustannusarvion sijoittamatta pääkonttoria uudelleen.
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Yksityiskohdat
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Näytä tarkka infrastruktuurin määrä
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Anna rahaa
@@ -3392,8 +3394,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP :{BLACK}Muuta p
STR_COMPANY_VIEW_BUY_SHARE_BUTTON :{BLACK}Osta 25{NBSP}%:n osuus yhtiöstä
STR_COMPANY_VIEW_SELL_SHARE_BUTTON :{BLACK}Myy 25{NBSP}%:n osuus yhtiöstä
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP :{BLACK}Osta 25{NBSP}%:n osuus tästä yhtiöstä. Shift+Klik näyttää kustannusarvion ostamatta osuuksia
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Myy 25{NBSP}%:n osuus tästä yhtiöstä. Shift+Klik näyttää tuottoarvion myymättä osuuksia
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP :{BLACK}Osta 25{NBSP}%:n osuus tästä yhtiöstä. Vaihto+napsautus näyttää kustannusarvion ostamatta osuuksia.
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Myy 25{NBSP}%:n osuus tästä yhtiöstä. Vaihto+napsautus näyttää tuottoarvion myymättä osuuksia.
STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Yhtiön nimi
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Pääjohtajan nimi
@@ -3423,7 +3425,7 @@ STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUST
STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING}
STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} ja {NUM} muuta
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Teollisuusmuotojen nimet - kohdista päänäkymä teollisuuslaitokseen napsauttamalla nimeä. Ctrl+Klik avaa uuden näkymäikkunan teollisuuslaitoksen sijaintiin
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Teollisuusmuotojen nimet – kohdista päänäkymä tuotantolaitokseen napsauttamalla nimeä. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen sijaintiin.
STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER :{BLACK}Vastaanotettava rahti: {SILVER}{STRING}
STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER :{BLACK}Tuotettu rahti: {SILVER}{STRING}
STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES :Kaikki rahtityypit
@@ -3433,7 +3435,7 @@ STR_INDUSTRY_DIRECTORY_FILTER_NONE :Ei mitään
STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY}
STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Tuotto viime kuussa:
STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}{NBSP}% kuljetettu)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä teollisuuden sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan teollisuuden sijaintiin
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä tuotantolaitoksen sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan laitoksen sijaintiin.
STR_INDUSTRY_VIEW_PRODUCTION_LEVEL :{BLACK}Tuotantotaso: {YELLOW}{COMMA}{NBSP}%
STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE :{YELLOW}Teollisuuslaitos ilmoittaa pikaisesta sulkeutumisestaan!
@@ -3557,10 +3559,10 @@ STR_PURCHASE_INFO_MAX_TE :{BLACK}Suurin v
STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Toimintasäde: {GOLD}{COMMA} ruutua
STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Ilma-alustyyppi: {GOLD}{STRING}
-STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Junien valintaluettelo. Lisää tietoja junaa napsauttamalla. Ctrl+Klik näyttää tai piilottaa kulkuneuvon tyypin
-STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Ajoneuvojen valintaluettelo. Napsauta ajoneuvoa saadaksesi lisää tietoja. Ctrl+Klik näyttää tai piilottaa ajoneuvon tyypin
-STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Laivojen valintaluettelo. Napsauta laivaa saadaksesi lisää tietoja. Ctrl+Klik näyttää tai piilottaa laivan tyypin
-STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP :{BLACK}Ilma-alusten valintaluettelo. Napsauta ilma-alusta saadaksesi lisää tietoja. Ctrl+Klik näyttää tai piilottaa ilma-aluksen tyypin
+STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Raideliikennevälineiden valintaluettelo. Napsauta kulkuneuvoa saadaksesi lisää tietoa. Ctrl+napsautus näyttää tai piilottaa kulkuneuvon tyypin.
+STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Ajoneuvojen valintaluettelo. Napsauta ajoneuvoa saadaksesi lisää tietoja. Ctrl+napsautus näyttää tai piilottaa ajoneuvon tyypin.
+STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Laivojen valintaluettelo. Napsauta laivaa saadaksesi lisää tietoja. Ctrl+napsautus näyttää tai piilottaa laivan tyypin.
+STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP :{BLACK}Ilma-alusten valintaluettelo. Napsauta ilma-alusta saadaksesi lisää tietoja. Ctrl+napsautus näyttää tai piilottaa ilma-aluksen tyypin.
STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON :{BLACK}Osta yksikkö
STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Osta ajoneuvo
@@ -3572,15 +3574,15 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Osta ja
STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Osta ja sovita laiva
STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_BUTTON :{BLACK}Osta ja sovita ilma-alus
-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu yksikkö. Shift+Klik näyttää kustannusarvion ostamatta
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu ajoneuvo. Shift+Klik näyttää kustannusarvion ostamatta
-STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu laiva. Shift+Klik näyttää kustannusarvion ostamatta
-STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Osta korostettu ilma-alus. Shift+Klik näyttää kustannusarvion ostamatta
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu raideliikenneväline. Vaihto+napsautus näyttää kustannusarvion ostamatta.
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu ajoneuvo. Vaihto+napsautus näyttää kustannusarvion ostamatta.
+STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu laiva. Vaihto+napsautus näyttää kustannusarvion ostamatta.
+STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP :{BLACK}Osta valittu ilma-alus. Vaihto+napsautus näyttää kustannusarvion ostamatta.
-STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu yksikkö. Shift+Klik näyttää kustannusarvion ostamatta
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ajoneuvo. Shift+Klik näyttää kustannusarvion ostamatta
-STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu laiva. Shift+Klik näyttää kustannusarvion ostamatta
-STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ilma-alus. Shift+Klik näyttää kustannusarvion ostamatta
+STR_BUY_VEHICLE_TRAIN_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu raideliikenneväline. Vaihto+napsautus näyttää kustannusarvion ostamatta.
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ajoneuvo. Vaihto+napsautus näyttää kustannusarvion ostamatta.
+STR_BUY_VEHICLE_SHIP_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu laiva. Vaihto+napsautus näyttää kustannusarvion ostamatta.
+STR_BUY_VEHICLE_AIRCRAFT_BUY_REFIT_VEHICLE_TOOLTIP :{BLACK}Osta ja sovita valittu ilma-alus. Vaihto+napsautus näyttää kustannusarvion ostamatta.
STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON :{BLACK}Nimeä
STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON :{BLACK}Nimeä
@@ -3660,15 +3662,15 @@ STR_DEPOT_CLONE_ROAD_VEHICLE :{BLACK}Kloonaa
STR_DEPOT_CLONE_SHIP :{BLACK}Kloonaa laiva
STR_DEPOT_CLONE_AIRCRAFT :{BLACK}Kloonaa ilma-alus
-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO :{BLACK}Tämä ostaa kopion junasta ja kaikista sen vaunuista. Napsauta tätä painiketta ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Napsauta tätä painiketta ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Tämä ostaa kopion laivasta. Napsauta tätä painiketta ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
-STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Tämä ostaa kopion lentokoneesta. Napsauta tätä painiketta ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO :{BLACK}Tämä ostaa kopion junasta kaikkine vaunuineen. Napsauta tätä painiketta ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Napsauta tätä painiketta ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Tämä ostaa kopion laivasta. Napsauta tätä painiketta ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Tämä ostaa kopion lentokoneesta. Napsauta tätä painiketta ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+napsautus jakaa komennot. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä veturitallin sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan veturitallin sijaintiin
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä varikon sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan varikon sijaintiin
-STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä telakan sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan telekan sijaintiin
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä lentokonehallin sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan lentokonehallin sijaintiin
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä veturitallin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan veturitallin sijaintiin.
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvovarikon sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan varikon sijaintiin.
+STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä telakan sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan telakan sijaintiin.
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä lentokonehallin sijaintiin. Ctrl+napsautus avaa uuden näkymäikkunan lentokonehallin sijaintiin.
STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Näytä tällä asemalla olevien junien käskyt
STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Näytä tässä terminaalissa olevien ajoneuvojen käskyt
@@ -3758,20 +3760,20 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Automaat
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä junan sijaintiin. Ctrl+Klik seuraa junaa näkymässä
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä ajoneuvon sijaintiin. Ctrl+Klik seuraa ajoneuvoa päänäkymässä
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä laivan sijaintiin. Ctrl+Click seuraa laivaa näkymässä
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Keskitä näkymä ilma-aluksen sijaintiin. Ctrl+Klik seuraa ilma-alusta päänäkymässä
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä junan sijaintiin. Kaksoisnapsauta seurataksesi junaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan junan sijaintiin.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ajoneuvon sijaintiin. Kaksoisnapsauta seurataksesi ajoneuvoa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ajoneuvon sijaintiin.
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä laivan sijaintiin. Kaksoisnapsauta seurataksesi laivaa päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan laivan sijaintiin.
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Keskitä päänäkymä ilma-aluksen sijaintiin. Kaksoisnapsauta seurataksesi ilma-alusta päänäkymässä. Ctrl+napsautus avaa uuden näkymäikkunan ilma-aluksen sijaintiin.
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä juna veturitalliin. Ctrl+Klik suorittaa vain huollon
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ajoneuvo varikolle. Ctrl+Klik suorittaa vain huollon
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä laiva telakalle. Ctrl+Klik suorittaa vain huollon
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ilma-alus lentokonehalliin. Ctrl+Klik suorittaa vain huollon
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä juna veturitalliin. Ctrl+napsautus suorittaa vain huollon.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ajoneuvo varikolle. Ctrl+napsautus suorittaa vain huollon.
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä laiva telakalle. Ctrl+napsautus suorittaa vain huollon.
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Lähetä ilma-alus lentokonehalliin. Ctrl+napsautus suorittaa vain huollon.
-STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Tämä ostaa kopion junasta vaunuineen. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Tämä ostaa kopion laivasta. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Tämä ostaa kopion lentokoneesta. Ctrl+Klik jakaa komennot. Shift+Klik näyttää kustannusarvion ostamatta kopiota
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Tämä ostaa kopion junasta kaikkine vaunuineen. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Tämä ostaa kopion ajoneuvosta. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Tämä ostaa kopion laivasta. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Tämä ostaa kopion lentokoneesta. Ctrl+napsautus jakaa käskyt. Vaihto+napsautus näyttää kustannusarvion ostamatta kopiota.
STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP :{BLACK}Anna junalle lupa ohittaa punainen opastin
@@ -3783,20 +3785,22 @@ STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Sovita i
STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP :{BLACK}Käännä junan suunta
STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP :{BLACK}Pakota ajoneuvo kääntymään ympäri
-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Näytä junan käskyt. Ctrl+Klik näyttää junan aikataulun
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Näytä ajoneuvon käskyt. Ctrl+Klik näyttää ajoneuvon aikataulun
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Näytä junan käskyt. Ctrl+napsautus näyttää junan aikataulun.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Näytä ajoneuvon käskyt. Ctrl+napsautus näyttää ajoneuvon aikataulun.
STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Näytä laivan käskyt. Ctrl+Click näyttää laivan aikataulun
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Näytä ilma-aluksen käskyt. Ctrl+Klik näyttää ilma-aluksen aikataulun
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Näytä ilma-aluksen käskyt. Ctrl+napsautus näyttää ilma-aluksen aikataulun.
STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä junan tiedot
STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä ajoneuvon tiedot
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä laivan tiedot
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Näytä ilma-aluksen tiedot
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Valitun junan toiminnot – napsauta pysäyttääksesi/käynnistääksesi junan. Ctrl+Klik vierittääksesi kohteeseen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen ajoneuvon toiminnot – napsauta pysäyttääksesi/käynnistääksesi ajoneuvon. Ctrl+Klik vierittääksesi kohteeseen
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen laivat toiminnot – napsauta pysäyttääksesi/käynnistääksesi laivan. Ctrl+Klik vierittääksesi kohteeseen
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nykyisen lentokoneen toiminnot – napsauta pysäyttääksesi/käynnistääksesi lentokoneen. Ctrl+Klik vierittääksesi kohteeseen
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Nykyisen junan toiminnot – napsauta pysäyttääksesi/käynnistääksesi
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Nykyisen ajoneuvon toiminnot – napsauta pysäyttääksesi/käynnistääksesi
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Nykyisen laivan toiminnot – napsauta pysäyttääksesi/käynnistääksesi
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Nykyisen ilma-aluksen toiminnot – napsauta pysäyttääksesi/käynnistääksesi
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Keskitä päänäkymä käskyn kohteeseen. Ctrl+napsautus avaa uuden näkymäikkunan käskyn kohteen sijaintiin.
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lastataan/puretaan
@@ -3854,8 +3858,8 @@ STR_VEHICLE_INFO_FEEDER_CARGO_VALUE :{BLACK}Siirron
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS :{BLACK}Huoltoväli: {LTBLUE}{COMMA}{NBSP}päivää{BLACK} Viimeisin huolto: {LTBLUE}{DATE_LONG}
STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT :{BLACK}Huoltoväli: {LTBLUE}{COMMA}{NBSP}%{BLACK} Viime huolto: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Kasvata huoltoväliä kymmenellä. Ctrl+Klik kasvattaa huoltoväliä viidellä
-STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Pienennä huoltoväliä kymmenellä. Ctrl+Klik vähentää huoltoväliä viidellä
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Kasvata huoltoväliä kymmenellä. Ctrl+napsautus kasvattaa huoltoväliä viidellä.
+STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP :{BLACK}Pienennä huoltoväliä kymmenellä. Ctrl+napsautus pienentää huoltoväliä viidellä.
STR_SERVICE_INTERVAL_DROPDOWN_TOOLTIP :{BLACK}Muuta huoltovälien tyyppiä
STR_VEHICLE_DETAILS_DEFAULT :Oletus
@@ -3897,7 +3901,7 @@ STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Uusi kap
STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO_LONG}{}{BLACK}Tulot sovittamisesta: {GREEN}{CURRENCY_LONG}
STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Sovituksen kustannus: {RED}{CURRENCY_LONG}
STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT :{BLACK}Uusi kapasiteetti: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Tulot sovittamisesta: {GREEN}{CURRENCY_LONG}
-STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Valitse sovitettavat kulkuneuvot. Hiirellä vetäminen sallii useamman kulkuneuvon valinnan. Tyhjän alueen napsautus valitsee koko kulkuneuvon. Ctrl+Klik valitsee kulkuneuvon ja sitä seuraavan ketjun
+STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Valitse sovitettavat kulkuneuvot. Hiirellä vetämällä voit valita useamman kulkuneuvon. Tyhjän alueen napsautus valitsee koko kulkuneuvon. Ctrl+napsautus valitsee kulkuneuvon ja sitä seuraavan ketjun.
STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}Valitse junan rahtityyppi
STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Valitse ajoneuvolla kuljetettava rahti
@@ -3919,7 +3923,7 @@ STR_ORDERS_CAPTION :{WHITE}{VEHICLE
STR_ORDERS_TIMETABLE_VIEW :{BLACK}Aikataulu
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Näytä aikataulu
-STR_ORDERS_LIST_TOOLTIP :{BLACK}Käskyt – napsauta käskyä korostaaksesi sen. Ctrl+Klik siirtää näkymän kohteeseen
+STR_ORDERS_LIST_TOOLTIP :{BLACK}Käskyt – napsauta käskyä korostaaksesi sen. Ctrl+napsautus siirtää näkymän käskyn kohteeseen.
STR_ORDER_INDEX :{COMMA}:{NBSP}
STR_ORDER_TEXT :{STRING} {STRING} {STRING}
@@ -3949,9 +3953,9 @@ STR_ORDER_DROP_NO_UNLOADING :Ei rahdinpurkua
STR_ORDER_TOOLTIP_UNLOAD :{BLACK}Muuta korostetun käskyn purkamiskäyttäytymistä
STR_ORDER_REFIT :{BLACK}Sovita
-STR_ORDER_REFIT_TOOLTIP :{BLACK}Valitse mihin rahtityyppiin tämä käsky sovittaa. Ctrl+Klik poistaa sovituskäskyn
+STR_ORDER_REFIT_TOOLTIP :{BLACK}Valitse, mille rahtityypille kulkuneuvo sovitetaan tässä käskyssä. Ctrl+napsautus poistaa sovitusmääräyksen.
STR_ORDER_REFIT_AUTO :{BLACK}Uudelleensovitus asemalla
-STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Valitse tällä määräyksellä sovitettava rahtityyppi. Ctrl+Klik poistaaksesi sovitusmääräyksen. Sovitus suoritetaan vain, jos kulkuneuvo sallii sen
+STR_ORDER_REFIT_AUTO_TOOLTIP :{BLACK}Valitse, mille rahtityypille kulkuneuvo sovitetaan tässä käskyssä. Ctrl+napsautus poistaa sovitusmääräyksen. Uudelleensovittamisen edellytyksenä on, että kulkuneuvo sallii sen.
STR_ORDER_DROP_REFIT_AUTO :Määrätty rahti
STR_ORDER_DROP_REFIT_AUTO_ANY :Saatavilla oleva rahti
@@ -3987,13 +3991,13 @@ STR_ORDER_CONDITIONAL_VALUE_TOOLTIP :{BLACK}Arvo, jo
STR_ORDER_CONDITIONAL_VALUE_CAPT :{WHITE}Syötä arvo, johon verrataan
STR_ORDERS_SKIP_BUTTON :{BLACK}Ohita
-STR_ORDERS_SKIP_TOOLTIP :{BLACK}Ohita nykyinen käsky ja aloita seuraava. Ctrl+Klik hyppää valittuun käskyyn
+STR_ORDERS_SKIP_TOOLTIP :{BLACK}Ohita nykyinen käsky ja aloita seuraava. Ctrl+napsautus hyppää valittuun käskyyn.
STR_ORDERS_DELETE_BUTTON :{BLACK}Poista
STR_ORDERS_DELETE_TOOLTIP :{BLACK}Poista korostettu käsky
STR_ORDERS_DELETE_ALL_TOOLTIP :{BLACK}Poista kaikki käskyt
STR_ORDERS_STOP_SHARING_BUTTON :{BLACK}Lopeta jakaminen
-STR_ORDERS_STOP_SHARING_TOOLTIP :{BLACK}Lopeta käskyjen jakaminen. Ctrl+Klik poistaa lisäksi kaikki tämän kulkuneuvon käskyt
+STR_ORDERS_STOP_SHARING_TOOLTIP :{BLACK}Lopeta käskyjen jakaminen. Ctrl+napsautus poistaa lisäksi kaikki tämän kulkuneuvon käskyt.
STR_ORDERS_GO_TO_BUTTON :{BLACK}Mene
STR_ORDER_GO_TO_NEAREST_DEPOT :Mene lähimmälle varikolle
@@ -4103,7 +4107,7 @@ STR_TIMETABLE_STATUS_NOT_STARTED :{BLACK}Tämä a
STR_TIMETABLE_STATUS_START_AT :{BLACK}Tämä aikataulu alkaa {STRING}
STR_TIMETABLE_STARTING_DATE :{BLACK}Aloituspäivä
-STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Valitse päivämäärä aikataulun aloituspäiväksi. Ctrl+Klik määrittää aikataulun aloituspäivän ja jakaa aikataulun tasaisesti kaikkien sitä käyttävien kulkuneuvojen kesken niiden järjestyksen mukaan.
+STR_TIMETABLE_STARTING_DATE_TOOLTIP :{BLACK}Valitse päivämäärä aikataulun aloitusajankohdaksi. Ctrl+napsautus asettaa aikataulun aloituspäivän ja levittää kaikki tämän käskyjoukon jakavat kulkuneuvot tasaisesti niiden keskinäisen järjestyksen mukaan, mikäli käskyjoukko on kokonaan aikataulutettu.
STR_TIMETABLE_CHANGE_TIME :{BLACK}Muuta aikaa
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Aseta kuinka kauan käskyn tulisi kestää
@@ -4121,7 +4125,7 @@ STR_TIMETABLE_RESET_LATENESS :{BLACK}Nollaa m
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Nollaa myöhästymislaskuri, jotta vaunu olisi taas aikataulussa
STR_TIMETABLE_AUTOFILL :{BLACK}Automaattinen
-STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+Klik: yritä säilyttää odotusajat)
+STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+napsautus: yritä säilyttää odotusajat)
STR_TIMETABLE_EXPECTED :{BLACK}Odotettu
STR_TIMETABLE_SCHEDULED :{BLACK}Aikataulu
diff --git a/src/lang/french.txt b/src/lang/french.txt
index 3fc49fdf47..a260a4280b 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Choisir
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Choisir le critère de tri
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Choisir le critère de filtrage
STR_BUTTON_SORT_BY :{BLACK}Trier par
-STR_BUTTON_LOCATION :{BLACK}Emplacement
STR_BUTTON_RENAME :{BLACK}Renommer
STR_BUTTON_CATCHMENT :{BLACK}Couverture
STR_TOOLTIP_CATCHMENT :{BLACK}Basculer l'affichage de la zone couverte
@@ -750,6 +749,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Terre en friche
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Herbe
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Terre nue
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Région tropicale
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Champs
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Arbres
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Rochers
@@ -2633,6 +2633,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Choisir
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informations sur le terrain
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur la case. Ctrl-clic pour ouvrir une nouvelle vue sur la case
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Coût si démolition{NBSP}: {LTBLUE}N/D
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Coût si démolition{NBSP}: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Gain si démolition{NBSP}: {LTBLUE}{CURRENCY_LONG}
@@ -3103,6 +3104,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Activer
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Éditer le texte du 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
@@ -3759,10 +3761,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Si l'aut
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur le train. Ctrl-clic pour le suivre dans la vue principale.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur le véhicule. Ctrl-clic pour le suivre dans la vue principale.
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur le navire. Ctrl-clic pour le suivre dans la vue principale.
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur l'aéronef. Ctrl-clic pour le suivre dans la vue principale.
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centrer la vue sur le train. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur le train
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centrer la vue sur le véhicule. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur le véhicule
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centrer la vue sur le navire. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur le navire
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centrer la vue sur l'aéronef. Double clic pour le suivre dans la vue principale. Ctrl-clic pour ouvrir une nouvelle vue sur l'aéronef
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envoyer le train au dépôt.{}Ctrl-clic pour un entretien seul.
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envoyer le véhicule au dépôt.{}Ctrl-clic pour un entretien seul.
@@ -3794,10 +3796,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher les détails du navire
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Afficher les détails de l'aéronef
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Action courante du train - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Action courante du véhicule routier - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Action courante du navire - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Action courante de l'aéronef - Cliquer pour le démarrer/l'arrêter. Ctrl-clic pour centrer la vue sur sa destination.
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Action courante du train - cliquer pour le démarrer/l'arrêter
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Action courante du véhicule - cliquer pour le démarrer/l'arrêter
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Action courante du navire - cliquer pour le démarrer/l'arrêter
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Action courante de l'aéronef - cliquer pour le démarrer/l'arrêter
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centrer la vue sur la destination. Ctrl-clic pour ouvrir une nouvelle vue sur la destination
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Chargement/Déchargement
diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt
index 69e2045f3a..abdbfa13b5 100644
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -419,7 +419,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Tagh òr
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Tagh cuspairean-deuchainn an t-seòrsachaidh
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Tagh cuspairean-deuchainn a' chriathraidh
STR_BUTTON_SORT_BY :{BLACK}Seòrsaich a-rèir
-STR_BUTTON_LOCATION :{BLACK}Ionad
STR_BUTTON_RENAME :{BLACK}Thoir ainm ùr air
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Dùin an uinneag
@@ -3828,10 +3827,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Glèidh
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air an trèan. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad na trèan
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air a' charbad. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad a' charbaid
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air an long. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad na luinge
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Meadhanaich am prìomh-shealladh air a' charbad-adhair. Fosglaidh Ctrl+briogadh port-seallaidh ùr air ionad a' charbaid-adhair
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Cuir an trèan dhan trèan-lann. Cha dèan Ctrl+briogadh ach obair-ghlèidhidh
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Cuir carbad dhan gharaids. Cha dèan Ctrl+briogadh ach obair-ghlèidhidh
@@ -3863,10 +3858,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Seall mi
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Seall mion-fhiosrachadh na luinge
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Seall mion-fhiosrachadh a' charbaid
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh na trèan seo - briog gus an trèan a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh a' charbaid seo - briog gus an carbad a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh na luinge seo - briog gus an long a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gnìomh a' charbaid-adhair seo - briog gus an carbad a chur a' dol/na stad. Sgrolaich dhan cheann-uidhe le Ctrl+briogadh
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}A' luchdadh / dì-luchdadh
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index a51bb5767c..a3ae4ce5e2 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona o criterio de ordenación
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecciona o criterio de filtrado
STR_BUTTON_SORT_BY :{BLACK}Ordenar por
-STR_BUTTON_LOCATION :{BLACK}Situación
STR_BUTTON_RENAME :{BLACK}Renomear
STR_BUTTON_CATCHMENT :{BLACK}Cobertura
STR_TOOLTIP_CATCHMENT :{BLACK}Alternar amosar área de cobertura
@@ -3707,10 +3706,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Facer qu
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar a vista principal na situación do tren. Ctrl+click seguirá ao tren na vista principal
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar a vista principal na situación do vehículo. Ctrl+click seguirá ao vehículo na vista principal
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar a vista principal na situación do barco. Ctrl+click seguirá ao barco na vista principal
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centra-la vista principal na situación do avión. Ctrl+click seguirá ao avión na vista principal
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren ao depósito. Ctrl+click para facer só servizo
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Envia-lo vehículo ao depósito. Ctrl click para facer só servizo
@@ -3742,10 +3737,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra-l
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra-los detalles do barco
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra-los detalles do avión
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do tren - pincha para deter/arrancar o tren. Ctrl+click para desprazarse ao destino
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do vehículo - pincha para parar/arrancar o vehículo. Ctrl+click para desprazarse ao destino
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do barco - pincha para parar/arrancar o barco. Ctrl+click para desprazarse ao destino
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual do avión - pincha para parar/arrancar o avión. Ctrl+click para desprazarse ao destino
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando / Descargando
diff --git a/src/lang/german.txt b/src/lang/german.txt
index ba3b829901..28ab4b5a5c 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Sortierr
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sortierkriterien auswählen
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filterkriterien auswählen
STR_BUTTON_SORT_BY :{BLACK}Sortieren nach
-STR_BUTTON_LOCATION :{BLACK}Standort
STR_BUTTON_RENAME :{BLACK}Umbenennen
STR_BUTTON_CATCHMENT :{BLACK}Einzugsgebiet
STR_TOOLTIP_CATCHMENT :{BLACK}Anzeige des Einzugsgebietes umschalten
@@ -759,6 +758,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Unebenes Land
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Wiesen
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Kahles Land
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Regenwald
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Ackerland
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Bäume
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Felsen
@@ -791,7 +791,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Zeige al
STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Letzte Nachricht oder letzten Bericht anzeigen
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_STATUSBAR_PAUSED :{YELLOW}* * ANGEHALTEN * *
-STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * ANGEHALTEN (warte auf Update der Warenverteilung) * *
+STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * PAUSE (warte auf Aktualisierung des Verteilungsgraphen) * *
STR_STATUSBAR_AUTOSAVE :{RED}Autosicherung
STR_STATUSBAR_SAVING_GAME :{RED}* * SPEICHERE SPIEL * *
@@ -853,7 +853,7 @@ STR_NEWS_END_OF_RECESSION :{BLACK}{BIG_FON
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL :{BIG_FONT}{BLACK}{INDUSTRY} {G 0 erhöht erhöht erhöht erhöhen} die Produktion!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_COAL :{BIG_FONT}{BLACK}Neue Kohlevorkommen bei {INDUSTRY} gefunden!{}Förderung verdoppelt!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_OIL :{BIG_FONT}{BLACK}Neue Ölfunde bei {INDUSTRY}!{}Förderung wird vermutlich verdoppelt!
-STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Neue Getreideanbaumethoden bei {INDUSTRY} werden Erträge verdoppeln!
+STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_FARM :{BIG_FONT}{BLACK}Neue Anbaumethoden bei {INDUSTRY} werden Erträge verdoppeln!
STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_SMOOTH :{BIG_FONT}{BLACK}{STRING}produktion von {INDUSTRY} erhöht sich um {COMMA}%!
STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL :{BIG_FONT}{BLACK}Produktion bei {INDUSTRY} sinkt um 50%
STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_FARM :{BIG_FONT}{BLACK}Insektenplage bei {INDUSTRY} verursacht Schaden!{}Produktion sinkt um 50%
@@ -1080,7 +1080,7 @@ STR_NUM_VERY_LOW :Sehr niedrig
STR_NUM_LOW :Niedrig
STR_NUM_NORMAL :Normal
STR_NUM_HIGH :Hoch
-STR_NUM_CUSTOM :Eigene
+STR_NUM_CUSTOM :Individuell
STR_NUM_CUSTOM_NUMBER :Individuell ({NUM})
STR_VARIETY_NONE :Minimal
@@ -1105,7 +1105,7 @@ STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Individuell ({N
STR_RIVERS_NONE :Keine
STR_RIVERS_FEW :Wenige
-STR_RIVERS_MODERATE :einige
+STR_RIVERS_MODERATE :Einige
STR_RIVERS_LOT :Viele
STR_DISASTER_NONE :Keine
@@ -1425,7 +1425,7 @@ STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN :Rauheit des Gel
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT :(nur TerraGenesis) Wähle die Häufigkeit von Hügeln: Rollende Landschaften haben wenige, weit verteilte Hügel. Zerklüftete Landschaften haben viele Hügel, was wiederum sich wiederholend aussehen kann
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Sehr eben
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH :Eben
-STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :zerklüftet
+STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH :Zerklüftet
STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH :Sehr zerklüftet
STR_CONFIG_SETTING_VARIETY :Größe der Geländeformen: {STRING}
STR_CONFIG_SETTING_VARIETY_HELPTEXT :(nur TerraGenesis) Beinflusst, ob die Karte sowohl bergige als auch ebene Gegenden enthält. Weil dieses die Karte nur ebener macht, sollten andere Einstellungen auf bergig gesetzt werden
@@ -2540,7 +2540,7 @@ STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} ha
STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} hat seinen/ihren Namen in {STRING} geändert
STR_NETWORK_MESSAGE_GIVE_MONEY_RECEIVE :*** {STRING} gab der eigenen Firma {2:CURRENCY_LONG}
STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY :*** Die eigene Firma übergab {1:STRING} {2:CURRENCY_LONG}
-STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} gab {1:STRING} {2:CURRENCY_LONG}
+STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} gab {2:CURRENCY_LONG} an {1:STRING}
STR_NETWORK_MESSAGE_MONEY_GIVE_SRC_DESCRIPTION :{STRING} ({COMPANY})
STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Der Server hat das Spiel beendet
STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Der Server startet neu...{}Bitte warten...
@@ -3298,6 +3298,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Industri
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Gebietsinformation
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Zentriert die Hauptansicht an der Kachelposition. Strg+Klick öffnet ein neues Ansichtsfenster an der Kachelposition
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Räumungskosten: {LTBLUE}Keine
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Räumungskosten: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Einnahmen beim Abriss: {LTBLUE}{CURRENCY_LONG}
@@ -3473,7 +3474,7 @@ STR_FRAMERATE_DRAWING :{BLACK}Grafik-R
STR_FRAMERATE_DRAWING_VIEWPORTS :{BLACK}Kartenansichten:
STR_FRAMERATE_VIDEO :{BLACK}Videoausgabe:
STR_FRAMERATE_SOUND :{BLACK}Sound-Abmischung:
-STR_FRAMERATE_ALLSCRIPTS :{BLACK} GS/KI insgesamt:
+STR_FRAMERATE_ALLSCRIPTS :{BLACK} GS/AI-Skripte gesamt:
STR_FRAMERATE_GAMESCRIPT :{BLACK} Script:
STR_FRAMERATE_AI :{BLACK} KI {NUM} {STRING}
############ End of leave-in-this-order
@@ -3490,7 +3491,7 @@ STR_FRAMETIME_CAPTION_DRAWING :Grafik-Renderin
STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS :Karten-Rendering
STR_FRAMETIME_CAPTION_VIDEO :Videoausgabe
STR_FRAMETIME_CAPTION_SOUND :Sound-Abmischung
-STR_FRAMETIME_CAPTION_ALLSCRIPTS :GS/KI-Skripte insgesamt
+STR_FRAMETIME_CAPTION_ALLSCRIPTS :GS/AI-Skripte gesamt
STR_FRAMETIME_CAPTION_GAMESCRIPT :Spielskript
STR_FRAMETIME_CAPTION_AI :KI {NUM} {STRING}
############ End of leave-in-this-order
@@ -3795,6 +3796,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Umschalt
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Schildtext ändern
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Hauptansicht auf Schildposition zentrieren. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Schildes
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Zum nächsten Schild wechseln
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Zum vorherigen Schild wechseln
@@ -3819,8 +3821,8 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER :{ORANGE}{STRING
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL :{ORANGE}{STRING}{GREEN} geliefert
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (noch benötigt)
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (geliefert)
-STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}-ten{NBSP}Tag
-STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}-ten{NBSP}Tag (finanziert)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}.{NBSP}Tag
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}Die Stadt wächst jeden {ORANGE}{COMMA}{BLACK}.{NBSP}Tag (finanziert)
STR_TOWN_VIEW_TOWN_GROW_STOPPED :{BLACK}Die Stadt wächst {RED}nicht{BLACK}
STR_TOWN_VIEW_NOISE_IN_TOWN :{BLACK}Lärmbelastung in der Stadt: {ORANGE}{COMMA}{BLACK} Grenzwert: {ORANGE}{COMMA}
STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Hauptansicht zur Stadt scrollen. Strg+Klick öffnet neue Zusatzansicht bei der Stadt
@@ -4597,10 +4599,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ursprün
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Zug scrollen. Strg+Klick, um dem Zug zu folgen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Fahrzeug scrollen. Strg+Klick, um dem Fahrzeug zu folgen
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Schiff scrollen. Strg+Klick, um dem Schiff zu folgen
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Hauptansicht zum Flugzeug scrollen. Strg+Klick, um dem Flugzeug zu folgen
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf die Position des Zuges. Durch Doppelklick wird der Zug in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Zuges
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf den Standort des Fahrzeugs. Durch Doppelklick wird das Fahrzeug in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster an der Position des Fahrzeugs
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf die Position des Schiffs. Mit Doppelklick wird das Schiff in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Schiffs
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Zentriert die Hauptansicht auf die Position des Flugzeugs. Durch Doppelklick wird das Flugzeug in der Hauptansicht verfolgt. Strg+Klick öffnet ein neues Ansichtsfenster auf der Position des Flugzeugs
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Zug ins Depot schicken. Strg+Klick, um dort nur Wartung durchzuführen
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Das Fahrzeug ins Depot schicken. Strg+Klick, um dort nur Wartung durchzuführen
@@ -4635,10 +4637,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Einzelhe
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Zeige Einzelheiten des Schiffes
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Zeige Einzelheiten des Flugzeuges
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Zugbewegung - Klicke hier, um den Zug anzuhalten / zu starten. Strg + Klick scrollt zum Bestimmungsort
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Fahrzeugbewegung - Klick zum Anhalten bzw. Losschicken. Strg + Klick scrollt zum Bestimmungsort
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Schiffsbewegung - Klicke hier, um das Schiff anzuhalten / zu starten. Strg + Klick scrollt zum Bestimmungsort
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Laufende Flugzeugbewegung - Klick zum Anhalten bzw. Losschicken. Strg + Klick scrollt zum Bestimmungsort
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Momentane Zugaktion - Klicken zum Starten/Anhalten des Zuges
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Momentane Fahrzeugaktion - Klicken zum Starten/Anhalten des Fahrzeugs
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Momentane Schiffsaktion - Klicken zum Starten/Anhalten des Schiffs
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Momentane Flugzeugaktion - Klicken zum Starten/Anhalten des Flugzeugs
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Hauptansicht auf Auftragsziel zentrieren. Strg+Klick öffnet ein neues Ansichtsfenster auf dem Standort des Auftragsziels
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laden / Entladen
@@ -4961,6 +4965,7 @@ STR_ORDER_STOP_ORDER :(Stopp)
STR_ORDER_SELL_ORDER :(Verkaufe Fahrzeug)
STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(Station unbenutzbar){POP_COLOUR} {STRING} {STATION} {STRING}
STR_ORDER_IMPLICIT :(Implizit)
@@ -5449,7 +5454,7 @@ STR_ERROR_CAN_ONLY_BE_BUILT_ABOVE_SNOW_LINE :{WHITE}... kann
STR_ERROR_CAN_ONLY_BE_BUILT_BELOW_SNOW_LINE :{WHITE}... kann nur unterhalb der Schneegrenze errichtet werden
STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES :{WHITE}Es konnten für die Industrie '{STRING}' keine geeigneten Standorte gefunden werden
-STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Ändere die Karteneinstellungen, um eine bessere Karte zu erzeugen
+STR_ERROR_NO_SUITABLE_PLACES_FOR_INDUSTRIES_EXPLANATION :{WHITE}Karteneinstellungen ändern, um eine bessere Karte zu erzeugen
# Station construction related errors
STR_ERROR_CAN_T_BUILD_RAILROAD_STATION :{WHITE}Bahnhof kann hier nicht gebaut werden...
diff --git a/src/lang/greek.txt b/src/lang/greek.txt
index ffb5d22669..241ebafacd 100644
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -294,7 +294,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Επιλ
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Επιλογή κριτηρίου ταξινόμησης
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Επιλέξτε κριτήρια φιλτραρίσματος
STR_BUTTON_SORT_BY :{BLACK}Ταξινόμηση κατά
-STR_BUTTON_LOCATION :{BLACK}Τοποθεσία
STR_BUTTON_RENAME :{BLACK}Μετονομασία
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Κλείσιμο παραθύρου
@@ -3778,10 +3777,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Υποχ
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στην τοποθεσία του τρένου. Με Ctrl+Κλικ ακολουθεί το τρένο στην κύρια προβολή
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στην τοποθεσία του οχήματος δρόμου. Με Ctrl+Κλικ ακολουθεί το όχημα στην κύρια προβολή
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στη τοποθεσία του πλοίου. Με Ctrl+Κλικ ακολουθεί το πλοίο στην κύρια προβολή
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Κεντράρισμα της κύριας προβολής στην τοποθεσία του αεροσκάφους. Με Ctrl+Κλικ ακολουθεί το αεροσκάφος στην κύρια προβολή
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Στέλνει το τρένο στο αμαξοστάσιο. Με Ctrl+Κλικ κάνει μόνο επισκευή
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Στέλνει το όχημα στο αμαξοστάσιο. Με Ctrl+Κλικ κάνει μόνο επισκευή
@@ -3813,10 +3808,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Εμφά
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Εμφάνιση λεπτομερειών πλοίου
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Εμφάνιση λεπτομερειών αεροσκάφους
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια τρένου - πατήστε εδώ για ξεκινήσετε/σταματήσετε το τρένο. Με Ctrl+Κλικ πηγαίνετε στον προορισμό
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια οχήματος - πατήστε εδώ για ξεκινήσετε/σταματήσετε το όχημα. Με Ctrl+Κλικ πηγαίνετε στον προορισμό
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια πλοίου - πατήστε εδώ για ξεκινήσετε/σταματήσετε το πλοίο. Με Ctrl+Κλικ πηγαίνετε στον προορισμό
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Τρέχουσα ενέργεια αεροσκάφους - πατήστε εδώ για ξεκινήσετε/σταματήσετε το πλοίο. Με Ctrl+Κλικ πηγαίνετε στον προορισμό
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Φόρτωση / Εκφόρτωση
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index 8f6f516b2a..b4162a3cbe 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -245,7 +245,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}(בחר(
STR_TOOLTIP_SORT_CRITERIA :{BLACK}בחר\י קרטריון מיון
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}בחר קריטריון סינון
STR_BUTTON_SORT_BY :{BLACK}מיון לפי
-STR_BUTTON_LOCATION :{BLACK}מיקום
STR_BUTTON_RENAME :{BLACK}שנה שם
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}סגור חלון
@@ -3606,10 +3605,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}שמור
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}מרכז את התצוגה על מיקום הרכבת. Ctrl+לחיצה יעקוב אחרי הרכבת בתצוגה הראשית
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}מרכז את התצוגה על מיקומו של כלי הרכב. Ctrl+לחיצה יעקוב אחרי כלי הרכב בתצוגה הראשית
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}מקד את התצוגה הראשית על כלי השייט. Ctrl+לחיצה יעקוב אחרי כל השייט בתצוגה הראשית
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}מקד את התצוגה הראשית על כלי הטייס. Ctrl+לחיצה יעקוב אחרי כלי הטייס בתצוגה הראשית
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}.שלח את הרכבת למוסך
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}.שלח את כלי הרכב למוסך
@@ -3641,10 +3636,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}הצג
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}הצג פרטי כלי שייט
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}הצג פרטי כלי טייס
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}פעולה רכבת נוכחית - לחץ כדי לעצור/להפעיל את הרכבת. Ctrl+לחיצה על מנת לגרור ליעד
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}פעולת כלי רכב נוכחי - לחץ כדי לעצור/להפעיל את כלי הרכב. Ctrl+לחיצה כדי לגלול ליעד
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}פעולת כלי שייט נוכחי - לחץ כדי לעצור/להפעיל את כלי השייט. Ctrl+לחיצה כדי לגלול ליעד
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}פעולת כלי טייס נוכחי - לחץ כדי לעצור/להפעיל את כלי השייט. Ctrl+לחיצה כדי לגלול ליעד
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}טעינה / פריקה
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index 19de32d7fd..cc5eac533d 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -296,7 +296,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Csökken
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sorbarendezési feltétel
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Szűrési feltétel kiválasztása
STR_BUTTON_SORT_BY :{BLACK}Rendezés
-STR_BUTTON_LOCATION :{BLACK}Megnéz
STR_BUTTON_RENAME :{BLACK}Átnevez
STR_BUTTON_CATCHMENT :{BLACK}Lefedett terület
STR_TOOLTIP_CATCHMENT :{BLACK}Az állomás által lefedett terület mutatása
@@ -3784,10 +3783,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Az autom
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Közelítés a vonat jelenlegi helyzetére. Ctrl+kattintással a vonat követése a fő nézetben
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Közelítés a jármű jelenlegi helyzetére. Ctrl+kattintással a jármű követése a fő nézetben
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Közelítés a hajó jelenlegi helyzetére. Ctrl+kattintással a hajó követése a fő nézetben
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Közelítés a repülőgép jelenlegi helyzetére. Ctrl+kattintással a repülőgép követése a fő nézetben
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}A járműtelepre küldi a vonatot. Ctrl+kattintással csak javításra
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Garázsba küldi a járművet. Ctrl+kattintással csak javításra
@@ -3819,10 +3814,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}A közú
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}A hajó adatai
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}A repülőgép adatai
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális vonatmozgás - kattints ide a vonat elindításához vagy megállításához. Ctrl+kattintással az utasítások váltása
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális járműmozgás - kattints ide a jármű elindításához vagy megállításához. Ctrl+kattintással az utasítások váltása
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális hajómozgás - kattints ide a hajó elindításhoz vagy megállításhoz. Ctrl+kattintással az utasítások váltása
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Aktuális repülőgépmozgás - kattints ide a repülőgép elindításához vagy megállításához. Ctrl+kattintással az utasítások váltása
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Berakodás / Kirakodás
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 15c9c95323..2f30ad8af4 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -224,7 +224,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Velja up
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Velja uppröðun
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Veldu hvers kyns farartæki þú vilt kaupa
STR_BUTTON_SORT_BY :{BLACK}Flokka eftir
-STR_BUTTON_LOCATION :{BLACK}Staðsetning
STR_BUTTON_RENAME :{BLACK}Endurnefna
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Loka glugga
@@ -3310,10 +3309,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Heldur l
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Miðstilla sjónarhorn á staðsetningu lestar. Ctrl+smella til að fylgja lestina í aðal sjónarhorni
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Miðja aðalsjónarhornið á bifreið. Ctrl smelltu til að fylgja bifreiðina í aðalglugga
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Miðja aðalsjónarhorn á staðsetningu skips. Ctrl smelltu til að fylgja skipi í aðalglugga
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Miðja aðalsjónarhorn á flugvélina. Ctrl smelltu til að fylgja flugvél í aðalglugga
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Senda lest í skýli. Ctrl+smella til þjóna lestinni einungis
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Senda bifreið í skýli
@@ -3345,10 +3340,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Sýna up
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Sýna nánari upplýsingar um skip
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Sýna nánari upplýsingar um skip
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð lestar - smelltu hér til að stöðva/ræsa lestina. Ctrl+smella til að fara á áfangastað
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð bifreiðar - smelltu hér til að stöðva/ræsa bifreið. Ctrl+Smella til að fara á áfangastað
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð skips - smelltu hér til að stöðva/ræsa skipið. Ctrl+Smella til at fara á áfangastað
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Núverandi aðgerð - smelltu hér til að stöðva/ræsa flugvél. Ctrl+Smella til at fara á áfangastað
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ferma / Afferma
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index 1a376fd799..789fb8e28c 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -194,6 +194,7 @@ STR_COLOUR_DEFAULT :Standar
STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mil/j
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/jam
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}meter/detik
+STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ubin/hari
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}dk
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}dk
@@ -233,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Pilih mo
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Pilih kriteria pengurutan
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Pilih kriteria
STR_BUTTON_SORT_BY :{BLACK}Urutkan
-STR_BUTTON_LOCATION :{BLACK}Lokasi
STR_BUTTON_RENAME :{BLACK}Ubah nama
STR_BUTTON_CATCHMENT :{BLACK}Jangkauan
STR_TOOLTIP_CATCHMENT :{BLACK}Tombol tampilan area cakupan
@@ -315,10 +315,14 @@ STR_SORT_BY_RANGE :Jangkauan
STR_SORT_BY_POPULATION :Populasi
STR_SORT_BY_RATING :Peringkat
STR_SORT_BY_NUM_VEHICLES :Jumlah kendaraan
+STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :Total laba tahun lalu
STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR :Total laba tahun ini
STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :Laba rata-rata tahun lalu
+STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :Laba rata-rata tahun ini
# Group by options for vehicle list
+STR_GROUP_BY_NONE :Tidak ada
+STR_GROUP_BY_SHARED_ORDERS :Perintah bersama
# Tooltips for the main toolbar
STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Hentikan sementara permainan
@@ -744,6 +748,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Daratan terjal
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Daratan berumput
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Lahan kritis
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Hutan hujan
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Ladang
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Pepohonan
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Bebatuan
@@ -1447,6 +1452,7 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Menjagakan alat
STR_CONFIG_SETTING_EXPENSES_LAYOUT :Kelompokkan pengeluaran perusahaan dalam neraca: {STRING}
STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Mendefinisikan tata ruang untuk tetingkap biaya perusahaan
STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Secara otomatis menghapus sinyal selama konstruksi rel: {STRING}
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Menghapus sinyal secara otomatis selama konstruksi rel jika sinyal menghalangi. Perhatikan bahwa hal ini berpotensi menyebabkan kecelakaan kereta api.
STR_CONFIG_SETTING_SOUND_TICKER :Ticker berita: {STRING}
STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Mainkan suara untuk pesanan berita yang diringkas
@@ -1564,6 +1570,7 @@ STR_CONFIG_SETTING_ECONOMY_TYPE :Tipe ekonomi: {
STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT :Ekonomi yang lancar membuat perubahan produksi lebih sering, dan dalam langkah yang lebih kecil. Ekonomi beku menghentikan perubahan produksi dan penutupan industri. Pengaturan ini mungkin tidak berpengaruh jika jenis industri disediakan oleh NewGRF.
STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Asli
STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Halus
+STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Beku
STR_CONFIG_SETTING_ALLOW_SHARES :Ijinkan pembelian saham perusahaan lain: {STRING}
STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Jika diaktifkan, pemain dibolehkan membeli saham suatu perusahaan. Saham hanya bisa dibeli saat perusahaan memasuki umur tertentu
STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Usia minimum perusahaan untuk memperdagangkan saham: {STRING}
@@ -1617,6 +1624,7 @@ STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Penempatan poho
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Mengendalikan kemunculan pohon dalam permainan. Ini akan berefek pada industri yang memerlukan pohon, contohnya pengolahan kayu gelondongan
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Tumbuh tapi jangan menyebar {RED}(memecahkan pabrik kayu)
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Tumbuh tetapi hanya tersebar di hutan hujan
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Tumbuh dan menyebar ke mana-mana
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Jangan tumbuh, jangan menyebar {RED}(menghancurkan pabrik kayu)
STR_CONFIG_SETTING_TOOLBAR_POS :Posisi toolbar utama: {STRING}
@@ -1684,6 +1692,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Apabila kecepat
STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Imperial (mpj)
STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Metrik (km/j)
STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/d)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Unit permainan (ubin/hari)
STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Satuan daya kendaraan: {STRING}
STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Apabila daya kendaraan ditampilkan di antarmuka, nyatakan di satuan yang dipilih
@@ -1816,6 +1825,7 @@ STR_INTRO_TRANSLATION :{BLACK}Terjemah
# Quit window
STR_QUIT_CAPTION :{WHITE}Keluar
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Anda yakin ingin keluar dari OpenTTD?
STR_QUIT_YES :{BLACK}Ya
STR_QUIT_NO :{BLACK}Tidak
@@ -1979,6 +1989,7 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Bergabun
STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Cek server
STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Periksa lagi status server
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :{BLACK}Cari di internet
STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP :{BLACK}Cari di internet untuk server publik
STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN :{BLACK}CARI LAN
STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Cari jaringan area lokal untuk server
@@ -2223,6 +2234,7 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} be
STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} mulai mendirikan perusahaan (#{2:NUM})
STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} meninggalkan permainan ({2:STRING})
STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} telah mengganti namanya menjadi {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} memberikan {2:CURRENCY_LONG} kepada {1:STRING}
STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Server menutup sesi
STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Server memulai ulang...{}Tunggulah...
STR_NETWORK_MESSAGE_KICKED :*** {STRING} telah dikeluarkan. Alasan: ({STRING})
@@ -2620,6 +2632,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Pilih in
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informasi area daratan
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Pusatkan tampilan utama pada lokasi ubin. Ctrl+Klik membuka viewport baru pada lokasi petak
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Biaya penghancuran: {LTBLUE}tidak ada
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Biaya penghancuran: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Nilai jual kembali: {LTBLUE}{CURRENCY_LONG}
@@ -3090,6 +3103,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Hidup ma
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Ubah tulisan di tanda pengenal
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Pusatkan tampilan utama pada lokasi tanda tangan. Ctrl+Klik membuka viewport baru pada lokasi tanda tangan
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Pergi sampai rambu berikutnya
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Pergi ke rambu sebelumnya
@@ -3173,10 +3187,10 @@ STR_GOALS_COMPANY_TITLE :{BLACK}Target p
STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Klik pada tujuan untuk mengarahkan pandangan pada tengah industri/kota/kotak. Ctrl+klik untuk membuka jendela baru pada lokasi industri/kota/kotak
# Goal question window
-STR_GOAL_QUESTION_CAPTION_QUESTION :Pertanyaan
-STR_GOAL_QUESTION_CAPTION_INFORMATION :Informasi
-STR_GOAL_QUESTION_CAPTION_WARNING :Peringatan
-STR_GOAL_QUESTION_CAPTION_ERROR :Kesalahan
+STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Pertanyaan
+STR_GOAL_QUESTION_CAPTION_INFORMATION :{BLACK}Informasi
+STR_GOAL_QUESTION_CAPTION_WARNING :{BLACK}Peringatan
+STR_GOAL_QUESTION_CAPTION_ERROR :{YELLOW}Kesalahan
############ Start of Goal Question button list
STR_GOAL_QUESTION_BUTTON_CANCEL :Batal
@@ -3366,7 +3380,8 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Pindah K
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Membangun kembali kantor pusat perusahaan di tempat lain dengan 1% ongkos dari nilai perusahaan. Shift untuk menampilkan perkiraan biaya
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detail
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Lihat jumlah infrastruktur lebih detail
-STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Kirim uang
+STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Berikan uang
+STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Berikan uang kepada perusahaan ini
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Ganti Wajah
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Pilih wajah baru pimpinan
@@ -3384,7 +3399,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Jual 25%
STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Nama Perusahaan
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Nama Pimpinan
-STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Masukkan jumlah uang yang akan diberikan
+STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Masukkan jumlah uang yang ingin Anda berikan
STR_BUY_COMPANY_MESSAGE :{WHITE}Kami mencari perusahaan transporasi untuk mengambil alih perusahaan kami.{}{}Anda ingin membeli {COMPANY} senilai {CURRENCY_LONG}?
@@ -3745,10 +3760,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Membuat
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan pada lokasi kereta. Ctrl+Click akan mengikuti kereta pada pandangan utama.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan utama pada lokasi kendaraan. Ctrl+Click akan mengikuti kendaraan pada pandangan utama
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan utama pada lokasi kapal. Ctrl+Click akan mengikuti kapal pada pandangan utama
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Arahkan pandangan utama pada lokasi pesawat. Ctrl+Click akan mengikuti pesawat pada pandangan utama
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Pandangan utama lokasi pusat kereta api. Klik ganda akan mengikuti kereta di tampilan utama. Ctrl+Click membuka viewport baru pada lokasi kereta
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Pandangan utama lokasi kendaraan. Klik dua kali akan mengikuti kendaraan dalam tampilan utama. Ctrl+Click membuka viewport baru pada lokasi kendaraan
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Tampilan utama pusat di lokasi kapal. Klik ganda akan mengikuti kapal dalam tampilan utama. Ctrl+Click membuka viewport baru di lokasi kapal
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Pandangan utama pusat lokasi pesawat. Klik dua kali akan mengikuti pesawat dalam tampilan utama. Ctrl+Click membuka viewport baru pada lokasi pesawat
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kereta berhenti di depo. CTRL+klik untuk memerintahkan perbaikan saja
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Perintahkan kendaraan berhenti di bengkel. CTRL+klik hanya akan memerintahkan perbaikan di bengkel
@@ -3780,10 +3795,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilka
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilkan detail kapal
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Tampilkan detail pesawat
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aksi kereta saat ini - klik untuk menjalankan/menghentikan kereta. Ctrl-Click untuk melihat tujuan.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Kegiatan kendaraan saat ini - klik untuk menghentikan/menjalankan kendaraan. Ctrl-Click untuk melihat tujuan.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Aksi kapal saat ini - klik untuk menghentikan / menjalankan kapal. Ctrl-Click untuk melihat tujuan.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Aksi pesawat saat ini - klik untuk menghentikan/menjalankan pesawat. Ctrl-Click untuk melihat tujuan.
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Aksi kereta saat ini - klik untuk menghentikan/memulai kereta
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Aksi kendaraan saat ini - klik untuk menghentikan/memulai kendaraan
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Aksi kapal saat ini - klik untuk menghentikan/menjalankan kapal
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Aksi Pesawat saat ini - klik untuk menghentikan/memulai Pesawat
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Tampilan utama pusat pada tujuan pesanan. Ctrl+Click membuka viewport baru pada lokasi tujuan pesanan
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Bongkar/Muat
@@ -4464,6 +4481,7 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Jenis bengkel s
STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} jadi terlalu panjang setelah diganti
STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Tidak ada aturan peremajaan otomatis yang berlaku
STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(batas min. uang)
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}Kendaraan baru tidak bisa membawa {STRING}
STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}Kendaraan baru tidak dapat melakukan perbaikan dalam urutan {NUM}
# Rail construction errors
@@ -4751,10 +4769,10 @@ STR_INDUSTRY_NAME_SUGAR_MINE :Tambang Gula
##id 0x6000
STR_SV_EMPTY :
STR_SV_UNNAMED :Tanpa nama
-STR_SV_TRAIN_NAME :Kereta {COMMA}
-STR_SV_ROAD_VEHICLE_NAME :Kendaraan Jalan Raya {COMMA}
-STR_SV_SHIP_NAME :Kapal {COMMA}
-STR_SV_AIRCRAFT_NAME :Pesawat {COMMA}
+STR_SV_TRAIN_NAME :Kereta #{COMMA}
+STR_SV_ROAD_VEHICLE_NAME :Kendaraan Jalan Raya #{COMMA}
+STR_SV_SHIP_NAME :Kapal #{COMMA}
+STR_SV_AIRCRAFT_NAME :Pesawat #{COMMA}
STR_SV_STNAME :{STRING}
STR_SV_STNAME_NORTH :{STRING} Utara
@@ -5056,6 +5074,7 @@ STR_FORMAT_BUOY_NAME :Pelampung {TOWN
STR_FORMAT_BUOY_NAME_SERIAL :Pelampung {TOWN} #{COMMA}
STR_FORMAT_COMPANY_NUM :(Perusahaan {COMMA})
STR_FORMAT_GROUP_NAME :Kelompok {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA}
STR_FORMAT_INDUSTRY_NAME :{1:STRING} {0:TOWN}
STR_FORMAT_WAYPOINT_NAME :Waypoint {TOWN}
STR_FORMAT_WAYPOINT_NAME_SERIAL :Waypoint {TOWN} #{COMMA}
diff --git a/src/lang/irish.txt b/src/lang/irish.txt
index b88d0ce23e..c7253c688a 100644
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Roghnaig
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Roghnaigh critéir sórtála
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Roghnaigh critéir scagtha
STR_BUTTON_SORT_BY :{BLACK}Sórtáil de réir
-STR_BUTTON_LOCATION :{BLACK}Suíomh
STR_BUTTON_RENAME :{BLACK}Athainmnigh
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Dún an fhuinneog
@@ -3535,10 +3534,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ceangail
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh na traenach. Leanfar an traein sa phríomhamharc le Ctrl+Cliceáil
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh na feithicle. Leanfar an fheithicil sa phríomhamharc le Ctrl+Cliceáil
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh na loinge. Leanfar an long sa phríomhamharc le Ctrl+Cliceáil
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Láraigh an príomhamharc ar shuíomh an aerárthaigh. Leanfar an t-aerárthach sa phríomhamharc le Ctrl+Cliceáil
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Seol an traein chuig an iosta. Ní dhéanfar ach seirbhísiú le Ctrl+Cliceáil
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Seol an fheithicil chuig an iosta. Ní dhéanfar ach seirbhísiú le Ctrl+Cliceáil
@@ -3570,10 +3565,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Taispeá
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Taispeáin sonraí na loinge
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Taispeáin sonraí an aerárthaigh
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don traein reatha - cliceáil chun an traein a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don fheithicil reatha - cliceáil chun an fheithicil a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don long reatha - cliceáil chun an long a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}An gníomh don aerárthach reatha - cliceáil chun an t-aerárthach a thosú/stopadh. Ctrl+Cliceáil le scrollú chuig an gceann scríbe.
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Ag Lódáil / Dílódáil
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 1e27f92ecf..e19c373479 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selezion
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleziona il criterio di ordinamento
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleziona il criterio di filtraggio
STR_BUTTON_SORT_BY :{BLACK}Ordina per
-STR_BUTTON_LOCATION :{BLACK}Posizione
STR_BUTTON_RENAME :{BLACK}Rinomina
STR_BUTTON_CATCHMENT :{BLACK}Copertura
STR_TOOLTIP_CATCHMENT :{BLACK}Attiva/disattiva la visualizzazione dell'area di copertura
@@ -3750,10 +3749,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fa sì c
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione del treno. CTRL+clic attiva l'inseguimento della visuale.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione dell'automezzo. CTRL+clic attiva l'inseguimento della visuale.
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione della nave. CTRL+clic attiva l'inseguimento della visuale.
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centra la visuale principale sulla posizione dell'aeromobile. CTRL+clic attiva l'inseguimento della visuale.
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Manda il treno al deposito. CTRL+clic per eseguire solo una manutenzione
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Manda l'automezzo al deposito. CTRL+clic per eseguire solo una manutenzione
@@ -3785,10 +3780,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra i
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra i dettagli sulla nave
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostra i dettagli sull'aeromobile
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente del treno - fare clic per fermarlo/avviarlo. CTRL+clic visualizza la destinazione
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente del veicolo - fare clic per fermarlo/avviarlo. CTRL+clic visualizza la destinazione
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente della nave - fare clic per fermarla/avviarla. CTRL+clic visualizza la destinazione
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Azione corrente dell'aeromobile - fare clic per fermare/avviare l'aeromobile. CTRL+clic visualizza la destinazione
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Caricamento / Scaricamento
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 885ac32c7f..0986c95840 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}並べ
STR_TOOLTIP_SORT_CRITERIA :{BLACK}並べ替えの基準を選択します
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}フィルタリングの基準を選択します
STR_BUTTON_SORT_BY :{BLACK}並べ替え
-STR_BUTTON_LOCATION :{BLACK}所在地に移動
STR_BUTTON_RENAME :{BLACK}名前を変更
STR_BUTTON_CATCHMENT :{BLACK}範囲
STR_TOOLTIP_CATCHMENT :{BLACK}範囲するエリアを表示します。
@@ -3624,10 +3623,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}機関
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}メイン画面を列車の場所に移動します。Ctrl+クリックで、そのまま列車を追跡します
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}メイン画面を車両の場所に移動します。Ctrl+クリックで、そのまま車両を追跡します
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}メイン画面を船舶の場所に移動します。Ctrl+クリックで、そのまま船舶を追跡します
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}メイン画面を航空機の場所に移動します。Ctrl+クリックで、そのまま航空機を追跡します
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}列車を列車庫へ回送します。Ctrl+クリックすると点検後、再出庫します
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}車両を車庫へ回送します。Ctrl+クリックすると点検後、再出庫します
@@ -3659,10 +3654,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}車両
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}船舶の情報を表示
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}航空機の情報を表示します
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}列車の現在の動作 - 運用開始/運用停止するにはここをクリックします。Ctrl+クリックで目的地に移動します
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}車両の現在の動作 - 運用開始/運用停止するにはここをクリックします。Ctrl+クリックで目的地に移動します
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}船舶の現在の動作 - 運用開始/運用停止するにはここをここへクリックします。Ctrl+クリックで目的地に移動します
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}航空機の現在の動作 - 運用開始/運用停止するにはここをクリックします。Ctrl+クリックで目的地に移動します
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}積み降ろし中
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 979450c90f..7760a3053d 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}정렬
STR_TOOLTIP_SORT_CRITERIA :{BLACK}정렬 기준을 선택하십시오.
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}검색 기준 선택
STR_BUTTON_SORT_BY :{BLACK}정렬
-STR_BUTTON_LOCATION :{BLACK}위치
STR_BUTTON_RENAME :{BLACK}이름 바꾸기
STR_BUTTON_CATCHMENT :{BLACK}역세권
STR_TOOLTIP_CATCHMENT :{BLACK}이 역의 역세권을 표시하거나 끕니다.
@@ -758,6 +757,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}거친 땅
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}잔디 땅
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}맨 땅
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}열대우림
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}들판
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}나무
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}바위
@@ -3304,6 +3304,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}표시
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}이 지역의 지형 정보
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}이 칸의 위치로 이동합니다. CTRL+클릭하면 이 칸의 위치를 기준으로 새로운 외부 화면을 엽니다
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}초기화 가격: {LTBLUE}없음
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}초기화 가격: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}제거시 들어오는 환불금: {LTBLUE}{CURRENCY_LONG}
@@ -3801,6 +3802,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}팻말
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}팻말 내용 고치기
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}이 팻말의 위치로 이동합니다. CTRL+클릭하면 이 팻말 위치를 기준으로 새로운 외부 화면을 엽니다
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}다음 팻말로 가기
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}이전 팻말로 가기
@@ -4111,7 +4113,7 @@ STR_CONFIG_DEPARTURE_MERGE_IDENTICAL_HELPTEXT :동일한 정
STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}이 경유지의 위치로 시점을 변경합니다. CTRL+클릭하면 이 경유지 위치를 기준으로 새로운 외부 화면을 엽니다
STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}이 경유지의 이름을 변경합니다
-STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}이 부표의 위치로 시점을 변경합니다. CTRL+클릭하면 이 부표 위치를 기준으로 새로운 외부 화면을 엽니다
+STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}이 부표의 위치로 이동합니다. CTRL+클릭하면 이 부표 위치를 기준으로 새로운 외부 화면을 엽니다
STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}부표 이름 바꾸기
STR_EDIT_WAYPOINT_NAME :{WHITE}경유지 이름 설정
@@ -4603,10 +4605,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}자동
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}이 열차가 있는 곳으로 이동합니다. CTRL+클릭하면 이 열차를 따라갑니다
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}이 차량이 있는 곳으로 이동합니다. CTRL+클릭하면 이 차량을 따라갑니다
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}이 선박이 있는 곳으로 이동합니다. CTRL+클릭하면 이 선박을 따라갑니다
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}이 항공기가 있는 곳으로 이동합니다. CTRL+클릭하면 이 항공기를 따라갑니다
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}이 열차의 위치로 화면을 이동합니다. 더블 클릭하면 이 열차를 따라 화면이 움직입니다. CTRL+클릭하면 이 열차 위치를 기준으로 외부 화면을 엽니다
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}이 차량의 위치로 화면을 이동합니다. 더블 클릭하면 이 차량을 따라 화면이 움직입니다. CTRL+클릭하면 이 차량 위치를 기준으로 외부 화면을 엽니다
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}이 선박의 위치로 화면을 이동합니다. 더블 클릭하면 이 선박을 따라 화면이 움직입니다. CTRL+클릭하면 이 선박 위치를 기준으로 외부 화면을 엽니다
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}이 항공기의 위치로 화면을 이동합니다. 더블 클릭하면 이 항공기를 따라 화면이 움직입니다. CTRL+클릭하면 이 항공기 위치를 기준으로 외부 화면을 엽니다
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}열차를 차량기지로 보냅니다. CTRL+클릭하면 정비를 하러 차량기지에 들르기만 합니다
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}차량을 차고지로 보냅니다. CTRL+클릭하면 정비를 하러 차고지에 들르기만 합니다
@@ -4641,10 +4643,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}차량
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}선박의 상세정보를 보여줍니다
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}항공기의 상세정보를 보여줍니다
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}현재 열차 행동 - 열차를 운행/정지시키려면 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}현재 차량 행동 - 운행/정지시키려면 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}현재 선박 행동 - 선박을 운행/중지시키려면 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}현재 항공기 행동 - 항공기를 운행/중지시키려면 여기를 클릭하세요. CTRL+클릭하면 목적지를 볼 수 있습니다.
+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_ORDER_LOCATION_TOOLTIP :{BLACK}이 경로의 위치로 화면을 이동합니다. CTRL+클릭하면 이 경로의 위치를 기준으로 외부 화면을 엽니다
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}싣는 중 / 내리는 중
@@ -5529,12 +5533,12 @@ STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR :{WHITE}... 격
STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT :{WHITE}차량기지 내에서 정지한 경우에만 개조할 수 있습니다
STR_ERROR_TRAIN_TOO_LONG :{WHITE}열차가 너무 깁니다!
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}차량을 유턴시킬 수 없습니다...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE :{WHITE}차량을 뒤집을 수 없습니다...
STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS :{WHITE}여러 대가 연결된 차량은 뒤집을 수 없습니다...
STR_ERROR_INCOMPATIBLE_RAIL_TYPES :알맞지 않은 철도 타입입니다
STR_ERROR_CAN_T_MOVE_VEHICLE :{WHITE}차량을 옮길 수 없습니다...
-STR_ERROR_REAR_ENGINE_FOLLOW_FRONT :{WHITE}뒷쪽 기관차는 앞쪽 기관차를 항상 따라다닐 것입니다
+STR_ERROR_REAR_ENGINE_FOLLOW_FRONT :{WHITE}뒷쪽 기관차는 앞쪽 기관차와 항상 붙어있어야 합니다
STR_ERROR_UNABLE_TO_FIND_ROUTE_TO :{WHITE}근처에 있는 차량기지로 가는 길을 찾을 수 없습니다
STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT :{WHITE}근처에 있는 차고지를 찾을 수 없습니다
diff --git a/src/lang/latin.txt b/src/lang/latin.txt
index 72f6e9b8b2..cde844e14b 100644
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -421,7 +421,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Eligere
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Eligere criteria separandi
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Eligere criteria colandi
STR_BUTTON_SORT_BY :{BLACK}Ordinare
-STR_BUTTON_LOCATION :{BLACK}Locus
STR_BUTTON_RENAME :{BLACK}Renominare
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Claudere fenestram
@@ -3824,10 +3823,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Facere u
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hoc tramen. Ctrl+Preme ut conspectus tramen sequatur
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hoc vehiculum. Ctrl+Preme ut conspectus vechiculum sequatur
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hanc navem. Ctrl+Preme ut conspectus navem sequatur
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Movere conspectum supra hoc aeroplanum. Ctrl+Preme ut conspectus aeroplanum sequatur
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mittere tramen ad receptaculum. Ctrl+Preme ut modo ministretur
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mittere vehiculum ad receptaculum. Ctrl+Preme ut modo ministretur
@@ -3859,10 +3854,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Monstrar
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Monstrare indicia navis
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Monstrare indicia aeroplani
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Actio traminis currens - preme ut tramen sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Actio vehiculi currens - preme ut vehiculum sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Actio navis currens - preme ut navis sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Actio aeroplani currens - preme ut aeroplanum sistatur/incohatur. Ctrl+Preme ut conspectus movetur ad destinatum
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Onerans / Exonerans
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index c92cb61f17..79278c6845 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -236,7 +236,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Izvēlē
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Izvēlēties kārtošanas pazīmes
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izvēlēties filtrēšanas pazīmes
STR_BUTTON_SORT_BY :{BLACK}Kārtot pēc
-STR_BUTTON_LOCATION :{BLACK}Atrašanās vieta
STR_BUTTON_RENAME :{BLACK}Pārdēvēt
STR_BUTTON_CATCHMENT :{BLACK}Pārklājums
STR_TOOLTIP_CATCHMENT :{BLACK}Pārslēgt pārklājuma laukuma rādīšanu
@@ -3764,10 +3763,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Automāt
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz vilcienu. Ctrl+klikšķis sekos vilcienam galvenajā skatā
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz transportlīdzekli. Ctrl+klikšķis sekos transportlīdzeklim galvenajā skatā
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz kuģi. Ctrl+klikšķis sekos kuģim galvenajā skatā
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrēt galveno skatu uz lidaparātu. Ctrl+klikšķis sekos lidaparātam galvenajā skatā
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sūtīt vilcienu uz depo. Ctrl+klikšķis - izvēlēties tikai apkopi
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sūtīt autotransporta līdzekli uz depo. Ctrl+klikšķis - izvēlēties tikai apkopi
@@ -3799,10 +3794,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Rādīt
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Rādīt kuģa informāciju
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Rādīt lidaparāta informāciju
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Vilciena pašreizējā darbība - klikšķināt šeit, lai apturētu/palaistu vilcienu. Ctrl+klikšķis, lai ritinātu līdz galamērķim
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Transportlīdzekļa pašreizējā darbība - klikšķināt šeit, lai to apturētu/palaistu. Ctrl+klikšķis, lai ritinātu līdz galamērķim
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Kuģa pašreizējā darbība - klikšķināt šeit, lai apturētu/palaistu kuģi. Ctrl+klikšķis, lai ritinātu līdz galamērķim
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Lidaparāta pašreizējā darbība - klikšķināt šeit, lai apturētu/palaistu lidaparātu. Ctrl+klikšķis, lai ritinātu līdz galamērķim
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Iekraušana / Izkraušana
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 411450c354..0220f55e74 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -427,7 +427,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Rikiavim
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Rikiavimo raktas
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filtravimo raktas
STR_BUTTON_SORT_BY :{BLACK}Rikiuoti pagal
-STR_BUTTON_LOCATION :{BLACK}Vieta
STR_BUTTON_RENAME :{BLACK}Pervadinti
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Užverti langą
@@ -3828,10 +3827,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Pakeitim
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centruoti traukinį pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su traukiniu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centruoti automobilį pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su automobiliu
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centruoti laivą pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su laivu
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centruoti lėktuvą pagrindiniame lange. Spragtelėjus laikant nuspaustą Ctrl klavišą, pagrindinio lango vaizdas slinksis kartu su lėktuvu
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Nukreipti traukinį į depą. Spragtelėjus laikant nuspaustą Ctrl klavišą, traukinys bus nukreiptas tik techninei apžiūrai
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Nukreipti automobilį į garažą. Spragtelėjus laikant nuspaustą Ctrl klavišą, automobilis bus nukreiptas tik techninei apžiūrai
@@ -3863,10 +3858,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Parodyti
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Parodyti išsamią laivo informaciją
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Parodyti išsamią lėktuvo informaciją
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Traukinio būsena. Spragtelkite, jei norite sustabdyti ar paleisti traukinį. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Automobilio būsena. Spragtelkite, jei norite sustabdyti ar paleisti automobilį. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Laivo būsena. Spragtelkite, jei norite sustabdyti ar paleisti laivą. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Lėktuvo būsena. Spragtelkite, jei norite sustabdyti ar paleisti lėktuvą. Spragtelėjus laikant nuspaustą Ctrl klavišą, vykdomos užduoties paskirties vieta bus centruota pagrindiniame lange
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Pakraunamas / iškraunamas
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index de573b3d04..69c9db7009 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Richtung
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Argument fir ze sortéieren
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Filterkritère wielen
STR_BUTTON_SORT_BY :{BLACK}Sortéier no
-STR_BUTTON_LOCATION :{BLACK}Plaz
STR_BUTTON_RENAME :{BLACK}Ëmbenennen
STR_BUTTON_CATCHMENT :{BLACK}Reechwäit
STR_TOOLTIP_CATCHMENT :{BLACK}Reechwäit uweisen un/ausschalten
@@ -3719,10 +3718,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Mécht d
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op den Zuch. Ctrl+Klick follegt dem Zuch an der Haaptusiicht
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op d'Gefier. Ctrl+Klick follegt dem Gefier an der Haaptusiicht
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op d'Schëff. Ctrl+Klick follegt dem Schëff an der Haaptusiicht
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Zentréiert d'Usiicht op de Fliger. Ctrl+Klick follegt dem Fliger an der Haaptusiicht
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Schéckt den Zuch an de Schapp. Ctrl+Klick fir nëmmen Revisioun
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Schéckt d'Gefier an den Depot. Ctrl+Klick fir nëmmen Revisioun
@@ -3754,10 +3749,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Weist St
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Weis Schëffsdetailer
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Weist d'Fligerdetailer
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - klick hei fir den Zuch ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - klick hei fir d'Gefier ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - Klick hei fir d'Schëff ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Momentan Aktioun - Klick hei fir de Fliger ze stoppen/starten. Ctrl+Klick fir op Destinatioun ze scrollen
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lueden / Entlueden
diff --git a/src/lang/malay.txt b/src/lang/malay.txt
index 2c988c5ecd..536a21bbf8 100644
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -225,7 +225,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Pilih be
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Pilih cara susunan
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Pilih cara penapisan
STR_BUTTON_SORT_BY :{BLACK}Menyusun mengikuti
-STR_BUTTON_LOCATION :{BLACK}Lokasi
STR_BUTTON_RENAME :{BLACK}Tukar Nama
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Tutup tetingkap
@@ -3230,10 +3229,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Membuat
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Pusatkan paparan utama kepada lokasi kereta api. Ctrl+Klik akan mengikuti keretapi di paparan utama
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Pusatkan paparan utama kepada lokasi kenderaan. Ctrl+Klik akan mengikuti kenderaan di paparan utama
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Pusatkan pemandangan utama ke lokasi kapal. Ctrl+Klik akan mengikuti kapal di paparan utama
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Pusatkan paparan utama di lokasi pesawat. Ctrl+Klik akan mengikuti pesawat di paparan utama
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Hantar keretapi ke depoh. Ctrl+Klik akan hanya selenggara
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Hantar kenderaan ke depoh. Ctrl+Klik untuk selenggara sahaja
@@ -3265,10 +3260,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Tunjukka
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Tunjukkan butiran kapal
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Tunjukkan butiran pesawat
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa keretapi - klik untuk menghentikan/menggerakkan keretapi. Ctrl+Klik untuk skrol ke destinasi
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa kenderaan - klik untuk menghentikan/menggerakkan kenderaan. Ctrl+Klik untuk skrol ke destinasi
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa kapal - klik untuk menghentikan/menggerakkan kapal. Ctrl+Klik untuk skrol ke destinasi
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Pergerakan semasa pesawat - klik untuk menghentikan/menggerakkan pesawat. Ctrl+Klik untuk skrol ke destinasi
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Punggah naik / Punggah turun
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 5279f4f76a..72b2d2d85b 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -196,6 +196,7 @@ STR_COLOUR_DEFAULT :Standard
STR_UNITS_VELOCITY_IMPERIAL :{COMMA}{NBSP}mi/t
STR_UNITS_VELOCITY_METRIC :{COMMA}{NBSP}km/t
STR_UNITS_VELOCITY_SI :{COMMA}{NBSP}m/s
+STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}ruter/dag
STR_UNITS_POWER_IMPERIAL :{COMMA}{NBSP}hk
STR_UNITS_POWER_METRIC :{COMMA}{NBSP}hk
@@ -235,7 +236,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Velg sor
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Velg sorteringskriterier
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Velg filtreringskriterier
STR_BUTTON_SORT_BY :{BLACK}Sorter etter
-STR_BUTTON_LOCATION :{BLACK}Gå til
STR_BUTTON_RENAME :{BLACK}Gi nytt navn
STR_BUTTON_CATCHMENT :{BLACK}Dekning
STR_TOOLTIP_CATCHMENT :{BLACK}Veksle mellom visning av dekningsområde
@@ -316,8 +316,15 @@ STR_SORT_BY_CARGO_CAPACITY :Lastekapasitet
STR_SORT_BY_RANGE :Rekkevidde
STR_SORT_BY_POPULATION :Folketall
STR_SORT_BY_RATING :Rangering
+STR_SORT_BY_NUM_VEHICLES :Antall kjøretøy
+STR_SORT_BY_TOTAL_PROFIT_LAST_YEAR :Total profitt i fjor
+STR_SORT_BY_TOTAL_PROFIT_THIS_YEAR :Total profitt i år
+STR_SORT_BY_AVERAGE_PROFIT_LAST_YEAR :Gjennomsnittlig profitt i fjor
+STR_SORT_BY_AVERAGE_PROFIT_THIS_YEAR :Gjennomsnittlig profitt i år
# Group by options for vehicle list
+STR_GROUP_BY_NONE :Ingen
+STR_GROUP_BY_SHARED_ORDERS :Delte ordre
# Tooltips for the main toolbar
STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Sett spillet på pause
@@ -743,6 +750,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Utmark
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Gress
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Bart land
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Regnskog
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Jorder
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Trær
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Steiner
@@ -774,6 +782,7 @@ STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Vis alle
STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Vis siste melding eller nyhetsrapport
STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - -
STR_STATUSBAR_PAUSED :{YELLOW}* * PAUSE * *
+STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * SPILL SATT PÅ PAUSE (venter på koblingsgraf oppdatering) * *
STR_STATUSBAR_AUTOSAVE :{RED}AUTOLAGRING
STR_STATUSBAR_SAVING_GAME :{RED}* * LAGRER SPILL * *
@@ -1315,6 +1324,7 @@ STR_CONFIG_SETTING_POPULATION_IN_LABEL :Vis byers innby
STR_CONFIG_SETTING_POPULATION_IN_LABEL_HELPTEXT :Vis inbyggertallet i byer i tittelfeltet på kartet
STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS :Graflinjenes tykkelse: {STRING}
STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS_HELPTEXT :Linjebredde i grafene. En tynn linje er mer presis å lese av, mens en tykkere linje er lettere å se, og farger er lettere å skille
+STR_CONFIG_SETTING_SHOW_NEWGRF_NAME :Vis NewGRF's navn i kjøretøysbyggevinduet: {STRING}
STR_CONFIG_SETTING_SHOW_NEWGRF_NAME_HELPTEXT :Legg til en linje i bygg kjøretøy vinduet, som viser hvilken NewGRF det valgte kjøretøyet kommer fra.
STR_CONFIG_SETTING_LANDSCAPE :Landskap: {STRING}
@@ -1444,6 +1454,8 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :La byggingsverk
STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Holde verktøylinjen for bruer, tunneler, osv åpnet etter bruk
STR_CONFIG_SETTING_EXPENSES_LAYOUT :Grupper utgifter i firmaets finansvindu: {STRING}
STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Definer oppsettet for vinduet som viser selskapets utgifter
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Automatisk fjerne signaler mens jernbane bygges: {STRING}
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Automatisk fjerne signaler mens jernbane bygges dersom signalene er i veien. Vær oppmerksom på at dette kan potensielt lede til togkrasj.
STR_CONFIG_SETTING_SOUND_TICKER :Nyhetstavle: {STRING}
STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Spille av lyd for oppsummerte nyhetsmeldinger
@@ -1557,8 +1569,14 @@ STR_CONFIG_SETTING_ENDING_YEAR :Poengsum ved sl
STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT :Året spillet slutter med tanke på poeng. På slutten av dette året, vil firmaets poengsum bli lagret og tavlen med høyeste poengsummer vil vises. Spilleren kan fortsette å spille etter dette.{}Hvis dette er før start året, vil tavlen med høyeste poengsummer aldri vises.
STR_CONFIG_SETTING_ENDING_YEAR_VALUE :{NUM}
STR_CONFIG_SETTING_ENDING_YEAR_ZERO :Aldri
+STR_CONFIG_SETTING_ECONOMY_TYPE :Økonomi type: {STRING}
+STR_CONFIG_SETTING_ECONOMY_TYPE_HELPTEXT :Jevn økonomi medfører at produksjonen endres oftere, og i mindre steg. Frossen økonomi stopper produksjon endringer og industri stenges. Denne innstillingen kan ha ingen effekt dersom industri typene er gitt av NewGRF.
+STR_CONFIG_SETTING_ECONOMY_TYPE_ORIGINAL :Original
+STR_CONFIG_SETTING_ECONOMY_TYPE_SMOOTH :Jevnt
+STR_CONFIG_SETTING_ECONOMY_TYPE_FROZEN :Frossen
STR_CONFIG_SETTING_ALLOW_SHARES :Tillat aksjekjøp i andre firmaer: {STRING}
STR_CONFIG_SETTING_ALLOW_SHARES_HELPTEXT :Når aktivert, tillates kjøp og salg av selskapers aksjer. Aksjer vil kun være tilgjengelig selskaper som når en viss alder
+STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES :Minimum alder på firmaet for å handle aksjer: {STRING}
STR_CONFIG_SETTING_MIN_YEARS_FOR_SHARES_HELPTEXT :Sett minimum levetid for et selskap, før andre kan kjøpe og selge aksjer fra dem.
STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE :Prosentandel av etappe-overskudd som skal betales i innmatingssystem: {STRING}
STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE_HELPTEXT :Andel av inntekten gitt til de mellomliggende etapper i et overføringssystem, noe som gir mer kontroll over inntektene
@@ -1607,6 +1625,10 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :Lineær
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Plassering av trær i spillet: {STRING}
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Kontroll tilfeldige utseender til tre under spillet. Dette kan påvirke industrier som avhenger av trevekst, for eksempel trelast
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Voks men ikke spre{RED}(ødelegger for sagbruk)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Voks, men kun i regnskoger
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Voks og spre overalt
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Ikke voks, men spre {RED}(ødelegger for sagbruk)
STR_CONFIG_SETTING_TOOLBAR_POS :Plassering av hovedverktøylinje: {STRING}
STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horisontal posisjon av hoved verktøylinjen på toppen av skjermen
@@ -1673,6 +1695,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Når en hastigh
STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Det britiske imperiets enhetssystem (mph)
STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Metrisk (km/t)
STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/s)
+STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Spill deler (ruter/dag)
STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Kjøretøys effektenheter: {STRING}
STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Når et kjøretøys effekt er vist i brukergrensesnittet, vise det i de valgte enheter
@@ -1805,6 +1828,7 @@ STR_INTRO_TRANSLATION :{BLACK}Denne ov
# Quit window
STR_QUIT_CAPTION :{WHITE}Avslutt
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er du sikker på at du vil avslutte OpenTTD?
STR_QUIT_YES :{BLACK}Ja
STR_QUIT_NO :{BLACK}Nei
@@ -1816,6 +1840,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}Er du s
# Cheat window
STR_CHEATS :{WHITE}Juksekoder
STR_CHEATS_TOOLTIP :{BLACK}Avkrysningsbokser indikerer om du har brukt denne juksekoden tidligere
+STR_CHEATS_NOTE :{BLACK}Notat: alle endringer i disse innstillingene vil bli lagret i det lagrede spillet
STR_CHEAT_MONEY :{LTBLUE}Øk pengebeholdningen med {CURRENCY_LONG}
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Spiller som firma: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Magisk bulldoser (fjern industrier, uflyttbare objekter): {ORANGE}{STRING}
@@ -1967,6 +1992,10 @@ STR_NETWORK_SERVER_LIST_JOIN_GAME :{BLACK}Bli med
STR_NETWORK_SERVER_LIST_REFRESH :{BLACK}Oppdater tjener
STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP :{BLACK}Oppdater tjenerinfo
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET :Søk på internett
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_INTERNET_TOOLTIP :{BLACK}Søk på internett for offentlige servere
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN :{BLACK}Søk LAN
+STR_NETWORK_SERVER_LIST_SEARCH_SERVER_LAN_TOOLTIP :{BLACK}Søk lokalt nettverk for servere
STR_NETWORK_SERVER_LIST_ADD_SERVER :{BLACK}Legg til tjener
STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP :{BLACK}Legger til en tjener til listen som alltid vil bli sjekket for aktive spill.
STR_NETWORK_SERVER_LIST_START_SERVER :{BLACK}Start tjener
@@ -2193,11 +2222,13 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :Spillet er fort
STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :Spillet er fortsatt på pause ({STRING}, {STRING})
STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3 :Spillet er fortsatt på pause ({STRING}, {STRING}, {STRING})
STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_4 :Spillet er fortsatt på pause ({STRING}, {STRING}, {STRING}, {STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_5 :Spillet er fortsatt på pause ({STRING}, {STRING}, {STRING}, {STRING}, {STRING})
STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED :Spillet fortsetter ({STRING})
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS :ikke nok spillere
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS :kobler til klienter
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL :manual
STR_NETWORK_SERVER_MESSAGE_GAME_REASON_GAME_SCRIPT :spillskript
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_LINK_GRAPH :venter for koblingsgraf oppdatering
############ End of leave-in-this-order
STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlater
STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har blitt med i spillet
@@ -2207,8 +2238,10 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} ha
STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} har startet et nytt firma (nr. {2:NUM})
STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} har forlatt spillet ({2:STRING})
STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} har forandret sitt navn til {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY :*** {STRING} ga {2:CURRENCY_LONG} til ditt firma{1:STRING}
STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Tjeneren avsluttet spillet
STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Tjeneren starter på nytt...{}Vennligst vent...
+STR_NETWORK_MESSAGE_KICKED :*** {STRING} ble kastet ut. Grunn: ({STRING})
# Content downloading window
STR_CONTENT_TITLE :{WHITE}Laster ned innhold
@@ -2325,6 +2358,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Slå sam
STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Bygg separat kontrollpunkt
# Generic toolbar
+STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Deaktivert da det ikke er noen kjøretøy tilgjengelig for denne infrastrukturen
# Rail construction toolbar
STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Bygg jernbane
@@ -2520,6 +2554,12 @@ STR_TREES_RANDOM_TYPE :{BLACK}Trær av
STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Plasser trær av tilfeldig type. Shift slår av/på kostnadsestimat
STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Tilfeldige trær
STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Plasser trær tilfeldig i landskapet
+STR_TREES_MODE_NORMAL_BUTTON :{BLACK}Normal
+STR_TREES_MODE_NORMAL_TOOLTIP :{BLACK}Plant ett og ett tre ved å dra over landskapet.
+STR_TREES_MODE_FOREST_SM_BUTTON :{BLACK}Vokse
+STR_TREES_MODE_FOREST_SM_TOOLTIP :{BLACK}Plant små skoger ved å dra over landskapet.
+STR_TREES_MODE_FOREST_LG_BUTTON :{BLACK}Skog
+STR_TREES_MODE_FOREST_LG_TOOLTIP :{BLACK}Plant store skoger ved å dra over landskapet.
# Land generation window (SE)
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Landskapsgenerering
@@ -2596,6 +2636,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Velg ind
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informasjon om landområde
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Sentrer hovedvinduet på lokasjon. Ctrl+Klikk åpner et nytt tilleggsvindu på lokasjonen
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Ryddingskostnad: {LTBLUE}Ikke tilgjengelig
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Ryddingskostnad: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Utbytte når ryddet: {LTBLUE}{CURRENCY_LONG}
@@ -3066,6 +3107,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Veksle m
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Skriv inn skilttekst
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på skiltets lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over skiltets lokalisasjon
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Gå til neste skilt
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Gå til forrige skilt
@@ -3149,10 +3191,10 @@ STR_GOALS_COMPANY_TITLE :{BLACK}Firmaets
STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}klikk på mål for å gå til industri/by/rute . Ctrl+klikk åpner et nytt tilleggsvindu over industriens/byens/rutens beliggenhet
# Goal question window
-STR_GOAL_QUESTION_CAPTION_QUESTION :Spørsmål
-STR_GOAL_QUESTION_CAPTION_INFORMATION :Informasjon
-STR_GOAL_QUESTION_CAPTION_WARNING :Advarsel
-STR_GOAL_QUESTION_CAPTION_ERROR :Feil
+STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Spørsmål
+STR_GOAL_QUESTION_CAPTION_INFORMATION :{BLACK}Informasjon
+STR_GOAL_QUESTION_CAPTION_WARNING :{BLACK}Advarsel
+STR_GOAL_QUESTION_CAPTION_ERROR :{YELLOW}Feil
############ Start of Goal Question button list
STR_GOAL_QUESTION_BUTTON_CANCEL :Avbryt
@@ -3277,7 +3319,7 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}Hindre f
STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT}
STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Gå til kontrollpunkt. Ctrl+klikk åpner et nytt tilleggsvindu over kontrollpunktet
STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Endre kontrollpunktets navn
-STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Gå til bøye. Ctrl+klikk åpner et nytt tilleggsvindu over bøyen
+STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på bøyens lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over bøyens lokalisasjon
STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Endre navn på bøye
STR_EDIT_WAYPOINT_NAME :{WHITE}Endre navn på kontrollpunkt
@@ -3343,6 +3385,7 @@ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Gjenoppb
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detaljer
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Vis detaljert infrastrukturtelling
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Gi penger
+STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Gi penger til dette firmaet
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nytt ansikt
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Velg nytt ansikt på sjefen
@@ -3360,7 +3403,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Selg 25{
STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Firmanavn
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Sjefens navn
-STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Skriv inn hvor mye penger du ønsker å gi
+STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Skriv inn hvor mye penger du vil gi
STR_BUY_COMPANY_MESSAGE :{WHITE}Vi ser etter et transportfirma som er villig til å overta oss.{}{}Vil du kjøpe {COMPANY} for {CURRENCY_LONG}?
@@ -3628,10 +3671,10 @@ STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Dette vi
STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Dette vil skape en kopi av et skip. Klikk denne knappen og deretter på et skip utenfor eller inni skipsdokken. Ctrl+klikk vil dele ordrene. Shift+klikk viser estimert kostnad
STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Dette vil skape en kopi av et luftfartøy. Klikk denne knappen og deretter på et luftfartøy utenfor eller inni hangaren. Ctrl+klikk vil dele ordrene. Shift+klikk viser estimert kostnad
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Gå til togstall. Ctrl+klikk åpner et nytt tilleggsvindu over togstallen
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Gå til garasje. Ctrl+klikk åpner et nytt tilleggsvindu over garasjen
-STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Gå til skipsdokk. Ctrl+klikk åpner et nytt tilleggsvindu over skipsdokken
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Gå til hangar. Ctrl+klikk åpner et nytt tilleggsvindu over hangaren
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på togstallens lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over togstallens lokalisasjon
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på vegkjøretøyets garasje lokalisasjon. Dobbelklikk for å følge kjøretøyet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over vegkjøretøyets garasje lokalisasjon
+STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på skipsdokken lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over skipsdokkens lokalisasjon
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på hangar lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over hangarens lokalisasjon
STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Få en liste over alle tog med denne togstallen i sine ordre
STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Få en liste over alle kjøretøy med denne garasjen i sine ordre
@@ -3721,10 +3764,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}La autoe
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Gå til tog. Ctrl+klikk vil følge toget i hovedvinduet
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Gå til kjøretøy. Ctrl+klikk vil følge kjøretøyet i hovedvinduet
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Gå til skip. Ctrl+klikk vil følge skipet i hovedvinduet
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Gå til luftfartøy. Ctrl+klikk vil følge luftfartøyet i hovedvinduet
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på togets lokalisasjon. Dobbelklikk for å følge toget i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over togets lokalisasjon
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på kjøretøyets lokalisasjon. Dobbelklikk for å følge kjøretøyet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over kjøretøyets lokalisasjon
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på skipets lokalisasjon. Dobbelklikk for å følge skipet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over skipets lokalisasjon
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Midtjuster hovedvinduet på flyets lokalisasjon. Dobbelklikk for å følge flyet i hovedvinduet. Ctrl+Klikk åpner et nytt tilleggsvindu over flyets lokalisasjon
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send toget til en togstall. Ctrl+klikk for kun å utføre vedlikehold
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send kjøretøyet til en garasje. Ctrl+klikk for kun å utføre vedlikehold
@@ -3756,10 +3799,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Vis deta
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om skipet
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Vis detaljer om luftfartøyet
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende togstatus - klikk her for å stoppe/starte toget. Ctrl+klikk ruller til destinasjonen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende kjøretøystatus - klikk her for å stoppe/starte kjøretøyet. Ctrl+klikk ruller til destinasjonen
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende skipsstatus - klikk her for å stoppe/starte skipet. Ctrl+klikk ruller til destinasjonen
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende luftfartøystatus - klikk her for å stoppe/starte luftfartøyet. Ctrl+klikk ruller til destinasjonen
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Valgt tog handling - klikk for å stoppe/starte toget
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Valgt kjøretøy handling - klikk for å stoppe/starte kjøretøyet
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Valgt skip handling - klikk for å stoppe/starte skip
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Valgt luftfartøy komando - klikk for å stoppe/starte luftfartøyet
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Midtjuster hovedvinduet på ordrens lokalisasjon. Ctrl+Klikk åpner et nytt tilleggsvindu over ordrens lokalisasjon
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laster / Losser
@@ -3987,6 +4032,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Bygg om til {S
STR_ORDER_STOP_ORDER :(Stopp)
STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(Kan ikke bruke stasjon){POP_COLOUR} {STRING} {STATION} {STRING}
STR_ORDER_IMPLICIT :(Ubetinget)
@@ -4232,6 +4278,7 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Spillet er lagr
STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Kan ikke lese filen
STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Kan ikke skrive til filen
STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED :Integritetssjekk av data mislyktes
+STR_GAME_SAVELOAD_ERROR_PATCHPACK :Lagret spill er laget med en modifisert versjon
STR_GAME_SAVELOAD_NOT_AVAILABLE :
STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Spillet ble lagret i en versjon uten støtte for trikk. Alle trikker har blitt fjernet.
@@ -4312,6 +4359,7 @@ STR_ERROR_LOAN_ALREADY_REPAYED :{WHITE}... inge
STR_ERROR_CURRENCY_REQUIRED :{WHITE}... du trenger {CURRENCY_LONG}
STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}Kan ikke betale tilbake lån...
STR_ERROR_INSUFFICIENT_FUNDS :{WHITE}Kan ikke gi bort penger som er lånt fra banken...
+STR_ERROR_CAN_T_GIVE_MONEY :{WHITE}Kan ikke gi bort penger til dette firmaet...
STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}Kan ikke kjøpe firma...
STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Kan ikke bygge firmaets hovedkontor...
STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Kan ikke kjøpe 25{NBSP}% av aksjene...
@@ -4438,6 +4486,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Feil type garas
STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} er for langt etter utskiftning
STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Ingen autoerstatt/fornyelseregler satt.
STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(pengegrense)
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}Nytt kjøretøy kan ikke frakte {STRING}
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}Nytt kjøretøy kan ikke bygges på nytt {NUM}
# Rail construction errors
STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Umulig sporkombinasjon
@@ -4724,10 +4774,10 @@ STR_INDUSTRY_NAME_SUGAR_MINE :{G=feminine}Suk
##id 0x6000
STR_SV_EMPTY :
STR_SV_UNNAMED :Uten navn
-STR_SV_TRAIN_NAME :Tog {COMMA}
-STR_SV_ROAD_VEHICLE_NAME :Kjøretøy {COMMA}
-STR_SV_SHIP_NAME :Skip {COMMA}
-STR_SV_AIRCRAFT_NAME :Luftfartøy {COMMA}
+STR_SV_TRAIN_NAME :Tog #{COMMA}
+STR_SV_ROAD_VEHICLE_NAME :Vegkjøretøy #{COMMA}
+STR_SV_SHIP_NAME :Skip #{COMMA}
+STR_SV_AIRCRAFT_NAME :Luftfartøy #{COMMA}
STR_SV_STNAME :{STRING}
STR_SV_STNAME_NORTH :{STRING} nord
@@ -5029,6 +5079,7 @@ STR_FORMAT_BUOY_NAME :{TOWN} Bøye
STR_FORMAT_BUOY_NAME_SERIAL :{TOWN} Bøye #{COMMA}
STR_FORMAT_COMPANY_NUM :(Firma {COMMA})
STR_FORMAT_GROUP_NAME :Gruppe {COMMA}
+STR_FORMAT_GROUP_VEHICLE_NAME :{GROUP} #{COMMA}
STR_FORMAT_INDUSTRY_NAME :{TOWN} {STRING}
STR_FORMAT_WAYPOINT_NAME :{TOWN} Kontrollpunkt
STR_FORMAT_WAYPOINT_NAME_SERIAL :{TOWN} Kontrollpunkt # {COMMA}
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index ddf3e328cb..04534c3e51 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Vel sort
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Vel sorteringskriterium
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vel filtreringskriterium
STR_BUTTON_SORT_BY :{BLACK}Sorter etter
-STR_BUTTON_LOCATION :{BLACK}Stad
STR_BUTTON_RENAME :{BLACK}Gje nytt namn
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Lukk vindauge
@@ -3455,10 +3454,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Lat den
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Syne toget sin gjeldande posisjon. CTRL+klikk vil følgja toget i hovudvindauget
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Syne køyretøyet sin gjeldande posisjon. CTRL+klikk vil følgja køyretøyet i hovudvindauget
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Syne skipet sin gjeldande posisjon. CTRL+klikk vil følgja skipet i hovudvindauget
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Syne luftfartøyet sin gjeldande posisjon. CTRL+klikk vil følgja luftfartøyet i hovudvindauget
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send toget til togstallen. CTRL+klikk for å berre utføre vedlikehald
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Send køyretøyet til garasjen. CTRL+klikk for å berre sende til vedlikehald
@@ -3490,10 +3485,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Syne kø
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Syne skipsdetaljar
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Syne detaljar om luftfartøy
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldande togstatus - klikk her for å stoppe/starte tog. CTRL+klikk ruller til destinasjonen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldande køyretøystatus - klikk her for å stoppa/starta køyretøy. CTRL+klikk ruller til destinasjonen
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldende skipsstatus - klikk her for å stoppe/starte skip. CTRL+klikk ruller til destinasjonen
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gjeldande luftfartøystatus - klikk her for å stoppe/starte luftfartøy. CTRL+klikk ruller til destinasjonen
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lastar / Lossar
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 2d5bd14b53..f6a3a7c9ac 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -613,7 +613,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Wybierz
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Wybierz kryterium sortowania
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Wybierz kryteria filtrowania
STR_BUTTON_SORT_BY :{BLACK}Sortuj wg
-STR_BUTTON_LOCATION :{BLACK}Położenie
STR_BUTTON_RENAME :{BLACK}Zmień nazwę
STR_BUTTON_CATCHMENT :{BLACK}Zasięg
STR_TOOLTIP_CATCHMENT :{BLACK}Przełącz wyświetlanie zasięgu
@@ -1129,6 +1128,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Wyboisty teren
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Trawa
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Odsłonięta ziemia
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Las deszczowy
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Pola
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Drzewa
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Skały
@@ -1385,7 +1385,7 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :inna
STR_GAME_OPTIONS_GUI_ZOOM_FRAME :{BLACK}Rozmiar interfejsu
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_TOOLTIP :{BLACK}Wybierz rozmiar elementów interfejsu
-STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Normalne
+STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL :Normalny
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM :Podwójny
STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM :Poczwórny
@@ -1448,7 +1448,7 @@ STR_NUM_VERY_LOW :Bardzo mało
STR_NUM_LOW :Mało
STR_NUM_NORMAL :Średnio
STR_NUM_HIGH :Dużo
-STR_NUM_CUSTOM :Własne
+STR_NUM_CUSTOM :Własna
STR_NUM_CUSTOM_NUMBER :Własna ({NUM})
STR_VARIETY_NONE :Brak
@@ -2194,7 +2194,7 @@ STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE :{BLACK}Wybierz
STR_INTRO_TOOLTIP_GAME_OPTIONS :{BLACK}Wyświetl opcje gry
STR_INTRO_TOOLTIP_HIGHSCORE :{BLACK}Wyświetl tabelę wyników
-STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Ustawienia wyświetlania
+STR_INTRO_TOOLTIP_CONFIG_SETTINGS_TREE :{BLACK}Wyświetl ustawienia gry
STR_INTRO_TOOLTIP_NEWGRF_SETTINGS :{BLACK}Wyświetl ustawienia NewGRF
STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Poszukaj nowych lub zaktualizowanych dodatków do pobrania
STR_INTRO_TOOLTIP_SCRIPT_SETTINGS :{BLACK}Pokaż ustawienia SI / Game Script
@@ -3012,6 +3012,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Wybierz
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informacja o terenie
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji kawałka terenu. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Koszt czyszczenia: {LTBLUE}N/D
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Koszt czyszczenia: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Zysk gdy czyszczone: {LTBLUE}{CURRENCY_LONG}
@@ -3338,12 +3339,12 @@ STR_NEWGRF_SETTINGS_VERSION :{BLACK}Wersja:
STR_NEWGRF_SETTINGS_MIN_VERSION :{BLACK}Kompatybilność z wersją min.: {SILVER}{NUM}
STR_NEWGRF_SETTINGS_MD5SUM :{BLACK}Suma MD5: {SILVER}{STRING}
STR_NEWGRF_SETTINGS_PALETTE :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_SETTINGS_PALETTE_DEFAULT :Domyslny (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT :Domyślna (D)
STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP :Domyślna (D) / 32 bpp
STR_NEWGRF_SETTINGS_PALETTE_LEGACY :Dawna (W)
STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP :Dawna (W) / 32 bpp
STR_NEWGRF_SETTINGS_PARAMETER :{BLACK}Parametry: {SILVER}{STRING}
-STR_NEWGRF_SETTINGS_PARAMETER_NONE :Żadne
+STR_NEWGRF_SETTINGS_PARAMETER_NONE :Brak
STR_NEWGRF_SETTINGS_NO_INFO :{BLACK}Brak dostępnych informacji
STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Nie znaleziono pasującego pliku
@@ -3482,6 +3483,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Przełą
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Edycja tekstu napisu
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Wyśrodkuj główny widok na pozycji napisu. Ctrl+Klik otwiera nowy podgląd wyśrodkowany na niej
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Idź do następnego napisu
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Idź do poprzedniego napisu
@@ -4144,10 +4146,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Autowymi
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centruj główny widok na pozycji pociągu. Ctrl+klik by podążać za pociągiem w głównym oknie
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centruj główne okno na pozycji pojazdu. Ctrl+klik by podążać za pojazdem w głównym oknie
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centruj główny widok na pozycji statku. Ctrl+klik by podążać za statkiem w głównym oknie
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centruj główny widok na pozycji samolotu. Ctrl+klik by podążać za samolotem w głównym oknie
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji pociągu. Podwójne kliknięcie włączy podążanie za pociągiem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji pojazdu. Podwójne kliknięcie włączy podążanie za pojazdem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji statku. Podwójne kliknięcie włączy podążanie za statkiem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Wyśrodkuj główny widok na lokalizacji samolotu. Podwójne kliknięcie włączy podążanie za samolotem. Ctrl+Klik otworzy nowy podgląd na jego lokalizacji
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Wyślij pociąg do warsztatów. Ctrl - tylko serwis
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Wyślij pojazd do zajezdni. Ctrl - tylko serwis
@@ -4179,10 +4181,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż s
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż szczegóły statku
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Pokaż szczegóły samolotu
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan pociągu - kliknij aby zatrzymać/ruszyć pociąg. Ctrl+klik by przejść do punktu docelowego
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan pojazdu - kliknij aby zatrzymać/ruszyć pojazd. Ctrl+klik by przejść do punktu docelowego
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan statku - kliknij aby zatrzymać/ruszyć statek. Ctrl+klik by przejść do punktu docelowego
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Obecny stan samolotu - kliknij aby zatrzymać/ruszyć samolot. Ctrl+klik by przejść do punktu docelowego
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Obecny stan pociągu - kliknij, aby zatrzymać/ruszyć pociąg
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Obecny stan pojazdu - kliknij, aby zatrzymać/ruszyć pojazd
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Obecny stan statku - kliknij, aby zatrzymać/ruszyć statek
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Obecny stan samolotu - kliknij aby zatrzymać/ruszyć samolot
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Wyśrodkuj główny widok na celu polecenia. Ctrl+Klik otwiera nowy podgląd na celu
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Załadunek / Wyładunek
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 0b32c86faa..b1d1dd9f8b 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Seleccione critério de ordenação
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Seleccione o critério de filtragem/procura
STR_BUTTON_SORT_BY :{BLACK}Ordenar por
-STR_BUTTON_LOCATION :{BLACK}Localização
STR_BUTTON_RENAME :{BLACK}Renomear
STR_BUTTON_CATCHMENT :{BLACK}Cobertura
@@ -3692,10 +3691,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Forçar
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização do comboio. Ctrl+Clique segue o comboio na visualização
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização do veículo. Ctrl+Clique segue o veículo na visualização
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização do navio. Ctrl+Clique segue o navio na visualização
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar visualização na localização da aeronave. Ctrl+Clique segue a aeronave na visualização
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mandar comboio para o depósito
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Mandar veículo para o depósito
@@ -3727,10 +3722,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalhes do navio
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalhes da aeronave
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual do comboio - clique aqui para iniciar/parar comboio. Ctrl+Clique para deslocar-se ao destino
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual do veículo - clique aqui para iniciar/parar veículo. Ctrl+Clique para deslocar-se ao destino
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa atual do navio - clique aqui para iniciar/parar navio. Ctrl+Clique para deslocar-se ao destino
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Tarefa actual da aeronave - clique aqui para iniciar/parar a aeronave. Ctrl+Clique para deslocar-se ao destino
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}A carregar / descarregar
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index e3ee64aef3..fae04b6130 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -232,7 +232,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Alegeți
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Alegeți criteriul de sortare
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Alegeți criteriul de filtrare
STR_BUTTON_SORT_BY :{BLACK}Ordonează
-STR_BUTTON_LOCATION :{BLACK}Locație
STR_BUTTON_RENAME :{BLACK}Nume nou
STR_BUTTON_CATCHMENT :Arie de acoperire
@@ -3545,10 +3544,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Fă opti
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a trenului. Ctrl-click va urmări trenul
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a autovehiculului. Ctrl-click va urmări autovehiculul
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a navei. Ctrl-click va urmări nava
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrează imaginea pe locaţia curentă a aeronavei. Ctrl-click va urmări aeronava
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Trimite trenul într-un depou
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Trimite autovehiculul la autobază. Ctrl+clic pentru service
@@ -3580,10 +3575,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Afişeaz
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Afişează detaliile navei
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Afişează detaliile aeronavei
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a trenului - clic aici pentru a opri/porni trenul. Ctrl+Click pentru a vedea destinaţia
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a autovehiculului - clic aici pentru a opri/porni autovehiculul. Ctrl+Click pentru a vedea destinatia
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a navei - clic aici pentru a opri/porni nava. Ctrl+Click pentru a vedea destinaţia
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Comanda curentă a aeronavei - clic aici pentru a opri/porni aeronava
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Încărcare / Descărcare
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index 8319f93ead..841c6c2b5f 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -360,7 +360,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Смен
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Смена критерия сортировки
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Выберите фильтр
STR_BUTTON_SORT_BY :{BLACK}Сортировка
-STR_BUTTON_LOCATION :{BLACK}Обзор
STR_BUTTON_RENAME :{BLACK}Переименовать
STR_BUTTON_CATCHMENT :{BLACK}Охват
STR_TOOLTIP_CATCHMENT :{BLACK}Переключить подсветку участков, находящихся в зонах обслуживания станциями игрока, а также не попадающих в эти зоны.
@@ -385,7 +384,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT :{BLACK}Пока
STR_SHOW_HIDDEN_ENGINES_VEHICLE_TRAIN_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели локомотивов и вагонов также будут показаны
STR_SHOW_HIDDEN_ENGINES_VEHICLE_ROAD_VEHICLE_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели автомобилей также будут показаны
-STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели кораблей также будут показаны
+STR_SHOW_HIDDEN_ENGINES_VEHICLE_SHIP_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели судов также будут показаны
STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Если эта кнопка нажата, скрытые модели воздушных судов также будут показаны
# Query window
@@ -470,7 +469,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Пока
STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Список существующих предприятий; создание новых
STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Список поездов. Ctrl+щелчок переключает отображение по группам.
STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Список автотранспорта. Ctrl+щелчок переключает отображение по группам.
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Список кораблей. Ctrl+щелчок переключает отображение по группам.
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Список судов. Ctrl+щелчок переключает отображение по группам.
STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT :{BLACK}Список авиатранспорта. Ctrl+щелчок переключает отображение по группам.
STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN :{BLACK}Приблизить
STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT :{BLACK}Отдалить
@@ -489,8 +488,8 @@ STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Пере
STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO :{BLACK}Сохранение/загрузка сценария, выход из редактора, выход
STR_SCENEDIT_TOOLBAR_OPENTTD :{YELLOW}OpenTTD
STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR :{YELLOW}Редактор сценариев
-STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD :{BLACK}Уменьшить год начала игры на 1
-STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD :{BLACK}Увеличить год начала игры на 1
+STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD :{BLACK}Начать игру на 1 год раньше
+STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD :{BLACK}Начать игру на 1 год позже
STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE :{BLACK}Нажмите, чтобы изменить год начала игры
STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY :{BLACK}Показать карту; список городов
STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION :{BLACK}Создание ландшафта
@@ -895,6 +894,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Бездорожье
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Трава
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Пустырь
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Джунгли
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Поля
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Деревья
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Камни
@@ -943,7 +943,7 @@ STR_NEWS_FIRST_BUS_ARRIVAL :{BIG_FONT}{BLAC
STR_NEWS_FIRST_TRUCK_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый грузовик прибыл на терминал {STATION}!
STR_NEWS_FIRST_PASSENGER_TRAM_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый трамвай прибыл на {STATION}!
STR_NEWS_FIRST_CARGO_TRAM_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый грузовой трамвай прибыл на {STATION}!
-STR_NEWS_FIRST_SHIP_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый корабль причалил к {STATION}!
+STR_NEWS_FIRST_SHIP_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первое судно причалило к {STATION}!
STR_NEWS_FIRST_AIRCRAFT_ARRIVAL :{BIG_FONT}{BLACK}Жители празднуют!{}Первый самолёт прибыл в {STATION}!
STR_NEWS_TRAIN_CRASH :{BIG_FONT}{BLACK}Столкновение поездов!{}{COMMA} человек{P "" а ""} погиб{P "" ло ло} в результате крушения!
@@ -981,7 +981,7 @@ STR_NEWS_INDUSTRY_CLOSURE_GENERAL :{BIG_FONT}{BLAC
STR_NEWS_INDUSTRY_CLOSURE_SUPPLY_PROBLEMS :{BIG_FONT}{BLACK}{STRING} закрывается из-за проблем с поставками сырья!
STR_NEWS_INDUSTRY_CLOSURE_LACK_OF_TREES :{BIG_FONT}{BLACK}«{STRING}» объявляет о закрытии в связи с полной вырубкой близлежащих лесов!
-STR_NEWS_EURO_INTRODUCTION :{BIG_FONT}{BLACK}Создана зона евро!{}{}Теперь в вашей стране в качестве единой валюты используется евро!
+STR_NEWS_EURO_INTRODUCTION :{BIG_FONT}{BLACK}Создан европейский валютный союз!{}{}Теперь в вашей стране в качестве единой валюты используется евро!
STR_NEWS_BEGIN_OF_RECESSION :{BIG_FONT}{BLACK}Мировой спад{}{}Финансовые эксперты дают ужасные прогнозы в связи с кризисом экономики!
STR_NEWS_END_OF_RECESSION :{BIG_FONT}{BLACK}Спад закончился!{}{}Увеличение объёмов торговли внушает уверенность владельцам предприятий. Экономика укрепляет свои позиции.
@@ -1604,6 +1604,8 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Инструм
STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Инструменты строительства мостов, туннелей и{NBSP}т.{NBSP}п. не отключаются самостоятельно после использования
STR_CONFIG_SETTING_EXPENSES_LAYOUT :Группировать расходы в окне финансов компании: {STRING}
STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Разделять доходы и расходы в окне финансовой информации компании
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Убирать мешающие ж/д сигналы при строительстве: {STRING}
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Автоматически убирать сигналы, мешающие постройке новых рельсовых путей. Это может привести к столкновению поездов.
STR_CONFIG_SETTING_SOUND_TICKER :Бегущая строка: {STRING}
STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Воспроизводить звук при появлении бегущей строки с новостями
@@ -1630,17 +1632,17 @@ STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Максима
STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT :Максимальное количество автомобилей, которое может иметь транспортная компания
STR_CONFIG_SETTING_MAX_AIRCRAFT :Максимальное количество авиатранспорта на игрока: {STRING}
STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT :Максимальное количество воздушных судов, которое может иметь транспортная компания
-STR_CONFIG_SETTING_MAX_SHIPS :Максимальное количество кораблей на игрока: {STRING}
-STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Максимальное количество кораблей, которое может иметь транспортная компания
+STR_CONFIG_SETTING_MAX_SHIPS :Максимальное количество судов на игрока: {STRING}
+STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT :Максимальное количество судов, которое может иметь транспортная компания
-STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Не допускать постройки поездов компьютером: {STRING}
-STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT :Запрет строительства поездов для игроков, управляемых компьютером
-STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :Не допускать постройки автомобилей компьютером: {STRING}
-STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT :Запрет строительства автомобилей для игроков, управляемых компьютером
-STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :Не допускать постройки авиатранспорта компьютером: {STRING}
-STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT :Запрет строительства воздушных судов для игроков, управляемых компьютером
-STR_CONFIG_SETTING_AI_BUILDS_SHIPS :Не допускать постройки кораблей компьютером: {STRING}
-STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT :Запрет строительства кораблей для игроков, управляемых компьютером
+STR_CONFIG_SETTING_AI_BUILDS_TRAINS :Запретить покупку поездов компьютером: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_TRAINS_HELPTEXT :Запрет покупки железнодорожного транспорта для компаний, управляемых компьютером
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :Запретить покупку автомобилей компьютером: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES_HELPTEXT :Запрет покупки автотранспорта для компаний, управляемых компьютером
+STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :Запретить покупку авиатранспорта компьютером: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT_HELPTEXT :Запрет покупки воздушного транспорта для компаний, управляемых компьютером
+STR_CONFIG_SETTING_AI_BUILDS_SHIPS :Запретить покупку судов компьютером: {STRING}
+STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT :Запрет покупки водного транспорта для компаний, управляемых компьютером
STR_CONFIG_SETTING_AI_PROFILE :Исходный профиль настроек: {STRING}
STR_CONFIG_SETTING_AI_PROFILE_HELPTEXT :Выберите, какой профиль настроек использовать случайному ИИ или для начальных значений при добавлении нового ИИ или сценария игры
@@ -1666,7 +1668,7 @@ STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES :Интерва
STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_HELPTEXT :Настройка периодичности тех. обслуживания для новых автомобилей
STR_CONFIG_SETTING_SERVINT_AIRCRAFT :Интервал обслуживания по умолчанию для авиатранспорта: {STRING}
STR_CONFIG_SETTING_SERVINT_AIRCRAFT_HELPTEXT :Настройка периодичности тех. обслуживания для новых воздушных судов
-STR_CONFIG_SETTING_SERVINT_SHIPS :Интервал обслуживания по умолчанию для кораблей: {STRING}
+STR_CONFIG_SETTING_SERVINT_SHIPS :Интервал обслуживания по умолчанию для судов: {STRING}
STR_CONFIG_SETTING_SERVINT_SHIPS_HELPTEXT :Настройка периодичности тех. обслуживания для новых судов
STR_CONFIG_SETTING_NOSERVICE :Не обслуживать транспорт, если отключены поломки: {STRING}
STR_CONFIG_SETTING_NOSERVICE_HELPTEXT :Отключение технического обслуживания транспортных средств, если отключены поломки. (Если транспорт не заходит в депо, автозамена не работает).
@@ -1773,12 +1775,12 @@ STR_CONFIG_SETTING_TOWN_CARGOGENMODE_HELPTEXT :Зависим
STR_CONFIG_SETTING_TOWN_CARGOGENMODE_ORIGINAL :квадратичная зависимость (оригинальная)
STR_CONFIG_SETTING_TOWN_CARGOGENMODE_BITCOUNT :линейная зависимость
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Размножение деревьев в игре: {STRING}
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Настройка возможности самостоятельного размножения деревьев в игре. Это может влиять на работоспособность некоторых предприятий, например, лесопилок.
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT :Рост деревьев в игре: {STRING}
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_HELPTEXT :Настройка роста и произвольного появления новых деревьев со временем. Это может влиять на работоспособность некоторых предприятий, например, лесопилок.
STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_SPREAD :Растут, но не распространяются {RED}(ломается лесопилка)
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :Растут, но распространяются только в тропических лесах
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :Растут и распространяются везде
-STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :Не растут, не распространяются {RED} (ломается лесопилка)
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_RAINFOREST :существующие растут, новые - только в тропических лесах
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_SPREAD_ALL :растут старые и появляются новые
+STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_NO_GROWTH_NO_SPREAD :нет {RED}(ломается лесопилка)
STR_CONFIG_SETTING_TOOLBAR_POS :Положение главной панели инструментов: {STRING}
STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Горизонтальное расположение основной панели инструментов в верхней части экрана
@@ -1908,8 +1910,8 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Алгорит
STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Алгоритм поиска пути, используемый поездами
STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :Алгоритм поиска пути для автотранспорта: {STRING}
STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_HELPTEXT :Алгоритм поиска пути, используемый автомобилями
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :Алгоритм поиска пути для кораблей: {STRING}
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT :Алгоритм поиска пути, используемый кораблями
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS :Алгоритм поиска пути для судов: {STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT :Алгоритм поиска пути, используемый водным транспортом
STR_CONFIG_SETTING_REVERSE_AT_SIGNALS :Автоматический разворот у сигналов: {STRING}
STR_CONFIG_SETTING_REVERSE_AT_SIGNALS_HELPTEXT :Разрешить поездам разворачиваться у светофора, если они долго ждут разрешающего сигнала
@@ -1990,6 +1992,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}Вы у
# Cheat window
STR_CHEATS :{WHITE}Читы
STR_CHEATS_TOOLTIP :{BLACK}Галочки показывают, использовали ли Вы этот чит раньше
+STR_CHEATS_NOTE :{BLACK}Внимание! Их использование записывается при сохранении игры!
STR_CHEAT_MONEY :{LTBLUE}Добавить {CURRENCY_LONG}
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Игра за компанию: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Волшебный динамит (снос ВСЕГО): {ORANGE}{STRING}
@@ -2386,6 +2389,7 @@ STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE :*** {STRING} п
STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW :*** {STRING} основал новую компанию (#{2:NUM})
STR_NETWORK_MESSAGE_CLIENT_LEFT :*** {STRING} покинул игру ({2:STRING})
STR_NETWORK_MESSAGE_NAME_CHANGE :*** {STRING} изменил имя на {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY :*** Компания «{STRING}» передала «{STRING}» {CURRENCY_LONG}
STR_NETWORK_MESSAGE_SERVER_SHUTDOWN :{WHITE}Сервер закрыл сессию
STR_NETWORK_MESSAGE_SERVER_REBOOT :{WHITE}Сервер перезапускается...{}Пожалуйста, подождите...
STR_NETWORK_MESSAGE_KICKED :*** {STRING} был исключён из игры. Причина: ({STRING})
@@ -2521,6 +2525,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Объе
STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Поставить отдельную точку пути
# Generic toolbar
+STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Отключено, так как нет подходящих транспортных средств для этой инфраструктуры
# Rail construction toolbar
STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Неэлектрифицированная ж/д
@@ -2537,7 +2542,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Уста
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Строительство ж/д мостов. При нажатом Shift - оценка стоимости строительства.
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Строительство ж/д туннелей. При нажатом Shift - оценка стоимости строительства.
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Переключение между строительством и удалением ж/д путей, сигналов, станций. При нажатом Ctrl убирает станции с рельсами.
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Преобразовать/модернизировать рельсы. При нажатом Shift - оценка стоимости преобразования.
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Преобразовать/модернизировать рельсы. При нажатом Shift - оценка стоимости модернизации.
STR_RAIL_NAME_RAILROAD :Ж/д
STR_RAIL_NAME_RAILROAD.m :Ж/д
@@ -2659,7 +2664,7 @@ STR_WATERWAYS_TOOLBAR_CAPTION :{WHITE}Судо
STR_WATERWAYS_TOOLBAR_CAPTION_SE :{WHITE}Водные пути
STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP :{BLACK}Строительство каналов. При нажатом Shift - оценка стоимости строительства.
STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}Строительство шлюзов. При нажатом Shift - оценка стоимости строительства.
-STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}Строительство доков (для приобретения и обслуживания кораблей). При нажатом Shift - оценка стоимости строительства.
+STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}Строительство доков (для приобретения и обслуживания судов). При нажатом Shift - оценка стоимости строительства.
STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP :{BLACK}Строительство пристаней. Нажатие Ctrl позволяет объединять станции. При нажатом Shift - оценка стоимости строительства.
STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Буи помогают в навигации на больших расстояниях; используйте их как маршрутные точки. При нажатом Shift - оценка стоимости строительства.
STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Строительство акведуков. При нажатом Shift - оценка стоимости строительства.
@@ -2729,6 +2734,12 @@ STR_TREES_RANDOM_TYPE :{BLACK}Дере
STR_TREES_RANDOM_TYPE_TOOLTIP :{BLACK}Высадка деревьев случайного типа. При нажатом Shift - оценка стоимости высадки.
STR_TREES_RANDOM_TREES_BUTTON :{BLACK}Расставить по карте
STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Разместить деревья на местности случайным образом
+STR_TREES_MODE_NORMAL_BUTTON :{BLACK}Дерево
+STR_TREES_MODE_NORMAL_TOOLTIP :{BLACK}Высадка отдельных деревьев
+STR_TREES_MODE_FOREST_SM_BUTTON :{BLACK}Роща
+STR_TREES_MODE_FOREST_SM_TOOLTIP :{BLACK}Создание небольших рощ
+STR_TREES_MODE_FOREST_LG_BUTTON :{BLACK}Лес
+STR_TREES_MODE_FOREST_LG_TOOLTIP :{BLACK}Создание крупных лесов
# Land generation window (SE)
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Генератор карты
@@ -2805,6 +2816,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Выбе
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Информация о территории
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Показать этот участок земли в основном окне. Ctrl+щелчок - показать в дополнительном окне.
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Стоимость очистки: {LTBLUE}(недоступна)
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Стоимость очистки: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Выручка от продажи: {LTBLUE}{CURRENCY_LONG}
@@ -2960,7 +2972,7 @@ STR_FRAMERATE_GAMELOOP :{BLACK}Расч
STR_FRAMERATE_GL_ECONOMY :{BLACK} Расчёт объёмов груза:
STR_FRAMERATE_GL_TRAINS :{BLACK} Движение поездов:
STR_FRAMERATE_GL_ROADVEHS :{BLACK} Движение автомобилей:
-STR_FRAMERATE_GL_SHIPS :{BLACK} Движение кораблей:
+STR_FRAMERATE_GL_SHIPS :{BLACK} Движение судов:
STR_FRAMERATE_GL_AIRCRAFT :{BLACK} Движение воздушных судов:
STR_FRAMERATE_GL_LANDSCAPE :{BLACK} Изменения на карте:
STR_FRAMERATE_GL_LINKGRAPH :{BLACK} Задержка графа распределения:
@@ -2977,7 +2989,7 @@ STR_FRAMETIME_CAPTION_GAMELOOP :Расчёт и
STR_FRAMETIME_CAPTION_GL_ECONOMY :Расчёт объёмов груза
STR_FRAMETIME_CAPTION_GL_TRAINS :Движение поездов
STR_FRAMETIME_CAPTION_GL_ROADVEHS :Движение автомобилей
-STR_FRAMETIME_CAPTION_GL_SHIPS :Движение кораблей
+STR_FRAMETIME_CAPTION_GL_SHIPS :Движение судов
STR_FRAMETIME_CAPTION_GL_AIRCRAFT :Движение воздушных судов
STR_FRAMETIME_CAPTION_GL_LANDSCAPE :Расчёт изменений на карте
STR_FRAMETIME_CAPTION_GL_LINKGRAPH :Задержка графа распределения
@@ -3277,6 +3289,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Пере
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Изменить текст таблички
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Показать знак в основном окне. Ctrl+щелчок - показать в дополнительном окне.
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}К следующей табличке
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}К предыдущей табличке
@@ -3477,7 +3490,7 @@ STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Пере
STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Показать список поездов, маршрут которых проходит через эту станцию
STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP :{BLACK}Показать список автомобилей, маршрут которых проходит через эту станцию/остановку
STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP :{BLACK}Показать список воздушных судов, маршрут которых проходит через этот аэропорт
-STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Показать список кораблей, маршрут которых проходит через эту пристань
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Показать список судов, маршрут которых проходит через эту пристань
STR_STATION_VIEW_RENAME_STATION_CAPTION :Название станции
@@ -3502,12 +3515,12 @@ STR_FINANCES_SECTION_NEW_VEHICLES :{GOLD}Нова
STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS :{GOLD}Обслуж. поездов
STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS :{GOLD}Обслуж. автомобилей
STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS :{GOLD}Обслуж. авиации
-STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Обслуж. кораблей
+STR_FINANCES_SECTION_SHIP_RUNNING_COSTS :{GOLD}Обслуж. судов
STR_FINANCES_SECTION_PROPERTY_MAINTENANCE :{GOLD}Обслуж. собственности
STR_FINANCES_SECTION_TRAIN_INCOME :{GOLD}Доход от поездов
STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME :{GOLD}Доход от автомобилей
STR_FINANCES_SECTION_AIRCRAFT_INCOME :{GOLD}Доход от авиации
-STR_FINANCES_SECTION_SHIP_INCOME :{GOLD}Доход от кораблей
+STR_FINANCES_SECTION_SHIP_INCOME :{GOLD}Доход от судов
STR_FINANCES_SECTION_LOAN_INTEREST :{GOLD}Проценты по займу
STR_FINANCES_SECTION_OTHER :{GOLD}Прочие расходы
STR_FINANCES_NEGATIVE_INCOME :{BLACK}-{CURRENCY_LONG}
@@ -3533,7 +3546,7 @@ STR_COMPANY_VIEW_VEHICLES_TITLE :{GOLD}Тран
STR_COMPANY_VIEW_TRAINS :{WHITE}{COMMA} поезд{P "" а ов}
STR_COMPANY_VIEW_ROAD_VEHICLES :{WHITE}{COMMA} автомобил{P ь я ей}
STR_COMPANY_VIEW_AIRCRAFT :{WHITE}{COMMA} воздушн{P ое ых ых} суд{P но на ов}
-STR_COMPANY_VIEW_SHIPS :{WHITE}{COMMA} корабл{P ь я ей}
+STR_COMPANY_VIEW_SHIPS :{WHITE}{COMMA} суд{P но на ов}
STR_COMPANY_VIEW_VEHICLES_NONE :{WHITE}нет
STR_COMPANY_VIEW_COMPANY_VALUE :{GOLD}Стоимость компании: {WHITE}{CURRENCY_LONG}
STR_COMPANY_VIEW_SHARES_OWNED_BY :{WHITE}({COMMA}% владеет {COMPANY})
@@ -3554,6 +3567,7 @@ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Пере
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Подробности
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Посмотреть подробный состав инфраструктуры
STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Передать деньги
+STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Передать некоторую сумму денег этой компании
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Внешность
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Изменить внешность директора
@@ -3571,7 +3585,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP :{BLACK}Прод
STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION :Компания
STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Имя директора
-STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Введите сумму денег, которую вы хотите передать
+STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Введите сумму, которую собираетесь передать
STR_BUY_COMPANY_MESSAGE :{WHITE}Мы ищем потенциального покупателя для нашей компании.{}{}Не желаете ли Вы приобрести {COMPANY} за {CURRENCY_LONG}?
@@ -3625,12 +3639,12 @@ STR_CONFIG_GAME_PRODUCTION_LEVEL :{WHITE}Изме
# Vehicle lists
STR_VEHICLE_LIST_TRAIN_CAPTION :{WHITE}{STRING} - {COMMA} поезд{P "" а ов}
STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION :{WHITE}{STRING} - {COMMA} автомобил{P ь я ей}
-STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} корабл{P ь я ей}
+STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING} - {COMMA} суд{P но на ов}
STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING} - {COMMA} воздушн{P ое ых ых} суд{P но на ов}
STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Поезда - щёлкните для получения информации
STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Автомобили - щёлкните для получения информации
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Корабли - щёлкните для получения информации
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Суда - щёлкните для получения информации
STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Авиатранспорт - щёлкните для получения информации
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Прибыль в этом году: {CURRENCY_LONG} (в прошлом году: {CURRENCY_LONG})
@@ -3659,7 +3673,7 @@ STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION :{WHITE}Общи
# Group window
STR_GROUP_ALL_TRAINS :Все поезда
STR_GROUP_ALL_ROAD_VEHICLES :Весь автотранспорт
-STR_GROUP_ALL_SHIPS :Все корабли
+STR_GROUP_ALL_SHIPS :Все суда
STR_GROUP_ALL_AIRCRAFTS :Все самолёты
STR_GROUP_DEFAULT_TRAINS :Без группы
@@ -3701,7 +3715,7 @@ STR_BUY_VEHICLE_TRAM_VEHICLE_CAPTION :Новые тр
############ range for vehicle availability starts
STR_BUY_VEHICLE_TRAIN_ALL_CAPTION :Новый поезд
STR_BUY_VEHICLE_ROAD_VEHICLE_ALL_CAPTION :Новый дорожный транспорт
-STR_BUY_VEHICLE_SHIP_CAPTION :Новый корабль
+STR_BUY_VEHICLE_SHIP_CAPTION :Новое судно
STR_BUY_VEHICLE_AIRCRAFT_CAPTION :Новое воздушное судно
############ range for vehicle availability ends
@@ -3731,9 +3745,9 @@ STR_PURCHASE_INFO_MAX_TE :{BLACK}Макс
STR_PURCHASE_INFO_AIRCRAFT_RANGE :{BLACK}Дальность: {GOLD}{COMMA} клет{P ка ки ок}
STR_PURCHASE_INFO_AIRCRAFT_TYPE :{BLACK}Тип возд. судна: {GOLD}{STRING}
-STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Список локомотивов и вагонов - щёлкните для получения информации. Ctrl+щелчок скроет/покажет ТС.
+STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP :{BLACK}Список железнодорожного транспорта - щёлкните для получения информации. Ctrl+щелчок скроет/покажет ТС.
STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Список автотранспорта - щёлкните для получения информации. Ctrl+щелчок скроет/покажет выбранный автомобиль.
-STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Список кораблей - щёлкните для получения информации. Ctrl+щелчок скроет/покажет выбранный корабль.
+STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP :{BLACK}Список судов - щёлкните для получения информации. Ctrl+щелчок скроет/покажет выбранное судно.
STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP :{BLACK}Список воздушных судов - щёлкните для получения информации. Ctrl+щелчок скроет/покажет ТС.
STR_BUY_REFIT_VEHICLE_BUY_VEHICLE_BUTTON :{BLACK}Переоборудовать
@@ -3766,7 +3780,7 @@ STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON :{BLACK}Пере
STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP :{BLACK}Изменить название модели поезда
STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP :{BLACK}Изменить название модели автомобиля
-STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Изменить название модели корабля
+STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP :{BLACK}Изменить название модели судна
STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP :{BLACK}Изменить название модели возд. судна
STR_BUY_VEHICLE_TRAIN_HIDE_TOGGLE_BUTTON :{BLACK}Скрыть
@@ -3781,12 +3795,12 @@ STR_BUY_VEHICLE_AIRCRAFT_SHOW_TOGGLE_BUTTON :{BLACK}Пока
STR_BUY_VEHICLE_TRAIN_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранного локомотива/вагона
STR_BUY_VEHICLE_ROAD_VEHICLE_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели автомобиля
-STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели корабля
+STR_BUY_VEHICLE_SHIP_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели судна
STR_BUY_VEHICLE_AIRCRAFT_HIDE_SHOW_TOGGLE_TOOLTIP :{BLACK}Переключить скрытие/отображение выбранной модели воздушного судна
STR_QUERY_RENAME_TRAIN_TYPE_CAPTION :{WHITE}Название модели поезда
STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION :{WHITE}Название модели автомобиля
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION :{WHITE}Название модели корабля
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION :{WHITE}Название модели судна
STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION :{WHITE}Название модели возд. судна
# Depot window
@@ -3800,22 +3814,22 @@ STR_DEPOT_VEHICLE_TOOLTIP :{BLACK}{ENGINE}
STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} единиц{P а "" ""}{STRING}
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO_LONG} ({CARGO_SHORT})
-STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Поезда - используйте перетаскивание для изменения состава; нажмите ПКМ для получения информации. Удерживайте Ctrl для перетаскивания вагона вместе со всеми следующими за ним.
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Автомобили - нажмите ПКМ для получения информации
-STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Корабли - нажмите ПКМ для получения информации
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Авиатранспорт - нажмите ПКМ для получения информации
+STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Поезда в депо. Изменяйте составы с помощью перетаскивания; нажмите ПКМ для получения информации.{}При нажатой Ctrl обе функции применяются от выбранного вагона до конца состава.
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Автомобили в гараже. Нажмите ПКМ для получения информации.
+STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Суда в доке. Нажмите ПКМ для получения информации.
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Воздушный транспорт в ангаре. Нажмите ПКМ для получения информации.
-STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Перетащите сюда транспорт, чтобы продать его
+STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Перетащите сюда транспортное средство, чтобы продать его
STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP :{BLACK}Перетащите сюда автомобиль, чтобы продать его
-STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Перетащите сюда корабль, чтобы продать его
-STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Перетащите сюда транспорт, чтобы продать его
+STR_DEPOT_SHIP_SELL_TOOLTIP :{BLACK}Перетащите сюда судно, чтобы продать его
+STR_DEPOT_AIRCRAFT_SELL_TOOLTIP :{BLACK}Перетащите сюда воздушное судно, чтобы продать его
STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP :{BLACK}Перетащите сюда локомотив для продажи всего состава
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP :{BLACK}Продать все поезда в депо
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP :{BLACK}Продать все авто в гараже
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP :{BLACK}Продать все автомобили в гараже
STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP :{BLACK}Продать все суда в доке
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP :{BLACK}Продать весь авиатранспорт в ангаре
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP :{BLACK}Продать все воздушные суда в ангаре
STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP :{BLACK}Автозамена всех поездов в депо
STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP :{BLACK}Автозамена всех авто в гараже
@@ -3829,7 +3843,7 @@ STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON :{BLACK}Ново
STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый поезд
STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый автомобиль
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый корабль
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новое судно
STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP :{BLACK}Купить новый авиатранспорт
STR_DEPOT_CLONE_TRAIN :{BLACK}Копировать
@@ -3839,7 +3853,7 @@ STR_DEPOT_CLONE_AIRCRAFT :{BLACK}Копи
STR_DEPOT_CLONE_TRAIN_DEPOT_INFO :{BLACK}Создать копию состава. Нажмите на кнопку, а затем на поезд внутри или снаружи депо. Ctrl+щелчок создаст поезд с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Создать копию автомобиля. Нажмите на кнопку, а затем на машину внутри или снаружи гаража. Ctrl+щелчок создаст автомобиль с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Создать копию корабля. Нажмите на кнопку, а затем на корабль внутри или снаружи дока. Ctrl+щелчок создаст корабль с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Создать копию судна. Нажмите на кнопку, а затем на судно внутри или снаружи дока. Ctrl+щелчок создаст судно с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Создать копию воздушного судна. Нажмите на кнопку, а потом на воздушное судно внутри или снаружи ангара. Ctrl+щелчок создаст копию с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Показать депо в основном окне. Ctrl+щелчок - показать в дополнительном окне.
@@ -3854,13 +3868,13 @@ STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP :{BLACK}Пока
STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP :{BLACK}Нажмите для остановки всех поездов в депо
STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP :{BLACK}Нажмите для остановки всех авто в гараже
-STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP :{BLACK}Нажмите для остановки всех кораблей в доке
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP :{BLACK}Нажмите для остановки всех судов в доке
STR_DEPOT_MASS_STOP_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_MASS_START_HANGAR_TOOLTIP :{BLACK}Нажмите для запуска всего воздушного транспорта в ангаре
STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Весь транспорт в депо будет продан. Вы уверены?
@@ -3884,8 +3898,8 @@ STR_ENGINE_PREVIEW_TRAM_VEHICLE.gen :трамвая
STR_ENGINE_PREVIEW_AIRCRAFT :воздушное судно
STR_ENGINE_PREVIEW_AIRCRAFT.gen :воздушного судна
-STR_ENGINE_PREVIEW_SHIP :корабль
-STR_ENGINE_PREVIEW_SHIP.gen :корабля
+STR_ENGINE_PREVIEW_SHIP :судно
+STR_ENGINE_PREVIEW_SHIP.gen :судна
STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER :{BLACK}Цена: {CURRENCY_LONG} Вес: {WEIGHT_SHORT}{}Скорость: {VELOCITY} Мощность: {POWER}{}Стоимость обслуж.: {CURRENCY_LONG}/год{}Ёмкость: {CARGO_LONG}
STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE :{BLACK}Цена: {CURRENCY_LONG} Вес: {WEIGHT_SHORT}{}Скорость: {VELOCITY} Мощность: {POWER} Макс. ТУ: {6:FORCE}{}Стоимость обслуж.: {4:CURRENCY_LONG}/год{}Ёмкость: {5:CARGO_LONG}
@@ -3901,8 +3915,8 @@ STR_REPLACE_VEHICLE_TRAIN :Поезд
STR_REPLACE_VEHICLE_TRAIN.gen :ж/д транспорта
STR_REPLACE_VEHICLE_ROAD_VEHICLE :Автотранспорт
STR_REPLACE_VEHICLE_ROAD_VEHICLE.gen :автотранспорта
-STR_REPLACE_VEHICLE_SHIP :Корабль
-STR_REPLACE_VEHICLE_SHIP.gen :кораблей
+STR_REPLACE_VEHICLE_SHIP :Судно
+STR_REPLACE_VEHICLE_SHIP.gen :судов
STR_REPLACE_VEHICLE_AIRCRAFT :Авиатранспорт
STR_REPLACE_VEHICLE_AIRCRAFT.gen :воздушного транспорта
@@ -3942,31 +3956,31 @@ STR_REPLACE_ROAD_VEHICLES :Автотра
STR_REPLACE_TRAM_VEHICLES :Трамваи
STR_REPLACE_REMOVE_WAGON :{BLACK}Удаление вагонов: {ORANGE}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Разрешить при автозамене сохранять длину поездов путём удаления вагонов (начиная с головы поезда), если при автозамене локомотива увеличится длина поезда.
+STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Разрешить при автозамене сохранять длину поездов путём удаления вагонов (начиная с головы поезда), если при автозамене локомотива увеличится длина состава.
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Показать поезд в основном окне. Ctrl+щелчок включит слежение за поездом в главном окне.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Показать автомобиль в главном окне. Ctrl+щелчок включит слежение за автомобилем в главном окне.
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Показать корабль в главном окне. Ctrl+Click будет следить за кораблем в главном окне
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Показать самолёт в главном окне. Ctrl+щелчок включит слежение за самолётом в главном окне.
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Показать поезд в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Показать автомобиль в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне.
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Показать судно в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне.
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Показать воздушное судно в основном окне.{}Двойной щелчок - следить за ним в основном окне.{}Ctrl+щелчок - показать в дополнительном окне.
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить поезд в депо. Ctrl+щелчок - только для обслуживания.
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить автомобиль в гараж. Ctrl+щелчок - только для обслуживания.
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить корабль в док. Ctrl+щелчок - только для обслуживания.
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить судно в док. Ctrl+щелчок - только для обслуживания.
STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Отправить воздушное судно в ангар. Ctrl+щелчок - только для обслуживания.
STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Создать копию состава. Ctrl+щелчок создаст поезд с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Создать копию автомобиля. Ctrl+щелчок создаст автомобиль с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Создать копию корабля. Ctrl+щелчок создаст корабль с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Создать копию судна. Ctrl+щелчок создаст судно с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Создать копию воздушного судна. Ctrl+щелчок создаст копию с общим маршрутом. Shift+щелчок - оценка стоимости покупки.
STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP :{BLACK}Заставить поезд проехать на красный сигнал светофора
STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP :{BLACK}Переоборудование поезда для перевозки иного типа груза
STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Переоборудование автомобиля для перевозки иного типа груза
-STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудование корабля для перевозки иного типа груза
+STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудование судна для перевозки иного типа груза
STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Переоборудование возд. судна для перевозки иного типа груза
STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP :{BLACK}Развернуть поезд
@@ -3979,13 +3993,15 @@ STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Пока
STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о поезде
STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию об автомобиле
-STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о корабле
+STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показать информацию о судне
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Показать сведения об авиатранспорте.
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие поезда; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие автомобиля; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие корабля; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Текущее действие воздушного судна; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
+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_ORDER_LOCATION_TOOLTIP :{BLACK}Показать станцию назначения в основном окне. Ctrl+щелчок - показать в дополнительном окне.
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Разгрузка/Погрузка
@@ -4016,7 +4032,7 @@ STR_VEHICLE_NAME_BUTTON :{BLACK}Назв
STR_VEHICLE_DETAILS_TRAIN_RENAME :{BLACK}Переименовать поезд
STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME :{BLACK}Переименовать автомобиль
-STR_VEHICLE_DETAILS_SHIP_RENAME :{BLACK}Переименовать корабль
+STR_VEHICLE_DETAILS_SHIP_RENAME :{BLACK}Переименовать судно
STR_VEHICLE_DETAILS_AIRCRAFT_RENAME :{BLACK}Переименовать воздушное судно
STR_VEHICLE_INFO_AGE_RUNNING_COST_YR :{BLACK}Возраст: {LTBLUE}{STRING}{BLACK} Стоимость обслуживания: {LTBLUE}{CURRENCY_LONG}/год
@@ -4053,7 +4069,7 @@ STR_VEHICLE_DETAILS_PERCENT :В процен
STR_QUERY_RENAME_TRAIN_CAPTION :{WHITE}Название поезда
STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION :{WHITE}Название автомобиля
-STR_QUERY_RENAME_SHIP_CAPTION :{WHITE}Название корабля
+STR_QUERY_RENAME_SHIP_CAPTION :{WHITE}Название судна
STR_QUERY_RENAME_AIRCRAFT_CAPTION :{WHITE}Название возд. судна
# Extra buttons for train details windows
@@ -4095,12 +4111,12 @@ STR_REFIT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Выбе
STR_REFIT_TRAIN_REFIT_BUTTON :{BLACK}Переоборудовать поезд
STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON :{BLACK}Переоборудовать авто
-STR_REFIT_SHIP_REFIT_BUTTON :{BLACK}Переоборудовать корабль
+STR_REFIT_SHIP_REFIT_BUTTON :{BLACK}Переоборудовать судно
STR_REFIT_AIRCRAFT_REFIT_BUTTON :{BLACK}Переоборудовать возд. судно
STR_REFIT_TRAIN_REFIT_TOOLTIP :{BLACK}Переоборудовать поезд для перевозки выбранного типа груза
STR_REFIT_ROAD_VEHICLE_REFIT_TOOLTIP :{BLACK}Переоборудовать автомобиль для перевозки выбранного типа груза
-STR_REFIT_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудовать корабль для перевозки выбранного типа груза
+STR_REFIT_SHIP_REFIT_TOOLTIP :{BLACK}Переоборудовать судно для перевозки выбранного типа груза
STR_REFIT_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Переоборудовать авиатранспорт для перевозки выбранного типа груза
# Order view
@@ -4213,6 +4229,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Переобо
STR_ORDER_STOP_ORDER :(Стоп)
STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(Неверный тип){POP_COLOUR} {STRING} {STATION} {STRING}
STR_ORDER_IMPLICIT :(Автоматически)
@@ -4548,6 +4565,7 @@ STR_ERROR_LOAN_ALREADY_REPAYED :{WHITE}... за
STR_ERROR_CURRENCY_REQUIRED :{WHITE}... требуется {CURRENCY_LONG}
STR_ERROR_CAN_T_REPAY_LOAN :{WHITE}Невозможно погасить заём...
STR_ERROR_INSUFFICIENT_FUNDS :{WHITE}Невозможно отдать занятые у банка деньги...
+STR_ERROR_CAN_T_GIVE_MONEY :{WHITE}Невозможно передать деньги этой компании...
STR_ERROR_CAN_T_BUY_COMPANY :{WHITE}Невозможно приобрести компанию...
STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS :{WHITE}Невозможно построить штаб-квартиру компании...
STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS :{WHITE}Невозможно купить 25% акций этой компании...
@@ -4674,6 +4692,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Неверны
STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}ТС «{VEHICLE}» слишком длинное после замены
STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}Правила автозамены/обновления не были применены
STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(недостаточно денег)
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}Новое транспортное средство не может возить {STRING.acc}
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}Ошибка в {NUM}-м пункте расписания: нельзя переоборудовать ТС
# Rail construction errors
STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Недопустимая комбинация путей
@@ -4767,47 +4787,47 @@ STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE :{WHITE}Нево
# Generic vehicle errors
STR_ERROR_TRAIN_IN_THE_WAY :{WHITE}Поезд мешает
STR_ERROR_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Автомобиль мешает
-STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Корабль мешает
+STR_ERROR_SHIP_IN_THE_WAY :{WHITE}Судно мешает
STR_ERROR_AIRCRAFT_IN_THE_WAY :{WHITE}Воздушное судно мешает
STR_ERROR_CAN_T_REFIT_TRAIN :{WHITE}Невозможно переоборудовать поезд...
STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE :{WHITE}Невозможно переоборудовать автомобиль...
-STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}Невозможно переоборудовать корабль...
+STR_ERROR_CAN_T_REFIT_SHIP :{WHITE}Невозможно переоборудовать судно...
STR_ERROR_CAN_T_REFIT_AIRCRAFT :{WHITE}Невозможно переоборудовать самолёт...
STR_ERROR_CAN_T_RENAME_TRAIN :{WHITE}Невозможно переименовать поезд...
STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE :{WHITE}Невозможно переименовать автомобиль...
-STR_ERROR_CAN_T_RENAME_SHIP :{WHITE}Невозможно переименовать корабль...
+STR_ERROR_CAN_T_RENAME_SHIP :{WHITE}Невозможно переименовать судно...
STR_ERROR_CAN_T_RENAME_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_SHIP :{WHITE}Невозможно остановить/запустить судно...
STR_ERROR_CAN_T_STOP_START_AIRCRAFT :{WHITE}Невозможно остановить/запустить авиатранспорт...
STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT :{WHITE}Невозможно отправить поезд в депо...
STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT :{WHITE}Невозможно отправить автомобиль в гараж...
-STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Невозможно отправить корабль в док...
+STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT :{WHITE}Невозможно отправить судно в док...
STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR :{WHITE}Невозможно отправить самолёт в ангар...
STR_ERROR_CAN_T_BUY_TRAIN :{WHITE}Невозможно купить ж/д транспорт...
STR_ERROR_CAN_T_BUY_ROAD_VEHICLE :{WHITE}Невозможно купить автомобиль...
-STR_ERROR_CAN_T_BUY_SHIP :{WHITE}Невозможно купить корабль...
+STR_ERROR_CAN_T_BUY_SHIP :{WHITE}Невозможно купить судно...
STR_ERROR_CAN_T_BUY_AIRCRAFT :{WHITE}Невозможно купить воздушное судно...
STR_ERROR_CAN_T_RENAME_TRAIN_TYPE :{WHITE}Невозможно изменить название модели поезда...
STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE :{WHITE}Невозможно изменить название модели автомобиля...
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE :{WHITE}Невозможно изменить название модели корабля...
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE :{WHITE}Невозможно изменить название модели судна...
STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE :{WHITE}Невозможно изменить название модели возд. судна...
STR_ERROR_CAN_T_SELL_TRAIN :{WHITE}Невозможно продать поезд...
STR_ERROR_CAN_T_SELL_ROAD_VEHICLE :{WHITE}Невозможно продать автомобиль...
-STR_ERROR_CAN_T_SELL_SHIP :{WHITE}Невозможно продать корабль...
+STR_ERROR_CAN_T_SELL_SHIP :{WHITE}Невозможно продать судно...
STR_ERROR_CAN_T_SELL_AIRCRAFT :{WHITE}Невозможно продать самолёт...
STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}Локомотив и/или вагон недоступен
STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}Автотранспорт недоступен
-STR_ERROR_SHIP_NOT_AVAILABLE :{WHITE}Корабль недоступен
+STR_ERROR_SHIP_NOT_AVAILABLE :{WHITE}Судно недоступно
STR_ERROR_AIRCRAFT_NOT_AVAILABLE :{WHITE}Авиатранспорт недоступен
STR_ERROR_TOO_MANY_VEHICLES_IN_GAME :{WHITE}Слишком много транспорта в игре
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index f8b6588b02..caee206bb3 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -419,7 +419,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Odaberit
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Odaberite kriterijum za sortiranje
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izaberite način filtriranja
STR_BUTTON_SORT_BY :{BLACK}Sortiraj po
-STR_BUTTON_LOCATION :{BLACK}Mesto
STR_BUTTON_RENAME :{BLACK}Preimenuj
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zatvori prozor
@@ -3775,10 +3774,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Ukoliko
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju voza. Ctrl+Klik će pratiti voz u glavnom pogledu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju vozila. Ctrl+Klik će pratiti vozilo u glavnom pogledu
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju broda. Ctrl+Klik će pratiti brod u glavnom pogledu
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Prebacuje glavni pogled na lokaciju letilice. Ctrl+Klik će pratiti letelicu u glavnom pogledu
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošaljite voz u depo. Sa Ctrl+Klik će otići samo na servis
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošaljite vozilo u depo. Sa Ctrl+Klik će otići samo na servis
@@ -3810,10 +3805,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Prikazuj
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Prikazuje podatke o brodu
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Prikazuje podatke o letilici
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje voza - kliknite ovde za zaustavljanje/pokretanje voza. Ctrl+Klik pomera pogled na odredište
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje vozila - kliknite ovde za zaustavljanje/pokretanje vozila. Ctrl+Klik pomera pogled na odredište
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje broda - kliknite ovde za zaustavljanje/pokretanje broda. Ctrl+Klik pomera pogled na odredište
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Trenutno stanje letilice - kliknite ovde za zaustavljanje/pokretanje letilice. Ctrl+Klik pomera pogled na odredište
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Utovarivanje / Istovarivanje
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index 85487a5aa6..14c511069f 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}选择
STR_TOOLTIP_SORT_CRITERIA :{BLACK}选择排序标准
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}选择过滤标准
STR_BUTTON_SORT_BY :{BLACK}排序
-STR_BUTTON_LOCATION :{BLACK}定位
STR_BUTTON_RENAME :{BLACK}重命名
STR_BUTTON_CATCHMENT :{BLACK}覆盖范围
STR_TOOLTIP_CATCHMENT :{BLACK}显示覆盖范围
@@ -3720,10 +3719,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}当车
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到列车所在的位置. 单击的同时按住Ctrl则主窗口会跟踪列车的路线
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到车辆所在的位置. 单击的同时按住Ctrl则主窗口会跟踪车辆的路线
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到船只所在的位置. 单击的同时按住Ctrl则主窗口会跟踪船只的航线
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}将屏幕中心移动到飞机所在的位置. 单击的同时按住Ctrl则主窗口会跟踪飞机的航线
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}命令列车返回车库
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}命令汽车前往车库{}Ctrl+单击 时汽车只进行保养
@@ -3755,10 +3750,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}显示
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}显示船只的详情
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}显示飞机的详情
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}当前列车状态{}点击可以 启动/停止 列车。Ctrl+点击切换至目的地。
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}当前车辆的任务{}单击这里可以 停止/启动 车辆。Ctrl+点击切换至目的地。
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}当前船只的任务{}点击可以 启动/停止 船只。Ctrl+点击切换至目的地。
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}飞机当前的状态{}点击可以 停止/启动 飞机。 Ctrl+点击 切换至目的地
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}装载/卸货
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 640ed6fa38..f75467ec19 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -298,7 +298,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Spôsob
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Zvoľ kritérium triedenia
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Vybrať kritériá filtrovania
STR_BUTTON_SORT_BY :{BLACK}Usporiadať
-STR_BUTTON_LOCATION :{BLACK}Poloha
STR_BUTTON_RENAME :{BLACK}Premenovať
STR_BUTTON_CATCHMENT :{BLACK}Pokrytie
STR_TOOLTIP_CATCHMENT :{BLACK}Prepnúť zobrazenie oblasti pokrytia
@@ -1723,10 +1722,10 @@ STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL :normálny
STR_CONFIG_SETTING_TOWN_GROWTH_FAST :rýchly
STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST :Veľmi rýchly
STR_CONFIG_SETTING_LARGER_TOWNS :Podiel miest ktoré sa stanú veľkomestami: {STRING}
-STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT :Množstvo miest ktoré sa stanú veľkomestami, teda tie ktoré začali väčšie a rastú rýchlejšie.
+STR_CONFIG_SETTING_LARGER_TOWNS_HELPTEXT :Množstvo miest, ktoré sa stanú veľkomestami, teda tie ktoré začali väčšie a rastú rýchlejšie.
STR_CONFIG_SETTING_LARGER_TOWNS_VALUE :1 z {COMMA}
STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :žiadne
-STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :Násobok pociatocnej velkosti mesta: {STRING}
+STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :Násobok počiatočnej veľkosti mesta: {STRING}
STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT :Priemerná veľkosť veľkomiest v porovnaní k mestám na začiatku hry.
STR_CONFIG_SETTING_LINKGRAPH_INTERVAL :Aktualizovať distribučný graf každ{P 0:2 "ý" "é" "ých"} {STRING} {P 0:2 "deň" "dni" "dní"}
@@ -2136,7 +2135,7 @@ STR_NETWORK_LANG_LATVIAN :Litovsky
STR_NETWORK_GAME_LOBBY_CAPTION :{WHITE}Sieťová hra - čakáreň
STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN :{BLACK}Pripravuje sa k vstupu: {ORANGE}{STRING}
-STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP :{BLACK}Aktualny zoznam spolocnosti v tejto hre. Bud mozes do jednej vstupit, alebo zalozit novu spolocnost.
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP :{BLACK}Aktuálny zoznam spoločností v tejto hre. Buď môžeš do jednej vstúpiť, alebo založiť novú spoločnosť.
STR_NETWORK_GAME_LOBBY_COMPANY_INFO :{SILVER}INFO O SPOLOCNOSTI
STR_NETWORK_GAME_LOBBY_COMPANY_NAME :{SILVER}Názov spoločnosti: {WHITE}{STRING}
@@ -2447,7 +2446,7 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Vybrať
# Rail waypoint construction window
STR_WAYPOINT_CAPTION :{WHITE}Smerový bod
-STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Vyber typ kontrolneho bodu
+STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Vyber typ kontrolného bodu
# Rail station construction window
STR_STATION_BUILD_RAIL_CAPTION :{WHITE}Výber železničnej stanice
@@ -2790,21 +2789,21 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT :Lodenica
STR_LAI_TUNNEL_DESCRIPTION_RAILROAD :Železničný tunel
STR_LAI_TUNNEL_DESCRIPTION_ROAD :Cestný tunel
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL :Ocelovy zavesny zeleznicny most
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL :Ocelovy pilierovy zeleznicny most
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL :Ocelovy visuty zeleznicny most
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE :Vystuzeny zavesny betonovy zeleznicny most
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN :Dreveny zeleznicny most
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE :Betonovy zeleznicny most
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL :Kryty zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL :Oceľový závesný železničný most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL :Oceľový pilierový železničný most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL :Oceľový visutý železničný most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE :Vystužený závesný betónový železničný most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN :Drevený železničný most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE :Betónový železničný most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL :Krytý železničný most
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL :Ocelovy zavesny cestny most
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL :Ocelovy pilierovy cestny most
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL :Ocelovy visuty cestny most
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE :Vystuzeny zavesny betonovy cestny most
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN :Dreveny cestny most
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE :Betonovy cestny most
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL :Kryty cestny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL :Oceľový závesný cestný most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL :Oceľovy pilierový cestný most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL :Oceľový visutý cestný most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE :Vystužený závesný betónový cestný most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN :Drevený cestný most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE :Betónový cestný most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL :Krytý cestný most
STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT :Akvadukt
@@ -2944,12 +2943,12 @@ STR_MAPGEN_BORDER_MANUAL :{BLACK}Manuáln
STR_MAPGEN_HEIGHTMAP_ROTATION :{BLACK}Orientácia výškovej mapy:
STR_MAPGEN_HEIGHTMAP_NAME :{BLACK}Názov výškovej mapy:
-STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Velkost:
+STR_MAPGEN_HEIGHTMAP_SIZE_LABEL :{BLACK}Veľkosť:
STR_MAPGEN_HEIGHTMAP_SIZE :{ORANGE}{NUM} x {NUM}
STR_MAPGEN_MAX_HEIGHTLEVEL_QUERY_CAPT :{WHITE}Zmeniť maximálnu výšku mapy
STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Zmeniť výšku hranice snehu
-STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Zmenit rok zaciatku hry
+STR_MAPGEN_START_DATE_QUERY_CAPT :{WHITE}Zmeniť rok začiatku hry
# SE Map generation
STR_SE_MAPGEN_CAPTION :{WHITE}Typ scenara
@@ -3441,7 +3440,7 @@ STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Premiest
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Sídlo spoločnosti je možné premiestniť za 1% hodnoty spoločnosti. Shift+klik zobrazí odhadovanú cenu
STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detaily
STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Zobraziť podrobné políčka infraštruktúry
-STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Previesť peniaze
+STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Presuň peniaze do tejto spoločnosti
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nová tvár
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Vybrať novú tvár prezidenta
@@ -3820,10 +3819,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Zachovan
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu vlaku. Ctrl+klik bude sledovať vlak
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu vozidla. Ctrl+klik bude sledovať vozidlo
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu lode. Ctrl+klik bude sledovať loď
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Vycentrovať pohľad na pozíciu lietadla. Ctrl+klik bude sledovať lietadlo
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Poslať vlak do depa. Ctrl+klik iba servis
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Poslať vozidlo do garáže. Ctrl+klik iba servis.
@@ -3855,10 +3850,11 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Zobrazi
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Zobraziť detaily o lodi
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Zobraziť detaily o lietadle
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť vlaku - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť vozidla - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť lode - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Aktuálna činnosť lietadla - kliknutím sa zastaví/spustí. Ctrl+klik presunie pohľad na cieľovú stanicu
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Činnosť aktuálneho vlaku - kliknite na zastavenie/spustenie vlaku
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Činnosť aktuálneho cestného vozidla - kliknite na zastavenie/spustenie cestného vozidla
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Činnosť aktuálnej lode - kliknite na zastavenie/spustenie lode
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Činnosť aktuálneho lietadla - kliknite na zastavenie/spustenie lietadla
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Nakláda / Vykláda
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 2113ae5eb4..73ac808be8 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -384,7 +384,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Izberite
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Izberite kriterij razvrščanja
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Izberite kriterij filtriranja
STR_BUTTON_SORT_BY :{BLACK}Razvrsti po
-STR_BUTTON_LOCATION :{BLACK}Mesto
STR_BUTTON_RENAME :{BLACK}Preimenuj
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Zapri okno
@@ -3692,10 +3691,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Dovoli s
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo vlaka. Ctrl+Klik odpre nov pogled na lokaciji vlaka
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo vozila. Ctrl+Klik odpre nov pogled na lokaciji vozila
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo ladje. Ctrl+Klik odpre nov pogled na lokaciji ladje
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Osredotoči pogled na lokacijo letala. Ctrl+Klik odpre nov pogled na lokaciji letala
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošlji vlak v železniško garažo. Ctrl+Klik samo na servis
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Pošlji vozilo v garažo. Ctrl+Klik samo na servis
@@ -3727,10 +3722,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Prikaži
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Prikaži podrobnosti ladje
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Prikaži podrobnosti letala
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Dejanje trenutnega vlaka - klikni za izklop/zagon vlaka. Ctrl+Klik za premik na destinacijo
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Dejanja trenutnega vozila - klikni za ustavitev/zagon vozila. Ctrl+Klik za premik na destinacijo
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Dejanje trenutne ladje - klikni za ustavitev/zagon ladje. Ctrl+Klik za premik na destinacijo
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Dejanje trenutnega letala - klikni za ustavitev/zagon letala. Ctrl+Klik za premik na destinacijo
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Natovarjanje / Raztovarjanje
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 60f9de1f32..a8f40493d3 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Seleccio
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selecciona orden de clasificación
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selecciona criterio de filtrado
STR_BUTTON_SORT_BY :{BLACK}Ordenar por
-STR_BUTTON_LOCATION :{BLACK}Sitio
STR_BUTTON_RENAME :{BLACK}Renombrar
STR_BUTTON_CATCHMENT :{BLACK}Cobertura
STR_TOOLTIP_CATCHMENT :{BLACK}Mostrar u ocultar área de cobertura
@@ -266,7 +265,7 @@ STR_SHOW_HIDDEN_ENGINES_VEHICLE_AIRCRAFT_TOOLTIP :{BLACK}Al activ
# Query window
STR_BUTTON_DEFAULT :{BLACK}Por defecto
STR_BUTTON_CANCEL :{BLACK}Cancelar
-STR_BUTTON_OK :{BLACK}OK
+STR_BUTTON_OK :{BLACK}Aceptar
STR_WARNING_PASSWORD_SECURITY :{YELLOW}Advertencia: Los administradores del servidor podrían ser capaz de leer cualquier texto introducido aquí.
# On screen keyboard window
@@ -487,7 +486,7 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES :Borrar todos lo
STR_ABOUT_MENU_LAND_BLOCK_INFO :Información del terreno
STR_ABOUT_MENU_SEPARATOR :
STR_ABOUT_MENU_TOGGLE_CONSOLE :Activar consola
-STR_ABOUT_MENU_AI_DEBUG :Depuración de Script de Juego / IA
+STR_ABOUT_MENU_AI_DEBUG :Depuración de Script de juego / IA
STR_ABOUT_MENU_SCREENSHOT :Captura de pantalla
STR_ABOUT_MENU_SHOW_FRAMERATE :Mostrar fotogramas por segundo - FPS
STR_ABOUT_MENU_ABOUT_OPENTTD :Acerca de 'OpenTTD'
@@ -1473,7 +1472,7 @@ STR_CONFIG_SETTING_SOUND_AMBIENT :Ambiental: {STR
STR_CONFIG_SETTING_SOUND_AMBIENT_HELPTEXT :Reproducir sonidos ambientales de terreno, industrias y municipios
STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING :Deshabilitar construcción de infraestructuras cuando no haya vehículos apropiados disponibles: {STRING}
-STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT :Cuando se activa, solo pueden construirse infraestructuras si hay vehículos disponibles para ellas, previniendo un gasto innecesario de tiempo y dinero
+STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT :Cuando se activa, solo pueden construirse infraestructuras si hay vehículos disponibles para ellas, evitando un gasto innecesario de tiempo y dinero
STR_CONFIG_SETTING_MAX_TRAINS :Número máximo de trenes por empresa: {STRING}
STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT :Número máximo de trenes que una compañía puede tener
STR_CONFIG_SETTING_MAX_ROAD_VEHICLES :Número máximo de automóviles por empresa: {STRING}
@@ -1838,6 +1837,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}¿Está
# Cheat window
STR_CHEATS :{WHITE}Trucos
STR_CHEATS_TOOLTIP :{BLACK}Las casillas indican si ha usado este truco antes
+STR_CHEATS_NOTE :{BLACK}Nota: el uso de estos ajustes quedará registrado en la partida
STR_CHEAT_MONEY :{LTBLUE}Incrementar dinero en {CURRENCY_LONG}
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Jugando como la empresa: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Bulldózer mágico (elimina industrias, objetos inamovibles): {ORANGE}{STRING}
@@ -2354,6 +2354,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Unir pun
STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Construir un punto de ruta separado
# Generic toolbar
+STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Desactivado porque actualmente no hay vehículos disponibles para esta infraestructura
# Rail construction toolbar
STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Construcción de Ferrocarril
@@ -2405,21 +2406,21 @@ STR_STATION_CLASS_WAYP :Puntos de ruta
# Signal window
STR_BUILD_SIGNAL_CAPTION :{WHITE}Selección de Señales
STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Señal de bloque (mecánica){}Es el tipo de señal más básico, que permite a un único tren estar a la vez en el mismo bloque
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Señal de entrada (mecánica){}Verde si existen una o más señales de salida en el tramo en verde, de lo contrario estará en rojo
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Señal de entrada (mecánica){}En verde si existen una o más señales en verde en el siguiente segmento de vía; de lo contrario, estará en rojo
STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Señal de salida (mecánica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo
STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Señal combo (mecánica){}La señal combo actúa como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Señal de ruta (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de un sentido (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Señal de bloque (eléctrica){}Es el tipo de señal más básico, que permite a un único tren estar a la vez en el mismo bloque
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Señal de entrada (eléctrica){}Verde si existen una o más señales verdes en el siguiente segmento de vía, de lo contrario estará en rojo
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Señal de salida (eléctrica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Señal de ruta (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser rebasadas desde atrás
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de sentido único (mecánica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser rebasadas desde atrás
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Señal de bloque (eléctrica){}Es el tipo de señal más básico, que permite estar solamente a un tren en el mismo bloque
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Señal de entrada (eléctrica){}En verde si existen una o más señales en verde en el siguiente segmento de vía; de lo contrario, estará en rojo
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Señal de salida (eléctrica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar correctamente las señales de entrada y combo
STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Señal combo (eléctrica){}La señal combo actúa como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Señal de ruta (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de un sentido (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Señal de ruta (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser rebasadas desde atrás
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Señal de ruta de sentido único (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser rebasadas desde atrás
STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Convertir señal{}Cuando es seleccionado, pulsar sobre una señal existente la convierte en el tipo y variante indicados. Pulsar Ctrl+Clic permite cambiar de variante. Mayús+Clic muestra una estimación del precio de conversión
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Distancia del arrastre de señales
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Reducir distancia del arrastre de señales
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Incrementar distancia del arrastre de señales
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Distancia de arrastre de señales
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Reducir la distancia de arrastre de señales
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Incrementar la distancia de arrastre de señales
# Bridge selection window
STR_SELECT_RAIL_BRIDGE_CAPTION :{WHITE}Seleccione Puente de Ferrocarril
@@ -2631,6 +2632,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Permite
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Información del terreno
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrar la vista principal en la posición de la casilla. Ctrl+Clic abre un nuevo punto de vista en dicha posición.
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Coste de despeje: {LTBLUE}N/D
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Coste de despeje: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Beneficio cuando es limpiado: {LTBLUE}{CURRENCY_LONG}
@@ -3101,6 +3103,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Activa/d
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Editar texto del cartel
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centrar la vista principal en el cartel. Ctrl+Clic abre un nuevo punto de vista en dicha posición
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Ir al siguiente cartel
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir al anterior cartel
@@ -3757,10 +3760,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Hacer qu
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del tren. Ctrl+Clic sigue al tren en la vista principal
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del vehículo. Ctrl+Clic sigue al vehículo en la vista principal
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición del barco. Ctrl+Clic sigue al barco en la vista principal
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar vista en posición de la aeronave. Ctrl+Clic sigue a la aeronave en la vista principal
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición del tren. Doble clic seguirá al tren en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición del vehículo. Doble clic seguirá al vehículo en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición.
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición del barco. Doble clic seguirá al barco en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición.
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK}Centrar la vista principal en la posición de la aeronave. Doble clic seguirá la aeronave en la vista principal. Ctrl+Clic abre un nuevo punto de vista en dicha posición.
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren al depósito. Ctrl+Clic para realizar solamente mantenimiento
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar vehículo al depósito. Ctrl+Clic para realizar solamente mantenimiento
@@ -3792,10 +3795,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalles del barco
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Mostrar detalles de la aeronave
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del tren - Clic para detener/arrancar el tren. Ctrl+Clic para desplazarse hasta el destino
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del vehículo - Clic para detener/arrancar vehículo. Ctrl+Clic para desplazarse hasta el destino
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual del barco - Clic para detener/arrancar barco. Ctrl+Clic para desplazarse hasta el destino
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Acción actual de la aeronave - Clic para detener/arrancar aeronave. Ctrl+Clic para desplazarse hasta el destino
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del tren - clicar para detener/arrancar el tren
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del vehículo - clicar para detener/arrancar el vehículo
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Acción actual del barco - clicar para detener/arrancar el barco
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual de la aeronave - clicar para detener/arrancar la aeronave
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centrar la vista principal en el destino de la orden. Ctrl+Clic abre un nuevo punto de vista en dicha posición
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando / Descargando
@@ -4023,6 +4028,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Reformar en {S
STR_ORDER_STOP_ORDER :(Detenerse)
STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(No puede usar la estación){POP_COLOUR} {STRING} {STATION} {STRING}
STR_ORDER_IMPLICIT :(Implícita)
@@ -4139,7 +4145,7 @@ STR_DATE_YEAR_TOOLTIP :{BLACK}Seleccio
# AI debug window
-STR_AI_DEBUG :{WHITE}Depuración de Scripts de Juego / IA
+STR_AI_DEBUG :{WHITE}Depuración de Scripts de juego / IA
STR_AI_DEBUG_NAME_AND_VERSION :{BLACK}{STRING} (v{NUM})
STR_AI_DEBUG_NAME_TOOLTIP :{BLACK}Nombre del script
STR_AI_DEBUG_SETTINGS :{BLACK}Configuración
@@ -4155,18 +4161,18 @@ STR_AI_DEBUG_MATCH_CASE_TOOLTIP :{BLACK}Activa/d
STR_AI_DEBUG_CONTINUE :{BLACK}Continuar
STR_AI_DEBUG_CONTINUE_TOOLTIP :{BLACK}Quitar pausa y hacer que la IA continúe
STR_AI_DEBUG_SELECT_AI_TOOLTIP :{BLACK}Mostrar salida de depuración de esta IA
-STR_AI_GAME_SCRIPT :{BLACK}Script de Juego
-STR_AI_GAME_SCRIPT_TOOLTIP :{BLACK}Comprobar el registro del Script de Juego
+STR_AI_GAME_SCRIPT :{BLACK}Script de juego
+STR_AI_GAME_SCRIPT_TOOLTIP :{BLACK}Comprobar el registro del Script de juego
STR_ERROR_AI_NO_AI_FOUND :No se encontró IA apropiada para cargar.{}Ésta es una IA por defecto que no realiza acción alguna.{}Puedes descargar nuevas IA mediante el sistema de 'Contenido Online'
STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}Uno de los scripts ejecutados ha fallado. Por favor, informe del fallo al autor del script con una captura de la ventana de depuración de Script / IA
STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}La ventana de depuración de Scripts solo está disponible para el servidor
# AI configuration window
-STR_AI_CONFIG_CAPTION :{WHITE}Configuración de Scripts de Juego / IA
-STR_AI_CONFIG_GAMELIST_TOOLTIP :{BLACK}Script de Juego que será cargado en la próxima partida
-STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}IAs que serán cargadas en la próxima partida
-STR_AI_CONFIG_HUMAN_PLAYER :Jugador Humano
+STR_AI_CONFIG_CAPTION :{WHITE}Configuración de Scripts de juego / IA
+STR_AI_CONFIG_GAMELIST_TOOLTIP :{BLACK}Script de juego que será cargado en la próxima partida
+STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}IA que serán cargadas en la próxima partida
+STR_AI_CONFIG_HUMAN_PLAYER :Jugador humano
STR_AI_CONFIG_RANDOM_AI :IA aleatoria
STR_AI_CONFIG_NONE :(ninguna)
@@ -4175,13 +4181,13 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP :{BLACK}Mover la
STR_AI_CONFIG_MOVE_DOWN :{BLACK}Mover hacia abajo
STR_AI_CONFIG_MOVE_DOWN_TOOLTIP :{BLACK}Mover la IA seleccionada hacia abajo
-STR_AI_CONFIG_GAMESCRIPT :{SILVER}Script de Juego
+STR_AI_CONFIG_GAMESCRIPT :{SILVER}Script de juego
STR_AI_CONFIG_AI :{SILVER}IA
STR_AI_CONFIG_CHANGE :{BLACK}Seleccionar {STRING}
STR_AI_CONFIG_CHANGE_NONE :
STR_AI_CONFIG_CHANGE_AI :IA
-STR_AI_CONFIG_CHANGE_GAMESCRIPT :Script de Juego
+STR_AI_CONFIG_CHANGE_GAMESCRIPT :Script de juego
STR_AI_CONFIG_CHANGE_TOOLTIP :{BLACK}Cargar otro script
STR_AI_CONFIG_CONFIGURE :{BLACK}Configurar
STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Configura los parámetros del script
@@ -4189,7 +4195,7 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Configur
# Available AIs window
STR_AI_LIST_CAPTION :{WHITE}Disponible {STRING}
STR_AI_LIST_CAPTION_AI :IAs
-STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts de Juego
+STR_AI_LIST_CAPTION_GAMESCRIPT :Scripts de juego
STR_AI_LIST_TOOLTIP :{BLACK}Clic para seleccionar un script
STR_AI_LIST_AUTHOR :{LTBLUE}Autor: {ORANGE}{STRING}
@@ -4212,7 +4218,7 @@ STR_SCREENSHOT_MINIMAP_SCREENSHOT :{BLACK}Minimapa
# AI Parameters
STR_AI_SETTINGS_CAPTION :{WHITE}Parámetros {STRING}
STR_AI_SETTINGS_CAPTION_AI :IA
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT :Script de Juego
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT :Script de juego
STR_AI_SETTINGS_CLOSE :{BLACK}Cerrar
STR_AI_SETTINGS_RESET :{BLACK}Reiniciar
STR_AI_SETTINGS_SETTING :{STRING}: {ORANGE}{STRING}
@@ -4475,6 +4481,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Tipo de depósi
STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} es demasiado largo después del reemplazo
STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}No se han aplicado reglas de autoreemplazo/renovación
STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(límite de dinero)
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}El nuevo vehículo no puede transportar {STRING}
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}El nuevo vehículo no se puede reformar en la orden {NUM}
# Rail construction errors
STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Combinación de tramos imposible
diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt
index 78db61f4e5..198312fa44 100644
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -235,7 +235,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Elegir o
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Elegir criterio de orden
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Elegir criterio de filtrado
STR_BUTTON_SORT_BY :{BLACK}Ordenar por
-STR_BUTTON_LOCATION :{BLACK}Ubicación
STR_BUTTON_RENAME :{BLACK}Cambiar nombre
STR_BUTTON_CATCHMENT :{BLACK}Cobertura
STR_TOOLTIP_CATCHMENT :{BLACK}Mostrar u ocultar área de cobertura
@@ -394,7 +393,7 @@ STR_SETTINGS_MENU_NEWGRF_SETTINGS :Configuración
STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS :Opciones de transparencia
STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED :Mostrar nombres de pueblos
STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED :Mostrar nombres de estaciones
-STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :Mostrar puntos guías
+STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :Mostrar puntos de ruta
STR_SETTINGS_MENU_SIGNS_DISPLAYED :Mostrar carteles propios
STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS :Mostrar carteles y nombres del competidor
STR_SETTINGS_MENU_FULL_ANIMATION :Animación completa
@@ -641,10 +640,10 @@ STR_PERFORMANCE_DETAIL_TOTAL :{BLACK}Total:
STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP :{BLACK}Cuántos vehículos tuvieron ganancias el último año, contando los de carretera, trenes, barcos y aeronaves
STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP :{BLACK}Número de estaciones abastecidas recientemente. Las estaciones de tren, paradas de autobuses, aeropuertos y demás se contabilizan aparte, aun si pertenecen a la misma estación
STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP :{BLACK}Utilidad del vehículo con menores ingresos (de entre aquellos con más de 2 años)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más baja de los pasados 12 trimestres
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más alta de los pasados 12 trimestres
-STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP :{BLACK}Unidades de cargamento entregadas en los pasados cuatro trimestres
-STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP :{BLACK}Número de tipos de cargamento entregados en el trimestre pasado
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más baja de los últimos 12 trimestres
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP :{BLACK}Cantidad de efectivo ganado en el trimestre con la utilidad más alta de los últimos 12 trimestres
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP :{BLACK}Unidades de cargamento entregadas en los últimos cuatro trimestres
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP :{BLACK}Número de tipos de cargamento entregados en el último trimestre
STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP :{BLACK}Cantidad de dinero que esta empresa tiene en el banco
STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP :{BLACK}Cantidad de dinero que esta empresa ha recibido como préstamo
STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP :{BLACK}Total de puntos ganados del máximo posible
@@ -750,6 +749,7 @@ STR_SMALLMAP_LEGENDA_DOCK :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_ROUGH_LAND :{TINY_FONT}{BLACK}Terreno irregular
STR_SMALLMAP_LEGENDA_GRASS_LAND :{TINY_FONT}{BLACK}Pasto
STR_SMALLMAP_LEGENDA_BARE_LAND :{TINY_FONT}{BLACK}Terreno árido
+STR_SMALLMAP_LEGENDA_RAINFOREST :{TINY_FONT}{BLACK}Selva
STR_SMALLMAP_LEGENDA_FIELDS :{TINY_FONT}{BLACK}Campos
STR_SMALLMAP_LEGENDA_TREES :{TINY_FONT}{BLACK}Árboles
STR_SMALLMAP_LEGENDA_ROCKS :{TINY_FONT}{BLACK}Rocas
@@ -761,7 +761,7 @@ STR_SMALLMAP_LEGENDA_DESERT :{TINY_FONT}{BLA
STR_SMALLMAP_LEGENDA_SNOW :{TINY_FONT}{BLACK}Nieve
STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF :{BLACK}Mostrar u ocultar nombres de pueblos en el mapa
-STR_SMALLMAP_CENTER :{BLACK}Centrar vista en la ubicación actual
+STR_SMALLMAP_CENTER :{BLACK}Centrar la vista en la ubicación actual
STR_SMALLMAP_INDUSTRY :{TINY_FONT}{STRING} ({NUM})
STR_SMALLMAP_LINKSTATS :{TINY_FONT}{STRING}
STR_SMALLMAP_COMPANY :{TINY_FONT}{COMPANY}
@@ -1452,6 +1452,8 @@ STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS :Mantener activa
STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS_HELPTEXT :Mantener abiertas las herramientas de construcción de puentes, túneles, etc., después de usarlas
STR_CONFIG_SETTING_EXPENSES_LAYOUT :Agrupar gastos en la ventana de finanzas: {STRING}
STR_CONFIG_SETTING_EXPENSES_LAYOUT_HELPTEXT :Definir el diseño de la ventana de finanzas
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS :Quitar señales de forma automática al construir vías férreas: {STRING}
+STR_CONFIG_SETTING_AUTO_REMOVE_SIGNALS_HELPTEXT :Quitar las señales de forma automática al construir vías férreas si estas obstruyen. Puede provocar choques de trenes.
STR_CONFIG_SETTING_SOUND_TICKER :Boletín de noticias: {STRING}
STR_CONFIG_SETTING_SOUND_TICKER_HELPTEXT :Reproducir sonido para mensajes resumidos de noticias
@@ -1836,6 +1838,7 @@ STR_ABANDON_SCENARIO_QUERY :{YELLOW}¿Está
# Cheat window
STR_CHEATS :{WHITE}Trucos
STR_CHEATS_TOOLTIP :{BLACK}Las casillas marcadas indican que ya se usó este truco
+STR_CHEATS_NOTE :{BLACK}Nota: todo uso de esta configuración se guardará en el archivo de juego
STR_CHEAT_MONEY :{LTBLUE}Añadir {CURRENCY_LONG} en efectivo
STR_CHEAT_CHANGE_COMPANY :{LTBLUE}Jugar como la empresa: {ORANGE}{COMMA}
STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Excavadora mágica (elimina industrias y objetos inamovibles): {ORANGE}{STRING}
@@ -2312,16 +2315,16 @@ STR_MISSING_GRAPHICS_NO_QUIT :{BLACK}No, sali
# Transparency settings window
STR_TRANSPARENCY_CAPTION :{WHITE}Opciones de transparencia
-STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Activar o desactivar transparencia para carteles. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Activar o desactivar transparencia para árboles. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Activar o desactivar transparencia para casas. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Activar o desactivar transparencia para industrias. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Activar o desactivar transparencia para edificios como estaciones, depósitos o puntos guías. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Activar o desactivar transparencia para puentes. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Activar o desactivar transparencia para estructuras como faros o antenas. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Activar o desactivar transparencia para catenaria. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Activar o desactivar transparencia para indicadores de carga. Ctrl+Clic para excluir de tecla rápida 'X'
-STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Ocultar objetos totalmente (deben ser transparentes primero)
+STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Transparencia de carteles. Ctrl+Clic para bloquear
+STR_TRANSPARENT_TREES_TOOLTIP :{BLACK}Transparencia de árboles. Ctrl+Clic para bloquear
+STR_TRANSPARENT_HOUSES_TOOLTIP :{BLACK}Transparencia de casas. Ctrl+Clic para bloquear
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP :{BLACK}Transparencia de industrias. Ctrl+Clic para bloquear
+STR_TRANSPARENT_BUILDINGS_TOOLTIP :{BLACK}Transparencia de estaciones, depósitos o puntos de ruta. Ctrl+Clic para bloquear
+STR_TRANSPARENT_BRIDGES_TOOLTIP :{BLACK}Transparencia de puentes. Ctrl+Clic para bloquear
+STR_TRANSPARENT_STRUCTURES_TOOLTIP :{BLACK}Transparencia de estructuras como faros o antenas. Ctrl+Clic para bloquear
+STR_TRANSPARENT_CATENARY_TOOLTIP :{BLACK}Transparencia de catenaria. Ctrl+Clic para bloquear
+STR_TRANSPARENT_LOADING_TOOLTIP :{BLACK}Transparencia de indicadores de cargamento. Ctrl+Clic para bloquear
+STR_TRANSPARENT_INVISIBLE_TOOLTIP :{BLACK}Ocultar objetos totalmente
# Linkgraph legend window
STR_LINKGRAPH_LEGEND_CAPTION :{BLACK}Leyenda de flujo de cargamento
@@ -2352,6 +2355,7 @@ STR_JOIN_WAYPOINT_CAPTION :{WHITE}Unir pun
STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT :{YELLOW}Construir aparte
# Generic toolbar
+STR_TOOLBAR_DISABLED_NO_VEHICLE_AVAILABLE :{BLACK}Deshabilitado al no haber vehículos disponibles para esta infraestructura
# Rail construction toolbar
STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION :Construcción de ferrocarril
@@ -2362,12 +2366,12 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION :Construcción d
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Construir tramo de vías férreas en una orientación. Ctrl quita o coloca vías. Mayús muestra una estimación del precio
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL :{BLACK}Construir tramo de vías férreas con orientación automática. Ctrl quita o coloca vías. Mayús muestra una estimación del precio
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Construir depósito de trenes (para comprar y dar mantenimiento a trenes). Mayús muestra una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Construir punto guía sobre vías férreas. Ctrl activa la unión de puntos guías. Mayús muestra una estimación del precio
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Construir punto de ruta sobre vías férreas. Ctrl activa la unión de puntos de ruta. Mayús muestra una estimación del precio
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION :{BLACK}Construir estación de ferrocarril. Ctrl activa la ampliación de estaciones. Mayús muestra una estimación del precio
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Poner señales. Ctrl intercambia señales mecánicas y eléctricas{}Arrastrar sobre un tramo recto permite poner señales intercaladas. Ctrl pone señales hasta un desvío u otra señal{}Ctrl+Clic cambia al modo de selección de señales. Mayús muestra una estimación del precio
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Construir puente de ferrocarril. Mayús muestra una estimación del precio
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Construir túnel de ferrocarril. Mayús muestra una estimación del precio
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Quitar vías férreas, señales, estaciones y puntos guías. Al mantener pulsado Ctrl se quitan también las vías al retirar estaciones o puntos guías
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Quitar vías férreas, señales, estaciones y puntos de ruta. Al mantener pulsado Ctrl se quitan también las vías al retirar estaciones o puntos de ruta
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Convertir o actualizar tipos de vías férreas. Mayús muestra una estimación del precio
STR_RAIL_NAME_RAILROAD :Ferrocarril
@@ -2380,8 +2384,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Orientac
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Elegir la orientación del depósito de trenes
# Rail waypoint construction window
-STR_WAYPOINT_CAPTION :{WHITE}Punto guía
-STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Elegir el tipo de punto guía
+STR_WAYPOINT_CAPTION :{WHITE}Punto de ruta
+STR_WAYPOINT_GRAPHICS_TOOLTIP :{BLACK}Elegir el tipo de punto de ruta
# Rail station construction window
STR_STATION_BUILD_RAIL_CAPTION :{WHITE}Selección de estación
@@ -2398,7 +2402,7 @@ STR_STATION_BUILD_STATION_CLASS_TOOLTIP :{BLACK}Mostrar
STR_STATION_BUILD_STATION_TYPE_TOOLTIP :{BLACK}Construir el tipo de estación elegida
STR_STATION_CLASS_DFLT :Estación por defecto
-STR_STATION_CLASS_WAYP :Puntos guías
+STR_STATION_CLASS_WAYP :Puntos de ruta
# Signal window
STR_BUILD_SIGNAL_CAPTION :{WHITE}Selección de señales
@@ -2422,7 +2426,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP :{BLACK}Aumentar
# Bridge selection window
STR_SELECT_RAIL_BRIDGE_CAPTION :{WHITE}Selección de puente de ferrocarril
STR_SELECT_ROAD_BRIDGE_CAPTION :{WHITE}Selección de puente de carretera
-STR_SELECT_BRIDGE_SELECTION_TOOLTIP :{BLACK}Selección de puente: Clic en el puente elegido para construirlo
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP :{BLACK}Selección de puente. Clic para construir
STR_SELECT_BRIDGE_INFO :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
STR_SELECT_BRIDGE_SCENEDIT_INFO :{GOLD}{STRING},{} {VELOCITY}
STR_BRIDGE_NAME_SUSPENSION_STEEL :Colgante (acero)
@@ -2484,7 +2488,7 @@ STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP :{BLACK}Construi
STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP :{BLACK}Construir esclusa. Mayús muestra una estimación del precio
STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP :{BLACK}Construir astillero (para comprar y dar mantenimiento a barcos). Mayús muestra una estimación del precio
STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP :{BLACK}Construir muelles. Ctrl activa la ampliación de estaciones. Mayús muestra una estimación del precio
-STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Colocar boya para utilizar como punto guía marítimo. Mayús muestra una estimación del precio
+STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Colocar boya para utilizar como punto de ruta marítimo. Mayús muestra una estimación del precio
STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Construir acueducto. Mayús muestra una estimación del precio
STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP :{BLACK}Definir cuerpo de agua.{}Crea un canal, a menos que se pulse Ctrl en un área al nivel del mar, en cuyo caso se inundarán los alrededores
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP :{BLACK}Colocar ríos
@@ -2629,6 +2633,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Elegir l
# Land area window
STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Información sobre área de terreno
+STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la casilla.Ctrl+Clic abre una vista aparte
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Costo por despejar: {LTBLUE}N/D
STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Costo por despejar: {RED}{CURRENCY_LONG}
STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED :{BLACK}Ingreso por despejar: {LTBLUE}{CURRENCY_LONG}
@@ -3099,6 +3104,7 @@ STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Distingu
# Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Editar texto del cartel
+STR_EDIT_SIGN_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la señal. Ctrl+Clic abre una vista aparte
STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP :{BLACK}Ir al siguiente cartel
STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP :{BLACK}Ir al cartel anterior
@@ -3109,14 +3115,14 @@ STR_TOWN_DIRECTORY_CAPTION :{WHITE}Pueblos
STR_TOWN_DIRECTORY_NONE :{ORANGE}- Ninguno -
STR_TOWN_DIRECTORY_TOWN :{ORANGE}{TOWN}{BLACK} ({COMMA})
STR_TOWN_DIRECTORY_CITY :{ORANGE}{TOWN}{YELLOW} (ciudad){BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Nombres de pueblos. Clic en un nombre para centrar la vista principal en el pueblo. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_TOWN_DIRECTORY_LIST_TOOLTIP :{BLACK}Nombres de pueblos. Clic para centrar la vista en el pueblo. Ctrl+Clic abre una vista aparte
STR_TOWN_POPULATION :{BLACK}Población mundial: {COMMA}
# Town view window
STR_TOWN_VIEW_TOWN_CAPTION :{WHITE}{TOWN}
STR_TOWN_VIEW_CITY_CAPTION :{WHITE}{TOWN} (ciudad)
STR_TOWN_VIEW_POPULATION_HOUSES :{BLACK}Habitantes: {ORANGE}{COMMA}{BLACK} Casas: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX :{BLACK}{CARGO_LIST} mes pasado: {ORANGE}{COMMA}{BLACK} máx.: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX :{BLACK}{CARGO_LIST} último mes: {ORANGE}{COMMA}{BLACK} máx.: {ORANGE}{COMMA}
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH :{BLACK}Cargamento necesario para crecimiento:
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL :{ORANGE}{STRING}{RED} requeridos
STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER :{ORANGE}{STRING}{BLACK} requerido en invierno
@@ -3127,7 +3133,7 @@ STR_TOWN_VIEW_TOWN_GROWS_EVERY :{BLACK}El puebl
STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED :{BLACK}El pueblo crece cada {ORANGE}{COMMA}{BLACK}{NBSP}días{P "" s} (obra negra)
STR_TOWN_VIEW_TOWN_GROW_STOPPED :{BLACK}El pueblo {RED}no{BLACK} está creciendo
STR_TOWN_VIEW_NOISE_IN_TOWN :{BLACK}Nivel de ruido en el pueblo: {ORANGE}{COMMA}{BLACK} Máx.: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Centrar vista sobre el pueblo. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_TOWN_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en el pueblo. Ctrl+Clic abre una vista aparte
STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON :{BLACK}Ayuntamiento
STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP :{BLACK}Mostrar información sobre el ayuntamiento local
STR_TOWN_VIEW_RENAME_TOOLTIP :{BLACK}Cambiar nombre del pueblo
@@ -3179,7 +3185,7 @@ STR_GOALS_SPECTATOR_NONE :{ORANGE}- No ap
STR_GOALS_PROGRESS :{ORANGE}{STRING}
STR_GOALS_PROGRESS_COMPLETE :{GREEN}{STRING}
STR_GOALS_COMPANY_TITLE :{BLACK}Metas de la empresa
-STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en una meta para centrar la vista principal en la casilla, industria o pueblo. Ctrl+Clic abre una nueva ventana de vista en dicha ubicación
+STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en una meta para centrar la vista en la industria, pueblo o casilla. Ctrl+Clic abre una vista aparte
# Goal question window
STR_GOAL_QUESTION_CAPTION_QUESTION :{BLACK}Pregunta
@@ -3215,7 +3221,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO :{ORANGE}{STRING
STR_SUBSIDIES_NONE :{ORANGE}- Ninguno -
STR_SUBSIDIES_SUBSIDISED_TITLE :{BLACK}Servicios con subsidio:
STR_SUBSIDIES_SUBSIDISED_FROM_TO :{ORANGE}{STRING} desde {STRING} a {STRING}{YELLOW} ({COMPANY}{YELLOW}, hasta {DATE_SHORT})
-STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en un servicio para centrar la vista principal en esta industria o pueblo. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER :{BLACK}Clic en un servicio para centrar la vista en la industria o pueblo. Ctrl+Clic abre una vista aparte
# Story book window
STR_STORY_BOOK_CAPTION :{WHITE}Historial de {COMPANY}
@@ -3231,7 +3237,7 @@ STR_STORY_BOOK_NEXT_PAGE_TOOLTIP :{BLACK}Ir a la
STR_STORY_BOOK_INVALID_GOAL_REF :{RED}Referencia a objetivos no válida
# Station list window
-STR_STATION_LIST_TOOLTIP :{BLACK}Nombres de estaciones: Clic en un nombre para centrar la vista principal en la estación. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_STATION_LIST_TOOLTIP :{BLACK}Nombres de estaciones. Clic para centrar la vista en la estación. Ctrl+Clic abre una vista aparte
STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE :{BLACK}Mantener pulsado Ctrl para seleccionar más de un elemento
STR_STATION_LIST_CAPTION :{WHITE}{COMPANY}: {COMMA} estaci{P ón ones}
STR_STATION_LIST_STATION :{YELLOW}{STATION} {STATION_FEATURES}
@@ -3293,7 +3299,7 @@ STR_CARGO_RATING_EXCELLENT :Excelente
STR_CARGO_RATING_OUTSTANDING :Excepcional
############ range for rating ends
-STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Centrar vista en la ubicación de la estación. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en la estación. Ctrl+Clic abre una vista aparte
STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Cambiar nombre de la estación
STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Mostrar aquellos trenes que tienen esta estación en su itinerario
@@ -3308,9 +3314,9 @@ STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP :{BLACK}No permi
# Waypoint/buoy view window
STR_WAYPOINT_VIEW_CAPTION :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Centrar vista en ubicación del punto guía. Ctrl+Clic abre una ventana de vista en dicha ubicación
-STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Cambiar nombre de punto guía
-STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en la ubicación de la boya. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_WAYPOINT_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en el punto de ruta. Ctrl+Clic abre una vista aparte
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME :{BLACK}Cambiar nombre de punto de ruta
+STR_BUOY_VIEW_CENTER_TOOLTIP :{BLACK}Centrar la vista en la boya. Ctrl+Clic abre una vista aparte
STR_BUOY_VIEW_CHANGE_BUOY_NAME :{BLACK}Cambiar nombre de boya
STR_EDIT_WAYPOINT_NAME :{WHITE}Cambiar nombre de punto de ruta
@@ -3420,7 +3426,7 @@ STR_INDUSTRY_DIRECTORY_ITEM_PROD1 :{ORANGE}{INDUST
STR_INDUSTRY_DIRECTORY_ITEM_PROD2 :{ORANGE}{INDUSTRY} {STRING}, {STRING}
STR_INDUSTRY_DIRECTORY_ITEM_PROD3 :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING}
STR_INDUSTRY_DIRECTORY_ITEM_PRODMORE :{ORANGE}{INDUSTRY} {STRING}, {STRING}, {STRING} y {NUM} más...
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Nombre de industria: Clic en un nombre para centrar la vista principal en la industria. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION :{BLACK}Nombres de industrias. Clic para centrar la vista en la industria. Ctrl+Clic abre una vista aparte
STR_INDUSTRY_DIRECTORY_ACCEPTED_CARGO_FILTER :{BLACK}Cargamento aceptado: {SILVER}{STRING}
STR_INDUSTRY_DIRECTORY_PRODUCED_CARGO_FILTER :{BLACK}Cargemento producido: {SILVER}{STRING}
STR_INDUSTRY_DIRECTORY_FILTER_ALL_TYPES :Todos los tipos
@@ -3428,9 +3434,9 @@ STR_INDUSTRY_DIRECTORY_FILTER_NONE :Ninguno
# Industry view
STR_INDUSTRY_VIEW_CAPTION :{WHITE}{INDUSTRY}
-STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Producción mes pasado:
+STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE :{BLACK}Producción último mes:
STR_INDUSTRY_VIEW_TRANSPORTED :{YELLOW}{CARGO_LONG}{STRING}{BLACK} ({COMMA}% transportado)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Centrar la vista sobre la industria. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la industria. Ctrl+Clic abre una vista aparte
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!
@@ -3451,10 +3457,10 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION :{WHITE}{STRING}
STR_VEHICLE_LIST_SHIP_CAPTION :{WHITE}{STRING}: {COMMA} barco{P "" s}
STR_VEHICLE_LIST_AIRCRAFT_CAPTION :{WHITE}{STRING}: {COMMA} aeronave{P "" s}
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenes: Clic en un tren para más información
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Vehículos de carretera: Clic en un vehículo para más información
-STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos: Clic en un barco para más información
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeronave: Clic en una aeronave para más información
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP :{BLACK}Trenes. Clic para más información
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Vehículos de carretera. Clic para más información
+STR_VEHICLE_LIST_SHIP_TOOLTIP :{BLACK}Barcos. Clic para más información
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP :{BLACK}Aeronave. Clic para más información
STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Ganancias este año: {CURRENCY_LONG} (último año: {CURRENCY_LONG})
@@ -3492,7 +3498,7 @@ STR_GROUP_DEFAULT_AIRCRAFTS :Aeronaves sin a
STR_GROUP_COUNT_WITH_SUBGROUP :{TINY_FONT}{COMMA} (+{COMMA})
-STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Grupos: Clic en un grupo para ver los vehículos incluidos. Arrastrar y soltar para reorganizar los grupos.
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP :{BLACK}Grupos. Clic para ver los vehículos incluidos. Arrastrar y soltar para reorganizar los grupos.
STR_GROUP_CREATE_TOOLTIP :{BLACK}Clic para crear un grupo
STR_GROUP_DELETE_TOOLTIP :{BLACK}Eliminar el grupo seleccionado
STR_GROUP_RENAME_TOOLTIP :{BLACK}Cambiar nombre del grupo seleccionado
@@ -3621,9 +3627,9 @@ STR_DEPOT_VEHICLE_TOOLTIP_CHAIN :{BLACK}{NUM} ve
STR_DEPOT_VEHICLE_TOOLTIP_CARGO :{}{CARGO_LONG} ({CARGO_SHORT})
STR_DEPOT_TRAIN_LIST_TOOLTIP :{BLACK}Trenes: arrastrar vehículos de ferrocarril con Clic izquierdo para añadirlos o quitarlos del tren. Clic derecho para más información. Mantener pulsado Ctrl para usar estos comandos con el resto del tren
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Vehículos de carretera: Clic derecho para más información
-STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Barcos: Clic derecho en barco para más información
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aeronaves: Clic derecho en la aeronave para más información
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK}Vehículos. Clic derecho para más información
+STR_DEPOT_SHIP_LIST_TOOLTIP :{BLACK}Barcos. Clic derecho para más información
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP :{BLACK}Aeronaves. Clic derecho para más información
STR_DEPOT_TRAIN_SELL_TOOLTIP :{BLACK}Arrastrar aquí un vehículo para venderlo
STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP :{BLACK}Arrastrar aquí el vehículo de carretera para venderlo
@@ -3662,10 +3668,10 @@ STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO :{BLACK}Esto com
STR_DEPOT_CLONE_SHIP_DEPOT_INFO :{BLACK}Esto comprará una copia idéntica del barco. Clic en este botón y después en el barco a copiar. Ctrl+Clic para compartir las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esto comprará una copia idéntica de la aeronave. Clic en este botón y después en la aeronave a copiar. Ctrl+Clic para compartir las órdenes. Mayús+Clic muestra una estimación del precio sin realizar la compra
-STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del depósito de trenes. Ctrl+Clic abre una ventana de vista en dicha ubicación
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del depósito de vehículos. Ctrl+Clic abre una ventana de vista en dicha ubicación
-STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del astillero. Ctrl+Clic abre una ventana de vista en dicha ubicación
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del hangar. Ctrl+Clic abre una ventana de vista en dicha ubicación
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el depósito de trenes. Ctrl+Clic abre una vista aparte
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el depósito de vehículos. Ctrl+Clic abre una vista aparte
+STR_DEPOT_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el astillero. Ctrl+Clic abre una vista aparte
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el hangar. Ctrl+Clic abre una vista aparte
STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP :{BLACK}Listar todos los trenes que tengan alguna orden de ir a este depósito
STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP :{BLACK}Listar todos los vehículos que tengan alguna orden de ir a este depósito
@@ -3755,10 +3761,10 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Hacer qu
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrar la vista en la ubicación del tren. Ctrl+Clic sigue al tren en la vista principal
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del vehículo. Ctrl+Clic sigue al vehículo en la vista principal
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación del barco. Ctrl+Clic sigue al barco en la vista principal
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrar vista en la ubicación de la aeronave. Ctrl+Clic sigue a la aeronave en la vista principal
+STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP :{BLACK} Centrar la vista en el tren. Doble clic permite seguir el tren. Ctrl+Clic abre una vista aparte
+STR_VEHICLE_VIEW_ROAD_VEHICLE_CENTER_TOOLTIP :{BLACK} Centrar la vista en el vehículo. Doble clic permite seguir el vehículo. Ctrl+Clic abre una vista aparte
+STR_VEHICLE_VIEW_SHIP_CENTER_TOOLTIP :{BLACK}Centrar la vista en el barco. Ctrl+Clic abre una vista aparte
+STR_VEHICLE_VIEW_AIRCRAFT_CENTER_TOOLTIP :{BLACK} Centrar la vista en la aeronave. Doble clic permite seguir la aeronave. Ctrl+Clic abre una vista aparte
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar tren al depósito. Ctrl+Clic para realizar solamente mantenimiento
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Enviar vehículo al depósito. Ctrl+Clic para realizar solamente mantenimiento
@@ -3790,10 +3796,12 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Ver deta
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Ver detalles del barco
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Ver detalles de la aeronave
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Actividad del tren. Clic para detener o poner en marcha. Ctrl+Clic para desplazarse hasta el destino
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Actividad del vehículo. Clic para detener o poner en marcha. Ctrl+Clic para desplazarse hasta el destino
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Actividad del barco. Clic para detener o poner en marcha. Ctrl+Clic para desplazarse hasta el destino
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Actividad de la aeronave. Clic para aterrizar o despegar. Ctrl+Clic para desplazarse hasta el destino
+STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del tren. Clic para arrancar o detener
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual del vehículo. Clic para arrancar o detener
+STR_VEHICLE_VIEW_SHIP_STATE_STATUS_STOP_TOOLTIP :{BLACK}Acción actual del barco. Clic para arrancar o detener
+STR_VEHICLE_VIEW_AIRCRAFT_STATUS_START_STOP_TOOLTIP :{BLACK}Acción actual de la aeronave. Clic para arrancar o detener
+
+STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP :{BLACK}Centrar la vista en el destino de la orden. Ctrl+Clic abre una vista aparte
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Cargando/Descargando
@@ -3916,7 +3924,7 @@ STR_ORDERS_CAPTION :{WHITE}{VEHICLE
STR_ORDERS_TIMETABLE_VIEW :{BLACK}Itinerario
STR_ORDERS_TIMETABLE_VIEW_TOOLTIP :{BLACK}Cambiar a la ventana de itinerarios
-STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes: Clic en una orden para resaltarla. Ctrl+Clic para desplazarse a la estación indicada en la orden
+STR_ORDERS_LIST_TOOLTIP :{BLACK}Lista de órdenes. Clic para resaltar. Ctrl+Clic para ir al destino de la orden
STR_ORDER_INDEX :{COMMA}:{NBSP}
STR_ORDER_TEXT :{STRING} {STRING} {STRING}
@@ -4021,6 +4029,7 @@ STR_ORDER_REFIT_STOP_ORDER :(Reformar a {ST
STR_ORDER_STOP_ORDER :(Detenerse)
STR_ORDER_GO_TO_STATION :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION_CAN_T_USE_STATION :{PUSH_COLOUR}{RED}(No se puede usar la estación){POP_COLOUR} {STRING} {STATION} {STRING}
STR_ORDER_IMPLICIT :(Implícito)
@@ -4072,7 +4081,7 @@ STR_TIMETABLE_TITLE :{WHITE}{VEHICLE
STR_TIMETABLE_ORDER_VIEW :{BLACK}Órdenes
STR_TIMETABLE_ORDER_VIEW_TOOLTIP :{BLACK}Cambiar a la ventana de órdenes
-STR_TIMETABLE_TOOLTIP :{BLACK}Itinerarios: Clic en una orden para marcarla
+STR_TIMETABLE_TOOLTIP :{BLACK}Itinerarios. Clic en una orden para resaltarla
STR_TIMETABLE_NO_TRAVEL :No viajar
STR_TIMETABLE_NOT_TIMETABLEABLE :Viajar (automático; programado por la próxima orden manual)
@@ -4144,12 +4153,12 @@ STR_AI_DEBUG_SETTINGS :{BLACK}Configur
STR_AI_DEBUG_SETTINGS_TOOLTIP :{BLACK}Cambiar la configuración del script
STR_AI_DEBUG_RELOAD :{BLACK}Volver a cargar código
STR_AI_DEBUG_RELOAD_TOOLTIP :{BLACK}Eliminar la IA, volver a cargar el código y reiniciar la IA
-STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP :{BLACK}Activar o desactivar interrupción cuando un mensaje de log de la IA coincida con la cadena de interrupción
+STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP :{BLACK}Alternar interrupción de ejec. cuando la IA registre un mensaje que coincida con el texto de interrupción
STR_AI_DEBUG_BREAK_ON_LABEL :{BLACK}Interrumpir en:
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 coincida con esta cadena, poner el juego en pausa
STR_AI_DEBUG_MATCH_CASE :{BLACK}Distinguir mayúsculas
-STR_AI_DEBUG_MATCH_CASE_TOOLTIP :{BLACK}Activar o desactivar la distinción de mayúsculas al comparar los mensajes del log de la IA con la cadena de interrupción
+STR_AI_DEBUG_MATCH_CASE_TOOLTIP :{BLACK}Alternar distinción de mayúsculas al comparar los mensajes registrados de la IA con el texto de interrupción
STR_AI_DEBUG_CONTINUE :{BLACK}Continuar
STR_AI_DEBUG_CONTINUE_TOOLTIP :{BLACK}Quitar la pausa y hacer que la IA continúe
STR_AI_DEBUG_SELECT_AI_TOOLTIP :{BLACK}Mostrar salida de depuración de esta IA
@@ -4432,7 +4441,7 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST :{WHITE}Primero
# Waypoint related errors
STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING :{WHITE}Se amplía más de un punto de ruta existente
-STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Demasiado cerca de otro punto guía
+STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT :{WHITE}Demasiado cerca de otro punto de ruta
STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT :{WHITE}No se puede construir el punto de ruta aquí...
STR_ERROR_CAN_T_POSITION_BUOY_HERE :{WHITE}No se puede colocar la boya aquí...
@@ -4473,6 +4482,8 @@ STR_ERROR_DEPOT_WRONG_DEPOT_TYPE :Tipo de depósi
STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT :{WHITE}{VEHICLE} es demasiado largo después del reemplazo
STR_ERROR_AUTOREPLACE_NOTHING_TO_DO :{WHITE}No se han aplicado reglas de reemplazo o renovación
STR_ERROR_AUTOREPLACE_MONEY_LIMIT :(límite de dinero)
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_CARGO :{WHITE}El nuevo vehículo no puede llevar {STRING}
+STR_ERROR_AUTOREPLACE_INCOMPATIBLE_REFIT :{WHITE}El nuevo vehículo no puede reformarse en la orden {NUM}
# Rail construction errors
STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION :{WHITE}Combinación imposible de vías
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 9a2aa7db84..7e4bb93ac1 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Välj so
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Välj sortering
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Angre kriterier för filtrering
STR_BUTTON_SORT_BY :{BLACK}Sortera efter
-STR_BUTTON_LOCATION :{BLACK}Plats
STR_BUTTON_RENAME :{BLACK}Byt namn
STR_BUTTON_CATCHMENT :{BLACK}Upptagningsområde
STR_TOOLTIP_CATCHMENT :{BLACK}Växla visning av upptagningsområde
@@ -3720,10 +3719,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gör så
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför tåget. Ctrl+klick följer tåget i huvudvyn
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför fordonet. Ctrl+klick följer fordonet i huvudvyn
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför skeppet. Ctrl+klick följer skeppet i huvudvyn
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Centrera huvudvyn ovanför flygplanet. Ctrl+klick följer flygplanet i huvudvyn
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Skicka tåg till depå. Ctrl+klick skickar tåget enbart på service
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Skicka fordon till depå. Ctrl+klick servar endast
@@ -3755,10 +3750,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Visa vä
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Visa skeppdetaljer
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Visa flygplan detaljer
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Aktuell tåghandling - klicka här för att stoppa/starta tåg. Ctrl+klick för att scrolla till destination.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Nuvarande fordonsaktivitet - Klicka här för att stoppa/starta fordon. Ctrl+Klick för att scrolla till destination.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Nuvarande skeppshandling - Klicka här för att stoppa/starta skepp. Ctrl+Klick för att scrolla till destination
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Nuvarande flygplanshandling - Klicka här för att stoppa/starta flygplan. Ctr+klick för att scrolla till destinationen
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Lastar / lastar av
diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt
index 0ffea150cf..539d201dd0 100644
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Select s
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Select sorting criteria
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Select filtering criteria
STR_BUTTON_SORT_BY :{BLACK}Sort by
-STR_BUTTON_LOCATION :{BLACK}Location
STR_BUTTON_RENAME :{BLACK}Rename
STR_TOOLTIP_CATCHMENT :{BLACK}தழுவு பகுதி காட்சியை நிலைமாற்று
@@ -3300,8 +3299,6 @@ STR_REPLACE_REMOVE_WAGON :{BLACK}பெ
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}வாகனத்தின் இருப்பிடத்தினை மையமாகக் கொள். Ctrl + Click முக்கிய பார்வையில் வாகனத்தைப் பின்தொடரும்
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}விமானத்தின் இருப்பிடத்தினை மையமாகக் கொள். Ctrl + Click முக்கிய பார்வையில் விமானத்தைப் பின்தொடரும்
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}இரயிலினை பணிமனைக்கு அனுப்பவும். Ctrl+Click அழுத்தினால் பழுதுபார்த்தல் மட்டுமே நடக்கும்
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}வாகனத்தினை பணிமனைக்கு அனுப்பவும். Ctrl+Click அழுத்தினால் பழுதுபார்த்தல் மட்டுமே நடக்கும்
@@ -3333,10 +3330,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}சா
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}கப்பலின் விவரங்களைக் காட்டு
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}விமானத்தின் விவரங்களைக் காட்டு
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய இரயில்வே செயல் - இரயிலினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும்
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய வாகனங்கள் செயல் - வாகனத்தினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும்
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய கப்பல் செயல் - கப்பலினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும்
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}தற்போதைய விமான செயல் - விமானத்தினை நிறுத்த/கிளப்ப சொடுக்கவும். Ctrl+Click அழுத்தினால் செல்லவேண்டிய இடத்தினைக் காட்டும்
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}சரக்கு ஏற்றம் / இறக்கம்
diff --git a/src/lang/thai.txt b/src/lang/thai.txt
index 94886dd8fa..6ee1192915 100644
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}เล
STR_TOOLTIP_SORT_CRITERIA :{BLACK}เลือกเกณฑ์การเรียงลำดับ
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}เลือกเกณฑ์การกรอง
STR_BUTTON_SORT_BY :{BLACK}เรียงตาม
-STR_BUTTON_LOCATION :{BLACK}ที่ตั้ง
STR_BUTTON_RENAME :{BLACK}เปลี่ยนชื่อ
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}ปิดหน้าต่าง
@@ -3454,10 +3453,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}ทำ
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของขบวนรถ
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของพาหนะ
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของเรือ
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}กดเพื่อไปยังจุดศูนย์กลางของอากาศยาน
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}ส่งขบวนรถไปยังโรงซ่อมบำรุง
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}ส่งยานพาหนะไปยังโรงซ่อมบำรุง
@@ -3489,10 +3484,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}แส
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}{BLACK}แสดงรายละเอียดของเรือลำนี้
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}{BLACK}แสดงรายละเอียดของอากาศยานลำนี้
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของขบวนรถนี้
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของรถคันนี้
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของเรือลำนี้
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}สภาพการปัจจุบันของเครื่องบินลำนี้
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}อยู่ระหว่างการขนถ่าย
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index 0f4356ad79..4afcc6d5fb 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}選擇
STR_TOOLTIP_SORT_CRITERIA :{BLACK}選擇排序項目
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}選擇過濾條件
STR_BUTTON_SORT_BY :{BLACK}排序依照
-STR_BUTTON_LOCATION :{BLACK}位置
STR_BUTTON_RENAME :{BLACK}重新命名
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}關閉視窗
@@ -3542,10 +3541,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}如果
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}將列車置於畫面中央。按住 Ctrl 點選可於畫面中央追蹤該列車
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}將車輛置於畫面中央。 按住 Ctrl 點選可於畫面中央追蹤該車輛
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}將船舶置於畫面中央。按住 Ctrl 點選可於畫面中央追蹤該船舶
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}將飛機置於畫面中央。按住 Ctrl 點選可於畫面中央追蹤該飛機
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}將列車送回機廠，按住 CTRL 點選機廠則僅做維護
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}將車輛送到車庫，按住 CTRL 點選則只做維護
@@ -3577,10 +3572,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}顯示
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}顯示船舶詳細資料
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}顯示飛機詳細資料
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}列車目前的動作 - 按此可停止／起動列車。按住 Ctrl 點選可以捲動到目的地。
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}目前車輛動作 - 點選這裡可停止／起動車輛。按住 Ctrl 點選可以捲動到目的地。
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}目前船舶動作 - 按此可停止／起動船舶。按住 Ctrl 點選可以捲動到目的地。
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}目前飛機動作 - 按此可停止／起動飛機。按住 Ctrl 點選可以捲動到目的地。
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}正在裝卸貨物
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 746596a21d..0be33fe5e1 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -234,7 +234,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Sıralam
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Sıralama kriterini seçin
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Süzme kriterini seçin
STR_BUTTON_SORT_BY :{BLACK}Sırala
-STR_BUTTON_LOCATION :{BLACK}Göster
STR_BUTTON_RENAME :{BLACK}Yeni ad
STR_BUTTON_CATCHMENT :{BLACK}Kapsama alanı
STR_TOOLTIP_CATCHMENT :{BLACK}Kapsama alanını göstermeyi aç/kapa
@@ -3721,10 +3720,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Otomatik
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Treni göster. Ctrl ile tıklama trenin konumunu gösteren yeni bir pencere açar
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Aracı göster. Ctrl ile tıklama aracın konumunu gösteren yeni bir pencere açar
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Gemiyi göster. Ctrl ile tıklama geminin konumunu gösteren yeni bir pencere açar
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Ana görüntüyü uçağın olduğu yere alır. Ctrl-tık ana görüntüde uçağı takip eder
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Treni garaja gönder
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Aracı garaja gönder
@@ -3756,10 +3751,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Karayolu
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Gemi ayrıntılarını göster
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Uçak ayrıntılarını göster
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Trenin mevcut hareketi - treni durdurmak/başlatmak için buraya tıklayın. Hedefe gitmek için CTRL+Tıkla
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Aracın mevcut hareketi - durdurmak/başlatmak için tıklayın. Hedefe gitmek için CTRL+Tıklama
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Geminin mevcut hareketi - durdurmak/başlatmak için buraya tıklayın. Hedefe gitmek için CTRL+Tıklama
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Uçağın durumu - uçağı durdurmak/başlatmak için tıklayın. Ctrl+Tıklama ile hedefe gidin
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Yükleme / Boşaltma
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index 18ba4df658..5c11e9cbf6 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -358,7 +358,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Обер
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Оберіть критерій сортування
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Оберіть критерій фільтру
STR_BUTTON_SORT_BY :{BLACK}Сортувати
-STR_BUTTON_LOCATION :{BLACK}Показати
STR_BUTTON_RENAME :{BLACK}Назва
STR_BUTTON_CATCHMENT :{BLACK}Покриття
STR_TOOLTIP_CATCHMENT :{BLACK}Вкл./викл. відображення області покриття
@@ -3851,10 +3850,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Дозв
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Показати поїзд у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Показати автомобіль у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Показати корабель у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Показати літак у центрі екрану. Ctrl+клац мишою спричинить слідкування за ним у головному вікні
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Направити поїзд у депо
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Направити авто в депо
@@ -3886,10 +3881,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Пока
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Показати корабель детально
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Показати літак детально
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія поїзда - натисніть для руху/зупинки поїзда. Утримуйте Ctrl, щоб показати пункт призначення
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія автомобіля - натисніть для руху/зупинки автомобіля. Утримуйте Ctrl, щоб показати пункт призначення
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія корабля - натисніть для руху/зупинки корабля. Утримуйте Ctrl, щоб показати пункт призначення
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Поточна дія літака - натисніть для руху/зупинки літака. Утримуйте Ctrl, щоб показати пункт призначення
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Вантаження
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index de76c86fe4..ce7de03d51 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Selektea
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Selektear skiftnoarm
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Selekear filternoarm
STR_BUTTON_SORT_BY :{BLACK}Skifte op
-STR_BUTTON_LOCATION :{BLACK}Lokaasje
STR_BUTTON_RENAME :{BLACK}op 'e nij neamme
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Slút finster
@@ -3216,10 +3215,6 @@ STR_REPLACE_MAGLEV_VEHICLES :Maglev treinen
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje fan disse trein. bij Ctrl+Click bliuwst it skip folgjen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje van dizze wein. Brûk Ctrl+klik om dizze wein te folgjen
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje fan dit skip. bij Ctrl+Click bliuwst it skip folgjen
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Sintrearje it byld op de lokaasje fan dit fleantúch
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer trein nei depot. Brûk Ctrl+Klik om allinich ûnderhâld te jaan
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Stjoer wein nei garaazje. Brûk Ctrl+Klik om allinich ûnderhâld te jaan
@@ -3241,6 +3236,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Lit oard
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Fleantúch details sjen litte
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Laden / Losse
STR_VEHICLE_STATUS_LEAVING :{LTBLUE}fuortsette
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index 9079e02fa1..1d46e0ebed 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -216,7 +216,6 @@ STR_UNITS_HEIGHT_SI :{COMMA} m
# Common window strings
STR_BUTTON_SORT_BY :{BLACK}Ordinas per
-STR_BUTTON_LOCATION :{BLACK}Loko
STR_BUTTON_RENAME :{BLACK}Rinomizar
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Klozas fenestro
@@ -1044,6 +1043,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_HEADING_FOR_DEPOT_SERVICE_VEL :{LTBLUE}Servado ad {DEPOT}, {VELOCITY}
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 85a61f3b5d..9398d3eed5 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -222,7 +222,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Избе
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Изберете критериум за сортирање
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Изберете филтрирање критериуми
STR_BUTTON_SORT_BY :{BLACK}Сортирање според
-STR_BUTTON_LOCATION :{BLACK}Локација
STR_BUTTON_RENAME :{BLACK}Преименувај
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Затвори го прозорецот
@@ -1515,7 +1514,6 @@ STR_REPLACE_VEHICLE_AIRCRAFT :Летало
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Центар главниот приказ на локација авионот. Ctrl + клик ќе го следат авион во главниот приказ
STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Прати го авионот во хангар. CTRL+клик ќе го прати само на сервис
@@ -1528,7 +1526,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Прик
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Прикажи детали за авионот
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Сега авиони акција - кликни за да се запре / проектот авиони. Ctrl + Кликнете да дојдете до дестинацијата
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR :{ORANGE}Премногу далеку за да следната дестинација
diff --git a/src/lang/unfinished/maltese.txt b/src/lang/unfinished/maltese.txt
index c1a929e201..f442bb9678 100644
--- a/src/lang/unfinished/maltese.txt
+++ b/src/lang/unfinished/maltese.txt
@@ -175,7 +175,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Għazel
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Għazel il-kriterju biex tissortja
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Għazel il-kriterju biex tiffilterja
STR_BUTTON_SORT_BY :{BLACK}Issortja b'dan
-STR_BUTTON_LOCATION :{BLACK}Lokal
STR_BUTTON_RENAME :{BLACK}Semmi mil-ġdid
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Għalaq it-tieqa
@@ -914,6 +913,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE
+
# Messages in the start stop button in the vehicle view
diff --git a/src/lang/unfinished/marathi.txt b/src/lang/unfinished/marathi.txt
index 3b5e8e4295..530d06e6e4 100644
--- a/src/lang/unfinished/marathi.txt
+++ b/src/lang/unfinished/marathi.txt
@@ -222,7 +222,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}वर
STR_TOOLTIP_SORT_CRITERIA :{BLACK}वर्गीकरण निकष निवडा
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}फिल्टरिंग निकष निवडा
STR_BUTTON_SORT_BY :{BLACK}यानुसार क्रमवारी लावा
-STR_BUTTON_LOCATION :{BLACK}जागा
STR_BUTTON_RENAME :{BLACK}नाव बदला
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}खिडकी बंद करा
@@ -1384,6 +1383,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE
+
# Messages in the start stop button in the vehicle view
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index 948307c049..fced2ad3b5 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -223,7 +223,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}انتخ
STR_TOOLTIP_SORT_CRITERIA :{BLACK}انتخاب معیار مرتب کردن
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}انتخاب معیار پایش
STR_BUTTON_SORT_BY :{BLACK}مرتب کردن بر اساس
-STR_BUTTON_LOCATION :{BLACK}مختصات
STR_BUTTON_RENAME :{BLACK}نام گزاری
STR_BUTTON_CATCHMENT :{BLACK}تحت پوشش
@@ -3059,9 +3058,6 @@ STR_REPLACE_ELRAIL_VEHICLES :وسایل نق
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}نمای اصلی جایگاه قطار. برای دنبال کردن قطار Ctrl+Click کنید
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}نمای اصلی از جایگاه کشتی. برای دنبال کردن کشتی Ctrl+Click کنید
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}نمای اصلی از جایگاه هواپیما. برای دنبال کردن هواپیما Ctrl+click کنید
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}این قطار را به ایستگاه راه آهن بفرست. Ctrl+Click فقط قطار را سرویس میکند
STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP :{BLACK}فرستادن کشتی به لنگرگاه. ctrl+click فقط سرویس میکند
@@ -3083,9 +3079,7 @@ STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}نمای
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}نمایش ویژگی های کشتی
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}نمایش ویژگی های هوا پیما
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}فعالیت فعلی قطار - برای توقف/شروع حرکت قطار کلیک کن.Ctrl+Click برای رفتن به مقضد
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}عمل فعلی کشتی - برای شروع/توقف کشتی اینجا کلیک کنید.Ctrl+Click برای رفتن به مقضد
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}عمل فعلی هواپیما - برای توقف/شروع کار هواپیما کلیک کنید.Ctrl+Click برای رفتن به مقصد
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}پر / خالی کردن
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index d7861b42c9..6251b96fbe 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -223,7 +223,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK} (ترت
STR_TOOLTIP_SORT_CRITERIA :{BLACK}ترتیب کا طریقہ منتخب کریں
STR_TOOLTIP_FILTER_CRITERIA :{BLACK} چھاننے کے اصول چنیئے
STR_BUTTON_SORT_BY :{BLACK}سے ترتیب دو
-STR_BUTTON_LOCATION :{BLACK}جگہ
STR_BUTTON_RENAME :{BLACK} تبادلھء نام
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}کھڑکی بند کرو
@@ -2408,6 +2407,7 @@ STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR :{ORANGE}اگلی منزل بہت دور ہے
diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt
index 0eaec1f607..15d35d3893 100644
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -233,7 +233,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Chọn t
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Chọn tiêu chí sắp xếp
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Chọn tiêu chí lọc bỏ
STR_BUTTON_SORT_BY :{BLACK}Sắp xếp bởi
-STR_BUTTON_LOCATION :{BLACK}Vị trí
STR_BUTTON_RENAME :{BLACK}Đổi tên
STR_BUTTON_CATCHMENT :{BLACK}Vùng che phủ
STR_TOOLTIP_CATCHMENT :{BLACK}Đổi ẩn/hiện vùng che phủ
@@ -3722,10 +3721,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Tự đ
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Xem vị trí đoàn tàu. Ctrl+Click mở cửa sổ mới để theo dõi
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Xem vị trí ôtô. Ctrl+Click mở cửa sổ mới để theo dõi
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Xem vị trí tàu thuỷ. Ctrl+Click mở cửa sổ mới để theo dõi
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Xem vị trí máy bay. Ctrl+Click mở cửa sổ mới để theo dõi
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Đưa tàu về xưởng. Ctrl+Click sẽ gửi về bảo trì thôi
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Đưa ôtô về xưởng. Ctrl+Click sẽ gửi về bảo trì thôi
@@ -3757,10 +3752,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Hiện c
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Hiện chi tiết tàu thuỷ
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Hiện chi tiết máy bay
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với đoàn tàu - bấm để dừng/chạy tàu. Ctrl+Click để chuyển điểm đến
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với ôtô - bấm để dừng/chạy ôtô. Ctrl+Click để chuyển điểm đến
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với tàu thuỷ - bấm để dừng/chạy tàu. Ctrl+Click để chuyển điểm đến
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Thao tác với máy bay - bấm để dừng/chạy máy bay. Ctrl+Click để chuyển điểm đến
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Bốc/dỡ hàng
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index d7dd2b6bf0..34026b37e8 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -231,7 +231,6 @@ STR_TOOLTIP_SORT_ORDER :{BLACK}Dewiswch
STR_TOOLTIP_SORT_CRITERIA :{BLACK}Dewiswch drefn trefnu
STR_TOOLTIP_FILTER_CRITERIA :{BLACK}Dewis criteria hidlydd
STR_BUTTON_SORT_BY :{BLACK}Trefnu yn ôl
-STR_BUTTON_LOCATION :{BLACK}Lleoliad
STR_BUTTON_RENAME :{BLACK}Ailenwi
STR_TOOLTIP_CLOSE_WINDOW :{BLACK}Cau ffenestr
@@ -3568,10 +3567,6 @@ STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Gwneud i
# Vehicle view
STR_VEHICLE_VIEW_CAPTION :{WHITE}{VEHICLE}
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad y trên. Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad y cerbyd, Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP :{BLACK}Canol'r prif olygfa ar leoliad yr long. Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP :{BLACK}Canoli'r brif olygfa ar leoliad yr awyren. Bydd Ctrl+Clic yn dilyn yn ffenestr bennaf
STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP :{BLACK}Anfon trên i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP :{BLACK}Anfon cerbyd i'r depo. Bydd CTRL+clic yn rhoi gwasanaeth iddo'n unig
@@ -3603,10 +3598,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP :{BLACK}Dangos m
STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP :{BLACK}Dangos manylion llong
STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP :{BLACK}Dangos manylion awyren
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred y trên - cliciwch yma stopio/cychwyn y trên. Ctrl+Clic i sgrolio i'r gyrchfan
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred y cerbyd - cliciwch yma stopio/cychwyn y cerbyd. Ctrl+Clic i sgrolio i'r gyrchfan
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred y llong - cliciwch yma stopio/cychwyn y llong. Ctrl+Clic i sgrolio i'r gyrchfan
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP :{BLACK}Gweithred yr awyren - cliciwch yma stopio/cychwyn yr awyren. Ctrl+Clic i sgrolio i'r gyrchfan
+
# Messages in the start stop button in the vehicle view
STR_VEHICLE_STATUS_LOADING_UNLOADING :{LTBLUE}Llwytho / Dadlwytho
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index aa73b9008a..145abce96b 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -19,6 +19,8 @@
#include "company_func.h"
#include "company_gui.h"
#include "company_base.h"
+#include "tile_map.h"
+#include "texteff.hpp"
#include "core/backup_type.hpp"
#include "cheat_type.h"
@@ -293,7 +295,7 @@ CommandCost CmdCheatSetting(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
/**
* Change the bank bank balance of a company by inserting or removing money without affecting the loan.
- * @param tile unused
+ * @param tile tile to show text effect on (if not 0)
* @param flags operation to perform
* @param p1 the amount of money to receive (if positive), or spend (if negative)
* @param p2 (bit 0-7) - the company ID.
@@ -316,6 +318,10 @@ CommandCost CmdChangeBankBalance(TileIndex tile, DoCommandFlag flags, uint32 p1,
Backup cur_company(_current_company, company, FILE_LINE);
SubtractMoneyFromCompany(CommandCost(expenses_type, -delta));
cur_company.Restore();
+
+ if (tile != 0) {
+ ShowCostOrIncomeAnimation(TileX(tile) * TILE_SIZE, TileY(tile) * TILE_SIZE, GetTilePixelZ(tile), -delta);
+ }
}
/* This command doesn't cost anything for deity. */
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index e8e728ff0b..56a5bcda71 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -27,6 +27,7 @@
#include "tunnelbridge_map.h"
#include "viewport_type.h"
#include "guitimer_func.h"
+#include "viewport_func.h"
#include "rev.h"
#include "widgets/misc_widget.h"
@@ -48,6 +49,7 @@ static const NWidgetPart _nested_land_info_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_LAND_AREA_INFORMATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_LI_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP),
NWidget(WWT_DEBUGBOX, COLOUR_GREY),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, WID_LI_BACKGROUND), EndContainer(),
@@ -397,6 +399,19 @@ public:
::ShowNewGRFInspectWindow(GetGrfSpecFeature(this->tile), this->tile);
}
+ void OnClick(Point pt, int widget, int click_count) override
+ {
+ switch (widget) {
+ case WID_LI_LOCATION:
+ if (_ctrl_pressed) {
+ ShowExtraViewportWindow(this->tile);
+ } else {
+ ScrollMainWindowToTile(this->tile);
+ }
+ break;
+ }
+ }
+
/**
* Some data on this window has become invalid.
* @param data Information about the changed data.
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 5c62d78ca2..ed1ac08bac 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -862,14 +862,12 @@ int openttd_main(int argc, char *argv[])
if (resolution.width != 0) _cur_resolution = resolution;
- /*
- * The width and height must be at least 1 pixel and width times
- * height times bytes per pixel must still fit within a 32 bits
- * integer, even for 32 bpp video modes. This way all internal
- * drawing routines work correctly.
- */
- _cur_resolution.width = ClampU(_cur_resolution.width, 1, UINT16_MAX / 2);
- _cur_resolution.height = ClampU(_cur_resolution.height, 1, UINT16_MAX / 2);
+ /* Limit width times height times bytes per pixel to fit a 32 bit
+ * integer, This way all internal drawing routines work correctly.
+ * A resolution that has one component as 0 is treated as a marker to
+ * auto-detect a good window size. */
+ _cur_resolution.width = std::min(_cur_resolution.width, UINT16_MAX / 2u);
+ _cur_resolution.height = std::min(_cur_resolution.height, UINT16_MAX / 2u);
/* Assume the cursor starts within the game as not all video drivers
* get an event that the cursor is within the window when it is opened.
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index b6d9cdc74e..4fa3c7ba69 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -1871,7 +1871,16 @@ again:
int y = TileY(v->tile) * TILE_SIZE + rdp[turn_around_start_frame].y;
Direction new_dir = RoadVehGetSlidingDirection(v, x, y);
- if (v->IsFrontEngine() && RoadVehFindCloseTo(v, x, y, new_dir) != nullptr) return false;
+ if (v->IsFrontEngine() && RoadVehFindCloseTo(v, x, y, new_dir) != nullptr) {
+ /* We are blocked. */
+ v->cur_speed = 0;
+ if (!v->path.empty()) {
+ /* Prevent pathfinding rerun as we already know where we are heading to. */
+ v->path.tile.push_front(v->tile);
+ v->path.td.push_front(dir);
+ }
+ return false;
+ }
uint32 r = VehicleEnterTile(v, v->tile, x, y);
if (HasBit(r, VETS_CANNOT_ENTER)) {
diff --git a/src/saveload/industry_sl.cpp b/src/saveload/industry_sl.cpp
index 99e25856c8..6f41e34552 100644
--- a/src/saveload/industry_sl.cpp
+++ b/src/saveload/industry_sl.cpp
@@ -72,6 +72,7 @@ static const SaveLoad _industry_desc[] = {
SLE_CONDNULL(1, SLV_82, SLV_197), // random_triggers
SLE_CONDVAR(Industry, random, SLE_UINT16, SLV_82, SL_MAX_VERSION),
+ SLE_CONDSSTR(Industry, text, SLE_STR | SLF_ALLOW_CONTROL, SLV_INDUSTRY_TEXT, SL_MAX_VERSION),
SLE_CONDNULL(32, SLV_2, SLV_144), // old reserved space
diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h
index 7c976f3b94..58a47748b8 100644
--- a/src/saveload/saveload.h
+++ b/src/saveload/saveload.h
@@ -327,6 +327,7 @@ enum SaveLoadVersion : uint16 {
SLV_GS_INDUSTRY_CONTROL, ///< 287 PR#7912 and PR#8115 GS industry control.
SLV_VEH_MOTION_COUNTER, ///< 288 PR#8591 Desync safe motion counter
+ SLV_INDUSTRY_TEXT, ///< 289 PR#8576 Additional GS text for industries.
SL_MAX_VERSION, ///< Highest possible saveload version
diff --git a/src/script/api/game_changelog.hpp b/src/script/api/game_changelog.hpp
index cbb862f1ca..edc5884072 100644
--- a/src/script/api/game_changelog.hpp
+++ b/src/script/api/game_changelog.hpp
@@ -30,11 +30,15 @@
* \li GSIndustry::SetControlFlags
* \li GSIndustry::SetExclusiveConsumer
* \li GSIndustry::SetExclusiveSupplier
+ * \li GSIndustry::SetText
* \li GSStoryPage::MakePushButtonReference
* \li GSStoryPage::MakeTileButtonReference
* \li GSStoryPage::MakeVehicleButtonReference
* \li GSPriorityQueue
*
+ * Other changes:
+ * \li GSCompany::ChangeBankBalance takes one extra parameter to refer to a location to show text effect on
+ *
* \b 1.10.0
*
* API additions:
diff --git a/src/script/api/script_company.cpp b/src/script/api/script_company.cpp
index 93bba63328..20f1b3f7a1 100644
--- a/src/script/api/script_company.cpp
+++ b/src/script/api/script_company.cpp
@@ -226,17 +226,19 @@
return GetLoanAmount() == loan;
}
-/* static */ bool ScriptCompany::ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type)
+/* static */ bool ScriptCompany::ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type, TileIndex tile)
{
EnforcePrecondition(false, ScriptObject::GetCompany() == OWNER_DEITY);
EnforcePrecondition(false, expenses_type < (ExpensesType)::EXPENSES_END);
EnforcePrecondition(false, (int64)delta >= INT32_MIN);
EnforcePrecondition(false, (int64)delta <= INT32_MAX);
+ EnforcePrecondition(false, tile == INVALID_TILE || ::IsValidTile(tile));
company = ResolveCompanyID(company);
EnforcePrecondition(false, company != COMPANY_INVALID);
- return ScriptObject::DoCommand(0, (uint32)(delta), company | expenses_type << 8 , CMD_CHANGE_BANK_BALANCE);
+ /* Network commands only allow 0 to indicate invalid tiles, not INVALID_TILE */
+ return ScriptObject::DoCommand(tile == INVALID_TILE ? 0 : tile , (uint32)(delta), company | expenses_type << 8 , CMD_CHANGE_BANK_BALANCE);
}
/* static */ bool ScriptCompany::BuildCompanyHQ(TileIndex tile)
diff --git a/src/script/api/script_company.hpp b/src/script/api/script_company.hpp
index ea2f0cdd14..635b6fdee0 100644
--- a/src/script/api/script_company.hpp
+++ b/src/script/api/script_company.hpp
@@ -242,6 +242,7 @@ public:
* @param company The company to change the bank balance of.
* @param delta Amount of money to give or take from the bank balance. A positive value adds money to the bank balance.
* @param expenses_type The account in the finances window that will register the cost.
+ * @param tile The tile to show text effect on or ScriptMap::TILE_INVALID
* @return True, if the bank balance was changed.
* @game @pre No ScriptCompanyMode active in scope.
* @pre ResolveCompanyID(company) != COMPANY_INVALID.
@@ -250,7 +251,7 @@ public:
* @note You need to create your own news message to inform about costs/gifts that you create using this command.
* @api -ai
*/
- static bool ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type);
+ static bool ChangeBankBalance(CompanyID company, Money delta, ExpensesType expenses_type, TileIndex tile);
/**
* Get the income of the company in the given quarter.
diff --git a/src/script/api/script_industry.cpp b/src/script/api/script_industry.cpp
index 14ba8e4022..0a5ca98d35 100644
--- a/src/script/api/script_industry.cpp
+++ b/src/script/api/script_industry.cpp
@@ -15,6 +15,7 @@
#include "script_map.hpp"
#include "../../company_base.h"
#include "../../industry.h"
+#include "../../string_func.h"
#include "../../strings_func.h"
#include "../../station_base.h"
#include "../../newgrf_industries.h"
@@ -47,6 +48,20 @@
return GetString(STR_INDUSTRY_NAME);
}
+/* static */ bool ScriptIndustry::SetText(IndustryID industry_id, Text *text)
+{
+ CCountedPtr counter(text);
+
+ const char *encoded_text = nullptr;
+ if (text != nullptr) {
+ encoded_text = text->GetEncodedText();
+ EnforcePreconditionEncodedText(false, encoded_text);
+ }
+ EnforcePrecondition(false, IsValidIndustry(industry_id));
+
+ return ScriptObject::DoCommand(0, industry_id, static_cast(IndustryAction::SetText), CMD_INDUSTRY_CTRL, encoded_text);
+}
+
/* static */ ScriptIndustry::CargoAcceptState ScriptIndustry::IsCargoAccepted(IndustryID industry_id, CargoID cargo_id)
{
if (!IsValidIndustry(industry_id)) return CAS_NOT_ACCEPTED;
diff --git a/src/script/api/script_industry.hpp b/src/script/api/script_industry.hpp
index dac3d32fd7..95133da0ec 100644
--- a/src/script/api/script_industry.hpp
+++ b/src/script/api/script_industry.hpp
@@ -81,6 +81,16 @@ public:
*/
static char *GetName(IndustryID industry_id);
+ /**
+ * Set the custom text of an industry, shown in the GUI.
+ * @param industry_id The industry to set the custom text of.
+ * @param text The text to set it to (can be either a raw string, or a ScriptText object). If null is passed, the text will be removed.
+ * @pre IsValidIndustry(industry_id).
+ * @return True if the action succeeded.
+ * @api -ai
+ */
+ static bool SetText(IndustryID industry_id, Text *text);
+
/**
* See whether an industry currently accepts a certain cargo.
* @param industry_id The index of the industry.
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index 39f209a36b..e3b270fbfd 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -25,6 +25,7 @@
#include "core/geometry_func.hpp"
#include "hotkeys.h"
#include "transparency.h"
+#include "gui.h"
#include "widgets/sign_widget.h"
@@ -486,6 +487,17 @@ struct SignWindow : Window, SignList {
void OnClick(Point pt, int widget, int click_count) override
{
switch (widget) {
+ case WID_QES_LOCATION: {
+ const Sign *si = Sign::Get(this->cur_sign);
+ TileIndex tile = TileVirtXY(si->x, si->y);
+ if (_ctrl_pressed) {
+ ShowExtraViewportWindow(tile);
+ } else {
+ ScrollMainWindowToTile(tile);
+ }
+ break;
+ }
+
case WID_QES_PREVIOUS:
case WID_QES_NEXT: {
const Sign *si = this->PrevNextSign(widget == WID_QES_NEXT);
@@ -523,6 +535,7 @@ static const NWidgetPart _nested_query_sign_edit_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_QES_CAPTION), SetDataTip(STR_WHITE_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_QES_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_EDIT_SIGN_LOCATION_TOOLTIP),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY),
NWidget(WWT_EDITBOX, COLOUR_GREY, WID_QES_TEXT), SetMinimalSize(256, 12), SetDataTip(STR_EDIT_SIGN_SIGN_OSKTITLE, STR_NULL), SetPadding(2, 2, 2, 2),
diff --git a/src/smallmap_colours.h b/src/smallmap_colours.h
index 5755f2bf06..29f6b99308 100644
--- a/src/smallmap_colours.h
+++ b/src/smallmap_colours.h
@@ -15,6 +15,7 @@
static const uint8 PC_ROUGH_LAND = 0x52; ///< Dark green palette colour for rough land.
static const uint8 PC_GRASS_LAND = 0x54; ///< Dark green palette colour for grass land.
static const uint8 PC_BARE_LAND = 0x37; ///< Brown palette colour for bare land.
+static const uint8 PC_RAINFOREST = 0x5C; ///< Pale green palette colour for rainforest.
static const uint8 PC_FIELDS = 0x25; ///< Light brown palette colour for fields.
static const uint8 PC_TREES = 0x57; ///< Green palette colour for trees.
static const uint8 PC_WATER = 0xC9; ///< Dark blue palette colour for water.
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 66261371d1..8745eaa449 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -115,11 +115,12 @@ static const LegendAndColour _legend_vegetation[] = {
MK(PC_ROUGH_LAND, STR_SMALLMAP_LEGENDA_ROUGH_LAND),
MK(PC_GRASS_LAND, STR_SMALLMAP_LEGENDA_GRASS_LAND),
MK(PC_BARE_LAND, STR_SMALLMAP_LEGENDA_BARE_LAND),
+ MK(PC_RAINFOREST, STR_SMALLMAP_LEGENDA_RAINFOREST),
MK(PC_FIELDS, STR_SMALLMAP_LEGENDA_FIELDS),
MK(PC_TREES, STR_SMALLMAP_LEGENDA_TREES),
- MK(PC_GREEN, STR_SMALLMAP_LEGENDA_FOREST),
- MS(PC_GREY, STR_SMALLMAP_LEGENDA_ROCKS),
+ MS(PC_GREEN, STR_SMALLMAP_LEGENDA_FOREST),
+ MK(PC_GREY, STR_SMALLMAP_LEGENDA_ROCKS),
MK(PC_ORANGE, STR_SMALLMAP_LEGENDA_DESERT),
MK(PC_LIGHT_BLUE, STR_SMALLMAP_LEGENDA_SNOW),
MK(PC_BLACK, STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES),
@@ -434,7 +435,11 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t)
{
switch (t) {
case MP_CLEAR:
- return (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) < 3) ? MKCOLOUR_XXXX(PC_BARE_LAND) : _vegetation_clear_bits[GetClearGround(tile)];
+ if (IsClearGround(tile, CLEAR_GRASS)) {
+ if (GetClearDensity(tile) < 3) return MKCOLOUR_XXXX(PC_BARE_LAND);
+ if (GetTropicZone(tile) == TROPICZONE_RAINFOREST) return MKCOLOUR_XXXX(PC_RAINFOREST);
+ }
+ return _vegetation_clear_bits[GetClearGround(tile)];
case MP_INDUSTRY:
return IsTileForestIndustry(tile) ? MKCOLOUR_XXXX(PC_GREEN) : MKCOLOUR_XXXX(PC_DARK_RED);
@@ -443,7 +448,7 @@ static inline uint32 GetSmallMapVegetationPixels(TileIndex tile, TileType t)
if (GetTreeGround(tile) == TREE_GROUND_SNOW_DESERT || GetTreeGround(tile) == TREE_GROUND_ROUGH_SNOW) {
return (_settings_game.game_creation.landscape == LT_ARCTIC) ? MKCOLOUR_XYYX(PC_LIGHT_BLUE, PC_TREES) : MKCOLOUR_XYYX(PC_ORANGE, PC_TREES);
}
- return MKCOLOUR_XYYX(PC_GRASS_LAND, PC_TREES);
+ return (GetTropicZone(tile) == TROPICZONE_RAINFOREST) ? MKCOLOUR_XYYX(PC_RAINFOREST, PC_TREES) : MKCOLOUR_XYYX(PC_GRASS_LAND, PC_TREES);
default:
return ApplyMask(MKCOLOUR_XXXX(PC_GRASS_LAND), &_smallmap_vehicles_andor[t]);
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 532e355336..4716091d3e 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -790,7 +790,9 @@ void ShowCompanyStations(CompanyID company)
static const NWidgetPart _nested_station_view_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_SV_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_STATION_VIEW_RENAME_TOOLTIP),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_SV_CAPTION), SetDataTip(STR_STATION_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_SV_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_STATION_VIEW_CENTER_TOOLTIP),
NWidget(WWT_DEBUGBOX, COLOUR_GREY),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
@@ -809,20 +811,14 @@ static const NWidgetPart _nested_station_view_widgets[] = {
NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_SV_SCROLLBAR),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, WID_SV_ACCEPT_RATING_LIST), SetMinimalSize(249, 23), SetResize(1, 0), EndContainer(),
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_LOCATION), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1),
- SetDataTip(STR_BUTTON_LOCATION, STR_STATION_VIEW_CENTER_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_ACCEPTS_RATINGS), SetMinimalSize(46, 12), SetResize(1, 0), SetFill(1, 1),
- SetDataTip(STR_STATION_VIEW_RATINGS_BUTTON, STR_STATION_VIEW_RATINGS_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_RENAME), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1),
- SetDataTip(STR_BUTTON_RENAME, STR_STATION_VIEW_RENAME_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_DEPARTURES), SetMinimalSize(80, 12), SetResize(1, 0), SetFill(1, 1),
- SetDataTip(STR_STATION_VIEW_DEPARTURES_BUTTON, STR_STATION_VIEW_DEPARTURES_TOOLTIP),
- EndContainer(),
+ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_ACCEPTS_RATINGS), SetMinimalSize(46, 12), SetResize(1, 0), SetFill(1, 1),
+ SetDataTip(STR_STATION_VIEW_RATINGS_BUTTON, STR_STATION_VIEW_RATINGS_TOOLTIP),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_DEPARTURES), SetMinimalSize(46, 12), SetResize(1, 0), SetFill(1, 1),
+ SetDataTip(STR_STATION_VIEW_DEPARTURES_BUTTON, STR_STATION_VIEW_DEPARTURES_TOOLTIP),
NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_CLOSE_AIRPORT), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1),
SetDataTip(STR_STATION_VIEW_CLOSE_AIRPORT, STR_STATION_VIEW_CLOSE_AIRPORT_TOOLTIP),
- NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_CATCHMENT), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
+ NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SV_CATCHMENT), SetMinimalSize(45, 12), SetResize(1, 0), SetFill(1, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_TRAINS), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_TRAIN, STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_ROADVEHS), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_LORRY, STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SV_SHIPS), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_SHIP, STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP),
diff --git a/src/strings.cpp b/src/strings.cpp
index 9bc75f2e77..803e8e618c 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -2316,11 +2316,9 @@ const char *GetCurrentLanguageIsoCode()
/**
* Check whether there are glyphs missing in the current language.
- * @param[out] str Pointer to an address for storing the text pointer.
* @return If glyphs are missing, return \c true, else return \c false.
- * @post If \c true is returned and str is not nullptr, *str points to a string that is found to contain at least one missing glyph.
*/
-bool MissingGlyphSearcher::FindMissingGlyphs(const char **str)
+bool MissingGlyphSearcher::FindMissingGlyphs()
{
InitFreeType(this->Monospace());
const Sprite *question_mark[FS_END];
@@ -2332,12 +2330,22 @@ bool MissingGlyphSearcher::FindMissingGlyphs(const char **str)
this->Reset();
for (const char *text = this->NextString(); text != nullptr; text = this->NextString()) {
FontSize size = this->DefaultSize();
- if (str != nullptr) *str = text;
for (WChar c = Utf8Consume(&text); c != '\0'; c = Utf8Consume(&text)) {
if (c >= SCC_FIRST_FONT && c <= SCC_LAST_FONT) {
size = (FontSize)(c - SCC_FIRST_FONT);
} else if (!IsInsideMM(c, SCC_SPRITE_START, SCC_SPRITE_END) && IsPrintable(c) && !IsTextDirectionChar(c) && c != '?' && GetGlyph(size, c) == question_mark[size]) {
/* The character is printable, but not in the normal font. This is the case we were testing for. */
+ std::string size_name;
+
+ switch (size) {
+ case 0: size_name = "medium"; break;
+ case 1: size_name = "small"; break;
+ case 2: size_name = "large"; break;
+ case 3: size_name = "mono"; break;
+ default: NOT_REACHED();
+ }
+
+ DEBUG(freetype, 0, "Font is missing glyphs to display char 0x%X in %s font size", c, size_name.c_str());
return true;
}
}
@@ -2413,7 +2421,7 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
{
static LanguagePackGlyphSearcher pack_searcher;
if (searcher == nullptr) searcher = &pack_searcher;
- bool bad_font = !base_font || searcher->FindMissingGlyphs(nullptr);
+ bool bad_font = !base_font || searcher->FindMissingGlyphs();
#if defined(WITH_FREETYPE) || defined(_WIN32)
if (bad_font) {
/* We found an unprintable character... lets try whether we can find
@@ -2431,6 +2439,19 @@ void CheckForMissingGlyphs(bool base_font, MissingGlyphSearcher *searcher)
memcpy(&_freetype, &backup, sizeof(backup));
+ if (!bad_font) {
+ /* Show that we loaded fallback font. To do this properly we have
+ * to set the colour of the string, otherwise we end up with a lot
+ * of artifacts.* The colour 'character' might change in the
+ * future, so for safety we just Utf8 Encode it into the string,
+ * which takes exactly three characters, so it replaces the "XXX"
+ * with the colour marker. */
+ static char *err_str = stredup("XXXThe current font is missing some of the characters used in the texts for this language. Using system fallback font instead.");
+ Utf8Encode(err_str, SCC_YELLOW);
+ SetDParamStr(0, err_str);
+ ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_WARNING);
+ }
+
if (bad_font && base_font) {
/* Our fallback font does miss characters too, so keep the
* user chosen font as that is more likely to be any good than
diff --git a/src/strings_func.h b/src/strings_func.h
index 27d6232154..b783710cea 100644
--- a/src/strings_func.h
+++ b/src/strings_func.h
@@ -280,7 +280,7 @@ public:
*/
virtual void SetFontNames(struct FreeTypeSettings *settings, const char *font_name, const void *os_data = nullptr) = 0;
- bool FindMissingGlyphs(const char **str);
+ bool FindMissingGlyphs();
};
void CheckForMissingGlyphs(bool base_font = true, MissingGlyphSearcher *search = nullptr);
diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini
index c74b27ef15..dd6c49c0ca 100644
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -129,7 +129,7 @@ name = ""resolution""
type = SLE_INT
length = 2
var = _cur_resolution
-def = ""640,480""
+def = ""0,0""
cat = SC_BASIC
[SDTG_STR]
diff --git a/src/table/sprites.h b/src/table/sprites.h
index 03137e1228..f632ce1961 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -54,7 +54,7 @@ static const SpriteID SPR_LARGE_SMALL_WINDOW = 682;
/** Extra graphic spritenumbers */
static const SpriteID SPR_OPENTTD_BASE = 4896;
-static const uint16 OPENTTD_SPRITE_COUNT = 184;
+static const uint16 OPENTTD_SPRITE_COUNT = 186;
/* Halftile-selection sprites */
static const SpriteID SPR_HALFTILE_SELECTION_FLAT = SPR_OPENTTD_BASE;
@@ -163,6 +163,8 @@ static const SpriteID SPR_IMG_DELETE_LEFT = SPR_OPENTTD_BASE + 166;
static const SpriteID SPR_IMG_DELETE_RIGHT = SPR_OPENTTD_BASE + 167;
static const SpriteID SPR_WINDOW_DEFSIZE = SPR_OPENTTD_BASE + 168;
+static const SpriteID SPR_RENAME = SPR_OPENTTD_BASE + 184;
+static const SpriteID SPR_GOTO_LOCATION = SPR_OPENTTD_BASE + 185;
static const SpriteID SPR_IMG_CARGOFLOW = SPR_OPENTTD_BASE + 174;
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 33c444e317..b3c5019e8c 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -582,7 +582,9 @@ public:
static const NWidgetPart _nested_town_game_view_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TV_CAPTION), SetDataTip(STR_TOWN_VIEW_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
NWidget(WWT_DEBUGBOX, COLOUR_BROWN),
NWidget(WWT_SHADEBOX, COLOUR_BROWN),
NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),
@@ -594,13 +596,9 @@ static const NWidgetPart _nested_town_game_view_widgets[] = {
EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_BROWN, WID_TV_INFO), SetMinimalSize(260, 32), SetResize(1, 0), SetFill(1, 0), EndContainer(),
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
- NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_SHOW_AUTHORITY), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON, STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
- EndContainer(),
- NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
+ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_SHOW_AUTHORITY), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON, STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(40, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
NWidget(WWT_RESIZEBOX, COLOUR_BROWN),
EndContainer(),
};
@@ -615,8 +613,9 @@ static WindowDesc _town_game_view_desc(
static const NWidgetPart _nested_town_editor_view_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
NWidget(WWT_CAPTION, COLOUR_BROWN, WID_TV_CAPTION), SetDataTip(STR_TOWN_VIEW_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
- NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CHANGE_NAME), SetMinimalSize(76, 14), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
NWidget(WWT_SHADEBOX, COLOUR_BROWN),
NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN),
NWidget(WWT_STICKYBOX, COLOUR_BROWN),
@@ -627,13 +626,10 @@ static const NWidgetPart _nested_town_editor_view_widgets[] = {
EndContainer(),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_BROWN, WID_TV_INFO), SetMinimalSize(260, 32), SetResize(1, 0), SetFill(1, 0), EndContainer(),
- NWidget(NWID_HORIZONTAL),
- NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
- NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_CENTER_VIEW), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_TOWN_VIEW_CENTER_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_EXPAND_BUTTON, STR_TOWN_VIEW_EXPAND_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_DELETE), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_TOWN_VIEW_DELETE_TOOLTIP),
- EndContainer(),
- NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(14, 12), SetFill(0, 1), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
+ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_EXPAND), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_EXPAND_BUTTON, STR_TOWN_VIEW_EXPAND_TOOLTIP),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_TV_DELETE), SetMinimalSize(80, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_TOWN_VIEW_DELETE_TOOLTIP),
+ NWidget(WWT_TEXTBTN, COLOUR_BROWN, WID_TV_CATCHMENT), SetMinimalSize(40, 12), SetFill(1, 1), SetResize(1, 0), SetDataTip(STR_BUTTON_CATCHMENT, STR_TOOLTIP_CATCHMENT),
NWidget(WWT_RESIZEBOX, COLOUR_BROWN),
EndContainer(),
};
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index d85ab8841c..07c88fc2f0 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -2563,7 +2563,6 @@ static const NWidgetPart _nested_nontrain_vehicle_details_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_VD_CAPTION), SetDataTip(STR_VEHICLE_DETAILS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VD_RENAME_VEHICLE), SetMinimalSize(40, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_VEHICLE_NAME_BUTTON, STR_NULL /* filled in later */),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
NWidget(WWT_STICKYBOX, COLOUR_GREY),
@@ -2587,7 +2586,6 @@ static const NWidgetPart _nested_train_vehicle_details_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_VD_CAPTION), SetDataTip(STR_VEHICLE_DETAILS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_VD_RENAME_VEHICLE), SetMinimalSize(40, 0), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetDataTip(STR_VEHICLE_NAME_BUTTON, STR_NULL /* filled in later */),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
NWidget(WWT_STICKYBOX, COLOUR_GREY),
@@ -2651,8 +2649,6 @@ struct VehicleDetailsWindow : Window {
this->vscroll = (v->type == VEH_TRAIN ? this->GetScrollbar(WID_VD_SCROLLBAR) : nullptr);
this->FinishInitNested(window_number);
- this->GetWidget(WID_VD_RENAME_VEHICLE)->tool_tip = STR_VEHICLE_DETAILS_TRAIN_RENAME + v->type;
-
this->owner = v->owner;
this->tab = TDW_TAB_CARGO;
if (v->type == VEH_TRAIN && _shift_pressed) this->tab = TDW_TAB_TOTALS;
@@ -3068,8 +3064,6 @@ struct VehicleDetailsWindow : Window {
{
const Vehicle *v = Vehicle::Get(this->window_number);
- this->SetWidgetDisabledState(WID_VD_RENAME_VEHICLE, v->owner != _local_company);
-
if (v->type == VEH_TRAIN) {
this->DisableWidget(this->tab + WID_VD_DETAILS_CARGO_CARRIED);
this->vscroll->SetCount(GetTrainDetailsWndVScroll(v->index, this->tab));
@@ -3092,14 +3086,6 @@ struct VehicleDetailsWindow : Window {
void OnClick(Point pt, int widget, int click_count) override
{
switch (widget) {
- case WID_VD_RENAME_VEHICLE: { // rename
- const Vehicle *v = Vehicle::Get(this->window_number);
- SetDParam(0, v->index);
- ShowQueryString(STR_VEHICLE_NAME, STR_QUERY_RENAME_TRAIN_CAPTION + v->type,
- MAX_LENGTH_VEHICLE_NAME_CHARS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS);
- break;
- }
-
case WID_VD_INCREASE_SERVICING_INTERVAL: // increase int
case WID_VD_DECREASE_SERVICING_INTERVAL: { // decrease int
int mod = _ctrl_pressed ? 5 : 10;
@@ -3151,13 +3137,6 @@ struct VehicleDetailsWindow : Window {
}
}
- void OnQueryTextFinished(char *str) override
- {
- if (str == nullptr) return;
-
- DoCommandP(0, this->window_number, 0, CMD_RENAME_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_RENAME_TRAIN + Vehicle::Get(this->window_number)->type), nullptr, str);
- }
-
void OnResize() override
{
NWidgetCore *nwi = this->GetWidget(WID_VD_MATRIX);
@@ -3220,7 +3199,9 @@ static void ShowVehicleDetailsWindow(const Vehicle *v)
static const NWidgetPart _nested_vehicle_view_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_NULL /* filled in later */),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_VV_CAPTION), SetDataTip(STR_VEHICLE_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_NULL /* filled in later */),
NWidget(WWT_DEBUGBOX, COLOUR_GREY),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
@@ -3233,7 +3214,6 @@ static const NWidgetPart _nested_vehicle_view_widgets[] = {
EndContainer(),
EndContainer(),
NWidget(NWID_VERTICAL),
- NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CENTER_MAIN_VIEW), SetMinimalSize(18, 18), SetDataTip(SPR_CENTRE_VIEW_VEHICLE, 0x0 /* filled later */),
NWidget(NWID_SELECTION, INVALID_COLOUR, WID_VV_SELECT_DEPOT_CLONE),
NWidget(WWT_IMGBTN, COLOUR_GREY, WID_VV_GOTO_DEPOT), SetMinimalSize(18, 18), SetDataTip(0x0 /* filled later */, 0x0 /* filled later */),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_CLONE), SetMinimalSize(18, 18), SetDataTip(0x0 /* filled later */, 0x0 /* filled later */),
@@ -3253,6 +3233,7 @@ static const NWidgetPart _nested_vehicle_view_widgets[] = {
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHBTN, COLOUR_GREY, WID_VV_START_STOP), SetMinimalTextLines(1, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 2), SetResize(1, 0), SetFill(1, 0),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_VV_ORDER_LOCATION), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_VEHICLE_VIEW_ORDER_LOCATION_TOOLTIP),
NWidget(WWT_RESIZEBOX, COLOUR_GREY),
EndContainer(),
};
@@ -3460,8 +3441,9 @@ public:
this->owner = v->owner;
this->GetWidget(WID_VV_VIEWPORT)->InitializeViewport(this, this->window_number | (1 << 31), _vehicle_view_zoom_levels[v->type]);
- this->GetWidget(WID_VV_START_STOP)->tool_tip = STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP + v->type;
- this->GetWidget(WID_VV_CENTER_MAIN_VIEW)->tool_tip = STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP + v->type;
+ this->GetWidget(WID_VV_START_STOP)->tool_tip = STR_VEHICLE_VIEW_TRAIN_STATUS_START_STOP_TOOLTIP + v->type;
+ this->GetWidget(WID_VV_RENAME)->tool_tip = STR_VEHICLE_DETAILS_TRAIN_RENAME + v->type;
+ this->GetWidget(WID_VV_LOCATION)->tool_tip = STR_VEHICLE_VIEW_TRAIN_CENTER_TOOLTIP + v->type;
this->GetWidget(WID_VV_REFIT)->tool_tip = STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP + v->type;
this->GetWidget(WID_VV_SHOW_ORDERS)->tool_tip = STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP + v->type;
this->GetWidget(WID_VV_SHOW_DETAILS)->tool_tip = STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP + v->type;
@@ -3534,6 +3516,7 @@ public:
bool can_control = IsVehicleControlAllowed(v, _local_company);
bool refitable_and_stopped_in_depot = IsVehicleRefitable(v);
+ this->SetWidgetDisabledState(WID_VV_RENAME, !is_localcompany);
this->SetWidgetDisabledState(WID_VV_GOTO_DEPOT, !is_localcompany);
this->SetWidgetDisabledState(WID_VV_REFIT, !refitable_and_stopped_in_depot || !is_localcompany);
this->SetWidgetDisabledState(WID_VV_CLONE, !is_localcompany);
@@ -3544,6 +3527,8 @@ public:
this->SetWidgetDisabledState(WID_VV_TURN_AROUND, !can_control);
}
+ this->SetWidgetDisabledState(WID_VV_ORDER_LOCATION, v->current_order.GetLocation(v) == INVALID_TILE);
+
this->DrawWidgets();
}
@@ -3725,27 +3710,44 @@ public:
const Vehicle *v = Vehicle::Get(this->window_number);
switch (widget) {
- case WID_VV_START_STOP: // start stop
- if (_ctrl_pressed) {
- /* Scroll to current order destination */
- TileIndex tile = v->current_order.GetLocation(v);
- if (tile != INVALID_TILE) ScrollMainWindowToTile(tile);
- } else {
- /* Start/Stop */
- StartStopVehicle(v, false);
- }
+ case WID_VV_RENAME: { // rename
+ SetDParam(0, v->index);
+ ShowQueryString(STR_VEHICLE_NAME, STR_QUERY_RENAME_TRAIN_CAPTION + v->type,
+ MAX_LENGTH_VEHICLE_NAME_CHARS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT | QSF_LEN_IN_CHARS);
break;
- case WID_VV_CENTER_MAIN_VIEW: {// center main view
- const Window *mainwindow = FindWindowById(WC_MAIN_WINDOW, 0);
- /* code to allow the main window to 'follow' the vehicle if the ctrl key is pressed */
- if (_ctrl_pressed && mainwindow->viewport->zoom <= ZOOM_LVL_OUT_4X) {
- mainwindow->viewport->follow_vehicle = v->index;
+ }
+
+ case WID_VV_START_STOP: // start stop
+ StartStopVehicle(v, false);
+ break;
+
+ case WID_VV_ORDER_LOCATION: {
+ /* Scroll to current order destination */
+ TileIndex tile = v->current_order.GetLocation(v);
+ if (tile == INVALID_TILE) break;
+
+ if (_ctrl_pressed) {
+ ShowExtraViewportWindow(tile);
} else {
- ScrollMainWindowTo(v->x_pos, v->y_pos, v->z_pos);
+ ScrollMainWindowToTile(tile);
}
break;
}
+ case WID_VV_LOCATION: // center main view
+ if (_ctrl_pressed) {
+ ShowExtraViewportWindow(TileVirtXY(v->x_pos, v->y_pos));
+ } else {
+ const Window *mainwindow = FindWindowById(WC_MAIN_WINDOW, 0);
+ if (click_count > 1 && mainwindow->viewport->zoom <= ZOOM_LVL_OUT_4X) {
+ /* main window 'follows' vehicle */
+ mainwindow->viewport->follow_vehicle = v->index;
+ } else {
+ ScrollMainWindowTo(v->x_pos, v->y_pos, v->z_pos);
+ }
+ }
+ break;
+
case WID_VV_GOTO_DEPOT: // goto hangar
if (_shift_pressed) {
if (HandlePlacePushButton(this, WID_VV_GOTO_DEPOT, ANIMCURSOR_PICKSTATION, HT_RECT)) {
@@ -3806,8 +3808,14 @@ public:
break;
}
}
+ void OnQueryTextFinished(char *str) override
+ {
+ if (str == nullptr) return;
- virtual void OnDropdownSelect(int widget, int index) OVERRIDE
+ DoCommandP(0, this->window_number, 0, CMD_RENAME_VEHICLE | CMD_MSG(STR_ERROR_CAN_T_RENAME_TRAIN + Vehicle::Get(this->window_number)->type), nullptr, str);
+ }
+
+ virtual void OnDropdownSelect(int widget, int index) override
{
switch (widget) {
case WID_VV_GOTO_DEPOT: {
diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp
index c33f58610c..86c8c25322 100644
--- a/src/video/allegro_v.cpp
+++ b/src/video/allegro_v.cpp
@@ -417,6 +417,8 @@ const char *VideoDriver_Allegro::Start(const StringList &parm)
}
_allegro_instance_count++;
+ this->UpdateAutoResolution();
+
install_timer();
install_mouse();
install_keyboard();
diff --git a/src/video/cocoa/cocoa_v.h b/src/video/cocoa/cocoa_v.h
index f5d1756407..54ff53d156 100644
--- a/src/video/cocoa/cocoa_v.h
+++ b/src/video/cocoa/cocoa_v.h
@@ -70,6 +70,9 @@ public:
/** Main game loop. */
void GameLoop(); // In event.mm.
+protected:
+ Dimension GetScreenSize() const override;
+
private:
friend class WindowQuartzSubdriver;
diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm
index eae1acbc99..f09920fe20 100644
--- a/src/video/cocoa/cocoa_v.mm
+++ b/src/video/cocoa/cocoa_v.mm
@@ -200,6 +200,8 @@ const char *VideoDriver_Cocoa::Start(const StringList &parm)
/* Don't create a window or enter fullscreen if we're just going to show a dialog. */
if (!CocoaSetupApplication()) return NULL;
+ this->UpdateAutoResolution();
+
this->orig_res = _cur_resolution;
int width = _cur_resolution.width;
int height = _cur_resolution.height;
@@ -302,6 +304,15 @@ void VideoDriver_Cocoa::EditBoxLostFocus()
HandleTextInput(NULL, true);
}
+/**
+ * Get the resolution of the main screen.
+ */
+Dimension VideoDriver_Cocoa::GetScreenSize() const
+{
+ NSRect frame = [ [ NSScreen mainScreen ] frame ];
+ return { static_cast(NSWidth(frame)), static_cast(NSHeight(frame)) };
+}
+
/**
* Handle a change of the display area.
*/
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index 70260eecdc..b9a7a6d6e1 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -135,6 +135,8 @@ static FVideoDriver_Dedicated iFVideoDriver_Dedicated;
const char *VideoDriver_Dedicated::Start(const StringList &parm)
{
+ this->UpdateAutoResolution();
+
int bpp = BlitterFactory::GetCurrentBlitter()->GetScreenDepth();
_dedicated_video_mem = (bpp == 0) ? nullptr : MallocT(_cur_resolution.width * _cur_resolution.height * (bpp / 8));
diff --git a/src/video/null_v.cpp b/src/video/null_v.cpp
index f5d6caf8fc..4132effa94 100644
--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@@ -26,6 +26,8 @@ const char *VideoDriver_Null::Start(const StringList &parm)
_set_error_mode(_OUT_TO_STDERR);
#endif
+ this->UpdateAutoResolution();
+
this->ticks = GetDriverParamInt(parm, "ticks", 1000);
this->until_exit = GetDriverParamBool(parm, "until_exit");
_screen.width = _screen.pitch = _cur_resolution.width;
diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp
index fdf3295928..25c649b899 100644
--- a/src/video/sdl2_v.cpp
+++ b/src/video/sdl2_v.cpp
@@ -491,8 +491,6 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h, bool resize)
DEBUG(driver, 1, "SDL2: using mode %ux%ux%d", w, h, bpp);
- if (bpp == 0) usererror("Can't use a blitter that blits 0 bpp for normal visuals");
-
/* Free any previously allocated shadow surface */
if (_sdl_surface != nullptr && _sdl_surface != _sdl_realscreen) SDL_FreeSurface(_sdl_surface);
@@ -505,10 +503,15 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h, bool resize)
flags |= SDL_WINDOW_FULLSCREEN;
}
+ int x = SDL_WINDOWPOS_UNDEFINED, y = SDL_WINDOWPOS_UNDEFINED;
+ SDL_Rect r;
+ if (SDL_GetDisplayBounds(this->startup_display, &r) == 0) {
+ x = r.x + std::max(0, r.w - static_cast(w)) / 2;
+ y = r.y + std::max(0, r.h - static_cast(h)) / 4; // decent desktops have taskbars at the bottom
+ }
_sdl_window = SDL_CreateWindow(
caption,
- SDL_WINDOWPOS_UNDEFINED,
- SDL_WINDOWPOS_UNDEFINED,
+ x, y,
w, h,
flags);
@@ -997,6 +1000,8 @@ int VideoDriver_SDL::PollEvent()
const char *VideoDriver_SDL::Start(const StringList &parm)
{
+ if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 0) return "Only real blitters supported";
+
#if defined(WITH_FCITX)
FcitxInit();
#endif
@@ -1016,6 +1021,25 @@ const char *VideoDriver_SDL::Start(const StringList &parm)
}
if (ret_code < 0) return SDL_GetError();
+ this->startup_display = GetDriverParamInt(parm, "display", -1);
+ int num_displays = SDL_GetNumVideoDisplays();
+ if (!IsInsideBS(this->startup_display, 0, num_displays)) {
+ /* Mouse position decides which display to use */
+ int mx, my;
+ SDL_GetGlobalMouseState(&mx, &my);
+ this->startup_display = 0; // used when mouse is on no screen...
+ for (int display = 0; display < num_displays; ++display) {
+ SDL_Rect r;
+ if (SDL_GetDisplayBounds(display, &r) == 0 && IsInsideBS(mx, r.x, r.w) && IsInsideBS(my, r.y, r.h)) {
+ DEBUG(driver, 1, "SDL2: Mouse is at (%d, %d), use display %d (%d, %d, %d, %d)", mx, my, display, r.x, r.y, r.w, r.h);
+ this->startup_display = display;
+ break;
+ }
+ }
+ }
+
+ this->UpdateAutoResolution();
+
GetVideoModes();
if (!CreateMainSurface(_cur_resolution.width, _cur_resolution.height, false)) {
return SDL_GetError();
@@ -1268,6 +1292,7 @@ bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
bool VideoDriver_SDL::AfterBlitterChange()
{
+ assert(BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0);
int w, h;
SDL_GetWindowSize(_sdl_window, &w, &h);
return CreateMainSurface(w, h, false);
@@ -1283,4 +1308,12 @@ void VideoDriver_SDL::ReleaseBlitterLock()
if (_draw_mutex != nullptr) _draw_mutex->unlock();
}
+Dimension VideoDriver_SDL::GetScreenSize() const
+{
+ SDL_DisplayMode mode;
+ if (SDL_GetCurrentDisplayMode(this->startup_display, &mode) != 0) return VideoDriver::GetScreenSize();
+
+ return { static_cast(mode.w), static_cast(mode.h) };
+}
+
#endif /* WITH_SDL2 */
diff --git a/src/video/sdl2_v.h b/src/video/sdl2_v.h
index c2ac87a062..de10543b5d 100644
--- a/src/video/sdl2_v.h
+++ b/src/video/sdl2_v.h
@@ -40,6 +40,10 @@ public:
void EditBoxLostFocus() override;
const char *GetName() const override { return "sdl"; }
+
+protected:
+ Dimension GetScreenSize() const override;
+
private:
int PollEvent();
void LoopOnce();
@@ -60,6 +64,7 @@ private:
uint32 last_cur_ticks;
uint32 next_tick;
+ int startup_display;
std::thread draw_thread;
std::unique_lock draw_lock;
};
diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp
index 252b65916d..ef5d64f96c 100644
--- a/src/video/sdl_v.cpp
+++ b/src/video/sdl_v.cpp
@@ -620,6 +620,8 @@ const char *VideoDriver_SDL::Start(const StringList &parm)
}
if (ret_code < 0) return SDL_GetError();
+ this->UpdateAutoResolution();
+
GetVideoModes();
if (!CreateMainSurface(_cur_resolution.width, _cur_resolution.height)) {
return SDL_GetError();
diff --git a/src/video/video_driver.hpp b/src/video/video_driver.hpp
index 23421387c2..88ce43a42b 100644
--- a/src/video/video_driver.hpp
+++ b/src/video/video_driver.hpp
@@ -12,10 +12,19 @@
#include "../driver.h"
#include "../core/geometry_type.hpp"
+#include "../core/math_func.hpp"
#include
+extern std::string _ini_videodriver;
+extern std::vector _resolutions;
+extern Dimension _cur_resolution;
+extern bool _rightclick_emulate;
+
/** The base of all video drivers. */
class VideoDriver : public Driver {
+ const uint DEFAULT_WINDOW_WIDTH = 640u; ///< Default window width.
+ const uint DEFAULT_WINDOW_HEIGHT = 480u; ///< Default window height.
+
public:
/**
* Mark a particular area dirty.
@@ -102,11 +111,27 @@ public:
static VideoDriver *GetInstance() {
return static_cast(*DriverFactoryBase::GetActiveDriver(Driver::DT_VIDEO));
}
+
+protected:
+ /*
+ * Get the resolution of the main screen.
+ */
+ virtual Dimension GetScreenSize() const { return { DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT }; }
+
+ /**
+ * Apply resolution auto-detection and clamp to sensible defaults.
+ */
+ void UpdateAutoResolution()
+ {
+ if (_cur_resolution.width == 0 || _cur_resolution.height == 0) {
+ /* Auto-detect a good resolution. We aim for 75% of the screen size.
+ * Limit width times height times bytes per pixel to fit a 32 bit
+ * integer, This way all internal drawing routines work correctly. */
+ Dimension res = this->GetScreenSize();
+ _cur_resolution.width = ClampU(res.width * 3 / 4, DEFAULT_WINDOW_WIDTH, UINT16_MAX / 2);
+ _cur_resolution.height = ClampU(res.height * 3 / 4, DEFAULT_WINDOW_HEIGHT, UINT16_MAX / 2);
+ }
+ }
};
-extern std::string _ini_videodriver;
-extern std::vector _resolutions;
-extern Dimension _cur_resolution;
-extern bool _rightclick_emulate;
-
#endif /* VIDEO_VIDEO_DRIVER_HPP */
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp
index edbd103cb2..b487608708 100644
--- a/src/video/win32_v.cpp
+++ b/src/video/win32_v.cpp
@@ -44,9 +44,6 @@
#define PM_QS_INPUT 0x20000
#endif
-typedef BOOL (WINAPI *PFNTRACKMOUSEEVENT)(LPTRACKMOUSEEVENT lpEventTrack);
-static PFNTRACKMOUSEEVENT _pTrackMouseEvent = nullptr;
-
static struct {
HWND main_wnd; ///< Handle to system window.
HBITMAP dib_sect; ///< System bitmap object referencing our rendering buffer.
@@ -81,24 +78,24 @@ static Palette _local_palette;
static void MakePalette()
{
+ _cur_palette.first_dirty = 0;
+ _cur_palette.count_dirty = 256;
+ _local_palette = _cur_palette;
+
LOGPALETTE *pal = (LOGPALETTE*)alloca(sizeof(LOGPALETTE) + (256 - 1) * sizeof(PALETTEENTRY));
pal->palVersion = 0x300;
pal->palNumEntries = 256;
for (uint i = 0; i != 256; i++) {
- pal->palPalEntry[i].peRed = _cur_palette.palette[i].r;
- pal->palPalEntry[i].peGreen = _cur_palette.palette[i].g;
- pal->palPalEntry[i].peBlue = _cur_palette.palette[i].b;
+ pal->palPalEntry[i].peRed = _local_palette.palette[i].r;
+ pal->palPalEntry[i].peGreen = _local_palette.palette[i].g;
+ pal->palPalEntry[i].peBlue = _local_palette.palette[i].b;
pal->palPalEntry[i].peFlags = 0;
}
_wnd.gdi_palette = CreatePalette(pal);
if (_wnd.gdi_palette == nullptr) usererror("CreatePalette failed!\n");
-
- _cur_palette.first_dirty = 0;
- _cur_palette.count_dirty = 256;
- _local_palette = _cur_palette;
}
static void UpdatePalette(HDC dc, uint start, uint count)
@@ -234,31 +231,6 @@ int RedrawScreenDebug()
}
#endif
-/* Windows 95 will not have a WM_MOUSELEAVE message, so define it if needed */
-#if !defined(WM_MOUSELEAVE)
-#define WM_MOUSELEAVE 0x02A3
-#endif
-#define TID_POLLMOUSE 1
-#define MOUSE_POLL_DELAY 75
-
-static void CALLBACK TrackMouseTimerProc(HWND hwnd, UINT msg, UINT_PTR event, DWORD time)
-{
- RECT rc;
- POINT pt;
-
- /* Get the rectangle of our window and translate it to screen coordinates.
- * Compare this with the current screen coordinates of the mouse and if it
- * falls outside of the area or our window we have left the window. */
- GetClientRect(hwnd, &rc);
- MapWindowPoints(hwnd, HWND_DESKTOP, (LPPOINT)(LPRECT)&rc, 2);
- GetCursorPos(&pt);
-
- if (!PtInRect(&rc, pt) || (WindowFromPoint(pt) != hwnd)) {
- KillTimer(hwnd, event);
- PostMessage(hwnd, WM_MOUSELEAVE, 0, 0L);
- }
-}
-
/**
* Instantiate a new window.
* @param full_screen Whether to make a full screen window or not.
@@ -638,7 +610,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
switch (msg) {
case WM_CREATE:
- SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, TrackMouseTimerProc);
+ _cursor.in_window = false; // Win32 has mouse tracking.
SetCompositionPos(hwnd);
_imm_props = ImmGetProperty(GetKeyboardLayout(0), IGP_PROPERTY);
break;
@@ -735,16 +707,12 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
* tracking the mouse for exiting the window */
if (!_cursor.in_window) {
_cursor.in_window = true;
- if (_pTrackMouseEvent != nullptr) {
- TRACKMOUSEEVENT tme;
- tme.cbSize = sizeof(tme);
- tme.dwFlags = TME_LEAVE;
- tme.hwndTrack = hwnd;
+ TRACKMOUSEEVENT tme;
+ tme.cbSize = sizeof(tme);
+ tme.dwFlags = TME_LEAVE;
+ tme.hwndTrack = hwnd;
- _pTrackMouseEvent(&tme);
- } else {
- SetTimer(hwnd, TID_POLLMOUSE, MOUSE_POLL_DELAY, TrackMouseTimerProc);
- }
+ TrackMouseEvent(&tme);
}
if (_cursor.fix_at) {
@@ -1012,27 +980,24 @@ static void RegisterWndClass()
{
static bool registered = false;
- if (!registered) {
- HINSTANCE hinst = GetModuleHandle(nullptr);
- WNDCLASS wnd = {
- CS_OWNDC,
- WndProcGdi,
- 0,
- 0,
- hinst,
- LoadIcon(hinst, MAKEINTRESOURCE(100)),
- LoadCursor(nullptr, IDC_ARROW),
- 0,
- 0,
- _T("OTTD")
- };
+ if (registered) return;
- registered = true;
- if (!RegisterClass(&wnd)) usererror("RegisterClass failed");
+ HINSTANCE hinst = GetModuleHandle(nullptr);
+ WNDCLASS wnd = {
+ CS_OWNDC,
+ WndProcGdi,
+ 0,
+ 0,
+ hinst,
+ LoadIcon(hinst, MAKEINTRESOURCE(100)),
+ LoadCursor(nullptr, IDC_ARROW),
+ 0,
+ 0,
+ _T("OTTD")
+ };
- /* Dynamically load mouse tracking, as it doesn't exist on Windows 95. */
- _pTrackMouseEvent = (PFNTRACKMOUSEEVENT)GetProcAddress(GetModuleHandle(_T("User32")), "TrackMouseEvent");
- }
+ registered = true;
+ if (!RegisterClass(&wnd)) usererror("RegisterClass failed");
}
static bool AllocateDibSection(int w, int h, bool force)
@@ -1044,8 +1009,6 @@ static bool AllocateDibSection(int w, int h, bool force)
w = std::max(w, 64);
h = std::max(h, 64);
- if (bpp == 0) usererror("Can't use a blitter that blits 0 bpp for normal visuals");
-
if (!force && w == _screen.width && h == _screen.height) return false;
bi = (BITMAPINFO*)alloca(sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256);
@@ -1056,7 +1019,7 @@ static bool AllocateDibSection(int w, int h, bool force)
bi->bmiHeader.biHeight = -(_wnd.height = h);
bi->bmiHeader.biPlanes = 1;
- bi->bmiHeader.biBitCount = BlitterFactory::GetCurrentBlitter()->GetScreenDepth();
+ bi->bmiHeader.biBitCount = bpp;
bi->bmiHeader.biCompression = BI_RGB;
if (_wnd.dib_sect) DeleteObject(_wnd.dib_sect);
@@ -1119,6 +1082,10 @@ static FVideoDriver_Win32 iFVideoDriver_Win32;
const char *VideoDriver_Win32::Start(const StringList &parm)
{
+ if (BlitterFactory::GetCurrentBlitter()->GetScreenDepth() == 0) return "Only real blitters supported";
+
+ this->UpdateAutoResolution();
+
memset(&_wnd, 0, sizeof(_wnd));
RegisterWndClass();
@@ -1282,7 +1249,7 @@ void VideoDriver_Win32::MainLoop()
/* Release the thread while sleeping */
if (_draw_threaded) draw_lock.unlock();
- Sleep(1);
+ CSleep(1);
if (_draw_threaded) draw_lock.lock();
NetworkDrawChatMessage();
@@ -1329,6 +1296,7 @@ bool VideoDriver_Win32::ToggleFullscreen(bool full_screen)
bool VideoDriver_Win32::AfterBlitterChange()
{
+ assert(BlitterFactory::GetCurrentBlitter()->GetScreenDepth() != 0);
return AllocateDibSection(_screen.width, _screen.height, true) && this->MakeWindow(_fullscreen);
}
@@ -1351,3 +1319,8 @@ void VideoDriver_Win32::EditBoxLostFocus()
SetCompositionPos(_wnd.main_wnd);
SetCandidatePos(_wnd.main_wnd);
}
+
+Dimension VideoDriver_Win32::GetScreenSize() const
+{
+ return { static_cast(GetSystemMetrics(SM_CXSCREEN)), static_cast(GetSystemMetrics(SM_CYSCREEN)) };
+}
diff --git a/src/video/win32_v.h b/src/video/win32_v.h
index 5c1b20322f..ef02e132e6 100644
--- a/src/video/win32_v.h
+++ b/src/video/win32_v.h
@@ -40,6 +40,9 @@ public:
const char *GetName() const override { return "win32"; }
bool MakeWindow(bool full_screen);
+
+protected:
+ Dimension GetScreenSize() const override;
};
/** The factory for Windows' video driver. */
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index a43c818b5e..4351b64618 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -161,7 +161,9 @@ public:
static const NWidgetPart _nested_waypoint_view_widgets[] = {
NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_W_RENAME), SetMinimalSize(12, 14), SetDataTip(SPR_RENAME, STR_BUOY_VIEW_CHANGE_BUOY_NAME),
NWidget(WWT_CAPTION, COLOUR_GREY, WID_W_CAPTION), SetDataTip(STR_WAYPOINT_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+ NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_W_CENTER_VIEW), SetMinimalSize(12, 14), SetDataTip(SPR_GOTO_LOCATION, STR_BUOY_VIEW_CENTER_TOOLTIP),
NWidget(WWT_DEBUGBOX, COLOUR_GREY),
NWidget(WWT_SHADEBOX, COLOUR_GREY),
NWidget(WWT_DEFSIZEBOX, COLOUR_GREY),
@@ -173,8 +175,6 @@ static const NWidgetPart _nested_waypoint_view_widgets[] = {
EndContainer(),
EndContainer(),
NWidget(NWID_HORIZONTAL),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_CENTER_VIEW), SetMinimalSize(100, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_BUOY_VIEW_CENTER_TOOLTIP),
- NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_RENAME), SetMinimalSize(100, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_BUOY_VIEW_CHANGE_BUOY_NAME),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_DEPARTURES), SetMinimalSize(100, 12), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_STATION_VIEW_DEPARTURES_BUTTON, STR_STATION_VIEW_DEPARTURES_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_W_SHOW_VEHICLES), SetMinimalSize(15, 12), SetDataTip(STR_SHIP, STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP),
NWidget(WWT_RESIZEBOX, COLOUR_GREY),
diff --git a/src/widgets/misc_widget.h b/src/widgets/misc_widget.h
index 07dc3e7602..e49e6309ad 100644
--- a/src/widgets/misc_widget.h
+++ b/src/widgets/misc_widget.h
@@ -12,6 +12,7 @@
/** Widgets of the #LandInfoWindow class. */
enum LandInfoWidgets {
+ WID_LI_LOCATION, ///< Scroll to location.
WID_LI_BACKGROUND, ///< Background of the window.
};
diff --git a/src/widgets/sign_widget.h b/src/widgets/sign_widget.h
index 2225eb8b1c..1a05dd349b 100644
--- a/src/widgets/sign_widget.h
+++ b/src/widgets/sign_widget.h
@@ -24,6 +24,7 @@ enum SignListWidgets {
/** Widgets of the #SignWindow class. */
enum QueryEditSignWidgets {
WID_QES_CAPTION, ///< Caption of the window.
+ WID_QES_LOCATION, ///< Scroll to sign location.
WID_QES_TEXT, ///< Text of the query.
WID_QES_OK, ///< OK button.
WID_QES_CANCEL, ///< Cancel button.
diff --git a/src/widgets/vehicle_widget.h b/src/widgets/vehicle_widget.h
index 5ab675eff5..188276bdc1 100644
--- a/src/widgets/vehicle_widget.h
+++ b/src/widgets/vehicle_widget.h
@@ -15,7 +15,9 @@ enum VehicleViewWidgets {
WID_VV_CAPTION, ///< Caption of window.
WID_VV_VIEWPORT, ///< Viewport widget.
WID_VV_START_STOP, ///< Start or stop this vehicle, and show information about the current state.
- WID_VV_CENTER_MAIN_VIEW, ///< Center the main view on this vehicle.
+ WID_VV_RENAME, ///< Rename vehicle
+ WID_VV_LOCATION, ///< Center the main view on this vehicle.
+ WID_VV_ORDER_LOCATION, ///< Center the main view on the order's target location.
WID_VV_GOTO_DEPOT, ///< Order this vehicle to go to the depot.
WID_VV_REFIT, ///< Open the refit window.
WID_VV_SHOW_ORDERS, ///< Show the orders of this vehicle.
@@ -43,7 +45,6 @@ enum VehicleRefitWidgets {
/** Widgets of the #VehicleDetailsWindow class. */
enum VehicleDetailsWidgets {
WID_VD_CAPTION, ///< Caption of window.
- WID_VD_RENAME_VEHICLE, ///< Rename this vehicle.
WID_VD_TOP_DETAILS, ///< Panel with generic details.
WID_VD_INCREASE_SERVICING_INTERVAL, ///< Increase the servicing interval.
WID_VD_DECREASE_SERVICING_INTERVAL, ///< Decrease the servicing interval.