Merge branch 'master' into jgrpp

# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h

CMakeLists.txt

@@ -140,7 +140,9 @@ if(NOT OPTION_DEDICATED)
                 find_package(SDL)
             endif()
             find_package(Fluidsynth)
-            find_package(Fontconfig)
+            if(Freetype_FOUND)
+                find_package(Fontconfig)
+            endif()
             find_package(Harfbuzz)
             find_package(ICU OPTIONAL_COMPONENTS i18n)
         endif()

README.md

@@ -562,9 +562,6 @@ See `src/3rdparty/squirrel/COPYRIGHT` for the complete license text.
 The md5 implementation in `src/3rdparty/md5` is licensed under the Zlib license.
 See the comments in the source files in `src/3rdparty/md5` for the complete license text.
 
-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 fmt implementation in `src/3rdparty/fmt` is licensed under the MIT license.
 See `src/3rdparty/fmt/LICENSE.rst` for the complete license text.
 

os/macosx/notarize.sh

@@ -5,11 +5,8 @@ set -e
 # 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:
+# This uses the Xcode notarytool to perform notarization. You must set up a keychain
-#
+# profile called "openttd" using the "store-credentials" notarytool command beforehand.
-#   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:
@@ -22,19 +19,11 @@ set -e
 # 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
@@ -43,24 +32,15 @@ if [ "${dmg_filename}" = "bundles/*.dmg" ]; then
     exit 1
 fi;
 
-cat <<EOF > notarize.json
+xcrun notarytool submit ${dmg_filename[0]} --keychain-profile "openttd" --wait
-{
-   "notarize": [
-      {
-         "path": "${dmg_filename[0]}",
-         "bundle_id": "org.openttd.openttd.jgrpp",
-         "staple": true
-      }
-   ]
-}
-EOF
 
-gon notarize.json
+# Staple the ticket to the .dmg
+xcrun stapler staple "${dmg_filename[0]}"
 
 app_filename=(_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app)
 
 if [ "${app_filename}" = "_CPack_Packages/*/Bundle/openttd-*/OpenTTD.app" ]; then
-    echo "No .app found in the _CPack_Packages directory, skipping stapling."
+    echo "No .app found in the _CPack_Packages directory, skipping app stapling."
     exit 0
 fi;
 

os/os2/build_lang.cmd

@@ -1,8 +0,0 @@
-rem
-rem Building language files...
-rem
-cd ..
-strgen\strgen
-for %%f in (lang\*.txt) do strgen\strgen %%f
-cd strgen
-

os/os2/dedicated.cmd

@@ -1 +0,0 @@
-start /n /win openttd.exe -D %1 %2 %3 %4 %5 %6 %7 %8 %9

os/os2/installer/download_nosound.cmd

@@ -1,21 +0,0 @@
-@echo off
-if "%1" == "" goto err
-if "%2" == "" goto err
-
-echo Downloading NoSound...
-
-%1\wget http://binaries.openttd.org/installer/nosound-NOSOUND_VERSION.7z -O %2/baseset/nosound.7z
-
-echo Extracting NoSound...
-
-%1\7za x -y -O%2/baseset %2/baseset/nosound.7z
-del %1\baseset\nosound.7z /n
-
-echo NoSound has been installed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-echo Please visit www.openttd.org for details on downloading NoSound.
-
-:end

os/os2/installer/download_opengfx.cmd

@@ -1,21 +0,0 @@
-@echo off
-if "%1" == "" goto err
-if "%2" == "" goto err
-
-echo Downloading OpenGFX...
-
-%1\wget http://binaries.openttd.org/installer/opengfx-OPENGFX_VERSION.7z -O %2/baseset/opengfx.7z
-
-echo Extracting OpenGFX...
-
-%1\7za x -y -O%2/baseset %2/baseset/opengfx.7z
-del %1\baseset\opengfx.7z /n
-
-echo OpenGFX has been installed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-echo Please visit www.openttd.org for details on downloading OpenGFX.
-
-:end

os/os2/installer/download_opensfx.cmd

@@ -1,21 +0,0 @@
-@echo off
-if "%1" == "" goto err
-if "%2" == "" goto err
-
-echo Downloading OpenSFX...
-
-%1\wget http://binaries.openttd.org/installer/opensfx-OPENSFX_VERSION.7z -O %2/baseset/opensfx.7z
-
-echo Extracting OpenSFX...
-
-%1\7za x -y -O%2/baseset %2/baseset/opensfx.7z
-del %1\baseset\opensfx.7z /n
-
-echo OpenSFX has been installed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-echo Please visit www.openttd.org for details on downloading OpenSFX.
-
-:end

os/os2/installer/make_installer.cmd

@@ -1,85 +0,0 @@
-@echo off
-
-set OPENTTD_VERSION=1.11.0
-set OPENSFX_VERSION=0.8.0
-set NOSOUND_VERSION=0.8.0
-set OPENGFX_VERSION=1.2.0
-
-echo To make the installer, you must have the WarpIN compiler (wic) installed and in
-echo your path, as well as wget and unzip. This file will download the various DLLs
-echo to be distributed with the installer. If you do not want to continue, please
-echo press CTRL-C now.
-echo.
-pause
-
-cd ..\..\..\bundle
-
-if not exist SDL12.dll goto getsdl
-if not exist FSLib.dll goto getsdl
-goto libc
-
-:getsdl
-
-wget http://www.os2site.com/sw/dev/sdl/sdl-1.2.10-bin-20080804.zip -O dl.zip
-unzip -j dl.zip SDL/FSLib.dll SDL/SDL12.dll
-del dl.zip
-
-:libc
-
-if exist libc063.dll goto gcc
-
-wget ftp://ftp.netlabs.org/pub/gcc/libc-0.6.3-csd3.zip -O dl.zip
-unzip -j dl.zip libc063.dll
-del dl.zip
-
-:gcc
-
-if exist gcc442.dll goto tools
-
-wget http://www.owenrudge.net/various/gcc442.zip -O dl.zip
-unzip -j dl.zip gcc442.dll
-del dl.zip
-
-:tools
-
-cd ..\os\os2\installer
-if exist tools goto opengfx
-
-mkdir tools
-cd tools
-
-wget http://download.smedley.info/wget-1.11.4-os2-20090315.zip -O dl.zip
-unzip -j dl.zip wget/bin/wget.exe
-del dl.zip
-
-wget ftp://ftp.os4.su/moveton/p7zip-9.04-bin-os2.zip -O dl.zip
-unzip -j dl.zip bin/7za.exe dll/ilibca.dll
-del dl.zip
-
-cd ..
-
-:opengfx
-
-if exist opengfx goto opensfx
-
-mkdir opengfx
-sed s/OPENGFX_VERSION/%OPENGFX_VERSION%/ < download_opengfx.cmd > opengfx\download_opengfx.cmd
-copy remove_opengfx.cmd opengfx
-
-:opensfx
-if exist opensfx goto nosound
-
-mkdir opensfx
-sed s/OPENSFX_VERSION/%OPENSFX_VERSION%/ < download_opensfx.cmd > opensfx\download_opensfx.cmd
-copy remove_opensfx.cmd opensfx
-
-:nosound
-
-mkdir nosound
-sed s/NOSOUND_VERSION/%NOSOUND_VERSION%/ < download_nosound.cmd > nosound\download_nosound.cmd
-copy remove_nosound.cmd nosound
-
-:end
-
-if exist openttd-%OPENTTD_VERSION%-os2.exe del openttd-%OPENTTD_VERSION%-os2.exe
-wic -a openttd-%OPENTTD_VERSION%-os2.exe 1 -c../../../bundle -r * 2 -ctools -r * 3 -copengfx -r * 4 -copensfx -r * 5 -cnosound -r * -U -s openttd.wis

os/os2/installer/openttd.wis

@@ -1,106 +0,0 @@
-<WARPIN>
-<HEAD>
-<TITLE>OpenTTD</TITLE>
-
-<!-- Please remember to increment the build number for each package
-     when releasing a new stable version, particularly if there are
-     also release candidates sharing the major/minor versions:
-
-     e.g., 0\7\1\16279 for 0.7.1-RC1,
-           0\7\1\16365 for 0.7.1-RC2,
-           0\7\1\16540 for 0.7.1 final
--->
-
-<PCK INDEX="1"
-      PACKAGEID="OpenTTD\OpenTTD\OpenTTD\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="OpenTTD"
-      LONGFILENAMES
-      BASE
-      >OpenTTD is an open source transport simulation game</PCK>
-
-<PCK INDEX="2"
-      PACKAGEID="OpenTTD\OpenTTD\Downloader\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="Download tools"
-      REQUIRES=1
-      FIXED
-      >Tools required for downloading the OpenGFX/SFX packs</PCK>
-
-<PCK INDEX="3"
-      PACKAGEID="OpenTTD\OpenTTD\OpenGFX\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="OpenGFX"
-      LONGFILENAMES
-      REQUIRES=2
-      EXECUTE="$(3)\download_opengfx.cmd | $(1) $(/1)"
-      DEEXECUTE="$(3)\remove_opengfx.cmd | $(1) $(/1)"
-      FIXED
-      >Downloads the OpenGFX graphics pack for OpenTTD</PCK>
-
-<PCK INDEX="4"
-      PACKAGEID="OpenTTD\OpenTTD\OpenSFX\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="OpenSFX"
-      LONGFILENAMES
-      REQUIRES=2
-      EXECUTE="$(4)\download_opensfx.cmd | $(1) $(/1)"
-      DEEXECUTE="$(4)\remove_opensfx.cmd | $(1) $(/1)"
-      FIXED
-      >Downloads the OpenSFX sound effects pack for OpenTTD</PCK>
-
-<PCK INDEX="5"
-      PACKAGEID="OpenTTD\OpenTTD\NoSound\1\0\0\18862"
-      TARGET="$(WARPIN_DEFAULTAPPSPATH)\OpenTTD"
-      SELECT
-      TITLE="NoSound"
-      LONGFILENAMES
-      REQUIRES=2
-      EXECUTE="$(5)\download_nosound.cmd | $(1) $(/1)"
-      DEEXECUTE="$(5)\remove_nosound.cmd | $(1) $(/1)"
-      FIXED
-      >Downloads the NoSound pack for OpenTTD, to disable sound effects</PCK>
-
-</HEAD>
-
-<BODY>
-<!-- page 1: introductory page -->
-<PAGE INDEX="1" TYPE="README">
-<NEXTBUTTON TARGET=2>~Next</NEXTBUTTON>
-<README EXTRACTFROMPCK="1">README.md</README>
-<TEXT>Welcome to the OpenTTD installer. This program will install OpenTTD 1.0 on your system. Before we begin the installation process, please take a moment to read the following document.
-
-Select "Next" to continue, or "Cancel" to abort installation.</TEXT>
-</PAGE>
-
-<!-- page 2: licence page -->
-<PAGE INDEX="2" TYPE="README">
-<NEXTBUTTON TARGET=3>~Next</NEXTBUTTON>
-<README EXTRACTFROMPCK="1">COPYING.md</README>
-<TEXT>OpenTTD is licenced under the GNU General Public License. The text of the licence is below.
-
-Select "Next" if you agree to this licence.
-Select "Cancel" to abort installation.</TEXT>
-</PAGE>
-
-<!-- The TYPE=CONTAINER will list the packages which can be installed. -->
-<PAGE INDEX="3" TYPE="CONTAINER">
-<NEXTBUTTON TARGET="4">~Next</NEXTBUTTON>
-<TEXT>On this page, you may choose which components to install. If you don't own Transport Tycoon Deluxe, you will need to download OpenGFX (3MiB) and OpenSFX (10MiB).</TEXT>
-</PAGE>
-
-<!-- Display another TEXT page to inform the user
-         that installation will begin. We use the TARGET=0
-        with the NEXTBUTTON tag which starts installation. -->
-
-<PAGE INDEX="4" TYPE="TEXT">
-<NEXTBUTTON TARGET="0">I~nstall</NEXTBUTTON>
-<TEXT>
-Press "Install" to begin installing OpenTTD.</TEXT>
-</PAGE>
-</BODY>
-</WARPIN>

os/os2/installer/remove_nosound.cmd

@@ -1,15 +0,0 @@
-@echo off
-if "%1" == "" goto err
-
-echo Removing NoSound...
-
-del %1\baseset\nosound\*.* /n
-rmdir %1\baseset\nosound
-
-echo NoSound has been removed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-
-:end

os/os2/installer/remove_opengfx.cmd

@@ -1,15 +0,0 @@
-@echo off
-if "%1" == "" goto err
-
-echo Removing OpenGFX...
-
-del %1\baseset\opengfx\*.* /n
-rmdir %1\baseset\opengfx
-
-echo OpenGFX has been removed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-
-:end

os/os2/installer/remove_opensfx.cmd

@@ -1,15 +0,0 @@
-@echo off
-if "%1" == "" goto err
-
-echo Removing OpenSFX...
-
-del %1\baseset\opensfx\*.* /n
-rmdir %1\baseset\opensfx
-
-echo OpenSFX has been removed.
-goto end
-
-:err
-echo This batch file is only intended for use by the OpenTTD installer.
-
-:end

os/os2/openttd.wpj

@@ -1,64 +0,0 @@
-40
-projectIdent
-0
-VpeMain
-1
-WRect
-0
-0
-10304
-10020
-2
-MProject
-3
-MCommand
-15
-svn_version.cmd
-4
-MCommand
-0
-2
-5
-WFileName
-17
-..\..\openttd.tgt
-6
-WFileName
-23
-..\..\strgen\strgen.tgt
-7
-WVList
-2
-8
-VComponent
-9
-WRect
-0
-0
-5696
-4240
-0
-0
-10
-WFileName
-17
-..\..\openttd.tgt
-0
-0
-11
-VComponent
-12
-WRect
-688
-680
-5696
-4240
-0
-0
-13
-WFileName
-23
-..\..\strgen\strgen.tgt
-0
-1
-8

os/os2/svn_version.cmd

@@ -1,30 +0,0 @@
-@echo off
-echo Running SVN version detection script...
-rem
-rem Requires subversion (`svnversion') to be installed
-rem
-cd ..\..
-if not "%RELEASE%"=="" goto forcerelease
-if not exist .svn goto nosvn
-svnversion -n . > os\os2\svnver.tmp
-if not "%ERRORLEVEL%"=="0" goto nosvn
-
-copy os\os2\svnver1.c+os\os2\svnver.tmp+os\os2\svnver2.c rev.c /a /y > nul 2> nul
-goto end
-
-:forcerelease
-echo Forcing release string "%RELEASE%"...
-echo const char _openttd_revision[] = "%RELEASE%"; > rev.c
-echo const int _revision_number = 0; >> rev.c
-goto end
-
-:nosvn
-echo Error executing `svnversion' or no SVN data detected
-echo const char _openttd_revision[] = "norev000"; > rev.c
-echo const int _revision_number = 0; >> rev.c
-goto end
-
-:end
-cd os\os2
-del svnver.tmp > nul 2> nul
-rem end

os/os2/svnver1.c

@@ -1,3 +0,0 @@
-/* rev.c part #1 for OS/2 - ensure no newline at end of file! */
-
-const char _openttd_revision[] = "r

os/os2/svnver2.c

@@ -1,4 +0,0 @@
-";
-const int _revision_number = 0;
-
-/* rev.c part 2 for OS/2 - ensure no newline at start of file! */

src/3rdparty/CMakeLists.txt

@@ -4,7 +4,6 @@ add_subdirectory(icu)
 add_subdirectory(md5)
 add_subdirectory(squirrel)
 add_subdirectory(opengl)
-add_subdirectory(os2)
 add_subdirectory(cpp-btree)
 add_subdirectory(mingw-std-threads)
 add_subdirectory(monocypher)

src/3rdparty/os2/CMakeLists.txt

@@ -1,7 +0,0 @@
-add_files(
-    getaddrinfo.c
-    getaddrinfo.h
-    getnameinfo.c
-    getnameinfo.h
-    CONDITION OPTION_OS2
-)

src/3rdparty/os2/getaddrinfo.c

@@ -1,299 +0,0 @@
-/*
- *  This file is part of libESMTP, a library for submission of RFC 2822
- *  formatted electronic mail messages using the SMTP protocol described
- *  in RFC 2821.
- *
- *  Copyright (C) 2001,2002  Brian Stafford  <brian@stafford.uklinux.net>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* An emulation of the RFC 2553 / Posix getaddrinfo resolver interface.
- */
-
-#if !HAVE_GETADDRINFO
-
-/* Need to turn off Posix features in glibc to build this */
-#undef _POSIX_C_SOURCE
-#undef _XOPEN_SOURCE
-
-#include "getaddrinfo.h"
-//#include "compat/inet_pton.h"
-
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-static struct addrinfo *
-dup_addrinfo (struct addrinfo *info, void *addr, size_t addrlen) {
-    struct addrinfo *ret;
-
-    ret = malloc (sizeof (struct addrinfo));
-    if (ret == NULL)
-        return NULL;
-    memcpy (ret, info, sizeof (struct addrinfo));
-    ret->ai_addr = malloc (addrlen);
-    if (ret->ai_addr == NULL) {
-        free (ret);
-        return NULL;
-    }
-    memcpy (ret->ai_addr, addr, addrlen);
-    ret->ai_addrlen = addrlen;
-    return ret;
-}
-
-int
-getaddrinfo (const char *nodename, const char *servname,
-              const struct addrinfo *hints, struct addrinfo **res)
-{
-    struct hostent *hp;
-    struct servent *servent;
-    const char *socktype;
-    int port;
-    struct addrinfo hint, result;
-    struct addrinfo *ai, *sai, *eai;
-    char **addrs;
-
-    if (servname == NULL && nodename == NULL)
-        return EAI_NONAME;
-
-    memset (&result, 0, sizeof result);
-
-    /* default for hints */
-    if (hints == NULL) {
-        memset (&hint, 0, sizeof hint);
-        hint.ai_family = PF_UNSPEC;
-        hints = &hint;
-    }
-
-    if (servname == NULL)
-        port = 0;
-    else {
-        /* check for tcp or udp sockets only */
-        if (hints->ai_socktype == SOCK_STREAM)
-            socktype = "tcp";
-        else if (hints->ai_socktype == SOCK_DGRAM)
-            socktype = "udp";
-        else
-            return EAI_SERVICE;
-        result.ai_socktype = hints->ai_socktype;
-
-        /* Note: maintain port in host byte order to make debugging easier */
-        if (isdigit (*servname))
-            port = strtol (servname, NULL, 10);
-        else if ((servent = getservbyname (servname, socktype)) != NULL)
-            port = ntohs (servent->s_port);
-        else
-            return EAI_NONAME;
-    }
-
-    /* if nodename == NULL refer to the local host for a client or any
-       for a server */
-    if (nodename == NULL) {
-        struct sockaddr_in sin;
-
-        /* check protocol family is PF_UNSPEC or PF_INET - could try harder
-           for IPv6 but that's more code than I'm prepared to write */
-        if (hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET)
-            result.ai_family = AF_INET;
-        else
-            return EAI_FAMILY;
-
-        sin.sin_family = result.ai_family;
-        sin.sin_port = htons (port);
-        if (hints->ai_flags & AI_PASSIVE)
-            sin.sin_addr.s_addr = htonl (INADDR_ANY);
-        else
-            sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-        /* Duplicate result and addr and return */
-        *res = dup_addrinfo (&result, &sin, sizeof sin);
-        return (*res == NULL) ? EAI_MEMORY : 0;
-    }
-
-    /* If AI_NUMERIC is specified, use inet_pton to translate numbers and
-       dots notation. */
-    if (hints->ai_flags & AI_NUMERICHOST) {
-        struct sockaddr_in sin;
-
-        /* check protocol family is PF_UNSPEC or PF_INET */
-        if (hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET)
-            result.ai_family = AF_INET;
-        else
-            return EAI_FAMILY;
-
-        sin.sin_family = result.ai_family;
-        sin.sin_port = htons (port);
-        if (inet_pton(result.ai_family, nodename, &sin.sin_addr)==0)
-            return EAI_NONAME;
-        sin.sin_addr.s_addr = inet_addr (nodename);
-        /* Duplicate result and addr and return */
-        *res = dup_addrinfo (&result, &sin, sizeof sin);
-        return (*res == NULL) ? EAI_MEMORY : 0;
-    }
-
-#if HAVE_H_ERRNO
-    h_errno = 0;
-#endif
-    errno = 0;
-    hp = gethostbyname(nodename);
-    if (hp == NULL) {
-#ifdef EAI_SYSTEM
-        if (errno != 0) {
-            return EAI_SYSTEM;
-        }
-#endif
-        switch (h_errno) {
-        case HOST_NOT_FOUND:
-            return EAI_NODATA;
-        case NO_DATA:
-            return EAI_NODATA;
-#if defined(NO_ADDRESS) && NO_ADDRESS != NO_DATA
-        case NO_ADDRESS:
-            return EAI_NODATA;
-#endif
-        case NO_RECOVERY:
-            return EAI_FAIL;
-        case TRY_AGAIN:
-            return EAI_AGAIN;
-        default:
-            return EAI_FAIL;
-        }
-        return EAI_FAIL;
-    }
-
-    /* Check that the address family is acceptable.
-     */
-    switch (hp->h_addrtype) {
-    case AF_INET:
-        if (!(hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET))
-            return EAI_FAMILY;
-        break;
-#ifndef __OS2__
-    case AF_INET6:
-        if (!(hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET6))
-            return EAI_FAMILY;
-        break;
-#endif
-    default:
-        return EAI_FAMILY;
-    }
-
-    /* For each element pointed to by hp, create an element in the
-       result linked list. */
-    sai = eai = NULL;
-    for (addrs = hp->h_addr_list; *addrs != NULL; addrs++) {
-        struct sockaddr sa;
-        size_t addrlen;
-
-        if (hp->h_length < 1)
-            continue;
-        sa.sa_family = hp->h_addrtype;
-        switch (hp->h_addrtype) {
-        case AF_INET:
-            ((struct sockaddr_in *) &sa)->sin_port = htons (port);
-            memcpy (&((struct sockaddr_in *) &sa)->sin_addr,
-                    *addrs, hp->h_length);
-            addrlen = sizeof (struct sockaddr_in);
-            break;
-#ifndef __OS2__
-        case AF_INET6:
-#if SIN6_LEN
-            ((struct sockaddr_in6 *) &sa)->sin6_len = hp->h_length;
-#endif
-            ((struct sockaddr_in6 *) &sa)->sin6_port = htons (port);
-            memcpy (&((struct sockaddr_in6 *) &sa)->sin6_addr,
-                    *addrs, hp->h_length);
-            addrlen = sizeof (struct sockaddr_in6);
-            break;
-#endif
-        default:
-            continue;
-        }
-
-        result.ai_family = hp->h_addrtype;
-        ai = dup_addrinfo (&result, &sa, addrlen);
-        if (ai == NULL) {
-            freeaddrinfo (sai);
-            return EAI_MEMORY;
-        }
-        if (sai == NULL)
-            sai = ai;
-        else
-            eai->ai_next = ai;
-        eai = ai;
-    }
-
-    if (sai == NULL) {
-        return EAI_NODATA;
-    }
-
-    if (hints->ai_flags & AI_CANONNAME) {
-        sai->ai_canonname = malloc (strlen (hp->h_name) + 1);
-        if (sai->ai_canonname == NULL) {
-            freeaddrinfo (sai);
-            return EAI_MEMORY;
-        }
-        strcpy (sai->ai_canonname, hp->h_name);
-    }
-
-    *res = sai;
-    return 0;
-}
-
-void
-freeaddrinfo (struct addrinfo *ai)
-{
-    struct addrinfo *next;
-
-    while (ai != NULL) {
-        next = ai->ai_next;
-        if (ai->ai_canonname != NULL)
-            free (ai->ai_canonname);
-        if (ai->ai_addr != NULL)
-            free (ai->ai_addr);
-        free (ai);
-        ai = next;
-    }
-}
-
-const char *
-gai_strerror (int ecode)
-{
-    static const char *eai_descr[] = {
-        "no error",
-        "address family for nodename not supported",	/* EAI_ADDRFAMILY */
-        "temporary failure in name resolution",		/* EAI_AGAIN */
-        "invalid value for ai_flags",	 		/* EAI_BADFLAGS */
-        "non-recoverable failure in name resolution",	/* EAI_FAIL */
-        "ai_family not supported",			/* EAI_FAMILY */
-        "memory allocation failure",			/* EAI_MEMORY */
-        "no address associated with nodename",		/* EAI_NODATA */
-        "nodename nor servname provided, or not known",	/* EAI_NONAME */
-        "servname not supported for ai_socktype",		/* EAI_SERVICE */
-        "ai_socktype not supported",			/* EAI_SOCKTYPE */
-        "system error returned in errno",			/* EAI_SYSTEM */
-        "argument buffer overflow",			/* EAI_OVERFLOW */
-    };
-
-    if (ecode < 0 || ecode > (int) (sizeof eai_descr/ sizeof eai_descr[0]))
-        return "unknown error";
-    return eai_descr[ecode];
-}
-
-#endif /* HAVE_GETADDRINFO */

src/3rdparty/os2/getaddrinfo.h

@@ -1,101 +0,0 @@
-#ifndef _getaddrinfo_h
-#define _getaddrinfo_h
-
-/*
- *  Shamelessly duplicated from the fetchmail public sources
- *  for use by the Squid Project under GNU Public License.
- *
- * Update/Maintenance History:
- *
- *    15-Aug-2007 : Copied from fetchmail 6.3.8
- *			- added protection around libray headers
- *
- *    16-Aug-2007 : Altered configure checks
- *                  Un-hacked slightly to use system gethostbyname()
- *
- *  Original License and code follows.
- */
-
-/*
- *  This file is part of libESMTP, a library for submission of RFC 2822
- *  formatted electronic mail messages using the SMTP protocol described
- *  in RFC 2821.
- *
- *  Copyright (C) 2001,2002  Brian Stafford  <brian@stafford.uklinux.net>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/* Structure and prototypes taken from RFC 2553 */
-
-/* SG 23/09/2007:
-On Windows the following definitions are already available, may be that
-this could be needed on some other platform */
-typedef int socklen_t;
-
-struct addrinfo {
-    int ai_flags;  	  	/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
-    int ai_family; 	  	/* PF_xxx */
-    int ai_socktype;	 	/* SOCK_xxx */
-    int ai_protocol;	 	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-    socklen_t ai_addrlen;	/* length of ai_addr */
-    char *ai_canonname;		/* canonical name for nodename */
-    struct sockaddr *ai_addr;	/* binary address */
-    struct addrinfo *ai_next;	/* next structure in linked list */
-};
-
-/* Supposed to be defined in <netdb.h> */
-#define AI_ADDRCONFIG  0
-#define AI_PASSIVE     1       /* Socket address is intended for `bind'.  */
-#define AI_CANONNAME   2       /* Request for canonical name.  */
-#define AI_NUMERICHOST 4       /* Don't use name resolution.  */
-
-/* Supposed to be defined in <netdb.h> */
-#define EAI_ADDRFAMILY 1   /* address family for nodename not supported */
-#define EAI_AGAIN      2   /* temporary failure in name resolution */
-#define EAI_BADFLAGS   3   /* invalid value for ai_flags */
-#define EAI_FAIL       4   /* non-recoverable failure in name resolution */
-#define EAI_FAMILY     5   /* ai_family not supported */
-#define EAI_MEMORY     6   /* memory allocation failure */
-#define EAI_NODATA     7   /* no address associated with nodename */
-#define EAI_NONAME     8   /* nodename nor servname provided, or not known */
-#define EAI_SERVICE    9   /* servname not supported for ai_socktype */
-#define EAI_SOCKTYPE   10  /* ai_socktype not supported */
-
-#ifndef EAI_SYSTEM
-/* Not defined on mingw32. */
-#define EAI_SYSTEM     11  /* System error returned in `errno'.  */
-#endif
-#ifndef EAI_OVERFLOW
-/* Not defined on mingw32. */
-#define EAI_OVERFLOW   12 /* Argument buffer overflow.  */
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-/* RFC 2553 / Posix resolver */
-int getaddrinfo (const char *nodename, const char *servname,
-                               const struct addrinfo *hints, struct addrinfo **res);
-/* Free addrinfo structure and associated storage */
-void freeaddrinfo (struct addrinfo *ai);
-
-/* Convert error return from getaddrinfo() to string */
-const char *gai_strerror (int code);
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _getaddrinfo_h */

src/3rdparty/os2/getnameinfo.c

@@ -1,367 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Issues to be discussed:
- * - RFC2553 says that we should raise error on short buffer.  X/Open says
- *   we need to truncate the result.  We obey RFC2553 (and X/Open should be
- *   modified).  ipngwg rough consensus seems to follow RFC2553.  RFC3493 says
- *   nothing about it, but defines a new error code EAI_OVERFLOW which seems
- *   to be intended the code for this case.
- * - What is "local" in NI_NOFQDN?  (see comments in the code)
- * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other.
- * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if
- *   sin6_scope_id is filled - standardization status?
- * - what should we do if we should do getservbyport("sctp")?
- */
-
-/*
- * Considerations about thread-safeness
- *   The code in this file is thread-safe, and so the thread-safeness of
- *   getnameinfo() depends on the property of backend functions.
- *     - getservbyport() is not thread safe for most systems we are targeting.
- *     - getipnodebyaddr() is thread safe.  However, many resolver libraries
- *       used in the function are not thread safe.
- *     - gethostbyaddr() is usually not thread safe.
- */
-
-#if !HAVE_GETNAMEINFO
-
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <stddef.h>
-#include <errno.h>
-#include <inttypes.h>
-#include "getaddrinfo.h"
-#include "getnameinfo.h"
-
-static const struct afd {
-    int a_af;
-    int a_addrlen;
-    int a_socklen;
-    int a_off;
-    int a_portoff;
-} afdl [] = {
-#if INET6
-    {PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
-        offsetof(struct sockaddr_in6, sin6_addr),
-        offsetof(struct sockaddr_in6, sin6_port)},
-#endif
-    {PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in),
-     offsetof(struct sockaddr_in, sin_addr),
-     offsetof(struct sockaddr_in, sin_port)},
-    {0, 0, 0, 0, 0},
-};
-
-#if INET6
-static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
-                                 size_t, int));
-static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
-#endif
-
-int
-getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
-const struct sockaddr *sa;
-socklen_t salen;
-char *host;
-size_t hostlen;
-char *serv;
-size_t servlen;
-int flags;
-{
-    const struct afd *afd;
-    struct servent *sp;
-    struct hostent *hp;
-    unsigned short port;
-    int family, i;
-    const char *addr;
-    uint32_t v4a;
-    char numserv[512];
-
-    if (sa == NULL)
-        return EAI_FAIL;
-
-#if HAVE_SA_LEN	/*XXX*/
-    if (sa->sa_len != salen)
-        return EAI_FAIL;
-#endif
-
-    family = sa->sa_family;
-    for (i = 0; afdl[i].a_af; i++)
-        if (afdl[i].a_af == family) {
-            afd = &afdl[i];
-            goto found;
-        }
-    return EAI_FAMILY;
-
-found:
-    if (salen != afd->a_socklen)
-        return EAI_FAIL;
-
-    /* network byte order */
-    memcpy(&port, (const char *)sa + afd->a_portoff, sizeof(port));
-    addr = (const char *)sa + afd->a_off;
-
-    if (serv == NULL || servlen == 0) {
-        /*
-         * do nothing in this case.
-         * in case you are wondering if "&&" is more correct than
-         * "||" here: RFC3493 says that serv == NULL OR servlen == 0
-         * means that the caller does not want the result.
-         */
-    } else {
-        if (flags & NI_NUMERICSERV)
-            sp = NULL;
-        else {
-            sp = getservbyport(port,
-                               (flags & NI_DGRAM) ? "udp" : "tcp");
-        }
-        if (sp) {
-            if (strlen(sp->s_name) + 1 > servlen)
-                return EAI_OVERFLOW;
-            strncpy(serv, sp->s_name, servlen);
-        } else {
-            snprintf(numserv, sizeof(numserv), "%u", ntohs(port));
-            if (strlen(numserv) + 1 > servlen)
-                return EAI_OVERFLOW;
-            strncpy(serv, numserv, servlen);
-        }
-    }
-
-    switch (sa->sa_family) {
-    case AF_INET:
-        v4a = (uint32_t)
-              ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr);
-        if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
-            flags |= NI_NUMERICHOST;
-        v4a >>= IN_CLASSA_NSHIFT;
-        if (v4a == 0)
-            flags |= NI_NUMERICHOST;
-        break;
-#if INET6
-    case AF_INET6: {
-        const struct sockaddr_in6 *sin6;
-        sin6 = (const struct sockaddr_in6 *)sa;
-        switch (sin6->sin6_addr.s6_addr[0]) {
-        case 0x00:
-            if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
-                ;
-            else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
-                ;
-            else
-                flags |= NI_NUMERICHOST;
-            break;
-        default:
-            if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
-                flags |= NI_NUMERICHOST;
-            else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
-                flags |= NI_NUMERICHOST;
-            break;
-        }
-    }
-    break;
-#endif
-    }
-    if (host == NULL || hostlen == 0) {
-        /*
-         * do nothing in this case.
-         * in case you are wondering if "&&" is more correct than
-         * "||" here: RFC3493 says that host == NULL or hostlen == 0
-         * means that the caller does not want the result.
-         */
-    } else if (flags & NI_NUMERICHOST) {
-        /* NUMERICHOST and NAMEREQD conflicts with each other */
-        if (flags & NI_NAMEREQD)
-            return EAI_NONAME;
-
-        goto numeric;
-    } else {
-#if USE_GETIPNODEBY
-        int h_error = 0;
-        hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
-#else
-        hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af);
-#if 0 // getnameinfo.c:161:9: error: variable 'h_error' set but not used
-#if HAVE_H_ERRNO
-        h_error = h_errno;
-#else
-        h_error = EINVAL;
-#endif
-#endif /* 0 */
-#endif
-
-        if (hp) {
-#if 0
-            if (flags & NI_NOFQDN) {
-                /*
-                 * According to RFC3493 section 6.2, NI_NOFQDN
-                 * means "node name portion of the FQDN shall
-                 * be returned for local hosts."  The following
-                 * code tries to implement it by returning the
-                 * first label (the part before the first
-                 * period) of the FQDN.  However, it is not
-                 * clear if this always makes sense, since the
-                 * given address may be outside of "local
-                 * hosts."  Due to the unclear description, we
-                 * disable the code in this implementation.
-                 */
-                char *p;
-                p = strchr(hp->h_name, '.');
-                if (p)
-                    *p = '\0';
-            }
-#endif
-            if (strlen(hp->h_name) + 1 > hostlen) {
-#if USE_GETIPNODEBY
-                freehostent(hp);
-#endif
-                return EAI_OVERFLOW;
-            }
-            strncpy(host, hp->h_name, hostlen);
-#if USE_GETIPNODEBY
-            freehostent(hp);
-#endif
-        } else {
-            if (flags & NI_NAMEREQD)
-                return EAI_NONAME;
-
-numeric:
-            switch (afd->a_af) {
-#if INET6
-            case AF_INET6: {
-                int error;
-
-                if ((error = ip6_parsenumeric(sa, addr, host,
-                                              hostlen,
-                                              flags)) != 0)
-                    return(error);
-                break;
-            }
-#endif
-            default:
-                if (inet_ntop(afd->a_af, addr, host,
-                              hostlen) == NULL)
-                    return EAI_SYSTEM;
-                break;
-            }
-        }
-    }
-    return(0);
-}
-
-#if INET6
-static int
-ip6_parsenumeric(sa, addr, host, hostlen, flags)
-const struct sockaddr *sa;
-const char *addr;
-char *host;
-size_t hostlen;
-int flags;
-{
-    int numaddrlen;
-    char numaddr[512];
-
-    if (inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr)) == NULL)
-        return EAI_SYSTEM;
-
-    numaddrlen = strlen(numaddr);
-    if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-        return EAI_OVERFLOW;
-    strncpy(host, numaddr, hostlen);
-
-    if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
-        char zonebuf[SQUIDHOSTNAMELEN];
-        int zonelen;
-
-        zonelen = ip6_sa2str(
-                      (const struct sockaddr_in6 *)(const void *)sa,
-                      zonebuf, sizeof(zonebuf), flags);
-        if (zonelen < 0)
-            return EAI_OVERFLOW;
-        if (zonelen + 1 + numaddrlen + 1 > hostlen)
-            return EAI_OVERFLOW;
-
-        /* construct <numeric-addr><delim><zoneid> */
-        memcpy(host + numaddrlen + 1, zonebuf,
-               (size_t)zonelen);
-        host[numaddrlen] = SCOPE_DELIMITER;
-        host[numaddrlen + 1 + zonelen] = '\0';
-    }
-
-    return 0;
-}
-
-/* ARGSUSED */
-static int
-ip6_sa2str(sa6, buf, bufsiz, flags)
-const struct sockaddr_in6 *sa6;
-char *buf;
-size_t bufsiz;
-int flags;
-{
-    unsigned int ifindex;
-    const struct in6_addr *a6;
-    int n;
-
-    ifindex = (unsigned int)sa6->sin6_scope_id;
-    a6 = &sa6->sin6_addr;
-
-#if NI_NUMERICSCOPE
-    if ((flags & NI_NUMERICSCOPE) != 0) {
-        n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-        if (n < 0 || n >= bufsiz)
-            return -1;
-        else
-            return n;
-    }
-#endif
-
-    /* if_indextoname() does not take buffer size.  not a good api... */
-    if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6) ||
-            IN6_IS_ADDR_MC_NODELOCAL(a6)) && bufsiz >= IF_NAMESIZE) {
-        char *p = if_indextoname(ifindex, buf);
-        if (p)
-            return (strlen(p));
-    }
-
-    /* last resort */
-    n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-    if (n < 0 || n >= bufsiz)
-        return -1;
-    else
-        return n;
-}
-#endif /* INET6 */
-#endif

src/3rdparty/os2/getnameinfo.h

@@ -1,29 +0,0 @@
-#ifndef _getnameinfo_h
-#define _getnameinfo_h
-/*
- * Reconstructed from KAME getnameinfo.c (in lib/)
- */
-
-    /* getnameinfo flags */
-#define	NI_NOFQDN	0x0001
-#define	NI_NUMERICHOST	0x0002	/* return numeric form of address */
-#define	NI_NAMEREQD	0x0004	/* request DNS name */
-#define	NI_NUMERICSERV	0x0008
-#define	NI_DGRAM	0x0010
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-/* RFC 2553 / Posix resolver */
-int getnameinfo(const struct sockaddr *sa,
-                              socklen_t salen,
-                              char *host,
-                              size_t hostlen,
-                              char *serv,
-                              size_t servlen,
-                              int flags );
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _getnameinfo_h */

src/3rdparty/squirrel/squirrel/sqcompiler.cpp

@@ -194,6 +194,14 @@ public:
 			_vm->_lasterror = SQString::Create(_ss(_vm), compilererror, -1);
 			return false;
 		}
+		catch (const std::string &compilererror) {
+			if(_raiseerror && _ss(_vm)->_compilererrorhandler) {
+				_ss(_vm)->_compilererrorhandler(_vm, compilererror.c_str(), type(_sourcename) == OT_STRING ? _stringval(_sourcename) : "unknown",
+					_lex._currentline, _lex._currentcolumn);
+			}
+			_vm->_lasterror = SQString::Create(_ss(_vm), compilererror);
+			return false;
+		}
 	}
 	void Statements()
 	{

src/3rdparty/squirrel/squirrel/sqstring.h

@@ -17,6 +17,7 @@ struct SQString : public SQRefCounted
 	~SQString(){}
 public:
 	static SQString *Create(SQSharedState *ss, const SQChar *, SQInteger len = -1 );
+	static SQString *Create(SQSharedState *ss, const std::string &str) { return Create(ss, str.data(), str.size()); }
 	SQInteger Next(const SQObjectPtr &refpos, SQObjectPtr &outkey, SQObjectPtr &outval);
 	void Release();
 	SQSharedState *_sharedstate;

src/airport_gui.cpp

@@ -582,7 +582,7 @@ static const NWidgetPart _nested_build_airport_widgets[] = {
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_AP_LAYOUT_DECREASE), SetMinimalSize(12, 0), SetDataTip(AWV_DECREASE, STR_NULL),
-			NWidget(WWT_LABEL, COLOUR_GREY, WID_AP_LAYOUT_NUM), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_JUST_STRING, STR_NULL),
+			NWidget(WWT_LABEL, COLOUR_GREY, WID_AP_LAYOUT_NUM), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_JUST_STRING1, STR_NULL),
 			NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_AP_LAYOUT_INCREASE), SetMinimalSize(12, 0), SetDataTip(AWV_INCREASE, STR_NULL),
 		EndContainer(),
 		NWidget(WWT_EMPTY, COLOUR_DARK_GREEN, WID_AP_EXTRA_TEXT), SetFill(1, 0), SetMinimalSize(150, 0),

src/base_media_func.h

@@ -22,7 +22,7 @@ extern void CheckExternalFiles();
  * @param name the name of the item to fetch.
  */
 #define fetch_metadata(name) \
-	item = metadata->GetItem(name, false); \
+	item = metadata->GetItem(name); \
 	if (item == nullptr || !item->value.has_value() || item->value->empty()) { \
 		DEBUG(grf, 0, "Base " SET_TYPE "set detail loading: %s field missing.", name); \
 		DEBUG(grf, 0, "  Is %s readable for the user running OpenTTD?", full_filename.c_str()); \
@@ -64,7 +64,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 	fetch_metadata("version");
 	this->version = atoi(item->value->c_str());
 
-	item = metadata->GetItem("fallback", false);
+	item = metadata->GetItem("fallback");
 	this->fallback = (item != nullptr && item->value && *item->value != "0" && *item->value != "false");
 
 	/* For each of the file types we want to find the file, MD5 checksums and warning messages. */
@@ -74,7 +74,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 	for (uint i = 0; i < Tnum_files; i++) {
 		MD5File *file = &this->files[i];
 		/* Find the filename first. */
-		item = files->GetItem(BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names[i], false);
+		item = files->GetItem(BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names[i]);
 		if (item == nullptr || (!item->value.has_value() && !allow_empty_filename)) {
 			DEBUG(grf, 0, "No " SET_TYPE " file for: %s (in %s)", BaseSet<T, Tnum_files, Tsearch_in_tars>::file_names[i], full_filename.c_str());
 			return false;
@@ -92,7 +92,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 		file->filename = path + filename;
 
 		/* Then find the MD5 checksum */
-		item = md5s->GetItem(filename, false);
+		item = md5s->GetItem(filename);
 		if (item == nullptr || !item->value.has_value()) {
 			DEBUG(grf, 0, "No MD5 checksum specified for: %s (in %s)", filename.c_str(), full_filename.c_str());
 			return false;
@@ -118,8 +118,8 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 		}
 
 		/* Then find the warning message when the file's missing */
-		item = origin->GetItem(filename, false);
+		item = origin->GetItem(filename);
-		if (item == nullptr) item = origin->GetItem("default", false);
+		if (item == nullptr) item = origin->GetItem("default");
 		if (item == nullptr || !item->value.has_value()) {
 			DEBUG(grf, 1, "No origin warning message specified for: %s", filename.c_str());
 			file->missing_warning.clear();

src/bootstrap_gui.cpp

@@ -41,7 +41,7 @@ static const struct NWidgetPart _background_widgets[] = {
 static WindowDesc _background_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_BOOTSTRAP, WC_NONE,
-	0,
+	WDF_NO_CLOSE,
 	_background_widgets, lengthof(_background_widgets)
 );
 
@@ -79,7 +79,7 @@ static const NWidgetPart _nested_bootstrap_errmsg_widgets[] = {
 static WindowDesc _bootstrap_errmsg_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_BOOTSTRAP, WC_NONE,
-	WDF_MODAL,
+	WDF_MODAL | WDF_NO_CLOSE,
 	_nested_bootstrap_errmsg_widgets, lengthof(_nested_bootstrap_errmsg_widgets)
 );
 
@@ -135,7 +135,7 @@ static const NWidgetPart _nested_bootstrap_download_status_window_widgets[] = {
 static WindowDesc _bootstrap_download_status_window_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
-	WDF_MODAL,
+	WDF_MODAL | WDF_NO_CLOSE,
 	_nested_bootstrap_download_status_window_widgets, lengthof(_nested_bootstrap_download_status_window_widgets)
 );
 
@@ -188,7 +188,7 @@ static const NWidgetPart _bootstrap_query_widgets[] = {
 static WindowDesc _bootstrap_query_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
-	0,
+	WDF_NO_CLOSE,
 	_bootstrap_query_widgets, lengthof(_bootstrap_query_widgets)
 );
 

src/build_vehicle_gui.cpp

@@ -1646,7 +1646,8 @@ struct BuildVehicleWindow : BuildVehicleWindowBase {
 
 		/* Filter engine name */
 		this->string_filter.ResetState();
-		this->string_filter.AddLine(GetString(e->info.string_id));
+		SetDParam(0, PackEngineNameDParam(e->index, EngineNameContext::PurchaseList));
+		this->string_filter.AddLine(GetString(STR_ENGINE_NAME));
 
 		/* Filter NewGRF extra text */
 		auto text = GetNewGRFAdditionalText(e->index);

src/company_gui.cpp

@@ -634,14 +634,9 @@ static const LiveryClass _livery_class[LS_END] = {
 	LC_ROAD, LC_ROAD,
 };
 
-class DropDownListColourItem : public DropDownListItem {
+class DropDownListColourItem : public DropDownListStringItem {
 public:
-	DropDownListColourItem(int result, bool masked) : DropDownListItem(result, masked) {}
+	DropDownListColourItem(int result, bool masked) : DropDownListStringItem(result >= COLOUR_END ? STR_COLOUR_DEFAULT : _colour_dropdown[result], result, masked) {}
-
-	StringID String() const
-	{
-		return this->result >= COLOUR_END ? STR_COLOUR_DEFAULT : _colour_dropdown[this->result];
-	}
 
 	uint Width() const override
 	{
@@ -1305,82 +1300,82 @@ static const NWidgetPart _nested_select_company_manager_face_widgets[] = {
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_HAS_MOUSTACHE_EARRING_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_EYECOLOUR, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_HAS_MOUSTACHE_EARRING), SetDataTip(STR_JUST_STRING, STR_FACE_MOUSTACHE_EARRING_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_HAS_MOUSTACHE_EARRING), SetDataTip(STR_JUST_STRING1, STR_FACE_MOUSTACHE_EARRING_TOOLTIP), SetTextStyle(TC_WHITE),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_HAS_GLASSES_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_GLASSES, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_HAS_GLASSES), SetDataTip(STR_JUST_STRING, STR_FACE_GLASSES_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_HAS_GLASSES), SetDataTip(STR_JUST_STRING1, STR_FACE_GLASSES_TOOLTIP), SetTextStyle(TC_WHITE),
 						EndContainer(),
 						NWidget(NWID_SPACER), SetMinimalSize(0, 2), SetFill(1, 0),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_HAIR_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_HAIR, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_HAIR_L), SetDataTip(AWV_DECREASE, STR_FACE_HAIR_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_HAIR), SetDataTip(STR_JUST_STRING, STR_FACE_HAIR_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_HAIR), SetDataTip(STR_JUST_STRING1, STR_FACE_HAIR_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_HAIR_R), SetDataTip(AWV_INCREASE, STR_FACE_HAIR_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_EYEBROWS_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_EYEBROWS, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_EYEBROWS_L), SetDataTip(AWV_DECREASE, STR_FACE_EYEBROWS_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_EYEBROWS), SetDataTip(STR_JUST_STRING, STR_FACE_EYEBROWS_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_EYEBROWS), SetDataTip(STR_JUST_STRING1, STR_FACE_EYEBROWS_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_EYEBROWS_R), SetDataTip(AWV_INCREASE, STR_FACE_EYEBROWS_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_EYECOLOUR_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_EYECOLOUR, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_EYECOLOUR_L), SetDataTip(AWV_DECREASE, STR_FACE_EYECOLOUR_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_EYECOLOUR), SetDataTip(STR_JUST_STRING, STR_FACE_EYECOLOUR_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_EYECOLOUR), SetDataTip(STR_JUST_STRING1, STR_FACE_EYECOLOUR_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_EYECOLOUR_R), SetDataTip(AWV_INCREASE, STR_FACE_EYECOLOUR_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_GLASSES_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_GLASSES, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_GLASSES_L), SetDataTip(AWV_DECREASE, STR_FACE_GLASSES_TOOLTIP_2),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_GLASSES), SetDataTip(STR_JUST_STRING, STR_FACE_GLASSES_TOOLTIP_2), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_GLASSES), SetDataTip(STR_JUST_STRING1, STR_FACE_GLASSES_TOOLTIP_2), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_GLASSES_R), SetDataTip(AWV_INCREASE, STR_FACE_GLASSES_TOOLTIP_2),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_NOSE_TEXT), SetFill(1, 0),  SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_NOSE, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_NOSE_L), SetDataTip(AWV_DECREASE, STR_FACE_NOSE_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_NOSE), SetDataTip(STR_JUST_STRING, STR_FACE_NOSE_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_NOSE), SetDataTip(STR_JUST_STRING1, STR_FACE_NOSE_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_NOSE_R), SetDataTip(AWV_INCREASE, STR_FACE_NOSE_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_LIPS_MOUSTACHE_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_MOUSTACHE, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_LIPS_MOUSTACHE_L), SetDataTip(AWV_DECREASE, STR_FACE_LIPS_MOUSTACHE_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_LIPS_MOUSTACHE), SetDataTip(STR_JUST_STRING, STR_FACE_LIPS_MOUSTACHE_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_LIPS_MOUSTACHE), SetDataTip(STR_JUST_STRING1, STR_FACE_LIPS_MOUSTACHE_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_LIPS_MOUSTACHE_R), SetDataTip(AWV_INCREASE, STR_FACE_LIPS_MOUSTACHE_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_CHIN_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_CHIN, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_CHIN_L), SetDataTip(AWV_DECREASE, STR_FACE_CHIN_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_CHIN), SetDataTip(STR_JUST_STRING, STR_FACE_CHIN_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_CHIN), SetDataTip(STR_JUST_STRING1, STR_FACE_CHIN_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_CHIN_R), SetDataTip(AWV_INCREASE, STR_FACE_CHIN_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_JACKET_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_JACKET, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_JACKET_L), SetDataTip(AWV_DECREASE, STR_FACE_JACKET_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_JACKET), SetDataTip(STR_JUST_STRING, STR_FACE_JACKET_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_JACKET), SetDataTip(STR_JUST_STRING1, STR_FACE_JACKET_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_JACKET_R), SetDataTip(AWV_INCREASE, STR_FACE_JACKET_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_COLLAR_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_COLLAR, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_COLLAR_L), SetDataTip(AWV_DECREASE, STR_FACE_COLLAR_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_COLLAR), SetDataTip(STR_JUST_STRING, STR_FACE_COLLAR_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_COLLAR), SetDataTip(STR_JUST_STRING1, STR_FACE_COLLAR_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_COLLAR_R), SetDataTip(AWV_INCREASE, STR_FACE_COLLAR_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_TEXT, INVALID_COLOUR, WID_SCMF_TIE_EARRING_TEXT), SetFill(1, 0), SetPadding(WidgetDimensions::unscaled.framerect),
 								SetDataTip(STR_FACE_EARRING, STR_NULL), SetTextStyle(TC_GOLD), SetAlignment(SA_VERT_CENTER | SA_RIGHT),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_TIE_EARRING_L), SetDataTip(AWV_DECREASE, STR_FACE_TIE_EARRING_TOOLTIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_TIE_EARRING), SetDataTip(STR_JUST_STRING, STR_FACE_TIE_EARRING_TOOLTIP), SetTextStyle(TC_WHITE),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCMF_TIE_EARRING), SetDataTip(STR_JUST_STRING1, STR_FACE_TIE_EARRING_TOOLTIP), SetTextStyle(TC_WHITE),
 							NWidget(WWT_PUSHARROWBTN, COLOUR_GREY, WID_SCMF_TIE_EARRING_R), SetDataTip(AWV_INCREASE, STR_FACE_TIE_EARRING_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_SPACER), SetFill(0, 1),
@@ -2281,12 +2276,6 @@ static const NWidgetPart _nested_company_widgets[] = {
 					EndContainer(),
 				EndContainer(),
 				NWidget(NWID_HORIZONTAL),
-					NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_DESC_OWNERS),
-						NWidget(NWID_VERTICAL), SetPIP(5, 5, 4),
-							NWidget(WWT_EMPTY, INVALID_COLOUR, WID_C_DESC_OWNERS), SetMinimalTextLines(MAX_COMPANY_SHARE_OWNERS, 0),
-							NWidget(NWID_SPACER), SetFill(0, 1),
-						EndContainer(),
-					EndContainer(),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 					NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_HOSTILE_TAKEOVER),
 						NWidget(NWID_VERTICAL),
@@ -2294,6 +2283,14 @@ static const NWidgetPart _nested_company_widgets[] = {
 							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_C_HOSTILE_TAKEOVER), SetDataTip(STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON, STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP),
 						EndContainer(),
 					EndContainer(),
+				EndContainer(),
+				NWidget(NWID_HORIZONTAL),
+					NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_DESC_OWNERS),
+						NWidget(NWID_VERTICAL), SetPIP(5, 5, 4),
+							NWidget(WWT_EMPTY, INVALID_COLOUR, WID_C_DESC_OWNERS), SetMinimalTextLines(MAX_COMPANY_SHARE_OWNERS, 0),
+							NWidget(NWID_SPACER), SetFill(0, 1),
+						EndContainer(),
+					EndContainer(),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 					NWidget(NWID_SELECTION, INVALID_COLOUR, WID_C_SELECT_GIVE_MONEY),
 						NWidget(NWID_VERTICAL),

src/console.cpp

@@ -107,7 +107,7 @@ void IConsolePrint(TextColour colour_code, const char *string)
 		return;
 	}
 
-	/* Create a copy of the string, strip if of colours and invalid
+	/* Create a copy of the string, strip it of colours and invalid
 	 * characters and (when applicable) assign it to the console buffer */
 	str = stredup(string);
 	str_strip_colours(str);

src/console_cmds.cpp

@@ -1424,16 +1424,14 @@ DEF_CONSOLE_CMD(ConStartAI)
 		 * try again with the assumption everything right of the dot is
 		 * the version the user wants to load. */
 		if (!config->HasScript()) {
-			char *name = stredup(argv[1]);
+			const char *e = strrchr(argv[1], '.');
-			char *e = strrchr(name, '.');
 			if (e != nullptr) {
-				*e = '\0';
+				size_t name_length = e - argv[1];
 				e++;
 
 				int version = atoi(e);
-				config->Change(name, version, true);
+				config->Change(std::string(argv[1], name_length), version, true);
 			}
-			free(name);
 		}
 
 		if (!config->HasScript()) {
@@ -2363,6 +2361,11 @@ DEF_CONSOLE_CMD(ConListSettingsDefaults)
 
 DEF_CONSOLE_CMD(ConGamelogPrint)
 {
+	if (argc == 0) {
+		IConsoleHelp("Print logged fundamental changes to the game since the start. Usage: 'gamelog'.");
+		return true;
+	}
+
 	GamelogPrintConsole();
 	return true;
 }

src/console_gui.cpp

@@ -72,8 +72,8 @@ static bool TruncateBuffer();
 
 /* ** main console cmd buffer ** */
 static Textbuf _iconsole_cmdline(ICON_CMDLN_SIZE);
-static char *_iconsole_history[ICON_HISTORY_SIZE];
+static ring_buffer<std::string> _iconsole_history;
-static int _iconsole_historypos;
+static ptrdiff_t _iconsole_historypos;
 IConsoleModes _iconsole_mode;
 
 /* *************** *
@@ -359,7 +359,6 @@ void IConsoleGUIInit()
 	_iconsole_mode = ICONSOLE_CLOSED;
 
 	IConsoleClearBuffer();
-	memset(_iconsole_history, 0, sizeof(_iconsole_history));
 
 	IConsolePrintF(CC_WARNING, "OpenTTD Game Console Revision 7 - %s", _openttd_revision);
 	IConsolePrint(CC_WHITE,  "------------------------------------");
@@ -433,15 +432,14 @@ static const char *IConsoleHistoryAdd(const char *cmd)
 	if (StrEmpty(cmd)) return nullptr;
 
 	/* Do not put in history if command is same as previous */
-	if (_iconsole_history[0] == nullptr || strcmp(_iconsole_history[0], cmd) != 0) {
+	if (_iconsole_history.empty() || _iconsole_history.front() != cmd) {
-		free(_iconsole_history[ICON_HISTORY_SIZE - 1]);
+		_iconsole_history.emplace_front(cmd);
-		memmove(&_iconsole_history[1], &_iconsole_history[0], sizeof(_iconsole_history[0]) * (ICON_HISTORY_SIZE - 1));
+		while (_iconsole_history.size() > ICON_HISTORY_SIZE) _iconsole_history.pop_back();
-		_iconsole_history[0] = stredup(cmd);
 	}
 
 	/* Reset the history position */
 	IConsoleResetHistoryPos();
-	return _iconsole_history[0];
+	return _iconsole_history.front().c_str();
 }
 
 /**
@@ -450,10 +448,8 @@ static const char *IConsoleHistoryAdd(const char *cmd)
  */
 static void IConsoleHistoryNavigate(int direction)
 {
-	if (_iconsole_history[0] == nullptr) return; // Empty history
+	if (_iconsole_history.empty()) return; // Empty history
-	_iconsole_historypos = Clamp(_iconsole_historypos + direction, -1, ICON_HISTORY_SIZE - 1);
+	_iconsole_historypos = Clamp<ptrdiff_t>(_iconsole_historypos + direction, -1, _iconsole_history.size() - 1);
-
-	if (direction > 0 && _iconsole_history[_iconsole_historypos] == nullptr) _iconsole_historypos--;
 
 	if (_iconsole_historypos == -1) {
 		_iconsole_cmdline.DeleteAll();

src/core/span_type.hpp

@@ -93,6 +93,14 @@ public:
 	constexpr const_iterator cbegin() const noexcept { return const_iterator(first); }
 	constexpr const_iterator cend() const noexcept { return const_iterator(last); }
 
+	constexpr reference operator[](size_type idx) const { return first[idx]; }
+
+	constexpr span<element_type> subspan(size_t offset, size_t count)
+	{
+		assert(offset + count <= size());
+		return span(this->data() + offset, count);
+	}
+
 private:
 	pointer first;
 	pointer last;

src/cpu.cpp

@@ -32,13 +32,6 @@ uint64 ottd_rdtsc()
 #define RDTSC_AVAILABLE
 #endif
 
-/* rdtsc for OS/2. Hopefully this works, who knows */
-#if defined (__WATCOMC__) && !defined(RDTSC_AVAILABLE)
-unsigned __int64 ottd_rdtsc();
-# pragma aux ottd_rdtsc = 0x0F 0x31 value [edx eax] parm nomemory modify exact [edx eax] nomemory;
-# define RDTSC_AVAILABLE
-#endif
-
 /* rdtsc for all other *nix-en (hopefully). Use GCC syntax */
 #if (defined(__i386__) || defined(__x86_64__)) && !defined(RDTSC_AVAILABLE)
 uint64 ottd_rdtsc()

src/crashlog.cpp

@@ -105,8 +105,6 @@ char *CrashLog::LogCompiler(char *buffer, const char *last) const
 			"ICC %d", __ICC
 #elif defined(__GNUC__)
 			"GCC %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__
-#elif defined(__WATCOMC__)
-			"WatcomC %d", __WATCOMC__
 #else
 			"<unknown>"
 #endif

src/currency.cpp

@@ -20,54 +20,54 @@
 
 #include "safeguards.h"
 
-	/*   exchange rate    prefix                         symbol_pos
+	/*   exchange rate    prefix                             code
-	 *   |  separator        |           postfix             |
+	 *   |  separator        |           postfix              |  symbol_pos
-	 *   |   |   Euro year   |              |                | name
+	 *   |   |   Euro year   |              |                 |     | name
-	 *   |   |    |          |              |                |  | */
+	 *   |   |    |          |              |                 |     |  | */
 /** The original currency specifications. */
 static const CurrencySpec origin_currency_specs[CURRENCY_END] = {
-	{    1, "", CF_NOEURO, u8"\u00a3",     "",               0, STR_GAME_OPTIONS_CURRENCY_GBP    }, ///< british pound
+	{    1, "", CF_NOEURO, u8"\u00a3",     "",               "GBP", 0, STR_GAME_OPTIONS_CURRENCY_GBP    }, ///< british pound
-	{    2, "", CF_NOEURO, "$",            "",               0, STR_GAME_OPTIONS_CURRENCY_USD    }, ///< american dollar
+	{    2, "", CF_NOEURO, "$",            "",               "USD", 0, STR_GAME_OPTIONS_CURRENCY_USD    }, ///< american dollar
-	{    2, "", CF_ISEURO, u8"\u20ac",     "",               0, STR_GAME_OPTIONS_CURRENCY_EUR    }, ///< euro
+	{    2, "", CF_ISEURO, u8"\u20ac",     "",               "EUR", 0, STR_GAME_OPTIONS_CURRENCY_EUR    }, ///< euro
-	{  220, "", CF_NOEURO, u8"\u00a5",     "",               0, STR_GAME_OPTIONS_CURRENCY_JPY    }, ///< japanese yen
+	{  220, "", CF_NOEURO, u8"\u00a5",     "",               "JPY", 0, STR_GAME_OPTIONS_CURRENCY_JPY    }, ///< japanese yen
-	{   27, "", 2002,      "",             NBSP "S.",        1, STR_GAME_OPTIONS_CURRENCY_ATS    }, ///< austrian schilling
+	{   27, "", 2002,      "",             NBSP "S.",        "ATS", 1, STR_GAME_OPTIONS_CURRENCY_ATS    }, ///< austrian schilling
-	{   81, "", 2002,      "BEF" NBSP,     "",               0, STR_GAME_OPTIONS_CURRENCY_BEF    }, ///< belgian franc
+	{   81, "", 2002,      "BEF" NBSP,     "",               "BEF", 0, STR_GAME_OPTIONS_CURRENCY_BEF    }, ///< belgian franc
-	{    2, "", CF_NOEURO, "CHF" NBSP,     "",               0, STR_GAME_OPTIONS_CURRENCY_CHF    }, ///< swiss franc
+	{    2, "", CF_NOEURO, "CHF" NBSP,     "",               "CHF", 0, STR_GAME_OPTIONS_CURRENCY_CHF    }, ///< swiss franc
-	{   41, "", CF_NOEURO, "",             NBSP u8"K\u010d", 1, STR_GAME_OPTIONS_CURRENCY_CZK    }, ///< czech koruna
+	{   41, "", CF_NOEURO, "",             NBSP u8"K\u010d", "CZK", 1, STR_GAME_OPTIONS_CURRENCY_CZK    }, ///< czech koruna
-	{    4, "", 2002,      "DM" NBSP,      "",               0, STR_GAME_OPTIONS_CURRENCY_DEM    }, ///< deutsche mark
+	{    4, "", 2002,      "DM" NBSP,      "",               "DEM", 0, STR_GAME_OPTIONS_CURRENCY_DEM    }, ///< deutsche mark
-	{   11, "", CF_NOEURO, "",             NBSP "kr",        1, STR_GAME_OPTIONS_CURRENCY_DKK    }, ///< danish krone
+	{   11, "", CF_NOEURO, "",             NBSP "kr",        "DKK", 1, STR_GAME_OPTIONS_CURRENCY_DKK    }, ///< danish krone
-	{  333, "", 2002,      "Pts" NBSP,     "",               0, STR_GAME_OPTIONS_CURRENCY_ESP    }, ///< spanish peseta
+	{  333, "", 2002,      "Pts" NBSP,     "",               "ESP", 0, STR_GAME_OPTIONS_CURRENCY_ESP    }, ///< spanish peseta
-	{   12, "", 2002,      "",             NBSP "mk",        1, STR_GAME_OPTIONS_CURRENCY_FIM    }, ///< finnish markka
+	{   12, "", 2002,      "",             NBSP "mk",        "FIM", 1, STR_GAME_OPTIONS_CURRENCY_FIM    }, ///< finnish markka
-	{   13, "", 2002,      "FF" NBSP,      "",               0, STR_GAME_OPTIONS_CURRENCY_FRF    }, ///< french franc
+	{   13, "", 2002,      "FF" NBSP,      "",               "FRF", 0, STR_GAME_OPTIONS_CURRENCY_FRF    }, ///< french franc
-	{  681, "", 2002,      "",             "Dr.",            1, STR_GAME_OPTIONS_CURRENCY_GRD    }, ///< greek drachma
+	{  681, "", 2002,      "",             "Dr.",            "GRD", 1, STR_GAME_OPTIONS_CURRENCY_GRD    }, ///< greek drachma
-	{  378, "", CF_NOEURO, "",             NBSP "Ft",        1, STR_GAME_OPTIONS_CURRENCY_HUF    }, ///< hungarian forint
+	{  378, "", CF_NOEURO, "",             NBSP "Ft",        "HUF", 1, STR_GAME_OPTIONS_CURRENCY_HUF    }, ///< hungarian forint
-	{  130, "", CF_NOEURO, "",             NBSP "Kr",        1, STR_GAME_OPTIONS_CURRENCY_ISK    }, ///< icelandic krona
+	{  130, "", CF_NOEURO, "",             NBSP "Kr",        "ISK", 1, STR_GAME_OPTIONS_CURRENCY_ISK    }, ///< icelandic krona
-	{ 3873, "", 2002,      "",             NBSP "L.",        1, STR_GAME_OPTIONS_CURRENCY_ITL    }, ///< italian lira
+	{ 3873, "", 2002,      "",             NBSP "L.",        "ITL", 1, STR_GAME_OPTIONS_CURRENCY_ITL    }, ///< italian lira
-	{    4, "", 2002,      "NLG" NBSP,     "",               0, STR_GAME_OPTIONS_CURRENCY_NLG    }, ///< dutch gulden
+	{    4, "", 2002,      "NLG" NBSP,     "",               "NLG", 0, STR_GAME_OPTIONS_CURRENCY_NLG    }, ///< dutch gulden
-	{   12, "", CF_NOEURO, "",             NBSP "Kr",        1, STR_GAME_OPTIONS_CURRENCY_NOK    }, ///< norwegian krone
+	{   12, "", CF_NOEURO, "",             NBSP "Kr",        "NOK", 1, STR_GAME_OPTIONS_CURRENCY_NOK    }, ///< norwegian krone
-	{    6, "", CF_NOEURO, "",             NBSP u8"z\u0142", 1, STR_GAME_OPTIONS_CURRENCY_PLN    }, ///< polish zloty
+	{    6, "", CF_NOEURO, "",             NBSP u8"z\u0142", "PLN", 1, STR_GAME_OPTIONS_CURRENCY_PLN    }, ///< polish zloty
-	{    5, "", CF_NOEURO, "",             NBSP "Lei",       1, STR_GAME_OPTIONS_CURRENCY_RON    }, ///< romanian leu
+	{    5, "", CF_NOEURO, "",             NBSP "Lei",       "RON", 1, STR_GAME_OPTIONS_CURRENCY_RON    }, ///< romanian leu
-	{   50, "", CF_NOEURO, "",             NBSP "p",         1, STR_GAME_OPTIONS_CURRENCY_RUR    }, ///< russian rouble
+	{   50, "", CF_NOEURO, "",             NBSP "p",         "RUR", 1, STR_GAME_OPTIONS_CURRENCY_RUR    }, ///< russian rouble
-	{  479, "", 2007,      "",             NBSP "SIT",       1, STR_GAME_OPTIONS_CURRENCY_SIT    }, ///< slovenian tolar
+	{  479, "", 2007,      "",             NBSP "SIT",       "SIT", 1, STR_GAME_OPTIONS_CURRENCY_SIT    }, ///< slovenian tolar
-	{   13, "", CF_NOEURO, "",             NBSP "Kr",        1, STR_GAME_OPTIONS_CURRENCY_SEK    }, ///< swedish krona
+	{   13, "", CF_NOEURO, "",             NBSP "Kr",        "SEK", 1, STR_GAME_OPTIONS_CURRENCY_SEK    }, ///< swedish krona
-	{    3, "", CF_NOEURO, "",             NBSP "TL",        1, STR_GAME_OPTIONS_CURRENCY_TRY    }, ///< turkish lira
+	{    3, "", CF_NOEURO, "",             NBSP "TL",        "TRY", 1, STR_GAME_OPTIONS_CURRENCY_TRY    }, ///< turkish lira
-	{   60, "", 2009,      "",             NBSP "Sk",        1, STR_GAME_OPTIONS_CURRENCY_SKK    }, ///< slovak koruna
+	{   60, "", 2009,      "",             NBSP "Sk",        "SKK", 1, STR_GAME_OPTIONS_CURRENCY_SKK    }, ///< slovak koruna
-	{    4, "", CF_NOEURO, "R$" NBSP,      "",               0, STR_GAME_OPTIONS_CURRENCY_BRL    }, ///< brazil real
+	{    4, "", CF_NOEURO, "R$" NBSP,      "",               "BRL", 0, STR_GAME_OPTIONS_CURRENCY_BRL    }, ///< brazil real
-	{   31, "", 2011,      "",             NBSP "EEK",       1, STR_GAME_OPTIONS_CURRENCY_EEK    }, ///< estonian krooni
+	{   31, "", 2011,      "",             NBSP "EEK",       "EEK", 1, STR_GAME_OPTIONS_CURRENCY_EEK    }, ///< estonian krooni
-	{    4, "", 2015,      "",             NBSP "Lt",        1, STR_GAME_OPTIONS_CURRENCY_LTL    }, ///< lithuanian litas
+	{    4, "", 2015,      "",             NBSP "Lt",        "LTL", 1, STR_GAME_OPTIONS_CURRENCY_LTL    }, ///< lithuanian litas
-	{ 1850, "", CF_NOEURO, u8"\u20a9",     "",               0, STR_GAME_OPTIONS_CURRENCY_KRW    }, ///< south korean won
+	{ 1850, "", CF_NOEURO, u8"\u20a9",     "",               "KRW", 0, STR_GAME_OPTIONS_CURRENCY_KRW    }, ///< south korean won
-	{   13, "", CF_NOEURO, "R" NBSP,       "",               0, STR_GAME_OPTIONS_CURRENCY_ZAR    }, ///< south african rand
+	{   13, "", CF_NOEURO, "R" NBSP,       "",               "ZAR", 0, STR_GAME_OPTIONS_CURRENCY_ZAR    }, ///< south african rand
-	{    1, "", CF_NOEURO, "",             "",               2, STR_GAME_OPTIONS_CURRENCY_CUSTOM }, ///< custom currency (add further languages below)
+	{    1, "", CF_NOEURO, "",             "",               "",    2, STR_GAME_OPTIONS_CURRENCY_CUSTOM }, ///< custom currency (add further languages below)
-	{    3, "", CF_NOEURO, "",             NBSP "GEL",       1, STR_GAME_OPTIONS_CURRENCY_GEL    }, ///< Georgian Lari
+	{    3, "", CF_NOEURO, "",             NBSP "GEL",       "GEL", 1, STR_GAME_OPTIONS_CURRENCY_GEL    }, ///< Georgian Lari
-	{ 4901, "", CF_NOEURO, "",             NBSP "Rls",       1, STR_GAME_OPTIONS_CURRENCY_IRR    }, ///< Iranian Rial
+	{ 4901, "", CF_NOEURO, "",             NBSP "Rls",       "IRR", 1, STR_GAME_OPTIONS_CURRENCY_IRR    }, ///< Iranian Rial
-	{   80, "", CF_NOEURO, "",             NBSP "rub",       1, STR_GAME_OPTIONS_CURRENCY_RUB    }, ///< New Russian Ruble
+	{   80, "", CF_NOEURO, "",             NBSP "rub",       "RUB", 1, STR_GAME_OPTIONS_CURRENCY_RUB    }, ///< New Russian Ruble
-	{   24, "", CF_NOEURO, "$",            "",               0, STR_GAME_OPTIONS_CURRENCY_MXN    }, ///< Mexican peso
+	{   24, "", CF_NOEURO, "$",            "",               "MXN", 0, STR_GAME_OPTIONS_CURRENCY_MXN    }, ///< Mexican peso
-	{   40, "", CF_NOEURO, "NTD" NBSP,     "",               0, STR_GAME_OPTIONS_CURRENCY_NTD    }, ///< new taiwan dollar
+	{   40, "", CF_NOEURO, "NTD" NBSP,     "",               "NTD", 0, STR_GAME_OPTIONS_CURRENCY_NTD    }, ///< new taiwan dollar
-	{    8, "", CF_NOEURO, u8"\u00a5",     "",               0, STR_GAME_OPTIONS_CURRENCY_CNY    }, ///< chinese renminbi
+	{    8, "", CF_NOEURO, u8"\u00a5",     "",               "CNY", 0, STR_GAME_OPTIONS_CURRENCY_CNY    }, ///< chinese renminbi
-	{   10, "", CF_NOEURO, "HKD" NBSP,     "",               0, STR_GAME_OPTIONS_CURRENCY_HKD    }, ///< hong kong dollar
+	{   10, "", CF_NOEURO, "HKD" NBSP,     "",               "HKD", 0, STR_GAME_OPTIONS_CURRENCY_HKD    }, ///< hong kong dollar
-	{   90, "", CF_NOEURO, u8"\u20b9",     "",               0, STR_GAME_OPTIONS_CURRENCY_INR    }, ///< Indian Rupee
+	{   90, "", CF_NOEURO, u8"\u20b9",     "",               "INR", 0, STR_GAME_OPTIONS_CURRENCY_INR    }, ///< Indian Rupee
-	{   19, "", CF_NOEURO, "Rp",           "",               0, STR_GAME_OPTIONS_CURRENCY_IDR    }, ///< Indonesian Rupiah
+	{   19, "", CF_NOEURO, "Rp",           "",               "IDR", 0, STR_GAME_OPTIONS_CURRENCY_IDR    }, ///< Indonesian Rupiah
-	{    5, "", CF_NOEURO, "RM",           "",               0, STR_GAME_OPTIONS_CURRENCY_MYR    }, ///< Malaysian Ringgit
+	{    5, "", CF_NOEURO, "RM",           "",               "MYR", 0, STR_GAME_OPTIONS_CURRENCY_MYR    }, ///< Malaysian Ringgit
 };
 
 /** Array of currencies used by the system */
@@ -161,23 +161,3 @@ void ResetCurrencies(bool preserve_custom)
 		_currency_specs[i] = origin_currency_specs[i];
 	}
 }
-
-/**
- * Build a list of currency names StringIDs to use in a dropdown list
- * @return Pointer to a (static) array of StringIDs
- */
-StringID *BuildCurrencyDropdown()
-{
-	/* Allow room for all currencies, plus a terminator entry */
-	static StringID names[CURRENCY_END + 1];
-	uint i;
-
-	/* Add each name */
-	for (i = 0; i < CURRENCY_END; i++) {
-		names[i] = _currency_specs[i].name;
-	}
-	/* Terminate the list */
-	names[i] = INVALID_STRING_ID;
-
-	return names;
-}

src/currency.h

@@ -75,6 +75,7 @@ struct CurrencySpec {
 	Year to_euro;          ///< %Year of switching to the Euro. May also be #CF_NOEURO or #CF_ISEURO.
 	std::string prefix;    ///< Prefix to apply when formatting money in this currency.
 	std::string suffix;    ///< Suffix to apply when formatting money in this currency.
+	std::string code;      ///< 3 letter untranslated code to identify the currency.
 	/**
 	 * The currency symbol is represented by two possible values, prefix and suffix
 	 * Usage of one or the other is determined by #symbol_pos.
@@ -89,8 +90,8 @@ struct CurrencySpec {
 
 	CurrencySpec() = default;
 
-	CurrencySpec(uint16 rate, const char *separator, Year to_euro, const char *prefix, const char *suffix, byte symbol_pos, StringID name) :
+	CurrencySpec(uint16 rate, const char *separator, Year to_euro, const char *prefix, const char *suffix, const char *code, byte symbol_pos, StringID name) :
-		rate(rate), separator(separator), to_euro(to_euro), prefix(prefix), suffix(suffix), symbol_pos(symbol_pos), name(name)
+		rate(rate), separator(separator), to_euro(to_euro), prefix(prefix), suffix(suffix), code(code), symbol_pos(symbol_pos), name(name)
 	{
 	}
 };
@@ -104,7 +105,6 @@ extern CurrencySpec _currency_specs[CURRENCY_END];
 uint64 GetMaskOfAllowedCurrencies();
 void CheckSwitchToEuro();
 void ResetCurrencies(bool preserve_custom = true);
-StringID *BuildCurrencyDropdown();
 byte GetNewgrfCurrencyIdConverted(byte grfcurr_id);
 
 #endif /* CURRENCY_H */

src/date_gui.cpp

@@ -95,9 +95,8 @@ struct SetDateWindow : Window {
 
 			case WID_SD_YEAR:
 				for (Year i = this->min_year; i <= this->max_year; i++) {
-					DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false);
+					SetDParam(0, i);
-					item->SetParam(0, i);
+					list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false));
-					list.emplace_back(item);
 				}
 				selected = this->date.year;
 				break;
@@ -206,18 +205,16 @@ struct SetMinutesWindow : SetDateWindow
 
 			case WID_SD_DAY:
 				for (uint i = 0; i < 60; i++) {
-					DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false);
+					SetDParam(0, i);
-					item->SetParam(0, i);
+					list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false));
-					list.emplace_back(item);
 				}
 				selected = MINUTES_MINUTE(minutes);
 				break;
 
 			case WID_SD_MONTH:
 				for (uint i = 0; i < 24; i++) {
-					DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false);
+					SetDParam(0, i);
-					item->SetParam(0, i);
+					list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false));
-					list.emplace_back(item);
 				}
 				selected = MINUTES_HOUR(minutes);
 

src/fileio.cpp

@@ -353,8 +353,6 @@ void FioCreateDirectory(const std::string &name)
 	 * of the time they are 'directory already exists' errors anyhow. */
 #if defined(_WIN32)
 	CreateDirectory(OTTD2FS(name).c_str(), nullptr);
-#elif defined(OS2) && !defined(__INNOTEK_LIBC__)
-	mkdir(OTTD2FS(name).c_str());
 #else
 	mkdir(OTTD2FS(name).c_str(), 0755);
 #endif
@@ -762,7 +760,7 @@ bool ExtractTar(const std::string &tar_filename, Subdirectory subdir)
 /**
  * Determine the base (personal dir and game data dir) paths
  * @param exe the path from the current path to the executable
- * @note defined in the OS related files (os2.cpp, win32.cpp, unix.cpp etc)
+ * @note defined in the OS related files (win32.cpp, unix.cpp etc)
  */
 extern void DetermineBasePaths(const char *exe);
 #else /* defined(_WIN32) */
@@ -882,7 +880,7 @@ void DetermineBasePaths(const char *exe)
 	}
 #endif
 
-#if defined(OS2) || !defined(WITH_PERSONAL_DIR)
+#if !defined(WITH_PERSONAL_DIR)
 	_searchpaths[SP_PERSONAL_DIR].clear();
 #else
 	if (!homedir.empty()) {

src/fios.cpp

@@ -37,7 +37,7 @@
 static std::string *_fios_path = nullptr;
 SortingBits _savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING;
 
-/* OS-specific functions are taken from their respective files (win32/unix/os2 .c) */
+/* OS-specific functions are taken from their respective files (win32/unix .c) */
 extern bool FiosIsRoot(const char *path);
 extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
 extern bool FiosIsHiddenFile(const struct dirent *ent);
@@ -146,7 +146,7 @@ bool FiosBrowseTo(const FiosItem *item)
 {
 	switch (item->type) {
 		case FIOS_TYPE_DRIVE:
-#if defined(_WIN32) || defined(__OS2__)
+#if defined(_WIN32)
 			assert(_fios_path != nullptr);
 			*_fios_path = std::string{ item->title, 0, 1 } + ":" PATHSEP;
 #endif

src/fios_gui.cpp

@@ -692,7 +692,7 @@ public:
 					}
 					if (this->fop == SLO_SAVE) {
 						/* Copy clicked name to editbox */
-						this->filename_editbox.text.Assign(file->title.c_str());
+						this->filename_editbox.text.Assign(file->title);
 						this->SetWidgetDirty(WID_SL_SAVE_OSK_TITLE);
 					}
 				} else if (!_load_check_data.HasErrors()) {

src/fontcache.cpp

@@ -187,5 +187,5 @@ bool HasAntialiasedFonts()
 
 #if !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG) && !defined(WITH_COCOA)
 
-bool SetFallbackFont(FontCacheSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback) { return false; }
+bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, int winlangid, MissingGlyphSearcher *callback) { return false; }
 #endif /* !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG) && !defined(WITH_COCOA) */

src/fontcache/freetypefontcache.cpp

@@ -145,19 +145,11 @@ void LoadFreeTypeFont(FontSize fs)
 	/* If font is an absolute path to a ttf, try loading that first. */
 	FT_Error error = FT_New_Face(_library, font_name, 0, &face);
 
-#if defined(WITH_COCOA)
-	extern void MacOSRegisterExternalFont(const char *file_path);
-	if (error == FT_Err_Ok) MacOSRegisterExternalFont(font_name);
-#endif
-
 	if (error != FT_Err_Ok) {
 		/* Check if font is a relative filename in one of our search-paths. */
 		std::string full_font = FioFindFullPath(BASE_DIR, font_name);
 		if (!full_font.empty()) {
 			error = FT_New_Face(_library, full_font.c_str(), 0, &face);
-#if defined(WITH_COCOA)
-			if (error == FT_Err_Ok) MacOSRegisterExternalFont(full_font.c_str());
-#endif
 		}
 	}
 
@@ -319,10 +311,10 @@ void UninitFreeType()
 	_library = nullptr;
 }
 
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG) && !defined(WITH_COCOA)
+#if !defined(WITH_FONTCONFIG)
 
 FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) { return FT_Err_Cannot_Open_Resource; }
 
-#endif /* !defined(_WIN32) && !defined(__APPLE__) && !defined(WITH_FONTCONFIG) && !defined(WITH_COCOA) */
+#endif /* !defined(WITH_FONTCONFIG) */
 
 #endif /* WITH_FREETYPE */

src/fontdetection.h

@@ -37,6 +37,6 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face);
  * @param callback The function to call to check for missing glyphs.
  * @return true if a font has been set, false otherwise.
  */
-bool SetFallbackFont(struct FontCacheSettings *settings, const char *language_isocode, int winlangid, class MissingGlyphSearcher *callback);
+bool SetFallbackFont(struct FontCacheSettings *settings, const std::string &language_isocode, int winlangid, class MissingGlyphSearcher *callback);
 
 #endif

src/game/game_gui.cpp

@@ -200,7 +200,7 @@ struct GSConfigWindow : public Window {
 					TextColour colour;
 					uint idx = 0;
 					if (config_item.description.empty()) {
-						str = STR_JUST_STRING;
+						str = STR_JUST_STRING1;
 						colour = TC_ORANGE;
 					} else {
 						str = STR_AI_SETTINGS_SETTING;
@@ -317,7 +317,7 @@ struct GSConfigWindow : public Window {
 
 							DropDownList list;
 							for (int i = config_item.min_value; i <= config_item.max_value; i++) {
-								list.emplace_back(new DropDownListCharStringItem(config_item.labels.find(i)->second, i, false));
+								list.emplace_back(new DropDownListStringItem(config_item.labels.find(i)->second, i, false));
 							}
 
 							ShowDropDownListAt(this, std::move(list), old_val, -1, wi_rect, COLOUR_ORANGE);

src/gamelog.cpp

@@ -5,7 +5,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 <http://www.gnu.org/licenses/>.
  */
 
-/** @file gamelog.cpp Definition of functions used for logging of important changes in the game */
+/** @file gamelog.cpp Definition of functions used for logging of fundamental changes to the game */
 
 #include "stdafx.h"
 #include "sl/saveload.h"

src/gamelog.h

@@ -5,7 +5,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 <http://www.gnu.org/licenses/>.
  */
 
-/** @file gamelog.h Functions to be called to log possibly unsafe game events */
+/** @file gamelog.h Functions to be called to log fundamental changes to the game */
 
 #ifndef GAMELOG_H
 #define GAMELOG_H

src/genworld_gui.cpp

@@ -112,7 +112,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 							NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(1, 1),
 							NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_MAPSIZE_Y_PULLDOWN), SetDataTip(STR_JUST_INT, STR_MAPGEN_MAPSIZE_TOOLTIP), SetFill(1, 0),
 						EndContainer(),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TERRAIN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TERRAIN_PULLDOWN), SetDataTip(STR_JUST_STRING1, STR_NULL), SetFill(1, 0),
 						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_VARIETY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
 						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_SMOOTHNESS_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
 						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_RIVER_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
@@ -173,9 +173,9 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 							NWidget(WWT_IMGBTN, COLOUR_ORANGE, WID_GL_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1),
 						EndContainer(),
 						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWNNAME_DROPDOWN), SetDataTip(STR_JUST_STRING, STR_MAPGEN_TOWN_NAME_DROPDOWN_TOOLTIP), SetFill(1, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING1, STR_NULL), SetFill(1, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING1, STR_NULL), SetFill(1, 0),
-						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_WATER_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
+						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, WID_GL_WATER_PULLDOWN), SetDataTip(STR_JUST_STRING1, STR_NULL), SetFill(1, 0),
 					EndContainer(),
 				EndContainer(),
 			EndContainer(),
@@ -403,9 +403,8 @@ static DropDownList BuildMapsizeDropDown(int other_dimension)
 	DropDownList list;
 
 	for (uint i = MIN_MAP_SIZE_BITS; i <= MAX_MAP_SIZE_BITS; i++) {
-		DropDownListParamStringItem *item = new DropDownListParamStringItem((i + other_dimension > MAX_MAP_TILES_BITS) ? STR_RED_INT : STR_JUST_INT, i, false);
+		SetDParam(0, 1LL << i);
-		item->SetParam(0, 1LL << i);
+		list.emplace_back(new DropDownListStringItem((i + other_dimension > MAX_MAP_TILES_BITS) ? STR_RED_INT : STR_JUST_INT, i, false));
-		list.emplace_back(item);
 	}
 
 	return list;

src/gfxinit.cpp

@@ -556,7 +556,7 @@ bool GraphicsSet::FillSetDetails(IniFile *ini, const std::string &path, const st
 		this->palette = ((*item->value)[0] == 'D' || (*item->value)[0] == 'd') ? PAL_DOS : PAL_WINDOWS;
 
 		/* Get optional blitter information. */
-		item = metadata->GetItem("blitter", false);
+		item = metadata->GetItem("blitter");
 		this->blitter = (item != nullptr && (*item->value)[0] == '3') ? BLT_32BPP : BLT_8BPP;
 	}
 	return ret;

src/goal_gui.cpp

@@ -283,7 +283,7 @@ struct GoalListWindow : public Window {
 static const NWidgetPart _nested_goals_list_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN),
-		NWidget(WWT_CAPTION, COLOUR_BROWN, WID_GOAL_CAPTION), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_BROWN, WID_GOAL_CAPTION), SetDataTip(STR_JUST_STRING1, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GOAL_SELECT_BUTTONS),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_GOAL_GLOBAL_BUTTON), SetMinimalSize(50, 0), SetMinimalTextLines(1, WidgetDimensions::unscaled.captiontext.Vertical()), SetDataTip(STR_GOALS_GLOBAL_BUTTON, STR_GOALS_GLOBAL_BUTTON_HELPTEXT),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, WID_GOAL_COMPANY_BUTTON), SetMinimalSize(50, 0), SetMinimalTextLines(1, WidgetDimensions::unscaled.captiontext.Vertical()), SetDataTip(STR_GOALS_COMPANY_BUTTON, STR_GOALS_COMPANY_BUTTON_HELPTEXT),

src/hotkeys.cpp

@@ -283,7 +283,7 @@ void HotkeyList::Load(IniFile *ini)
 {
 	IniGroup *group = ini->GetGroup(this->ini_group);
 	for (Hotkey *hotkey = this->items; hotkey->name != nullptr; ++hotkey) {
-		IniItem *item = group->GetItem(hotkey->name, false);
+		IniItem *item = group->GetItem(hotkey->name);
 		if (item != nullptr) {
 			hotkey->keycodes.clear();
 			if (item->value.has_value()) ParseHotkeys(hotkey, item->value->c_str());
@@ -299,8 +299,8 @@ void HotkeyList::Save(IniFile *ini) const
 {
 	IniGroup *group = ini->GetGroup(this->ini_group);
 	for (const Hotkey *hotkey = this->items; hotkey->name != nullptr; ++hotkey) {
-		IniItem *item = group->GetItem(hotkey->name, true);
+		IniItem &item = group->GetOrCreateItem(hotkey->name);
-		item->SetValue(SaveKeycodes(hotkey));
+		item.SetValue(SaveKeycodes(hotkey));
 	}
 }
 

src/industry_gui.cpp

@@ -460,7 +460,7 @@ public:
 					/* Measure the accepted cargoes, if any. */
 					GetAllCargoSuffixes(CARGOSUFFIX_IN, CST_FUND, nullptr, indtype, indsp, indsp->accepts_cargo, cargo_suffix);
 					std::string cargostring = this->MakeCargoListString(indsp->accepts_cargo, cargo_suffix, lengthof(indsp->accepts_cargo), STR_INDUSTRY_VIEW_REQUIRES_N_CARGO);
-					Dimension strdim = GetStringBoundingBox(cargostring.c_str());
+					Dimension strdim = GetStringBoundingBox(cargostring);
 					if (strdim.width > max_minwidth) {
 						extra_lines_req = std::max(extra_lines_req, strdim.width / max_minwidth + 1);
 						strdim.width = max_minwidth;
@@ -470,7 +470,7 @@ public:
 					/* Measure the produced cargoes, if any. */
 					GetAllCargoSuffixes(CARGOSUFFIX_OUT, CST_FUND, nullptr, indtype, indsp, indsp->produced_cargo, cargo_suffix);
 					cargostring = this->MakeCargoListString(indsp->produced_cargo, cargo_suffix, lengthof(indsp->produced_cargo), STR_INDUSTRY_VIEW_PRODUCES_N_CARGO);
-					strdim = GetStringBoundingBox(cargostring.c_str());
+					strdim = GetStringBoundingBox(cargostring);
 					if (strdim.width > max_minwidth) {
 						extra_lines_prd = std::max(extra_lines_prd, strdim.width / max_minwidth + 1);
 						strdim.width = max_minwidth;

src/ini_load.cpp

@@ -82,22 +82,32 @@ IniGroup::~IniGroup()
 }
 
 /**
- * Get the item with the given name, and if it doesn't exist
+ * Get the item with the given name.
- * and create is true it creates a new item.
  * @param name   name of the item to find.
- * @param create whether to create an item when not found or not.
  * @return the requested item or nullptr if not found.
  */
-IniItem *IniGroup::GetItem(const std::string &name, bool create)
+IniItem *IniGroup::GetItem(const std::string &name) const
 {
 	for (IniItem *item = this->item; item != nullptr; item = item->next) {
 		if (item->name == name) return item;
 	}
 
-	if (!create) return nullptr;
+	return nullptr;
+}
 
-	/* otherwise make a new one */
+/**
-	return new IniItem(this, name);
+ * Get the item with the given name, and if it doesn't exist create a new item.
+ * @param name   name of the item to find.
+ * @return the requested item.
+ */
+IniItem &IniGroup::GetOrCreateItem(const std::string &name)
+{
+	for (IniItem *item = this->item; item != nullptr; item = item->next) {
+		if (item->name == name) return *item;
+	}
+
+	/* Item doesn't exist, make a new one. */
+	return *(new IniItem(this, name));
 }
 
 /**

src/ini_type.h

@@ -46,7 +46,8 @@ struct IniGroup {
 	IniGroup(struct IniLoadFile *parent, const std::string &name);
 	~IniGroup();
 
-	IniItem *GetItem(const std::string &name, bool create);
+	IniItem *GetItem(const std::string &name) const;
+	IniItem &GetOrCreateItem(const std::string &name);
 	void RemoveItem(const std::string &name);
 	void Clear();
 };

src/intro_gui.cpp

@@ -494,7 +494,7 @@ static const NWidgetPart _nested_select_game_widgets[] = {
 static WindowDesc _select_game_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_SELECT_GAME, WC_NONE,
-	0,
+	WDF_NO_CLOSE,
 	_nested_select_game_widgets, lengthof(_nested_select_game_widgets)
 );
 

src/lang/afrikaans.txt

@@ -908,46 +908,47 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spel Ops
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Geldeenheid
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Geld eendheid keuse
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikaanse Dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikaanse Dollar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japannese Jen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japannese Jen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Oostenrykse Schilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Oostenrykse Schilling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgiese Frank (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgiese Frank
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Switserse Frank (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Switserse Frank
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tsjeggiese Kroon (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tsjeggiese Kroon
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Duitse Mark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Duitse Mark
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Deense Krone (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Deense Krone
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spaanse Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spaanse Peseta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finse Markka (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finse Markka
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franse Frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franse Frank
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Griekse Dragma (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Griekse Dragma
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hongaarse Forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hongaarse Forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Yslandse Kroon (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Yslandse Kroon
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italiaanse Lire (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italiaanse Lire
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nederlandse Gulde (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nederlandse Gulde
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Noorweegse Kroon (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Noorweegse Kroon
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poolse Zloty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poolse Zloty
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Roemeense Leu (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Roemeense Leu
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russiese Roebel (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russiese Roebel
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Sloweense Tolar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Sloweense Tolar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Sweedse Kroon (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Sweedse Kroon
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkse Lire (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkse Lire
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slowaakse Kroon (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slowaakse Kroon
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasiliaanse Real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasiliaanse Real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estniese Kroon (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estniese Kroon
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litause Litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litause Litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Suid Koreanse Won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Suid Koreanse Won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Suid Afrikaanse Rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Suid Afrikaanse Rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Pasmaak...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgiaanse Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgiaanse Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iraanse Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iraanse Rial
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nuwe Russiese Ruble (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nuwe Russiese Ruble
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexikaanse peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexikaanse peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nuwe Taiwan dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nuwe Taiwan dollar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Outostoor
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Kies interval tussen outomatiese store
@@ -1861,29 +1862,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Empiries (vt)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metries (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Eenhede
+STR_CONFIG_SETTING_LOCALISATION                                 :Eenhede
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafika
+STR_CONFIG_SETTING_GRAPHICS                                     :Grafika
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Klank
+STR_CONFIG_SETTING_SOUND                                        :Klank
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Koppelvlak
+STR_CONFIG_SETTING_INTERFACE                                    :Koppelvlak
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Algemeen
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Algemeen
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Vertoonvensters
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Vertoonvensters
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Konstruksie
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Konstruksie
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Nuus / Raad
+STR_CONFIG_SETTING_ADVISORS                                     :Nuus / Raad
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Maatskappy
+STR_CONFIG_SETTING_COMPANY                                      :Maatskappy
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Rekeningkunde
+STR_CONFIG_SETTING_ACCOUNTING                                   :Rekeningkunde
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Voertuie
+STR_CONFIG_SETTING_VEHICLES                                     :Voertuie
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Fisika
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Fisika
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Roete
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Roete
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Beperkings
+STR_CONFIG_SETTING_LIMITATIONS                                  :Beperkings
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Ongelukke & rampe
+STR_CONFIG_SETTING_ACCIDENTS                                    :Ongelukke & rampe
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Land skepping
+STR_CONFIG_SETTING_GENWORLD                                     :Land skepping
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Omgewing
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Omgewing
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Stadsrade
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Stadsrade
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Dorpe
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Dorpe
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Nywerhede
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Nywerhede
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Vragverspreiding
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Vragverspreiding
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Mededingers
+STR_CONFIG_SETTING_AI                                           :Mededingers
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Rekenaar spelers
+STR_CONFIG_SETTING_AI_NPC                                       :Rekenaar spelers
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Padvinder vir treine: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Pad speurder om vir teine te gebruik
@@ -4189,8 +4190,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Word ver
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Geskeduleer
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Verander tussen verwagte tyd en geskeduleerde tyd
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
 
 
 # Date window (for timetable)

src/lang/arabic_egypt.txt

@@ -902,43 +902,44 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}إعدا
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}وحدة العملة
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}اختيار وحدة العملة
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :جنية(£)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :جنية
-STR_GAME_OPTIONS_CURRENCY_USD                                   :دولار ($)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :دولار
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :يورو (€)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :يورو
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :ين (¥)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :ين
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :شلنق استرالي (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :شلنق استرالي
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :فرنك بلجيكي (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :فرنك بلجيكي
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :فرنك سويسري (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :فرنك سويسري
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :كرونا تشيكية (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :كرونا تشيكية
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :مارك الماني (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :مارك الماني
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :كرونا دنمركي
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :كرونا د
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :بيستا (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :بيستا
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :ماركا فنلندي(FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :ماركا فنلندي
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :فرنك (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :فرنك
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :دراخما يونانية (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :دراخما يونانية
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :فورنت هنغاري (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :فورنت هنغاري
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :كرونا ايسلاندية (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :كرونا ايسلاندية
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :ليرة ايطالية (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :ليرة ايطالية
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :غلدر هولندي (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :غلدر هولندي
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :كرونا نرويجية (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :كرونا نرويجية
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :زلوتي بولندي (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :زلوتي بولندي
-STR_GAME_OPTIONS_CURRENCY_RON                                   :لور يوناني (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :لور يوناني
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :روبل روسي (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :روبل روسي
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :تولار سوفاني (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :تولار سوفاني
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :كرونا سويدية (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :كرونا سويدية
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :ليرة تركية (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :ليرة تركية
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :كرونا سلوفاكية (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :كرونا سلوفاكية
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :ريال برازيلي (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :ريال برازيلي
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :كرونا استونية (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :كرونا استونية
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :وون كوريا الجنوبية (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :وون كوريا الجنوبية
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :راند جنوب أفريقيا (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :راند جنوب أفريقيا
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :مخصص ...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :(GEL) لاري جورجي
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :لاري جورجي
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :الدولار التايواني الجديد (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :الدولار التايواني الجديد
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :(CNY) الرنمينبي الصيني
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :الرنمينبي الصيني
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :(HKD) دولار هونج كونج
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :دولار هونج كونج
-STR_GAME_OPTIONS_CURRENCY_INR                                   :الروبية الهندية (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :الروبية الهندية
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}حفظ آلي
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}اختار مدة الحفظ الآلي
@@ -1672,29 +1673,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_FORCE_METRIC              :متري (كغ
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :إمبراطوري (قدم)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :متري (م)
 
-STR_CONFIG_SETTING_GRAPHICS                                     :رسوميات {ORANGE}
+STR_CONFIG_SETTING_GRAPHICS                                     :رسوميات
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}الصوت
+STR_CONFIG_SETTING_SOUND                                        :الصوت
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}النظام البيني
+STR_CONFIG_SETTING_INTERFACE                                    :النظام البيني
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :عموم{ORANGE}
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :عموم
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :مجالات رؤية {ORANGE}
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :مجالات رؤية
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}البناء
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :البناء
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}أخبار\ مستشارون
+STR_CONFIG_SETTING_ADVISORS                                     :أخبار\ مستشارون
-STR_CONFIG_SETTING_COMPANY                                      :شركة{ORANGE}
+STR_CONFIG_SETTING_COMPANY                                      :شركة
-STR_CONFIG_SETTING_ACCOUNTING                                   :حسابات{ORANGE}
+STR_CONFIG_SETTING_ACCOUNTING                                   :حسابات
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}المركبات
+STR_CONFIG_SETTING_VEHICLES                                     :المركبات
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :فيزياء{ORANGE}
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :فيزياء
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE} المسارات
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :المسارات
-STR_CONFIG_SETTING_LIMITATIONS                                  :حدود {ORANGE}
+STR_CONFIG_SETTING_LIMITATIONS                                  :حدود
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE} كوارث\حوادث
+STR_CONFIG_SETTING_ACCIDENTS                                    :كوارث\حوادث
-STR_CONFIG_SETTING_GENWORLD                                     :تكوين عالم {ORANGE}
+STR_CONFIG_SETTING_GENWORLD                                     :تكوين عالم
-STR_CONFIG_SETTING_ENVIRONMENT                                  :بيئة {ORANGE}
+STR_CONFIG_SETTING_ENVIRONMENT                                  :بيئة
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :سلطات {ORANGE}
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :سلطات
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE} مدن
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :مدن
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE} مصانع
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :مصانع
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :توزيع البضائع{ORANGE}
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :توزيع البضائع
-STR_CONFIG_SETTING_AI                                           :{ORANGE}المتنافسين
+STR_CONFIG_SETTING_AI                                           :المتنافسين
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE} لاعبين الحاسوب
+STR_CONFIG_SETTING_AI_NPC                                       : لاعبين الحاسوب
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}شبكة الاتصال
+STR_CONFIG_SETTING_NETWORK                                      :شبكة الاتصال
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :موجد الطريق- قصاص الطريق - للقطارات:{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :موجد الطريق (قصاص الأثر) للعربات: {STRING}
@@ -1942,6 +1943,7 @@ STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}أسم
 STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}ضع كلمة سر
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}احم لعبتك برقم سري حتى لا تصبح لعبتك مفتوحة للجميع
 
+STR_NETWORK_START_SERVER_VISIBILITY_TOOLTIP                     :{BLACK}سواء بإمكان الأشخاص الآخرين رؤية خادمك (server) في القائمة العامة أم لا
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM}عميل
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}اقصى عدد للعملاء:
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}أختر أقصى عدد للعملاء
@@ -1980,6 +1982,7 @@ STR_NETWORK_COMPANY_LIST_SPECTATE                               :شاهد
 # Network client list
 STR_NETWORK_CLIENT_LIST_CAPTION                                 :{WHITE}اللاعبون عبر الإنترنت
 STR_NETWORK_CLIENT_LIST_SERVER_NAME                             :{BLACK}الاسم
+STR_NETWORK_CLIENT_LIST_SERVER_CONNECTION_TYPE_TOOLTIP          :{BLACK}سواء ان يمكن الوصول إلى الخادم الخاص بك من قبل الآخرين وكيف سيصلون اليه
 STR_NETWORK_CLIENT_LIST_PLAYER_NAME                             :{BLACK}الاسم
 STR_NETWORK_CLIENT_LIST_SPECTATORS                              :المشاهدين
 STR_NETWORK_CLIENT_LIST_NEW_COMPANY                             :(شركة جديدة)
@@ -2112,6 +2115,7 @@ STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK} مسح
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK} ضع علامة على المحتوى التي لن يتم تحميلها
 STR_CONTENT_SEARCH_EXTERNAL                                     :{BLACK}بحث المواقع الخارجية
 STR_CONTENT_SEARCH_EXTERNAL_TOOLTIP                             :{BLACK} محتوى البحث غير متوفر في في خدمة محتوى OpenTTD على مواقع الويب غير التابعة لـ OpenTTD
+STR_CONTENT_SEARCH_EXTERNAL_DISCLAIMER                          :{WHITE}تختلف شروط وأحكام تنزيل المحتوى من مواقع الويب الخارجية.{}يجب عليك الرجوع إلى المواقع الخارجية للحصول على إرشادات حول كيفية تثبيت المحتوى في OpenTTD.{}هل تريد أن تكمل؟
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}مُرَشِح:
 STR_CONTENT_OPEN_URL                                            :{BLACK} زيارة الموقع
 STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}قم بزيارة الموقع لهذا المحتوى
@@ -2615,6 +2619,7 @@ STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}النس
 
 # Framerate display window
 STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
 STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} صورة في الثانية
 STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} صورة في الثانية
 STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} ثواني
@@ -3110,6 +3115,7 @@ STR_FINANCES_YEAR                                               :{WHITE}{NUM}
 
 ###length 3
 STR_FINANCES_REVENUE_TITLE                                      :{WHITE}الدخل
+STR_FINANCES_OPERATING_EXPENSES_TITLE                           :{WHITE}مصروفات التشغيل
 
 
 ###length 13
@@ -3211,6 +3217,7 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}وسط
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}نسبة الانتاج: {YELLOW}{COMMA}%
 
 STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}ينتج: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :، {STRING}{STRING}
 
 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}:يتطلب
 STR_INDUSTRY_VIEW_ACCEPT_CARGO_AMOUNT                           :{YELLOW}{STRING}{BLACK}: {CARGO_SHORT} تنتظر{STRING}
@@ -3912,8 +3919,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}متوق
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}مجدول
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}غير بين المتوقع و المجدول
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :و:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :م:
 
 
 # Date window (for timetable)
@@ -3956,6 +3961,7 @@ STR_AI_CONFIG_HUMAN_PLAYER                                      :لاعب انس
 STR_AI_CONFIG_RANDOM_AI                                         :ذكاء صناعي عشوائي
 STR_AI_CONFIG_NONE                                              :(لا شيء)
 STR_AI_CONFIG_MAX_COMPETITORS                                   :{LTBLUE}العدد الاقصى للمتنافسين: {ORANGE}{COMMA}
+STR_AI_CONFIG_COMPETITORS_INTERVAL                              :{LTBLUE}الفترة بين بدء المنافسين: {ORANGE}{COMMA} دقيقة
 
 STR_AI_CONFIG_MOVE_UP                                           :{BLACK}انقل للاعلى
 STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}انقل الذكاء الاصطناعي المختار للاعلى
@@ -4011,6 +4017,7 @@ STR_PERCENT_DOWN                                                :{WHITE}{NUM}%{D
 STR_PERCENT_UP_DOWN_SMALL                                       :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}{DOWN_ARROW}
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UP_ARROW}{DOWN_ARROW}
 STR_PERCENT_NONE_SMALL                                          :{TINY_FONT}{WHITE}{NUM}%
+STR_PERCENT_NONE                                                :{WHITE}{NUM}%
 
 # Income 'floats'
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINY_FONT}{RED}تكلفة: {CURRENCY_LONG}

src/lang/basque.txt

@@ -884,41 +884,42 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Jokoaren
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Diru unitateak
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Diru unitatearen aukeraketa
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra (£)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar Amerikarrak (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar Amerikarrak
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euroa (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euroa
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yena (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Yena
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Txelin Austriarra (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Txelin Austriarra
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franko Belgikarra (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franko Belgikarra
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Suitzar Frankoa (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Suitzar Frankoa
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Koroa Txekoa (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Koroa Txekoa
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marko Alemaniarra (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marko Alemaniarra
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danierar Koroa (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danierar Koroa
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pezeta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pezeta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marko Finlandiarra (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marko Finlandiarra
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frankoa (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frankoa
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Drachma Grekoa (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Drachma Grekoa
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florin Hungariarra (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florin Hungariarra
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Koro Islandiarra (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Koro Islandiarra
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Italiarra (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Italiarra
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Herbeheretako Florina (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Herbeheretako Florina
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norvegiar Koroa (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norvegiar Koroa
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty Poloniarra (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty Poloniarra
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu Errumaniarra (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu Errumaniarra
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Errusiar Rubloa (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Errusiar Rubloa
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar Esloveniarra (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar Esloveniarra
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Suediar Koroa (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Suediar Koroa
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira Turkiarra (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira Turkiarra
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Eslovakiar Koroa (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Eslovakiar Koroa
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Erreal Brasildarra (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Erreal Brasildarra
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estoniar Koroa (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estoniar Koroa
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lituaniako Litas-ak (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lituaniako Litas-ak
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Hego koreako Won-a (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Hego koreako Won-a
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Hego Afrikako Rand-a (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Hego Afrikako Rand-a
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Pertsonalizatua...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiarra (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari Georgiarra
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniarra (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniarra
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Auto-gordea
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Aukeratu jokoa automatikoki gordetzeko denbora
@@ -1752,28 +1753,28 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Inperiala (oin)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrikoa (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Kokapena
+STR_CONFIG_SETTING_LOCALISATION                                 :Kokapena
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafikoak
+STR_CONFIG_SETTING_GRAPHICS                                     :Grafikoak
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Soinua
+STR_CONFIG_SETTING_SOUND                                        :Soinua
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interfazea
+STR_CONFIG_SETTING_INTERFACE                                    :Interfazea
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Orokorra
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Orokorra
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Leihoak
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Leihoak
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Eraikuntza
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Eraikuntza
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Albisteak / Aholkulariak
+STR_CONFIG_SETTING_ADVISORS                                     :Albisteak / Aholkulariak
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Konpainia
+STR_CONFIG_SETTING_COMPANY                                      :Konpainia
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Ibilgailuak
+STR_CONFIG_SETTING_VEHICLES                                     :Ibilgailuak
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Fisika
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Fisika
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Ibilbideak
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Ibilbideak
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Mugak
+STR_CONFIG_SETTING_LIMITATIONS                                  :Mugak
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Hondamendiak / Istripuak
+STR_CONFIG_SETTING_ACCIDENTS                                    :Hondamendiak / Istripuak
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Mundua sortu
+STR_CONFIG_SETTING_GENWORLD                                     :Mundua sortu
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Ingurugiroa
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Ingurugiroa
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Agintariak
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Agintariak
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Herriak
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Herriak
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industriak
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industriak
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Zama banaketa
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Zama banaketa
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Lehiakideak
+STR_CONFIG_SETTING_AI                                           :Lehiakideak
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Ordenagailu jokalariak
+STR_CONFIG_SETTING_AI_NPC                                       :Ordenagailu jokalariak
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Trenen ibilbide bilatzailea: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Trenek erabiliko duten ibilbide bilatzailea
@@ -3947,8 +3948,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Espero z
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Programatuta
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Espero zena eta programatutakoaren artean aukeratu
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
 
 
 # Date window (for timetable)

src/lang/belarusian.txt

@@ -1217,46 +1217,47 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Нала
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Валюта
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Выбар валюты
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Брытанскі фунт (£)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Брытанскі фунт
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Даляр ЗША ($)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Даляр ЗША
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Эўра (€)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Эўра
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Японская ена (¥)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Японская ена
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Аўстралійскі шылінг (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Аўстралійскі шылінг
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Бэльґійскі франк (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Бэльґійскі франк
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Швайцарскі франк (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Швайцарскі франк
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Чэская крона (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Чэская крона
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Нямецкая марка (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Нямецкая марка
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Дацкая крона (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Дацкая крона
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Гішпанская пэсэта (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Гішпанская пэсэта
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Фінская марка (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Фінская марка
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Францускі франк (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Францускі франк
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Грэцкая драхма (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Грэцкая драхма
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Вугорскі форынт (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Вугорскі форынт
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Ісьляндзкая крона (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Ісьляндзкая крона
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Італьянская ліра (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Італьянская ліра
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Нідэрляндзкі гульдэн (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Нідэрляндзкі гульдэн
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Нарвэская крона (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Нарвэская крона
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Польскі злоты (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Польскі злоты
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Румынскі лей (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Румынскі лей
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Расейскі рубель (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Расейскі рубель
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Славенскі толар (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Славенскі толар
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Швэдзкая крона (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Швэдзкая крона
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Турэцкая ліра (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Турэцкая ліра
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Славацкая каруна (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Славацкая каруна
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Бразыльскі рэал (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Бразыльскі рэал
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Эстонская крона (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Эстонская крона
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Летувiскi лiт (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Летувiскi лiт
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Паўднёвакарэйская вона (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Паўднёвакарэйская вона
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Паўднёваафрыканскі рэнд (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Паўднёваафрыканскі рэнд
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Уласная...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Грузінскі лары (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Грузінскі лары
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Іранскі рыал (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Іранскі рыал
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Мексіканскі песа (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Мексіканскі песа
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Новы тайваньскі даляр (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Новы тайваньскі даляр
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Кітайскі юань (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Кітайскі юань
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Ганконскі даляр (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Ганконскі даляр
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Індыйская рупія (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Індыйская рупія
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Аўтазахаваньне
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Інтэрвал паміж аўтаматычнымі захаваньнямі гульні
@@ -2181,29 +2182,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :ангельс
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :мэтрычная (м)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :СІ (м)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Лакалізацыя
+STR_CONFIG_SETTING_LOCALISATION                                 :Лакалізацыя
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Графіка
+STR_CONFIG_SETTING_GRAPHICS                                     :Графіка
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Гукавыя эфэкты
+STR_CONFIG_SETTING_SOUND                                        :Гукавыя эфэкты
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Інтэрфэйс
+STR_CONFIG_SETTING_INTERFACE                                    :Інтэрфэйс
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Агульныя наладкі
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Агульныя наладкі
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Вокны прагляду
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Вокны прагляду
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Будаўніцтва
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Будаўніцтва
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Навіны і інфармацыя
+STR_CONFIG_SETTING_ADVISORS                                     :Навіны і інфармацыя
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Кампанія
+STR_CONFIG_SETTING_COMPANY                                      :Кампанія
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Фінансы
+STR_CONFIG_SETTING_ACCOUNTING                                   :Фінансы
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Транспарт
+STR_CONFIG_SETTING_VEHICLES                                     :Транспарт
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Фізічная мадэль
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Фізічная мадэль
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Маршруты
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Маршруты
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Абмежаваньні
+STR_CONFIG_SETTING_LIMITATIONS                                  :Абмежаваньні
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Аварыі і катастрофы
+STR_CONFIG_SETTING_ACCIDENTS                                    :Аварыі і катастрофы
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Стварэньне мапы
+STR_CONFIG_SETTING_GENWORLD                                     :Стварэньне мапы
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Навакольнае асяроддзе
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Навакольнае асяроддзе
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Гарадская адміністрацыя
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Гарадская адміністрацыя
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Населеныя пункты
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Населеныя пункты
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Прамысловасьць
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Прамысловасьць
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Разьмеркаваньне грузаў
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Разьмеркаваньне грузаў
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Канкурэнты
+STR_CONFIG_SETTING_AI                                           :Канкурэнты
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Кампутарныя гульцы
+STR_CONFIG_SETTING_AI_NPC                                       :Кампутарныя гульцы
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Альґарытм пошуку шляху для цягнікоў: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Мэханізм пошуку шляху для цягнікоў.
@@ -4551,8 +4552,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Чака
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Па раскладзе
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Пераключэньне паміж ґрафікам руху й чаканым часам прыбыцьця/адпраўленьня
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :П:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :А:
 
 
 # Date window (for timetable)

src/lang/brazilian_portuguese.txt

@@ -847,7 +847,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE                                 :{BIG_FONT}{BLAC
 STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION                           :{BIG_FONT}{BLACK}{STRING} foi fechada pelos credores e todos os seus bens foram vendidos!
 STR_NEWS_COMPANY_LAUNCH_TITLE                                   :{BIG_FONT}{BLACK}Nova empresa de transportes lançada!
 STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} inicia construção próximo a {TOWN}!
-STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLACK}{STRING} foi retomada por {STRING}!
+STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLACK}{STRING} foi comprada por {STRING} por um valor não revelado!
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Gerente)
 
 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} patrocinou a construção da nova cidade {TOWN}!
@@ -952,49 +952,51 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Unidades monetárias
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Seleção de unidades monetárias
 
+STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libras Britânicas (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libras Britânicas
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólares Norte Americanos (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dólares Norte Americanos
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Iene Japonês (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Iene Japonês
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Xelim Austríaco (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Xelim Austríaco
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franco Belga (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franco Belga
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franco Suíço (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franco Suíço
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Coroa Checa (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Coroa Checa
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marco Alemão (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marco Alemão
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Coroa Dinamarquesa (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Coroa Dinamarquesa
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta Espanhola (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Peseta Espanhola
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marco Finlandês (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marco Finlandês
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franco Francês (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franco Francês
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma Grego (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma Grego
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Forint Húngaro (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Forint Húngaro
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Coroa Islandesa (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Coroa Islandesa
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Italiana (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira Italiana
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Guilda Holandesa (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Guilda Holandesa
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Coroa Norueguesa (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Coroa Norueguesa
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Złoty Polonês (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Złoty Polonês
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Lei Romeno (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Lei Romeno
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rublo Russo (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rublo Russo
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar Eslovênio (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar Eslovênio
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Coroa Sueca (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Coroa Sueca
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira Turca (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira Turca
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Coroa Eslovaca (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Coroa Eslovaca
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real Brasileiro (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real Brasileiro
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Coroa Estoniana (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Coroa Estoniana
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litas Lituano (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litas Lituano
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Won Sul-Coreano (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Won Sul-Coreano
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Rand Sul-Africano (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Rand Sul-Africano
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Personalizado...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari da Georgia (GEL)
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniano (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial Iraniano
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novo Rublo Russo (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Novo Rublo Russo
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso Mexicano (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso Mexicano
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Novo dólar de Taiwan (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Novo dólar de Taiwan
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi chinês (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi chinês
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dólar de Hong Kong (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dólar de Hong Kong
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Rúpia Indiana (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Rúpia Indiana
 STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupia Indonésia (IDR)
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit Malaio (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit Malaio
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvar automaticamente
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selecionar o intervalo entre jogos salvos automaticos
@@ -1559,7 +1561,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED                :Cinza para verm
 STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE                  :Escala de cinza
 
 STR_CONFIG_SETTING_SCROLLMODE                                   :Comportamento de rolamento da janela: {STRING}
-STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :Comportamento ao rolar o mapa
+STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :Comportamento ao mover o mapa. A opção de "posição do mouse travada" não funciona em todos os sistemas, tais como versões baseadas na web, telas sensíveis ao toque, Linux com Wayland e outros.
 ###length 4
 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT                           :Mover vista com BDM, posição do mouse travada
 STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :Mover mapa com BDM, posição do mouse travada
@@ -2019,30 +2021,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperial (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Métrico (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Localização
+STR_CONFIG_SETTING_LOCALISATION                                 :Localização
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Gráficos
+STR_CONFIG_SETTING_GRAPHICS                                     :Gráficos
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Som
+STR_CONFIG_SETTING_SOUND                                        :Som
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interface
+STR_CONFIG_SETTING_INTERFACE                                    :Interface
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Geral
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Geral
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Janelas de visualização
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Janelas de visualização
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Construção
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Construção
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Notícias / Conselheiros
+STR_CONFIG_SETTING_ADVISORS                                     :Notícias / Conselheiros
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Companhia
+STR_CONFIG_SETTING_COMPANY                                      :Companhia
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Contabilidade
+STR_CONFIG_SETTING_ACCOUNTING                                   :Contabilidade
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Veículos
+STR_CONFIG_SETTING_VEHICLES                                     :Veículos
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Física
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Física
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Rota
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Rota
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Limitações
+STR_CONFIG_SETTING_LIMITATIONS                                  :Limitações
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Desastres / Acidentes
+STR_CONFIG_SETTING_ACCIDENTS                                    :Desastres / Acidentes
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Geração de Mundo
+STR_CONFIG_SETTING_GENWORLD                                     :Geração de Mundo
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Meio-Ambiente
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Meio-Ambiente
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Autoridades
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Autoridades
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE} Cidades
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            : Cidades
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Indústrias
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Indústrias
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Distribuição de Carga
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Distribuição de Carga
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Oponentes
+STR_CONFIG_SETTING_AI                                           :Oponentes
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Computadores
+STR_CONFIG_SETTING_AI_NPC                                       :Computadores
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Rede
+STR_CONFIG_SETTING_NETWORK                                      :Rede
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Pathfinder para trens: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Algorítimo de formulação de vias para trens, que define quais vias tomar
@@ -2081,6 +2083,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}A aloca
 # Video initalization errors
 STR_VIDEO_DRIVER_ERROR                                          :{WHITE}Erro nas configurações de vídeo...
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... nenhuma GPU compatível encontrada. Aceleração de hardware desativada
+STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... O driver gráfico (GPU) interrompeu o jogo. Aceleração por hardware desativada.
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -3760,6 +3763,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Detalhes
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Ver informações detalhadas de infraestrutura
 STR_COMPANY_VIEW_GIVE_MONEY_BUTTON                              :{BLACK}Dar dinheiro
 STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP                             :{BLACK}Dá dinheiro a essa empresa
+STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON                        :{BLACK}Aquisição hostil
+STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP                       :{BLACK}Fazer a aquisição hostil desta empresa
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Novo Rosto
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Selecionar novo rosto para o presidente
@@ -3775,6 +3780,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nome do Preside
 STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION                       :Inserir a quantidade de dinheiro que você quer dar
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {COMPANY} por {CURRENCY_LONG}?
+STR_BUY_COMPANY_HOSTILE_TAKEOVER                                :{WHITE}Na aquisição hostil de {COMPANY} você irá adquirir todos os ativos, liquidar todos os empréstimos e pagar o valor de 2 anos de lucros.{}{}O total estimado é de {CURRENCY_LONG}.{}{}Você quer continuar com esta aquisição hostil?
 
 # Company infrastructure window
 STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}Infraestrutura de {COMPANY}
@@ -3846,6 +3852,7 @@ STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Administ
 STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Envia instruções a todos os veículos desta lista
 STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Substituir veículos
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Enviar para Manutenção
+STR_VEHICLE_LIST_CREATE_GROUP                                   :Criar grupo
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Lucro anual: {CURRENCY_LONG} (último ano: {CURRENCY_LONG})
 STR_VEHICLE_LIST_CARGO                                          :[{CARGO_LIST}]
 STR_VEHICLE_LIST_NAME_AND_CARGO                                 :{STRING} {STRING}
@@ -4568,8 +4575,8 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Esperado
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Agendado
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Trocar entre esperado e agendado
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :C:
+STR_TIMETABLE_ARRIVAL                                           :C: {COLOUR}{DATE_TINY}
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :P:
+STR_TIMETABLE_DEPARTURE                                         :P: {COLOUR}{DATE_TINY}
 
 
 # Date window (for timetable)
@@ -5624,6 +5631,8 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_STRING1                                                :{STRING}
+STR_JUST_STRING2                                                :{STRING}
 STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_BIG_RAW_STRING                                         :{BIG_FONT}{STRING}

src/lang/bulgarian.txt

@@ -890,43 +890,44 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Наст
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Парична единица
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Избор на парична единица
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Британска лира (£)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Британска лира
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Американски долар ($)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Американски долар
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Евро (€)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Евро
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Японска йена (¥)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Японска йена
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :австрийски шилинг (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :австрийски шилинг
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :белгийски франк (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :белгийски франк
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :швейцарски франк (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :швейцарски франк
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :чешка крона (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :чешка крона
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :германска марка (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :германска марка
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :датска крона (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :датска крона
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Испанска песета (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Испанска песета
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :финландска марка (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :финландска марка
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Френски франк (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Френски франк
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :гръцка драхма (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :гръцка драхма
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :унгарски форинт (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :унгарски форинт
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :исландска крона (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :исландска крона
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :италианска лира (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :италианска лира
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :холандски гулден (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :холандски гулден
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :норвежка крона (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :норвежка крона
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Полска злота (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Полска злота
-STR_GAME_OPTIONS_CURRENCY_RON                                   :румънска лея (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :румънска лея
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :руска рубла (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :руска рубла
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :словенски толар (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :словенски толар
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :шведска крона (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :шведска крона
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :турска лира (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :турска лира
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :словашка крона (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :словашка крона
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :бразилски реал (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :бразилски реал
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Естонски крони (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Естонски крони
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Литовски Литас (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Литовски Литас
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Южнокорейски Вон (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Южнокорейски Вон
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Южноафрикански Ранд (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Южноафрикански Ранд
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :друга...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Грузинско лари (ГЕЛ)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Грузинско лари
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Ирански Риал (ИРР)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Ирански Риал
 STR_GAME_OPTIONS_CURRENCY_NTD                                   :Нов тайвански долар
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Хонгконгски долар (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Хонгконгски долар
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Автозаписване
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Интервала между две автозаписваня
@@ -1803,19 +1804,19 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperial (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metric (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Позициониране
+STR_CONFIG_SETTING_LOCALISATION                                 :Позициониране
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Звукови ефекти
+STR_CONFIG_SETTING_SOUND                                        :Звукови ефекти
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Интерфейс
+STR_CONFIG_SETTING_INTERFACE                                    :Интерфейс
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Основни
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Основни
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Строене
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Строене
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Автомобили
+STR_CONFIG_SETTING_VEHICLES                                     :Автомобили
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Маршрутизация
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Маршрутизация
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Ограничения
+STR_CONFIG_SETTING_LIMITATIONS                                  :Ограничения
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Права
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Права
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Градове
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Градове
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Индустрии
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Индустрии
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Съперници
+STR_CONFIG_SETTING_AI                                           :Съперници
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Компютърни играчи
+STR_CONFIG_SETTING_AI_NPC                                       :Компютърни играчи
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Пътенамирач за влакове: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Маршрутизатор използван за влакове
@@ -4025,8 +4026,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}В оч
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Насрочен
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Промени между очакване и разписание
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :П:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :З:
 
 
 # Date window (for timetable)

src/lang/catalan.txt

@@ -952,49 +952,50 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100{NBSP}%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Moneda
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Selecció de la unitat monetària
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Lliura esterlina (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Lliura esterlina
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dòlar americà (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dòlar americà
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Ien japonès (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Ien japonès
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Xíling austríac (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Xíling austríac
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franc belga (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Franc belga
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franc suís (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Franc suís
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Corona txeca (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Corona txeca
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marc alemany (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Marc alemany
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Corona danesa (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Corona danesa
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pesseta espanyola (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pesseta espanyola
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marc finlandès (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Marc finlandès
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc francès (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franc francès
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma grega (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Dracma grega
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florí hongarès (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Florí hongarès
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Corona islandesa (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Corona islandesa
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira italiana (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Lira italiana
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Florí neerlandès (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Florí neerlandès
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Corona noruega (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Corona noruega
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty polonès (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Zloty polonès
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu romanès (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Leu romanès
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruble rus (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruble rus
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar eslovè (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Tolar eslovè
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Corona sueca (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Corona sueca
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira turca (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Lira turca
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Corona eslovaca (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Corona eslovaca
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real brasiler (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Real brasiler
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Corona estoniana (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Corona estoniana
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litas lituà (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litas lituà
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Won sud-coreà (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Won sud-coreà
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Rand sud-africà (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Rand sud-africà
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Personalitzada
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari georgià (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Lari georgià
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial iranià (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Rial iranià
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ruble rus modern (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ruble rus modern
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso mexicà (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Peso mexicà
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nou dòlar taiwanès (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nou dòlar taiwanès
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi xinès (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Renminbi xinès
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dòlar de Hong Kong (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Dòlar de Hong Kong
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Rúpia índia (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Rúpia índia
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupia indonèsia (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Rupia indonèsia
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Ringgit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Desa automàticament
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Selecciona l'interval de desada automàtica de la partida
@@ -2019,30 +2020,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperial (peu)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Mètric (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Localització
+STR_CONFIG_SETTING_LOCALISATION                                 :Localització
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Gràfics
+STR_CONFIG_SETTING_GRAPHICS                                     :Gràfics
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Efectes de so
+STR_CONFIG_SETTING_SOUND                                        :Efectes de so
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interfície
+STR_CONFIG_SETTING_INTERFACE                                    :Interfície
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}General
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :General
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Finestres de visualització
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Finestres de visualització
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Construcció
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Construcció
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Notícies / Consells
+STR_CONFIG_SETTING_ADVISORS                                     :Notícies / Consells
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Companyia
+STR_CONFIG_SETTING_COMPANY                                      :Companyia
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Comptabilitat
+STR_CONFIG_SETTING_ACCOUNTING                                   :Comptabilitat
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Vehicles
+STR_CONFIG_SETTING_VEHICLES                                     :Vehicles
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Lleis físiques
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Lleis físiques
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Recorreguts
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Recorreguts
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Limitacions
+STR_CONFIG_SETTING_LIMITATIONS                                  :Limitacions
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Desastres / Accidents
+STR_CONFIG_SETTING_ACCIDENTS                                    :Desastres / Accidents
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Generació del món
+STR_CONFIG_SETTING_GENWORLD                                     :Generació del món
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Interacció amb l'entorn
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Interacció amb l'entorn
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Autoritats
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Autoritats
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Poblacions
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Poblacions
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Indústries
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Indústries
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Distribució de la càrrega
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Distribució de la càrrega
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Competidors
+STR_CONFIG_SETTING_AI                                           :Competidors
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Jugadors IA
+STR_CONFIG_SETTING_AI_NPC                                       :Jugadors IA
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Xarxa
+STR_CONFIG_SETTING_NETWORK                                      :Xarxa
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Encaminador dels trens: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Algorisme a emprar per a escollir les rutes dels trens
@@ -4568,8 +4569,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Esperat
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Planificat
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Canvia entre esperat i planificat
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
 
 
 # Date window (for timetable)

src/lang/chuvash.txt

@@ -486,6 +486,7 @@ STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Пӗлт
 
 
 
+
 ###length 42
 STR_GAME_OPTIONS_CURRENCY_RUR                                   :Вырӑсла тенкӗ (RUR)
 
@@ -840,11 +841,11 @@ STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :Питӗ хӑв
 
 ###length 3
 
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Интерфейс
+STR_CONFIG_SETTING_INTERFACE                                    :Интерфейс
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Лартӑм
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Лартӑм
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Ҫул-йӗр:
+STR_CONFIG_SETTING_VEHICLES                                     :Ҫул-йӗр:
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Хуласем
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Хуласем
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Ӑмӑртуҫӑсем
+STR_CONFIG_SETTING_AI                                           :Ӑмӑртуҫӑсем
 
 ###length 2
 STR_CONFIG_SETTING_PATHFINDER_NPF                               :NPF

src/lang/croatian.txt

@@ -1007,47 +1007,48 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Postavke
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Novčane jedinice
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Izbor novčanih jedinica
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Funte (£)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Funte
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Američki Dolar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Američki Dolar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanski Jen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanski Jen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrijski šiling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrijski šiling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgijski franak (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgijski franak
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Švicarski franak (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Švicarski franak
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Češka kruna (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Češka kruna
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Njemačka marka (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Njemačka marka
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danska kruna (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danska kruna
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Španjolska Pezeta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Španjolska Pezeta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finska marka (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finska marka
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Francuski Franak (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Francuski Franak
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Grčka drahma (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Grčka drahma
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Mađarski forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Mađarski forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandska kruna (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandska kruna
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Talijanska lira (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Talijanska lira
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nizozemski gulden (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nizozemski gulden
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norveška kruna (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norveška kruna
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poljski Zloti (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poljski Zloti
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumunjski lev (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumunjski lev
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruske rublje (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruske rublje
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenski tolar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenski tolar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Švedska kruna (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Švedska kruna
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turska lira (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turska lira
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovačka kruna (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovačka kruna
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilski real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilski real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonska kruna (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonska kruna
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litvanski Litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litvanski Litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Južnokorejski Won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Južnokorejski Won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Južnoafrički Rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Južnoafrički Rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Proizvoljno...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gruzijski Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gruzijski Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranski Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranski Rial
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nove ruske rublje (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nove ruske rublje
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksički Pesos (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksički Pesos
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Novi Tajvanski Dolar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Novi Tajvanski Dolar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Kineski Renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Kineski Renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkonški Dolar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkonški Dolar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Indijska Rupija (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indijska Rupija
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatsko spremanje
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Odaberi interval između automatskih spremanja igre
@@ -1980,29 +1981,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperijalni (ft
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrički (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Lokalizacija
+STR_CONFIG_SETTING_LOCALISATION                                 :Lokalizacija
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafika
+STR_CONFIG_SETTING_GRAPHICS                                     :Grafika
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Zvučni efekti
+STR_CONFIG_SETTING_SOUND                                        :Zvučni efekti
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Sučelje
+STR_CONFIG_SETTING_INTERFACE                                    :Sučelje
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Opće
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Opće
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Pogledi
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Pogledi
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Izgradnja
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Izgradnja
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Novosti / savjetnici
+STR_CONFIG_SETTING_ADVISORS                                     :Novosti / savjetnici
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Tvrtka
+STR_CONFIG_SETTING_COMPANY                                      :Tvrtka
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Računovodstvo
+STR_CONFIG_SETTING_ACCOUNTING                                   :Računovodstvo
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Vozila
+STR_CONFIG_SETTING_VEHICLES                                     :Vozila
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Fizika
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Fizika
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Rutanje
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Rutanje
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Ograničenja
+STR_CONFIG_SETTING_LIMITATIONS                                  :Ograničenja
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Katastrofe / nesreće
+STR_CONFIG_SETTING_ACCIDENTS                                    :Katastrofe / nesreće
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Stvaranje svijeta
+STR_CONFIG_SETTING_GENWORLD                                     :Stvaranje svijeta
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Okoliš
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Okoliš
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Vlasti
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Vlasti
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Gradovi
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Gradovi
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industrije
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industrije
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Distribucija tereta
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Distribucija tereta
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Suparnici
+STR_CONFIG_SETTING_AI                                           :Suparnici
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Računalni igrači
+STR_CONFIG_SETTING_AI_NPC                                       :Računalni igrači
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Pronalaženje putanje za vlakove: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Pronalazač puteva koji će se koristiti za vlakove
@@ -4375,8 +4376,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Očekiva
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Raspoređeno
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Promijeni između očekivanog i zadanog
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :D:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :O:
 
 
 # Date window (for timetable)

src/lang/czech.txt

@@ -1023,49 +1023,50 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Možnost
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Měna
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Výběr jednotek měny
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Libra
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dolar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japonský jen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japonský jen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Rakouský šilink (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Rakouský šilink
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgický frank (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgický frank
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Švýcarský frank (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Švýcarský frank
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Česká koruna (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Česká koruna
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Německá marka (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Německá marka
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Dánská koruna (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Dánská koruna
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Španělská peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Španělská peseta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finská marka (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finská marka
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Francouzský frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Francouzský frank
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Řecká drachma (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Řecká drachma
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Maďarský forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Maďarský forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandská koruna (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandská koruna
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italská lira (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italská lira
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Holandský gulden (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Holandský gulden
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norská koruna (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norská koruna
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polský zlotý (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polský zlotý
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumunský lei (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumunský lei
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruský rubl (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Ruský rubl
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovinský tolar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovinský tolar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Švédská koruna (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Švédská koruna
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turecká lira (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turecká lira
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovenská koruna (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovenská koruna
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilský real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilský real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonská koruna (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonská koruna
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litevský litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litevský litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Jihokorejský won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Jihokorejský won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Jihoafrický rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Jihoafrický rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Vlastní...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgijské Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgijské Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Íránský Riál (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Íránský Riál
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ruský rubl (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ruský rubl
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexické peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexické peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nový taiwanský dolar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nový taiwanský dolar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Čínský renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Čínský renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkongský dolar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hongkongský dolar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Indická rupie (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indická rupie
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonéská rupie (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonéská rupie
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajsijský Ringgit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajsijský Ringgit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatické ukládání
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Volba intervalu mezi automatickým ukládáním hry
@@ -2072,30 +2073,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperiální (f
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrické (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Překlad
+STR_CONFIG_SETTING_LOCALISATION                                 :Překlad
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafika
+STR_CONFIG_SETTING_GRAPHICS                                     :Grafika
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Zvuk
+STR_CONFIG_SETTING_SOUND                                        :Zvuk
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Ovládaní
+STR_CONFIG_SETTING_INTERFACE                                    :Ovládaní
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Obecné
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Obecné
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Pohledy
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Pohledy
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Výstavba
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Výstavba
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Novinky / Poradci
+STR_CONFIG_SETTING_ADVISORS                                     :Novinky / Poradci
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Společnost
+STR_CONFIG_SETTING_COMPANY                                      :Společnost
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Účetnictví
+STR_CONFIG_SETTING_ACCOUNTING                                   :Účetnictví
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Dopravní prostředky
+STR_CONFIG_SETTING_VEHICLES                                     :Dopravní prostředky
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Fyzika
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Fyzika
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Směrování
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Směrování
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Omezení
+STR_CONFIG_SETTING_LIMITATIONS                                  :Omezení
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Katastrofy / Nehody
+STR_CONFIG_SETTING_ACCIDENTS                                    :Katastrofy / Nehody
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Generování krajiny
+STR_CONFIG_SETTING_GENWORLD                                     :Generování krajiny
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Prostředí
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Prostředí
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Městská správa
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Městská správa
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Města
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Města
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Průmysl
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Průmysl
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Distribuce nákladu
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Distribuce nákladu
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Konkurenti
+STR_CONFIG_SETTING_AI                                           :Konkurenti
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Umělá inteligence
+STR_CONFIG_SETTING_AI_NPC                                       :Umělá inteligence
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Síť
+STR_CONFIG_SETTING_NETWORK                                      :Síť
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Hledač cesty pro vlaky: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Hledač cesty pro vlaky
@@ -4619,8 +4620,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Očekáv
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Plánovaný
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Přepnout mezi očekávaným a plánovaným
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :P:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :O:
 
 
 # Date window (for timetable)

src/lang/danish.txt

@@ -951,49 +951,50 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valutaenhed
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valg af valutaenhed
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britiske Pund (£)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britiske Pund
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikanske dollars ($)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Amerikanske dollars
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanske Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanske Yen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Østrisk Shilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Østrisk Shilling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgiske Franc (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgiske Franc
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sweiziske Franc (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sweiziske Franc
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tjekkiske Koruna (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tjekkiske Koruna
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danske Kroner (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danske Kroner
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanske Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanske Peseta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finske Markka (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finske Markka
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franske Franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franske Franc
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Græske Drachmer (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Græske Drachmer
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ungarnske Forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ungarnske Forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandske Kroner (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandske Kroner
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italienske Lire (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italienske Lire
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Hollandske Guilder (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Hollandske Guilder
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norske Kroner (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norske Kroner
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polske Zloty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polske Zloty
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumænske Lei (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumænske Lei
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russiske Rubel (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russiske Rubel
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenske Tolare (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenske Tolare
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Svenske Kroner (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Svenske Kroner
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Tyrkiske Lira (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Tyrkiske Lira
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakiske Koruna (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakiske Koruna
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasilianske Real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasilianske Real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estiske Kroon (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estiske Kroon
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litauiske Litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litauiske Litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Sydkoreansk Won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Sydkoreansk Won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Sydafrikansk Rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Sydafrikansk Rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Brugerdefineret...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgiske Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgiske Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranske Rialer (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranske Rialer
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ny Russisk Rubel (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ny Russisk Rubel
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksikansk Peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksikansk Peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Ny Taiwan dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Ny Taiwan dollar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Kinesisk Renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Kinesisk Renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Indisk rupi (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indisk rupi
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesisk Rupiah (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesisk Rupiah
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysisk Ringgit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysisk Ringgit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatisk gemning
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vælg interval imellem automatisk gemning
@@ -2018,30 +2019,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperisk (fod)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrisk (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Lokalisering
+STR_CONFIG_SETTING_LOCALISATION                                 :Lokalisering
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafiksæt / Manglende grafik
+STR_CONFIG_SETTING_GRAPHICS                                     :Grafiksæt / Manglende grafik
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Lydeffekter
+STR_CONFIG_SETTING_SOUND                                        :Lydeffekter
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Brugerflade
+STR_CONFIG_SETTING_INTERFACE                                    :Brugerflade
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Generelt
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Generelt
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Viewports
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Viewports
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Konstruktion
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Konstruktion
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Nyheder / Rådgivere
+STR_CONFIG_SETTING_ADVISORS                                     :Nyheder / Rådgivere
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Firma
+STR_CONFIG_SETTING_COMPANY                                      :Firma
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Regnskab
+STR_CONFIG_SETTING_ACCOUNTING                                   :Regnskab
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Køretøjer
+STR_CONFIG_SETTING_VEHICLES                                     :Køretøjer
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Fysik / Tilstand
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Fysik / Tilstand
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Ruteplanlægning
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Ruteplanlægning
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Begrænsninger
+STR_CONFIG_SETTING_LIMITATIONS                                  :Begrænsninger
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Katastrofer / Ulykker
+STR_CONFIG_SETTING_ACCIDENTS                                    :Katastrofer / Ulykker
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Verden generation
+STR_CONFIG_SETTING_GENWORLD                                     :Verden generation
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Miljø
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Miljø
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Myndigheder
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Myndigheder
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Byer
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Byer
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industrier
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industrier
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Fragtdistribution
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Fragtdistribution
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Modstandere
+STR_CONFIG_SETTING_AI                                           :Modstandere
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Computerstyrede spillere
+STR_CONFIG_SETTING_AI_NPC                                       :Computerstyrede spillere
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Netværk
+STR_CONFIG_SETTING_NETWORK                                      :Netværk
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Stifinder til tog: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Stifinder til brug for toge
@@ -3760,6 +3761,7 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Detaljer
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Se detaljerede infrastruktur-tal
 STR_COMPANY_VIEW_GIVE_MONEY_BUTTON                              :{BLACK}Giv penge
 STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP                             :{BLACK}Giv penge til dette selskab
+STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON                        :{BLACK}Fjendtlig overtagelse
 STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP                       :{BLACK}Foretag en fjendtlig overtagelse af dette firma
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nyt ansigt
@@ -3848,6 +3850,7 @@ STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Administ
 STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instruktioner til alle køretøjer i denne liste
 STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Udskift køretøjer
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send til eftersyn
+STR_VEHICLE_LIST_CREATE_GROUP                                   :Opret gruppe
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Afkast i år: {CURRENCY_LONG} (sidste år: {CURRENCY_LONG})
 STR_VEHICLE_LIST_CARGO                                          :[{CARGO_LIST}]
 STR_VEHICLE_LIST_NAME_AND_CARGO                                 :{STRING} {STRING}
@@ -4570,8 +4573,8 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Forvente
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Planlagt
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Skift mellem forventet og tidslagt
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :Ank:
+STR_TIMETABLE_ARRIVAL                                           :A: {COLOUR}{DATE_TINY}
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :Afg:
+STR_TIMETABLE_DEPARTURE                                         :D: {COLOUR}{DATE_TINY}
 
 
 # Date window (for timetable)
@@ -5626,6 +5629,8 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_STRING1                                                :{STRING}
+STR_JUST_STRING2                                                :{STRING}
 STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_BIG_RAW_STRING                                         :{BIG_FONT}{STRING}

src/lang/dutch.txt

@@ -846,7 +846,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE                                 :{BIG_FONT}{BLAC
 STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION                           :{BIG_FONT}{BLACK}{STRING} is gesloten door schuldeisers en alle eigendommen zijn verkocht!
 STR_NEWS_COMPANY_LAUNCH_TITLE                                   :{BIG_FONT}{BLACK}Nieuw transportbedrijf gestart!
 STR_NEWS_COMPANY_LAUNCH_DESCRIPTION                             :{BIG_FONT}{BLACK}{STRING} begint werkzaamheden bij {TOWN}!
-STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLACK}{STRING} is overgenomen door {STRING}!
+STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLACK}{STRING} is overgenomen door {STRING} voor een niet nader bekend gemaakt bedrag!
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Directeur)
 
 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} betaalt bouw van nieuwe stad {TOWN}!
@@ -951,49 +951,50 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuta kiezen
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Britse Pond
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Dollar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanse Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanse Yen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Oostenrijkse Shilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Oostenrijkse Shilling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgische Frank (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgische Frank
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Zwitserse Frank (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Zwitserse Frank
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tsjechische Kroon (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tsjechische Kroon
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Duitse Mark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Duitse Mark
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Deense Kroon (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Deense Kroon
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spaanse Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spaanse Peseta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finse Mark (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finse Mark
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franse Frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Franse Frank
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Griekse Drachme (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Griekse Drachme
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hongaarse Forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hongaarse Forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :IJslandse Kroon (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :IJslandse Kroon
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italiaanse Lire (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italiaanse Lire
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nederlandse Gulden (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nederlandse Gulden
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Noorse Kroon (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Noorse Kroon
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poolse Zloty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poolse Zloty
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Roemeense Leu (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Roemeense Leu
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russische Roebel (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russische Roebel
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Sloveense Tolar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Sloveense Tolar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Zweedse Kroon (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Zweedse Kroon
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkse Lira (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkse Lira
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slowaakse Kroon (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slowaakse Kroon
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Braziliaanse Real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Braziliaanse Real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estse Kroon (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estse Kroon
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litouwse Litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litouwse Litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Zuid-Koreaanse Won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Zuid-Koreaanse Won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Zuid-Afrikaanse Rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Zuid-Afrikaanse Rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Aangepast...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgische Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgische Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iraanse Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iraanse Rial
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nieuwe Russische Roebel (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nieuwe Russische Roebel
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexicaanse peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexicaanse peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nieuwe Taiwanse dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nieuwe Taiwanse dollar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Indiase rupee (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indiase rupee
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesische roepia (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesische roepia
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Maleisische Ringgit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Maleisische Ringgit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automatisch opslaan
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Tijdsduur kiezen tussen automatisch opgeslagen spellen
@@ -1558,7 +1559,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED                :Grijs naar rood
 STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE                  :Grijstinten
 
 STR_CONFIG_SETTING_SCROLLMODE                                   :Verplaatsingsgedrag voor kijkvensters: {STRING}
-STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :Gedrag tijdens het verplaatsen van de kaart
+STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :Gedrag tijdens het verplaatsen van de kaart. De opties over vergrendeling van de muis werken niet op alle systemen, bijv. webversies, aanraakschermen, Linux met Wayland en andere
 ###length 4
 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT                           :Kijkvenster verplaatsen met rechtermuisknop, muispositie vergrendeld
 STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :Kaart verplaatsen met rechtermuisknop, muispositie vergrendeld
@@ -2018,30 +2019,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperiaal (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metrisch (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Lokalisatie
+STR_CONFIG_SETTING_LOCALISATION                                 :Lokalisatie
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafische elementen
+STR_CONFIG_SETTING_GRAPHICS                                     :Grafische elementen
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Geluid
+STR_CONFIG_SETTING_SOUND                                        :Geluid
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Gebruikersscherm
+STR_CONFIG_SETTING_INTERFACE                                    :Gebruikersscherm
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Algemeen
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Algemeen
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Kijkvensters
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Kijkvensters
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Constructie
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Constructie
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Nieuws/adviseurs
+STR_CONFIG_SETTING_ADVISORS                                     :Nieuws/adviseurs
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Bedrijf
+STR_CONFIG_SETTING_COMPANY                                      :Bedrijf
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Boekhouding
+STR_CONFIG_SETTING_ACCOUNTING                                   :Boekhouding
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Voertuigen
+STR_CONFIG_SETTING_VEHICLES                                     :Voertuigen
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Natuurkundige eigenschappen
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Natuurkundige eigenschappen
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Routebepaling
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routebepaling
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Beperkingen
+STR_CONFIG_SETTING_LIMITATIONS                                  :Beperkingen
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Rampen/ongelukken
+STR_CONFIG_SETTING_ACCIDENTS                                    :Rampen/ongelukken
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Wereldontwikkeling
+STR_CONFIG_SETTING_GENWORLD                                     :Wereldontwikkeling
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Omgeving
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Omgeving
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Autoriteiten
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Autoriteiten
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Steden
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Steden
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industrieën
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industrieën
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Vrachtdistributie
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Vrachtdistributie
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Tegenstanders
+STR_CONFIG_SETTING_AI                                           :Tegenstanders
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Computerspelers
+STR_CONFIG_SETTING_AI_NPC                                       :Computerspelers
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Netwerk
+STR_CONFIG_SETTING_NETWORK                                      :Netwerk
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Routezoeker voor treinen: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Routezoeker voor treinen.
@@ -2080,6 +2081,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG                            :{WHITE}Toewijze
 # Video initalization errors
 STR_VIDEO_DRIVER_ERROR                                          :{WHITE}Fout met video-instellingen...
 STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION                 :{WHITE}... geen compatibele GPU gevonden. Hardwareversnelling is uitgeschakeld
+STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH              :{WHITE}... Spel is vastgelopen door het GPU-stuurprogramma. Hardwareversnelling wordt uitgeschakeld
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -3759,6 +3761,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Details
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Gedetailleerde aantallen infrastructuur bekijken
 STR_COMPANY_VIEW_GIVE_MONEY_BUTTON                              :{BLACK}Geld geven
 STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP                             :{BLACK}Geld geven aan dit bedrijf
+STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON                        :{BLACK}Vijandige overname
+STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP                       :{BLACK}Een vijandige overname van dit bedrijf uitvoeren
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nieuw gezicht
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Nieuw gezicht voor directeur kiezen
@@ -3774,6 +3778,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Naam van direct
 STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION                       :Voer het bedrag in om weg te geven
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}We zoeken een transportbedrijf dat ons bedrijf over kan nemen.{}{}Wil je {COMPANY} kopen voor {CURRENCY_LONG}?
+STR_BUY_COMPANY_HOSTILE_TAKEOVER                                :{WHITE}Bij een vijandige overname van {COMPANY} neem je alle bezittingen over, betaal je alle leningen terug en betaal je twee jaar winst.{}{}Het totaal wordt geschat op {CURRENCY_LONG}.{}{}Wil je doorgaan met de vijandige overname?
 
 # Company infrastructure window
 STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}Infrastructuur van {COMPANY}
@@ -3845,6 +3850,7 @@ STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Lijst be
 STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Stuur instructies naar alle voertuigen in de lijst
 STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vervang voertuigen
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Stuur voor onderhoud
+STR_VEHICLE_LIST_CREATE_GROUP                                   :Groep maken
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Winst dit jaar: {CURRENCY_LONG} (vorig jaar: {CURRENCY_LONG})
 STR_VEHICLE_LIST_CARGO                                          :[{CARGO_LIST}]
 STR_VEHICLE_LIST_NAME_AND_CARGO                                 :{STRING} {STRING}
@@ -4567,8 +4573,8 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Verwacht
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Volgens dienstregeling
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Wissel tussen verwacht en volgens dienstregeling
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_ARRIVAL                                           :A: {COLOUR}{DATE_TINY}
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :V:
+STR_TIMETABLE_DEPARTURE                                         :D: {COLOUR}{DATE_TINY}
 
 
 # Date window (for timetable)
@@ -5623,6 +5629,8 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_STRING1                                                :{STRING}
+STR_JUST_STRING2                                                :{STRING}
 STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_BIG_RAW_STRING                                         :{BIG_FONT}{STRING}

src/lang/english.txt

@@ -951,49 +951,51 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency units
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection
 
+STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({RAW_STRING})
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound
-STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanese Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanese Yen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Rubles (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Rubles
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Swedish Krona (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Swedish Krona
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkish Lira (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkish Lira
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovak Koruna (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovak Koruna
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilian Real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilian Real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonian Krooni (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonian Krooni
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lithuanian Litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lithuanian Litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :South Korean Won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :South Korean Won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African Rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African Rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Custom...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :New Russian Ruble (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :New Russian Ruble
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexican Peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexican Peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :New Taiwan Dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :New Taiwan Dollar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Indian Rupee (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indian Rupee
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesian Rupiah (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesian Rupiah
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysian Ringgit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysian Ringgit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosave
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Select interval between automatic game saves
@@ -2018,30 +2020,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperial (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metric (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Localisation
+STR_CONFIG_SETTING_LOCALISATION                                 :Localisation
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Graphics
+STR_CONFIG_SETTING_GRAPHICS                                     :Graphics
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Sound
+STR_CONFIG_SETTING_SOUND                                        :Sound
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interface
+STR_CONFIG_SETTING_INTERFACE                                    :Interface
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}General
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :General
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Viewports
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Viewports
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Construction
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Construction
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}News / Advisors
+STR_CONFIG_SETTING_ADVISORS                                     :News / Advisors
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Company
+STR_CONFIG_SETTING_COMPANY                                      :Company
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Accounting
+STR_CONFIG_SETTING_ACCOUNTING                                   :Accounting
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Vehicles
+STR_CONFIG_SETTING_VEHICLES                                     :Vehicles
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Physics
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Physics
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Routing
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routing
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Limitations
+STR_CONFIG_SETTING_LIMITATIONS                                  :Limitations
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Disasters / Accidents
+STR_CONFIG_SETTING_ACCIDENTS                                    :Disasters / Accidents
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}World generation
+STR_CONFIG_SETTING_GENWORLD                                     :World generation
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Environment
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Environment
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Authorities
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Authorities
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Towns
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Towns
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industries
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industries
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Cargo distribution
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Cargo distribution
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Competitors
+STR_CONFIG_SETTING_AI                                           :Competitors
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Computer players
+STR_CONFIG_SETTING_AI_NPC                                       :Computer players
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Network
+STR_CONFIG_SETTING_NETWORK                                      :Network
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Pathfinder for trains: {STRING2}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Path finder to use for trains
@@ -3849,6 +3851,7 @@ STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Manage l
 STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instructions to all vehicles in this list
 STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Replace vehicles
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send for Servicing
+STR_VEHICLE_LIST_CREATE_GROUP                                   :Create group
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Profit this year: {CURRENCY_LONG} (last year: {CURRENCY_LONG})
 STR_VEHICLE_LIST_CARGO                                          :[{CARGO_LIST}]
 STR_VEHICLE_LIST_NAME_AND_CARGO                                 :{STRING1} {STRING1}
@@ -4571,8 +4574,8 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Expected
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Scheduled
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Switch between expected and scheduled
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_ARRIVAL                                           :A: {COLOUR}{DATE_TINY}
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+STR_TIMETABLE_DEPARTURE                                         :D: {COLOUR}{DATE_TINY}
 
 
 # Date window (for timetable)
@@ -5627,6 +5630,8 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_STRING1                                                :{STRING1}
+STR_JUST_STRING2                                                :{STRING2}
 STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{RAW_STRING}
 STR_JUST_BIG_RAW_STRING                                         :{BIG_FONT}{RAW_STRING}

src/lang/english_AU.txt

@@ -951,49 +951,51 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency units
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection
 
+STR_GAME_OPTIONS_CURRENCY_CODE                                  :{STRING} ({STRING})
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound
-STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanese Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanese Yen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Rubles (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Rubles
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Swedish Krona (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Swedish Krona
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkish Lira (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkish Lira
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovak Koruna (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovak Koruna
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilian Real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilian Real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonian Krooni (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonian Krooni
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lithuanian Litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lithuanian Litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :South Korean Won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :South Korean Won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African Rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African Rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Custom...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :New Russian Ruble (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :New Russian Ruble
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexican Peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexican Peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :New Taiwan Dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :New Taiwan Dollar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Indian Rupee (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indian Rupee
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesian Rupiah (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesian Rupiah
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysian Ringgit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysian Ringgit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosave
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Select interval between automatic game saves
@@ -2018,30 +2020,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperial (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metric (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Localisation
+STR_CONFIG_SETTING_LOCALISATION                                 :Localisation
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Graphics
+STR_CONFIG_SETTING_GRAPHICS                                     :Graphics
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Sound
+STR_CONFIG_SETTING_SOUND                                        :Sound
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interface
+STR_CONFIG_SETTING_INTERFACE                                    :Interface
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}General
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :General
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Viewports
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Viewports
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Construction
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Construction
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}News / Advisors
+STR_CONFIG_SETTING_ADVISORS                                     :News / Advisors
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Company
+STR_CONFIG_SETTING_COMPANY                                      :Company
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Accounting
+STR_CONFIG_SETTING_ACCOUNTING                                   :Accounting
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Vehicles
+STR_CONFIG_SETTING_VEHICLES                                     :Vehicles
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Physics
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Physics
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Routing
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routing
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Limitations
+STR_CONFIG_SETTING_LIMITATIONS                                  :Limitations
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Disasters / Accidents
+STR_CONFIG_SETTING_ACCIDENTS                                    :Disasters / Accidents
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}World generation
+STR_CONFIG_SETTING_GENWORLD                                     :World generation
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Environment
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Environment
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Authorities
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Authorities
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Towns
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Towns
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industries
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industries
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Cargo distribution
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Cargo distribution
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Competitors
+STR_CONFIG_SETTING_AI                                           :Competitors
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Computer players
+STR_CONFIG_SETTING_AI_NPC                                       :Computer players
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Network
+STR_CONFIG_SETTING_NETWORK                                      :Network
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Pathfinder for trains: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Path finder to use for trains
@@ -3849,6 +3851,7 @@ STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Manage l
 STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instructions to all vehicles in this list
 STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Replace vehicles
 STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send for Servicing
+STR_VEHICLE_LIST_CREATE_GROUP                                   :Create group
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Profit this year: {CURRENCY_LONG} (last year: {CURRENCY_LONG})
 STR_VEHICLE_LIST_CARGO                                          :[{CARGO_LIST}]
 STR_VEHICLE_LIST_NAME_AND_CARGO                                 :{STRING} {STRING}
@@ -4571,8 +4574,8 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Expected
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Scheduled
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Switch between expected and scheduled
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_ARRIVAL                                           :A: {COLOUR}{DATE_TINY}
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+STR_TIMETABLE_DEPARTURE                                         :D: {COLOUR}{DATE_TINY}
 
 
 # Date window (for timetable)
@@ -5627,6 +5630,8 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_STRING1                                                :{STRING}
+STR_JUST_STRING2                                                :{STRING}
 STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_BIG_RAW_STRING                                         :{BIG_FONT}{STRING}

src/lang/english_US.txt

@@ -951,49 +951,50 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Currency units
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Currency units selection
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :British Pound
-STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :American Dollar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanese Yen (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Japanese Yen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austrian Shilling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgian Franc
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Swiss Franc
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Czech Koruna
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Deutschmark
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danish Krone
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Spanish Peseta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnish Markka
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :French Franc
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Greek Drachma
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungarian Forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Icelandic Krona
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italian Lira
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Ruble (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Ruble
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Swedish Krona (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Swedish Krona
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkish Lira (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkish Lira
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovak Koruna (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovak Koruna
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilian Real (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilian Real
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonian Krooni (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estonian Krooni
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lithuanian Litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Lithuanian Litas
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :South Korean Won (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :South Korean Won
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African Rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African Rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Custom...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :New Russian Ruble (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :New Russian Ruble
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexican Peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexican Peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :New Taiwan Dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :New Taiwan Dollar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Chinese Renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kong Dollar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Indian Rupee (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Indian Rupee
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesian Rupiah (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonesian Rupiah
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysian Ringgit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaysian Ringgit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Autosave
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Select interval between automatic game saves
@@ -2018,30 +2019,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Imperial (ft)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metric (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Localization
+STR_CONFIG_SETTING_LOCALISATION                                 :Localization
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Graphics
+STR_CONFIG_SETTING_GRAPHICS                                     :Graphics
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Sound
+STR_CONFIG_SETTING_SOUND                                        :Sound
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interface
+STR_CONFIG_SETTING_INTERFACE                                    :Interface
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}General
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :General
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Viewports
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Viewports
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Construction
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Construction
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}News / Advisors
+STR_CONFIG_SETTING_ADVISORS                                     :News / Advisors
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Company
+STR_CONFIG_SETTING_COMPANY                                      :Company
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Accounting
+STR_CONFIG_SETTING_ACCOUNTING                                   :Accounting
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Vehicles
+STR_CONFIG_SETTING_VEHICLES                                     :Vehicles
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Physics
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Physics
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Routing
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Routing
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Limitations
+STR_CONFIG_SETTING_LIMITATIONS                                  :Limitations
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Disasters / Accidents
+STR_CONFIG_SETTING_ACCIDENTS                                    :Disasters / Accidents
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}World generation
+STR_CONFIG_SETTING_GENWORLD                                     :World generation
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Environment
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Environment
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Authorities
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Authorities
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Towns
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Towns
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industries
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industries
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Cargo distribution
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Cargo distribution
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Competitors
+STR_CONFIG_SETTING_AI                                           :Competitors
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Computer players
+STR_CONFIG_SETTING_AI_NPC                                       :Computer players
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Network
+STR_CONFIG_SETTING_NETWORK                                      :Network
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Pathfinder for trains: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Path finder to use for trains
@@ -4567,8 +4568,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Expected
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Scheduled
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Switch between expected and scheduled
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
 
 
 # Date window (for timetable)

src/lang/esperanto.txt

@@ -585,7 +585,7 @@ STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Forigu ĉiujn m
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Landkvadrataj informoj
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Baskuligi Konzolon
-STR_ABOUT_MENU_AI_DEBUG                                         :AI/Ludo skripto sencimigo
+STR_ABOUT_MENU_AI_DEBUG                                         :AI/Ludoskripta sencimigo
 STR_ABOUT_MENU_SCREENSHOT                                       :Ekranfoto
 STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Montru bildrapidon
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Pri 'OpenTTD'
@@ -1015,6 +1015,7 @@ STR_GAME_OPTIONS_TAB_SOUND                                      :Sono
 STR_GAME_OPTIONS_TAB_SOUND_TT                                   :{BLACK}Elektu agordojn pri sono kaj muziko
 
 STR_GAME_OPTIONS_VOLUME                                         :Laŭteco
+STR_GAME_OPTIONS_SFX_VOLUME                                     :Sonefektoj
 STR_GAME_OPTIONS_MUSIC_VOLUME                                   :Muziko
 
 STR_GAME_OPTIONS_VOLUME_0                                       :0%
@@ -1026,49 +1027,50 @@ STR_GAME_OPTIONS_VOLUME_100                                     :100%
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Monunuoj
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Elekto de monunuoj
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Brita Pundo (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Brita Pundo
-STR_GAME_OPTIONS_CURRENCY_USD                                   :Usona Dolaro (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :Usona Dolaro
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eŭro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Eŭro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Enoj (JPY)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Enoj
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Aŭstriaj Ŝilingoj (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Aŭstriaj Ŝilingoj
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgaj Frankoj (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgaj Frankoj
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Svisaj Frankoj (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Svisaj Frankoj
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Ĉeĥaj Korunoj (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Ĉeĥaj Korunoj
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Germanaj Markoj (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Germanaj Markoj
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danaj Kronoj (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Danaj Kronoj
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pesetoj (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Pesetoj
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnaj Markoj (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Finnaj Markoj
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frankoj (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Frankoj
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Grekaj Draĥmoj (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Grekaj Draĥmoj
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungaraj Forintoj (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Hungaraj Forintoj
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandaj Kronoj (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandaj Kronoj
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italaj Liroj (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Italaj Liroj
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nederlandaj Guldenoj (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Nederlandaj Guldenoj
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norvegaj Kronoj (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norvegaj Kronoj
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polaj Zlotoj (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polaj Zlotoj
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumanaj Leŭoj (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumanaj Leŭoj
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rusaj Rubloj (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Rusaj Rubloj
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenaj Tolaroj (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenaj Tolaroj
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Svedaj Kronoj (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Svedaj Kronoj
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkaj Liroj (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkaj Liroj
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakaj Korunoj (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakaj Korunoj
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilaj Realoj (BRL)
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brazilaj Realoj
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estona Krono (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estona Krono
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litova lido (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litova lido
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Sud-korea ŭono (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Sud-korea ŭono
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Sudafrika rando (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Sudafrika rando
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Alia...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Kartvela Lario (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Kartvela Lario
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Irana Rialo (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Irana Rialo
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nova rusia rublo (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Nova rusia rublo
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksika peso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksika peso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nova tajvana dolaro (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Nova tajvana dolaro
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Ĉina juano (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Ĉina juano
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Honkonga dolaro (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Honkonga dolaro
-STR_GAME_OPTIONS_CURRENCY_INR                                   :Barata rupio (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :Barata rupio
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonezia rupio (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indonezia rupio
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajzia ringito (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malajzia ringito
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Aŭtomata konservado
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Elektu intervalon inter aŭtomataj konservadoj de la ludo
@@ -1097,6 +1099,7 @@ STR_GAME_OPTIONS_VIDEO_ACCELERATION                             :{BLACK}Aparatar
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP                     :{BLACK}Elektu tiun ĉi agordon por ke OpenTTD klopodu uzi aparataran akceladon. Se vi ŝanĝas tiun ĉi agordon, la nova agordo validos nur ekde restartigo de la ludo
 STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART                     :{WHITE}Tiu ĉi agordo ekefikos nur post restartigo de la ludo
 
+STR_GAME_OPTIONS_VIDEO_VSYNC                                    :{BLACK}Vertikala sinkronigo
 
 STR_GAME_OPTIONS_VIDEO_DRIVER_INFO                              :{BLACK}Nuna pelilo: {STRING}
 
@@ -1119,8 +1122,10 @@ STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP             :{BLACK}Montru l
 
 STR_GAME_OPTIONS_GRAPHICS                                       :{BLACK}Grafiko
 
+STR_GAME_OPTIONS_REFRESH_RATE                                   :{BLACK}Montru aktualigoftecon
 STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP                           :{BLACK}Elektu ekranan aktualigoftecon
 STR_GAME_OPTIONS_REFRESH_RATE_ITEM                              :{NUM}Hz
+STR_GAME_OPTIONS_REFRESH_RATE_WARNING                           :{WHITE}Aktualigoftecoj pli altaj ol 60Hz povas kaŭzi malrapidiĝon.
 
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Baza grafikaro
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektu la uzendan bazgrafikaron
@@ -1311,6 +1316,7 @@ STR_CONFIG_SETTING_RUNNING_COSTS                                :Irkostoj: {STRI
 STR_CONFIG_SETTING_RUNNING_COSTS_HELPTEXT                       :Ŝanĝu nivelon de bontenkostoj kaj irkostoj de veturiloj kaj infrastrukturo
 
 STR_CONFIG_SETTING_CONSTRUCTION_SPEED                           :Konstrurapido: {STRING}
+STR_CONFIG_SETTING_CONSTRUCTION_SPEED_HELPTEXT                  :Limigu la kvanton de konstruaj agoj por AIoj
 
 STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS                           :Veturilpaneoj: {STRING}
 STR_CONFIG_SETTING_VEHICLE_BREAKDOWNS_HELPTEXT                  :Regu kiom ofte povas panei maladekvate prizorgataj veturiloj
@@ -1352,6 +1358,7 @@ STR_CONFIG_SETTING_AUTOSLOPE_HELPTEXT                           :Permesu terenŝ
 STR_CONFIG_SETTING_CATCHMENT                                    :Permesu pli realismajn grandecojn de servataj areoj: {STRING}
 STR_CONFIG_SETTING_CATCHMENT_HELPTEXT                           :Diversaj tipoj de stacioj kaj flughavenoj havas diversgrandajn servatajn areojn
 
+STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES                     :Kompaniaj stacioj povas servi fabrikojn kun alkroĉitaj neŭtralaj stacioj: {STRING}
 STR_CONFIG_SETTING_SERVE_NEUTRAL_INDUSTRIES_HELPTEXT            :Kiam tiu ĉi agordo estas aktiva, fabrikoj kun alkroĉitaj stacioj (ekzemple oleplatformoj) povas ankaŭ esti servataj de apudaj stacioj konstruitaj de kompanioj. Kiam tiu ĉi agordo estas malaktiva, tiaj ĉi fabrikoj serveblas nur per siaj alkroĉitaj stacioj. Apudaj stacioj konstruitaj de kompanioj ne povos servi ilin, kaj la alkroĉita stacio ankaŭ ne servos ion alian ol la fabrikon mem
 
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :Permesu forigon de pli da urbaj stratoj, pontoj ktp: {STRING}
@@ -1767,6 +1774,7 @@ STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :Malebligu ŝipo
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS_HELPTEXT                     :Se tiu ĉi agordo estas aktiva, komputila ludanto ne povas konstrui ŝipojn
 
 STR_CONFIG_SETTING_AI_PROFILE                                   :Defaŭlta agorda profilo: {STRING}
+STR_CONFIG_SETTING_AI_PROFILE_HELPTEXT                          :Elektu kiun agordaron uzi por hazardaj AIoj aŭ por komencaj valoroj dum aldonado de nova AI aŭ ludoskripto
 ###length 3
 STR_CONFIG_SETTING_AI_PROFILE_EASY                              :Facila
 STR_CONFIG_SETTING_AI_PROFILE_MEDIUM                            :Mezfacila
@@ -2045,30 +2053,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Angla-usona sis
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Metra (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI-unuoj (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Loka adaptado
+STR_CONFIG_SETTING_LOCALISATION                                 :Loka adaptado
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafiko
+STR_CONFIG_SETTING_GRAPHICS                                     :Grafiko
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Sonefektoj
+STR_CONFIG_SETTING_SOUND                                        :Sonefektoj
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Interfaco
+STR_CONFIG_SETTING_INTERFACE                                    :Interfaco
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Ĝenerale
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Ĝenerale
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Vidujoj
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Vidujoj
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Konstruado
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Konstruado
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Novaĵoj / Konsilantoj
+STR_CONFIG_SETTING_ADVISORS                                     :Novaĵoj / Konsilantoj
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Kompanio
+STR_CONFIG_SETTING_COMPANY                                      :Kompanio
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Librotenado
+STR_CONFIG_SETTING_ACCOUNTING                                   :Librotenado
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Veturiloj
+STR_CONFIG_SETTING_VEHICLES                                     :Veturiloj
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Fiziko
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Fiziko
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Navigado
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Navigado
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Limigoj
+STR_CONFIG_SETTING_LIMITATIONS                                  :Limigoj
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Katastrofoj / akcidentoj
+STR_CONFIG_SETTING_ACCIDENTS                                    :Katastrofoj / akcidentoj
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Mondgenerado
+STR_CONFIG_SETTING_GENWORLD                                     :Mondgenerado
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Medio
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Medio
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Lokaj estroj
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Lokaj estroj
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Urboj
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Urboj
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Industrioj
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Industrioj
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Ŝarĝodistribuado
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Ŝarĝodistribuado
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Konkurantoj
+STR_CONFIG_SETTING_AI                                           :Konkurantoj
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Komputil-ludantoj
+STR_CONFIG_SETTING_AI_NPC                                       :Komputil-ludantoj
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Reto
+STR_CONFIG_SETTING_NETWORK                                      :Reto
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Padtrovilo por trajnoj: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :Padtrovilo por stratveturiloj: {STRING}
@@ -2391,6 +2399,7 @@ STR_NETWORK_CLIENT_LIST_PLAYER_NAME                             :{BLACK}Nomo
 STR_NETWORK_CLIENT_LIST_PLAYER_NAME_TOOLTIP                     :{BLACK}Via ludantnomo
 STR_NETWORK_CLIENT_LIST_PLAYER_NAME_EDIT_TOOLTIP                :{BLACK}Ŝanĝu vian ludantonomon
 STR_NETWORK_CLIENT_LIST_PLAYER_NAME_QUERY_CAPTION               :Via ludantnomo
+STR_NETWORK_CLIENT_LIST_ADMIN_CLIENT_TOOLTIP                    :{BLACK}Administraj agoj fareblaj por tiu ĉi kliento
 STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP                   :{BLACK}Administraj agoj fareblaj por tiu ĉi kompanio
 STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP                            :{BLACK}Aliĝu al tiu ĉi kompanio
 STR_NETWORK_CLIENT_LIST_CHAT_CLIENT_TOOLTIP                     :{BLACK}Sendu mesaĝon al tiu ĉi ludanto
@@ -3077,6 +3086,12 @@ STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD
 # Framerate display window
 STR_FRAMERATE_CAPTION                                           :{WHITE}Bildrapido
 STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Rapido de simulado: {STRING}
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Nombro de tempopulsoj simulataj ĉiusekunde.
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}Grafika bildrapido: {STRING}
+STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}Nombro de bildokadroj montrataj ĉiusekunde.
+STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Nuna ludrapideca faktoro: {DECIMAL}x
+STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Kiom rapide la ludo nun iras, kompare al la atendata rapideco je normala simuladrapido.
 STR_FRAMERATE_CURRENT                                           :{WHITE}Nuna
 STR_FRAMERATE_AVERAGE                                           :{WHITE}Averaĝa
 STR_FRAMERATE_MEMORYUSE                                         :{WHITE}Memory
@@ -3092,21 +3107,36 @@ STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COM
 STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 
 ###length 15
+STR_FRAMERATE_GAMELOOP                                          :{BLACK}Luda iteracio ensume:
 STR_FRAMERATE_GL_ECONOMY                                        :{BLACK} Traktado de ŝarĝoj:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  Trajnaj tempopulsoj:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  Stratveturilaj tempopulsoj:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Ŝipaj tempopulsoj:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}  Aviadilaj tempopulsoj:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK}  Mondaj tempopulsoj:
 STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK} Ligografea prokrasto:
 STR_FRAMERATE_DRAWING                                           :{BLACK}Grafika bildigo:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Mondaj vidujoj:
 STR_FRAMERATE_VIDEO                                             :{BLACK}Videa eligo:
 STR_FRAMERATE_SOUND                                             :{BLACK}Sonmiksado:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Ludoskriptoj/AI ensume:
 STR_FRAMERATE_GAMESCRIPT                                        :{BLACK} Ludoskripto:
 STR_FRAMERATE_AI                                                :{BLACK}   AI {NUM} {STRING}
 
 ###length 15
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Luda iteracio
 STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Traktado de ŝarĝoj
+STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Trajnaj tempopulsoj
+STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Stratveturilaj tempopulsoj
+STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Ŝipaj tempopulsoj
+STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Aviadilaj tempopulsoj
+STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :Mondaj tempopulsoj
 STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              :Ligografea prokrasto
 STR_FRAMETIME_CAPTION_DRAWING                                   :Grafika bildigo
+STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Bildigo de mondaj vidujoj
 STR_FRAMETIME_CAPTION_VIDEO                                     :Videa eligo
 STR_FRAMETIME_CAPTION_SOUND                                     :Sonmiksado
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Ludoskriptoj/AIoj ensume
 STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Ludoskripto
 STR_FRAMETIME_CAPTION_AI                                        :AI {NUM} {STRING}
 
@@ -3333,6 +3363,8 @@ STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Movadi l
 
 STR_SPRITE_ALIGNER_CROSSHAIR                                    :{BLACK}Celkruco
 
+STR_SPRITE_ALIGNER_RESET_TOOLTIP                                :{BLACK}Restarigu la nunajn relativajn deŝovojn
+STR_SPRITE_ALIGNER_OFFSETS_REL                                  :{BLACK}X-deŝovo: {NUM}, Y-deŝovo: {NUM} (Relativa)
 STR_SPRITE_ALIGNER_PICKER_BUTTON                                :{BLACK}Elektu bildeto
 STR_SPRITE_ALIGNER_PICKER_TOOLTIP                               :{BLACK}Elektu bildeton ie el la ekrano
 
@@ -3491,6 +3523,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{PUSH_COLOUR}{Y
 STR_GOALS_CAPTION                                               :{WHITE}Celoj de {COMPANY}
 STR_GOALS_COMPANY_BUTTON                                        :{BLACK}Kompanio
 STR_GOALS_COMPANY_BUTTON.n                                      :{BLACK}Kompanion
+STR_GOALS_COMPANY_BUTTON_HELPTEXT                               :{BLACK}Montru celojn de la kompanio
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Nenia -
 STR_GOALS_PROGRESS                                              :{ORANGE}{STRING}
@@ -3564,7 +3597,10 @@ STR_STATION_VIEW_SUPPLY_RATINGS_TITLE                           :{BLACK}Ĉiumona
 STR_STATION_VIEW_CARGO_SUPPLY_RATING                            :{WHITE}{STRING}: {YELLOW}{COMMA} / {STRING} ({COMMA}%)
 
 STR_STATION_VIEW_GROUP                                          :{BLACK}Grupigu laŭ
+STR_STATION_VIEW_WAITING_STATION                                :Stacio: Atendanta
+STR_STATION_VIEW_WAITING_AMOUNT                                 :Kvanto: Atendanta
 STR_STATION_VIEW_PLANNED_STATION                                :Stacio: Planata
+STR_STATION_VIEW_PLANNED_AMOUNT                                 :Kvanto: Planita
 STR_STATION_VIEW_FROM                                           :{YELLOW}{CARGO_SHORT} de {STATION}
 STR_STATION_VIEW_VIA                                            :{YELLOW}{CARGO_SHORT} tra {STATION}
 STR_STATION_VIEW_TO                                             :{YELLOW}{CARGO_SHORT} al {STATION}
@@ -4334,6 +4370,7 @@ STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Resta vivo (jar
 STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Maksimuma fidindeco
 ###next-name-looks-similar
 
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Kiel kompari la veturilajn datumoj al la donita valoro
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :egalas al
 STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :ne egalas al
 STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :estas malpli ol
@@ -4472,6 +4509,7 @@ STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ŝanĝu
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ŝanĝu kiom da tempo devus postuli la markita ordono. Stir+Klak ŝanĝas la tempon por ĉiuj ordonoj
 
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Vakigi tempon
+STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Forviŝu la tempokvanton por la markita ordono. Ctrl+Klak forviŝas tempokvantojn por ĉiuj ordonoj
 
 STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Ŝanĝu rapideclimon
 STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Ŝanĝu la maksimuman veturrapidecon de la markita ordono. Stir+Klak ŝanĝas la rapidecon por ĉiuj ordonoj
@@ -4483,13 +4521,14 @@ STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reigu ma
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reigu malfruan kalkulumon, tiel la veturilon estos akuratan
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Aŭtomata plenigo
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Aŭtomate plenigu la horaron per la valoroj de la sekva iro. Ctrl+Klak por klopodi konservi atendodaŭrojn
 
 STR_TIMETABLE_EXPECTED                                          :{BLACK}Atendite
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Planite
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Ŝalti inter atendite kaj planite
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_ARRIVAL                                           :A: {COLOUR}{DATE_TINY}
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :F:
+STR_TIMETABLE_DEPARTURE                                         :E: {COLOUR}{DATE_TINY}
 
 
 # Date window (for timetable)
@@ -4502,7 +4541,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Elekti j
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}AI/Ludo Skripto Sencimigo
+STR_AI_DEBUG                                                    :{WHITE}AI/Ludoskripta Sencimigo
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nomo de la skripto
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Agordoj
@@ -4520,11 +4559,14 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Vidu for
 STR_AI_GAME_SCRIPT                                              :{BLACK}Ludoskripto
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Kontrolu la ludoskriptan protokolon
 
+STR_ERROR_AI_NO_AI_FOUND                                        :Neniu taŭga AI estas ŝarĝebla.{}Tiu ĉi AI estas lokokupa AI kiu nenion faros.{}Vi povas elŝuti pliajn AIojn per la 'Enreta Enhavo'-sistemo
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Unu el la rulantaj skriptoj paneis. Bonvolu raporti tion ĉi al la aŭtoro de la skripto kun ekrankapto de la fenestro 'AI/Ludoskripta Sencimigo'
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION_AI                                        :{WHITE}AI-agordoj
 STR_AI_CONFIG_CAPTION_GAMESCRIPT                                :{WHITE}Ludoskriptaj agordoj
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Ludoskripto ŝarĝota en la sekva ludo
+STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}La AIoj ŝarĝotaj en la sekva ludo
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Homa ludanto
 STR_AI_CONFIG_RANDOM_AI                                         :Hazarda AI
 STR_AI_CONFIG_NONE                                              :(neniu)
@@ -4541,12 +4583,14 @@ STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Ludoskr
 STR_AI_CONFIG_GAMESCRIPT_PARAM                                  :{SILVER}Parametroj
 STR_AI_CONFIG_AI                                                :{SILVER}AIj
 
+STR_AI_CONFIG_CHANGE_AI                                         :{BLACK}Elektu AIon
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :{BLACK}Elektu ludoskripton
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Ŝarĝu alian skripton. Stir+Klak por montri ĉiujn haveblajn versiojn
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Agordi
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Agordi parametroj de la skripto
 
 # Available AIs window
+STR_AI_LIST_CAPTION                                             :{WHITE}Haveblaj {STRING}
 STR_AI_LIST_CAPTION_AI                                          :AIoj
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Ludoskriptoj
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Klaki por elekti skripto
@@ -5530,6 +5574,10 @@ STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
 STR_JUST_DATE_LONG                                              :{DATE_LONG}
 STR_JUST_DATE_ISO                                               :{DATE_ISO}
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_STRING1                                                :{STRING}
+STR_JUST_STRING1.n                                              :{STRING.n}
+STR_JUST_STRING2                                                :{STRING}
+STR_JUST_STRING2.n                                              :{STRING.n}
 STR_JUST_STRING_STRING                                          :{STRING}{STRING}
 STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_BIG_RAW_STRING                                         :{BIG_FONT}{STRING}

src/lang/estonian.txt

@@ -993,49 +993,50 @@ STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Liidese
 STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME                           :{BLACK}Valuuta
 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP                :{BLACK}Valuuta valimine
 
+
 ###length 42
-STR_GAME_OPTIONS_CURRENCY_GBP                                   :Suurbritannia nael (GBP)
+STR_GAME_OPTIONS_CURRENCY_GBP                                   :Suurbritannia nael
-STR_GAME_OPTIONS_CURRENCY_USD                                   :USA dollar (USD)
+STR_GAME_OPTIONS_CURRENCY_USD                                   :USA dollar
-STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro (EUR)
+STR_GAME_OPTIONS_CURRENCY_EUR                                   :Euro
-STR_GAME_OPTIONS_CURRENCY_JPY                                   :Jaapani jeen (¥)
+STR_GAME_OPTIONS_CURRENCY_JPY                                   :Jaapani jeen
-STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austria ðilling (ATS)
+STR_GAME_OPTIONS_CURRENCY_ATS                                   :Austria ðilling
-STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgia frank (BEF)
+STR_GAME_OPTIONS_CURRENCY_BEF                                   :Belgia frank
-STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sveitði frank (CHF)
+STR_GAME_OPTIONS_CURRENCY_CHF                                   :Sveitði frank
-STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tðehhi kroon (CZK)
+STR_GAME_OPTIONS_CURRENCY_CZK                                   :Tðehhi kroon
-STR_GAME_OPTIONS_CURRENCY_DEM                                   :Saksamargad (DEM)
+STR_GAME_OPTIONS_CURRENCY_DEM                                   :Saksamargad
-STR_GAME_OPTIONS_CURRENCY_DKK                                   :Taani kroon (DKK)
+STR_GAME_OPTIONS_CURRENCY_DKK                                   :Taani kroon
-STR_GAME_OPTIONS_CURRENCY_ESP                                   :Hispaania peseeta (ESP)
+STR_GAME_OPTIONS_CURRENCY_ESP                                   :Hispaania peseeta
-STR_GAME_OPTIONS_CURRENCY_FIM                                   :Soome mark (FIM)
+STR_GAME_OPTIONS_CURRENCY_FIM                                   :Soome mark
-STR_GAME_OPTIONS_CURRENCY_FRF                                   :Prantsuse frank (FRF)
+STR_GAME_OPTIONS_CURRENCY_FRF                                   :Prantsuse frank
-STR_GAME_OPTIONS_CURRENCY_GRD                                   :Kreeka drahm (GRD)
+STR_GAME_OPTIONS_CURRENCY_GRD                                   :Kreeka drahm
-STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ungari Forint (HUF)
+STR_GAME_OPTIONS_CURRENCY_HUF                                   :Ungari Forint
-STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandi kroon (ISK)
+STR_GAME_OPTIONS_CURRENCY_ISK                                   :Islandi kroon
-STR_GAME_OPTIONS_CURRENCY_ITL                                   :Itaalia liir (ITL)
+STR_GAME_OPTIONS_CURRENCY_ITL                                   :Itaalia liir
-STR_GAME_OPTIONS_CURRENCY_NLG                                   :Hollandi kulden (NLG)
+STR_GAME_OPTIONS_CURRENCY_NLG                                   :Hollandi kulden
-STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norra kroon (NOK)
+STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norra kroon
-STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poola Zlott (PLN)
+STR_GAME_OPTIONS_CURRENCY_PLN                                   :Poola Zlott
-STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumeenia Leu (RON)
+STR_GAME_OPTIONS_CURRENCY_RON                                   :Rumeenia Leu
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Vene rubla (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Vene rubla
-STR_GAME_OPTIONS_CURRENCY_SIT                                   :Sloveenia Talaar (SIT)
+STR_GAME_OPTIONS_CURRENCY_SIT                                   :Sloveenia Talaar
-STR_GAME_OPTIONS_CURRENCY_SEK                                   :Rootsi kroon (SEK)
+STR_GAME_OPTIONS_CURRENCY_SEK                                   :Rootsi kroon
-STR_GAME_OPTIONS_CURRENCY_TRY                                   :Türgi Liir (TRY)
+STR_GAME_OPTIONS_CURRENCY_TRY                                   :Türgi Liir
-STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakkia Kroon (SKK)
+STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakkia Kroon
-STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasiilia Reaal (BRL
+STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasiilia Reaal
-STR_GAME_OPTIONS_CURRENCY_EEK                                   :Eesti Kroon (EEK)
+STR_GAME_OPTIONS_CURRENCY_EEK                                   :Eesti Kroon
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Leedu litt (LTL)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Leedu litt
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Lõuna-Korea vonn (KRW)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Lõuna-Korea vonn
-STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Lõuna-Aafrika rand (ZAR)
+STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Lõuna-Aafrika rand
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Omatehtud...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gruusia lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gruusia lari
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iraani rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iraani rial
-STR_GAME_OPTIONS_CURRENCY_RUB                                   :Uus Vene rubla (RUB)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Uus Vene rubla
-STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mehhiko Peeso (MXN)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mehhiko Peeso
-STR_GAME_OPTIONS_CURRENCY_NTD                                   :Uus Taiwani dollar (NTD)
+STR_GAME_OPTIONS_CURRENCY_NTD                                   :Uus Taiwani dollar
-STR_GAME_OPTIONS_CURRENCY_CNY                                   :Hiina renminbi (CNY)
+STR_GAME_OPTIONS_CURRENCY_CNY                                   :Hiina renminbi
-STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kongi dollar (HKD)
+STR_GAME_OPTIONS_CURRENCY_HKD                                   :Hong Kongi dollar
-STR_GAME_OPTIONS_CURRENCY_INR                                   :India ruupia (INR)
+STR_GAME_OPTIONS_CURRENCY_INR                                   :India ruupia
-STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indoneesia ruupia (IDR)
+STR_GAME_OPTIONS_CURRENCY_IDR                                   :Indoneesia ruupia
-STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaisia ringit (MYR)
+STR_GAME_OPTIONS_CURRENCY_MYR                                   :Malaisia ringit
 
 STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Salvestusvälp
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vali salvestamise välp
@@ -2041,30 +2042,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL           :Inglise mõõdu
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC             :Meetermõõdustik (m)
 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI                 :SI-süsteem (m)
 
-STR_CONFIG_SETTING_LOCALISATION                                 :{ORANGE}Kohandused
+STR_CONFIG_SETTING_LOCALISATION                                 :Kohandused
-STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Graafika
+STR_CONFIG_SETTING_GRAPHICS                                     :Graafika
-STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Heliefektid
+STR_CONFIG_SETTING_SOUND                                        :Heliefektid
-STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Liides
+STR_CONFIG_SETTING_INTERFACE                                    :Liides
-STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Üldine
+STR_CONFIG_SETTING_INTERFACE_GENERAL                            :Üldine
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Vaated
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :Vaated
-STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}Ehitus
+STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :Ehitus
-STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Uudised / Nõunikud
+STR_CONFIG_SETTING_ADVISORS                                     :Uudised / Nõunikud
-STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Ettevõte
+STR_CONFIG_SETTING_COMPANY                                      :Ettevõte
-STR_CONFIG_SETTING_ACCOUNTING                                   :{ORANGE}Arveldamine
+STR_CONFIG_SETTING_ACCOUNTING                                   :Arveldamine
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Sõidukid
+STR_CONFIG_SETTING_VEHICLES                                     :Sõidukid
-STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :{ORANGE}Füüsika
+STR_CONFIG_SETTING_VEHICLES_PHYSICS                             :Füüsika
-STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Marsruutimine
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :Marsruutimine
-STR_CONFIG_SETTING_LIMITATIONS                                  :{ORANGE}Piirangud
+STR_CONFIG_SETTING_LIMITATIONS                                  :Piirangud
-STR_CONFIG_SETTING_ACCIDENTS                                    :{ORANGE}Katastroofid / Õnnetused
+STR_CONFIG_SETTING_ACCIDENTS                                    :Katastroofid / Õnnetused
-STR_CONFIG_SETTING_GENWORLD                                     :{ORANGE}Maailma tekitamine
+STR_CONFIG_SETTING_GENWORLD                                     :Maailma tekitamine
-STR_CONFIG_SETTING_ENVIRONMENT                                  :{ORANGE}Keskkond
+STR_CONFIG_SETTING_ENVIRONMENT                                  :Keskkond
-STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :{ORANGE}Omavalitsus
+STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES                      :Omavalitsus
-STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :{ORANGE}Asulad
+STR_CONFIG_SETTING_ENVIRONMENT_TOWNS                            :Asulad
-STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :{ORANGE}Tööstused
+STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES                       :Tööstused
-STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :{ORANGE}Kaubajaotus
+STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST                        :Kaubajaotus
-STR_CONFIG_SETTING_AI                                           :{ORANGE}Konkurendid
+STR_CONFIG_SETTING_AI                                           :Konkurendid
-STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Arvuti
+STR_CONFIG_SETTING_AI_NPC                                       :Arvuti
-STR_CONFIG_SETTING_NETWORK                                      :{ORANGE}Võrk
+STR_CONFIG_SETTING_NETWORK                                      :Võrk
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :Rongide marsruudileidja: {STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT               :Marsruudileidja rongide jaoks
@@ -4578,8 +4579,6 @@ STR_TIMETABLE_EXPECTED                                          :{BLACK}Eeldatav
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Plaanis
 STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Vaheta eeldatava ja graafiku vahel
 
-STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :S:
-STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :V:
 
 
 # Date window (for timetable)

src/lang/extra/afrikaans.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Verander
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Ontwerp: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/arabic_egypt.txt

@@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}غير
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}تصميم: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :و:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :م:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/basque.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Elur gar
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Diseinatua: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/belarusian.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Зьмя
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Распрацаваны ў {GOLD}{NUM} г.
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :П:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :А:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/brazilian_portuguese.txt

@@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Mudar li
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Desenvolvida: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :C:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :P:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/bulgarian.txt

@@ -27,6 +27,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Висо
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Модел: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :П:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :З:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/catalan.txt

@@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Canvia l
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Dissenyat: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/croatian.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Promijen
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Dizajnirano: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :D:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :O:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/czech.txt

@@ -1407,8 +1407,6 @@ STR_VEHICLE_LIST_CHANGE_ORDER_ROAD_VEHICLE_DEPOT                :Přenést pří
 STR_VEHICLE_LIST_CHANGE_ORDER_SHIP_DEPOT                        :Přenést příkaz na jiný dok
 STR_VEHICLE_LIST_CHANGE_ORDER_AIRCRAFT_HANGAR                   :Přenést příkaz na jiný hangár
 
-STR_VEHICLE_LIST_CREATE_GROUP                                   :Vytvořit skupinu ze seznamu
-
 STR_GROUP_EXPAND_ALL                                            :{BLACK}Rozbalit vše
 STR_GROUP_COLLAPSE_ALL                                          :{BLACK}Sbalit vše
 
@@ -1676,6 +1674,9 @@ STR_TIMETABLE_FILL_TIMETABLE_SUGGESTION_2                       :{BLACK}(Alterna
 
 STR_TIMETABLE_WARNINGS_OMITTED                                  :{BLACK}{NUM} další varování vynechána...
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :P:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :O:
+
 STR_DATE_MINUTES_MINUTE_TOOLTIP                                 :{BLACK}Nastavit minutu
 STR_DATE_MINUTES_HOUR_TOOLTIP                                   :{BLACK}Nastavit hodinu
 
@@ -1836,15 +1837,15 @@ STR_STATION_RATING_MAX_PERCENTAGE                               : (max. {PLUS_NU
 STR_STATION_RATING_MAX_PERCENTAGE_COMMA                         :, max. {PLUS_NUM}%
 STR_STATION_RATING_PERCENTAGE_COMMA                             :, {PLUS_NUM}%
 
-STR_STATION_RATING_TOOLTIP_SPEED                                :Maximální rychlost posledního vozidla{STRING}: {SET_COLOUR}{VELOCITY}{STRING} ({STRING})
+STR_STATION_RATING_TOOLTIP_SPEED                                :Maximální rychlost posledního vozidla{STRING}: {COLOUR}{VELOCITY}{STRING} ({STRING})
 
-STR_STATION_RATING_TOOLTIP_AGE                                  :Stáří posledního vozidla{STRING}: {SET_COLOUR}{NUM} {P rok roky let}{STRING}
+STR_STATION_RATING_TOOLTIP_AGE                                  :Stáří posledního vozidla{STRING}: {COLOUR}{NUM} {P rok roky let}{STRING}
 
 STR_STATION_RATING_TOOLTIP_WAITTIME                             :Čas od poslední obsluhy{STRING}: {STRING}
 STR_STATION_RATING_TOOLTIP_WAITTIME_SHIP                        :Čas od poslední obsluhy{STRING}: {STRING} (lodí)
-STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE                       :{SET_COLOUR}{NUM} d{P en ny ní}{STRING}
+STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE                       :{COLOUR}{NUM} d{P en ny ní}{STRING}
 
-STR_STATION_RATING_TOOLTIP_WAITUNITS                            :Čekající náklad (v průměru na další stanici){STRING}): {SET_COLOUR}{NUM}{STRING}
+STR_STATION_RATING_TOOLTIP_WAITUNITS                            :Čekající náklad (v průměru na další stanici){STRING}): {COLOUR}{NUM}{STRING}
 
 STR_STATION_RATING_TOOLTIP_STATUE                               :Socha ve městě{STRING}: {STRING}
 STR_STATION_RATING_TOOLTIP_STATUE_NO                            :{GOLD}ne{STRING}
@@ -1913,7 +1914,7 @@ STR_TMPL_CONFIG_USEDEPOT                                        :užij depo
 STR_TMPL_CONFIG_KEEPREMAINDERS                                  :nech zbyt
 STR_TMPL_CONFIG_OLD_ONLY                                        :jen staré
 
-STR_TMPL_NUM_TRAINS_NEED_RPL                                    :vlaků k nahrazení: {SET_COLOUR}{COMMA}
+STR_TMPL_NUM_TRAINS_NEED_RPL                                    :vlaků k nahrazení: {COLOUR}{COMMA}
 
 STR_TMPL_CARGO_SUMMARY                                          :{CARGO_LONG}
 STR_TMPL_CARGO_SUMMARY_MULTI                                    :{CARGO_LONG} (x{NUM})
@@ -2104,5 +2105,5 @@ STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_OFF              :vypnutá
 STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_SIMPLE           :stručná
 STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_DETAILED         :podrobná
 
-STR_VIEWPORT_TOWN_COLOUR                                        :{1:SET_COLOUR}{0:TOWN}
+STR_VIEWPORT_TOWN_COLOUR                                        :{1:COLOUR}{0:TOWN}
-STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {SET_COLOUR}({COMMA})
+STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {COLOUR}({COMMA})

src/lang/extra/danish.txt

@@ -33,6 +33,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ændre s
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Designet: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :Ank:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :Afg:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/dutch.txt

@@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Hoogte v
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Ontworpen: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :V:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/english.txt

@@ -12,8 +12,6 @@ STR_JUST_DATE_WALLCLOCK_SHORT                                   :{DATE_WALLCLOCK
 STR_JUST_DATE_WALLCLOCK_LONG                                    :{DATE_WALLCLOCK_LONG}
 STR_JUST_DATE_WALLCLOCK_ISO                                     :{DATE_WALLCLOCK_ISO}
 STR_JUST_TIME_HHMM                                              :{TIME_HHMM}
-STR_JUST_STRING1                                                :{STRING1}
-STR_JUST_STRING2                                                :{STRING2}
 STR_JUST_STRING3                                                :{STRING3}
 STR_JUST_VELOCITY                                               :{VELOCITY}
 STR_JUST_TT_TICKS                                               :{TT_TICKS}
@@ -1466,8 +1464,6 @@ STR_VEHICLE_LIST_CHANGE_ORDER_ROAD_VEHICLE_DEPOT                :Move order to a
 STR_VEHICLE_LIST_CHANGE_ORDER_SHIP_DEPOT                        :Move order to another depot
 STR_VEHICLE_LIST_CHANGE_ORDER_AIRCRAFT_HANGAR                   :Move order to another hangar
 
-STR_VEHICLE_LIST_CREATE_GROUP                                   :Create group from list
-
 STR_GROUP_EXPAND_ALL                                            :{BLACK}Expand all
 STR_GROUP_COLLAPSE_ALL                                          :{BLACK}Collapse all
 
@@ -1742,6 +1738,9 @@ STR_TIMETABLE_FILL_TIMETABLE_SUGGESTION_2                       :{BLACK}(Alterna
 
 STR_TIMETABLE_WARNINGS_OMITTED                                  :{BLACK}{NUM} further warnings omitted...
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 STR_DATE_MINUTES_MINUTE_TOOLTIP                                 :{BLACK}Select minute
 STR_DATE_MINUTES_HOUR_TOOLTIP                                   :{BLACK}Select hour
 
@@ -1903,15 +1902,15 @@ STR_STATION_RATING_MAX_PERCENTAGE                               : (max {PLUS_NUM
 STR_STATION_RATING_MAX_PERCENTAGE_COMMA                         :, max {PLUS_NUM}%
 STR_STATION_RATING_PERCENTAGE_COMMA                             :, {PLUS_NUM}%
 
-STR_STATION_RATING_TOOLTIP_SPEED                                :Max speed of last vehicle{STRING1}: {SET_COLOUR}{VELOCITY}{STRING1} ({STRING})
+STR_STATION_RATING_TOOLTIP_SPEED                                :Max speed of last vehicle{STRING1}: {COLOUR}{VELOCITY}{STRING1} ({STRING})
 
-STR_STATION_RATING_TOOLTIP_AGE                                  :Age of last vehicle{STRING1}: {SET_COLOUR}{NUM} year{P "" s}{STRING1}
+STR_STATION_RATING_TOOLTIP_AGE                                  :Age of last vehicle{STRING1}: {COLOUR}{NUM} year{P "" s}{STRING1}
 
 STR_STATION_RATING_TOOLTIP_WAITTIME                             :Time since last pickup{STRING1}: {STRING4}
 STR_STATION_RATING_TOOLTIP_WAITTIME_SHIP                        :Time since last pickup{STRING1}: {STRING4} (by ship)
-STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE                       :{SET_COLOUR}{NUM} day{P "" s}{STRING1}
+STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE                       :{COLOUR}{NUM} day{P "" s}{STRING1}
 
-STR_STATION_RATING_TOOLTIP_WAITUNITS                            :Cargo waiting (on average per next stop{STRING1}): {SET_COLOUR}{NUM}{STRING1}
+STR_STATION_RATING_TOOLTIP_WAITUNITS                            :Cargo waiting (on average per next stop{STRING1}): {COLOUR}{NUM}{STRING1}
 
 STR_STATION_RATING_TOOLTIP_STATUE                               :Statue in town{STRING1}: {STRING2}
 STR_STATION_RATING_TOOLTIP_STATUE_NO                            :{GOLD}no{STRING1}
@@ -1990,7 +1989,7 @@ STR_TMPL_SECTION_REFIT                                          :{BLACK}Refit
 STR_TMPL_SECTION_DEPOT_VEHICLES                                 :{BLACK}Depot vehicles
 STR_TMPL_SECTION_WHEN                                           :{BLACK}When
 
-STR_TMPL_NUM_TRAINS_NEED_RPL                                    :Trains to replace: {SET_COLOUR}{COMMA}
+STR_TMPL_NUM_TRAINS_NEED_RPL                                    :Trains to replace: {COLOUR}{COMMA}
 
 STR_TMPL_CARGO_SUMMARY                                          :{CARGO_LONG}
 STR_TMPL_CARGO_SUMMARY_MULTI                                    :{CARGO_LONG} (x{NUM})
@@ -2186,7 +2185,7 @@ STR_CONFIG_SETTING_CITY_IN_LABEL                                :Show city in to
 STR_CONFIG_SETTING_CITY_IN_LABEL_HELPTEXT                       :Display if a town is also a city in their label on the map
 
 ###length 4
-STR_VIEWPORT_TOWN_COLOUR                                        :{1:SET_COLOUR}{0:TOWN}
+STR_VIEWPORT_TOWN_COLOUR                                        :{1:COLOUR}{0:TOWN}
-STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {SET_COLOUR}({COMMA})
+STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {COLOUR}({COMMA})
-STR_VIEWPORT_TOWN_COLOUR_CITY                                   :{1:SET_COLOUR}{0:TOWN} (City)
+STR_VIEWPORT_TOWN_COLOUR_CITY                                   :{1:COLOUR}{0:TOWN} (City)
-STR_VIEWPORT_TOWN_COLOUR_CITY_POP                               :{WHITE}{TOWN} {SET_COLOUR}(City, {COMMA})
+STR_VIEWPORT_TOWN_COLOUR_CITY_POP                               :{WHITE}{TOWN} {COLOUR}(City, {COMMA})

src/lang/extra/english_AU.txt

@@ -59,6 +59,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Change s
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Designed: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/english_US.txt

@@ -61,6 +61,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Change s
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Designed: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/esperanto.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ŝanĝu
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Pripensite: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :F:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/estonian.txt

@@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Muuda lu
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Kujundatud: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :S:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :V:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/faroese.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Broyt h
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Sniðgivi: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :K:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :F:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/finnish.txt

@@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Vaihda l
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Suunniteltu: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :S:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :L:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/french.txt

@@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Modifier
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Conçu en{NBSP}: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/frisian.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{BLACK}Sniehich
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Ûntwurpen: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :F:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/gaelic.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Atharrai
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Air a dhealbhadh: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :R:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :F:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/galician.txt

@@ -1420,8 +1420,6 @@ STR_VEHICLE_LIST_CHANGE_ORDER_ROAD_VEHICLE_DEPOT                :Mover orde a ou
 STR_VEHICLE_LIST_CHANGE_ORDER_SHIP_DEPOT                        :Mover orde a outro depósito
 STR_VEHICLE_LIST_CHANGE_ORDER_AIRCRAFT_HANGAR                   :Mover orde a outro hangar
 
-STR_VEHICLE_LIST_CREATE_GROUP                                   :Crear grupo dende a lista
-
 STR_GROUP_EXPAND_ALL                                            :{BLACK}Expandir todo
 STR_GROUP_COLLAPSE_ALL                                          :{BLACK}Contraer todo
 
@@ -1695,6 +1693,9 @@ STR_TIMETABLE_FILL_TIMETABLE_SUGGESTION_2                       :{BLACK}(Alterna
 
 STR_TIMETABLE_WARNINGS_OMITTED                                  :{BLACK}{NUM} avisos máis omitidos...
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :Ch:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :S:
+
 STR_DATE_MINUTES_MINUTE_TOOLTIP                                 :{BLACK}Seleccionar minuto
 STR_DATE_MINUTES_HOUR_TOOLTIP                                   :{BLACK}Seleccionar hora
 
@@ -1855,15 +1856,15 @@ STR_STATION_RATING_MAX_PERCENTAGE                               : (máx {PLUS_NU
 STR_STATION_RATING_MAX_PERCENTAGE_COMMA                         :, máx {PLUS_NUM}%
 STR_STATION_RATING_PERCENTAGE_COMMA                             :, {PLUS_NUM}%
 
-STR_STATION_RATING_TOOLTIP_SPEED                                :Velocidade máxima do último vehículo{STRING}: {SET_COLOUR}{VELOCITY}{STRING} ({STRING})
+STR_STATION_RATING_TOOLTIP_SPEED                                :Velocidade máxima do último vehículo{STRING}: {COLOUR}{VELOCITY}{STRING} ({STRING})
 
-STR_STATION_RATING_TOOLTIP_AGE                                  :Idade do último vehículo{STRING}: {SET_COLOUR}{NUM} ano{P "" s}{STRING}
+STR_STATION_RATING_TOOLTIP_AGE                                  :Idade do último vehículo{STRING}: {COLOUR}{NUM} ano{P "" s}{STRING}
 
 STR_STATION_RATING_TOOLTIP_WAITTIME                             :Tempo dende a última recollida{STRING}: {STRING}
 STR_STATION_RATING_TOOLTIP_WAITTIME_SHIP                        :Tempo dende a última recollida{STRING}: {STRING} (por barco)
-STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE                       :{SET_COLOUR}{NUM} día{P "" s}{STRING}
+STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE                       :{COLOUR}{NUM} día{P "" s}{STRING}
 
-STR_STATION_RATING_TOOLTIP_WAITUNITS                            :Cargamento agardando (de media por próxima parada{STRING}): {SET_COLOUR}{NUM}{STRING}
+STR_STATION_RATING_TOOLTIP_WAITUNITS                            :Cargamento agardando (de media por próxima parada{STRING}): {COLOUR}{NUM}{STRING}
 
 STR_STATION_RATING_TOOLTIP_STATUE                               :Estatua na localidade{STRING}: {STRING}
 STR_STATION_RATING_TOOLTIP_STATUE_NO                            :{GOLD}non{STRING}
@@ -1942,7 +1943,7 @@ STR_TMPL_SECTION_REFIT                                          :{BLACK}Reaxusta
 STR_TMPL_SECTION_DEPOT_VEHICLES                                 :{BLACK}Depósito de vehículos
 STR_TMPL_SECTION_WHEN                                           :{BLACK}Cando
 
-STR_TMPL_NUM_TRAINS_NEED_RPL                                    :trenes a reemplazar: {SET_COLOUR}{COMMA}
+STR_TMPL_NUM_TRAINS_NEED_RPL                                    :trenes a reemplazar: {COLOUR}{COMMA}
 
 STR_TMPL_CARGO_SUMMARY                                          :{CARGO_LONG}
 STR_TMPL_CARGO_SUMMARY_MULTI                                    :{CARGO_LONG} (x{NUM})
@@ -2135,7 +2136,7 @@ STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_DETAILED         :Detallado
 STR_CONFIG_SETTING_CITY_IN_LABEL                                :Amosar se é cidade na etiqueta do nome da vila: {STRING}
 STR_CONFIG_SETTING_CITY_IN_LABEL_HELPTEXT                       :Amosar se unha vila tamén é unha cidade na súa etiqueta no mapa
 
-STR_VIEWPORT_TOWN_COLOUR                                        :{1:SET_COLOUR}{0:TOWN}
+STR_VIEWPORT_TOWN_COLOUR                                        :{1:COLOUR}{0:TOWN}
-STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {SET_COLOUR}({COMMA})
+STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {COLOUR}({COMMA})
-STR_VIEWPORT_TOWN_COLOUR_CITY                                   :{1:SET_COLOUR}{0:TOWN} (Cidade)
+STR_VIEWPORT_TOWN_COLOUR_CITY                                   :{1:COLOUR}{0:TOWN} (Cidade)
-STR_VIEWPORT_TOWN_COLOUR_CITY_POP                               :{WHITE}{TOWN} {SET_COLOUR}(Cidade, {COMMA})
+STR_VIEWPORT_TOWN_COLOUR_CITY_POP                               :{WHITE}{TOWN} {COLOUR}(Cidade, {COMMA})

src/lang/extra/german.txt

@@ -1258,8 +1258,6 @@ STR_VEHICLE_LIST_CHANGE_ORDER_ROAD_VEHICLE_DEPOT                :Verschiebe Auft
 STR_VEHICLE_LIST_CHANGE_ORDER_SHIP_DEPOT                        :Verschiebe Auftrag zu einer anderen Werft
 STR_VEHICLE_LIST_CHANGE_ORDER_AIRCRAFT_HANGAR                   :Verschiebe Auftrag zu einem anderen Hangar
 
-STR_VEHICLE_LIST_CREATE_GROUP                                   :Erstelle Gruppe aus Liste
-
 STR_GROUP_EXPAND_ALL                                            :{BLACK}Alles ausklappen
 STR_GROUP_COLLAPSE_ALL                                          :{BLACK}Alles einklappen
 
@@ -1494,6 +1492,9 @@ STR_TIMETABLE_WARNING_SCHEDULE_ID                               :{BLACK}Zeitplan
 
 STR_TIMETABLE_WARNINGS_OMITTED                                  :{BLACK}{NUM} keine weiteren Warnungen ...
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :an
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :ab
+
 STR_DATE_MINUTES_MINUTE_TOOLTIP                                 :{BLACK}Minute auswählen
 STR_DATE_MINUTES_HOUR_TOOLTIP                                   :{BLACK}Stunde auswählen
 
@@ -1674,7 +1675,7 @@ STR_TMPL_CONFIG_USEDEPOT                                        :Depotnutzung
 STR_TMPL_CONFIG_KEEPREMAINDERS                                  :Bereithaltung
 STR_TMPL_CONFIG_OLD_ONLY                                        :Nur alte
 
-STR_TMPL_NUM_TRAINS_NEED_RPL                                    :Züge zu ersetzen: {SET_COLOUR}{COMMA}
+STR_TMPL_NUM_TRAINS_NEED_RPL                                    :Züge zu ersetzen: {COLOUR}{COMMA}
 
 STR_TMPL_CARGO_SUMMARY                                          :{CARGO_LONG}
 STR_TMPL_CARGO_SUMMARY_MULTI                                    :{CARGO_LONG} (x{NUM})
@@ -1784,5 +1785,5 @@ STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_OFF              :Aus
 STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_SIMPLE           :Einfach
 STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_DETAILED         :Detailliert
 
-STR_VIEWPORT_TOWN_COLOUR                                        :{1:SET_COLOUR}{0:TOWN}
+STR_VIEWPORT_TOWN_COLOUR                                        :{1:COLOUR}{0:TOWN}
-STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {SET_COLOUR}({COMMA})
+STR_VIEWPORT_TOWN_COLOUR_POP                                    :{WHITE}{TOWN} {COLOUR}({COMMA})

src/lang/extra/greek.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Άλλα
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Έτος σχεδίασης: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :ΑΦ:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :ΑΝ:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/hebrew.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}שנה
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}מודל: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :D:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/hungarian.txt

@@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Hóhatá
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Kifejlesztve: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :É:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :I:
+
 # Cargo type orders Window
 
 # Plans window

src/lang/extra/icelandic.txt

@@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Breyta h
 
 STR_PURCHASE_INFO_DESIGNED                                      :{BLACK}Hönnun: {GOLD}{NUM}
 
+STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :K:
+STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :F:
+
 # Cargo type orders Window
 
 # Plans window