diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a80c7d91d..e55458a8bb 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/README.md b/README.md index a730f5ef45..ca45274a1f 100644 --- a/README.md +++ b/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. diff --git a/os/macosx/notarize.sh b/os/macosx/notarize.sh index 4ce2fc2cec..c34606bdc2 100755 --- a/os/macosx/notarize.sh +++ b/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: -# -# https://github.com/mitchellh/gon -# -# Follow the setup instructions on the gon site to install. +# This uses the Xcode notarytool to perform notarization. You must set up a keychain +# profile called "openttd" using the "store-credentials" notarytool command beforehand. # # 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 < notarize.json -{ - "notarize": [ - { - "path": "${dmg_filename[0]}", - "bundle_id": "org.openttd.openttd.jgrpp", - "staple": true - } - ] -} -EOF +xcrun notarytool submit ${dmg_filename[0]} --keychain-profile "openttd" --wait -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; diff --git a/os/os2/build_lang.cmd b/os/os2/build_lang.cmd deleted file mode 100644 index 57d3e9943c..0000000000 --- a/os/os2/build_lang.cmd +++ /dev/null @@ -1,8 +0,0 @@ -rem -rem Building language files... -rem -cd .. -strgen\strgen -for %%f in (lang\*.txt) do strgen\strgen %%f -cd strgen - diff --git a/os/os2/dedicated.cmd b/os/os2/dedicated.cmd deleted file mode 100644 index f4eb524995..0000000000 --- a/os/os2/dedicated.cmd +++ /dev/null @@ -1 +0,0 @@ -start /n /win openttd.exe -D %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/os/os2/installer/download_nosound.cmd b/os/os2/installer/download_nosound.cmd deleted file mode 100644 index 39e9843a92..0000000000 --- a/os/os2/installer/download_nosound.cmd +++ /dev/null @@ -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 \ No newline at end of file diff --git a/os/os2/installer/download_opengfx.cmd b/os/os2/installer/download_opengfx.cmd deleted file mode 100644 index c2686b456f..0000000000 --- a/os/os2/installer/download_opengfx.cmd +++ /dev/null @@ -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 diff --git a/os/os2/installer/download_opensfx.cmd b/os/os2/installer/download_opensfx.cmd deleted file mode 100644 index 0a46dea42a..0000000000 --- a/os/os2/installer/download_opensfx.cmd +++ /dev/null @@ -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 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd deleted file mode 100644 index 885b2dc623..0000000000 --- a/os/os2/installer/make_installer.cmd +++ /dev/null @@ -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 diff --git a/os/os2/installer/openttd.wis b/os/os2/installer/openttd.wis deleted file mode 100644 index 4b761ed83c..0000000000 --- a/os/os2/installer/openttd.wis +++ /dev/null @@ -1,106 +0,0 @@ - - -OpenTTD - - - -OpenTTD is an open source transport simulation game - -Tools required for downloading the OpenGFX/SFX packs - -Downloads the OpenGFX graphics pack for OpenTTD - -Downloads the OpenSFX sound effects pack for OpenTTD - -Downloads the NoSound pack for OpenTTD, to disable sound effects - - - - - - -~Next -README.md -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. - - - - -~Next -COPYING.md -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. - - - - -~Next -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). - - - - - -I~nstall - -Press "Install" to begin installing OpenTTD. - - - diff --git a/os/os2/installer/remove_nosound.cmd b/os/os2/installer/remove_nosound.cmd deleted file mode 100644 index 21c11e80d9..0000000000 --- a/os/os2/installer/remove_nosound.cmd +++ /dev/null @@ -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 diff --git a/os/os2/installer/remove_opengfx.cmd b/os/os2/installer/remove_opengfx.cmd deleted file mode 100644 index 71465d1677..0000000000 --- a/os/os2/installer/remove_opengfx.cmd +++ /dev/null @@ -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 diff --git a/os/os2/installer/remove_opensfx.cmd b/os/os2/installer/remove_opensfx.cmd deleted file mode 100644 index 361a870e33..0000000000 --- a/os/os2/installer/remove_opensfx.cmd +++ /dev/null @@ -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 diff --git a/os/os2/openttd.wpj b/os/os2/openttd.wpj deleted file mode 100644 index 61b2caa553..0000000000 --- a/os/os2/openttd.wpj +++ /dev/null @@ -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 diff --git a/os/os2/svn_version.cmd b/os/os2/svn_version.cmd deleted file mode 100644 index cc8836fc0b..0000000000 --- a/os/os2/svn_version.cmd +++ /dev/null @@ -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 diff --git a/os/os2/svnver1.c b/os/os2/svnver1.c deleted file mode 100644 index 56d3572c50..0000000000 --- a/os/os2/svnver1.c +++ /dev/null @@ -1,3 +0,0 @@ -/* rev.c part #1 for OS/2 - ensure no newline at end of file! */ - -const char _openttd_revision[] = "r \ No newline at end of file diff --git a/os/os2/svnver2.c b/os/os2/svnver2.c deleted file mode 100644 index 02d87603c5..0000000000 --- a/os/os2/svnver2.c +++ /dev/null @@ -1,4 +0,0 @@ -"; -const int _revision_number = 0; - -/* rev.c part 2 for OS/2 - ensure no newline at start of file! */ \ No newline at end of file diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt index 50b7052954..ffcd1e0aac 100644 --- a/src/3rdparty/CMakeLists.txt +++ b/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) diff --git a/src/3rdparty/os2/CMakeLists.txt b/src/3rdparty/os2/CMakeLists.txt deleted file mode 100644 index 8edc63479e..0000000000 --- a/src/3rdparty/os2/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_files( - getaddrinfo.c - getaddrinfo.h - getnameinfo.c - getnameinfo.h - CONDITION OPTION_OS2 -) diff --git a/src/3rdparty/os2/getaddrinfo.c b/src/3rdparty/os2/getaddrinfo.c deleted file mode 100644 index 3cdda21f1b..0000000000 --- a/src/3rdparty/os2/getaddrinfo.c +++ /dev/null @@ -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 - * - * 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 -#include -#include -#include -#include -#include -#include - -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 */ diff --git a/src/3rdparty/os2/getaddrinfo.h b/src/3rdparty/os2/getaddrinfo.h deleted file mode 100644 index 0a588a40a2..0000000000 --- a/src/3rdparty/os2/getaddrinfo.h +++ /dev/null @@ -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 - * - * 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 */ -#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 */ -#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 */ diff --git a/src/3rdparty/os2/getnameinfo.c b/src/3rdparty/os2/getnameinfo.c deleted file mode 100644 index 14fd89ef15..0000000000 --- a/src/3rdparty/os2/getnameinfo.c +++ /dev/null @@ -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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#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 */ - 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 diff --git a/src/3rdparty/os2/getnameinfo.h b/src/3rdparty/os2/getnameinfo.h deleted file mode 100644 index c1861aa033..0000000000 --- a/src/3rdparty/os2/getnameinfo.h +++ /dev/null @@ -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 */ diff --git a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp b/src/3rdparty/squirrel/squirrel/sqcompiler.cpp index 9ba1597120..86fe8a4b3b 100644 --- a/src/3rdparty/squirrel/squirrel/sqcompiler.cpp +++ b/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() { diff --git a/src/3rdparty/squirrel/squirrel/sqstring.h b/src/3rdparty/squirrel/squirrel/sqstring.h index a5f298e1e2..1d20d0b610 100644 --- a/src/3rdparty/squirrel/squirrel/sqstring.h +++ b/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; diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp index cee8d5d30c..91e5d4af5b 100644 --- a/src/airport_gui.cpp +++ b/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), diff --git a/src/base_media_func.h b/src/base_media_func.h index cec201d8fc..f372b26021 100644 --- a/src/base_media_func.h +++ b/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::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::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::file_names[i], false); + item = files->GetItem(BaseSet::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::file_names[i], full_filename.c_str()); return false; @@ -92,7 +92,7 @@ bool BaseSet::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::FillSetDetails(IniFile *ini, const } /* Then find the warning message when the file's missing */ - item = origin->GetItem(filename, false); - if (item == nullptr) item = origin->GetItem("default", false); + item = origin->GetItem(filename); + 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(); diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp index 434fc45b45..43f69642cb 100644 --- a/src/bootstrap_gui.cpp +++ b/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) ); diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index e18f7d1a7b..ce76b33872 100644 --- a/src/build_vehicle_gui.cpp +++ b/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); diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 4c12679aa1..43dcce1a9d 100644 --- a/src/company_gui.cpp +++ b/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) {} - - StringID String() const - { - return this->result >= COLOUR_END ? STR_COLOUR_DEFAULT : _colour_dropdown[this->result]; - } + DropDownListColourItem(int result, bool masked) : DropDownListStringItem(result >= COLOUR_END ? STR_COLOUR_DEFAULT : _colour_dropdown[result], result, masked) {} 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), diff --git a/src/console.cpp b/src/console.cpp index 80ba5fa439..e74245a70c 100644 --- a/src/console.cpp +++ b/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); diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index 2d9a2d7db4..d5d8b2ef9c 100644 --- a/src/console_cmds.cpp +++ b/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]); - char *e = strrchr(name, '.'); + const char *e = strrchr(argv[1], '.'); 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; } diff --git a/src/console_gui.cpp b/src/console_gui.cpp index 58bc778cf4..884ad9bf05 100644 --- a/src/console_gui.cpp +++ b/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 int _iconsole_historypos; +static ring_buffer _iconsole_history; +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) { - free(_iconsole_history[ICON_HISTORY_SIZE - 1]); - memmove(&_iconsole_history[1], &_iconsole_history[0], sizeof(_iconsole_history[0]) * (ICON_HISTORY_SIZE - 1)); - _iconsole_history[0] = stredup(cmd); + if (_iconsole_history.empty() || _iconsole_history.front() != cmd) { + _iconsole_history.emplace_front(cmd); + while (_iconsole_history.size() > ICON_HISTORY_SIZE) _iconsole_history.pop_back(); } /* 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 - _iconsole_historypos = Clamp(_iconsole_historypos + direction, -1, ICON_HISTORY_SIZE - 1); - - if (direction > 0 && _iconsole_history[_iconsole_historypos] == nullptr) _iconsole_historypos--; + if (_iconsole_history.empty()) return; // Empty history + _iconsole_historypos = Clamp(_iconsole_historypos + direction, -1, _iconsole_history.size() - 1); if (_iconsole_historypos == -1) { _iconsole_cmdline.DeleteAll(); diff --git a/src/core/span_type.hpp b/src/core/span_type.hpp index 488e191d29..3275d5d87e 100644 --- a/src/core/span_type.hpp +++ b/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 subspan(size_t offset, size_t count) + { + assert(offset + count <= size()); + return span(this->data() + offset, count); + } + private: pointer first; pointer last; diff --git a/src/cpu.cpp b/src/cpu.cpp index d9d7ac2377..12cbfd0f82 100644 --- a/src/cpu.cpp +++ b/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() diff --git a/src/crashlog.cpp b/src/crashlog.cpp index 6347640922..993a30546c 100644 --- a/src/crashlog.cpp +++ b/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 "" #endif diff --git a/src/currency.cpp b/src/currency.cpp index 841f00d56a..facb54f923 100644 --- a/src/currency.cpp +++ b/src/currency.cpp @@ -20,54 +20,54 @@ #include "safeguards.h" - /* exchange rate prefix symbol_pos - * | separator | postfix | - * | | Euro year | | | name - * | | | | | | | */ + /* exchange rate prefix code + * | separator | postfix | symbol_pos + * | | 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 - { 2, "", CF_NOEURO, "$", "", 0, STR_GAME_OPTIONS_CURRENCY_USD }, ///< american dollar - { 2, "", CF_ISEURO, u8"\u20ac", "", 0, STR_GAME_OPTIONS_CURRENCY_EUR }, ///< euro - { 220, "", CF_NOEURO, u8"\u00a5", "", 0, STR_GAME_OPTIONS_CURRENCY_JPY }, ///< japanese yen - { 27, "", 2002, "", NBSP "S.", 1, STR_GAME_OPTIONS_CURRENCY_ATS }, ///< austrian schilling - { 81, "", 2002, "BEF" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_BEF }, ///< belgian franc - { 2, "", CF_NOEURO, "CHF" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_CHF }, ///< swiss franc - { 41, "", CF_NOEURO, "", NBSP u8"K\u010d", 1, STR_GAME_OPTIONS_CURRENCY_CZK }, ///< czech koruna - { 4, "", 2002, "DM" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_DEM }, ///< deutsche mark - { 11, "", CF_NOEURO, "", NBSP "kr", 1, STR_GAME_OPTIONS_CURRENCY_DKK }, ///< danish krone - { 333, "", 2002, "Pts" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_ESP }, ///< spanish peseta - { 12, "", 2002, "", NBSP "mk", 1, STR_GAME_OPTIONS_CURRENCY_FIM }, ///< finnish markka - { 13, "", 2002, "FF" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_FRF }, ///< french franc - { 681, "", 2002, "", "Dr.", 1, STR_GAME_OPTIONS_CURRENCY_GRD }, ///< greek drachma - { 378, "", CF_NOEURO, "", NBSP "Ft", 1, STR_GAME_OPTIONS_CURRENCY_HUF }, ///< hungarian forint - { 130, "", CF_NOEURO, "", NBSP "Kr", 1, STR_GAME_OPTIONS_CURRENCY_ISK }, ///< icelandic krona - { 3873, "", 2002, "", NBSP "L.", 1, STR_GAME_OPTIONS_CURRENCY_ITL }, ///< italian lira - { 4, "", 2002, "NLG" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_NLG }, ///< dutch gulden - { 12, "", CF_NOEURO, "", NBSP "Kr", 1, STR_GAME_OPTIONS_CURRENCY_NOK }, ///< norwegian krone - { 6, "", CF_NOEURO, "", NBSP u8"z\u0142", 1, STR_GAME_OPTIONS_CURRENCY_PLN }, ///< polish zloty - { 5, "", CF_NOEURO, "", NBSP "Lei", 1, STR_GAME_OPTIONS_CURRENCY_RON }, ///< romanian leu - { 50, "", CF_NOEURO, "", NBSP "p", 1, STR_GAME_OPTIONS_CURRENCY_RUR }, ///< russian rouble - { 479, "", 2007, "", NBSP "SIT", 1, STR_GAME_OPTIONS_CURRENCY_SIT }, ///< slovenian tolar - { 13, "", CF_NOEURO, "", NBSP "Kr", 1, STR_GAME_OPTIONS_CURRENCY_SEK }, ///< swedish krona - { 3, "", CF_NOEURO, "", NBSP "TL", 1, STR_GAME_OPTIONS_CURRENCY_TRY }, ///< turkish lira - { 60, "", 2009, "", NBSP "Sk", 1, STR_GAME_OPTIONS_CURRENCY_SKK }, ///< slovak koruna - { 4, "", CF_NOEURO, "R$" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_BRL }, ///< brazil real - { 31, "", 2011, "", NBSP "EEK", 1, STR_GAME_OPTIONS_CURRENCY_EEK }, ///< estonian krooni - { 4, "", 2015, "", NBSP "Lt", 1, STR_GAME_OPTIONS_CURRENCY_LTL }, ///< lithuanian litas - { 1850, "", CF_NOEURO, u8"\u20a9", "", 0, STR_GAME_OPTIONS_CURRENCY_KRW }, ///< south korean won - { 13, "", CF_NOEURO, "R" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_ZAR }, ///< south african rand - { 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 - { 4901, "", CF_NOEURO, "", NBSP "Rls", 1, STR_GAME_OPTIONS_CURRENCY_IRR }, ///< Iranian Rial - { 80, "", CF_NOEURO, "", NBSP "rub", 1, STR_GAME_OPTIONS_CURRENCY_RUB }, ///< New Russian Ruble - { 24, "", CF_NOEURO, "$", "", 0, STR_GAME_OPTIONS_CURRENCY_MXN }, ///< Mexican peso - { 40, "", CF_NOEURO, "NTD" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_NTD }, ///< new taiwan dollar - { 8, "", CF_NOEURO, u8"\u00a5", "", 0, STR_GAME_OPTIONS_CURRENCY_CNY }, ///< chinese renminbi - { 10, "", CF_NOEURO, "HKD" NBSP, "", 0, STR_GAME_OPTIONS_CURRENCY_HKD }, ///< hong kong dollar - { 90, "", CF_NOEURO, u8"\u20b9", "", 0, STR_GAME_OPTIONS_CURRENCY_INR }, ///< Indian Rupee - { 19, "", CF_NOEURO, "Rp", "", 0, STR_GAME_OPTIONS_CURRENCY_IDR }, ///< Indonesian Rupiah - { 5, "", CF_NOEURO, "RM", "", 0, STR_GAME_OPTIONS_CURRENCY_MYR }, ///< Malaysian Ringgit + { 1, "", CF_NOEURO, u8"\u00a3", "", "GBP", 0, STR_GAME_OPTIONS_CURRENCY_GBP }, ///< british pound + { 2, "", CF_NOEURO, "$", "", "USD", 0, STR_GAME_OPTIONS_CURRENCY_USD }, ///< american dollar + { 2, "", CF_ISEURO, u8"\u20ac", "", "EUR", 0, STR_GAME_OPTIONS_CURRENCY_EUR }, ///< euro + { 220, "", CF_NOEURO, u8"\u00a5", "", "JPY", 0, STR_GAME_OPTIONS_CURRENCY_JPY }, ///< japanese yen + { 27, "", 2002, "", NBSP "S.", "ATS", 1, STR_GAME_OPTIONS_CURRENCY_ATS }, ///< austrian schilling + { 81, "", 2002, "BEF" NBSP, "", "BEF", 0, STR_GAME_OPTIONS_CURRENCY_BEF }, ///< belgian franc + { 2, "", CF_NOEURO, "CHF" NBSP, "", "CHF", 0, STR_GAME_OPTIONS_CURRENCY_CHF }, ///< swiss franc + { 41, "", CF_NOEURO, "", NBSP u8"K\u010d", "CZK", 1, STR_GAME_OPTIONS_CURRENCY_CZK }, ///< czech koruna + { 4, "", 2002, "DM" NBSP, "", "DEM", 0, STR_GAME_OPTIONS_CURRENCY_DEM }, ///< deutsche mark + { 11, "", CF_NOEURO, "", NBSP "kr", "DKK", 1, STR_GAME_OPTIONS_CURRENCY_DKK }, ///< danish krone + { 333, "", 2002, "Pts" NBSP, "", "ESP", 0, STR_GAME_OPTIONS_CURRENCY_ESP }, ///< spanish peseta + { 12, "", 2002, "", NBSP "mk", "FIM", 1, STR_GAME_OPTIONS_CURRENCY_FIM }, ///< finnish markka + { 13, "", 2002, "FF" NBSP, "", "FRF", 0, STR_GAME_OPTIONS_CURRENCY_FRF }, ///< french franc + { 681, "", 2002, "", "Dr.", "GRD", 1, STR_GAME_OPTIONS_CURRENCY_GRD }, ///< greek drachma + { 378, "", CF_NOEURO, "", NBSP "Ft", "HUF", 1, STR_GAME_OPTIONS_CURRENCY_HUF }, ///< hungarian forint + { 130, "", CF_NOEURO, "", NBSP "Kr", "ISK", 1, STR_GAME_OPTIONS_CURRENCY_ISK }, ///< icelandic krona + { 3873, "", 2002, "", NBSP "L.", "ITL", 1, STR_GAME_OPTIONS_CURRENCY_ITL }, ///< italian lira + { 4, "", 2002, "NLG" NBSP, "", "NLG", 0, STR_GAME_OPTIONS_CURRENCY_NLG }, ///< dutch gulden + { 12, "", CF_NOEURO, "", NBSP "Kr", "NOK", 1, STR_GAME_OPTIONS_CURRENCY_NOK }, ///< norwegian krone + { 6, "", CF_NOEURO, "", NBSP u8"z\u0142", "PLN", 1, STR_GAME_OPTIONS_CURRENCY_PLN }, ///< polish zloty + { 5, "", CF_NOEURO, "", NBSP "Lei", "RON", 1, STR_GAME_OPTIONS_CURRENCY_RON }, ///< romanian leu + { 50, "", CF_NOEURO, "", NBSP "p", "RUR", 1, STR_GAME_OPTIONS_CURRENCY_RUR }, ///< russian rouble + { 479, "", 2007, "", NBSP "SIT", "SIT", 1, STR_GAME_OPTIONS_CURRENCY_SIT }, ///< slovenian tolar + { 13, "", CF_NOEURO, "", NBSP "Kr", "SEK", 1, STR_GAME_OPTIONS_CURRENCY_SEK }, ///< swedish krona + { 3, "", CF_NOEURO, "", NBSP "TL", "TRY", 1, STR_GAME_OPTIONS_CURRENCY_TRY }, ///< turkish lira + { 60, "", 2009, "", NBSP "Sk", "SKK", 1, STR_GAME_OPTIONS_CURRENCY_SKK }, ///< slovak koruna + { 4, "", CF_NOEURO, "R$" NBSP, "", "BRL", 0, STR_GAME_OPTIONS_CURRENCY_BRL }, ///< brazil real + { 31, "", 2011, "", NBSP "EEK", "EEK", 1, STR_GAME_OPTIONS_CURRENCY_EEK }, ///< estonian krooni + { 4, "", 2015, "", NBSP "Lt", "LTL", 1, STR_GAME_OPTIONS_CURRENCY_LTL }, ///< lithuanian litas + { 1850, "", CF_NOEURO, u8"\u20a9", "", "KRW", 0, STR_GAME_OPTIONS_CURRENCY_KRW }, ///< south korean won + { 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) + { 3, "", CF_NOEURO, "", NBSP "GEL", "GEL", 1, STR_GAME_OPTIONS_CURRENCY_GEL }, ///< Georgian Lari + { 4901, "", CF_NOEURO, "", NBSP "Rls", "IRR", 1, STR_GAME_OPTIONS_CURRENCY_IRR }, ///< Iranian Rial + { 80, "", CF_NOEURO, "", NBSP "rub", "RUB", 1, STR_GAME_OPTIONS_CURRENCY_RUB }, ///< New Russian Ruble + { 24, "", CF_NOEURO, "$", "", "MXN", 0, STR_GAME_OPTIONS_CURRENCY_MXN }, ///< Mexican peso + { 40, "", CF_NOEURO, "NTD" NBSP, "", "NTD", 0, STR_GAME_OPTIONS_CURRENCY_NTD }, ///< new taiwan dollar + { 8, "", CF_NOEURO, u8"\u00a5", "", "CNY", 0, STR_GAME_OPTIONS_CURRENCY_CNY }, ///< chinese renminbi + { 10, "", CF_NOEURO, "HKD" NBSP, "", "HKD", 0, STR_GAME_OPTIONS_CURRENCY_HKD }, ///< hong kong dollar + { 90, "", CF_NOEURO, u8"\u20b9", "", "INR", 0, STR_GAME_OPTIONS_CURRENCY_INR }, ///< Indian Rupee + { 19, "", CF_NOEURO, "Rp", "", "IDR", 0, STR_GAME_OPTIONS_CURRENCY_IDR }, ///< Indonesian Rupiah + { 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; -} diff --git a/src/currency.h b/src/currency.h index 10caa59d3a..a144ecce77 100644 --- a/src/currency.h +++ b/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) : - rate(rate), separator(separator), to_euro(to_euro), prefix(prefix), suffix(suffix), symbol_pos(symbol_pos), name(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), 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 */ diff --git a/src/date_gui.cpp b/src/date_gui.cpp index 550759df71..7d4babee97 100644 --- a/src/date_gui.cpp +++ b/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); - item->SetParam(0, i); - list.emplace_back(item); + SetDParam(0, i); + list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false)); } 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); - item->SetParam(0, i); - list.emplace_back(item); + SetDParam(0, i); + list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false)); } 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); - item->SetParam(0, i); - list.emplace_back(item); + SetDParam(0, i); + list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false)); } selected = MINUTES_HOUR(minutes); diff --git a/src/fileio.cpp b/src/fileio.cpp index 2a5c042c22..c6a5f8911e 100644 --- a/src/fileio.cpp +++ b/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()) { diff --git a/src/fios.cpp b/src/fios.cpp index ea8a106755..ecf269b7c6 100644 --- a/src/fios.cpp +++ b/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 diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index de2bcb5f21..ff6fa17e68 100644 --- a/src/fios_gui.cpp +++ b/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()) { diff --git a/src/fontcache.cpp b/src/fontcache.cpp index 39493948dc..0168cd4345 100644 --- a/src/fontcache.cpp +++ b/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) */ diff --git a/src/fontcache/freetypefontcache.cpp b/src/fontcache/freetypefontcache.cpp index d568949bd5..d6a1e1b843 100644 --- a/src/fontcache/freetypefontcache.cpp +++ b/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 */ diff --git a/src/fontdetection.h b/src/fontdetection.h index a0242fda1f..2a316da505 100644 --- a/src/fontdetection.h +++ b/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 diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp index 1ea72afd56..62a97ec7b6 100644 --- a/src/game/game_gui.cpp +++ b/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); diff --git a/src/gamelog.cpp b/src/gamelog.cpp index e22c4cf329..413d9532b3 100644 --- a/src/gamelog.cpp +++ b/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 . */ -/** @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" diff --git a/src/gamelog.h b/src/gamelog.h index 40277483f2..1d30092228 100644 --- a/src/gamelog.h +++ b/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 . */ -/** @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 diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp index de7a865247..4e9887f5fe 100644 --- a/src/genworld_gui.cpp +++ b/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_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, 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_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING1, 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_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); - item->SetParam(0, 1LL << i); - list.emplace_back(item); + SetDParam(0, 1LL << i); + list.emplace_back(new DropDownListStringItem((i + other_dimension > MAX_MAP_TILES_BITS) ? STR_RED_INT : STR_JUST_INT, i, false)); } return list; diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp index bf05ba3ce7..b2c2cc33a8 100644 --- a/src/gfxinit.cpp +++ b/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; diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp index 72879d0287..72eaf3aab1 100644 --- a/src/goal_gui.cpp +++ b/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), diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp index 4a40df79fe..5a87eed1ab 100644 --- a/src/hotkeys.cpp +++ b/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); - item->SetValue(SaveKeycodes(hotkey)); + IniItem &item = group->GetOrCreateItem(hotkey->name); + item.SetValue(SaveKeycodes(hotkey)); } } diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 4dffaefca5..f4535fde09 100644 --- a/src/industry_gui.cpp +++ b/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; diff --git a/src/ini_load.cpp b/src/ini_load.cpp index 1b6532022e..e3a4687082 100644 --- a/src/ini_load.cpp +++ b/src/ini_load.cpp @@ -82,22 +82,32 @@ IniGroup::~IniGroup() } /** - * Get the item with the given name, and if it doesn't exist - * and create is true it creates a new item. + * Get the item with the given name. * @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)); } /** diff --git a/src/ini_type.h b/src/ini_type.h index 172679c532..cbce42ca52 100644 --- a/src/ini_type.h +++ b/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(); }; diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index f445b0d62d..06be8a8530 100644 --- a/src/intro_gui.cpp +++ b/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) ); diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index c11b554570..c75d9947ab 100644 --- a/src/lang/afrikaans.txt +++ b/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_USD :Amerikaanse Dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japannese Jen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Oostenrykse Schilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgiese Frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Switserse Frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tsjeggiese Kroon (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Duitse Mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Deense Krone (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spaanse Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finse Markka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franse Frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Griekse Dragma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Hongaarse Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Yslandse Kroon (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italiaanse Lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nederlandse Gulde (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Noorweegse Kroon (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poolse Zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Roemeense Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russiese Roebel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Sloweense Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Sweedse Kroon (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkse Lire (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slowaakse Kroon (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliaanse Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estniese Kroon (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litause Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Suid Koreanse Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Suid Afrikaanse Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Britse Pond +STR_GAME_OPTIONS_CURRENCY_USD :Amerikaanse Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japannese Jen +STR_GAME_OPTIONS_CURRENCY_ATS :Oostenrykse Schilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgiese Frank +STR_GAME_OPTIONS_CURRENCY_CHF :Switserse Frank +STR_GAME_OPTIONS_CURRENCY_CZK :Tsjeggiese Kroon +STR_GAME_OPTIONS_CURRENCY_DEM :Duitse Mark +STR_GAME_OPTIONS_CURRENCY_DKK :Deense Krone +STR_GAME_OPTIONS_CURRENCY_ESP :Spaanse Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finse Markka +STR_GAME_OPTIONS_CURRENCY_FRF :Franse Frank +STR_GAME_OPTIONS_CURRENCY_GRD :Griekse Dragma +STR_GAME_OPTIONS_CURRENCY_HUF :Hongaarse Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Yslandse Kroon +STR_GAME_OPTIONS_CURRENCY_ITL :Italiaanse Lire +STR_GAME_OPTIONS_CURRENCY_NLG :Nederlandse Gulde +STR_GAME_OPTIONS_CURRENCY_NOK :Noorweegse Kroon +STR_GAME_OPTIONS_CURRENCY_PLN :Poolse Zloty +STR_GAME_OPTIONS_CURRENCY_RON :Roemeense Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russiese Roebel +STR_GAME_OPTIONS_CURRENCY_SIT :Sloweense Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Sweedse Kroon +STR_GAME_OPTIONS_CURRENCY_TRY :Turkse Lire +STR_GAME_OPTIONS_CURRENCY_SKK :Slowaakse Kroon +STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliaanse Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estniese Kroon +STR_GAME_OPTIONS_CURRENCY_LTL :Litause Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Suid Koreanse Won +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_IRR :Iraanse Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nuwe Russiese Ruble (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexikaanse peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nuwe Taiwan dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgiaanse Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iraanse Rial +STR_GAME_OPTIONS_CURRENCY_RUB :Nuwe Russiese Ruble +STR_GAME_OPTIONS_CURRENCY_MXN :Mexikaanse peso +STR_GAME_OPTIONS_CURRENCY_NTD :Nuwe Taiwan dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi +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_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Klank -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Koppelvlak -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Algemeen -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Vertoonvensters -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruksie -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nuus / Raad -STR_CONFIG_SETTING_COMPANY :{ORANGE}Maatskappy -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Rekeningkunde -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Voertuie -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fisika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Roete -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Beperkings -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Ongelukke & rampe -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Land skepping -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Omgewing -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Stadsrade -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Dorpe -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Nywerhede -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Vragverspreiding -STR_CONFIG_SETTING_AI :{ORANGE}Mededingers -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Rekenaar spelers +STR_CONFIG_SETTING_LOCALISATION :Eenhede +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Klank +STR_CONFIG_SETTING_INTERFACE :Koppelvlak +STR_CONFIG_SETTING_INTERFACE_GENERAL :Algemeen +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Vertoonvensters +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruksie +STR_CONFIG_SETTING_ADVISORS :Nuus / Raad +STR_CONFIG_SETTING_COMPANY :Maatskappy +STR_CONFIG_SETTING_ACCOUNTING :Rekeningkunde +STR_CONFIG_SETTING_VEHICLES :Voertuie +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fisika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Roete +STR_CONFIG_SETTING_LIMITATIONS :Beperkings +STR_CONFIG_SETTING_ACCIDENTS :Ongelukke & rampe +STR_CONFIG_SETTING_GENWORLD :Land skepping +STR_CONFIG_SETTING_ENVIRONMENT :Omgewing +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Stadsrade +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Dorpe +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Nywerhede +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Vragverspreiding +STR_CONFIG_SETTING_AI :Mededingers +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) diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index a8086688d4..578b91f7a8 100644 --- a/src/lang/arabic_egypt.txt +++ b/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_USD :دولار ($) -STR_GAME_OPTIONS_CURRENCY_EUR :يورو (€) -STR_GAME_OPTIONS_CURRENCY_JPY :ين (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :شلنق استرالي (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :فرنك بلجيكي (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :فرنك سويسري (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :كرونا تشيكية (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :مارك الماني (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :كرونا دنمركي -STR_GAME_OPTIONS_CURRENCY_ESP :بيستا (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :ماركا فنلندي(FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :فرنك (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :دراخما يونانية (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :فورنت هنغاري (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :كرونا ايسلاندية (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :ليرة ايطالية (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :غلدر هولندي (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :كرونا نرويجية (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :زلوتي بولندي (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :لور يوناني (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :روبل روسي (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :تولار سوفاني (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :كرونا سويدية (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :ليرة تركية (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :كرونا سلوفاكية (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :ريال برازيلي (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :كرونا استونية (EEK) -STR_GAME_OPTIONS_CURRENCY_KRW :وون كوريا الجنوبية (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :راند جنوب أفريقيا (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :جنية +STR_GAME_OPTIONS_CURRENCY_USD :دولار +STR_GAME_OPTIONS_CURRENCY_EUR :يورو +STR_GAME_OPTIONS_CURRENCY_JPY :ين +STR_GAME_OPTIONS_CURRENCY_ATS :شلنق استرالي +STR_GAME_OPTIONS_CURRENCY_BEF :فرنك بلجيكي +STR_GAME_OPTIONS_CURRENCY_CHF :فرنك سويسري +STR_GAME_OPTIONS_CURRENCY_CZK :كرونا تشيكية +STR_GAME_OPTIONS_CURRENCY_DEM :مارك الماني +STR_GAME_OPTIONS_CURRENCY_DKK :كرونا د +STR_GAME_OPTIONS_CURRENCY_ESP :بيستا +STR_GAME_OPTIONS_CURRENCY_FIM :ماركا فنلندي +STR_GAME_OPTIONS_CURRENCY_FRF :فرنك +STR_GAME_OPTIONS_CURRENCY_GRD :دراخما يونانية +STR_GAME_OPTIONS_CURRENCY_HUF :فورنت هنغاري +STR_GAME_OPTIONS_CURRENCY_ISK :كرونا ايسلاندية +STR_GAME_OPTIONS_CURRENCY_ITL :ليرة ايطالية +STR_GAME_OPTIONS_CURRENCY_NLG :غلدر هولندي +STR_GAME_OPTIONS_CURRENCY_NOK :كرونا نرويجية +STR_GAME_OPTIONS_CURRENCY_PLN :زلوتي بولندي +STR_GAME_OPTIONS_CURRENCY_RON :لور يوناني +STR_GAME_OPTIONS_CURRENCY_RUR :روبل روسي +STR_GAME_OPTIONS_CURRENCY_SIT :تولار سوفاني +STR_GAME_OPTIONS_CURRENCY_SEK :كرونا سويدية +STR_GAME_OPTIONS_CURRENCY_TRY :ليرة تركية +STR_GAME_OPTIONS_CURRENCY_SKK :كرونا سلوفاكية +STR_GAME_OPTIONS_CURRENCY_BRL :ريال برازيلي +STR_GAME_OPTIONS_CURRENCY_EEK :كرونا استونية +STR_GAME_OPTIONS_CURRENCY_KRW :وون كوريا الجنوبية +STR_GAME_OPTIONS_CURRENCY_ZAR :راند جنوب أفريقيا STR_GAME_OPTIONS_CURRENCY_CUSTOM :مخصص ... -STR_GAME_OPTIONS_CURRENCY_GEL :(GEL) لاري جورجي -STR_GAME_OPTIONS_CURRENCY_NTD :الدولار التايواني الجديد (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :(CNY) الرنمينبي الصيني -STR_GAME_OPTIONS_CURRENCY_HKD :(HKD) دولار هونج كونج -STR_GAME_OPTIONS_CURRENCY_INR :الروبية الهندية (INR) +STR_GAME_OPTIONS_CURRENCY_GEL :لاري جورجي +STR_GAME_OPTIONS_CURRENCY_NTD :الدولار التايواني الجديد +STR_GAME_OPTIONS_CURRENCY_CNY :الرنمينبي الصيني +STR_GAME_OPTIONS_CURRENCY_HKD :دولار هونج كونج +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_SOUND :{ORANGE}الصوت -STR_CONFIG_SETTING_INTERFACE :{ORANGE}النظام البيني -STR_CONFIG_SETTING_INTERFACE_GENERAL :عموم{ORANGE} -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :مجالات رؤية {ORANGE} -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}البناء -STR_CONFIG_SETTING_ADVISORS :{ORANGE}أخبار\ مستشارون -STR_CONFIG_SETTING_COMPANY :شركة{ORANGE} -STR_CONFIG_SETTING_ACCOUNTING :حسابات{ORANGE} -STR_CONFIG_SETTING_VEHICLES :{ORANGE}المركبات -STR_CONFIG_SETTING_VEHICLES_PHYSICS :فيزياء{ORANGE} -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE} المسارات -STR_CONFIG_SETTING_LIMITATIONS :حدود {ORANGE} -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE} كوارث\حوادث -STR_CONFIG_SETTING_GENWORLD :تكوين عالم {ORANGE} -STR_CONFIG_SETTING_ENVIRONMENT :بيئة {ORANGE} -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :سلطات {ORANGE} -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE} مدن -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE} مصانع -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :توزيع البضائع{ORANGE} -STR_CONFIG_SETTING_AI :{ORANGE}المتنافسين -STR_CONFIG_SETTING_AI_NPC :{ORANGE} لاعبين الحاسوب -STR_CONFIG_SETTING_NETWORK :{ORANGE}شبكة الاتصال +STR_CONFIG_SETTING_GRAPHICS :رسوميات +STR_CONFIG_SETTING_SOUND :الصوت +STR_CONFIG_SETTING_INTERFACE :النظام البيني +STR_CONFIG_SETTING_INTERFACE_GENERAL :عموم +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :مجالات رؤية +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :البناء +STR_CONFIG_SETTING_ADVISORS :أخبار\ مستشارون +STR_CONFIG_SETTING_COMPANY :شركة +STR_CONFIG_SETTING_ACCOUNTING :حسابات +STR_CONFIG_SETTING_VEHICLES :المركبات +STR_CONFIG_SETTING_VEHICLES_PHYSICS :فيزياء +STR_CONFIG_SETTING_VEHICLES_ROUTING :المسارات +STR_CONFIG_SETTING_LIMITATIONS :حدود +STR_CONFIG_SETTING_ACCIDENTS :كوارث\حوادث +STR_CONFIG_SETTING_GENWORLD :تكوين عالم +STR_CONFIG_SETTING_ENVIRONMENT :بيئة +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :سلطات +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :مدن +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :مصانع +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :توزيع البضائع +STR_CONFIG_SETTING_AI :المتنافسين +STR_CONFIG_SETTING_AI_NPC : لاعبين الحاسوب +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} diff --git a/src/lang/basque.txt b/src/lang/basque.txt index 312984cf93..f4b6c21e16 100644 --- a/src/lang/basque.txt +++ b/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_USD :Dolar Amerikarrak (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euroa (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yena (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Txelin Austriarra (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franko Belgikarra (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Suitzar Frankoa (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Koroa Txekoa (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marko Alemaniarra (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danierar Koroa (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Pezeta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marko Finlandiarra (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Frankoa (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Grekoa (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florin Hungariarra (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Koro Islandiarra (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italiarra (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Herbeheretako Florina (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norvegiar Koroa (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zloty Poloniarra (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Errumaniarra (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Errusiar Rubloa (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Esloveniarra (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Suediar Koroa (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turkiarra (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Eslovakiar Koroa (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Erreal Brasildarra (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estoniar Koroa (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lituaniako Litas-ak (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Hego koreako Won-a (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Hego Afrikako Rand-a (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra +STR_GAME_OPTIONS_CURRENCY_USD :Dolar Amerikarrak +STR_GAME_OPTIONS_CURRENCY_EUR :Euroa +STR_GAME_OPTIONS_CURRENCY_JPY :Yena +STR_GAME_OPTIONS_CURRENCY_ATS :Txelin Austriarra +STR_GAME_OPTIONS_CURRENCY_BEF :Franko Belgikarra +STR_GAME_OPTIONS_CURRENCY_CHF :Suitzar Frankoa +STR_GAME_OPTIONS_CURRENCY_CZK :Koroa Txekoa +STR_GAME_OPTIONS_CURRENCY_DEM :Marko Alemaniarra +STR_GAME_OPTIONS_CURRENCY_DKK :Danierar Koroa +STR_GAME_OPTIONS_CURRENCY_ESP :Pezeta +STR_GAME_OPTIONS_CURRENCY_FIM :Marko Finlandiarra +STR_GAME_OPTIONS_CURRENCY_FRF :Frankoa +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Grekoa +STR_GAME_OPTIONS_CURRENCY_HUF :Florin Hungariarra +STR_GAME_OPTIONS_CURRENCY_ISK :Koro Islandiarra +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italiarra +STR_GAME_OPTIONS_CURRENCY_NLG :Herbeheretako Florina +STR_GAME_OPTIONS_CURRENCY_NOK :Norvegiar Koroa +STR_GAME_OPTIONS_CURRENCY_PLN :Zloty Poloniarra +STR_GAME_OPTIONS_CURRENCY_RON :Leu Errumaniarra +STR_GAME_OPTIONS_CURRENCY_RUR :Errusiar Rubloa +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Esloveniarra +STR_GAME_OPTIONS_CURRENCY_SEK :Suediar Koroa +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turkiarra +STR_GAME_OPTIONS_CURRENCY_SKK :Eslovakiar Koroa +STR_GAME_OPTIONS_CURRENCY_BRL :Erreal Brasildarra +STR_GAME_OPTIONS_CURRENCY_EEK :Estoniar Koroa +STR_GAME_OPTIONS_CURRENCY_LTL :Lituaniako Litas-ak +STR_GAME_OPTIONS_CURRENCY_KRW :Hego koreako Won-a +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_IRR :Rial Iraniarra (IRR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgiarra +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_GRAPHICS :{ORANGE}Grafikoak -STR_CONFIG_SETTING_SOUND :{ORANGE}Soinua -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfazea -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Orokorra -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Leihoak -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Eraikuntza -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Albisteak / Aholkulariak -STR_CONFIG_SETTING_COMPANY :{ORANGE}Konpainia -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Ibilgailuak -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fisika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Ibilbideak -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Mugak -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Hondamendiak / Istripuak -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Mundua sortu -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Ingurugiroa -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Agintariak -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Herriak -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industriak -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Zama banaketa -STR_CONFIG_SETTING_AI :{ORANGE}Lehiakideak -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Ordenagailu jokalariak +STR_CONFIG_SETTING_LOCALISATION :Kokapena +STR_CONFIG_SETTING_GRAPHICS :Grafikoak +STR_CONFIG_SETTING_SOUND :Soinua +STR_CONFIG_SETTING_INTERFACE :Interfazea +STR_CONFIG_SETTING_INTERFACE_GENERAL :Orokorra +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Leihoak +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Eraikuntza +STR_CONFIG_SETTING_ADVISORS :Albisteak / Aholkulariak +STR_CONFIG_SETTING_COMPANY :Konpainia +STR_CONFIG_SETTING_VEHICLES :Ibilgailuak +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fisika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Ibilbideak +STR_CONFIG_SETTING_LIMITATIONS :Mugak +STR_CONFIG_SETTING_ACCIDENTS :Hondamendiak / Istripuak +STR_CONFIG_SETTING_GENWORLD :Mundua sortu +STR_CONFIG_SETTING_ENVIRONMENT :Ingurugiroa +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Agintariak +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Herriak +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industriak +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Zama banaketa +STR_CONFIG_SETTING_AI :Lehiakideak +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) diff --git a/src/lang/belarusian.txt b/src/lang/belarusian.txt index 40500bae8e..a4a0e2add4 100644 --- a/src/lang/belarusian.txt +++ b/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_USD :Даляр ЗША ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Эўра (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Японская ена (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Аўстралійскі шылінг (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Бэльґійскі франк (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Швайцарскі франк (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Чэская крона (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Нямецкая марка (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Дацкая крона (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Гішпанская пэсэта (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Фінская марка (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Францускі франк (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Грэцкая драхма (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Вугорскі форынт (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Ісьляндзкая крона (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Італьянская ліра (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Нідэрляндзкі гульдэн (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Нарвэская крона (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Польскі злоты (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Румынскі лей (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Расейскі рубель (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Славенскі толар (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Швэдзкая крона (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Турэцкая ліра (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Славацкая каруна (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Бразыльскі рэал (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Эстонская крона (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Летувiскi лiт (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Паўднёвакарэйская вона (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Паўднёваафрыканскі рэнд (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Брытанскі фунт +STR_GAME_OPTIONS_CURRENCY_USD :Даляр ЗША +STR_GAME_OPTIONS_CURRENCY_EUR :Эўра +STR_GAME_OPTIONS_CURRENCY_JPY :Японская ена +STR_GAME_OPTIONS_CURRENCY_ATS :Аўстралійскі шылінг +STR_GAME_OPTIONS_CURRENCY_BEF :Бэльґійскі франк +STR_GAME_OPTIONS_CURRENCY_CHF :Швайцарскі франк +STR_GAME_OPTIONS_CURRENCY_CZK :Чэская крона +STR_GAME_OPTIONS_CURRENCY_DEM :Нямецкая марка +STR_GAME_OPTIONS_CURRENCY_DKK :Дацкая крона +STR_GAME_OPTIONS_CURRENCY_ESP :Гішпанская пэсэта +STR_GAME_OPTIONS_CURRENCY_FIM :Фінская марка +STR_GAME_OPTIONS_CURRENCY_FRF :Францускі франк +STR_GAME_OPTIONS_CURRENCY_GRD :Грэцкая драхма +STR_GAME_OPTIONS_CURRENCY_HUF :Вугорскі форынт +STR_GAME_OPTIONS_CURRENCY_ISK :Ісьляндзкая крона +STR_GAME_OPTIONS_CURRENCY_ITL :Італьянская ліра +STR_GAME_OPTIONS_CURRENCY_NLG :Нідэрляндзкі гульдэн +STR_GAME_OPTIONS_CURRENCY_NOK :Нарвэская крона +STR_GAME_OPTIONS_CURRENCY_PLN :Польскі злоты +STR_GAME_OPTIONS_CURRENCY_RON :Румынскі лей +STR_GAME_OPTIONS_CURRENCY_RUR :Расейскі рубель +STR_GAME_OPTIONS_CURRENCY_SIT :Славенскі толар +STR_GAME_OPTIONS_CURRENCY_SEK :Швэдзкая крона +STR_GAME_OPTIONS_CURRENCY_TRY :Турэцкая ліра +STR_GAME_OPTIONS_CURRENCY_SKK :Славацкая каруна +STR_GAME_OPTIONS_CURRENCY_BRL :Бразыльскі рэал +STR_GAME_OPTIONS_CURRENCY_EEK :Эстонская крона +STR_GAME_OPTIONS_CURRENCY_LTL :Летувiскi лiт +STR_GAME_OPTIONS_CURRENCY_KRW :Паўднёвакарэйская вона +STR_GAME_OPTIONS_CURRENCY_ZAR :Паўднёваафрыканскі рэнд STR_GAME_OPTIONS_CURRENCY_CUSTOM :Уласная... -STR_GAME_OPTIONS_CURRENCY_GEL :Грузінскі лары (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Іранскі рыал (IRR) -STR_GAME_OPTIONS_CURRENCY_MXN :Мексіканскі песа (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Новы тайваньскі даляр (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Кітайскі юань (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Ганконскі даляр (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Індыйская рупія (INR) +STR_GAME_OPTIONS_CURRENCY_GEL :Грузінскі лары +STR_GAME_OPTIONS_CURRENCY_IRR :Іранскі рыал +STR_GAME_OPTIONS_CURRENCY_MXN :Мексіканскі песа +STR_GAME_OPTIONS_CURRENCY_NTD :Новы тайваньскі даляр +STR_GAME_OPTIONS_CURRENCY_CNY :Кітайскі юань +STR_GAME_OPTIONS_CURRENCY_HKD :Ганконскі даляр +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_GRAPHICS :{ORANGE}Графіка -STR_CONFIG_SETTING_SOUND :{ORANGE}Гукавыя эфэкты -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Інтэрфэйс -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Агульныя наладкі -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Вокны прагляду -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Будаўніцтва -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Навіны і інфармацыя -STR_CONFIG_SETTING_COMPANY :{ORANGE}Кампанія -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Фінансы -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Транспарт -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Фізічная мадэль -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Маршруты -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Абмежаваньні -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Аварыі і катастрофы -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Стварэньне мапы -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Навакольнае асяроддзе -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Гарадская адміністрацыя -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Населеныя пункты -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Прамысловасьць -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Разьмеркаваньне грузаў -STR_CONFIG_SETTING_AI :{ORANGE}Канкурэнты -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Кампутарныя гульцы +STR_CONFIG_SETTING_LOCALISATION :Лакалізацыя +STR_CONFIG_SETTING_GRAPHICS :Графіка +STR_CONFIG_SETTING_SOUND :Гукавыя эфэкты +STR_CONFIG_SETTING_INTERFACE :Інтэрфэйс +STR_CONFIG_SETTING_INTERFACE_GENERAL :Агульныя наладкі +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Вокны прагляду +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Будаўніцтва +STR_CONFIG_SETTING_ADVISORS :Навіны і інфармацыя +STR_CONFIG_SETTING_COMPANY :Кампанія +STR_CONFIG_SETTING_ACCOUNTING :Фінансы +STR_CONFIG_SETTING_VEHICLES :Транспарт +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Фізічная мадэль +STR_CONFIG_SETTING_VEHICLES_ROUTING :Маршруты +STR_CONFIG_SETTING_LIMITATIONS :Абмежаваньні +STR_CONFIG_SETTING_ACCIDENTS :Аварыі і катастрофы +STR_CONFIG_SETTING_GENWORLD :Стварэньне мапы +STR_CONFIG_SETTING_ENVIRONMENT :Навакольнае асяроддзе +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Гарадская адміністрацыя +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Населеныя пункты +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Прамысловасьць +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Разьмеркаваньне грузаў +STR_CONFIG_SETTING_AI :Канкурэнты +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) diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 99707987d3..4659fd800c 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/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_USD :Dólares Norte Americanos (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Iene Japonês (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Xelim Austríaco (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franco Belga (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franco Suíço (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Coroa Checa (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marco Alemão (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Coroa Dinamarquesa (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Espanhola (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marco Finlandês (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franco Francês (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Dracma Grego (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint Húngaro (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Coroa Islandesa (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Guilda Holandesa (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Coroa Norueguesa (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Polonês (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Lei Romeno (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rublo Russo (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Eslovênio (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Coroa Sueca (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turca (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Coroa Eslovaca (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real Brasileiro (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Coroa Estoniana (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lituano (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won Sul-Coreano (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Sul-Africano (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Libras Britânicas +STR_GAME_OPTIONS_CURRENCY_USD :Dólares Norte Americanos +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Iene Japonês +STR_GAME_OPTIONS_CURRENCY_ATS :Xelim Austríaco +STR_GAME_OPTIONS_CURRENCY_BEF :Franco Belga +STR_GAME_OPTIONS_CURRENCY_CHF :Franco Suíço +STR_GAME_OPTIONS_CURRENCY_CZK :Coroa Checa +STR_GAME_OPTIONS_CURRENCY_DEM :Marco Alemão +STR_GAME_OPTIONS_CURRENCY_DKK :Coroa Dinamarquesa +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Espanhola +STR_GAME_OPTIONS_CURRENCY_FIM :Marco Finlandês +STR_GAME_OPTIONS_CURRENCY_FRF :Franco Francês +STR_GAME_OPTIONS_CURRENCY_GRD :Dracma Grego +STR_GAME_OPTIONS_CURRENCY_HUF :Forint Húngaro +STR_GAME_OPTIONS_CURRENCY_ISK :Coroa Islandesa +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Guilda Holandesa +STR_GAME_OPTIONS_CURRENCY_NOK :Coroa Norueguesa +STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Polonês +STR_GAME_OPTIONS_CURRENCY_RON :Lei Romeno +STR_GAME_OPTIONS_CURRENCY_RUR :Rublo Russo +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Eslovênio +STR_GAME_OPTIONS_CURRENCY_SEK :Coroa Sueca +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turca +STR_GAME_OPTIONS_CURRENCY_SKK :Coroa Eslovaca +STR_GAME_OPTIONS_CURRENCY_BRL :Real Brasileiro +STR_GAME_OPTIONS_CURRENCY_EEK :Coroa Estoniana +STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lituano +STR_GAME_OPTIONS_CURRENCY_KRW :Won Sul-Coreano +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_RUB :Novo Rublo Russo (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexicano (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Novo dólar de Taiwan (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chinês (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dólar de Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rúpia Indiana (INR) +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iraniano +STR_GAME_OPTIONS_CURRENCY_RUB :Novo Rublo Russo +STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexicano +STR_GAME_OPTIONS_CURRENCY_NTD :Novo dólar de Taiwan +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chinês +STR_GAME_OPTIONS_CURRENCY_HKD :Dólar de Hong Kong +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_GRAPHICS :{ORANGE}Gráficos -STR_CONFIG_SETTING_SOUND :{ORANGE}Som -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Geral -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Janelas de visualização -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construção -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Notícias / Conselheiros -STR_CONFIG_SETTING_COMPANY :{ORANGE}Companhia -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Contabilidade -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Veículos -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Física -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Rota -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitações -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Desastres / Acidentes -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Geração de Mundo -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Meio-Ambiente -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoridades -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE} Cidades -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Indústrias -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribuição de Carga -STR_CONFIG_SETTING_AI :{ORANGE}Oponentes -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computadores -STR_CONFIG_SETTING_NETWORK :{ORANGE}Rede +STR_CONFIG_SETTING_LOCALISATION :Localização +STR_CONFIG_SETTING_GRAPHICS :Gráficos +STR_CONFIG_SETTING_SOUND :Som +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :Geral +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Janelas de visualização +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construção +STR_CONFIG_SETTING_ADVISORS :Notícias / Conselheiros +STR_CONFIG_SETTING_COMPANY :Companhia +STR_CONFIG_SETTING_ACCOUNTING :Contabilidade +STR_CONFIG_SETTING_VEHICLES :Veículos +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Física +STR_CONFIG_SETTING_VEHICLES_ROUTING :Rota +STR_CONFIG_SETTING_LIMITATIONS :Limitações +STR_CONFIG_SETTING_ACCIDENTS :Desastres / Acidentes +STR_CONFIG_SETTING_GENWORLD :Geração de Mundo +STR_CONFIG_SETTING_ENVIRONMENT :Meio-Ambiente +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoridades +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS : Cidades +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Indústrias +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribuição de Carga +STR_CONFIG_SETTING_AI :Oponentes +STR_CONFIG_SETTING_AI_NPC :Computadores +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_DEPARTURE_ABBREVIATION :P: +STR_TIMETABLE_ARRIVAL :C: {COLOUR}{DATE_TINY} +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} diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index fc4aafa6e2..b8e77b4bd8 100644 --- a/src/lang/bulgarian.txt +++ b/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_USD :Американски долар ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Евро (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Японска йена (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :австрийски шилинг (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :белгийски франк (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :швейцарски франк (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :чешка крона (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :германска марка (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :датска крона (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Испанска песета (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :финландска марка (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Френски франк (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :гръцка драхма (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :унгарски форинт (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :исландска крона (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :италианска лира (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :холандски гулден (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :норвежка крона (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Полска злота (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :румънска лея (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :руска рубла (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :словенски толар (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :шведска крона (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :турска лира (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :словашка крона (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :бразилски реал (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Естонски крони (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Литовски Литас (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Южнокорейски Вон (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Южноафрикански Ранд (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Британска лира +STR_GAME_OPTIONS_CURRENCY_USD :Американски долар +STR_GAME_OPTIONS_CURRENCY_EUR :Евро +STR_GAME_OPTIONS_CURRENCY_JPY :Японска йена +STR_GAME_OPTIONS_CURRENCY_ATS :австрийски шилинг +STR_GAME_OPTIONS_CURRENCY_BEF :белгийски франк +STR_GAME_OPTIONS_CURRENCY_CHF :швейцарски франк +STR_GAME_OPTIONS_CURRENCY_CZK :чешка крона +STR_GAME_OPTIONS_CURRENCY_DEM :германска марка +STR_GAME_OPTIONS_CURRENCY_DKK :датска крона +STR_GAME_OPTIONS_CURRENCY_ESP :Испанска песета +STR_GAME_OPTIONS_CURRENCY_FIM :финландска марка +STR_GAME_OPTIONS_CURRENCY_FRF :Френски франк +STR_GAME_OPTIONS_CURRENCY_GRD :гръцка драхма +STR_GAME_OPTIONS_CURRENCY_HUF :унгарски форинт +STR_GAME_OPTIONS_CURRENCY_ISK :исландска крона +STR_GAME_OPTIONS_CURRENCY_ITL :италианска лира +STR_GAME_OPTIONS_CURRENCY_NLG :холандски гулден +STR_GAME_OPTIONS_CURRENCY_NOK :норвежка крона +STR_GAME_OPTIONS_CURRENCY_PLN :Полска злота +STR_GAME_OPTIONS_CURRENCY_RON :румънска лея +STR_GAME_OPTIONS_CURRENCY_RUR :руска рубла +STR_GAME_OPTIONS_CURRENCY_SIT :словенски толар +STR_GAME_OPTIONS_CURRENCY_SEK :шведска крона +STR_GAME_OPTIONS_CURRENCY_TRY :турска лира +STR_GAME_OPTIONS_CURRENCY_SKK :словашка крона +STR_GAME_OPTIONS_CURRENCY_BRL :бразилски реал +STR_GAME_OPTIONS_CURRENCY_EEK :Естонски крони +STR_GAME_OPTIONS_CURRENCY_LTL :Литовски Литас +STR_GAME_OPTIONS_CURRENCY_KRW :Южнокорейски Вон +STR_GAME_OPTIONS_CURRENCY_ZAR :Южноафрикански Ранд STR_GAME_OPTIONS_CURRENCY_CUSTOM :друга... -STR_GAME_OPTIONS_CURRENCY_GEL :Грузинско лари (ГЕЛ) -STR_GAME_OPTIONS_CURRENCY_IRR :Ирански Риал (ИРР) +STR_GAME_OPTIONS_CURRENCY_GEL :Грузинско лари +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_SOUND :{ORANGE}Звукови ефекти -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Интерфейс -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Основни -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Строене -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Автомобили -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Маршрутизация -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ограничения -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Права -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Градове -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Индустрии -STR_CONFIG_SETTING_AI :{ORANGE}Съперници -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Компютърни играчи +STR_CONFIG_SETTING_LOCALISATION :Позициониране +STR_CONFIG_SETTING_SOUND :Звукови ефекти +STR_CONFIG_SETTING_INTERFACE :Интерфейс +STR_CONFIG_SETTING_INTERFACE_GENERAL :Основни +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Строене +STR_CONFIG_SETTING_VEHICLES :Автомобили +STR_CONFIG_SETTING_VEHICLES_ROUTING :Маршрутизация +STR_CONFIG_SETTING_LIMITATIONS :Ограничения +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Права +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Градове +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Индустрии +STR_CONFIG_SETTING_AI :Съперници +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) diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index b44eab9b91..47787d1807 100644 --- a/src/lang/catalan.txt +++ b/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_USD :Dòlar americà (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Ien japonès (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Xíling austríac (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franc belga (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franc suís (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Corona txeca (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marc alemany (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Corona danesa (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Pesseta espanyola (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marc finlandès (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc francès (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Dracma grega (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florí hongarès (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandesa (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Florí neerlandès (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Corona noruega (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polonès (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu romanès (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ruble rus (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar eslovè (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Corona sueca (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Corona eslovaca (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real brasiler (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Corona estoniana (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituà (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won sud-coreà (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sud-africà (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Lliura esterlina +STR_GAME_OPTIONS_CURRENCY_USD :Dòlar americà +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Ien japonès +STR_GAME_OPTIONS_CURRENCY_ATS :Xíling austríac +STR_GAME_OPTIONS_CURRENCY_BEF :Franc belga +STR_GAME_OPTIONS_CURRENCY_CHF :Franc suís +STR_GAME_OPTIONS_CURRENCY_CZK :Corona txeca +STR_GAME_OPTIONS_CURRENCY_DEM :Marc alemany +STR_GAME_OPTIONS_CURRENCY_DKK :Corona danesa +STR_GAME_OPTIONS_CURRENCY_ESP :Pesseta espanyola +STR_GAME_OPTIONS_CURRENCY_FIM :Marc finlandès +STR_GAME_OPTIONS_CURRENCY_FRF :Franc francès +STR_GAME_OPTIONS_CURRENCY_GRD :Dracma grega +STR_GAME_OPTIONS_CURRENCY_HUF :Florí hongarès +STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandesa +STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Florí neerlandès +STR_GAME_OPTIONS_CURRENCY_NOK :Corona noruega +STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polonès +STR_GAME_OPTIONS_CURRENCY_RON :Leu romanès +STR_GAME_OPTIONS_CURRENCY_RUR :Ruble rus +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar eslovè +STR_GAME_OPTIONS_CURRENCY_SEK :Corona sueca +STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca +STR_GAME_OPTIONS_CURRENCY_SKK :Corona eslovaca +STR_GAME_OPTIONS_CURRENCY_BRL :Real brasiler +STR_GAME_OPTIONS_CURRENCY_EEK :Corona estoniana +STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituà +STR_GAME_OPTIONS_CURRENCY_KRW :Won sud-coreà +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_IRR :Rial iranià (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Ruble rus modern (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicà (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nou dòlar taiwanès (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi xinès (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dòlar de Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rúpia índia (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonèsia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgià +STR_GAME_OPTIONS_CURRENCY_IRR :Rial iranià +STR_GAME_OPTIONS_CURRENCY_RUB :Ruble rus modern +STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicà +STR_GAME_OPTIONS_CURRENCY_NTD :Nou dòlar taiwanès +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi xinès +STR_GAME_OPTIONS_CURRENCY_HKD :Dòlar de Hong Kong +STR_GAME_OPTIONS_CURRENCY_INR :Rúpia índia +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonèsia +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_GRAPHICS :{ORANGE}Gràfics -STR_CONFIG_SETTING_SOUND :{ORANGE}Efectes de so -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfície -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}General -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Finestres de visualització -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construcció -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Notícies / Consells -STR_CONFIG_SETTING_COMPANY :{ORANGE}Companyia -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Comptabilitat -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehicles -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Lleis físiques -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Recorreguts -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitacions -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Desastres / Accidents -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generació del món -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Interacció amb l'entorn -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoritats -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Poblacions -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Indústries -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribució de la càrrega -STR_CONFIG_SETTING_AI :{ORANGE}Competidors -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Jugadors IA -STR_CONFIG_SETTING_NETWORK :{ORANGE}Xarxa +STR_CONFIG_SETTING_LOCALISATION :Localització +STR_CONFIG_SETTING_GRAPHICS :Gràfics +STR_CONFIG_SETTING_SOUND :Efectes de so +STR_CONFIG_SETTING_INTERFACE :Interfície +STR_CONFIG_SETTING_INTERFACE_GENERAL :General +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Finestres de visualització +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construcció +STR_CONFIG_SETTING_ADVISORS :Notícies / Consells +STR_CONFIG_SETTING_COMPANY :Companyia +STR_CONFIG_SETTING_ACCOUNTING :Comptabilitat +STR_CONFIG_SETTING_VEHICLES :Vehicles +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Lleis físiques +STR_CONFIG_SETTING_VEHICLES_ROUTING :Recorreguts +STR_CONFIG_SETTING_LIMITATIONS :Limitacions +STR_CONFIG_SETTING_ACCIDENTS :Desastres / Accidents +STR_CONFIG_SETTING_GENWORLD :Generació del món +STR_CONFIG_SETTING_ENVIRONMENT :Interacció amb l'entorn +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoritats +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Poblacions +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Indústries +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribució de la càrrega +STR_CONFIG_SETTING_AI :Competidors +STR_CONFIG_SETTING_AI_NPC :Jugadors IA +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) diff --git a/src/lang/chuvash.txt b/src/lang/chuvash.txt index d2b6ef6380..af60124b6b 100644 --- a/src/lang/chuvash.txt +++ b/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_CONSTRUCTION :{ORANGE}Лартӑм -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Ҫул-йӗр: -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Хуласем -STR_CONFIG_SETTING_AI :{ORANGE}Ӑмӑртуҫӑсем +STR_CONFIG_SETTING_INTERFACE :Интерфейс +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Лартӑм +STR_CONFIG_SETTING_VEHICLES :Ҫул-йӗр: +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Хуласем +STR_CONFIG_SETTING_AI :Ӑмӑртуҫӑсем ###length 2 STR_CONFIG_SETTING_PATHFINDER_NPF :NPF diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 6d82f3d8af..8097fb7f56 100644 --- a/src/lang/croatian.txt +++ b/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_USD :Američki Dolar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanski Jen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Austrijski šiling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski franak (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Švicarski franak (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Češka kruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Njemačka marka (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danska kruna (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Španjolska Pezeta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finska marka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Francuski Franak (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grčka drahma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Mađarski forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandska kruna (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Talijanska lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nizozemski gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norveška kruna (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poljski Zloti (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumunjski lev (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ruske rublje (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenski tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Švedska kruna (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turska lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovačka kruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilski real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estonska kruna (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litvanski Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Južnokorejski Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Južnoafrički Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Funte +STR_GAME_OPTIONS_CURRENCY_USD :Američki Dolar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanski Jen +STR_GAME_OPTIONS_CURRENCY_ATS :Austrijski šiling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski franak +STR_GAME_OPTIONS_CURRENCY_CHF :Švicarski franak +STR_GAME_OPTIONS_CURRENCY_CZK :Češka kruna +STR_GAME_OPTIONS_CURRENCY_DEM :Njemačka marka +STR_GAME_OPTIONS_CURRENCY_DKK :Danska kruna +STR_GAME_OPTIONS_CURRENCY_ESP :Španjolska Pezeta +STR_GAME_OPTIONS_CURRENCY_FIM :Finska marka +STR_GAME_OPTIONS_CURRENCY_FRF :Francuski Franak +STR_GAME_OPTIONS_CURRENCY_GRD :Grčka drahma +STR_GAME_OPTIONS_CURRENCY_HUF :Mađarski forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandska kruna +STR_GAME_OPTIONS_CURRENCY_ITL :Talijanska lira +STR_GAME_OPTIONS_CURRENCY_NLG :Nizozemski gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norveška kruna +STR_GAME_OPTIONS_CURRENCY_PLN :Poljski Zloti +STR_GAME_OPTIONS_CURRENCY_RON :Rumunjski lev +STR_GAME_OPTIONS_CURRENCY_RUR :Ruske rublje +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenski tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Švedska kruna +STR_GAME_OPTIONS_CURRENCY_TRY :Turska lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovačka kruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilski real +STR_GAME_OPTIONS_CURRENCY_EEK :Estonska kruna +STR_GAME_OPTIONS_CURRENCY_LTL :Litvanski Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Južnokorejski Won +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_IRR :Iranski Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nove ruske rublje (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksički Pesos (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Novi Tajvanski Dolar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Kineski Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkonški Dolar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indijska Rupija (INR) +STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijski Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranski Rial +STR_GAME_OPTIONS_CURRENCY_RUB :Nove ruske rublje +STR_GAME_OPTIONS_CURRENCY_MXN :Meksički Pesos +STR_GAME_OPTIONS_CURRENCY_NTD :Novi Tajvanski Dolar +STR_GAME_OPTIONS_CURRENCY_CNY :Kineski Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkonški Dolar +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_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Zvučni efekti -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Sučelje -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Opće -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Pogledi -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Izgradnja -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Novosti / savjetnici -STR_CONFIG_SETTING_COMPANY :{ORANGE}Tvrtka -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Računovodstvo -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vozila -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Rutanje -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ograničenja -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofe / nesreće -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Stvaranje svijeta -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Okoliš -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Vlasti -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Gradovi -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrije -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribucija tereta -STR_CONFIG_SETTING_AI :{ORANGE}Suparnici -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Računalni igrači +STR_CONFIG_SETTING_LOCALISATION :Lokalizacija +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Zvučni efekti +STR_CONFIG_SETTING_INTERFACE :Sučelje +STR_CONFIG_SETTING_INTERFACE_GENERAL :Opće +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Pogledi +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Izgradnja +STR_CONFIG_SETTING_ADVISORS :Novosti / savjetnici +STR_CONFIG_SETTING_COMPANY :Tvrtka +STR_CONFIG_SETTING_ACCOUNTING :Računovodstvo +STR_CONFIG_SETTING_VEHICLES :Vozila +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Rutanje +STR_CONFIG_SETTING_LIMITATIONS :Ograničenja +STR_CONFIG_SETTING_ACCIDENTS :Katastrofe / nesreće +STR_CONFIG_SETTING_GENWORLD :Stvaranje svijeta +STR_CONFIG_SETTING_ENVIRONMENT :Okoliš +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Vlasti +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Gradovi +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrije +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribucija tereta +STR_CONFIG_SETTING_AI :Suparnici +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) diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 2de9771fed..b1bb768ccb 100644 --- a/src/lang/czech.txt +++ b/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_USD :Dolar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japonský jen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Rakouský šilink (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgický frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Švýcarský frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Česká koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Německá marka (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dánská koruna (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Španělská peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finská marka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Francouzský frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Řecká drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Maďarský forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandská koruna (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italská lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Holandský gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norská koruna (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polský zlotý (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumunský lei (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ruský rubl (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovinský tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Švédská koruna (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turecká lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovenská koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilský real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estonská koruna (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litevský litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Jihokorejský won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Jihoafrický rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra +STR_GAME_OPTIONS_CURRENCY_USD :Dolar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japonský jen +STR_GAME_OPTIONS_CURRENCY_ATS :Rakouský šilink +STR_GAME_OPTIONS_CURRENCY_BEF :Belgický frank +STR_GAME_OPTIONS_CURRENCY_CHF :Švýcarský frank +STR_GAME_OPTIONS_CURRENCY_CZK :Česká koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Německá marka +STR_GAME_OPTIONS_CURRENCY_DKK :Dánská koruna +STR_GAME_OPTIONS_CURRENCY_ESP :Španělská peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finská marka +STR_GAME_OPTIONS_CURRENCY_FRF :Francouzský frank +STR_GAME_OPTIONS_CURRENCY_GRD :Řecká drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Maďarský forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandská koruna +STR_GAME_OPTIONS_CURRENCY_ITL :Italská lira +STR_GAME_OPTIONS_CURRENCY_NLG :Holandský gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norská koruna +STR_GAME_OPTIONS_CURRENCY_PLN :Polský zlotý +STR_GAME_OPTIONS_CURRENCY_RON :Rumunský lei +STR_GAME_OPTIONS_CURRENCY_RUR :Ruský rubl +STR_GAME_OPTIONS_CURRENCY_SIT :Slovinský tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Švédská koruna +STR_GAME_OPTIONS_CURRENCY_TRY :Turecká lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovenská koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilský real +STR_GAME_OPTIONS_CURRENCY_EEK :Estonská koruna +STR_GAME_OPTIONS_CURRENCY_LTL :Litevský litas +STR_GAME_OPTIONS_CURRENCY_KRW :Jihokorejský won +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_IRR :Íránský Riál (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Ruský rubl (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexické peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nový taiwanský dolar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Čínský renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongský dolar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indická rupie (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonéská rupie (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malajsijský Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgijské Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Íránský Riál +STR_GAME_OPTIONS_CURRENCY_RUB :Ruský rubl +STR_GAME_OPTIONS_CURRENCY_MXN :Mexické peso +STR_GAME_OPTIONS_CURRENCY_NTD :Nový taiwanský dolar +STR_GAME_OPTIONS_CURRENCY_CNY :Čínský renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongský dolar +STR_GAME_OPTIONS_CURRENCY_INR :Indická rupie +STR_GAME_OPTIONS_CURRENCY_IDR :Indonéská rupie +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_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Zvuk -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Ovládaní -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Obecné -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Pohledy -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Výstavba -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Novinky / Poradci -STR_CONFIG_SETTING_COMPANY :{ORANGE}Společnost -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Účetnictví -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Dopravní prostředky -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fyzika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Směrování -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Omezení -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofy / Nehody -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generování krajiny -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Prostředí -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Městská správa -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Města -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Průmysl -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribuce nákladu -STR_CONFIG_SETTING_AI :{ORANGE}Konkurenti -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Umělá inteligence -STR_CONFIG_SETTING_NETWORK :{ORANGE}Síť +STR_CONFIG_SETTING_LOCALISATION :Překlad +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Zvuk +STR_CONFIG_SETTING_INTERFACE :Ovládaní +STR_CONFIG_SETTING_INTERFACE_GENERAL :Obecné +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Pohledy +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Výstavba +STR_CONFIG_SETTING_ADVISORS :Novinky / Poradci +STR_CONFIG_SETTING_COMPANY :Společnost +STR_CONFIG_SETTING_ACCOUNTING :Účetnictví +STR_CONFIG_SETTING_VEHICLES :Dopravní prostředky +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fyzika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Směrování +STR_CONFIG_SETTING_LIMITATIONS :Omezení +STR_CONFIG_SETTING_ACCIDENTS :Katastrofy / Nehody +STR_CONFIG_SETTING_GENWORLD :Generování krajiny +STR_CONFIG_SETTING_ENVIRONMENT :Prostředí +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Městská správa +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Města +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Průmysl +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribuce nákladu +STR_CONFIG_SETTING_AI :Konkurenti +STR_CONFIG_SETTING_AI_NPC :Umělá inteligence +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) diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 55c14a3619..0d588153fa 100644 --- a/src/lang/danish.txt +++ b/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_USD :Amerikanske dollars ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanske Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Østrisk Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgiske Franc (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Sweiziske Franc (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tjekkiske Koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danske Kroner (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spanske Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finske Markka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franske Franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Græske Drachmer (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungarnske Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandske Kroner (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italienske Lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Hollandske Guilder (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norske Kroner (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polske Zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumænske Lei (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russiske Rubel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenske Tolare (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Svenske Kroner (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Tyrkiske Lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakiske Koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasilianske Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estiske Kroon (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litauiske Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Sydkoreansk Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Sydafrikansk Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Britiske Pund +STR_GAME_OPTIONS_CURRENCY_USD :Amerikanske dollars +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanske Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Østrisk Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgiske Franc +STR_GAME_OPTIONS_CURRENCY_CHF :Sweiziske Franc +STR_GAME_OPTIONS_CURRENCY_CZK :Tjekkiske Koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Danske Kroner +STR_GAME_OPTIONS_CURRENCY_ESP :Spanske Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finske Markka +STR_GAME_OPTIONS_CURRENCY_FRF :Franske Franc +STR_GAME_OPTIONS_CURRENCY_GRD :Græske Drachmer +STR_GAME_OPTIONS_CURRENCY_HUF :Ungarnske Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandske Kroner +STR_GAME_OPTIONS_CURRENCY_ITL :Italienske Lire +STR_GAME_OPTIONS_CURRENCY_NLG :Hollandske Guilder +STR_GAME_OPTIONS_CURRENCY_NOK :Norske Kroner +STR_GAME_OPTIONS_CURRENCY_PLN :Polske Zloty +STR_GAME_OPTIONS_CURRENCY_RON :Rumænske Lei +STR_GAME_OPTIONS_CURRENCY_RUR :Russiske Rubel +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenske Tolare +STR_GAME_OPTIONS_CURRENCY_SEK :Svenske Kroner +STR_GAME_OPTIONS_CURRENCY_TRY :Tyrkiske Lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakiske Koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brasilianske Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estiske Kroon +STR_GAME_OPTIONS_CURRENCY_LTL :Litauiske Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Sydkoreansk Won +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_IRR :Iranske Rialer (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Ny Russisk Rubel (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksikansk Peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Ny Taiwan dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Kinesisk Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indisk rupi (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesisk Rupiah (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysisk Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgiske Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranske Rialer +STR_GAME_OPTIONS_CURRENCY_RUB :Ny Russisk Rubel +STR_GAME_OPTIONS_CURRENCY_MXN :Meksikansk Peso +STR_GAME_OPTIONS_CURRENCY_NTD :Ny Taiwan dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Kinesisk Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Indisk rupi +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesisk Rupiah +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_GRAPHICS :{ORANGE}Grafiksæt / Manglende grafik -STR_CONFIG_SETTING_SOUND :{ORANGE}Lydeffekter -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Brugerflade -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Generelt -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Viewports -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruktion -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nyheder / Rådgivere -STR_CONFIG_SETTING_COMPANY :{ORANGE}Firma -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Regnskab -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Køretøjer -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fysik / Tilstand -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Ruteplanlægning -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Begrænsninger -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofer / Ulykker -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Verden generation -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Miljø -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Myndigheder -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Byer -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrier -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Fragtdistribution -STR_CONFIG_SETTING_AI :{ORANGE}Modstandere -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computerstyrede spillere -STR_CONFIG_SETTING_NETWORK :{ORANGE}Netværk +STR_CONFIG_SETTING_LOCALISATION :Lokalisering +STR_CONFIG_SETTING_GRAPHICS :Grafiksæt / Manglende grafik +STR_CONFIG_SETTING_SOUND :Lydeffekter +STR_CONFIG_SETTING_INTERFACE :Brugerflade +STR_CONFIG_SETTING_INTERFACE_GENERAL :Generelt +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Viewports +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruktion +STR_CONFIG_SETTING_ADVISORS :Nyheder / Rådgivere +STR_CONFIG_SETTING_COMPANY :Firma +STR_CONFIG_SETTING_ACCOUNTING :Regnskab +STR_CONFIG_SETTING_VEHICLES :Køretøjer +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fysik / Tilstand +STR_CONFIG_SETTING_VEHICLES_ROUTING :Ruteplanlægning +STR_CONFIG_SETTING_LIMITATIONS :Begrænsninger +STR_CONFIG_SETTING_ACCIDENTS :Katastrofer / Ulykker +STR_CONFIG_SETTING_GENWORLD :Verden generation +STR_CONFIG_SETTING_ENVIRONMENT :Miljø +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Myndigheder +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Byer +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrier +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Fragtdistribution +STR_CONFIG_SETTING_AI :Modstandere +STR_CONFIG_SETTING_AI_NPC :Computerstyrede spillere +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_DEPARTURE_ABBREVIATION :Afg: +STR_TIMETABLE_ARRIVAL :A: {COLOUR}{DATE_TINY} +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} diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index d14dcc2737..f8cab25a52 100644 --- a/src/lang/dutch.txt +++ b/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_USD :Dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanse Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Oostenrijkse Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgische Frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Zwitserse Frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tsjechische Kroon (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Duitse Mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Deense Kroon (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spaanse Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finse Mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franse Frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Griekse Drachme (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Hongaarse Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :IJslandse Kroon (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italiaanse Lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nederlandse Gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Noorse Kroon (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poolse Zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Roemeense Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russische Roebel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Sloveense Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Zweedse Kroon (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkse Lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slowaakse Kroon (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Braziliaanse Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estse Kroon (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litouwse Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Zuid-Koreaanse Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Zuid-Afrikaanse Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Britse Pond +STR_GAME_OPTIONS_CURRENCY_USD :Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanse Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Oostenrijkse Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgische Frank +STR_GAME_OPTIONS_CURRENCY_CHF :Zwitserse Frank +STR_GAME_OPTIONS_CURRENCY_CZK :Tsjechische Kroon +STR_GAME_OPTIONS_CURRENCY_DEM :Duitse Mark +STR_GAME_OPTIONS_CURRENCY_DKK :Deense Kroon +STR_GAME_OPTIONS_CURRENCY_ESP :Spaanse Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finse Mark +STR_GAME_OPTIONS_CURRENCY_FRF :Franse Frank +STR_GAME_OPTIONS_CURRENCY_GRD :Griekse Drachme +STR_GAME_OPTIONS_CURRENCY_HUF :Hongaarse Forint +STR_GAME_OPTIONS_CURRENCY_ISK :IJslandse Kroon +STR_GAME_OPTIONS_CURRENCY_ITL :Italiaanse Lire +STR_GAME_OPTIONS_CURRENCY_NLG :Nederlandse Gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Noorse Kroon +STR_GAME_OPTIONS_CURRENCY_PLN :Poolse Zloty +STR_GAME_OPTIONS_CURRENCY_RON :Roemeense Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russische Roebel +STR_GAME_OPTIONS_CURRENCY_SIT :Sloveense Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Zweedse Kroon +STR_GAME_OPTIONS_CURRENCY_TRY :Turkse Lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slowaakse Kroon +STR_GAME_OPTIONS_CURRENCY_BRL :Braziliaanse Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estse Kroon +STR_GAME_OPTIONS_CURRENCY_LTL :Litouwse Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Zuid-Koreaanse Won +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_IRR :Iraanse Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nieuwe Russische Roebel (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexicaanse peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nieuwe Taiwanse dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indiase rupee (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesische roepia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Maleisische Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgische Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iraanse Rial +STR_GAME_OPTIONS_CURRENCY_RUB :Nieuwe Russische Roebel +STR_GAME_OPTIONS_CURRENCY_MXN :Mexicaanse peso +STR_GAME_OPTIONS_CURRENCY_NTD :Nieuwe Taiwanse dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Indiase rupee +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesische roepia +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_GRAPHICS :{ORANGE}Grafische elementen -STR_CONFIG_SETTING_SOUND :{ORANGE}Geluid -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Gebruikersscherm -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Algemeen -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Kijkvensters -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Constructie -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nieuws/adviseurs -STR_CONFIG_SETTING_COMPANY :{ORANGE}Bedrijf -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Boekhouding -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Voertuigen -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Natuurkundige eigenschappen -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Routebepaling -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Beperkingen -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Rampen/ongelukken -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Wereldontwikkeling -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Omgeving -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoriteiten -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Steden -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrieën -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Vrachtdistributie -STR_CONFIG_SETTING_AI :{ORANGE}Tegenstanders -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computerspelers -STR_CONFIG_SETTING_NETWORK :{ORANGE}Netwerk +STR_CONFIG_SETTING_LOCALISATION :Lokalisatie +STR_CONFIG_SETTING_GRAPHICS :Grafische elementen +STR_CONFIG_SETTING_SOUND :Geluid +STR_CONFIG_SETTING_INTERFACE :Gebruikersscherm +STR_CONFIG_SETTING_INTERFACE_GENERAL :Algemeen +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Kijkvensters +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Constructie +STR_CONFIG_SETTING_ADVISORS :Nieuws/adviseurs +STR_CONFIG_SETTING_COMPANY :Bedrijf +STR_CONFIG_SETTING_ACCOUNTING :Boekhouding +STR_CONFIG_SETTING_VEHICLES :Voertuigen +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Natuurkundige eigenschappen +STR_CONFIG_SETTING_VEHICLES_ROUTING :Routebepaling +STR_CONFIG_SETTING_LIMITATIONS :Beperkingen +STR_CONFIG_SETTING_ACCIDENTS :Rampen/ongelukken +STR_CONFIG_SETTING_GENWORLD :Wereldontwikkeling +STR_CONFIG_SETTING_ENVIRONMENT :Omgeving +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoriteiten +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Steden +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrieën +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Vrachtdistributie +STR_CONFIG_SETTING_AI :Tegenstanders +STR_CONFIG_SETTING_AI_NPC :Computerspelers +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_DEPARTURE_ABBREVIATION :V: +STR_TIMETABLE_ARRIVAL :A: {COLOUR}{DATE_TINY} +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} diff --git a/src/lang/english.txt b/src/lang/english.txt index 109360586e..ec45ebcdc4 100644 --- a/src/lang/english.txt +++ b/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_USD :American Dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanese Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :French Franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubles (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Swedish Krona (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkish Lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilian Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estonian Krooni (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :South African Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :British Pound +STR_GAME_OPTIONS_CURRENCY_USD :American Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanese Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc +STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc +STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone +STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka +STR_GAME_OPTIONS_CURRENCY_FRF :French Franc +STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona +STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira +STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder +STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone +STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty +STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubles +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Swedish Krona +STR_GAME_OPTIONS_CURRENCY_TRY :Turkish Lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilian Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estonian Krooni +STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas +STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won +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_IRR :Iranian Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :New Russian Ruble (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexican Peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indian Rupee (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian Rupiah (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysian Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranian Rial +STR_GAME_OPTIONS_CURRENCY_RUB :New Russian Ruble +STR_GAME_OPTIONS_CURRENCY_MXN :Mexican Peso +STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Indian Rupee +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian Rupiah +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_GRAPHICS :{ORANGE}Graphics -STR_CONFIG_SETTING_SOUND :{ORANGE}Sound -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}General -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Viewports -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construction -STR_CONFIG_SETTING_ADVISORS :{ORANGE}News / Advisors -STR_CONFIG_SETTING_COMPANY :{ORANGE}Company -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Accounting -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehicles -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Physics -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Routing -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitations -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Disasters / Accidents -STR_CONFIG_SETTING_GENWORLD :{ORANGE}World generation -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Environment -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Authorities -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Towns -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industries -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Cargo distribution -STR_CONFIG_SETTING_AI :{ORANGE}Competitors -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computer players -STR_CONFIG_SETTING_NETWORK :{ORANGE}Network +STR_CONFIG_SETTING_LOCALISATION :Localisation +STR_CONFIG_SETTING_GRAPHICS :Graphics +STR_CONFIG_SETTING_SOUND :Sound +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :General +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Viewports +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construction +STR_CONFIG_SETTING_ADVISORS :News / Advisors +STR_CONFIG_SETTING_COMPANY :Company +STR_CONFIG_SETTING_ACCOUNTING :Accounting +STR_CONFIG_SETTING_VEHICLES :Vehicles +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Physics +STR_CONFIG_SETTING_VEHICLES_ROUTING :Routing +STR_CONFIG_SETTING_LIMITATIONS :Limitations +STR_CONFIG_SETTING_ACCIDENTS :Disasters / Accidents +STR_CONFIG_SETTING_GENWORLD :World generation +STR_CONFIG_SETTING_ENVIRONMENT :Environment +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Authorities +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Towns +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industries +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Cargo distribution +STR_CONFIG_SETTING_AI :Competitors +STR_CONFIG_SETTING_AI_NPC :Computer players +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_DEPARTURE_ABBREVIATION :D: +STR_TIMETABLE_ARRIVAL :A: {COLOUR}{DATE_TINY} +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} diff --git a/src/lang/english_AU.txt b/src/lang/english_AU.txt index 35652fc1ce..714c844a79 100644 --- a/src/lang/english_AU.txt +++ b/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_USD :American Dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanese Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :French Franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubles (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Swedish Krona (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkish Lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilian Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estonian Krooni (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :South African Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :British Pound +STR_GAME_OPTIONS_CURRENCY_USD :American Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanese Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc +STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc +STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone +STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka +STR_GAME_OPTIONS_CURRENCY_FRF :French Franc +STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona +STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira +STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder +STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone +STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty +STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubles +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Swedish Krona +STR_GAME_OPTIONS_CURRENCY_TRY :Turkish Lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilian Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estonian Krooni +STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas +STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won +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_IRR :Iranian Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :New Russian Ruble (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexican Peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indian Rupee (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian Rupiah (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysian Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranian Rial +STR_GAME_OPTIONS_CURRENCY_RUB :New Russian Ruble +STR_GAME_OPTIONS_CURRENCY_MXN :Mexican Peso +STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Indian Rupee +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian Rupiah +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_GRAPHICS :{ORANGE}Graphics -STR_CONFIG_SETTING_SOUND :{ORANGE}Sound -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}General -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Viewports -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construction -STR_CONFIG_SETTING_ADVISORS :{ORANGE}News / Advisors -STR_CONFIG_SETTING_COMPANY :{ORANGE}Company -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Accounting -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehicles -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Physics -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Routing -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitations -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Disasters / Accidents -STR_CONFIG_SETTING_GENWORLD :{ORANGE}World generation -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Environment -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Authorities -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Towns -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industries -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Cargo distribution -STR_CONFIG_SETTING_AI :{ORANGE}Competitors -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computer players -STR_CONFIG_SETTING_NETWORK :{ORANGE}Network +STR_CONFIG_SETTING_LOCALISATION :Localisation +STR_CONFIG_SETTING_GRAPHICS :Graphics +STR_CONFIG_SETTING_SOUND :Sound +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :General +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Viewports +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construction +STR_CONFIG_SETTING_ADVISORS :News / Advisors +STR_CONFIG_SETTING_COMPANY :Company +STR_CONFIG_SETTING_ACCOUNTING :Accounting +STR_CONFIG_SETTING_VEHICLES :Vehicles +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Physics +STR_CONFIG_SETTING_VEHICLES_ROUTING :Routing +STR_CONFIG_SETTING_LIMITATIONS :Limitations +STR_CONFIG_SETTING_ACCIDENTS :Disasters / Accidents +STR_CONFIG_SETTING_GENWORLD :World generation +STR_CONFIG_SETTING_ENVIRONMENT :Environment +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Authorities +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Towns +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industries +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Cargo distribution +STR_CONFIG_SETTING_AI :Competitors +STR_CONFIG_SETTING_AI_NPC :Computer players +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_DEPARTURE_ABBREVIATION :D: +STR_TIMETABLE_ARRIVAL :A: {COLOUR}{DATE_TINY} +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} diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 0d8a3d1661..ff09eff6ad 100644 --- a/src/lang/english_US.txt +++ b/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_USD :American Dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanese Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :French Franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russian Ruble (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Swedish Krona (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkish Lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilian Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estonian Krooni (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :South African Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :British Pound +STR_GAME_OPTIONS_CURRENCY_USD :American Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanese Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc +STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc +STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone +STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka +STR_GAME_OPTIONS_CURRENCY_FRF :French Franc +STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona +STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira +STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder +STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone +STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty +STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russian Ruble +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Swedish Krona +STR_GAME_OPTIONS_CURRENCY_TRY :Turkish Lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilian Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estonian Krooni +STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas +STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won +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_IRR :Iranian Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :New Russian Ruble (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexican Peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indian Rupee (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian Rupiah (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysian Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranian Rial +STR_GAME_OPTIONS_CURRENCY_RUB :New Russian Ruble +STR_GAME_OPTIONS_CURRENCY_MXN :Mexican Peso +STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Indian Rupee +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian Rupiah +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_GRAPHICS :{ORANGE}Graphics -STR_CONFIG_SETTING_SOUND :{ORANGE}Sound -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}General -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Viewports -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construction -STR_CONFIG_SETTING_ADVISORS :{ORANGE}News / Advisors -STR_CONFIG_SETTING_COMPANY :{ORANGE}Company -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Accounting -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehicles -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Physics -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Routing -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitations -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Disasters / Accidents -STR_CONFIG_SETTING_GENWORLD :{ORANGE}World generation -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Environment -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Authorities -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Towns -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industries -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Cargo distribution -STR_CONFIG_SETTING_AI :{ORANGE}Competitors -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computer players -STR_CONFIG_SETTING_NETWORK :{ORANGE}Network +STR_CONFIG_SETTING_LOCALISATION :Localization +STR_CONFIG_SETTING_GRAPHICS :Graphics +STR_CONFIG_SETTING_SOUND :Sound +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :General +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Viewports +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construction +STR_CONFIG_SETTING_ADVISORS :News / Advisors +STR_CONFIG_SETTING_COMPANY :Company +STR_CONFIG_SETTING_ACCOUNTING :Accounting +STR_CONFIG_SETTING_VEHICLES :Vehicles +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Physics +STR_CONFIG_SETTING_VEHICLES_ROUTING :Routing +STR_CONFIG_SETTING_LIMITATIONS :Limitations +STR_CONFIG_SETTING_ACCIDENTS :Disasters / Accidents +STR_CONFIG_SETTING_GENWORLD :World generation +STR_CONFIG_SETTING_ENVIRONMENT :Environment +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Authorities +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Towns +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industries +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Cargo distribution +STR_CONFIG_SETTING_AI :Competitors +STR_CONFIG_SETTING_AI_NPC :Computer players +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) diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 6bcf3c81bf..4515f0626e 100644 --- a/src/lang/esperanto.txt +++ b/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_USD :Usona Dolaro (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Eŭro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Enoj (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Aŭstriaj Ŝilingoj (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgaj Frankoj (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Svisaj Frankoj (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Ĉeĥaj Korunoj (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Germanaj Markoj (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danaj Kronoj (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Pesetoj (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finnaj Markoj (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Frankoj (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grekaj Draĥmoj (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Hungaraj Forintoj (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandaj Kronoj (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italaj Liroj (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nederlandaj Guldenoj (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norvegaj Kronoj (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polaj Zlotoj (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumanaj Leŭoj (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rusaj Rubloj (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenaj Tolaroj (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Svedaj Kronoj (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkaj Liroj (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakaj Korunoj (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilaj Realoj (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estona Krono (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litova lido (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Sud-korea ŭono (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Sudafrika rando (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Brita Pundo +STR_GAME_OPTIONS_CURRENCY_USD :Usona Dolaro +STR_GAME_OPTIONS_CURRENCY_EUR :Eŭro +STR_GAME_OPTIONS_CURRENCY_JPY :Enoj +STR_GAME_OPTIONS_CURRENCY_ATS :Aŭstriaj Ŝilingoj +STR_GAME_OPTIONS_CURRENCY_BEF :Belgaj Frankoj +STR_GAME_OPTIONS_CURRENCY_CHF :Svisaj Frankoj +STR_GAME_OPTIONS_CURRENCY_CZK :Ĉeĥaj Korunoj +STR_GAME_OPTIONS_CURRENCY_DEM :Germanaj Markoj +STR_GAME_OPTIONS_CURRENCY_DKK :Danaj Kronoj +STR_GAME_OPTIONS_CURRENCY_ESP :Pesetoj +STR_GAME_OPTIONS_CURRENCY_FIM :Finnaj Markoj +STR_GAME_OPTIONS_CURRENCY_FRF :Frankoj +STR_GAME_OPTIONS_CURRENCY_GRD :Grekaj Draĥmoj +STR_GAME_OPTIONS_CURRENCY_HUF :Hungaraj Forintoj +STR_GAME_OPTIONS_CURRENCY_ISK :Islandaj Kronoj +STR_GAME_OPTIONS_CURRENCY_ITL :Italaj Liroj +STR_GAME_OPTIONS_CURRENCY_NLG :Nederlandaj Guldenoj +STR_GAME_OPTIONS_CURRENCY_NOK :Norvegaj Kronoj +STR_GAME_OPTIONS_CURRENCY_PLN :Polaj Zlotoj +STR_GAME_OPTIONS_CURRENCY_RON :Rumanaj Leŭoj +STR_GAME_OPTIONS_CURRENCY_RUR :Rusaj Rubloj +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenaj Tolaroj +STR_GAME_OPTIONS_CURRENCY_SEK :Svedaj Kronoj +STR_GAME_OPTIONS_CURRENCY_TRY :Turkaj Liroj +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakaj Korunoj +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilaj Realoj +STR_GAME_OPTIONS_CURRENCY_EEK :Estona Krono +STR_GAME_OPTIONS_CURRENCY_LTL :Litova lido +STR_GAME_OPTIONS_CURRENCY_KRW :Sud-korea ŭono +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_IRR :Irana Rialo (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nova rusia rublo (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksika peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nova tajvana dolaro (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Ĉina juano (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Honkonga dolaro (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Barata rupio (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonezia rupio (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malajzia ringito (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Kartvela Lario +STR_GAME_OPTIONS_CURRENCY_IRR :Irana Rialo +STR_GAME_OPTIONS_CURRENCY_RUB :Nova rusia rublo +STR_GAME_OPTIONS_CURRENCY_MXN :Meksika peso +STR_GAME_OPTIONS_CURRENCY_NTD :Nova tajvana dolaro +STR_GAME_OPTIONS_CURRENCY_CNY :Ĉina juano +STR_GAME_OPTIONS_CURRENCY_HKD :Honkonga dolaro +STR_GAME_OPTIONS_CURRENCY_INR :Barata rupio +STR_GAME_OPTIONS_CURRENCY_IDR :Indonezia rupio +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_GRAPHICS :{ORANGE}Grafiko -STR_CONFIG_SETTING_SOUND :{ORANGE}Sonefektoj -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfaco -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Ĝenerale -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Vidujoj -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruado -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Novaĵoj / Konsilantoj -STR_CONFIG_SETTING_COMPANY :{ORANGE}Kompanio -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Librotenado -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Veturiloj -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fiziko -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Navigado -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limigoj -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofoj / akcidentoj -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Mondgenerado -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Medio -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Lokaj estroj -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Urboj -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrioj -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Ŝarĝodistribuado -STR_CONFIG_SETTING_AI :{ORANGE}Konkurantoj -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Komputil-ludantoj -STR_CONFIG_SETTING_NETWORK :{ORANGE}Reto +STR_CONFIG_SETTING_LOCALISATION :Loka adaptado +STR_CONFIG_SETTING_GRAPHICS :Grafiko +STR_CONFIG_SETTING_SOUND :Sonefektoj +STR_CONFIG_SETTING_INTERFACE :Interfaco +STR_CONFIG_SETTING_INTERFACE_GENERAL :Ĝenerale +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Vidujoj +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruado +STR_CONFIG_SETTING_ADVISORS :Novaĵoj / Konsilantoj +STR_CONFIG_SETTING_COMPANY :Kompanio +STR_CONFIG_SETTING_ACCOUNTING :Librotenado +STR_CONFIG_SETTING_VEHICLES :Veturiloj +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fiziko +STR_CONFIG_SETTING_VEHICLES_ROUTING :Navigado +STR_CONFIG_SETTING_LIMITATIONS :Limigoj +STR_CONFIG_SETTING_ACCIDENTS :Katastrofoj / akcidentoj +STR_CONFIG_SETTING_GENWORLD :Mondgenerado +STR_CONFIG_SETTING_ENVIRONMENT :Medio +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Lokaj estroj +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Urboj +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrioj +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Ŝarĝodistribuado +STR_CONFIG_SETTING_AI :Konkurantoj +STR_CONFIG_SETTING_AI_NPC :Komputil-ludantoj +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_DEPARTURE_ABBREVIATION :F: +STR_TIMETABLE_ARRIVAL :A: {COLOUR}{DATE_TINY} +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} diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index cf698362ed..f834ee760a 100644 --- a/src/lang/estonian.txt +++ b/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_USD :USA dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Jaapani jeen (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Austria ðilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgia frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Sveitði frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tðehhi kroon (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Saksamargad (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Taani kroon (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Hispaania peseeta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Soome mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Prantsuse frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Kreeka drahm (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungari Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandi kroon (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Itaalia liir (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Hollandi kulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norra kroon (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poola Zlott (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumeenia Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Vene rubla (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Sloveenia Talaar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Rootsi kroon (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Türgi Liir (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakkia Kroon (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasiilia Reaal (BRL -STR_GAME_OPTIONS_CURRENCY_EEK :Eesti Kroon (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Leedu litt (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Lõuna-Korea vonn (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Lõuna-Aafrika rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Suurbritannia nael +STR_GAME_OPTIONS_CURRENCY_USD :USA dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Jaapani jeen +STR_GAME_OPTIONS_CURRENCY_ATS :Austria ðilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgia frank +STR_GAME_OPTIONS_CURRENCY_CHF :Sveitði frank +STR_GAME_OPTIONS_CURRENCY_CZK :Tðehhi kroon +STR_GAME_OPTIONS_CURRENCY_DEM :Saksamargad +STR_GAME_OPTIONS_CURRENCY_DKK :Taani kroon +STR_GAME_OPTIONS_CURRENCY_ESP :Hispaania peseeta +STR_GAME_OPTIONS_CURRENCY_FIM :Soome mark +STR_GAME_OPTIONS_CURRENCY_FRF :Prantsuse frank +STR_GAME_OPTIONS_CURRENCY_GRD :Kreeka drahm +STR_GAME_OPTIONS_CURRENCY_HUF :Ungari Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandi kroon +STR_GAME_OPTIONS_CURRENCY_ITL :Itaalia liir +STR_GAME_OPTIONS_CURRENCY_NLG :Hollandi kulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norra kroon +STR_GAME_OPTIONS_CURRENCY_PLN :Poola Zlott +STR_GAME_OPTIONS_CURRENCY_RON :Rumeenia Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Vene rubla +STR_GAME_OPTIONS_CURRENCY_SIT :Sloveenia Talaar +STR_GAME_OPTIONS_CURRENCY_SEK :Rootsi kroon +STR_GAME_OPTIONS_CURRENCY_TRY :Türgi Liir +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakkia Kroon +STR_GAME_OPTIONS_CURRENCY_BRL :Brasiilia Reaal +STR_GAME_OPTIONS_CURRENCY_EEK :Eesti Kroon +STR_GAME_OPTIONS_CURRENCY_LTL :Leedu litt +STR_GAME_OPTIONS_CURRENCY_KRW :Lõuna-Korea vonn +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_IRR :Iraani rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Uus Vene rubla (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mehhiko Peeso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Uus Taiwani dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Hiina renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kongi dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :India ruupia (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indoneesia ruupia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaisia ringit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Gruusia lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iraani rial +STR_GAME_OPTIONS_CURRENCY_RUB :Uus Vene rubla +STR_GAME_OPTIONS_CURRENCY_MXN :Mehhiko Peeso +STR_GAME_OPTIONS_CURRENCY_NTD :Uus Taiwani dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Hiina renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kongi dollar +STR_GAME_OPTIONS_CURRENCY_INR :India ruupia +STR_GAME_OPTIONS_CURRENCY_IDR :Indoneesia ruupia +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_GRAPHICS :{ORANGE}Graafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Heliefektid -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Liides -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Üldine -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Vaated -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Ehitus -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Uudised / Nõunikud -STR_CONFIG_SETTING_COMPANY :{ORANGE}Ettevõte -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Arveldamine -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Sõidukid -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Füüsika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Marsruutimine -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Piirangud -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastroofid / Õnnetused -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Maailma tekitamine -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Keskkond -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Omavalitsus -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Asulad -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Tööstused -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Kaubajaotus -STR_CONFIG_SETTING_AI :{ORANGE}Konkurendid -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Arvuti -STR_CONFIG_SETTING_NETWORK :{ORANGE}Võrk +STR_CONFIG_SETTING_LOCALISATION :Kohandused +STR_CONFIG_SETTING_GRAPHICS :Graafika +STR_CONFIG_SETTING_SOUND :Heliefektid +STR_CONFIG_SETTING_INTERFACE :Liides +STR_CONFIG_SETTING_INTERFACE_GENERAL :Üldine +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Vaated +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Ehitus +STR_CONFIG_SETTING_ADVISORS :Uudised / Nõunikud +STR_CONFIG_SETTING_COMPANY :Ettevõte +STR_CONFIG_SETTING_ACCOUNTING :Arveldamine +STR_CONFIG_SETTING_VEHICLES :Sõidukid +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Füüsika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Marsruutimine +STR_CONFIG_SETTING_LIMITATIONS :Piirangud +STR_CONFIG_SETTING_ACCIDENTS :Katastroofid / Õnnetused +STR_CONFIG_SETTING_GENWORLD :Maailma tekitamine +STR_CONFIG_SETTING_ENVIRONMENT :Keskkond +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Omavalitsus +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Asulad +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Tööstused +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Kaubajaotus +STR_CONFIG_SETTING_AI :Konkurendid +STR_CONFIG_SETTING_AI_NPC :Arvuti +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) diff --git a/src/lang/extra/afrikaans.txt b/src/lang/extra/afrikaans.txt index 3c2795b312..2f92d72cd9 100644 --- a/src/lang/extra/afrikaans.txt +++ b/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 diff --git a/src/lang/extra/arabic_egypt.txt b/src/lang/extra/arabic_egypt.txt index a84588f1aa..49752a0ae5 100644 --- a/src/lang/extra/arabic_egypt.txt +++ b/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 diff --git a/src/lang/extra/basque.txt b/src/lang/extra/basque.txt index 278233d04b..4431426886 100644 --- a/src/lang/extra/basque.txt +++ b/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 diff --git a/src/lang/extra/belarusian.txt b/src/lang/extra/belarusian.txt index 505c8efc6b..e0c347645f 100644 --- a/src/lang/extra/belarusian.txt +++ b/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 diff --git a/src/lang/extra/brazilian_portuguese.txt b/src/lang/extra/brazilian_portuguese.txt index 07780791b6..0715ce10c3 100644 --- a/src/lang/extra/brazilian_portuguese.txt +++ b/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 diff --git a/src/lang/extra/bulgarian.txt b/src/lang/extra/bulgarian.txt index 300dea4683..c813f27232 100644 --- a/src/lang/extra/bulgarian.txt +++ b/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 diff --git a/src/lang/extra/catalan.txt b/src/lang/extra/catalan.txt index 351cc48798..87876c6845 100644 --- a/src/lang/extra/catalan.txt +++ b/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 diff --git a/src/lang/extra/croatian.txt b/src/lang/extra/croatian.txt index 2b39f8d0b6..b36a97e1f4 100644 --- a/src/lang/extra/croatian.txt +++ b/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 diff --git a/src/lang/extra/czech.txt b/src/lang/extra/czech.txt index c8a49acd3d..ea76749f09 100644 --- a/src/lang/extra/czech.txt +++ b/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_POP :{WHITE}{TOWN} {SET_COLOUR}({COMMA}) +STR_VIEWPORT_TOWN_COLOUR :{1:COLOUR}{0:TOWN} +STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {COLOUR}({COMMA}) diff --git a/src/lang/extra/danish.txt b/src/lang/extra/danish.txt index 9e9b1b6895..578493b708 100644 --- a/src/lang/extra/danish.txt +++ b/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 diff --git a/src/lang/extra/dutch.txt b/src/lang/extra/dutch.txt index 86c413517e..c3631b3c2a 100644 --- a/src/lang/extra/dutch.txt +++ b/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 diff --git a/src/lang/extra/english.txt b/src/lang/extra/english.txt index 16dfd4c555..7676b52535 100644 --- a/src/lang/extra/english.txt +++ b/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_POP :{WHITE}{TOWN} {SET_COLOUR}({COMMA}) -STR_VIEWPORT_TOWN_COLOUR_CITY :{1:SET_COLOUR}{0:TOWN} (City) -STR_VIEWPORT_TOWN_COLOUR_CITY_POP :{WHITE}{TOWN} {SET_COLOUR}(City, {COMMA}) +STR_VIEWPORT_TOWN_COLOUR :{1:COLOUR}{0:TOWN} +STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {COLOUR}({COMMA}) +STR_VIEWPORT_TOWN_COLOUR_CITY :{1:COLOUR}{0:TOWN} (City) +STR_VIEWPORT_TOWN_COLOUR_CITY_POP :{WHITE}{TOWN} {COLOUR}(City, {COMMA}) diff --git a/src/lang/extra/english_AU.txt b/src/lang/extra/english_AU.txt index b8e206a6a8..a1aa65085c 100644 --- a/src/lang/extra/english_AU.txt +++ b/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 diff --git a/src/lang/extra/english_US.txt b/src/lang/extra/english_US.txt index 90ca40c1f1..677e50a6d0 100644 --- a/src/lang/extra/english_US.txt +++ b/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 diff --git a/src/lang/extra/esperanto.txt b/src/lang/extra/esperanto.txt index 8f688f78ea..07470e4a45 100644 --- a/src/lang/extra/esperanto.txt +++ b/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 diff --git a/src/lang/extra/estonian.txt b/src/lang/extra/estonian.txt index 145d553e4b..6638c93886 100644 --- a/src/lang/extra/estonian.txt +++ b/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 diff --git a/src/lang/extra/faroese.txt b/src/lang/extra/faroese.txt index 6ba5a8dc8f..25405121c2 100644 --- a/src/lang/extra/faroese.txt +++ b/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 diff --git a/src/lang/extra/finnish.txt b/src/lang/extra/finnish.txt index 4eb488d997..7d0ef87291 100644 --- a/src/lang/extra/finnish.txt +++ b/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 diff --git a/src/lang/extra/french.txt b/src/lang/extra/french.txt index 0cbeb5437e..68be1c8999 100644 --- a/src/lang/extra/french.txt +++ b/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 diff --git a/src/lang/extra/frisian.txt b/src/lang/extra/frisian.txt index f5b3f023fb..267b608196 100644 --- a/src/lang/extra/frisian.txt +++ b/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 diff --git a/src/lang/extra/gaelic.txt b/src/lang/extra/gaelic.txt index 0e8a74cbce..12a520c55c 100644 --- a/src/lang/extra/gaelic.txt +++ b/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 diff --git a/src/lang/extra/galician.txt b/src/lang/extra/galician.txt index 4acf3f26d8..4d5207d903 100644 --- a/src/lang/extra/galician.txt +++ b/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_POP :{WHITE}{TOWN} {SET_COLOUR}({COMMA}) -STR_VIEWPORT_TOWN_COLOUR_CITY :{1:SET_COLOUR}{0:TOWN} (Cidade) -STR_VIEWPORT_TOWN_COLOUR_CITY_POP :{WHITE}{TOWN} {SET_COLOUR}(Cidade, {COMMA}) +STR_VIEWPORT_TOWN_COLOUR :{1:COLOUR}{0:TOWN} +STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {COLOUR}({COMMA}) +STR_VIEWPORT_TOWN_COLOUR_CITY :{1:COLOUR}{0:TOWN} (Cidade) +STR_VIEWPORT_TOWN_COLOUR_CITY_POP :{WHITE}{TOWN} {COLOUR}(Cidade, {COMMA}) diff --git a/src/lang/extra/german.txt b/src/lang/extra/german.txt index 9a0074b055..c194af1110 100644 --- a/src/lang/extra/german.txt +++ b/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_POP :{WHITE}{TOWN} {SET_COLOUR}({COMMA}) +STR_VIEWPORT_TOWN_COLOUR :{1:COLOUR}{0:TOWN} +STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {COLOUR}({COMMA}) diff --git a/src/lang/extra/greek.txt b/src/lang/extra/greek.txt index e6e391a939..02639db910 100644 --- a/src/lang/extra/greek.txt +++ b/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 diff --git a/src/lang/extra/hebrew.txt b/src/lang/extra/hebrew.txt index bc14dfe523..2ffb61265c 100644 --- a/src/lang/extra/hebrew.txt +++ b/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 diff --git a/src/lang/extra/hungarian.txt b/src/lang/extra/hungarian.txt index 328ef5022d..10ad558853 100644 --- a/src/lang/extra/hungarian.txt +++ b/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 diff --git a/src/lang/extra/icelandic.txt b/src/lang/extra/icelandic.txt index 99ed241b6d..c96438f41a 100644 --- a/src/lang/extra/icelandic.txt +++ b/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 diff --git a/src/lang/extra/indonesian.txt b/src/lang/extra/indonesian.txt index a60890b8a2..8e9e48c064 100644 --- a/src/lang/extra/indonesian.txt +++ b/src/lang/extra/indonesian.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ubah ket STR_PURCHASE_INFO_DESIGNED :{BLACK}Desain: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/irish.txt b/src/lang/extra/irish.txt index 61cef40659..9f28ab58ca 100644 --- a/src/lang/extra/irish.txt +++ b/src/lang/extra/irish.txt @@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Athraigh STR_PURCHASE_INFO_DESIGNED :{BLACK}Deartha: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :I: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :F: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/italian.txt b/src/lang/extra/italian.txt index 255aa7afc0..e0ba8ed8c0 100644 --- a/src/lang/extra/italian.txt +++ b/src/lang/extra/italian.txt @@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Cambia l STR_PURCHASE_INFO_DESIGNED :{BLACK}Progettato nel: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :P: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/japanese.txt b/src/lang/extra/japanese.txt index 109eba9004..c844128a1b 100644 --- a/src/lang/extra/japanese.txt +++ b/src/lang/extra/japanese.txt @@ -111,6 +111,9 @@ STR_CONFIG_DEPARTURE_SHOW_ALL_STOPS_HELPTEXT :発車標に表 STR_PURCHASE_INFO_DESIGNED :{BLACK}設計年: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :着: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :発: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/korean.txt b/src/lang/extra/korean.txt index cafd1a1fc7..6e1ea2b14e 100644 --- a/src/lang/extra/korean.txt +++ b/src/lang/extra/korean.txt @@ -1420,8 +1420,6 @@ STR_VEHICLE_LIST_CHANGE_ORDER_ROAD_VEHICLE_DEPOT :다른 차고 STR_VEHICLE_LIST_CHANGE_ORDER_SHIP_DEPOT :다른 정박소로 경로 이동 STR_VEHICLE_LIST_CHANGE_ORDER_AIRCRAFT_HANGAR :다른 격납고로 경로 이동 -STR_VEHICLE_LIST_CREATE_GROUP :목록에서 그룹 만들기 - STR_GROUP_EXPAND_ALL :{BLACK}모두 펼치기 STR_GROUP_COLLAPSE_ALL :{BLACK}모두 접기 @@ -1689,6 +1687,9 @@ STR_TIMETABLE_FILL_TIMETABLE_SUGGESTION_2 :{BLACK}(또는, STR_TIMETABLE_WARNINGS_OMITTED :{BLACK}{NUM}개의 추가 경고가 생략되었습니다... +STR_TIMETABLE_ARRIVAL_ABBREVIATION :도착: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :출발: + STR_DATE_MINUTES_MINUTE_TOOLTIP :{BLACK}분(分) 선택 STR_DATE_MINUTES_HOUR_TOOLTIP :{BLACK}시(時) 선택 @@ -1849,15 +1850,15 @@ STR_STATION_RATING_MAX_PERCENTAGE : (최대 {PLUS_ STR_STATION_RATING_MAX_PERCENTAGE_COMMA :, 최대 {PLUS_NUM}% STR_STATION_RATING_PERCENTAGE_COMMA :, {PLUS_NUM}% -STR_STATION_RATING_TOOLTIP_SPEED :마지막으로 도착한 열차의 최대 속력{STRING}: {SET_COLOUR}{VELOCITY}{STRING} ({STRING}) +STR_STATION_RATING_TOOLTIP_SPEED :마지막으로 도착한 열차의 최대 속력{STRING}: {COLOUR}{VELOCITY}{STRING} ({STRING}) -STR_STATION_RATING_TOOLTIP_AGE :지난 열차의 연식{STRING}: {SET_COLOUR}{NUM}년{STRING} +STR_STATION_RATING_TOOLTIP_AGE :지난 열차의 연식{STRING}: {COLOUR}{NUM}년{STRING} STR_STATION_RATING_TOOLTIP_WAITTIME :지난 화물 적재 이후 지난 시간{STRING}: {STRING} STR_STATION_RATING_TOOLTIP_WAITTIME_SHIP :지난 화물 적재 이후 지난 시간{STRING}: {STRING} (선박) -STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE :{SET_COLOUR}{NUM}일{STRING} +STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE :{COLOUR}{NUM}일{STRING} -STR_STATION_RATING_TOOLTIP_WAITUNITS :대기 화물량 (각 목적지별 평균치{STRING}): {SET_COLOUR}{NUM}{STRING} +STR_STATION_RATING_TOOLTIP_WAITUNITS :대기 화물량 (각 목적지별 평균치{STRING}): {COLOUR}{NUM}{STRING} STR_STATION_RATING_TOOLTIP_STATUE :도시에 회사 소유주 동상{STRING}: {STRING} STR_STATION_RATING_TOOLTIP_STATUE_NO :{GOLD}없음{STRING} @@ -1936,7 +1937,7 @@ STR_TMPL_SECTION_REFIT :{BLACK}개조 STR_TMPL_SECTION_DEPOT_VEHICLES :{BLACK}기지 차량 STR_TMPL_SECTION_WHEN :{BLACK}시기 -STR_TMPL_NUM_TRAINS_NEED_RPL :교체할 열차 수: {SET_COLOUR}{COMMA} +STR_TMPL_NUM_TRAINS_NEED_RPL :교체할 열차 수: {COLOUR}{COMMA} STR_TMPL_CARGO_SUMMARY :{CARGO_LONG} STR_TMPL_CARGO_SUMMARY_MULTI :{CARGO_LONG} (x{NUM}) @@ -2130,7 +2131,7 @@ STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_DETAILED :자세히 STR_CONFIG_SETTING_CITY_IN_LABEL :도시 이름에 대도시 여부 표시: {STRING} STR_CONFIG_SETTING_CITY_IN_LABEL_HELPTEXT :지도 상에 표시되는 도시 이름에 대도시인지 여부를 표시합니다 -STR_VIEWPORT_TOWN_COLOUR :{1:SET_COLOUR}{0:TOWN} -STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {SET_COLOUR}({COMMA}) -STR_VIEWPORT_TOWN_COLOUR_CITY :{1:SET_COLOUR}{0:TOWN} (대도시) -STR_VIEWPORT_TOWN_COLOUR_CITY_POP :{WHITE}{TOWN} {SET_COLOUR}(대도시, {COMMA}) +STR_VIEWPORT_TOWN_COLOUR :{1:COLOUR}{0:TOWN} +STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {COLOUR}({COMMA}) +STR_VIEWPORT_TOWN_COLOUR_CITY :{1:COLOUR}{0:TOWN} (대도시) +STR_VIEWPORT_TOWN_COLOUR_CITY_POP :{WHITE}{TOWN} {COLOUR}(대도시, {COMMA}) diff --git a/src/lang/extra/latin.txt b/src/lang/extra/latin.txt index 04d252a33c..3a64502569 100644 --- a/src/lang/extra/latin.txt +++ b/src/lang/extra/latin.txt @@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Mutare a STR_PURCHASE_INFO_DESIGNED :{BLACK}Productum: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :E: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/latvian.txt b/src/lang/extra/latvian.txt index cdf1dd6d7b..e1186c012f 100644 --- a/src/lang/extra/latvian.txt +++ b/src/lang/extra/latvian.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Mainīt STR_PURCHASE_INFO_DESIGNED :{BLACK}Projektēts: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ie: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Iz: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/lithuanian.txt b/src/lang/extra/lithuanian.txt index 6dc1da873d..faa4352149 100644 --- a/src/lang/extra/lithuanian.txt +++ b/src/lang/extra/lithuanian.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Pakeisti STR_PURCHASE_INFO_DESIGNED :{BLACK}Sukurtas: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Atv.: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Išv.: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/luxembourgish.txt b/src/lang/extra/luxembourgish.txt index f7deb2498b..f1e1bce2ce 100644 --- a/src/lang/extra/luxembourgish.txt +++ b/src/lang/extra/luxembourgish.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ännert STR_PURCHASE_INFO_DESIGNED :{BLACK}Designt: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/malay.txt b/src/lang/extra/malay.txt index f32e222d6b..66dd2d4087 100644 --- a/src/lang/extra/malay.txt +++ b/src/lang/extra/malay.txt @@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Tukarkan STR_PURCHASE_INFO_DESIGNED :{BLACK}Direka: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :T: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :B: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/norwegian_bokmal.txt b/src/lang/extra/norwegian_bokmal.txt index cc0f449aff..5db49b963d 100644 --- a/src/lang/extra/norwegian_bokmal.txt +++ b/src/lang/extra/norwegian_bokmal.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Endre h STR_PURCHASE_INFO_DESIGNED :{BLACK}Designet: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ank: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Avg: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/norwegian_nynorsk.txt b/src/lang/extra/norwegian_nynorsk.txt index 9865e6e9a3..3f84865c2c 100644 --- a/src/lang/extra/norwegian_nynorsk.txt +++ b/src/lang/extra/norwegian_nynorsk.txt @@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Byt høg STR_PURCHASE_INFO_DESIGNED :{BLACK}Designa: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ank: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Avg: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/polish.txt b/src/lang/extra/polish.txt index 0ef036bb3e..3097ce97d0 100644 --- a/src/lang/extra/polish.txt +++ b/src/lang/extra/polish.txt @@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Zmień w STR_PURCHASE_INFO_DESIGNED :{BLACK}Zaprojektowany: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :P: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :O: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/portuguese.txt b/src/lang/extra/portuguese.txt index 206cc43927..1ceadaf9b9 100644 --- a/src/lang/extra/portuguese.txt +++ b/src/lang/extra/portuguese.txt @@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Mudar a STR_PURCHASE_INFO_DESIGNED :{BLACK}Concebido: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :C: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :P: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/romanian.txt b/src/lang/extra/romanian.txt index 34a6dfcd58..08301461fa 100644 --- a/src/lang/extra/romanian.txt +++ b/src/lang/extra/romanian.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Modific STR_PURCHASE_INFO_DESIGNED :{BLACK}An apariţie: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/russian.txt b/src/lang/extra/russian.txt index c018c9673f..ee0fc388e8 100644 --- a/src/lang/extra/russian.txt +++ b/src/lang/extra/russian.txt @@ -65,6 +65,9 @@ STR_ORDER_CONDITIONAL_COMPARATOR_HAS_MORE_EQUALS :имеет бо STR_ORDER_CONDITIONAL_PERCENT_DISPLAY :Перейти к заданию {COMMA} {COMMA} процентов времени +STR_TIMETABLE_ARRIVAL_ABBREVIATION :П: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :О: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/serbian.txt b/src/lang/extra/serbian.txt index e6c5d56a2c..e129144e0a 100644 --- a/src/lang/extra/serbian.txt +++ b/src/lang/extra/serbian.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Promena STR_PURCHASE_INFO_DESIGNED :{BLACK}Projektovan: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :D: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :P: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/simplified_chinese.txt b/src/lang/extra/simplified_chinese.txt index b83f652297..fc6cf94ed9 100644 --- a/src/lang/extra/simplified_chinese.txt +++ b/src/lang/extra/simplified_chinese.txt @@ -1325,8 +1325,6 @@ STR_VEHICLE_LIST_CHANGE_ORDER_ROAD_VEHICLE_DEPOT :转移调度任 STR_VEHICLE_LIST_CHANGE_ORDER_SHIP_DEPOT :转移调度任务去另一个船坞 STR_VEHICLE_LIST_CHANGE_ORDER_AIRCRAFT_HANGAR :转移调度任务去另一个机库 -STR_VEHICLE_LIST_CREATE_GROUP : - STR_GROUP_EXPAND_ALL :{BLACK}展开全部 STR_GROUP_COLLAPSE_ALL :{BLACK}折叠全部 @@ -1575,6 +1573,9 @@ STR_TIMETABLE_FILL_TIMETABLE_SUGGESTION_2 :{BLACK}（可 STR_TIMETABLE_WARNINGS_OMITTED :{BLACK}省略了{NUM}条警告 +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: + STR_DATE_MINUTES_MINUTE_TOOLTIP :{BLACK}选择分 STR_DATE_MINUTES_HOUR_TOOLTIP :{BLACK}选择小时 @@ -1734,15 +1735,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 :全部车辆的最高速度{STRING}：{SET_COLOUR}{VELOCITY}{STRING}（{STRING}） +STR_STATION_RATING_TOOLTIP_SPEED :全部车辆的最高速度{STRING}：{COLOUR}{VELOCITY}{STRING}（{STRING}） -STR_STATION_RATING_TOOLTIP_AGE :最大车辆年限{STRING}：{SET_COLOUR}{NUM} 年{STRING} +STR_STATION_RATING_TOOLTIP_AGE :最大车辆年限{STRING}：{COLOUR}{NUM} 年{STRING} STR_STATION_RATING_TOOLTIP_WAITTIME :上次结余时间距今{STRING}：{STRING} STR_STATION_RATING_TOOLTIP_WAITTIME_SHIP :上次结余时间距今{STRING}：{STRING}（航运） -STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE :{SET_COLOUR}{NUM} 天{STRING} +STR_STATION_RATING_TOOLTIP_WAITTIME_VALUE :{COLOUR}{NUM} 天{STRING} -STR_STATION_RATING_TOOLTIP_WAITUNITS :货物等待（在平均每日等待时间{STRING}）：{SET_COLOUR}{NUM}{STRING} +STR_STATION_RATING_TOOLTIP_WAITUNITS :货物等待（在平均每日等待时间{STRING}）：{COLOUR}{NUM}{STRING} STR_STATION_RATING_TOOLTIP_STATUE :公司雕像{STRING}：{STRING} STR_STATION_RATING_TOOLTIP_STATUE_NO :{GOLD}否{STRING} @@ -1807,7 +1808,7 @@ STR_TMPL_CONFIG_USEDEPOT :使用闲置 STR_TMPL_CONFIG_KEEPREMAINDERS :保持原样 STR_TMPL_CONFIG_OLD_ONLY :只换老的 -STR_TMPL_NUM_TRAINS_NEED_RPL :要被替换的火车: {SET_COLOUR}{COMMA} +STR_TMPL_NUM_TRAINS_NEED_RPL :要被替换的火车: {COLOUR}{COMMA} STR_TMPL_CARGO_SUMMARY :{CARGO_LONG} STR_TMPL_CARGO_SUMMARY_MULTI :{CARGO_LONG}（x{NUM}） @@ -1917,5 +1918,5 @@ STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_OFF :关闭 STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_SIMPLE :简单 STR_CONFIG_SETTING_STATION_RATING_TOOLTIP_MODE_DETAILED :详细 -STR_VIEWPORT_TOWN_COLOUR :{1:SET_COLOUR}{0:TOWN} -STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {SET_COLOUR}（{COMMA}） +STR_VIEWPORT_TOWN_COLOUR :{1:COLOUR}{0:TOWN} +STR_VIEWPORT_TOWN_COLOUR_POP :{WHITE}{TOWN} {COLOUR}（{COMMA}） diff --git a/src/lang/extra/slovak.txt b/src/lang/extra/slovak.txt index 72a9931e25..ebdd8cfe8c 100644 --- a/src/lang/extra/slovak.txt +++ b/src/lang/extra/slovak.txt @@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Zmeniť STR_PURCHASE_INFO_DESIGNED :{BLACK}Vyrobené: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :P: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :O: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/slovenian.txt b/src/lang/extra/slovenian.txt index 2936becd0b..111078b005 100644 --- a/src/lang/extra/slovenian.txt +++ b/src/lang/extra/slovenian.txt @@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Spremeni STR_PURCHASE_INFO_DESIGNED :{BLACK}Zasnova: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/spanish.txt b/src/lang/extra/spanish.txt index dff541fb80..012267ab5a 100644 --- a/src/lang/extra/spanish.txt +++ b/src/lang/extra/spanish.txt @@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Cambiar STR_PURCHASE_INFO_DESIGNED :{BLACK}Diseñado en: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ll: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :S: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/spanish_MX.txt b/src/lang/extra/spanish_MX.txt index 645c05b775..533708504d 100644 --- a/src/lang/extra/spanish_MX.txt +++ b/src/lang/extra/spanish_MX.txt @@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Cambiar STR_PURCHASE_INFO_DESIGNED :{BLACK}Diseñado: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Lleg: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Sal: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/swedish.txt b/src/lang/extra/swedish.txt index e3a271c769..8888e2d604 100644 --- a/src/lang/extra/swedish.txt +++ b/src/lang/extra/swedish.txt @@ -32,6 +32,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Ändra s STR_PURCHASE_INFO_DESIGNED :{BLACK}Designår: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/tamil.txt b/src/lang/extra/tamil.txt index 7ea92e889e..1ed06cd7a0 100644 --- a/src/lang/extra/tamil.txt +++ b/src/lang/extra/tamil.txt @@ -29,6 +29,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 diff --git a/src/lang/extra/thai.txt b/src/lang/extra/thai.txt index 3b38ea4e5c..b5e86d74e1 100644 --- a/src/lang/extra/thai.txt +++ b/src/lang/extra/thai.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 diff --git a/src/lang/extra/traditional_chinese.txt b/src/lang/extra/traditional_chinese.txt index 8f1f39a20e..e078c6be78 100644 --- a/src/lang/extra/traditional_chinese.txt +++ b/src/lang/extra/traditional_chinese.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 diff --git a/src/lang/extra/turkish.txt b/src/lang/extra/turkish.txt index e3758d001b..537b425c5f 100644 --- a/src/lang/extra/turkish.txt +++ b/src/lang/extra/turkish.txt @@ -34,6 +34,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Kar yük STR_PURCHASE_INFO_DESIGNED :{BLACK}Yapım yılı: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :V: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Ç: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/ukrainian.txt b/src/lang/extra/ukrainian.txt index 45fba1b7de..3e2c14b604 100644 --- a/src/lang/extra/ukrainian.txt +++ b/src/lang/extra/ukrainian.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 diff --git a/src/lang/extra/vietnamese.txt b/src/lang/extra/vietnamese.txt index 61bc1150c0..534c2edaae 100644 --- a/src/lang/extra/vietnamese.txt +++ b/src/lang/extra/vietnamese.txt @@ -35,6 +35,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Thay đ STR_PURCHASE_INFO_DESIGNED :{BLACK}Thiết kế: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Đến: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Đi: + # Cargo type orders Window # Plans window diff --git a/src/lang/extra/welsh.txt b/src/lang/extra/welsh.txt index 69553de1bd..522c406058 100644 --- a/src/lang/extra/welsh.txt +++ b/src/lang/extra/welsh.txt @@ -31,6 +31,9 @@ STR_MAPGEN_SNOW_LINE_QUERY_CAPT :{WHITE}Newid uc STR_PURCHASE_INFO_DESIGNED :{BLACK}Cynlluniwyd: {GOLD}{NUM} +STR_TIMETABLE_ARRIVAL_ABBREVIATION :Cyr: +STR_TIMETABLE_DEPARTURE_ABBREVIATION :Gad: + # Cargo type orders Window # Plans window diff --git a/src/lang/faroese.txt b/src/lang/faroese.txt index 37c243436e..c00b29d8b7 100644 --- a/src/lang/faroese.txt +++ b/src/lang/faroese.txt @@ -864,38 +864,39 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Spæli m STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Gjaldsoyra eindir STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Úrval av gjaldsoyra eindum + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Bretsk Pund (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dollarar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Evrir (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Eysturríkskan Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgiskan Frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Sveisiskan Frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tjekkisk Koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danskar Krónir (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spanskir Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finskan Mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franskan Frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grikkskan Drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungarskan Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Íslenska Krónu (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italskan Lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Niðurlendskan Gillin (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norskar Krónur (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polskan Zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumeniskan Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russiskar Rublar (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenskar Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Svenskar Krónur (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkiskan Lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakiska Koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasilskan Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estoniska Krooni (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litauiskir Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Suður Koreanskar Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Suður Afrikanskir Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Bretsk Pund +STR_GAME_OPTIONS_CURRENCY_USD :Dollarar +STR_GAME_OPTIONS_CURRENCY_EUR :Evrir +STR_GAME_OPTIONS_CURRENCY_JPY :Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Eysturríkskan Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgiskan Frank +STR_GAME_OPTIONS_CURRENCY_CHF :Sveisiskan Frank +STR_GAME_OPTIONS_CURRENCY_CZK :Tjekkisk Koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Danskar Krónir +STR_GAME_OPTIONS_CURRENCY_ESP :Spanskir Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finskan Mark +STR_GAME_OPTIONS_CURRENCY_FRF :Franskan Frank +STR_GAME_OPTIONS_CURRENCY_GRD :Grikkskan Drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Ungarskan Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Íslenska Krónu +STR_GAME_OPTIONS_CURRENCY_ITL :Italskan Lira +STR_GAME_OPTIONS_CURRENCY_NLG :Niðurlendskan Gillin +STR_GAME_OPTIONS_CURRENCY_NOK :Norskar Krónur +STR_GAME_OPTIONS_CURRENCY_PLN :Polskan Zloty +STR_GAME_OPTIONS_CURRENCY_RON :Rumeniskan Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russiskar Rublar +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenskar Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Svenskar Krónur +STR_GAME_OPTIONS_CURRENCY_TRY :Turkiskan Lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakiska Koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brasilskan Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estoniska Krooni +STR_GAME_OPTIONS_CURRENCY_LTL :Litauiskir Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Suður Koreanskar Won +STR_GAME_OPTIONS_CURRENCY_ZAR :Suður Afrikanskir Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Sjálvgjørt... STR_GAME_OPTIONS_CURRENCY_GEL :Georgiskur Lari STR_GAME_OPTIONS_CURRENCY_IRR :Iranskur Rial @@ -1689,15 +1690,15 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :Eingin ###length 3 -STR_CONFIG_SETTING_SOUND :{ORANGE}Ljóð effektir -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Takførisflati -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Bygging -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Flutningstól -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Beining -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Bygdir -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Ídnaðir -STR_CONFIG_SETTING_AI :{ORANGE}Kappingarneytar -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Teldu spælarir +STR_CONFIG_SETTING_SOUND :Ljóð effektir +STR_CONFIG_SETTING_INTERFACE :Takførisflati +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Bygging +STR_CONFIG_SETTING_VEHICLES :Flutningstól +STR_CONFIG_SETTING_VEHICLES_ROUTING :Beining +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Bygdir +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Ídnaðir +STR_CONFIG_SETTING_AI :Kappingarneytar +STR_CONFIG_SETTING_AI_NPC :Teldu spælarir STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Leiðbeinari fyri tok: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Leið beinari at nýta til tok @@ -3606,8 +3607,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Væntað STR_TIMETABLE_SCHEDULED :{BLACK}Ætlað STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Skift ímillum væntað og ætlað -STR_TIMETABLE_ARRIVAL_ABBREVIATION :K: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :F: # Date window (for timetable) diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index 2a5b694fdd..edf725687e 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -846,7 +846,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} on suljettu velkojien toimesta ja kaikki omaisuus on myyty pois! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Uusi kuljetusyhtiö perustettu! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} aloittaa rakentamisen kunnassa {TOWN}! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{1:STRING} on ottanut haltuunsa yhtiön {0:STRING}! +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{1:STRING} on ottanut haltuunsa yhtiön {0:STRING} julkistamattomaan hintaan! STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(pääjohtaja) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} rahoitti uuden kunnan, {TOWN}, rakentamista! @@ -951,49 +951,51 @@ STR_GAME_OPTIONS_VOLUME_100 :100{NBSP}% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Rahayksikkö STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Rahayksikön valinta +STR_GAME_OPTIONS_CURRENCY_CODE :{STRING} ({STRING}) + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Englannin punta (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Yhdysvaltain dollari (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanin jeni (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Itävallan šillinki (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgian frangi (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Sveitsin frangi (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tšekin koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Saksan markka (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Tanskan kruunu (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Espanjan peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Suomen markka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Ranskan frangi (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Kreikan drakma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Unkarin forintti (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islannin kruunu (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italian liira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Hollannin guldeni (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norjan kruunu (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Puolan złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Romanian leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Venäjän rupla (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian tolari (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Ruotsin kruunu (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkin liira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakian koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasilian reali (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Viron kruunu (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Liettuan liti (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Etelä-Korean won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Etelä-Afrikan randi (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Englannin punta +STR_GAME_OPTIONS_CURRENCY_USD :Yhdysvaltain dollari +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanin jeni +STR_GAME_OPTIONS_CURRENCY_ATS :Itävallan šillinki +STR_GAME_OPTIONS_CURRENCY_BEF :Belgian frangi +STR_GAME_OPTIONS_CURRENCY_CHF :Sveitsin frangi +STR_GAME_OPTIONS_CURRENCY_CZK :Tšekin koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Saksan markka +STR_GAME_OPTIONS_CURRENCY_DKK :Tanskan kruunu +STR_GAME_OPTIONS_CURRENCY_ESP :Espanjan peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Suomen markka +STR_GAME_OPTIONS_CURRENCY_FRF :Ranskan frangi +STR_GAME_OPTIONS_CURRENCY_GRD :Kreikan drakma +STR_GAME_OPTIONS_CURRENCY_HUF :Unkarin forintti +STR_GAME_OPTIONS_CURRENCY_ISK :Islannin kruunu +STR_GAME_OPTIONS_CURRENCY_ITL :Italian liira +STR_GAME_OPTIONS_CURRENCY_NLG :Hollannin guldeni +STR_GAME_OPTIONS_CURRENCY_NOK :Norjan kruunu +STR_GAME_OPTIONS_CURRENCY_PLN :Puolan złoty +STR_GAME_OPTIONS_CURRENCY_RON :Romanian leu +STR_GAME_OPTIONS_CURRENCY_RUR :Venäjän rupla +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian tolari +STR_GAME_OPTIONS_CURRENCY_SEK :Ruotsin kruunu +STR_GAME_OPTIONS_CURRENCY_TRY :Turkin liira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakian koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brasilian reali +STR_GAME_OPTIONS_CURRENCY_EEK :Viron kruunu +STR_GAME_OPTIONS_CURRENCY_LTL :Liettuan liti +STR_GAME_OPTIONS_CURRENCY_KRW :Etelä-Korean won +STR_GAME_OPTIONS_CURRENCY_ZAR :Etelä-Afrikan randi STR_GAME_OPTIONS_CURRENCY_CUSTOM :Oma... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgian lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iranin rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Uusi Venäjän rupla (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksikon peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Uusi Taiwanin dollari (TWD) -STR_GAME_OPTIONS_CURRENCY_CNY :Kiinan renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongin dollari (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Intian rupia (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian rupia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malesian ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgian lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranin rial +STR_GAME_OPTIONS_CURRENCY_RUB :Uusi Venäjän rupla +STR_GAME_OPTIONS_CURRENCY_MXN :Meksikon peso +STR_GAME_OPTIONS_CURRENCY_NTD :Uusi Taiwanin dollari +STR_GAME_OPTIONS_CURRENCY_CNY :Kiinan renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongin dollari +STR_GAME_OPTIONS_CURRENCY_INR :Intian rupia +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesian rupia +STR_GAME_OPTIONS_CURRENCY_MYR :Malesian ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automaattitallennus STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Valitse aikaväli automaattisille pelitallennuksille @@ -2018,30 +2020,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Brittiläinen ( STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrinen (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Mittayksiköt ja päivämäärät -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafiikka -STR_CONFIG_SETTING_SOUND :{ORANGE}Ääni -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Käyttöliittymä -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Yleinen -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Näkymät -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Rakentaminen -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Uutiset ja neuvonantajat -STR_CONFIG_SETTING_COMPANY :{ORANGE}Yhtiö -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Talous -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Kulkuneuvot -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fysiikka -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Reititys -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Rajoitukset -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Onnettomuudet -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Maailman luominen -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Ympäristö -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Viranomaiset -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Kunnat -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Laitokset -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Rahdin jakautuminen -STR_CONFIG_SETTING_AI :{ORANGE}Kilpailijat -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Tietokonepelaajat -STR_CONFIG_SETTING_NETWORK :{ORANGE}Verkko +STR_CONFIG_SETTING_LOCALISATION :Mittayksiköt ja päivämäärät +STR_CONFIG_SETTING_GRAPHICS :Grafiikka +STR_CONFIG_SETTING_SOUND :Ääni +STR_CONFIG_SETTING_INTERFACE :Käyttöliittymä +STR_CONFIG_SETTING_INTERFACE_GENERAL :Yleinen +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Näkymät +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Rakentaminen +STR_CONFIG_SETTING_ADVISORS :Uutiset ja neuvonantajat +STR_CONFIG_SETTING_COMPANY :Yhtiö +STR_CONFIG_SETTING_ACCOUNTING :Talous +STR_CONFIG_SETTING_VEHICLES :Kulkuneuvot +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fysiikka +STR_CONFIG_SETTING_VEHICLES_ROUTING :Reititys +STR_CONFIG_SETTING_LIMITATIONS :Rajoitukset +STR_CONFIG_SETTING_ACCIDENTS :Onnettomuudet +STR_CONFIG_SETTING_GENWORLD :Maailman luominen +STR_CONFIG_SETTING_ENVIRONMENT :Ympäristö +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Viranomaiset +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Kunnat +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Laitokset +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Rahdin jakautuminen +STR_CONFIG_SETTING_AI :Kilpailijat +STR_CONFIG_SETTING_AI_NPC :Tietokonepelaajat +STR_CONFIG_SETTING_NETWORK :Verkko STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Junien käyttämä reitinetsijä: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Junien käyttämä reitinetsijä @@ -3760,6 +3762,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Yksityis STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Näytä tarkka infrastruktuurin määrä STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Anna rahaa STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Anna rahaa tälle yhtiölle +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Vihamielinen yrityskaappaus +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Valtaa tämä yhtiö STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Uudet kasvot STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Valitse uudet kasvot pääjohtajalle @@ -3775,6 +3779,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Pääjohtajan n STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Syötä annettava rahamäärä STR_BUY_COMPANY_MESSAGE :{WHITE}Etsimme kuljetusyhtiötä, joka ottaisi haltuunsa yhtiömme{}{}Haluatko ostaa yhtiön {COMPANY} hintaan {CURRENCY_LONG}? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}Yhtiön {COMPANY} vihamielisessä valtauksessa ostat sen koko omaisuuden ja maksat sen kaikki lainat sekä kahden vuoden voittoja vastaavan summan.{}{}Arvioitu kustannus on yhteensä {CURRENCY_LONG}.{}{}Haluatko jatkaa tätä yrityskaappausta? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}{COMPANY}: Infrastruktuuri @@ -3846,6 +3851,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Muokkaa STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Ohjaa kaikkia listan kulkuneuvoja STR_VEHICLE_LIST_REPLACE_VEHICLES :Korvaa kulkuneuvoja STR_VEHICLE_LIST_SEND_FOR_SERVICING :Lähetä huoltoon +STR_VEHICLE_LIST_CREATE_GROUP :Luo ryhmä STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Tuotto tänä vuonna: {CURRENCY_LONG} (viime vuonna: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4568,8 +4574,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Odotettu STR_TIMETABLE_SCHEDULED :{BLACK}Aikataulu STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Vaihda odotetun ja aikataulun välillä -STR_TIMETABLE_ARRIVAL_ABBREVIATION :S: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :L: +STR_TIMETABLE_ARRIVAL :T: {COLOUR}{DATE_TINY} +STR_TIMETABLE_DEPARTURE :L: {COLOUR}{DATE_TINY} # Date window (for timetable) @@ -5624,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} diff --git a/src/lang/french.txt b/src/lang/french.txt index e5063b6c4e..818e417de6 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -847,7 +847,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} a été dissolue par ses créanciers et tous ses actifs vendus{NBSP}! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Nouvelle compagnie de transport{NBSP}! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} commence à construire près de {TOWN}{NBSP}! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} a été rachetée par {STRING}{NBSP}! +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} a été rachetée par {STRING} pour un montant iconnu ! STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Président) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} a sponsorisé la construction de la nouvelle ville {TOWN}{NBSP}! @@ -952,49 +952,51 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Devise STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Sélectionner l'unité monétaire +STR_GAME_OPTIONS_CURRENCY_CODE :{STRING} ({STRING}) + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Livre (£) -STR_GAME_OPTIONS_CURRENCY_USD :Dollar ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Shiling australien (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franc belge (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franc suisse (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Couronne tchèque (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Mark allemand (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Couronne danoise (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Mark finlandais (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc français (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachme grecque (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florin hongrois (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Couronne islandaise (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lire italienne (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Florin hollandais (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Couronne norvégienne (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Nouv. Zloty polonais (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu roumain (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rouble russe (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar slovénien (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Couronne suédoise (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lire turque (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Couronne slovaque (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Réal brésilien (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Couronne estonienne (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituanien (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won sud-coréen (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sud-africain (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Livre +STR_GAME_OPTIONS_CURRENCY_USD :Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Shiling australien +STR_GAME_OPTIONS_CURRENCY_BEF :Franc belge +STR_GAME_OPTIONS_CURRENCY_CHF :Franc suisse +STR_GAME_OPTIONS_CURRENCY_CZK :Couronne tchèque +STR_GAME_OPTIONS_CURRENCY_DEM :Mark allemand +STR_GAME_OPTIONS_CURRENCY_DKK :Couronne danoise +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Mark finlandais +STR_GAME_OPTIONS_CURRENCY_FRF :Franc français +STR_GAME_OPTIONS_CURRENCY_GRD :Drachme grecque +STR_GAME_OPTIONS_CURRENCY_HUF :Florin hongrois +STR_GAME_OPTIONS_CURRENCY_ISK :Couronne islandaise +STR_GAME_OPTIONS_CURRENCY_ITL :Lire italienne +STR_GAME_OPTIONS_CURRENCY_NLG :Florin hollandais +STR_GAME_OPTIONS_CURRENCY_NOK :Couronne norvégienne +STR_GAME_OPTIONS_CURRENCY_PLN :Nouv. Zloty polonais +STR_GAME_OPTIONS_CURRENCY_RON :Leu roumain +STR_GAME_OPTIONS_CURRENCY_RUR :Rouble russe +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar slovénien +STR_GAME_OPTIONS_CURRENCY_SEK :Couronne suédoise +STR_GAME_OPTIONS_CURRENCY_TRY :Lire turque +STR_GAME_OPTIONS_CURRENCY_SKK :Couronne slovaque +STR_GAME_OPTIONS_CURRENCY_BRL :Réal brésilien +STR_GAME_OPTIONS_CURRENCY_EEK :Couronne estonienne +STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituanien +STR_GAME_OPTIONS_CURRENCY_KRW :Won sud-coréen +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sud-africain STR_GAME_OPTIONS_CURRENCY_CUSTOM :Personnalisée... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Géorgien (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iranien (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nouveau rouble russe (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso méxicain (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nouveau Dollar de Taïwan (TWD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Chinois (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dollar de Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Roupie indienne (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Roupie indonésienne (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysian Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Géorgien +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iranien +STR_GAME_OPTIONS_CURRENCY_RUB :Nouveau rouble russe +STR_GAME_OPTIONS_CURRENCY_MXN :Peso méxicain +STR_GAME_OPTIONS_CURRENCY_NTD :Nouveau Dollar de Taïwan +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Chinois +STR_GAME_OPTIONS_CURRENCY_HKD :Dollar de Hong Kong +STR_GAME_OPTIONS_CURRENCY_INR :Roupie indienne +STR_GAME_OPTIONS_CURRENCY_IDR :Roupie indonésienne +STR_GAME_OPTIONS_CURRENCY_MYR :Malaysian Ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Sauvegarde automatique STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Sélectionner l'intervalle de temps entre les sauvegardes automatiques @@ -1016,21 +1018,21 @@ STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP :{BLACK}Cocher c STR_GAME_OPTIONS_RESOLUTION :{BLACK}Résolution STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Sélectionner la résolution d'écran à utiliser -STR_GAME_OPTIONS_RESOLUTION_OTHER :autre +STR_GAME_OPTIONS_RESOLUTION_OTHER :Autre STR_GAME_OPTIONS_RESOLUTION_ITEM :{NUM}x{NUM} -STR_GAME_OPTIONS_VIDEO_ACCELERATION :{BLACK} Accélération matérielle +STR_GAME_OPTIONS_VIDEO_ACCELERATION :{BLACK}Accélération matérielle STR_GAME_OPTIONS_VIDEO_ACCELERATION_TOOLTIP :{BLACK}Cochez cette case permet à OpenTTD d'utiliser l'accélération matérielle, si possible. Un paramètre modifié ne sera pris en compte qu'au redémarrage du jeu STR_GAME_OPTIONS_VIDEO_ACCELERATION_RESTART :{WHITE}Les paramètres ne prendront effet qu'après le redémarrage du jeu STR_GAME_OPTIONS_VIDEO_VSYNC :{BLACK}VSync -STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Cochez cette case pour activer la synchronisation verticale de l'écran. La modification de ce paramètres ne sera effective qu'après le redémarrage du jeu. Fonctionne uniquement si l’accélération matérielle est active +STR_GAME_OPTIONS_VIDEO_VSYNC_TOOLTIP :{BLACK}Cochez cette case pour activer la synchronisation verticale de l'écran. La modification de ce paramètre ne sera effective qu'après le redémarrage du jeu. Fonctionne uniquement si l’accélération matérielle est active. STR_GAME_OPTIONS_VIDEO_DRIVER_INFO :{BLACK}Pilote actif{NBSP}: {STRING} STR_GAME_OPTIONS_GUI_SCALE_FRAME :Taille de l'interface STR_GAME_OPTIONS_GUI_SCALE_TOOLTIP :{BLACK}Faites glisser la souris pour définir la taille de l'interface. Maintenir Ctrl pour un réglage en continu -STR_GAME_OPTIONS_GUI_SCALE_AUTO :détection automatique de la taille +STR_GAME_OPTIONS_GUI_SCALE_AUTO :Détection automatique de la taille STR_GAME_OPTIONS_GUI_SCALE_AUTO_TOOLTIP :{BLACK}Cochez cette case pour détecter automatiquement la taille de l'interface STR_GAME_OPTIONS_GUI_SCALE_BEVELS :{BLACK}Mettre à l’échelle les bordures @@ -1052,7 +1054,7 @@ STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP :{BLACK}Voir les STR_GAME_OPTIONS_GRAPHICS :{BLACK} Graphiques -STR_GAME_OPTIONS_REFRESH_RATE :{BLACK} Taux de rafraîchissement de l'affichage +STR_GAME_OPTIONS_REFRESH_RATE :{BLACK}Taux de rafraîchissement de l'affichage STR_GAME_OPTIONS_REFRESH_RATE_TOOLTIP :{BLACK} Sélectionnez la fréquence de rafraîchissement à utiliser STR_GAME_OPTIONS_REFRESH_RATE_ITEM :{NUM}Hz STR_GAME_OPTIONS_REFRESH_RATE_WARNING :{WHITE} Les taux de rafraîchissement supérieurs à 60Hz peuvent avoir un impact sur les performances. @@ -2019,30 +2021,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Impérial (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Métrique (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Localisation -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Graphiques -STR_CONFIG_SETTING_SOUND :{ORANGE}Son -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Général -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Vues -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construction -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Informations / Annonces -STR_CONFIG_SETTING_COMPANY :{ORANGE}Compagnie -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Comptabilité -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Véhicules -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Physique -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Routage -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitations -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Catastrophes / Accidents -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Création du terrain -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Environnement -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autorités -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Villes -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industries -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribution des marchandises -STR_CONFIG_SETTING_AI :{ORANGE}Compétiteurs -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Intelligence artificielle -STR_CONFIG_SETTING_NETWORK :{ORANGE}Réseau +STR_CONFIG_SETTING_LOCALISATION :Localisation +STR_CONFIG_SETTING_GRAPHICS :Graphiques +STR_CONFIG_SETTING_SOUND :Son +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :Général +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Vues +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construction +STR_CONFIG_SETTING_ADVISORS :Informations / Annonces +STR_CONFIG_SETTING_COMPANY :Compagnie +STR_CONFIG_SETTING_ACCOUNTING :Comptabilité +STR_CONFIG_SETTING_VEHICLES :Véhicules +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Physique +STR_CONFIG_SETTING_VEHICLES_ROUTING :Routage +STR_CONFIG_SETTING_LIMITATIONS :Limitations +STR_CONFIG_SETTING_ACCIDENTS :Catastrophes / Accidents +STR_CONFIG_SETTING_GENWORLD :Création du terrain +STR_CONFIG_SETTING_ENVIRONMENT :Environnement +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autorités +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Villes +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industries +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribution des marchandises +STR_CONFIG_SETTING_AI :Compétiteurs +STR_CONFIG_SETTING_AI_NPC :Intelligence artificielle +STR_CONFIG_SETTING_NETWORK :Réseau STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Recherche de chemin des trains{NBSP}: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Recherche de chemin à utiliser pour les trains @@ -2097,7 +2099,7 @@ STR_INTRO_GAME_OPTIONS :{BLACK}Options STR_INTRO_HIGHSCORE :{BLACK}Meilleurs scores STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Paramètres de jeu STR_INTRO_NEWGRF_SETTINGS :{BLACK}Paramètres NewGRF -STR_INTRO_ONLINE_CONTENT :{BLACK}Contenue additionnel en ligne +STR_INTRO_ONLINE_CONTENT :{BLACK}Contenu additionnel en ligne STR_INTRO_AI_SETTINGS :{BLACK}Configuration des IAs STR_INTRO_GAMESCRIPT_SETTINGS :{BLACK}Configuration du script de jeu STR_INTRO_QUIT :{BLACK}Quitter @@ -3761,6 +3763,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Détails STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Afficher le détail des calculs d'infrastructure STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Donner de l’argent STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Donner de l’argent à cette compagnie +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Rachat de force +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Racheter de force cette compagnie STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nouveau visage STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Choix d'un nouveau visage pour le P.D.G. @@ -3776,6 +3780,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Nom du P.D.G. STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Entrer le montant que vous souhaiter donner STR_BUY_COMPANY_MESSAGE :{WHITE}Nous sommes à la recherche d'un repreneur pour notre compagnie{}{}Voulez-vous acheter {COMPANY} pour {CURRENCY_LONG}{NBSP}? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}Si vous rachetez de force la compagnie {COMPANY} vous acquérirez tout ce qu'elle possède, rembourserez les prêts et payerez pendant deux ans une partie des profits.{}{} Le total est estimé à {CURRENCY_LONG}.{}{} Souhaitez-vous tout de même racheter de force cette compagnie ? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}Infrastructure de {COMPANY} @@ -3847,6 +3852,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Gérer l STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Envoyer des instructions à tous les véhicules de cette liste STR_VEHICLE_LIST_REPLACE_VEHICLES :Remplacer des véhicules STR_VEHICLE_LIST_SEND_FOR_SERVICING :Envoyer à l'entretien +STR_VEHICLE_LIST_CREATE_GROUP :Créer un groupe STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Profit cette année{NBSP}: {CURRENCY_LONG} (année précédente{NBSP}: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4569,8 +4575,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Attendu STR_TIMETABLE_SCHEDULED :{BLACK}Planifié STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Alterner entre attendu et planifié -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: +STR_TIMETABLE_ARRIVAL :A: {COLOUR}{DATE_TINY} +STR_TIMETABLE_DEPARTURE :D: {COLOUR}{DATE_TINY} # Date window (for timetable) @@ -5625,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} diff --git a/src/lang/frisian.txt b/src/lang/frisian.txt index b2cbf166e3..f1164007b3 100644 --- a/src/lang/frisian.txt +++ b/src/lang/frisian.txt @@ -901,49 +901,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Spulopsj STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Muntienheid STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Muntienheidseleksje + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Britske Pûn (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Amerikaanske Dollars (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanske Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Eastenrykske Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgyske Frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Switserske Frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tsjechyske Koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Dútske mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Deenske Kroan (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spaanske Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finske Markka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Frânske Franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grykske Drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Hongaarske Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Yslânske Kroan (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italjaanske Lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nederlânske Gûne (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Noorske Kroan (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poalske Zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Roemeenske Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russyske Rubels (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Sloveenske Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Sweedske Kroan (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkse Lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slowaakske Kroan (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Braziljaanse Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estlânske Kroan (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litouwske Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Súd-Koreaanske Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Súd-Afrikaanske Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Britske Pûn +STR_GAME_OPTIONS_CURRENCY_USD :Amerikaanske Dollars +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanske Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Eastenrykske Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgyske Frank +STR_GAME_OPTIONS_CURRENCY_CHF :Switserske Frank +STR_GAME_OPTIONS_CURRENCY_CZK :Tsjechyske Koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Dútske mark +STR_GAME_OPTIONS_CURRENCY_DKK :Deenske Kroan +STR_GAME_OPTIONS_CURRENCY_ESP :Spaanske Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finske Markka +STR_GAME_OPTIONS_CURRENCY_FRF :Frânske Franc +STR_GAME_OPTIONS_CURRENCY_GRD :Grykske Drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Hongaarske Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Yslânske Kroan +STR_GAME_OPTIONS_CURRENCY_ITL :Italjaanske Lire +STR_GAME_OPTIONS_CURRENCY_NLG :Nederlânske Gûne +STR_GAME_OPTIONS_CURRENCY_NOK :Noorske Kroan +STR_GAME_OPTIONS_CURRENCY_PLN :Poalske Zloty +STR_GAME_OPTIONS_CURRENCY_RON :Roemeenske Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russyske Rubels +STR_GAME_OPTIONS_CURRENCY_SIT :Sloveenske Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Sweedske Kroan +STR_GAME_OPTIONS_CURRENCY_TRY :Turkse Lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slowaakske Kroan +STR_GAME_OPTIONS_CURRENCY_BRL :Braziljaanse Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estlânske Kroan +STR_GAME_OPTIONS_CURRENCY_LTL :Litouwske Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Súd-Koreaanske Won +STR_GAME_OPTIONS_CURRENCY_ZAR :Súd-Afrikaanske Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Oanpasse... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgyske Lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iraanske Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Neie Russyske Rubels (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksikaanse Peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Neie Taiwanesyske Dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Sineeske Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongske Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Yndyske rupee (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Yndonezyske Roepia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Maleizyske Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgyske Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iraanske Rial +STR_GAME_OPTIONS_CURRENCY_RUB :Neie Russyske Rubels +STR_GAME_OPTIONS_CURRENCY_MXN :Meksikaanse Peso +STR_GAME_OPTIONS_CURRENCY_NTD :Neie Taiwanesyske Dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Sineeske Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongske Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Yndyske rupee +STR_GAME_OPTIONS_CURRENCY_IDR :Yndonezyske Roepia +STR_GAME_OPTIONS_CURRENCY_MYR :Maleizyske Ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automatysk opslaan STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Selektearje de interval foar automatysk opslaan @@ -1812,29 +1813,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Ymperiaal (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrysk (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalisaasje -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Ôfbyldings -STR_CONFIG_SETTING_SOUND :{ORANGE}Lûd -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Algemien -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}konstruksje -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nijs / Adviseurs -STR_CONFIG_SETTING_COMPANY :{ORANGE}Bedriuw -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Boekhâlding -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Motorreauwen -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Natuerkundig model -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Route -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Beheinings -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Rampen / Ûngelokken -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Wrâldgeneraasje -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Omwrâld -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoriteiten -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Stêd -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}yndustryen -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Frachtdistribusje -STR_CONFIG_SETTING_AI :{ORANGE}Tsjinstânners -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computer spilers -STR_CONFIG_SETTING_NETWORK :{ORANGE}Netwurk +STR_CONFIG_SETTING_LOCALISATION :Lokalisaasje +STR_CONFIG_SETTING_GRAPHICS :Ôfbyldings +STR_CONFIG_SETTING_SOUND :Lûd +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :Algemien +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :konstruksje +STR_CONFIG_SETTING_ADVISORS :Nijs / Adviseurs +STR_CONFIG_SETTING_COMPANY :Bedriuw +STR_CONFIG_SETTING_ACCOUNTING :Boekhâlding +STR_CONFIG_SETTING_VEHICLES :Motorreauwen +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Natuerkundig model +STR_CONFIG_SETTING_VEHICLES_ROUTING :Route +STR_CONFIG_SETTING_LIMITATIONS :Beheinings +STR_CONFIG_SETTING_ACCIDENTS :Rampen / Ûngelokken +STR_CONFIG_SETTING_GENWORLD :Wrâldgeneraasje +STR_CONFIG_SETTING_ENVIRONMENT :Omwrâld +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoriteiten +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Stêd +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :yndustryen +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Frachtdistribusje +STR_CONFIG_SETTING_AI :Tsjinstânners +STR_CONFIG_SETTING_AI_NPC :Computer spilers +STR_CONFIG_SETTING_NETWORK :Netwurk STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pathfinder foar treinen: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :Pathfinder foar auto's: {STRING} @@ -3807,8 +3808,6 @@ STR_TIMETABLE_RESET_LATENESS :{BLACK}Fertragi STR_TIMETABLE_EXPECTED :{BLACK}Ferwachte STR_TIMETABLE_SCHEDULED :{BLACK}Pland -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :F: # Date window (for timetable) diff --git a/src/lang/gaelic.txt b/src/lang/gaelic.txt index 3638eddb11..bd159a301c 100644 --- a/src/lang/gaelic.txt +++ b/src/lang/gaelic.txt @@ -1097,41 +1097,42 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Roghainn STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Aonadan airgeadra STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Tagh aonadan airgeadra + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Not Breatannach (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dolar Aimeireaganach (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Eòro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen Seapanach (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Sgillin Ostaireach (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franc Beilgeach (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franc Eilbheiseach (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Seiceach (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Mark Gearmailteach (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Crùn Danmhairgeach (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Spàinnteach (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Markka Fionnlannach (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc Frangach (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Greugach (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint Ungaireach (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Krona Tìleach (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Eadailteach (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Guilder Duitseach (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Krone Nirribheach (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Pòlainneach (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Romàineach (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rùbal Ruiseach (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slòbhaineach (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Krona Suaineach (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turcach (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slòbhacach (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real Braisileach (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Eastoineach (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas Liotuaineach (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won Choirèa a Deas (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Afraga a Deas (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Not Breatannach +STR_GAME_OPTIONS_CURRENCY_USD :Dolar Aimeireaganach +STR_GAME_OPTIONS_CURRENCY_EUR :Eòro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen Seapanach +STR_GAME_OPTIONS_CURRENCY_ATS :Sgillin Ostaireach +STR_GAME_OPTIONS_CURRENCY_BEF :Franc Beilgeach +STR_GAME_OPTIONS_CURRENCY_CHF :Franc Eilbheiseach +STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Seiceach +STR_GAME_OPTIONS_CURRENCY_DEM :Mark Gearmailteach +STR_GAME_OPTIONS_CURRENCY_DKK :Crùn Danmhairgeach +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Spàinnteach +STR_GAME_OPTIONS_CURRENCY_FIM :Markka Fionnlannach +STR_GAME_OPTIONS_CURRENCY_FRF :Franc Frangach +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Greugach +STR_GAME_OPTIONS_CURRENCY_HUF :Forint Ungaireach +STR_GAME_OPTIONS_CURRENCY_ISK :Krona Tìleach +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Eadailteach +STR_GAME_OPTIONS_CURRENCY_NLG :Guilder Duitseach +STR_GAME_OPTIONS_CURRENCY_NOK :Krone Nirribheach +STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Pòlainneach +STR_GAME_OPTIONS_CURRENCY_RON :Leu Romàineach +STR_GAME_OPTIONS_CURRENCY_RUR :Rùbal Ruiseach +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slòbhaineach +STR_GAME_OPTIONS_CURRENCY_SEK :Krona Suaineach +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turcach +STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slòbhacach +STR_GAME_OPTIONS_CURRENCY_BRL :Real Braisileach +STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Eastoineach +STR_GAME_OPTIONS_CURRENCY_LTL :Litas Liotuaineach +STR_GAME_OPTIONS_CURRENCY_KRW :Won Choirèa a Deas +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Afraga a Deas STR_GAME_OPTIONS_CURRENCY_CUSTOM :Gnàthaichte... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Cairtbheileach (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iorànach (IRR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Cairtbheileach +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iorànach STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Fèin-shàbhaladh STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Tagh dè cho tric ’s a thèid an geama fèin-shàbhaladh @@ -2032,29 +2033,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Impireil (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Meatrach (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Ionadaileadh -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafaigeachd -STR_CONFIG_SETTING_SOUND :{ORANGE}Fuaim -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Eadar-aghaidh -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Coitcheann -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Puirt-sheallaidh -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Togail -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Comhairlean / Fiosrachadh -STR_CONFIG_SETTING_COMPANY :{ORANGE}Companaidh -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Cunntasachd -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Carbadan -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fiosaigeachd -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Lorg shlighean -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Cuingeachaidhean -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Dunaidh / Tubaistean -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Gintinn saoghail -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Àrainneachd -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Ùghdarrasan -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Bailtean -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Gnìomhachasan -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Sgaoileadh carago -STR_CONFIG_SETTING_AI :{ORANGE}Co-farpaisichean -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Cluicheadairean coimpiutair +STR_CONFIG_SETTING_LOCALISATION :Ionadaileadh +STR_CONFIG_SETTING_GRAPHICS :Grafaigeachd +STR_CONFIG_SETTING_SOUND :Fuaim +STR_CONFIG_SETTING_INTERFACE :Eadar-aghaidh +STR_CONFIG_SETTING_INTERFACE_GENERAL :Coitcheann +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Puirt-sheallaidh +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Togail +STR_CONFIG_SETTING_ADVISORS :Comhairlean / Fiosrachadh +STR_CONFIG_SETTING_COMPANY :Companaidh +STR_CONFIG_SETTING_ACCOUNTING :Cunntasachd +STR_CONFIG_SETTING_VEHICLES :Carbadan +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fiosaigeachd +STR_CONFIG_SETTING_VEHICLES_ROUTING :Lorg shlighean +STR_CONFIG_SETTING_LIMITATIONS :Cuingeachaidhean +STR_CONFIG_SETTING_ACCIDENTS :Dunaidh / Tubaistean +STR_CONFIG_SETTING_GENWORLD :Gintinn saoghail +STR_CONFIG_SETTING_ENVIRONMENT :Àrainneachd +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Ùghdarrasan +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Bailtean +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Gnìomhachasan +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Sgaoileadh carago +STR_CONFIG_SETTING_AI :Co-farpaisichean +STR_CONFIG_SETTING_AI_NPC :Cluicheadairean coimpiutair STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Lorg shlighean aig trèanaichean: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :An dòigh a lorgas trèanaichean an slighe @@ -4339,8 +4340,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Dùil ai STR_TIMETABLE_SCHEDULED :{BLACK}Clàraichte STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Gearr leum eadar dùil air is clàraichte -STR_TIMETABLE_ARRIVAL_ABBREVIATION :R: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :F: # Date window (for timetable) diff --git a/src/lang/galician.txt b/src/lang/galician.txt index 3bc27d8f8f..d2fd658d31 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -952,49 +952,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Unidades monetarias STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Selección de unidades monetarias + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Libra esterlina (£) -STR_GAME_OPTIONS_CURRENCY_USD :Dólar americano ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Ien xaponés (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Chelín austríaco (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franco suízo (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Coroa checa (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marco alemán (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Coroa danesa (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta española (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marco finés (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franco francés (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Dracma grego (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florín húngaro (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Coroa islandesa (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Florín neerlandés (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Coroa norueguesa (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Złoty polaco (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu rumano (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rublo ruso (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar esloveno (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Coroa sueca (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Coroa eslovaca (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real brasileiro (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Coroa estona (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituana (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Wŏn surcoreano (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra esterlina +STR_GAME_OPTIONS_CURRENCY_USD :Dólar americano +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Ien xaponés +STR_GAME_OPTIONS_CURRENCY_ATS :Chelín austríaco +STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga +STR_GAME_OPTIONS_CURRENCY_CHF :Franco suízo +STR_GAME_OPTIONS_CURRENCY_CZK :Coroa checa +STR_GAME_OPTIONS_CURRENCY_DEM :Marco alemán +STR_GAME_OPTIONS_CURRENCY_DKK :Coroa danesa +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta española +STR_GAME_OPTIONS_CURRENCY_FIM :Marco finés +STR_GAME_OPTIONS_CURRENCY_FRF :Franco francés +STR_GAME_OPTIONS_CURRENCY_GRD :Dracma grego +STR_GAME_OPTIONS_CURRENCY_HUF :Florín húngaro +STR_GAME_OPTIONS_CURRENCY_ISK :Coroa islandesa +STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Florín neerlandés +STR_GAME_OPTIONS_CURRENCY_NOK :Coroa norueguesa +STR_GAME_OPTIONS_CURRENCY_PLN :Złoty polaco +STR_GAME_OPTIONS_CURRENCY_RON :Leu rumano +STR_GAME_OPTIONS_CURRENCY_RUR :Rublo ruso +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar esloveno +STR_GAME_OPTIONS_CURRENCY_SEK :Coroa sueca +STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca +STR_GAME_OPTIONS_CURRENCY_SKK :Coroa eslovaca +STR_GAME_OPTIONS_CURRENCY_BRL :Real brasileiro +STR_GAME_OPTIONS_CURRENCY_EEK :Coroa estona +STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituana +STR_GAME_OPTIONS_CURRENCY_KRW :Wŏn surcoreano +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano STR_GAME_OPTIONS_CURRENCY_CUSTOM :Persoal... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari xeorxiano (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Real iraniano (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Novo rublo ruso (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicano (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Novo dólar taiwanés (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chinés (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dólar de Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupia India (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia Indonesia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malaio(MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari xeorxiano +STR_GAME_OPTIONS_CURRENCY_IRR :Real iraniano +STR_GAME_OPTIONS_CURRENCY_RUB :Novo rublo ruso +STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicano +STR_GAME_OPTIONS_CURRENCY_NTD :Novo dólar taiwanés +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chinés +STR_GAME_OPTIONS_CURRENCY_HKD :Dólar de Hong Kong +STR_GAME_OPTIONS_CURRENCY_INR :Rupia India +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia Indonesia +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malaio STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Autogravado STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Selecciona o intervalo entre autogravados @@ -2019,30 +2020,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}Localización -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Gráficos -STR_CONFIG_SETTING_SOUND :{ORANGE}Efectos de son -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Xeral -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Fiestras de visualización -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construción -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Novas / Conselleiros -STR_CONFIG_SETTING_COMPANY :{ORANGE}Compañía -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Contabilidade -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehículos -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Física -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Encamiñamento -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitacións -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Desastres / Accidentes -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Xeración do mundo -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Contorno -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoridades -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Cidades -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrias -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribución da carga -STR_CONFIG_SETTING_AI :{ORANGE}Competidores -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Xogadores da computadora -STR_CONFIG_SETTING_NETWORK :{ORANGE}Rede +STR_CONFIG_SETTING_LOCALISATION :Localización +STR_CONFIG_SETTING_GRAPHICS :Gráficos +STR_CONFIG_SETTING_SOUND :Efectos de son +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :Xeral +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Fiestras de visualización +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construción +STR_CONFIG_SETTING_ADVISORS :Novas / Conselleiros +STR_CONFIG_SETTING_COMPANY :Compañía +STR_CONFIG_SETTING_ACCOUNTING :Contabilidade +STR_CONFIG_SETTING_VEHICLES :Vehículos +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Física +STR_CONFIG_SETTING_VEHICLES_ROUTING :Encamiñamento +STR_CONFIG_SETTING_LIMITATIONS :Limitacións +STR_CONFIG_SETTING_ACCIDENTS :Desastres / Accidentes +STR_CONFIG_SETTING_GENWORLD :Xeración do mundo +STR_CONFIG_SETTING_ENVIRONMENT :Contorno +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoridades +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Cidades +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrias +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribución da carga +STR_CONFIG_SETTING_AI :Competidores +STR_CONFIG_SETTING_AI_NPC :Xogadores da computadora +STR_CONFIG_SETTING_NETWORK :Rede STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Buscador de ruta para trens: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Buscador de ruta empregado polos trens @@ -4568,8 +4569,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Esperado STR_TIMETABLE_SCHEDULED :{BLACK}Programado STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Alternar entre o esperado e o programado -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ch: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :S: # Date window (for timetable) diff --git a/src/lang/german.txt b/src/lang/german.txt index 3e9f349793..3d665b7679 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -196,6 +196,7 @@ STR_UNITS_VELOCITY_IMPERIAL :{DECIMAL}{NBSP} STR_UNITS_VELOCITY_METRIC :{DECIMAL}{NBSP}km/h STR_UNITS_VELOCITY_SI :{DECIMAL}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}Kacheln/Tag +STR_UNITS_VELOCITY_KNOTS :{DECIMAL}{NBSP}Knoten STR_UNITS_POWER_IMPERIAL :{DECIMAL}{NBSP}PS STR_UNITS_POWER_METRIC :{DECIMAL}{NBSP}PS @@ -344,7 +345,7 @@ STR_GOTO_ORDER_VIEW_TOOLTIP :{BLACK}Auftrags ###length 31 STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Spiel anhalten STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Zeitraffer (Zeit vergeht schnellstmöglich) -STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Einstellungen +STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Optionen und Einstellungen STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Spiel speichern, Spiel laden, Spiel abbrechen, (OpenTTD) Beenden STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Weltkarte, zusätzliche Fenster oder Schilderliste anzeigen STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Städteverzeichnis anzeigen @@ -931,55 +932,67 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Hauptans # Game options window STR_GAME_OPTIONS_CAPTION :{WHITE}Spieleinstellungen +STR_GAME_OPTIONS_TAB_GENERAL :Allgemein +STR_GAME_OPTIONS_TAB_GENERAL_TT :{BLACK}Wähle allgemeine Einstellungen +STR_GAME_OPTIONS_TAB_GRAPHICS :Grafik +STR_GAME_OPTIONS_TAB_SOUND :Sound +STR_GAME_OPTIONS_VOLUME :Lautstärke +STR_GAME_OPTIONS_SFX_VOLUME :Sound-Effekte +STR_GAME_OPTIONS_MUSIC_VOLUME :Musik +STR_GAME_OPTIONS_VOLUME_0 :0% +STR_GAME_OPTIONS_VOLUME_25 :25% +STR_GAME_OPTIONS_VOLUME_50 :50% +STR_GAME_OPTIONS_VOLUME_75 :75% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Währung STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Währung auswählen + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Britische Pfund (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :US-Dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanische Yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Österreichische Schilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgische Franken (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Schweizer Franken (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tschechische Kronen (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutsche Mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dänische Kronen (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spanische Peseten (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finnische Mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Französische Franken (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Griechische Drachmen (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungarische Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Isländische Kronen (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italienische Lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Niederländische Gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norwegische Kronen (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polnische Zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumänische Lei (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Alte Russische Rubel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenische Taler (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Schwedische Kronen (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Türkische Lire (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slowakische Kronen (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasilianische Reais (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estnische Kronen (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litauische Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Südkoreanische Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Südafrikanische Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Britische Pfund +STR_GAME_OPTIONS_CURRENCY_USD :US-Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanische Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Österreichische Schilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgische Franken +STR_GAME_OPTIONS_CURRENCY_CHF :Schweizer Franken +STR_GAME_OPTIONS_CURRENCY_CZK :Tschechische Kronen +STR_GAME_OPTIONS_CURRENCY_DEM :Deutsche Mark +STR_GAME_OPTIONS_CURRENCY_DKK :Dänische Kronen +STR_GAME_OPTIONS_CURRENCY_ESP :Spanische Peseten +STR_GAME_OPTIONS_CURRENCY_FIM :Finnische Mark +STR_GAME_OPTIONS_CURRENCY_FRF :Französische Franken +STR_GAME_OPTIONS_CURRENCY_GRD :Griechische Drachmen +STR_GAME_OPTIONS_CURRENCY_HUF :Ungarische Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Isländische Kronen +STR_GAME_OPTIONS_CURRENCY_ITL :Italienische Lire +STR_GAME_OPTIONS_CURRENCY_NLG :Niederländische Gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norwegische Kronen +STR_GAME_OPTIONS_CURRENCY_PLN :Polnische Zloty +STR_GAME_OPTIONS_CURRENCY_RON :Rumänische Lei +STR_GAME_OPTIONS_CURRENCY_RUR :Alte Russische Rubel +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenische Taler +STR_GAME_OPTIONS_CURRENCY_SEK :Schwedische Kronen +STR_GAME_OPTIONS_CURRENCY_TRY :Türkische Lire +STR_GAME_OPTIONS_CURRENCY_SKK :Slowakische Kronen +STR_GAME_OPTIONS_CURRENCY_BRL :Brasilianische Reais +STR_GAME_OPTIONS_CURRENCY_EEK :Estnische Kronen +STR_GAME_OPTIONS_CURRENCY_LTL :Litauische Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Südkoreanische Won +STR_GAME_OPTIONS_CURRENCY_ZAR :Südafrikanische Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Eigene ... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgische Lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iranische Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Neue Russische Rubel (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexikanische Pesos (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Neuer Taiwan-Dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinesische Yuan (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkong-Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indische Rupie (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesische Rupiah (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysische Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgische Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranische Rial +STR_GAME_OPTIONS_CURRENCY_RUB :Neue Russische Rubel +STR_GAME_OPTIONS_CURRENCY_MXN :Mexikanische Pesos +STR_GAME_OPTIONS_CURRENCY_NTD :Neuer Taiwan-Dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinesische Yuan +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkong-Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Indische Rupie +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesische Rupiah +STR_GAME_OPTIONS_CURRENCY_MYR :Malaysische Ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Autosicherung STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Abstand zwischen den automatischen Spielesicherungen wählen @@ -987,6 +1000,10 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Abstand # Autosave dropdown ###length 5 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Aus +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_10_MINUTES :Alle 10 Minuten +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES :Alle 30 Minuten +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES :Alle 60 Minuten +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES :Alle 120 Minuten STR_GAME_OPTIONS_LANGUAGE :{BLACK}Sprache STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Sprache für die Spieloberfläche auswählen @@ -1023,6 +1040,9 @@ STR_GAME_OPTIONS_GUI_SCALE_3X :3× STR_GAME_OPTIONS_GUI_SCALE_4X :4× STR_GAME_OPTIONS_GUI_SCALE_5X :5x +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK :{BLACK}Über Umfrage und Privatsphäre +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW :{BLACK}Vorschau des Umfrageergebnisses +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP :{BLACK}Zeige die Umfrageergebnisse des gerade laufenden Spiels an STR_GAME_OPTIONS_GRAPHICS :{BLACK}Grafik @@ -1153,6 +1173,7 @@ STR_CONFIG_SETTING_EXPAND_ALL :{BLACK}Alles au STR_CONFIG_SETTING_COLLAPSE_ALL :{BLACK}Alles einklappen STR_CONFIG_SETTING_RESET_ALL :{BLACK}Alle Werte zurücksetzen STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT :(keine Erklärung verfügbar) +STR_CONFIG_SETTING_VALUE :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR} STR_CONFIG_SETTING_DEFAULT_VALUE :{LTBLUE}Standardwert: {ORANGE}{STRING} STR_CONFIG_SETTING_TYPE :{LTBLUE}Art der Einstellung: {ORANGE}{STRING} STR_CONFIG_SETTING_TYPE_CLIENT :Nutzer-Einstellung (nicht in Spielständen gespeichert; beeinflusst alle Spiele) @@ -1944,6 +1965,7 @@ STR_CONFIG_SETTING_SHORT_PATH_SATURATION :Auslastung der STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT :Häufig gibt es mehrere Verbindungen um von einer Station zu einer anderen zu kommen. Zuerst wird der Algorithmus die kürzesten Verbindungen auslasten, dann die längeren usw. Wenn alle Verbindungen ausgelastet sind, verteilt er die verbliebene Nachfrage gleichmäßig. Diese Einstellung besagt, ab welcher Auslastung eine Verbinudng als „voll“ gilt und der Algorithmus in der ersten Runde die nächst längere wählt. Da die Kapazität der Verbindungen geschätzt wird, ist es sinnvoll, hier weniger als 100% anzugeben, um etwas „Luft“ für Fehlschätzungen zu lassen. STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY :Geschwindigkeitseinheit: {STRING} +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_NAUTICAL :Geschwindigkeitseinheit (nautisch): {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Immer wenn die Geschwindigkeit angezeigt wird, sie in den gewählten Einheiten anzeigen ###length 5 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Imperial (mph) @@ -1986,30 +2008,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperial (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrisch (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalisierung -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafik -STR_CONFIG_SETTING_SOUND :{ORANGE}Sound -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Oberfläche -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Allgemein -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Kartenansichten -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruktion -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nachrichten und Hinweise -STR_CONFIG_SETTING_COMPANY :{ORANGE}Firma -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Finanzen -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Fahrzeuge -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Physik -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Wegsuche -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Beschränkungen -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Unfälle und Katastrophen -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Spielfeld-Erzeugung -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Umgebung -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Öffentliche Verwaltungen -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Städte -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrien -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Warenverteilung -STR_CONFIG_SETTING_AI :{ORANGE}Mitbewerber -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computerspieler -STR_CONFIG_SETTING_NETWORK :{ORANGE}Netzwerk +STR_CONFIG_SETTING_LOCALISATION :Lokalisierung +STR_CONFIG_SETTING_GRAPHICS :Grafik +STR_CONFIG_SETTING_SOUND :Sound +STR_CONFIG_SETTING_INTERFACE :Oberfläche +STR_CONFIG_SETTING_INTERFACE_GENERAL :Allgemein +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Kartenansichten +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruktion +STR_CONFIG_SETTING_ADVISORS :Nachrichten und Hinweise +STR_CONFIG_SETTING_COMPANY :Firma +STR_CONFIG_SETTING_ACCOUNTING :Finanzen +STR_CONFIG_SETTING_VEHICLES :Fahrzeuge +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Physik +STR_CONFIG_SETTING_VEHICLES_ROUTING :Wegsuche +STR_CONFIG_SETTING_LIMITATIONS :Beschränkungen +STR_CONFIG_SETTING_ACCIDENTS :Unfälle und Katastrophen +STR_CONFIG_SETTING_GENWORLD :Spielfeld-Erzeugung +STR_CONFIG_SETTING_ENVIRONMENT :Umgebung +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Öffentliche Verwaltungen +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Städte +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrien +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Warenverteilung +STR_CONFIG_SETTING_AI :Mitbewerber +STR_CONFIG_SETTING_AI_NPC :Computerspieler +STR_CONFIG_SETTING_NETWORK :Netzwerk STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pfadsucher für Züge: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Pfadsuch-Algorithmus für Züge @@ -2378,6 +2400,9 @@ STR_NETWORK_ASK_RELAY_NO :{BLACK}Nein STR_NETWORK_ASK_RELAY_YES_ONCE :{BLACK}Ja, diesmal STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Ja, nicht erneut fragen +STR_NETWORK_ASK_SURVEY_LINK :Über Umfrage und Privatsphäre +STR_NETWORK_ASK_SURVEY_NO :Nein +STR_NETWORK_ASK_SURVEY_YES :Ja STR_NETWORK_SPECTATORS :Zuschauer @@ -2669,7 +2694,10 @@ STR_STATION_BUILD_STATION_CLASS_TOOLTIP :{BLACK}Eine Sta STR_STATION_BUILD_STATION_TYPE_TOOLTIP :{BLACK}Die Stationsart auswählen, die gebaut werden soll STR_STATION_CLASS_DFLT :Standardstation +STR_STATION_CLASS_DFLT_STATION :Standart-Haltestelle +STR_STATION_CLASS_DFLT_ROADSTOP :Standard-Staßenhaltestelle STR_STATION_CLASS_WAYP :Wegpunkte +STR_STATION_CLASS_WAYP_WAYPOINT :Standart-Wegpunkt # Signal window STR_BUILD_SIGNAL_CAPTION :{WHITE}Signalauswahl @@ -3718,6 +3746,7 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Details STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Detaillierte Informationen zur Infrastruktur dieser Firma anzeigen STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Verschenke Geld STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Geld an diese Firma verschenken +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Feindliche Übernahme STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Neues Gesicht STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Neues Gesicht für Manager aussuchen @@ -4524,8 +4553,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Voraussi STR_TIMETABLE_SCHEDULED :{BLACK}Fahrplanmäßig STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Umschalten zwischen Anzeige der erwarteten Ankunftszeit und des Fahrplans -STR_TIMETABLE_ARRIVAL_ABBREVIATION :an -STR_TIMETABLE_DEPARTURE_ABBREVIATION :ab # Date window (for timetable) @@ -4569,6 +4596,7 @@ STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}Die KIs, STR_AI_CONFIG_HUMAN_PLAYER :Menschlicher Spieler STR_AI_CONFIG_RANDOM_AI :Zufällige KI STR_AI_CONFIG_NONE :- +STR_AI_CONFIG_NAME_VERSION :{STRING} {YELLOW}v{NUM} STR_AI_CONFIG_MAX_COMPETITORS :{LTBLUE}Max. Mitbewerber-Zahl: {ORANGE}{COMMA} STR_AI_CONFIG_COMPETITORS_INTERVAL :{LTBLUE}Intervall zwischen Start von Wettbewerbern: {ORANGE}{COMMA} minute{P "" n} @@ -5085,6 +5113,7 @@ STR_ERROR_NO_BUOY :{WHITE}Es gibt STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Fahrplan kann nicht erstellt werden ... STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Fahrzeuge halten nur an Stationen STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Das Fahrzeug hält nicht an dieser Station +STR_ERROR_TIMETABLE_INCOMPLETE :{WHITE}... Fahrplan ist unvollständig # Sign related errors STR_ERROR_TOO_MANY_SIGNS :{WHITE}... zu viele Schilder @@ -5564,11 +5593,13 @@ STR_VEHICLE_NAME :{VEHICLE} STR_WAYPOINT_NAME :{WAYPOINT} STR_JUST_CARGO :{CARGO_LONG} +STR_JUST_RIGHT_ARROW :{RIGHT_ARROW} STR_JUST_CHECKMARK :{CHECKMARK} STR_JUST_COMMA :{COMMA} STR_JUST_CURRENCY_SHORT :{CURRENCY_SHORT} STR_JUST_CURRENCY_LONG :{CURRENCY_LONG} STR_JUST_CARGO_LIST :{CARGO_LIST} +STR_JUST_DECIMAL :{DECIMAL} STR_JUST_INT :{NUM} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_SHORT :{DATE_SHORT} diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 7022138599..2fb3380e09 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1042,49 +1042,50 @@ 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 :Στερλίνα Ηνωμένου Βασιλείου (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Δολλάριο Η.Π.Α. (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Ευρώ (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Ιαπωνικό Γιεν (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Αυστριακό Σελίνι (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Βελγικό Φράγκο (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Ελβετικό Φράγκο (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Τσέχικη Κορώνα (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Γερμανικό Μάρκο (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Δανέζικη Κορώνα (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Ισπανική Πεσέτα (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Φινλανδικό Μάρκο (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Γαλλικό Φράγκο (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Ελληνική Δραχμή (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ουγγρικό Φλουρί (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Ισλανδική Κορώνα (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Ιταλική Λίρα (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Ολλανδικό Φιορίνι (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Νορβηγική Κορώνα (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Πολωνικό Ζλότυ (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Ρουμάνικο Λευ (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ρωσικό Ρούβλι (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Σλοβένικο Τολάρ (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Σουηδική Κορώνα (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Τούρκικη Λίρα (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Σλοβάκικη Κορώνα (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Βραζιλιάνικο Ρεάλ (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Εσθονική Κορώνα (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Λιθουανική Λίτα (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Νοτιοκορεάτικο Γουόν (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Νοτιοαφρικάνικο Ραντ (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Στερλίνα Ηνωμένου Βασιλείου +STR_GAME_OPTIONS_CURRENCY_USD :Δολλάριο Η.Π.Α. +STR_GAME_OPTIONS_CURRENCY_EUR :Ευρώ +STR_GAME_OPTIONS_CURRENCY_JPY :Ιαπωνικό Γιεν +STR_GAME_OPTIONS_CURRENCY_ATS :Αυστριακό Σελίνι +STR_GAME_OPTIONS_CURRENCY_BEF :Βελγικό Φράγκο +STR_GAME_OPTIONS_CURRENCY_CHF :Ελβετικό Φράγκο +STR_GAME_OPTIONS_CURRENCY_CZK :Τσέχικη Κορώνα +STR_GAME_OPTIONS_CURRENCY_DEM :Γερμανικό Μάρκο +STR_GAME_OPTIONS_CURRENCY_DKK :Δανέζικη Κορώνα +STR_GAME_OPTIONS_CURRENCY_ESP :Ισπανική Πεσέτα +STR_GAME_OPTIONS_CURRENCY_FIM :Φινλανδικό Μάρκο +STR_GAME_OPTIONS_CURRENCY_FRF :Γαλλικό Φράγκο +STR_GAME_OPTIONS_CURRENCY_GRD :Ελληνική Δραχμή +STR_GAME_OPTIONS_CURRENCY_HUF :Ουγγρικό Φλουρί +STR_GAME_OPTIONS_CURRENCY_ISK :Ισλανδική Κορώνα +STR_GAME_OPTIONS_CURRENCY_ITL :Ιταλική Λίρα +STR_GAME_OPTIONS_CURRENCY_NLG :Ολλανδικό Φιορίνι +STR_GAME_OPTIONS_CURRENCY_NOK :Νορβηγική Κορώνα +STR_GAME_OPTIONS_CURRENCY_PLN :Πολωνικό Ζλότυ +STR_GAME_OPTIONS_CURRENCY_RON :Ρουμάνικο Λευ +STR_GAME_OPTIONS_CURRENCY_RUR :Ρωσικό Ρούβλι +STR_GAME_OPTIONS_CURRENCY_SIT :Σλοβένικο Τολάρ +STR_GAME_OPTIONS_CURRENCY_SEK :Σουηδική Κορώνα +STR_GAME_OPTIONS_CURRENCY_TRY :Τούρκικη Λίρα +STR_GAME_OPTIONS_CURRENCY_SKK :Σλοβάκικη Κορώνα +STR_GAME_OPTIONS_CURRENCY_BRL :Βραζιλιάνικο Ρεάλ +STR_GAME_OPTIONS_CURRENCY_EEK :Εσθονική Κορώνα +STR_GAME_OPTIONS_CURRENCY_LTL :Λιθουανική Λίτα +STR_GAME_OPTIONS_CURRENCY_KRW :Νοτιοκορεάτικο Γουόν +STR_GAME_OPTIONS_CURRENCY_ZAR :Νοτιοαφρικάνικο Ραντ STR_GAME_OPTIONS_CURRENCY_CUSTOM :Άλλο... -STR_GAME_OPTIONS_CURRENCY_GEL :Γεοργιανό Λάρι (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Ιρανικό Ριάλ (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Νεο Ρώσικο Ρούβλι (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Πεσος Μεξικου (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Δολλάριο Νέας Ταϊβάν (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Ρενμίνμπι Κίνας (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Δολάριο Χονγκ Κονγκ (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Ρουπία Ινδίας (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Ινδονησιακή Ρουπία (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ρινγκίτ Μαλαισίας (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Γεοργιανό Λάρι +STR_GAME_OPTIONS_CURRENCY_IRR :Ιρανικό Ριάλ +STR_GAME_OPTIONS_CURRENCY_RUB :Νεο Ρώσικο Ρούβλι +STR_GAME_OPTIONS_CURRENCY_MXN :Πεσος Μεξικου +STR_GAME_OPTIONS_CURRENCY_NTD :Δολλάριο Νέας Ταϊβάν +STR_GAME_OPTIONS_CURRENCY_CNY :Ρενμίνμπι Κίνας +STR_GAME_OPTIONS_CURRENCY_HKD :Δολάριο Χονγκ Κονγκ +STR_GAME_OPTIONS_CURRENCY_INR :Ρουπία Ινδίας +STR_GAME_OPTIONS_CURRENCY_IDR :Ινδονησιακή Ρουπία +STR_GAME_OPTIONS_CURRENCY_MYR :Ρινγκίτ Μαλαισίας STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Αυτόματη αποθήκευση STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Επιλογή διάκενου ανάμεσα στις αυτόματες αποθηκεύσεις @@ -2089,30 +2090,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Αυτοκρα STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Μετρικό (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Τοπικοποίηση -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Γραφικά -STR_CONFIG_SETTING_SOUND :{ORANGE}Ήχος -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Περιβάλλον Λειτουργίας -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Γενικά -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Παράθυρα προβολών -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Κατασκευή -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Ειδήσεις / Σύμβουλοι -STR_CONFIG_SETTING_COMPANY :{ORANGE}Εταιρία -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Λογιστικά -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Οχήματα -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Φυσική -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Δρομολογήσεις -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Περιορισμοί -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Καταστροφές/Ατυχήματα -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Δημιουργία Κόσμου -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Περιβάλλον -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Αρχές -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Πόλεις -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Βιομηχανίες -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Κατανομή φορτίων -STR_CONFIG_SETTING_AI :{ORANGE}Ανταγωνιστές -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Παίκτες υπολογιστή -STR_CONFIG_SETTING_NETWORK :{ORANGE}Δίκτυο +STR_CONFIG_SETTING_LOCALISATION :Τοπικοποίηση +STR_CONFIG_SETTING_GRAPHICS :Γραφικά +STR_CONFIG_SETTING_SOUND :Ήχος +STR_CONFIG_SETTING_INTERFACE :Περιβάλλον Λειτουργίας +STR_CONFIG_SETTING_INTERFACE_GENERAL :Γενικά +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Παράθυρα προβολών +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Κατασκευή +STR_CONFIG_SETTING_ADVISORS :Ειδήσεις / Σύμβουλοι +STR_CONFIG_SETTING_COMPANY :Εταιρία +STR_CONFIG_SETTING_ACCOUNTING :Λογιστικά +STR_CONFIG_SETTING_VEHICLES :Οχήματα +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Φυσική +STR_CONFIG_SETTING_VEHICLES_ROUTING :Δρομολογήσεις +STR_CONFIG_SETTING_LIMITATIONS :Περιορισμοί +STR_CONFIG_SETTING_ACCIDENTS :Καταστροφές/Ατυχήματα +STR_CONFIG_SETTING_GENWORLD :Δημιουργία Κόσμου +STR_CONFIG_SETTING_ENVIRONMENT :Περιβάλλον +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Αρχές +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Πόλεις +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Βιομηχανίες +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Κατανομή φορτίων +STR_CONFIG_SETTING_AI :Ανταγωνιστές +STR_CONFIG_SETTING_AI_NPC :Παίκτες υπολογιστή +STR_CONFIG_SETTING_NETWORK :Δίκτυο STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Μέθοδος δρομολόγησης για τρένα: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Μέθοδος διαπίστωσης διαδρομής που χρησιμοποιείται για τα τρένα @@ -4626,8 +4627,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) diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index c9bf5b2ddc..a347cd66ef 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -913,43 +913,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 :(GBP) לירה שטרלינג -STR_GAME_OPTIONS_CURRENCY_USD :(USD) דולר אמריקאי -STR_GAME_OPTIONS_CURRENCY_EUR :(EUR) יורו -STR_GAME_OPTIONS_CURRENCY_JPY :(JPY) ין יפני -STR_GAME_OPTIONS_CURRENCY_ATS :(ATS) שילינג אוסטרלי -STR_GAME_OPTIONS_CURRENCY_BEF :(BEF) פרנק בולגרי -STR_GAME_OPTIONS_CURRENCY_CHF :(CHF) פרנק שוודי -STR_GAME_OPTIONS_CURRENCY_CZK :(CZK) קרונה צ'כית -STR_GAME_OPTIONS_CURRENCY_DEM :(DEM) מרק גרמני -STR_GAME_OPTIONS_CURRENCY_DKK :(DKK) קרונה דנית -STR_GAME_OPTIONS_CURRENCY_ESP :(ESP) פזטה ספרדית -STR_GAME_OPTIONS_CURRENCY_FIM :(FIM) מרק פיני -STR_GAME_OPTIONS_CURRENCY_FRF :(FRF) פרנק צרפתי -STR_GAME_OPTIONS_CURRENCY_GRD :(GRD) דרכמה יוונית -STR_GAME_OPTIONS_CURRENCY_HUF :(HUF) פורינט הונגרי -STR_GAME_OPTIONS_CURRENCY_ISK :(ISK) קרונה איסלנדית -STR_GAME_OPTIONS_CURRENCY_ITL :(ITL) לירה איטלקית -STR_GAME_OPTIONS_CURRENCY_NLG :(NLG) גילדן הולנדי -STR_GAME_OPTIONS_CURRENCY_NOK :(NOK) קרונה נורווגית -STR_GAME_OPTIONS_CURRENCY_PLN :(PLN) זלוטי פולני -STR_GAME_OPTIONS_CURRENCY_RON :(RON) ליו רומני -STR_GAME_OPTIONS_CURRENCY_RUR :(RUR) רובל רוסי -STR_GAME_OPTIONS_CURRENCY_SIT :(SIT) טולר סלובני -STR_GAME_OPTIONS_CURRENCY_SEK :(SEK) קרונה שוודית -STR_GAME_OPTIONS_CURRENCY_TRY :(TRY) לירה טורקית -STR_GAME_OPTIONS_CURRENCY_SKK :(SKK) קורונה סלובקית -STR_GAME_OPTIONS_CURRENCY_BRL :(BRL) ריל ברזילאי -STR_GAME_OPTIONS_CURRENCY_EEK :(EEK) קרוני אסטוני -STR_GAME_OPTIONS_CURRENCY_LTL :(LTL) ליטאס ליטאי -STR_GAME_OPTIONS_CURRENCY_KRW :(KRW) וון דרום קוריאני -STR_GAME_OPTIONS_CURRENCY_ZAR :(ZAR) ראנד דרום אפריקאי +STR_GAME_OPTIONS_CURRENCY_GBP :לירה שטרלינג +STR_GAME_OPTIONS_CURRENCY_USD :דולר אמריקאי +STR_GAME_OPTIONS_CURRENCY_EUR :יורו +STR_GAME_OPTIONS_CURRENCY_JPY :ין יפני +STR_GAME_OPTIONS_CURRENCY_ATS :שילינג אוסטרלי +STR_GAME_OPTIONS_CURRENCY_BEF :פרנק בולגרי +STR_GAME_OPTIONS_CURRENCY_CHF :פרנק שוודי +STR_GAME_OPTIONS_CURRENCY_CZK :קרונה צ'כית +STR_GAME_OPTIONS_CURRENCY_DEM :מרק גרמני +STR_GAME_OPTIONS_CURRENCY_DKK :קרונה דנית +STR_GAME_OPTIONS_CURRENCY_ESP :פזטה ספרדית +STR_GAME_OPTIONS_CURRENCY_FIM :מרק פיני +STR_GAME_OPTIONS_CURRENCY_FRF :פרנק צרפתי +STR_GAME_OPTIONS_CURRENCY_GRD :דרכמה יוונית +STR_GAME_OPTIONS_CURRENCY_HUF :פורינט הונגרי +STR_GAME_OPTIONS_CURRENCY_ISK :קרונה איסלנדית +STR_GAME_OPTIONS_CURRENCY_ITL :לירה איטלקית +STR_GAME_OPTIONS_CURRENCY_NLG :גילדן הולנדי +STR_GAME_OPTIONS_CURRENCY_NOK :קרונה נורווגית +STR_GAME_OPTIONS_CURRENCY_PLN :זלוטי פולני +STR_GAME_OPTIONS_CURRENCY_RON :ליו רומני +STR_GAME_OPTIONS_CURRENCY_RUR :רובל רוסי +STR_GAME_OPTIONS_CURRENCY_SIT :טולר סלובני +STR_GAME_OPTIONS_CURRENCY_SEK :קרונה שוודית +STR_GAME_OPTIONS_CURRENCY_TRY :לירה טורקית +STR_GAME_OPTIONS_CURRENCY_SKK :קורונה סלובקית +STR_GAME_OPTIONS_CURRENCY_BRL :ריל ברזילאי +STR_GAME_OPTIONS_CURRENCY_EEK :קרוני אסטוני +STR_GAME_OPTIONS_CURRENCY_LTL :ליטאס ליטאי +STR_GAME_OPTIONS_CURRENCY_KRW :וון דרום קוריאני +STR_GAME_OPTIONS_CURRENCY_ZAR :ראנד דרום אפריקאי STR_GAME_OPTIONS_CURRENCY_CUSTOM :אחר... -STR_GAME_OPTIONS_CURRENCY_GEL :לארי גאורגי (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :ריאל איראני (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :רובל רוסי (RUB) -STR_GAME_OPTIONS_CURRENCY_INR :רופי הודי (INR) +STR_GAME_OPTIONS_CURRENCY_GEL :לארי גאורגי +STR_GAME_OPTIONS_CURRENCY_IRR :ריאל איראני +STR_GAME_OPTIONS_CURRENCY_RUB :רובל רוסי +STR_GAME_OPTIONS_CURRENCY_INR :רופי הודי STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}שמירה אוטומטית STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}בחר פרק זמן בין שמירות אוטומטיות @@ -1880,29 +1881,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :בריטית ( STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :מטרי (מטר) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (מטר) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}הגדרות מיקום -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}גרפיקה -STR_CONFIG_SETTING_SOUND :{ORANGE}צלילים -STR_CONFIG_SETTING_INTERFACE :{ORANGE}ממשק חזותי -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}כללי -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}נקודות מבט -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}בנייה -STR_CONFIG_SETTING_ADVISORS :{ORANGE}חדשות / יועצים -STR_CONFIG_SETTING_COMPANY :{ORANGE}חברה -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}חשבונאות -STR_CONFIG_SETTING_VEHICLES :{ORANGE}כלי תחבורה -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}פיזיקה -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}ניתוב -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}מגבלות -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}אסונות / תאונות -STR_CONFIG_SETTING_GENWORLD :{ORANGE}יצירת עולם -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}סביבה -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}רשויות -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}ערים -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}תעשיות -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}התפלגות המטען -STR_CONFIG_SETTING_AI :{ORANGE}מתחרים -STR_CONFIG_SETTING_AI_NPC :{ORANGE}שחקני מחשב +STR_CONFIG_SETTING_LOCALISATION :הגדרות מיקום +STR_CONFIG_SETTING_GRAPHICS :גרפיקה +STR_CONFIG_SETTING_SOUND :צלילים +STR_CONFIG_SETTING_INTERFACE :ממשק חזותי +STR_CONFIG_SETTING_INTERFACE_GENERAL :כללי +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :נקודות מבט +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :בנייה +STR_CONFIG_SETTING_ADVISORS :חדשות / יועצים +STR_CONFIG_SETTING_COMPANY :חברה +STR_CONFIG_SETTING_ACCOUNTING :חשבונאות +STR_CONFIG_SETTING_VEHICLES :כלי תחבורה +STR_CONFIG_SETTING_VEHICLES_PHYSICS :פיזיקה +STR_CONFIG_SETTING_VEHICLES_ROUTING :ניתוב +STR_CONFIG_SETTING_LIMITATIONS :מגבלות +STR_CONFIG_SETTING_ACCIDENTS :אסונות / תאונות +STR_CONFIG_SETTING_GENWORLD :יצירת עולם +STR_CONFIG_SETTING_ENVIRONMENT :סביבה +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :רשויות +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :ערים +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :תעשיות +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :התפלגות המטען +STR_CONFIG_SETTING_AI :מתחרים +STR_CONFIG_SETTING_AI_NPC :שחקני מחשב STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{STRING} :אלגוריתם איתור נתיב עבור רכבות STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :אלגוריתם איתור נתיב עבור רכבות @@ -4235,8 +4236,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}צפוי STR_TIMETABLE_SCHEDULED :{BLACK}מתוכנן STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}החלף בין מתוכנן וצפוי -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) diff --git a/src/lang/hindi.txt b/src/lang/hindi.txt index 422f92b57f..d980ee5e79 100644 --- a/src/lang/hindi.txt +++ b/src/lang/hindi.txt @@ -274,6 +274,7 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC + ###length 42 STR_GAME_OPTIONS_CURRENCY_FIM :फिनलैंड मार्का (FIM) STR_GAME_OPTIONS_CURRENCY_ISK :आइसलैंडिक क्रोना (ISK) @@ -600,7 +601,7 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :अंतर् ###length 3 -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}सामान्य +STR_CONFIG_SETTING_INTERFACE_GENERAL :सामान्य STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_HELPTEXT :नौकाओं द्वारा उपयोग किया जाने वाला पथान्वेषी ###length 2 diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index ba8d3aeed9..3093e9430a 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1015,49 +1015,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Pénznem STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}A használt pénznem kiválasztása + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Angol Font (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Amerikai Dollár (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euró (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japán Jen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Osztrák Shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belga Frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Svájci Frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Cseh Korona (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Német Márka (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dán Korona (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spanyol Pezeta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finn Márka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Svájci Frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Görög Drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Magyar Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Izlandi Korona (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Olasz Líra (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Holland Gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norvég Korona (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Lengyel Zlotyi (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Román Lej (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Orosz Rubel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Szlovén Tolár (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Svéd Korona (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Török Líra (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Szlovák Korona (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazil Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Észt Korona (EKK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litván Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Dél-koreai Von (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Dél-afrikai Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Angol Font +STR_GAME_OPTIONS_CURRENCY_USD :Amerikai Dollár +STR_GAME_OPTIONS_CURRENCY_EUR :Euró +STR_GAME_OPTIONS_CURRENCY_JPY :Japán Jen +STR_GAME_OPTIONS_CURRENCY_ATS :Osztrák Shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belga Frank +STR_GAME_OPTIONS_CURRENCY_CHF :Svájci Frank +STR_GAME_OPTIONS_CURRENCY_CZK :Cseh Korona +STR_GAME_OPTIONS_CURRENCY_DEM :Német Márka +STR_GAME_OPTIONS_CURRENCY_DKK :Dán Korona +STR_GAME_OPTIONS_CURRENCY_ESP :Spanyol Pezeta +STR_GAME_OPTIONS_CURRENCY_FIM :Finn Márka +STR_GAME_OPTIONS_CURRENCY_FRF :Svájci Frank +STR_GAME_OPTIONS_CURRENCY_GRD :Görög Drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Magyar Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Izlandi Korona +STR_GAME_OPTIONS_CURRENCY_ITL :Olasz Líra +STR_GAME_OPTIONS_CURRENCY_NLG :Holland Gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norvég Korona +STR_GAME_OPTIONS_CURRENCY_PLN :Lengyel Zlotyi +STR_GAME_OPTIONS_CURRENCY_RON :Román Lej +STR_GAME_OPTIONS_CURRENCY_RUR :Orosz Rubel +STR_GAME_OPTIONS_CURRENCY_SIT :Szlovén Tolár +STR_GAME_OPTIONS_CURRENCY_SEK :Svéd Korona +STR_GAME_OPTIONS_CURRENCY_TRY :Török Líra +STR_GAME_OPTIONS_CURRENCY_SKK :Szlovák Korona +STR_GAME_OPTIONS_CURRENCY_BRL :Brazil Real +STR_GAME_OPTIONS_CURRENCY_EEK :Észt Korona +STR_GAME_OPTIONS_CURRENCY_LTL :Litván Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Dél-koreai Von +STR_GAME_OPTIONS_CURRENCY_ZAR :Dél-afrikai Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Saját... -STR_GAME_OPTIONS_CURRENCY_GEL :Grúz Lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iráni Riál (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Új Orosz Rubel (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexikói Peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Új Tajvani Dollár (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Kínai Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongi Dollár (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indiai Rúpia (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonéz rúpia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Maláj ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Grúz Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iráni Riál +STR_GAME_OPTIONS_CURRENCY_RUB :Új Orosz Rubel +STR_GAME_OPTIONS_CURRENCY_MXN :Mexikói Peso +STR_GAME_OPTIONS_CURRENCY_NTD :Új Tajvani Dollár +STR_GAME_OPTIONS_CURRENCY_CNY :Kínai Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongi Dollár +STR_GAME_OPTIONS_CURRENCY_INR :Indiai Rúpia +STR_GAME_OPTIONS_CURRENCY_IDR :Indonéz rúpia +STR_GAME_OPTIONS_CURRENCY_MYR :Maláj ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automatikus mentés STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Az automatikus mentések közötti időtartam kiválasztása @@ -2073,30 +2074,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Angolszász (l STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrikus (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Honosítás -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Megjelenés -STR_CONFIG_SETTING_SOUND :{ORANGE}Hang effektek -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Felület -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Általános -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Nézet -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Építkezés -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Hírüzenetek / Figyelmeztetések -STR_CONFIG_SETTING_COMPANY :{ORANGE}Vállalat -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Pénzügyek -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Járművek -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Útvonalkeresés -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Korlátozások -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katasztrófák / Balesetek -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Térképgenerálás -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Környezet -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Önkormányzatok -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Települések -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Gazdasági épületek -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Rakományok szétosztása (úticélok) -STR_CONFIG_SETTING_AI :{ORANGE}Ellenfelek -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Számítógép által vezérelt ellenfelek -STR_CONFIG_SETTING_NETWORK :{ORANGE}Hálózat +STR_CONFIG_SETTING_LOCALISATION :Honosítás +STR_CONFIG_SETTING_GRAPHICS :Megjelenés +STR_CONFIG_SETTING_SOUND :Hang effektek +STR_CONFIG_SETTING_INTERFACE :Felület +STR_CONFIG_SETTING_INTERFACE_GENERAL :Általános +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Nézet +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Építkezés +STR_CONFIG_SETTING_ADVISORS :Hírüzenetek / Figyelmeztetések +STR_CONFIG_SETTING_COMPANY :Vállalat +STR_CONFIG_SETTING_ACCOUNTING :Pénzügyek +STR_CONFIG_SETTING_VEHICLES :Járművek +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Útvonalkeresés +STR_CONFIG_SETTING_LIMITATIONS :Korlátozások +STR_CONFIG_SETTING_ACCIDENTS :Katasztrófák / Balesetek +STR_CONFIG_SETTING_GENWORLD :Térképgenerálás +STR_CONFIG_SETTING_ENVIRONMENT :Környezet +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Önkormányzatok +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Települések +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Gazdasági épületek +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Rakományok szétosztása (úticélok) +STR_CONFIG_SETTING_AI :Ellenfelek +STR_CONFIG_SETTING_AI_NPC :Számítógép által vezérelt ellenfelek +STR_CONFIG_SETTING_NETWORK :Hálózat STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Útvonalkereső vonatokhoz: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :A vonatokhoz használt útvonalkereső @@ -4616,8 +4617,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Várhat STR_TIMETABLE_SCHEDULED :{BLACK}Tervezett STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Váltás a várható és a tervezett időpontok között -STR_TIMETABLE_ARRIVAL_ABBREVIATION :É: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :I: # Date window (for timetable) diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index 35743210eb..7051c0fc09 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -863,41 +863,42 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Stilling STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Gjaldmiðill STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Val á gjaldmiðli + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Sterlingspund (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Bandaríkjadalur (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Evra (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanskt jen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Austurrískur skildingur (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgískur franki (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Svissneskur franki (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tékknesk kóróna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Þýskt mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dönsk króna (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spænskir pesetar (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finnskt mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franskur franki (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grísk drakma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungversk forinta (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Íslensk króna (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Ítölsk líra (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Hollensk gyllini (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norsk króna (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Pólskt slot (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rúmensk leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rússnesk rúbla (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slóvensk tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Sænsk króna (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Tyrknesk líra (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slóvakísk kórúna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasilísk ríla (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Eistnesk Króna (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litháenskt litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Suðurkóreskt vonn (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Suður-Afrískt rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Sterlingspund +STR_GAME_OPTIONS_CURRENCY_USD :Bandaríkjadalur +STR_GAME_OPTIONS_CURRENCY_EUR :Evra +STR_GAME_OPTIONS_CURRENCY_JPY :Japanskt jen +STR_GAME_OPTIONS_CURRENCY_ATS :Austurrískur skildingur +STR_GAME_OPTIONS_CURRENCY_BEF :Belgískur franki +STR_GAME_OPTIONS_CURRENCY_CHF :Svissneskur franki +STR_GAME_OPTIONS_CURRENCY_CZK :Tékknesk kóróna +STR_GAME_OPTIONS_CURRENCY_DEM :Þýskt mark +STR_GAME_OPTIONS_CURRENCY_DKK :Dönsk króna +STR_GAME_OPTIONS_CURRENCY_ESP :Spænskir pesetar +STR_GAME_OPTIONS_CURRENCY_FIM :Finnskt mark +STR_GAME_OPTIONS_CURRENCY_FRF :Franskur franki +STR_GAME_OPTIONS_CURRENCY_GRD :Grísk drakma +STR_GAME_OPTIONS_CURRENCY_HUF :Ungversk forinta +STR_GAME_OPTIONS_CURRENCY_ISK :Íslensk króna +STR_GAME_OPTIONS_CURRENCY_ITL :Ítölsk líra +STR_GAME_OPTIONS_CURRENCY_NLG :Hollensk gyllini +STR_GAME_OPTIONS_CURRENCY_NOK :Norsk króna +STR_GAME_OPTIONS_CURRENCY_PLN :Pólskt slot +STR_GAME_OPTIONS_CURRENCY_RON :Rúmensk leu +STR_GAME_OPTIONS_CURRENCY_RUR :Rússnesk rúbla +STR_GAME_OPTIONS_CURRENCY_SIT :Slóvensk tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Sænsk króna +STR_GAME_OPTIONS_CURRENCY_TRY :Tyrknesk líra +STR_GAME_OPTIONS_CURRENCY_SKK :Slóvakísk kórúna +STR_GAME_OPTIONS_CURRENCY_BRL :Brasilísk ríla +STR_GAME_OPTIONS_CURRENCY_EEK :Eistnesk Króna +STR_GAME_OPTIONS_CURRENCY_LTL :Litháenskt litas +STR_GAME_OPTIONS_CURRENCY_KRW :Suðurkóreskt vonn +STR_GAME_OPTIONS_CURRENCY_ZAR :Suður-Afrískt rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Sérsniðinn... STR_GAME_OPTIONS_CURRENCY_GEL :Lari (Gel) -STR_GAME_OPTIONS_CURRENCY_IRR :Íranskt ríal (IRR) +STR_GAME_OPTIONS_CURRENCY_IRR :Íranskt ríal STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Sjálfvirk vistun STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Tíðni sjálfvirkra vistana @@ -1714,15 +1715,15 @@ STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT :Meðalstærð b ###length 3 -STR_CONFIG_SETTING_SOUND :{ORANGE}Hljóð -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Viðmót -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Bygging -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Farartæki -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Leiðarvísun farartækja -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Bæir -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Iðnaður -STR_CONFIG_SETTING_AI :{ORANGE}Mótherji -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Gervigreind +STR_CONFIG_SETTING_SOUND :Hljóð +STR_CONFIG_SETTING_INTERFACE :Viðmót +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Bygging +STR_CONFIG_SETTING_VEHICLES :Farartæki +STR_CONFIG_SETTING_VEHICLES_ROUTING :Leiðarvísun farartækja +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Bæir +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Iðnaður +STR_CONFIG_SETTING_AI :Mótherji +STR_CONFIG_SETTING_AI_NPC :Gervigreind STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Leiðsögukerfi lesta: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Leiðsögukerfi sem nota á fyrir lestir @@ -3834,8 +3835,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Væntanl STR_TIMETABLE_SCHEDULED :{BLACK}Áætluð STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Skifta á milli væntanlegs og áætlaðs -STR_TIMETABLE_ARRIVAL_ABBREVIATION :K: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :F: # Date window (for timetable) diff --git a/src/lang/ido.txt b/src/lang/ido.txt index ddee0e4460..16e7b7bfdb 100644 --- a/src/lang/ido.txt +++ b/src/lang/ido.txt @@ -475,6 +475,7 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Ludo Sel + ###length 42 diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index bcbb80a5df..daed78f1ee 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -936,49 +936,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Opsi per STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Mata uang STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Pilih mata uang + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Poundsterling (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen Jepang (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Shilling Austria (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franc Belgia (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franc Swiss (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Ceko (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Krone Denmark (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Spanyol (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Markka Finlandia (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc Prancis (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Yunani (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint Hungaria (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Krona Islandia (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italian (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Krone Norwegia (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zloty Polandia (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Romania (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rubel Rusia (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slovenia (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Krona Swedia (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turki (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slovakia (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real Brazilia (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Estonia (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lithuania (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won Korea Selatan (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Afrika Selatan (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Poundsterling +STR_GAME_OPTIONS_CURRENCY_USD :Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen Jepang +STR_GAME_OPTIONS_CURRENCY_ATS :Shilling Austria +STR_GAME_OPTIONS_CURRENCY_BEF :Franc Belgia +STR_GAME_OPTIONS_CURRENCY_CHF :Franc Swiss +STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Ceko +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Krone Denmark +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Spanyol +STR_GAME_OPTIONS_CURRENCY_FIM :Markka Finlandia +STR_GAME_OPTIONS_CURRENCY_FRF :Franc Prancis +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Yunani +STR_GAME_OPTIONS_CURRENCY_HUF :Forint Hungaria +STR_GAME_OPTIONS_CURRENCY_ISK :Krona Islandia +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italian +STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder +STR_GAME_OPTIONS_CURRENCY_NOK :Krone Norwegia +STR_GAME_OPTIONS_CURRENCY_PLN :Zloty Polandia +STR_GAME_OPTIONS_CURRENCY_RON :Leu Romania +STR_GAME_OPTIONS_CURRENCY_RUR :Rubel Rusia +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slovenia +STR_GAME_OPTIONS_CURRENCY_SEK :Krona Swedia +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turki +STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slovakia +STR_GAME_OPTIONS_CURRENCY_BRL :Real Brazilia +STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Estonia +STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lithuania +STR_GAME_OPTIONS_CURRENCY_KRW :Won Korea Selatan +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Afrika Selatan STR_GAME_OPTIONS_CURRENCY_CUSTOM :Atur sendiri... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgia (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iran (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Rubel Rusia Baru (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexiko(MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Dollar Taiwan Baru (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Cina (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dollar Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :India Rupee (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupiah Indonesia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit Malaysia (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgia +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iran +STR_GAME_OPTIONS_CURRENCY_RUB :Rubel Rusia Baru +STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexiko +STR_GAME_OPTIONS_CURRENCY_NTD :Dollar Taiwan Baru +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Cina +STR_GAME_OPTIONS_CURRENCY_HKD :Dollar Hong Kong +STR_GAME_OPTIONS_CURRENCY_INR :India Rupee +STR_GAME_OPTIONS_CURRENCY_IDR :Rupiah Indonesia +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit Malaysia STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Simpan Otomatis STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Pilih selang waktu permainan otomatis disimpan @@ -1983,30 +1984,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperial (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrik (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalisasi -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafik -STR_CONFIG_SETTING_SOUND :{ORANGE}Suara -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Antaramuka -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Umum -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Jendela -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruksi -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Berita / Penasihat -STR_CONFIG_SETTING_COMPANY :{ORANGE}Perusahaan -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Akuntansi -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Kendaraan -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fisika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Pengarahan -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Keterbatasan -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Bencana / Kecelakaan -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Pembuatan Bentang Darat -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Linkungan Dunia -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Berwenang -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Kota -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industri -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribusi kargo -STR_CONFIG_SETTING_AI :{ORANGE}Pesaing -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Pemain Komputer -STR_CONFIG_SETTING_NETWORK :{ORANGE}Jaringan +STR_CONFIG_SETTING_LOCALISATION :Lokalisasi +STR_CONFIG_SETTING_GRAPHICS :Grafik +STR_CONFIG_SETTING_SOUND :Suara +STR_CONFIG_SETTING_INTERFACE :Antaramuka +STR_CONFIG_SETTING_INTERFACE_GENERAL :Umum +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Jendela +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruksi +STR_CONFIG_SETTING_ADVISORS :Berita / Penasihat +STR_CONFIG_SETTING_COMPANY :Perusahaan +STR_CONFIG_SETTING_ACCOUNTING :Akuntansi +STR_CONFIG_SETTING_VEHICLES :Kendaraan +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fisika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Pengarahan +STR_CONFIG_SETTING_LIMITATIONS :Keterbatasan +STR_CONFIG_SETTING_ACCIDENTS :Bencana / Kecelakaan +STR_CONFIG_SETTING_GENWORLD :Pembuatan Bentang Darat +STR_CONFIG_SETTING_ENVIRONMENT :Linkungan Dunia +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Berwenang +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Kota +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industri +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribusi kargo +STR_CONFIG_SETTING_AI :Pesaing +STR_CONFIG_SETTING_AI_NPC :Pemain Komputer +STR_CONFIG_SETTING_NETWORK :Jaringan STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pencari jejak untuk kereta: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Pencari jejak untuk kereta @@ -4513,8 +4514,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Harapan STR_TIMETABLE_SCHEDULED :{BLACK}Dijadwalkan STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Ubah antara perkiraan dan jadwal -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) diff --git a/src/lang/irish.txt b/src/lang/irish.txt index 77422cd9cd..3aa4732ed7 100644 --- a/src/lang/irish.txt +++ b/src/lang/irish.txt @@ -925,49 +925,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Roghanna STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Aonaid airgeadra STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Aonaid airgeadra a roghnú + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Punt na Breataine (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dollar Mheiriceá (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen na Seapáine (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Scilling na hOstaire (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franc na Beilge (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franc na hEilbhéise (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Phoblacht na Seice (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Krone na Danmhairge (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta na Spáinne (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Markka na Fionlainne (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc na Fraince (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma na Gréige (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint na hUngáire (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Krona na hÍoslainne (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira na hIodáile (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Guilder na hÍsiltíre (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Krone na hIorua (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Złoty na Polainne (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu na Rómáine (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rúbal na Rúise (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar na Slóivéine (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Krona na Sualainne (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira na Tuirce (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Koruna na Slováice (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real na Brasaíle (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Krooni na hEastóine (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas na Liotuáine (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won na Cóiré Theas (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand na hAfraice Theas (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Punt na Breataine +STR_GAME_OPTIONS_CURRENCY_USD :Dollar Mheiriceá +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen na Seapáine +STR_GAME_OPTIONS_CURRENCY_ATS :Scilling na hOstaire +STR_GAME_OPTIONS_CURRENCY_BEF :Franc na Beilge +STR_GAME_OPTIONS_CURRENCY_CHF :Franc na hEilbhéise +STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Phoblacht na Seice +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Krone na Danmhairge +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta na Spáinne +STR_GAME_OPTIONS_CURRENCY_FIM :Markka na Fionlainne +STR_GAME_OPTIONS_CURRENCY_FRF :Franc na Fraince +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma na Gréige +STR_GAME_OPTIONS_CURRENCY_HUF :Forint na hUngáire +STR_GAME_OPTIONS_CURRENCY_ISK :Krona na hÍoslainne +STR_GAME_OPTIONS_CURRENCY_ITL :Lira na hIodáile +STR_GAME_OPTIONS_CURRENCY_NLG :Guilder na hÍsiltíre +STR_GAME_OPTIONS_CURRENCY_NOK :Krone na hIorua +STR_GAME_OPTIONS_CURRENCY_PLN :Złoty na Polainne +STR_GAME_OPTIONS_CURRENCY_RON :Leu na Rómáine +STR_GAME_OPTIONS_CURRENCY_RUR :Rúbal na Rúise +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar na Slóivéine +STR_GAME_OPTIONS_CURRENCY_SEK :Krona na Sualainne +STR_GAME_OPTIONS_CURRENCY_TRY :Lira na Tuirce +STR_GAME_OPTIONS_CURRENCY_SKK :Koruna na Slováice +STR_GAME_OPTIONS_CURRENCY_BRL :Real na Brasaíle +STR_GAME_OPTIONS_CURRENCY_EEK :Krooni na hEastóine +STR_GAME_OPTIONS_CURRENCY_LTL :Litas na Liotuáine +STR_GAME_OPTIONS_CURRENCY_KRW :Won na Cóiré Theas +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand na hAfraice Theas STR_GAME_OPTIONS_CURRENCY_CUSTOM :Saincheaptha... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari na Seoirsia (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial na hIaráine (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Rúbal Nua na Rúise (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mheicsiceo (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Dollar Nua na Téaváine (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi na Síne (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dollar Hong Cong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rúipí na hIndia (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupiah na hIndinéise (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit na Malaeisia (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari na Seoirsia +STR_GAME_OPTIONS_CURRENCY_IRR :Rial na hIaráine +STR_GAME_OPTIONS_CURRENCY_RUB :Rúbal Nua na Rúise +STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mheicsiceo +STR_GAME_OPTIONS_CURRENCY_NTD :Dollar Nua na Téaváine +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi na Síne +STR_GAME_OPTIONS_CURRENCY_HKD :Dollar Hong Cong +STR_GAME_OPTIONS_CURRENCY_INR :Rúipí na hIndia +STR_GAME_OPTIONS_CURRENCY_IDR :Rupiah na hIndinéise +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit na Malaeisia STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Uathshábháil STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Roghnaigh eatramh idir uathshábhálacha an chluiche @@ -1944,30 +1945,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Impiriúil (tr) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Méadrach (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Logánú -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafaicí -STR_CONFIG_SETTING_SOUND :{ORANGE}Fuaim -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Comhéadan -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Ginearálta -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Painéil amhairc -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Tógáil -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nuacht / Comhairleoirí -STR_CONFIG_SETTING_COMPANY :{ORANGE}Cuideachta -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Cuntasaíocht -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Feithiclí -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fisic -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Ródú -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Teorainneacha -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Tubaistí / Timpistí -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Domhan a chruthú -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Timpeallacht -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Údaráis -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Bailte -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Tionscail -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Dáileadh lastais -STR_CONFIG_SETTING_AI :{ORANGE}Iomaitheoirí -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Ríomh-imreoirí -STR_CONFIG_SETTING_NETWORK :{ORANGE}Líonra +STR_CONFIG_SETTING_LOCALISATION :Logánú +STR_CONFIG_SETTING_GRAPHICS :Grafaicí +STR_CONFIG_SETTING_SOUND :Fuaim +STR_CONFIG_SETTING_INTERFACE :Comhéadan +STR_CONFIG_SETTING_INTERFACE_GENERAL :Ginearálta +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Painéil amhairc +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Tógáil +STR_CONFIG_SETTING_ADVISORS :Nuacht / Comhairleoirí +STR_CONFIG_SETTING_COMPANY :Cuideachta +STR_CONFIG_SETTING_ACCOUNTING :Cuntasaíocht +STR_CONFIG_SETTING_VEHICLES :Feithiclí +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fisic +STR_CONFIG_SETTING_VEHICLES_ROUTING :Ródú +STR_CONFIG_SETTING_LIMITATIONS :Teorainneacha +STR_CONFIG_SETTING_ACCIDENTS :Tubaistí / Timpistí +STR_CONFIG_SETTING_GENWORLD :Domhan a chruthú +STR_CONFIG_SETTING_ENVIRONMENT :Timpeallacht +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Údaráis +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Bailte +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Tionscail +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Dáileadh lastais +STR_CONFIG_SETTING_AI :Iomaitheoirí +STR_CONFIG_SETTING_AI_NPC :Ríomh-imreoirí +STR_CONFIG_SETTING_NETWORK :Líonra STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Aimsitheoir bealaigh do thraenacha: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :An t-aimsitheoir bealaigh a úsáidfear do thraenacha @@ -4434,8 +4435,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Ag súil STR_TIMETABLE_SCHEDULED :{BLACK}Sceidealta STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Athraigh idir an t-am a bhfuil súil leis agus an t-am sceidealta -STR_TIMETABLE_ARRIVAL_ABBREVIATION :I: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :F: # Date window (for timetable) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index fc443875d7..92873123c8 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -953,49 +953,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valuta STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Selezione della valuta + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Sterlina britannica (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dollaro americano (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen giapponese (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Scellino austriaco (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franco svizzero (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Corona ceca (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marco tedesco (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Corona danese (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta spagnola (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marco finlandese (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franco francese (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Dracma greca (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint ungherese (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandese (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Fiorino olandese (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Corona norvegese (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polacco (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu rumeno (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rublo russo (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar sloveno (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Corona svedese (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Corona slovacca (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real brasiliano (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Corona éstone (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituano (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won sudcoreano (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Sterlina britannica +STR_GAME_OPTIONS_CURRENCY_USD :Dollaro americano +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen giapponese +STR_GAME_OPTIONS_CURRENCY_ATS :Scellino austriaco +STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga +STR_GAME_OPTIONS_CURRENCY_CHF :Franco svizzero +STR_GAME_OPTIONS_CURRENCY_CZK :Corona ceca +STR_GAME_OPTIONS_CURRENCY_DEM :Marco tedesco +STR_GAME_OPTIONS_CURRENCY_DKK :Corona danese +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta spagnola +STR_GAME_OPTIONS_CURRENCY_FIM :Marco finlandese +STR_GAME_OPTIONS_CURRENCY_FRF :Franco francese +STR_GAME_OPTIONS_CURRENCY_GRD :Dracma greca +STR_GAME_OPTIONS_CURRENCY_HUF :Forint ungherese +STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandese +STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Fiorino olandese +STR_GAME_OPTIONS_CURRENCY_NOK :Corona norvegese +STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polacco +STR_GAME_OPTIONS_CURRENCY_RON :Leu rumeno +STR_GAME_OPTIONS_CURRENCY_RUR :Rublo russo +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar sloveno +STR_GAME_OPTIONS_CURRENCY_SEK :Corona svedese +STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca +STR_GAME_OPTIONS_CURRENCY_SKK :Corona slovacca +STR_GAME_OPTIONS_CURRENCY_BRL :Real brasiliano +STR_GAME_OPTIONS_CURRENCY_EEK :Corona éstone +STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituano +STR_GAME_OPTIONS_CURRENCY_KRW :Won sudcoreano +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano STR_GAME_OPTIONS_CURRENCY_CUSTOM :Personalizzata... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgiano (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial iraniano (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nuovo rublo russo (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso messicano (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nuovo dollaro taiwanese (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi cinese (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dollaro di Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupia indiana (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonesiana (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malaysiano (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgiano +STR_GAME_OPTIONS_CURRENCY_IRR :Rial iraniano +STR_GAME_OPTIONS_CURRENCY_RUB :Nuovo rublo russo +STR_GAME_OPTIONS_CURRENCY_MXN :Peso messicano +STR_GAME_OPTIONS_CURRENCY_NTD :Nuovo dollaro taiwanese +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi cinese +STR_GAME_OPTIONS_CURRENCY_HKD :Dollaro di Hong Kong +STR_GAME_OPTIONS_CURRENCY_INR :Rupia indiana +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonesiana +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malaysiano STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Salvataggi automatici STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Seleziona l'intervallo fra i salvataggi automatici della partita @@ -2053,30 +2054,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperiali (pied STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metriche (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Localizzazione -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafica -STR_CONFIG_SETTING_SOUND :{ORANGE}Effetti sonori -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfaccia -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Generale -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Visuali -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Costruzione -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Notizie / consigli -STR_CONFIG_SETTING_COMPANY :{ORANGE}Compagnia -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Economia -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Veicoli -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fisica -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Instradamento -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limiti -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Disastri / incidenti -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generazione del mondo -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Ambiente -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autorità -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Città -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrie -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribuzione dei carichi -STR_CONFIG_SETTING_AI :{ORANGE}Avversari -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Giocatori controllati dal computer -STR_CONFIG_SETTING_NETWORK :{ORANGE}Rete +STR_CONFIG_SETTING_LOCALISATION :Localizzazione +STR_CONFIG_SETTING_GRAPHICS :Grafica +STR_CONFIG_SETTING_SOUND :Effetti sonori +STR_CONFIG_SETTING_INTERFACE :Interfaccia +STR_CONFIG_SETTING_INTERFACE_GENERAL :Generale +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Visuali +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Costruzione +STR_CONFIG_SETTING_ADVISORS :Notizie / consigli +STR_CONFIG_SETTING_COMPANY :Compagnia +STR_CONFIG_SETTING_ACCOUNTING :Economia +STR_CONFIG_SETTING_VEHICLES :Veicoli +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fisica +STR_CONFIG_SETTING_VEHICLES_ROUTING :Instradamento +STR_CONFIG_SETTING_LIMITATIONS :Limiti +STR_CONFIG_SETTING_ACCIDENTS :Disastri / incidenti +STR_CONFIG_SETTING_GENWORLD :Generazione del mondo +STR_CONFIG_SETTING_ENVIRONMENT :Ambiente +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autorità +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Città +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrie +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribuzione dei carichi +STR_CONFIG_SETTING_AI :Avversari +STR_CONFIG_SETTING_AI_NPC :Giocatori controllati dal computer +STR_CONFIG_SETTING_NETWORK :Rete STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pathfinder per i treni: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Pathfinder da utilizzare per i treni @@ -4608,8 +4609,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Orari at STR_TIMETABLE_SCHEDULED :{BLACK}Orari programmati STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Alterna fra la visualizzazione degli orari attesi e degli orari programmati -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :P: # Date window (for timetable) diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index a8f651f6ad..2d99525068 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -951,49 +951,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% 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_USD :米ドル($) -STR_GAME_OPTIONS_CURRENCY_EUR :欧州連合・ユーロ(€) -STR_GAME_OPTIONS_CURRENCY_JPY :日本円(¥) -STR_GAME_OPTIONS_CURRENCY_ATS :オーストリア・シリング(ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :ベルギー・フラン(BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :スイス・フラン(CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :チェコ・コルナ(CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :ドイツ・マルク(DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :デンマーク・クローネ(DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :スペイン・ペセタ(₧) -STR_GAME_OPTIONS_CURRENCY_FIM :フィンランド・マーカ(FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :フランス・フラン(₣) -STR_GAME_OPTIONS_CURRENCY_GRD :ギリシャ・ドラクマ(₯) -STR_GAME_OPTIONS_CURRENCY_HUF :ハンガリー・フォリント(HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :アイスランド・クローナ(ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :イタリア・リラ(ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :オランダ・ギルダー(ƒ) -STR_GAME_OPTIONS_CURRENCY_NOK :ノルウェー・クローネ(NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :ポーランド・ズウォティ(PLN) -STR_GAME_OPTIONS_CURRENCY_RON :ルーマニア・レウ(RON) -STR_GAME_OPTIONS_CURRENCY_RUR :ロシア・ルーブル(₽) -STR_GAME_OPTIONS_CURRENCY_SIT :スロベニア・トラール(SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :スウェーデン・クローナ(SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :トルコ・リラ(₺) -STR_GAME_OPTIONS_CURRENCY_SKK :スロバキア・コルナ(SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :ブラジル・レアル(R$) -STR_GAME_OPTIONS_CURRENCY_EEK :エストニア・クローン(EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :リトアニア・リタス(LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :韓国・ウォン(₩) -STR_GAME_OPTIONS_CURRENCY_ZAR :南アフリカランド (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :英ポンド +STR_GAME_OPTIONS_CURRENCY_USD :米ドル +STR_GAME_OPTIONS_CURRENCY_EUR :欧州連合・ユーロ +STR_GAME_OPTIONS_CURRENCY_JPY :日本円 +STR_GAME_OPTIONS_CURRENCY_ATS :オーストリア・シリング +STR_GAME_OPTIONS_CURRENCY_BEF :ベルギー・フラン +STR_GAME_OPTIONS_CURRENCY_CHF :スイス・フラン +STR_GAME_OPTIONS_CURRENCY_CZK :チェコ・コルナ +STR_GAME_OPTIONS_CURRENCY_DEM :ドイツ・マルク +STR_GAME_OPTIONS_CURRENCY_DKK :デンマーク・クローネ +STR_GAME_OPTIONS_CURRENCY_ESP :スペイン・ペセタ +STR_GAME_OPTIONS_CURRENCY_FIM :フィンランド・マーカ +STR_GAME_OPTIONS_CURRENCY_FRF :フランス・フラン +STR_GAME_OPTIONS_CURRENCY_GRD :ギリシャ・ドラクマ +STR_GAME_OPTIONS_CURRENCY_HUF :ハンガリー・フォリント +STR_GAME_OPTIONS_CURRENCY_ISK :アイスランド・クローナ +STR_GAME_OPTIONS_CURRENCY_ITL :イタリア・リラ +STR_GAME_OPTIONS_CURRENCY_NLG :オランダ・ギルダー +STR_GAME_OPTIONS_CURRENCY_NOK :ノルウェー・クローネ +STR_GAME_OPTIONS_CURRENCY_PLN :ポーランド・ズウォティ +STR_GAME_OPTIONS_CURRENCY_RON :ルーマニア・レウ +STR_GAME_OPTIONS_CURRENCY_RUR :ロシア・ルーブル +STR_GAME_OPTIONS_CURRENCY_SIT :スロベニア・トラール +STR_GAME_OPTIONS_CURRENCY_SEK :スウェーデン・クローナ +STR_GAME_OPTIONS_CURRENCY_TRY :トルコ・リラ +STR_GAME_OPTIONS_CURRENCY_SKK :スロバキア・コルナ +STR_GAME_OPTIONS_CURRENCY_BRL :ブラジル・レアル +STR_GAME_OPTIONS_CURRENCY_EEK :エストニア・クローン +STR_GAME_OPTIONS_CURRENCY_LTL :リトアニア・リタス +STR_GAME_OPTIONS_CURRENCY_KRW :韓国・ウォン +STR_GAME_OPTIONS_CURRENCY_ZAR :南アフリカランド STR_GAME_OPTIONS_CURRENCY_CUSTOM :カスタム… -STR_GAME_OPTIONS_CURRENCY_GEL :グルジア・ラリー(GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :イラン・リアル(IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :新ロシア・ルーブル(₽) -STR_GAME_OPTIONS_CURRENCY_MXN :メキシコ・ペソ(MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :新台湾ドル(NT$) -STR_GAME_OPTIONS_CURRENCY_CNY :中国・人民元(CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :香港ドル(HK$) -STR_GAME_OPTIONS_CURRENCY_INR :インド・ルピー(₹) -STR_GAME_OPTIONS_CURRENCY_IDR :インドネシア・ルピア(IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :マレーシア・リンギット(MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :グルジア・ラリー +STR_GAME_OPTIONS_CURRENCY_IRR :イラン・リアル +STR_GAME_OPTIONS_CURRENCY_RUB :新ロシア・ルーブル +STR_GAME_OPTIONS_CURRENCY_MXN :メキシコ・ペソ +STR_GAME_OPTIONS_CURRENCY_NTD :新台湾ドル +STR_GAME_OPTIONS_CURRENCY_CNY :中国・人民元 +STR_GAME_OPTIONS_CURRENCY_HKD :香港ドル +STR_GAME_OPTIONS_CURRENCY_INR :インド・ルピー +STR_GAME_OPTIONS_CURRENCY_IDR :インドネシア・ルピア +STR_GAME_OPTIONS_CURRENCY_MYR :マレーシア・リンギット STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}オートセーブ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}自動保存の間隔を選択します @@ -2010,30 +2011,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :ヤード・ポ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :メートル法 (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :国際単位系 (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}多国籍対応 -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}グラフィック -STR_CONFIG_SETTING_SOUND :{ORANGE}効果音 -STR_CONFIG_SETTING_INTERFACE :{ORANGE}インターフェース -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}一般 -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}画面表示 -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}建設 -STR_CONFIG_SETTING_ADVISORS :{ORANGE}ニュース/アドバイス -STR_CONFIG_SETTING_COMPANY :{ORANGE}会社 -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}会計 -STR_CONFIG_SETTING_VEHICLES :{ORANGE}輸送機器 -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}物理モデル -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}経路構築 -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}制限 -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}災害/事故 -STR_CONFIG_SETTING_GENWORLD :{ORANGE}マップ生成 -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}環境 -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}地方自治体 -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}街 -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}産業 -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}貨物配送先 -STR_CONFIG_SETTING_AI :{ORANGE}競争会社 -STR_CONFIG_SETTING_AI_NPC :{ORANGE}コンピュータプレイヤー -STR_CONFIG_SETTING_NETWORK :{ORANGE}ネットワーク +STR_CONFIG_SETTING_LOCALISATION :多国籍対応 +STR_CONFIG_SETTING_GRAPHICS :グラフィック +STR_CONFIG_SETTING_SOUND :効果音 +STR_CONFIG_SETTING_INTERFACE :インターフェース +STR_CONFIG_SETTING_INTERFACE_GENERAL :一般 +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :画面表示 +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :建設 +STR_CONFIG_SETTING_ADVISORS :ニュース/アドバイス +STR_CONFIG_SETTING_COMPANY :会社 +STR_CONFIG_SETTING_ACCOUNTING :会計 +STR_CONFIG_SETTING_VEHICLES :輸送機器 +STR_CONFIG_SETTING_VEHICLES_PHYSICS :物理モデル +STR_CONFIG_SETTING_VEHICLES_ROUTING :経路構築 +STR_CONFIG_SETTING_LIMITATIONS :制限 +STR_CONFIG_SETTING_ACCIDENTS :災害/事故 +STR_CONFIG_SETTING_GENWORLD :マップ生成 +STR_CONFIG_SETTING_ENVIRONMENT :環境 +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :地方自治体 +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :街 +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :産業 +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :貨物配送先 +STR_CONFIG_SETTING_AI :競争会社 +STR_CONFIG_SETTING_AI_NPC :コンピュータプレイヤー +STR_CONFIG_SETTING_NETWORK :ネットワーク STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :列車の経路探索アルゴリズム: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :列車の経路探索アルゴリズムを決めます @@ -4548,8 +4549,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) diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 73600dccf4..487f46871d 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -847,7 +847,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} 회사가 채권자에 의해 모든 자산이 팔려 파산하였습니다! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}새로운 운송회사 등장! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING}{G 0 "이" "가"} {TOWN}에서 공사를 시작했습니다! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING}의 관리권이 {STRING}(으)로 넘어갔습니다! +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} 회사가 비공개 금액에 {STRING} 회사로 인수되었습니다! STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(사장) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING}은(는) 새로운 도시 {TOWN}을(를) 건설했습니다! @@ -952,49 +952,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}화폐 단위 STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}화폐 단위 선택 + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :영국 파운드 (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :미국 달러 (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :유로 (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :일본 엔 (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :오스트리아 실링 (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :벨기에 프랑크 (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :스위스 프랑크 (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :체코 코루나 (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :독일 마르크 (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :덴마크 크로네 (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :스페인 페세타 (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :핀란드 마르카 (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :프랑스 프랑크 (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :그리스 드라크마 (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :헝가리 프로인트 (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :아이슬란드 크로나 (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :이탈리아 리라 (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :네덜란드 길더 (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :노르웨이 크로네 (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :폴란드 즈워티 (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :루마니아 레우 (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :러시아 루블 (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :슬로바키아 톨라 (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :스웨덴 크로나 (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :터키 리라 (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :슬로바키아 코루나 (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :브라질 레알 (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :에스토니아 크룬 (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :리투아니아 리타스 (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :대한민국 원 (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :남아프리카공화국 자르 (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :영국 파운드 +STR_GAME_OPTIONS_CURRENCY_USD :미국 달러 +STR_GAME_OPTIONS_CURRENCY_EUR :유로 +STR_GAME_OPTIONS_CURRENCY_JPY :일본 엔 +STR_GAME_OPTIONS_CURRENCY_ATS :오스트리아 실링 +STR_GAME_OPTIONS_CURRENCY_BEF :벨기에 프랑크 +STR_GAME_OPTIONS_CURRENCY_CHF :스위스 프랑크 +STR_GAME_OPTIONS_CURRENCY_CZK :체코 코루나 +STR_GAME_OPTIONS_CURRENCY_DEM :독일 마르크 +STR_GAME_OPTIONS_CURRENCY_DKK :덴마크 크로네 +STR_GAME_OPTIONS_CURRENCY_ESP :스페인 페세타 +STR_GAME_OPTIONS_CURRENCY_FIM :핀란드 마르카 +STR_GAME_OPTIONS_CURRENCY_FRF :프랑스 프랑크 +STR_GAME_OPTIONS_CURRENCY_GRD :그리스 드라크마 +STR_GAME_OPTIONS_CURRENCY_HUF :헝가리 프로인트 +STR_GAME_OPTIONS_CURRENCY_ISK :아이슬란드 크로나 +STR_GAME_OPTIONS_CURRENCY_ITL :이탈리아 리라 +STR_GAME_OPTIONS_CURRENCY_NLG :네덜란드 길더 +STR_GAME_OPTIONS_CURRENCY_NOK :노르웨이 크로네 +STR_GAME_OPTIONS_CURRENCY_PLN :폴란드 즈워티 +STR_GAME_OPTIONS_CURRENCY_RON :루마니아 레우 +STR_GAME_OPTIONS_CURRENCY_RUR :러시아 루블 +STR_GAME_OPTIONS_CURRENCY_SIT :슬로바키아 톨라 +STR_GAME_OPTIONS_CURRENCY_SEK :스웨덴 크로나 +STR_GAME_OPTIONS_CURRENCY_TRY :터키 리라 +STR_GAME_OPTIONS_CURRENCY_SKK :슬로바키아 코루나 +STR_GAME_OPTIONS_CURRENCY_BRL :브라질 레알 +STR_GAME_OPTIONS_CURRENCY_EEK :에스토니아 크룬 +STR_GAME_OPTIONS_CURRENCY_LTL :리투아니아 리타스 +STR_GAME_OPTIONS_CURRENCY_KRW :대한민국 원 +STR_GAME_OPTIONS_CURRENCY_ZAR :남아프리카공화국 자르 STR_GAME_OPTIONS_CURRENCY_CUSTOM :사용자 설정... -STR_GAME_OPTIONS_CURRENCY_GEL :그루지야 라리 (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :이란 리알 (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :신 러시아 루블 (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :멕시코 페소 (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :신 타이완 달러 (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :중국 위안 (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :홍콩 달러 (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :인도 루피 (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :인도네시아 루피아 (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :말레이시아 링깃 (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :그루지야 라리 +STR_GAME_OPTIONS_CURRENCY_IRR :이란 리알 +STR_GAME_OPTIONS_CURRENCY_RUB :신 러시아 루블 +STR_GAME_OPTIONS_CURRENCY_MXN :멕시코 페소 +STR_GAME_OPTIONS_CURRENCY_NTD :신 타이완 달러 +STR_GAME_OPTIONS_CURRENCY_CNY :중국 위안 +STR_GAME_OPTIONS_CURRENCY_HKD :홍콩 달러 +STR_GAME_OPTIONS_CURRENCY_INR :인도 루피 +STR_GAME_OPTIONS_CURRENCY_IDR :인도네시아 루피아 +STR_GAME_OPTIONS_CURRENCY_MYR :말레이시아 링깃 STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}자동 저장 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}게임 자동 저장 간격을 선택 @@ -2019,30 +2020,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :야드파운드 STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :미터법 (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :국제표준규격 (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}단위 설정 -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}그래픽 -STR_CONFIG_SETTING_SOUND :{ORANGE}효과음 -STR_CONFIG_SETTING_INTERFACE :{ORANGE}인터페이스 -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}일반 -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}게임 화면 -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}건설 -STR_CONFIG_SETTING_ADVISORS :{ORANGE}뉴스 / 정보 -STR_CONFIG_SETTING_COMPANY :{ORANGE}회사 -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}회계 -STR_CONFIG_SETTING_VEHICLES :{ORANGE}차량 -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}물리 -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}경로 -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}제한 -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}재앙 / 사고 -STR_CONFIG_SETTING_GENWORLD :{ORANGE}세계 제작 -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}환경 -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}지역 당국 -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}도시 -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}산업시설 -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}화물 분배 -STR_CONFIG_SETTING_AI :{ORANGE}경쟁자 -STR_CONFIG_SETTING_AI_NPC :{ORANGE}컴퓨터 플레이어 -STR_CONFIG_SETTING_NETWORK :{ORANGE}네트워크 +STR_CONFIG_SETTING_LOCALISATION :단위 설정 +STR_CONFIG_SETTING_GRAPHICS :그래픽 +STR_CONFIG_SETTING_SOUND :효과음 +STR_CONFIG_SETTING_INTERFACE :인터페이스 +STR_CONFIG_SETTING_INTERFACE_GENERAL :일반 +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :게임 화면 +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :건설 +STR_CONFIG_SETTING_ADVISORS :뉴스 / 정보 +STR_CONFIG_SETTING_COMPANY :회사 +STR_CONFIG_SETTING_ACCOUNTING :회계 +STR_CONFIG_SETTING_VEHICLES :차량 +STR_CONFIG_SETTING_VEHICLES_PHYSICS :물리 +STR_CONFIG_SETTING_VEHICLES_ROUTING :경로 +STR_CONFIG_SETTING_LIMITATIONS :제한 +STR_CONFIG_SETTING_ACCIDENTS :재앙 / 사고 +STR_CONFIG_SETTING_GENWORLD :세계 제작 +STR_CONFIG_SETTING_ENVIRONMENT :환경 +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :지역 당국 +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :도시 +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :산업시설 +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :화물 분배 +STR_CONFIG_SETTING_AI :경쟁자 +STR_CONFIG_SETTING_AI_NPC :컴퓨터 플레이어 +STR_CONFIG_SETTING_NETWORK :네트워크 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :열차에 사용할 경로 탐색법: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :열차에 사용할 경로 탐색 방법을 선택합니다. @@ -3761,6 +3762,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}상세 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}기반시설 상세정보 창을 엽니다 STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}돈 보내기 STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}이 회사에 돈을 보냅니다 +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}강제 인수 +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}이 회사를 강제 인수 STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}새 얼굴 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}사장의 얼굴을 선택합니다 @@ -3776,6 +3779,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :사장 이름 STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :보내고자 하는 돈의 액수를 입력하세요 STR_BUY_COMPANY_MESSAGE :{WHITE}저희 회사를 거두어주실 운송 회사를 찾고있습니다.{}{}저희 {COMPANY} 회사를 {CURRENCY_LONG}의 가격으로 인수합병하시겠습니까? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}{COMPANY} 회사를 강제 인수하려면 해당 회사의 모든 자산을 구매하고, 모든 대출을 상환하며 2년치 이익을 지불하게 됩니다.{}{}총 금액은 {CURRENCY_LONG} 가 될 것입니다.{}{}정말 강제 인수를 진행하시겠습니까? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}{COMPANY}의 기반시설 @@ -3847,6 +3851,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}관리 STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}이 목록에 있는 모든 열차에 지시를 내려 관리합니다 STR_VEHICLE_LIST_REPLACE_VEHICLES :차량 교체 STR_VEHICLE_LIST_SEND_FOR_SERVICING :점검하러 보내기 +STR_VEHICLE_LIST_CREATE_GROUP :그룹 생성 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}올해 이익: {CURRENCY_LONG} (작년: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4569,8 +4574,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) @@ -5625,6 +5628,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} diff --git a/src/lang/latin.txt b/src/lang/latin.txt index 6ed858084a..7573c0a942 100644 --- a/src/lang/latin.txt +++ b/src/lang/latin.txt @@ -1088,42 +1088,43 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Ludi opt STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Unitates nummi STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Electio unitatum nummi + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Libra Britannica (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dollarium CFA (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Ien Iaponicus (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Scellinus Austriacus (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Francus Belgicus (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Francus Helveticus (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Corona Cecha (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marca Germanica (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Corona Danica (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Hispanica (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marca Finnica (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Francus Francogallicus (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Graeca (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florenus Hungaricus (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Corona Islandica (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Libra Italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Florenus Batavicus (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Corona Norvegica (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Polonica (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Romanicus (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rubelus Russicus (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Dollarium Slovenicum (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Corona Suecica (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Libra Turcica (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Corona Slovaca (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Regalis Brasilica (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Corona Estonica (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lithuanica (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Von Coreanus (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Randum Africae Australis (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra Britannica +STR_GAME_OPTIONS_CURRENCY_USD :Dollarium CFA +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Ien Iaponicus +STR_GAME_OPTIONS_CURRENCY_ATS :Scellinus Austriacus +STR_GAME_OPTIONS_CURRENCY_BEF :Francus Belgicus +STR_GAME_OPTIONS_CURRENCY_CHF :Francus Helveticus +STR_GAME_OPTIONS_CURRENCY_CZK :Corona Cecha +STR_GAME_OPTIONS_CURRENCY_DEM :Marca Germanica +STR_GAME_OPTIONS_CURRENCY_DKK :Corona Danica +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Hispanica +STR_GAME_OPTIONS_CURRENCY_FIM :Marca Finnica +STR_GAME_OPTIONS_CURRENCY_FRF :Francus Francogallicus +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Graeca +STR_GAME_OPTIONS_CURRENCY_HUF :Florenus Hungaricus +STR_GAME_OPTIONS_CURRENCY_ISK :Corona Islandica +STR_GAME_OPTIONS_CURRENCY_ITL :Libra Italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Florenus Batavicus +STR_GAME_OPTIONS_CURRENCY_NOK :Corona Norvegica +STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Polonica +STR_GAME_OPTIONS_CURRENCY_RON :Leu Romanicus +STR_GAME_OPTIONS_CURRENCY_RUR :Rubelus Russicus +STR_GAME_OPTIONS_CURRENCY_SIT :Dollarium Slovenicum +STR_GAME_OPTIONS_CURRENCY_SEK :Corona Suecica +STR_GAME_OPTIONS_CURRENCY_TRY :Libra Turcica +STR_GAME_OPTIONS_CURRENCY_SKK :Corona Slovaca +STR_GAME_OPTIONS_CURRENCY_BRL :Regalis Brasilica +STR_GAME_OPTIONS_CURRENCY_EEK :Corona Estonica +STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lithuanica +STR_GAME_OPTIONS_CURRENCY_KRW :Von Coreanus +STR_GAME_OPTIONS_CURRENCY_ZAR :Randum Africae Australis STR_GAME_OPTIONS_CURRENCY_CUSTOM :Propria... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgiana (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Regalis Iranica (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Novus Rubelus Russicus (RUB) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgiana +STR_GAME_OPTIONS_CURRENCY_IRR :Regalis Iranica +STR_GAME_OPTIONS_CURRENCY_RUB :Novus Rubelus Russicus STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Servare automatice STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Eligere crebritatem automatice ludum servandi @@ -2034,29 +2035,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Anglicae (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metricae (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Localizatio -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Res Graphicae -STR_CONFIG_SETTING_SOUND :{ORANGE}Soni -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfacies -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Res Generales -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Fenestrae Conspectus -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Constructio -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nuntia / Admonitio -STR_CONFIG_SETTING_COMPANY :{ORANGE}Societas -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Ratiocinium -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehicula -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Physica -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Itinera -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Fines -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Calamitates / Accidentes -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generatio Mundi -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Circumiecta -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Auctoritates -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Oppida -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industriae -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Partitio onerum -STR_CONFIG_SETTING_AI :{ORANGE}Competitores -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Lusores computatrales +STR_CONFIG_SETTING_LOCALISATION :Localizatio +STR_CONFIG_SETTING_GRAPHICS :Res Graphicae +STR_CONFIG_SETTING_SOUND :Soni +STR_CONFIG_SETTING_INTERFACE :Interfacies +STR_CONFIG_SETTING_INTERFACE_GENERAL :Res Generales +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Fenestrae Conspectus +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Constructio +STR_CONFIG_SETTING_ADVISORS :Nuntia / Admonitio +STR_CONFIG_SETTING_COMPANY :Societas +STR_CONFIG_SETTING_ACCOUNTING :Ratiocinium +STR_CONFIG_SETTING_VEHICLES :Vehicula +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Physica +STR_CONFIG_SETTING_VEHICLES_ROUTING :Itinera +STR_CONFIG_SETTING_LIMITATIONS :Fines +STR_CONFIG_SETTING_ACCIDENTS :Calamitates / Accidentes +STR_CONFIG_SETTING_GENWORLD :Generatio Mundi +STR_CONFIG_SETTING_ENVIRONMENT :Circumiecta +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Auctoritates +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Oppida +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industriae +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Partitio onerum +STR_CONFIG_SETTING_AI :Competitores +STR_CONFIG_SETTING_AI_NPC :Lusores computatrales STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Inventrum itineris traminum: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Inventrum itineris hamaxostichis adhibendum @@ -4332,8 +4333,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Aestimat STR_TIMETABLE_SCHEDULED :{BLACK}Secundum horarium STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Mutare inter tempora quae aestimata sunt ac secundum horarium sunt -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :E: # Date window (for timetable) diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index 2034386279..23136c86b7 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -938,49 +938,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Spēles STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Naudas vienības STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Naudas vienību izvēle + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Lielbritānijas sterliņu mārciņas (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :ASV dolāri (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Eiro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japānas jenas (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Austrijas šiliņi (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Beļģijas franki (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Šveices franki (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Čehijas kronas (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Vācijas markas (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dānijas kronas (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spānijas pesetas (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Somijas markas (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Francijas franki (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grieķijas drahmas (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungārijas forinti (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Īslandes kronas (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Itālijas liras (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nīderlandes guldeņi (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norvēģijas kronas (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polijas zloti (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumānijas lejas (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Krievijas rubļi (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovēnijas tolāri (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Zviedrijas kronas (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turcijas liras (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovākijas kronas (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazīlijas reāli (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Igaunijas kronas (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lietuvas liti (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Dienvidkorejas vonas (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Dienvidāfrikas rendi (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Lielbritānijas sterliņu mārciņas +STR_GAME_OPTIONS_CURRENCY_USD :ASV dolāri +STR_GAME_OPTIONS_CURRENCY_EUR :Eiro +STR_GAME_OPTIONS_CURRENCY_JPY :Japānas jenas +STR_GAME_OPTIONS_CURRENCY_ATS :Austrijas šiliņi +STR_GAME_OPTIONS_CURRENCY_BEF :Beļģijas franki +STR_GAME_OPTIONS_CURRENCY_CHF :Šveices franki +STR_GAME_OPTIONS_CURRENCY_CZK :Čehijas kronas +STR_GAME_OPTIONS_CURRENCY_DEM :Vācijas markas +STR_GAME_OPTIONS_CURRENCY_DKK :Dānijas kronas +STR_GAME_OPTIONS_CURRENCY_ESP :Spānijas pesetas +STR_GAME_OPTIONS_CURRENCY_FIM :Somijas markas +STR_GAME_OPTIONS_CURRENCY_FRF :Francijas franki +STR_GAME_OPTIONS_CURRENCY_GRD :Grieķijas drahmas +STR_GAME_OPTIONS_CURRENCY_HUF :Ungārijas forinti +STR_GAME_OPTIONS_CURRENCY_ISK :Īslandes kronas +STR_GAME_OPTIONS_CURRENCY_ITL :Itālijas liras +STR_GAME_OPTIONS_CURRENCY_NLG :Nīderlandes guldeņi +STR_GAME_OPTIONS_CURRENCY_NOK :Norvēģijas kronas +STR_GAME_OPTIONS_CURRENCY_PLN :Polijas zloti +STR_GAME_OPTIONS_CURRENCY_RON :Rumānijas lejas +STR_GAME_OPTIONS_CURRENCY_RUR :Krievijas rubļi +STR_GAME_OPTIONS_CURRENCY_SIT :Slovēnijas tolāri +STR_GAME_OPTIONS_CURRENCY_SEK :Zviedrijas kronas +STR_GAME_OPTIONS_CURRENCY_TRY :Turcijas liras +STR_GAME_OPTIONS_CURRENCY_SKK :Slovākijas kronas +STR_GAME_OPTIONS_CURRENCY_BRL :Brazīlijas reāli +STR_GAME_OPTIONS_CURRENCY_EEK :Igaunijas kronas +STR_GAME_OPTIONS_CURRENCY_LTL :Lietuvas liti +STR_GAME_OPTIONS_CURRENCY_KRW :Dienvidkorejas vonas +STR_GAME_OPTIONS_CURRENCY_ZAR :Dienvidāfrikas rendi STR_GAME_OPTIONS_CURRENCY_CUSTOM :Cita... -STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijas lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Irānas riāli (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Jaunais Krievijas rublis (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksikas peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Jaunais Taivānas dolārs (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Ķīnas juaņa (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Honkongas dolārs (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indijas rūpija (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonēzijas rūpija (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaizijas Ringits (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijas lari +STR_GAME_OPTIONS_CURRENCY_IRR :Irānas riāli +STR_GAME_OPTIONS_CURRENCY_RUB :Jaunais Krievijas rublis +STR_GAME_OPTIONS_CURRENCY_MXN :Meksikas peso +STR_GAME_OPTIONS_CURRENCY_NTD :Jaunais Taivānas dolārs +STR_GAME_OPTIONS_CURRENCY_CNY :Ķīnas juaņa +STR_GAME_OPTIONS_CURRENCY_HKD :Honkongas dolārs +STR_GAME_OPTIONS_CURRENCY_INR :Indijas rūpija +STR_GAME_OPTIONS_CURRENCY_IDR :Indonēzijas rūpija +STR_GAME_OPTIONS_CURRENCY_MYR :Malaizijas Ringits STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automātiskā saglabāšana STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Izvēlēties spēles automātiskās saglabāšanas starplaikus @@ -1989,30 +1990,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :impērijas, bri STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :metriskās (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI, starptautiskās (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalizēšana -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Skaņa -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Saskarne -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Vispārīgi -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Skatvietas -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Būvniecība -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Avīžu raksti / padomnieki -STR_CONFIG_SETTING_COMPANY :{ORANGE}Uzņēmums -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Grāmatvedība -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Transportlīdzekļi -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Pārvietošanās -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ierobežojumi -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofas / negadījumi -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Pasaules radīšana -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Apkārtējā vide -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Pašvaldības -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Pilsētas -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Ražotnes -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Kravu sadale -STR_CONFIG_SETTING_AI :{ORANGE}Sāncenši -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Nespēlētāju tēli (datora vadīti) -STR_CONFIG_SETTING_NETWORK :{ORANGE}Tīkls +STR_CONFIG_SETTING_LOCALISATION :Lokalizēšana +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Skaņa +STR_CONFIG_SETTING_INTERFACE :Saskarne +STR_CONFIG_SETTING_INTERFACE_GENERAL :Vispārīgi +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Skatvietas +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Būvniecība +STR_CONFIG_SETTING_ADVISORS :Avīžu raksti / padomnieki +STR_CONFIG_SETTING_COMPANY :Uzņēmums +STR_CONFIG_SETTING_ACCOUNTING :Grāmatvedība +STR_CONFIG_SETTING_VEHICLES :Transportlīdzekļi +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Pārvietošanās +STR_CONFIG_SETTING_LIMITATIONS :Ierobežojumi +STR_CONFIG_SETTING_ACCIDENTS :Katastrofas / negadījumi +STR_CONFIG_SETTING_GENWORLD :Pasaules radīšana +STR_CONFIG_SETTING_ENVIRONMENT :Apkārtējā vide +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Pašvaldības +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Pilsētas +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Ražotnes +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Kravu sadale +STR_CONFIG_SETTING_AI :Sāncenši +STR_CONFIG_SETTING_AI_NPC :Nespēlētāju tēli (datora vadīti) +STR_CONFIG_SETTING_NETWORK :Tīkls STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Vilcienu ceļa meklētājs: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Vilcieniem pielietotais ceļa meklētājs @@ -4529,8 +4530,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Paredzē STR_TIMETABLE_SCHEDULED :{BLACK}Ieplānots STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Pārslēgties starp sagaidāmo un ieplānoto -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ie: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Iz: # Date window (for timetable) diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index afee6ce5d2..91c2c9c7ee 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1136,49 +1136,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Pagrindi STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valiuta STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Valiutos pasirinkimas + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Svarai sterlingų (£) -STR_GAME_OPTIONS_CURRENCY_USD :Amerikos Doleris ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Eurai (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Japonijos jenos (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Austrijos šilingai (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgijos frankai (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Šveicarijos frankai (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Čekijos kronos (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Vokietijos markės (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danijos kronos (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Ispanijos pesetos (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Suomijos markės (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Prancūzijos frankai (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Graikijos drachmos (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Vengrijos forintai (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandijos kronos (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italijos liros (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Olandijos guldenai (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norvegijos kronos (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Lenkijos zlotai (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumunijos lėjos (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rusijos rubliai (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovėnijos tolarai (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Švedijos kronos (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkijos liros (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakijos kronos (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilijos realai (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estijos kronos (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lietuvos Respublikos litai (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Pietų Korėjos vonai (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Pietų Afrikos Respublikos randas (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Svarai sterlingų +STR_GAME_OPTIONS_CURRENCY_USD :Amerikos Doleris +STR_GAME_OPTIONS_CURRENCY_EUR :Eurai +STR_GAME_OPTIONS_CURRENCY_JPY :Japonijos jenos +STR_GAME_OPTIONS_CURRENCY_ATS :Austrijos šilingai +STR_GAME_OPTIONS_CURRENCY_BEF :Belgijos frankai +STR_GAME_OPTIONS_CURRENCY_CHF :Šveicarijos frankai +STR_GAME_OPTIONS_CURRENCY_CZK :Čekijos kronos +STR_GAME_OPTIONS_CURRENCY_DEM :Vokietijos markės +STR_GAME_OPTIONS_CURRENCY_DKK :Danijos kronos +STR_GAME_OPTIONS_CURRENCY_ESP :Ispanijos pesetos +STR_GAME_OPTIONS_CURRENCY_FIM :Suomijos markės +STR_GAME_OPTIONS_CURRENCY_FRF :Prancūzijos frankai +STR_GAME_OPTIONS_CURRENCY_GRD :Graikijos drachmos +STR_GAME_OPTIONS_CURRENCY_HUF :Vengrijos forintai +STR_GAME_OPTIONS_CURRENCY_ISK :Islandijos kronos +STR_GAME_OPTIONS_CURRENCY_ITL :Italijos liros +STR_GAME_OPTIONS_CURRENCY_NLG :Olandijos guldenai +STR_GAME_OPTIONS_CURRENCY_NOK :Norvegijos kronos +STR_GAME_OPTIONS_CURRENCY_PLN :Lenkijos zlotai +STR_GAME_OPTIONS_CURRENCY_RON :Rumunijos lėjos +STR_GAME_OPTIONS_CURRENCY_RUR :Rusijos rubliai +STR_GAME_OPTIONS_CURRENCY_SIT :Slovėnijos tolarai +STR_GAME_OPTIONS_CURRENCY_SEK :Švedijos kronos +STR_GAME_OPTIONS_CURRENCY_TRY :Turkijos liros +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakijos kronos +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilijos realai +STR_GAME_OPTIONS_CURRENCY_EEK :Estijos kronos +STR_GAME_OPTIONS_CURRENCY_LTL :Lietuvos Respublikos litai +STR_GAME_OPTIONS_CURRENCY_KRW :Pietų Korėjos vonai +STR_GAME_OPTIONS_CURRENCY_ZAR :Pietų Afrikos Respublikos randas STR_GAME_OPTIONS_CURRENCY_CUSTOM :Kita... -STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijos lariai (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Irano rialai (IRR) +STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijos lariai +STR_GAME_OPTIONS_CURRENCY_IRR :Irano rialai STR_GAME_OPTIONS_CURRENCY_RUB :Naujieji Rusijos rubliai (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksikos pesai (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Naujieji Taivano doleriai (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Kinijos ženminbi juaniai (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Honkongo doleriai (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indijos rupijos (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonezijos rupijos (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaizijos ringitai (MYR) +STR_GAME_OPTIONS_CURRENCY_MXN :Meksikos pesai +STR_GAME_OPTIONS_CURRENCY_NTD :Naujieji Taivano doleriai +STR_GAME_OPTIONS_CURRENCY_CNY :Kinijos ženminbi juaniai +STR_GAME_OPTIONS_CURRENCY_HKD :Honkongo doleriai +STR_GAME_OPTIONS_CURRENCY_INR :Indijos rupijos +STR_GAME_OPTIONS_CURRENCY_IDR :Indonezijos rupijos +STR_GAME_OPTIONS_CURRENCY_MYR :Malaizijos ringitai STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automatinis išsaugojimas STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Pasirink, kaip dažnai išsaugoti žaidimą @@ -2185,30 +2186,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :imperiniai (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :metriniai (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalizavimas -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Garsai -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Vaizdas -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Bendros nuostatos -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Papildomi peržiūros langai -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstrukcijos -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Žinios ir patarėjai -STR_CONFIG_SETTING_COMPANY :{ORANGE}Kompanija -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Apskaita -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Transporto priemonės -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Maršrutas -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ribos -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofos ir incidentai -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Žemėlapio kūrimas -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Aplinka -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Valdžia -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Miestai -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Gamyklos -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Krovinių pasiskirstymas -STR_CONFIG_SETTING_AI :{ORANGE}Konkurentai -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Kompiuterio žaidėjai -STR_CONFIG_SETTING_NETWORK :{ORANGE}Žaidimas tinkle +STR_CONFIG_SETTING_LOCALISATION :Lokalizavimas +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Garsai +STR_CONFIG_SETTING_INTERFACE :Vaizdas +STR_CONFIG_SETTING_INTERFACE_GENERAL :Bendros nuostatos +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Papildomi peržiūros langai +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstrukcijos +STR_CONFIG_SETTING_ADVISORS :Žinios ir patarėjai +STR_CONFIG_SETTING_COMPANY :Kompanija +STR_CONFIG_SETTING_ACCOUNTING :Apskaita +STR_CONFIG_SETTING_VEHICLES :Transporto priemonės +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Maršrutas +STR_CONFIG_SETTING_LIMITATIONS :Ribos +STR_CONFIG_SETTING_ACCIDENTS :Katastrofos ir incidentai +STR_CONFIG_SETTING_GENWORLD :Žemėlapio kūrimas +STR_CONFIG_SETTING_ENVIRONMENT :Aplinka +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Valdžia +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Miestai +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Gamyklos +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Krovinių pasiskirstymas +STR_CONFIG_SETTING_AI :Konkurentai +STR_CONFIG_SETTING_AI_NPC :Kompiuterio žaidėjai +STR_CONFIG_SETTING_NETWORK :Žaidimas tinkle STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Traukinių maršrutų paieškos algoritmas: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Maršruto naudojamas ieškotojas traukiniams @@ -4727,8 +4728,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Tikėtin STR_TIMETABLE_SCHEDULED :{BLACK}Planuoti laikai STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Rodyti arba suplanuotus atvykimo laikus, arba tikėtinus atvykimo laikus (pastarieji gali keistis atsižvelgiant į tai, ar transporto priemonė laikosi tvarkaraščio) -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Atv.: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Išv.: # Date window (for timetable) diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index 0183697a00..f34f485b96 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -936,49 +936,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Spill Op STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Währungseenheet STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Währungseenheet wielen + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Pond (£) -STR_GAME_OPTIONS_CURRENCY_USD :Dollar ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Eisträichesche Schilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belsch Frang (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Schwäizer Frang (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tschechesch Kroun (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Däitsch Mark (DM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dänesch Kroun (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseten (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finnesch Mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franséische Frang (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Griechësch Drachme (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungaresche Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Isländesch Kroun (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italienesch Lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Holländesche Gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norwegesch Kroun (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polnesch Zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumänesch Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russesche Rubel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Sloweneschen Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Schwedesch Kroun (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Türkesch Lire (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakesch Kroun (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasilianesche Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estnesch Kroun (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litauesch Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Südkoreanesche Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Südafrikanesche Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Pond +STR_GAME_OPTIONS_CURRENCY_USD :Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Eisträichesche Schilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belsch Frang +STR_GAME_OPTIONS_CURRENCY_CHF :Schwäizer Frang +STR_GAME_OPTIONS_CURRENCY_CZK :Tschechesch Kroun +STR_GAME_OPTIONS_CURRENCY_DEM :Däitsch Mark +STR_GAME_OPTIONS_CURRENCY_DKK :Dänesch Kroun +STR_GAME_OPTIONS_CURRENCY_ESP :Peseten +STR_GAME_OPTIONS_CURRENCY_FIM :Finnesch Mark +STR_GAME_OPTIONS_CURRENCY_FRF :Franséische Frang +STR_GAME_OPTIONS_CURRENCY_GRD :Griechësch Drachme +STR_GAME_OPTIONS_CURRENCY_HUF :Ungaresche Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Isländesch Kroun +STR_GAME_OPTIONS_CURRENCY_ITL :Italienesch Lire +STR_GAME_OPTIONS_CURRENCY_NLG :Holländesche Gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norwegesch Kroun +STR_GAME_OPTIONS_CURRENCY_PLN :Polnesch Zloty +STR_GAME_OPTIONS_CURRENCY_RON :Rumänesch Leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russesche Rubel +STR_GAME_OPTIONS_CURRENCY_SIT :Sloweneschen Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Schwedesch Kroun +STR_GAME_OPTIONS_CURRENCY_TRY :Türkesch Lire +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakesch Kroun +STR_GAME_OPTIONS_CURRENCY_BRL :Brasilianesche Real +STR_GAME_OPTIONS_CURRENCY_EEK :Estnesch Kroun +STR_GAME_OPTIONS_CURRENCY_LTL :Litauesch Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Südkoreanesche Won +STR_GAME_OPTIONS_CURRENCY_ZAR :Südafrikanesche Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Eegen... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgesche Lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iranësche Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Neie Russesche Rubel (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexikanesche Peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinesesch Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indiesch Rupee (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesesch Rupiah (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysesche Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgesche Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranësche Rial +STR_GAME_OPTIONS_CURRENCY_RUB :Neie Russesche Rubel +STR_GAME_OPTIONS_CURRENCY_MXN :Mexikanesche Peso +STR_GAME_OPTIONS_CURRENCY_NTD :New Taiwan Dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinesesch Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar +STR_GAME_OPTIONS_CURRENCY_INR :Indiesch Rupee +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesesch Rupiah +STR_GAME_OPTIONS_CURRENCY_MYR :Malaysesche Ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Autospäicheren STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Wiel den Intervall aus fir d'Autospäicherung @@ -1985,30 +1986,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Britesch (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metresch (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokaliséirung -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafik -STR_CONFIG_SETTING_SOUND :{ORANGE}Soundeffekter -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Generell -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Usiicht -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruktioun -STR_CONFIG_SETTING_ADVISORS :{ORANGE}News / Meldungen -STR_CONFIG_SETTING_COMPANY :{ORANGE}Firma -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Compta -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Gefierer -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Physik -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Routeplangung -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitatiounen -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrophen / Accidenter -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Welt Generatioun -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Emwelt -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoritéiten -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Stied -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrien -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Wuereverdeelung -STR_CONFIG_SETTING_AI :{ORANGE}Géigner -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Computerspiller -STR_CONFIG_SETTING_NETWORK :{ORANGE}Netzwierk +STR_CONFIG_SETTING_LOCALISATION :Lokaliséirung +STR_CONFIG_SETTING_GRAPHICS :Grafik +STR_CONFIG_SETTING_SOUND :Soundeffekter +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :Generell +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Usiicht +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruktioun +STR_CONFIG_SETTING_ADVISORS :News / Meldungen +STR_CONFIG_SETTING_COMPANY :Firma +STR_CONFIG_SETTING_ACCOUNTING :Compta +STR_CONFIG_SETTING_VEHICLES :Gefierer +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Physik +STR_CONFIG_SETTING_VEHICLES_ROUTING :Routeplangung +STR_CONFIG_SETTING_LIMITATIONS :Limitatiounen +STR_CONFIG_SETTING_ACCIDENTS :Katastrophen / Accidenter +STR_CONFIG_SETTING_GENWORLD :Welt Generatioun +STR_CONFIG_SETTING_ENVIRONMENT :Emwelt +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoritéiten +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Stied +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrien +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Wuereverdeelung +STR_CONFIG_SETTING_AI :Géigner +STR_CONFIG_SETTING_AI_NPC :Computerspiller +STR_CONFIG_SETTING_NETWORK :Netzwierk STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pfadfinder fir Zich: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Pfadfinder dee fir Zich benotzt gëtt @@ -4521,8 +4522,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Erwaard STR_TIMETABLE_SCHEDULED :{BLACK}Geplangt STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Tëschent erwaard a geplangt wiesselen -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) diff --git a/src/lang/macedonian.txt b/src/lang/macedonian.txt index d2b10cc4f3..61c71515a5 100644 --- a/src/lang/macedonian.txt +++ b/src/lang/macedonian.txt @@ -794,6 +794,7 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Опци + ###length 42 diff --git a/src/lang/malay.txt b/src/lang/malay.txt index 6fdd7444d8..3483b39d2a 100644 --- a/src/lang/malay.txt +++ b/src/lang/malay.txt @@ -868,40 +868,41 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Pilihan STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Unit kewangan STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Pilihan unit kewangan + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Paun British (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dolar Amerika (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen Jepun (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Syiling Austria (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Frank Belgium (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Frank Swiss (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Czech (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Mark Jerman (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Krone Denmark (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Sepanyol (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Markka Finland (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc Perancis (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Yunani (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint Hungary (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Krona Iceland (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Itali (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Guilder Belanda (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Krone Norway (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Poland (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Romania (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ruble Rusia (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slovenia (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Krona Sweden (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turki (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slovak (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real Brazil (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Estonia (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :South African Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Paun British +STR_GAME_OPTIONS_CURRENCY_USD :Dolar Amerika +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen Jepun +STR_GAME_OPTIONS_CURRENCY_ATS :Syiling Austria +STR_GAME_OPTIONS_CURRENCY_BEF :Frank Belgium +STR_GAME_OPTIONS_CURRENCY_CHF :Frank Swiss +STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Czech +STR_GAME_OPTIONS_CURRENCY_DEM :Mark Jerman +STR_GAME_OPTIONS_CURRENCY_DKK :Krone Denmark +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Sepanyol +STR_GAME_OPTIONS_CURRENCY_FIM :Markka Finland +STR_GAME_OPTIONS_CURRENCY_FRF :Franc Perancis +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Yunani +STR_GAME_OPTIONS_CURRENCY_HUF :Forint Hungary +STR_GAME_OPTIONS_CURRENCY_ISK :Krona Iceland +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Itali +STR_GAME_OPTIONS_CURRENCY_NLG :Guilder Belanda +STR_GAME_OPTIONS_CURRENCY_NOK :Krone Norway +STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Poland +STR_GAME_OPTIONS_CURRENCY_RON :Leu Romania +STR_GAME_OPTIONS_CURRENCY_RUR :Ruble Rusia +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slovenia +STR_GAME_OPTIONS_CURRENCY_SEK :Krona Sweden +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turki +STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slovak +STR_GAME_OPTIONS_CURRENCY_BRL :Real Brazil +STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Estonia +STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas +STR_GAME_OPTIONS_CURRENCY_KRW :South Korean Won +STR_GAME_OPTIONS_CURRENCY_ZAR :South African Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Sesuaikan... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari (GEL) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Simpanan automatik STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Pilih tempoh untuk simpanan permainan automatik @@ -1609,18 +1610,18 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_VOLUME_SI :Unit SI (m³) ###length 3 -STR_CONFIG_SETTING_SOUND :{ORANGE}Bunyi -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Antaramuka (Interface) -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Pembinaan -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Berita / Penasihat -STR_CONFIG_SETTING_COMPANY :{ORANGE}Syarikat -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Kenderaan -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Laluan -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Kecelakaan / Kemalangan -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Bandar-bandar -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industri-industri -STR_CONFIG_SETTING_AI :{ORANGE}Pesaing -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Pemain komputer +STR_CONFIG_SETTING_SOUND :Bunyi +STR_CONFIG_SETTING_INTERFACE :Antaramuka (Interface) +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Pembinaan +STR_CONFIG_SETTING_ADVISORS :Berita / Penasihat +STR_CONFIG_SETTING_COMPANY :Syarikat +STR_CONFIG_SETTING_VEHICLES :Kenderaan +STR_CONFIG_SETTING_VEHICLES_ROUTING :Laluan +STR_CONFIG_SETTING_ACCIDENTS :Kecelakaan / Kemalangan +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Bandar-bandar +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industri-industri +STR_CONFIG_SETTING_AI :Pesaing +STR_CONFIG_SETTING_AI_NPC :Pemain komputer STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pencari laluan untuk keretapi: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :Pencari laluan untuk kenderaan jalanraya: {STRING} @@ -3745,8 +3746,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Dijangka STR_TIMETABLE_SCHEDULED :{BLACK}Dijadualkan STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Tukar di antara dijangkakan dan dijadualkan -STR_TIMETABLE_ARRIVAL_ABBREVIATION :T: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :B: # Date window (for timetable) diff --git a/src/lang/maltese.txt b/src/lang/maltese.txt index 85ca34a6b9..92762595df 100644 --- a/src/lang/maltese.txt +++ b/src/lang/maltese.txt @@ -408,6 +408,7 @@ STR_NEWS_VEHICLE_IS_LOST :{WHITE}{VEHICLE + ###length 42 diff --git a/src/lang/marathi.txt b/src/lang/marathi.txt index 43f6a74359..cee23e4047 100644 --- a/src/lang/marathi.txt +++ b/src/lang/marathi.txt @@ -701,32 +701,33 @@ STR_NEWS_NEW_VEHICLE_TYPE :{BIG_FONT}{BLAC + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :पौंड (£) -STR_GAME_OPTIONS_CURRENCY_USD :डोल्लर ($) -STR_GAME_OPTIONS_CURRENCY_EUR :युरो (€) -STR_GAME_OPTIONS_CURRENCY_JPY :येन (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :ओस्त्रिअन शिल्लिंग (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :बेल्गीअन फ्रांक (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :स्विस फ्रांक (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :झेख कोरुना (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :दोइश्मार्क (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :डेनिष क्रोन (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :पेसेटा (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :फिन्निश मार्क्का (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :फ्रांक (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :ग्रीक द्रक्मा (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :हंगेरियन फोरिन्त (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :आईसलेंडीक क्रोना (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :ईटेलिअन लिरा (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :डच गिल्डर (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :नोर्वेगीअन क्रोन (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :पोलिश झ्लोटी (PLN) -STR_GAME_OPTIONS_CURRENCY_RUR :रशिअन रुबल्स (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :स्लोवेनिअन तोलार (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :स्वीडीश क्रोना (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :तुर्की लिरा (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :स्लोवाक कोरुना (SKK) +STR_GAME_OPTIONS_CURRENCY_GBP :पौंड +STR_GAME_OPTIONS_CURRENCY_USD :डोल्लर +STR_GAME_OPTIONS_CURRENCY_EUR :युरो +STR_GAME_OPTIONS_CURRENCY_JPY :येन +STR_GAME_OPTIONS_CURRENCY_ATS :ओस्त्रिअन शिल्लिंग +STR_GAME_OPTIONS_CURRENCY_BEF :बेल्गीअन फ्रांक +STR_GAME_OPTIONS_CURRENCY_CHF :स्विस फ्रांक +STR_GAME_OPTIONS_CURRENCY_CZK :झेख कोरुना +STR_GAME_OPTIONS_CURRENCY_DEM :दोइश्मार्क +STR_GAME_OPTIONS_CURRENCY_DKK :डेनिष क्रोन +STR_GAME_OPTIONS_CURRENCY_ESP :पेसेटा +STR_GAME_OPTIONS_CURRENCY_FIM :फिन्निश मार्क्का +STR_GAME_OPTIONS_CURRENCY_FRF :फ्रांक +STR_GAME_OPTIONS_CURRENCY_GRD :ग्रीक द्रक्मा +STR_GAME_OPTIONS_CURRENCY_HUF :हंगेरियन फोरिन्त +STR_GAME_OPTIONS_CURRENCY_ISK :आईसलेंडीक क्रोना +STR_GAME_OPTIONS_CURRENCY_ITL :ईटेलिअन लिरा +STR_GAME_OPTIONS_CURRENCY_NLG :डच गिल्डर +STR_GAME_OPTIONS_CURRENCY_NOK :नोर्वेगीअन क्रोन +STR_GAME_OPTIONS_CURRENCY_PLN :पोलिश झ्लोटी +STR_GAME_OPTIONS_CURRENCY_RUR :रशिअन रुबल्स +STR_GAME_OPTIONS_CURRENCY_SIT :स्लोवेनिअन तोलार +STR_GAME_OPTIONS_CURRENCY_SEK :स्वीडीश क्रोना +STR_GAME_OPTIONS_CURRENCY_TRY :तुर्की लिरा +STR_GAME_OPTIONS_CURRENCY_SKK :स्लोवाक कोरुना # Autosave dropdown diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index 9447a88bda..c2d1f323c2 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -929,49 +929,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Spillinn STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valutaenhet STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Velg valutaenhet som skal brukes + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Britisk pund (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Amerikansk dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japansk yen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Østerriksk shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgisk franc (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Sveitsisk franc (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tsjekkisk koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Tysk mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dansk krone (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spansk pesetas (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finsk mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Fransk franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Gresk drakme (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungarsk forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandsk krone (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italiensk lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Hollandsk guilder (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norsk krone (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polsk złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumensk leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russisk rubel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovensk tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Svensk krone (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Tyrkisk lire (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakisk koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliansk real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estlandsk krone (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litauisk litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Sørkoreansk won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Sørafrikanske rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Britisk pund +STR_GAME_OPTIONS_CURRENCY_USD :Amerikansk dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japansk yen +STR_GAME_OPTIONS_CURRENCY_ATS :Østerriksk shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgisk franc +STR_GAME_OPTIONS_CURRENCY_CHF :Sveitsisk franc +STR_GAME_OPTIONS_CURRENCY_CZK :Tsjekkisk koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Tysk mark +STR_GAME_OPTIONS_CURRENCY_DKK :Dansk krone +STR_GAME_OPTIONS_CURRENCY_ESP :Spansk pesetas +STR_GAME_OPTIONS_CURRENCY_FIM :Finsk mark +STR_GAME_OPTIONS_CURRENCY_FRF :Fransk franc +STR_GAME_OPTIONS_CURRENCY_GRD :Gresk drakme +STR_GAME_OPTIONS_CURRENCY_HUF :Ungarsk forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandsk krone +STR_GAME_OPTIONS_CURRENCY_ITL :Italiensk lire +STR_GAME_OPTIONS_CURRENCY_NLG :Hollandsk guilder +STR_GAME_OPTIONS_CURRENCY_NOK :Norsk krone +STR_GAME_OPTIONS_CURRENCY_PLN :Polsk złoty +STR_GAME_OPTIONS_CURRENCY_RON :Rumensk leu +STR_GAME_OPTIONS_CURRENCY_RUR :Russisk rubel +STR_GAME_OPTIONS_CURRENCY_SIT :Slovensk tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Svensk krone +STR_GAME_OPTIONS_CURRENCY_TRY :Tyrkisk lire +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakisk koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliansk real +STR_GAME_OPTIONS_CURRENCY_EEK :Estlandsk krone +STR_GAME_OPTIONS_CURRENCY_LTL :Litauisk litas +STR_GAME_OPTIONS_CURRENCY_KRW :Sørkoreansk won +STR_GAME_OPTIONS_CURRENCY_ZAR :Sørafrikanske rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Egendefinert... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgisk lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iransk rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Ny russisk rubel (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksikansk peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Ny Taiwan Dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar (HKD) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgisk lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iransk rial +STR_GAME_OPTIONS_CURRENCY_RUB :Ny russisk rubel +STR_GAME_OPTIONS_CURRENCY_MXN :Meksikansk peso +STR_GAME_OPTIONS_CURRENCY_NTD :Ny Taiwan Dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Chinese Renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Dollar STR_GAME_OPTIONS_CURRENCY_INR :Indisk rupi (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesisk Rupi (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysisk Ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesisk Rupi +STR_GAME_OPTIONS_CURRENCY_MYR :Malaysisk Ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automatisk lagring STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Velg intervall for automatisk lagring @@ -1958,30 +1959,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Det britiske im 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_GRAPHICS :{ORANGE}Grafikk -STR_CONFIG_SETTING_SOUND :{ORANGE}Lydeffekter -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Grensesnitt -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Generelt -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Synsfelt -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruksjon -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nyheter / Rådgivere -STR_CONFIG_SETTING_COMPANY :{ORANGE}Firma -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Regnskap -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Kjøretøy -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fysikk -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Ruting -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Begrensninger -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofer / Ulykker -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Verdensgenerering -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Miljø -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Myndigheter -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Byer -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrier -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Gods-distribusjon -STR_CONFIG_SETTING_AI :{ORANGE}Motstandere -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Datamaskinstyrte spillere -STR_CONFIG_SETTING_NETWORK :{ORANGE}Nettverk +STR_CONFIG_SETTING_LOCALISATION :Lokalisering +STR_CONFIG_SETTING_GRAPHICS :Grafikk +STR_CONFIG_SETTING_SOUND :Lydeffekter +STR_CONFIG_SETTING_INTERFACE :Grensesnitt +STR_CONFIG_SETTING_INTERFACE_GENERAL :Generelt +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Synsfelt +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruksjon +STR_CONFIG_SETTING_ADVISORS :Nyheter / Rådgivere +STR_CONFIG_SETTING_COMPANY :Firma +STR_CONFIG_SETTING_ACCOUNTING :Regnskap +STR_CONFIG_SETTING_VEHICLES :Kjøretøy +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fysikk +STR_CONFIG_SETTING_VEHICLES_ROUTING :Ruting +STR_CONFIG_SETTING_LIMITATIONS :Begrensninger +STR_CONFIG_SETTING_ACCIDENTS :Katastrofer / Ulykker +STR_CONFIG_SETTING_GENWORLD :Verdensgenerering +STR_CONFIG_SETTING_ENVIRONMENT :Miljø +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Myndigheter +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Byer +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrier +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Gods-distribusjon +STR_CONFIG_SETTING_AI :Motstandere +STR_CONFIG_SETTING_AI_NPC :Datamaskinstyrte spillere +STR_CONFIG_SETTING_NETWORK :Nettverk STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Veifinner for tog: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Stifinner som skal brukes for tog @@ -4456,8 +4457,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Ventet STR_TIMETABLE_SCHEDULED :{BLACK}Planlagt STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Veksle mellom forventet og planlagt -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ank: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Avg: # Date window (for timetable) diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index fcf0a1adca..abeb981543 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -894,41 +894,42 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Spelinns STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valutaeining STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Vel valutaeining + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Pund (£) -STR_GAME_OPTIONS_CURRENCY_USD :Dollar ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Østerriksk shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgisk franc (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Sveitsisk franc (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tsjekkisk koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Tyske mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dansk krone (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Pesetas (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finske mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Gresk drakme (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungarsk forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandsk krone (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italiensk lire (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Hollandsk gylden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norsk krone (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polsk zloty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumensk lei (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russisk rubel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovensk tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Svensk krone (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Tyrkiske lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakisk koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliansk real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estiske kroner (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litauiske Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Sør-Koreanske Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Sør-Afrikanske Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Pund +STR_GAME_OPTIONS_CURRENCY_USD :Dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen +STR_GAME_OPTIONS_CURRENCY_ATS :Østerriksk shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgisk franc +STR_GAME_OPTIONS_CURRENCY_CHF :Sveitsisk franc +STR_GAME_OPTIONS_CURRENCY_CZK :Tsjekkisk koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Tyske mark +STR_GAME_OPTIONS_CURRENCY_DKK :Dansk krone +STR_GAME_OPTIONS_CURRENCY_ESP :Pesetas +STR_GAME_OPTIONS_CURRENCY_FIM :Finske mark +STR_GAME_OPTIONS_CURRENCY_FRF :Franc +STR_GAME_OPTIONS_CURRENCY_GRD :Gresk drakme +STR_GAME_OPTIONS_CURRENCY_HUF :Ungarsk forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandsk krone +STR_GAME_OPTIONS_CURRENCY_ITL :Italiensk lire +STR_GAME_OPTIONS_CURRENCY_NLG :Hollandsk gylden +STR_GAME_OPTIONS_CURRENCY_NOK :Norsk krone +STR_GAME_OPTIONS_CURRENCY_PLN :Polsk zloty +STR_GAME_OPTIONS_CURRENCY_RON :Rumensk lei +STR_GAME_OPTIONS_CURRENCY_RUR :Russisk rubel +STR_GAME_OPTIONS_CURRENCY_SIT :Slovensk tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Svensk krone +STR_GAME_OPTIONS_CURRENCY_TRY :Tyrkiske lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakisk koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliansk real +STR_GAME_OPTIONS_CURRENCY_EEK :Estiske kroner +STR_GAME_OPTIONS_CURRENCY_LTL :Litauiske Litas +STR_GAME_OPTIONS_CURRENCY_KRW :Sør-Koreanske Won +STR_GAME_OPTIONS_CURRENCY_ZAR :Sør-Afrikanske Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Eigendefinert... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgiske Lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iranske Rial (IRR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgiske Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranske Rial STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automatisk lagring STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Vel intervall for automatisk lagring @@ -1754,28 +1755,28 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Britisk eining STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrisk (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Plassering -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafikk -STR_CONFIG_SETTING_SOUND :{ORANGE}Lydar -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Grensesnitt -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Generelt -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruksjon -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Nyhende / Rådgjevarar -STR_CONFIG_SETTING_COMPANY :{ORANGE}Firma -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Rekneskap -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Køyretøy -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fysikk -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Ruting -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Avgrensingar -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofar / ulykker -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generer ei verd -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Miljø -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Styremaktane -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Byar -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industriar -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Varefordeling -STR_CONFIG_SETTING_AI :{ORANGE}Motstandarar -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Datamaskinspelarar +STR_CONFIG_SETTING_LOCALISATION :Plassering +STR_CONFIG_SETTING_GRAPHICS :Grafikk +STR_CONFIG_SETTING_SOUND :Lydar +STR_CONFIG_SETTING_INTERFACE :Grensesnitt +STR_CONFIG_SETTING_INTERFACE_GENERAL :Generelt +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruksjon +STR_CONFIG_SETTING_ADVISORS :Nyhende / Rådgjevarar +STR_CONFIG_SETTING_COMPANY :Firma +STR_CONFIG_SETTING_ACCOUNTING :Rekneskap +STR_CONFIG_SETTING_VEHICLES :Køyretøy +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fysikk +STR_CONFIG_SETTING_VEHICLES_ROUTING :Ruting +STR_CONFIG_SETTING_LIMITATIONS :Avgrensingar +STR_CONFIG_SETTING_ACCIDENTS :Katastrofar / ulykker +STR_CONFIG_SETTING_GENWORLD :Generer ei verd +STR_CONFIG_SETTING_ENVIRONMENT :Miljø +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Styremaktane +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Byar +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industriar +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Varefordeling +STR_CONFIG_SETTING_AI :Motstandarar +STR_CONFIG_SETTING_AI_NPC :Datamaskinspelarar STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Vegfinnar for tog: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Kva for vegfinnar som skal nyttast for tog @@ -3968,8 +3969,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Forventa STR_TIMETABLE_SCHEDULED :{BLACK}Planlagt STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Byt mellom antatt og planlagt -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ank: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Avg: # Date window (for timetable) diff --git a/src/lang/persian.txt b/src/lang/persian.txt index 3b9f8818f2..483cca54ed 100644 --- a/src/lang/persian.txt +++ b/src/lang/persian.txt @@ -884,41 +884,42 @@ 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_USD :دلار ($) -STR_GAME_OPTIONS_CURRENCY_EUR :یورو (€) -STR_GAME_OPTIONS_CURRENCY_JPY :ین (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :شیلینگ استرالیا (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :فرانک بلژیک (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :فرانک سوییس (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :کرونای چک (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :مارک آلمان (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :کرون دانمارک (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :پزوتا (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :مارک فنلاند (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :فرانک (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :دراخمای یونان (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :فورینت مجارستان (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :کرون ایسلندی (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :لیره ایتالیا (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :گیلدر هلندی (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :کرون نروژ (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :زلتای لهستانی (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :لئو رومانیایی (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :روبل روسیه (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :تولار اسلونی (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :کرون سوییس (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :لیره ترکیه (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :کرونای اسلواکی (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :رئال برزیل (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :کرونی استونی (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :لیتاس لیتوانی (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :وان کره جنوبی (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :رند آفریقای جنوبی (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :پوند +STR_GAME_OPTIONS_CURRENCY_USD :دلار +STR_GAME_OPTIONS_CURRENCY_EUR :یورو +STR_GAME_OPTIONS_CURRENCY_JPY :ین +STR_GAME_OPTIONS_CURRENCY_ATS :شیلینگ استرالیا +STR_GAME_OPTIONS_CURRENCY_BEF :فرانک بلژیک +STR_GAME_OPTIONS_CURRENCY_CHF :فرانک سوییس +STR_GAME_OPTIONS_CURRENCY_CZK :کرونای چک +STR_GAME_OPTIONS_CURRENCY_DEM :مارک آلمان +STR_GAME_OPTIONS_CURRENCY_DKK :کرون دانمارک +STR_GAME_OPTIONS_CURRENCY_ESP :پزوتا +STR_GAME_OPTIONS_CURRENCY_FIM :مارک فنلاند +STR_GAME_OPTIONS_CURRENCY_FRF :فرانک +STR_GAME_OPTIONS_CURRENCY_GRD :دراخمای یونان +STR_GAME_OPTIONS_CURRENCY_HUF :فورینت مجارستان +STR_GAME_OPTIONS_CURRENCY_ISK :کرون ایسلندی +STR_GAME_OPTIONS_CURRENCY_ITL :لیره ایتالیا +STR_GAME_OPTIONS_CURRENCY_NLG :گیلدر هلندی +STR_GAME_OPTIONS_CURRENCY_NOK :کرون نروژ +STR_GAME_OPTIONS_CURRENCY_PLN :زلتای لهستانی +STR_GAME_OPTIONS_CURRENCY_RON :لئو رومانیایی +STR_GAME_OPTIONS_CURRENCY_RUR :روبل روسیه +STR_GAME_OPTIONS_CURRENCY_SIT :تولار اسلونی +STR_GAME_OPTIONS_CURRENCY_SEK :کرون سوییس +STR_GAME_OPTIONS_CURRENCY_TRY :لیره ترکیه +STR_GAME_OPTIONS_CURRENCY_SKK :کرونای اسلواکی +STR_GAME_OPTIONS_CURRENCY_BRL :رئال برزیل +STR_GAME_OPTIONS_CURRENCY_EEK :کرونی استونی +STR_GAME_OPTIONS_CURRENCY_LTL :لیتاس لیتوانی +STR_GAME_OPTIONS_CURRENCY_KRW :وان کره جنوبی +STR_GAME_OPTIONS_CURRENCY_ZAR :رند آفریقای جنوبی STR_GAME_OPTIONS_CURRENCY_CUSTOM :دلخواه... -STR_GAME_OPTIONS_CURRENCY_GEL :لیره گرجستان (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :ریال ایران (IRR) +STR_GAME_OPTIONS_CURRENCY_GEL :لیره گرجستان +STR_GAME_OPTIONS_CURRENCY_IRR :ریال ایران STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK} ذخیره اتوماتیک STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK} انتخاب فاصله زمانی بین ذخیره کردن های اتوماتیک @@ -1584,18 +1585,18 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :امپریال STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :متریک (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :متر (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}بومی سازی -STR_CONFIG_SETTING_INTERFACE :{ORANGE}واسط کاربری -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}ساخت و ساز -STR_CONFIG_SETTING_VEHICLES :{ORANGE}وسایل نقلیه -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}مسیریابی -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}محیط زیست -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}مقامات -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}شهرها -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}صنایع -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}توزیع محموله -STR_CONFIG_SETTING_AI :{ORANGE}رقیبان -STR_CONFIG_SETTING_AI_NPC :{ORANGE}بازیگران رایانه +STR_CONFIG_SETTING_LOCALISATION :بومی سازی +STR_CONFIG_SETTING_INTERFACE :واسط کاربری +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :ساخت و ساز +STR_CONFIG_SETTING_VEHICLES :وسایل نقلیه +STR_CONFIG_SETTING_VEHICLES_ROUTING :مسیریابی +STR_CONFIG_SETTING_ENVIRONMENT :محیط زیست +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :مقامات +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :شهرها +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :صنایع +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :توزیع محموله +STR_CONFIG_SETTING_AI :رقیبان +STR_CONFIG_SETTING_AI_NPC :بازیگران رایانه STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :مسیریاب برای قطارها: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :مسیریاب برای خودروهای جاده ای: {STRING} diff --git a/src/lang/polish.txt b/src/lang/polish.txt index 543ef3b946..7176edacae 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -1226,7 +1226,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} zostaje zamknięty przez wierzycieli i wszystkie udziały zostają sprzedane! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Nowa firma rozpoczęła działalność! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} rozpoczyna budowę w pobliżu miasta {TOWN}! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} zostało przejęte przez {STRING}! +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} zostało przejęte przez {STRING} za nieujawnioną kwotę! STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Prezes) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} sponsoruje konstrukcję nowego miasta {TOWN}! @@ -1331,49 +1331,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Waluta STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Wybór waluty + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Funt brytyjski (£) -STR_GAME_OPTIONS_CURRENCY_USD :Dolar amerykański ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Jen japoński (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Szyling austriacki (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Frank belgijski (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Frank szwajcarski (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Korona czeska (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marki niemieckie (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Korona duńska (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta hiszpańska (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marka fińska (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Frank francuski (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma grecka (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint węgierski (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Korona islandzka (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira włoska (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Gulden holenderski (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Korona norweska (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polski złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Lej rumuński (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rubel rosyjski (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar słowenski (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Korona szwedzka (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira turecka (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Korona słowacka (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real brazylijski (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Korony estońskie (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lit litewski (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won południowokoreański (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Południowej Afryki (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Funt brytyjski +STR_GAME_OPTIONS_CURRENCY_USD :Dolar amerykański +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Jen japoński +STR_GAME_OPTIONS_CURRENCY_ATS :Szyling austriacki +STR_GAME_OPTIONS_CURRENCY_BEF :Frank belgijski +STR_GAME_OPTIONS_CURRENCY_CHF :Frank szwajcarski +STR_GAME_OPTIONS_CURRENCY_CZK :Korona czeska +STR_GAME_OPTIONS_CURRENCY_DEM :Marki niemieckie +STR_GAME_OPTIONS_CURRENCY_DKK :Korona duńska +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta hiszpańska +STR_GAME_OPTIONS_CURRENCY_FIM :Marka fińska +STR_GAME_OPTIONS_CURRENCY_FRF :Frank francuski +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma grecka +STR_GAME_OPTIONS_CURRENCY_HUF :Forint węgierski +STR_GAME_OPTIONS_CURRENCY_ISK :Korona islandzka +STR_GAME_OPTIONS_CURRENCY_ITL :Lira włoska +STR_GAME_OPTIONS_CURRENCY_NLG :Gulden holenderski +STR_GAME_OPTIONS_CURRENCY_NOK :Korona norweska +STR_GAME_OPTIONS_CURRENCY_PLN :Polski złoty +STR_GAME_OPTIONS_CURRENCY_RON :Lej rumuński +STR_GAME_OPTIONS_CURRENCY_RUR :Rubel rosyjski +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar słowenski +STR_GAME_OPTIONS_CURRENCY_SEK :Korona szwedzka +STR_GAME_OPTIONS_CURRENCY_TRY :Lira turecka +STR_GAME_OPTIONS_CURRENCY_SKK :Korona słowacka +STR_GAME_OPTIONS_CURRENCY_BRL :Real brazylijski +STR_GAME_OPTIONS_CURRENCY_EEK :Korony estońskie +STR_GAME_OPTIONS_CURRENCY_LTL :Lit litewski +STR_GAME_OPTIONS_CURRENCY_KRW :Won południowokoreański +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Południowej Afryki STR_GAME_OPTIONS_CURRENCY_CUSTOM :Własna... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari gruzińskie (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial irański (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nowy rubel rosyjski (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso meksykańskie (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nowy dolar tajwański (TWD) -STR_GAME_OPTIONS_CURRENCY_CNY :Juan chiński (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dolar hongkoński (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupia Indyjska (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia Indonezyjska (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malezyjski (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari gruzińskie +STR_GAME_OPTIONS_CURRENCY_IRR :Rial irański +STR_GAME_OPTIONS_CURRENCY_RUB :Nowy rubel rosyjski +STR_GAME_OPTIONS_CURRENCY_MXN :Peso meksykańskie +STR_GAME_OPTIONS_CURRENCY_NTD :Nowy dolar tajwański +STR_GAME_OPTIONS_CURRENCY_CNY :Juan chiński +STR_GAME_OPTIONS_CURRENCY_HKD :Dolar hongkoński +STR_GAME_OPTIONS_CURRENCY_INR :Rupia Indyjska +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia Indonezyjska +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malezyjski STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Autozapis STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Częstotliwość automatycznego zapisu stanu gry @@ -1938,7 +1939,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Od szarego do c STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Skala szarości STR_CONFIG_SETTING_SCROLLMODE :Zachowanie przeciągania okna podglądu: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Zachowanie podczas przeciągania mapy +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Zachowanie podczas przeciągania mapy. Opcje „pozycja myszy zablokowana” nie działają na systemach, takich jak wersje internetowe, ekrany dotykowe, Linux z Waylandem i innych ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Przeciągnij okno podglądu prawym przyciskiem myszy, pozycja myszy zablokowana STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Przeciągnij mapę prawym przyciskiem myszy, pozycja myszy zablokowana @@ -2398,30 +2399,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperialne (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metryczne (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalizacja -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Dźwięk -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfejs -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Ogólne -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Widok -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstrukcje -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Wiadomości i porady -STR_CONFIG_SETTING_COMPANY :{ORANGE}Firma -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Finanse -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Pojazdy -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizyka -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Wyznaczanie trasy -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ograniczenia -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Awarie i katastrofy -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Tworzenie mapy -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Środowisko -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Władze lokalne -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Miasta -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Przedsiębiorstwa -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Dystrybucja ładunków -STR_CONFIG_SETTING_AI :{ORANGE}Rywale -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Gracze komputerowi -STR_CONFIG_SETTING_NETWORK :{ORANGE}Sieć +STR_CONFIG_SETTING_LOCALISATION :Lokalizacja +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Dźwięk +STR_CONFIG_SETTING_INTERFACE :Interfejs +STR_CONFIG_SETTING_INTERFACE_GENERAL :Ogólne +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Widok +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstrukcje +STR_CONFIG_SETTING_ADVISORS :Wiadomości i porady +STR_CONFIG_SETTING_COMPANY :Firma +STR_CONFIG_SETTING_ACCOUNTING :Finanse +STR_CONFIG_SETTING_VEHICLES :Pojazdy +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizyka +STR_CONFIG_SETTING_VEHICLES_ROUTING :Wyznaczanie trasy +STR_CONFIG_SETTING_LIMITATIONS :Ograniczenia +STR_CONFIG_SETTING_ACCIDENTS :Awarie i katastrofy +STR_CONFIG_SETTING_GENWORLD :Tworzenie mapy +STR_CONFIG_SETTING_ENVIRONMENT :Środowisko +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Władze lokalne +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Miasta +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Przedsiębiorstwa +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Dystrybucja ładunków +STR_CONFIG_SETTING_AI :Rywale +STR_CONFIG_SETTING_AI_NPC :Gracze komputerowi +STR_CONFIG_SETTING_NETWORK :Sieć STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Wytyczanie drogi dla pociągów: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :System wyszukiwania trasy dla pociągów @@ -2460,6 +2461,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Nie powi # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Błąd ustawień obrazu... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... nie znaleziono kompatybilnego procesora graficznego. Przyspieszenie sprzętowe wyłączone. +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Sterownik GPU spowodował awarię gry. Wyłączono akcelerację sprzętową # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -4139,6 +4141,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Szczegó STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Zobacz szczegółowe wartości infrastruktury STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Przekaż pieniądze STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Przekaż część pieniędzy tej firmie +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Wrogie przejęcie +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Dokonaj wrogiego przejęcia tej firmy STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nowa twarz STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Wybierz nową twarz prezesa @@ -4154,6 +4158,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Nazwisko prezes STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Wpisz kwotę, jaką chcesz przekazać STR_BUY_COMPANY_MESSAGE :{WHITE}Szukamy firmy transportowej, która przejęłaby naszą firmę.{}{}Chcesz zakupić {COMPANY} za {CURRENCY_LONG}? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}W ramach wrogiego przejęcia {COMPANY} wykupisz wszystkie aktywa, spłacisz wszystkie pożyczki i wypłacisz dwuletnie zyski.{}{}Całość szacowana jest na {CURRENCY_LONG}.{}{}Czy chcesz kontynuować to wrogie przejęcie? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}Infrastruktura firmy {COMPANY} @@ -4225,6 +4230,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Zarządz STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Wyślij instrukcje wszystkim pojazdom na tej liście STR_VEHICLE_LIST_REPLACE_VEHICLES :Zastąp pojazdy STR_VEHICLE_LIST_SEND_FOR_SERVICING :Wyślij do serwisu +STR_VEHICLE_LIST_CREATE_GROUP :Stwórz grupę STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Zysk w tym roku: {CURRENCY_LONG} (ostatni rok: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4953,8 +4959,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Wymagany STR_TIMETABLE_SCHEDULED :{BLACK}Zaplanowany STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Przełącz między spodziewanymi i zaplanowanymi -STR_TIMETABLE_ARRIVAL_ABBREVIATION :P: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :O: +STR_TIMETABLE_ARRIVAL :P: {COLOUR}{DATE_TINY} +STR_TIMETABLE_DEPARTURE :O: {COLOUR}{DATE_TINY} # Date window (for timetable) @@ -6046,6 +6052,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} diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 6681c88839..dcde1bb52e 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -952,49 +952,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Unidades monetárias STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Selecção de unidades monetárias + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Libra Britânica (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dólar dos E.U.A. (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen Japonês (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Xelim Austríaco (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franco Belga (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franco Suíço (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Coroa Checa (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marco Alemão (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Coroa Dinamarquesa (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Espanhola (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marco Finlandês (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franco Francês (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Dracma Grego (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florim Húngaro (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Coroa Islandesa (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Florim Holandês (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Coroa Norueguesa (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zlóti Polaco (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Romeno (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rublo Russo (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Esloveno (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Coroa Sueca (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turca (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Coroa Eslovaca (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real Brasileiro (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Coroa Estoniana (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lituanias (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won Sul Coreano (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Sul Africano (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra Britânica +STR_GAME_OPTIONS_CURRENCY_USD :Dólar dos E.U.A. +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen Japonês +STR_GAME_OPTIONS_CURRENCY_ATS :Xelim Austríaco +STR_GAME_OPTIONS_CURRENCY_BEF :Franco Belga +STR_GAME_OPTIONS_CURRENCY_CHF :Franco Suíço +STR_GAME_OPTIONS_CURRENCY_CZK :Coroa Checa +STR_GAME_OPTIONS_CURRENCY_DEM :Marco Alemão +STR_GAME_OPTIONS_CURRENCY_DKK :Coroa Dinamarquesa +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Espanhola +STR_GAME_OPTIONS_CURRENCY_FIM :Marco Finlandês +STR_GAME_OPTIONS_CURRENCY_FRF :Franco Francês +STR_GAME_OPTIONS_CURRENCY_GRD :Dracma Grego +STR_GAME_OPTIONS_CURRENCY_HUF :Florim Húngaro +STR_GAME_OPTIONS_CURRENCY_ISK :Coroa Islandesa +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Florim Holandês +STR_GAME_OPTIONS_CURRENCY_NOK :Coroa Norueguesa +STR_GAME_OPTIONS_CURRENCY_PLN :Zlóti Polaco +STR_GAME_OPTIONS_CURRENCY_RON :Leu Romeno +STR_GAME_OPTIONS_CURRENCY_RUR :Rublo Russo +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Esloveno +STR_GAME_OPTIONS_CURRENCY_SEK :Coroa Sueca +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Turca +STR_GAME_OPTIONS_CURRENCY_SKK :Coroa Eslovaca +STR_GAME_OPTIONS_CURRENCY_BRL :Real Brasileiro +STR_GAME_OPTIONS_CURRENCY_EEK :Coroa Estoniana +STR_GAME_OPTIONS_CURRENCY_LTL :Litas Lituanias +STR_GAME_OPTIONS_CURRENCY_KRW :Won Sul Coreano +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Sul Africano STR_GAME_OPTIONS_CURRENCY_CUSTOM :Personalizado... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgiano (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iraniano (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Novo Rublo Russo (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexicano (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Novo dólar taiwanês (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chinês (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dólar de Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupia Indiana (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia Indonésia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit da Malásia (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgiano +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iraniano +STR_GAME_OPTIONS_CURRENCY_RUB :Novo Rublo Russo +STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexicano +STR_GAME_OPTIONS_CURRENCY_NTD :Novo dólar taiwanês +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chinês +STR_GAME_OPTIONS_CURRENCY_HKD :Dólar de Hong Kong +STR_GAME_OPTIONS_CURRENCY_INR :Rupia Indiana +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia Indonésia +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit da Malásia STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Guardar automaticamente STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Seleccionar o intervalo para guardar automático @@ -2019,30 +2020,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperial (ft/p 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_GRAPHICS :{ORANGE}Gráficos -STR_CONFIG_SETTING_SOUND :{ORANGE}Efeitos sonoros -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interface -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Geral -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Visualizadores -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construção -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Notícias / Assessores -STR_CONFIG_SETTING_COMPANY :{ORANGE}Empresa -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Contabilidade -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Veículos -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Física -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Em rota -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitações -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Desastres / Acidentes -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Geração do mundo -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Meio Ambiente -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoridades -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Localidades -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrias -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribuição de Carga -STR_CONFIG_SETTING_AI :{ORANGE}Oponentes -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Jogadores Computador -STR_CONFIG_SETTING_NETWORK :{ORANGE}Rede +STR_CONFIG_SETTING_LOCALISATION :Localização +STR_CONFIG_SETTING_GRAPHICS :Gráficos +STR_CONFIG_SETTING_SOUND :Efeitos sonoros +STR_CONFIG_SETTING_INTERFACE :Interface +STR_CONFIG_SETTING_INTERFACE_GENERAL :Geral +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Visualizadores +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construção +STR_CONFIG_SETTING_ADVISORS :Notícias / Assessores +STR_CONFIG_SETTING_COMPANY :Empresa +STR_CONFIG_SETTING_ACCOUNTING :Contabilidade +STR_CONFIG_SETTING_VEHICLES :Veículos +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Física +STR_CONFIG_SETTING_VEHICLES_ROUTING :Em rota +STR_CONFIG_SETTING_LIMITATIONS :Limitações +STR_CONFIG_SETTING_ACCIDENTS :Desastres / Acidentes +STR_CONFIG_SETTING_GENWORLD :Geração do mundo +STR_CONFIG_SETTING_ENVIRONMENT :Meio Ambiente +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoridades +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Localidades +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrias +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribuição de Carga +STR_CONFIG_SETTING_AI :Oponentes +STR_CONFIG_SETTING_AI_NPC :Jogadores Computador +STR_CONFIG_SETTING_NETWORK :Rede STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Sistema de encaminhar comboios: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Sistema de encaminhar comboios @@ -3850,6 +3851,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Gerir li STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Enviar 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 Serviço +STR_VEHICLE_LIST_CREATE_GROUP :Criar grupo STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Lucro deste ano: {CURRENCY_LONG} (último ano: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4572,8 +4574,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Esperado STR_TIMETABLE_SCHEDULED :{BLACK}Marcado STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Alternar entre tempo esperado e marcado -STR_TIMETABLE_ARRIVAL_ABBREVIATION :C: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :P: +STR_TIMETABLE_ARRIVAL :C: {COLOUR}{DATE_TINY} +STR_TIMETABLE_DEPARTURE :P: {COLOUR}{DATE_TINY} # Date window (for timetable) @@ -5628,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} diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index 2a6f7bd62a..a91e0822c4 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -344,9 +344,9 @@ STR_GOTO_ORDER_VIEW_TOOLTIP :{BLACK}Deschide ###length 31 STR_TOOLBAR_TOOLTIP_PAUSE_GAME :{BLACK}Pauză joc STR_TOOLBAR_TOOLTIP_FORWARD :{BLACK}Măreşte viteza de trecere a timpului -STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opţiuni -STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Salvare/abandon/ieşire joc -STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Afişează harta +STR_TOOLBAR_TOOLTIP_OPTIONS :{BLACK}Opțiuni și setări +STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME :{BLACK}Salvare, încărcare sau abandon joc, ieșire program +STR_TOOLBAR_TOOLTIP_DISPLAY_MAP :{BLACK}Afișează harta, vizor adițional, flux de marfă sau lista de semne STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY :{BLACK}Afişează lista cu oraşele de pe hartă STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES :{BLACK}Afişează subvenţiile STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_STATIONS :{BLACK}Afişează lista cu staţiile companiei @@ -354,9 +354,9 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES :{BLACK}Afişeaz STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL :{BLACK}Afişează date generale despre companie STR_TOOLBAR_TOOLTIP_DISPLAY_STORY_BOOK :{BLACK}Afişează cartea de poveste STR_TOOLBAR_TOOLTIP_DISPLAY_GOALS_LIST :{BLACK}Afişează lista de scopuri -STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Afişează grafice +STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS :{BLACK}Afișează graficele și ratele plăților pentru marfă ale companiei STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE :{BLACK}Afişează clasamentul companiilor -STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Listează sau fondează obiectivele industriale +STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW :{BLACK}Examinează industriile sau fondează construcția unei noi industrii STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS :{BLACK}Afișează lista cu trenurile companiei. Ctrl+clic comută afișarea listei cu grupuri/vehicule STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES :{BLACK}Afișează lista cu autovehiculele companiei. Ctrl+clic comută afișarea listei cu grupuri/vehicule STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS :{BLACK}Afișează lista cu navele companiei. Ctrl+clic comută afișarea listei cu grupuri/vehicule @@ -370,8 +370,8 @@ STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Construi STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Construieşte aeroporturi STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Afişează instrumentele pentru modelarea terenului, plantarea copacilor, etc. STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Afişează fereastra pentru configurarea sunetului/muzicii -STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Afişează ultimul mesaj (ultima ştire), opţiunile pentru mesaje -STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informaţii despre teren, consolă, depanare IA, capturi ecran, despre OpenTTD +STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Afișează ultimul mesaj (ultima știre), istoricul de mesaje sau șterge toate mesajele +STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Informații despre teren, captură de ecran, despre OpenTTD și unelte de dezvoltare STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Comută bara de unelte # Extra tooltips for the scenario editor toolbar @@ -450,7 +450,7 @@ STR_GRAPH_MENU_INCOME_GRAPH :Venituri STR_GRAPH_MENU_DELIVERED_CARGO_GRAPH :Număr încărcături livrate STR_GRAPH_MENU_PERFORMANCE_HISTORY_GRAPH :Evoluţia performanţei STR_GRAPH_MENU_COMPANY_VALUE_GRAPH :Valoarea companiei -STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Valorile plăţilor pe încărcături +STR_GRAPH_MENU_CARGO_PAYMENT_RATES :Valorile plăților pe mărfuri # Company league menu ###length 3 @@ -496,7 +496,7 @@ STR_TOOLBAR_SOUND_MUSIC :Sunet/muzică # Message menu ###length 3 -STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimul mesaj/ultima ştire +STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT :Ultimul mesaj/ultima știre STR_NEWS_MENU_MESSAGE_HISTORY_MENU :Lista ultimelor mesaje STR_NEWS_MENU_DELETE_ALL_MESSAGES :Șterge toate mesajele @@ -606,13 +606,13 @@ STR_GRAPH_CARGO_DELIVERED_CAPTION :{WHITE}Unităţ STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION :{WHITE}Evaluarea performanţelor companiilor (maxim=1000) STR_GRAPH_COMPANY_VALUES_CAPTION :{WHITE}Valorile companiilor -STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Preţurile transportului de călători şi mărfuri +STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION :{WHITE}Prețurile transportului de mărfuri STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL :{TINY_FONT}{BLACK}Zile în tranzit -STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Plata pentru livrarea a 10 unităţi (sau 10.000 de litri) de marfă pe o distanţă de 20 de pătrăţele +STR_GRAPH_CARGO_PAYMENT_RATES_TITLE :{TINY_FONT}{BLACK}Plata pentru livrarea a 10 unități (sau 10.000 de litri) de marfă pe o distanță de 20 de pătrățele STR_GRAPH_CARGO_ENABLE_ALL :{TINY_FONT}{BLACK}Activează tot STR_GRAPH_CARGO_DISABLE_ALL :{TINY_FONT}{BLACK}Dezactivează tot -STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Afişează toate mărfurile în graficul de plăţi -STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Nu afişa niciun tip de marfă în graficul de plăţi +STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL :{BLACK}Afișează toate mărfurile în graficul de plăți +STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL :{BLACK}Nu afișa niciun tip de marfă în graficul de plăți STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO :{BLACK}Comută ascunderea/afișarea graficului de marfă STR_GRAPH_CARGO_PAYMENT_CARGO :{TINY_FONT}{BLACK}{STRING} @@ -799,7 +799,7 @@ STR_SMALLMAP_TOOLTIP_DISABLE_ALL_CARGOS :{BLACK}Nu afiș STR_SMALLMAP_TOOLTIP_ENABLE_ALL_CARGOS :{BLACK}Afișează toate tipurile de încărcătură pe hartă # Status bar messages -STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Re-afişează ultimul mesaj +STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS :{BLACK}Re-afișează ultimul mesaj sau ultima știre STR_STATUSBAR_COMPANY_NAME :{SILVER}- - {COMPANY} - - STR_STATUSBAR_PAUSED :{YELLOW}* * PAUZĂ * * STR_STATUSBAR_PAUSED_LINK_GRAPH :{ORANGE}* * PAUZĂ (se actualizează graficul conexiunilor) * * @@ -846,7 +846,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}Compania {STRING} a fost închisă şi toate activele au fost valorificate de creditori! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}A apărut o nouă companie de transport! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} şi-a stabilit sediul lângă {TOWN}! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} a fost preluată de {STRING}! +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} a fost preluată de {STRING} pentru o sumă nedezvăluită! STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Preşedinte) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} a sponsorizat construcţia unui nou oras {TOWN}! @@ -932,60 +932,69 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Copiază STR_GAME_OPTIONS_CAPTION :{WHITE}Opţiuni STR_GAME_OPTIONS_TAB_GENERAL :General +STR_GAME_OPTIONS_TAB_GENERAL_TT :{BLACK}Alege setările generale STR_GAME_OPTIONS_TAB_GRAPHICS :Grafică +STR_GAME_OPTIONS_TAB_GRAPHICS_TT :{BLACK}Alege setările grafice +STR_GAME_OPTIONS_TAB_SOUND :Sunet STR_GAME_OPTIONS_TAB_SOUND_TT :{BLACK}Alegeți setările de sunet și muzică STR_GAME_OPTIONS_VOLUME :Volum +STR_GAME_OPTIONS_SFX_VOLUME :Efecte sonore STR_GAME_OPTIONS_MUSIC_VOLUME :Muzică +STR_GAME_OPTIONS_VOLUME_0 :0% +STR_GAME_OPTIONS_VOLUME_25 :25% +STR_GAME_OPTIONS_VOLUME_50 :50% STR_GAME_OPTIONS_VOLUME_75 :75% +STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Unitate monetară STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Alege unitatea monetară + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Liră sterlină (£) -STR_GAME_OPTIONS_CURRENCY_USD :Dolar american ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen japonez (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Şiling austriac (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franc belgian (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franc elveţian (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Coroană cehă (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marcă germană (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Coroană daneză (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marcă finlandeză (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc francez (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drahmă grecească (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint unguresc (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Coroană islandeză (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Liră italiană (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Gulden olandez (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Coroană norvegiană (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zlot polonez (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu românesc (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rublă rusească (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar sloven (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Coroană suedeză (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Liră turcească (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Coroană slovacă (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real brazilian (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Coroane estoniene (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituanian (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won sud-corean (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sud-african (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Liră sterlină +STR_GAME_OPTIONS_CURRENCY_USD :Dolar american +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen japonez +STR_GAME_OPTIONS_CURRENCY_ATS :Şiling austriac +STR_GAME_OPTIONS_CURRENCY_BEF :Franc belgian +STR_GAME_OPTIONS_CURRENCY_CHF :Franc elveţian +STR_GAME_OPTIONS_CURRENCY_CZK :Coroană cehă +STR_GAME_OPTIONS_CURRENCY_DEM :Marcă germană +STR_GAME_OPTIONS_CURRENCY_DKK :Coroană daneză +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Marcă finlandeză +STR_GAME_OPTIONS_CURRENCY_FRF :Franc francez +STR_GAME_OPTIONS_CURRENCY_GRD :Drahmă grecească +STR_GAME_OPTIONS_CURRENCY_HUF :Forint unguresc +STR_GAME_OPTIONS_CURRENCY_ISK :Coroană islandeză +STR_GAME_OPTIONS_CURRENCY_ITL :Liră italiană +STR_GAME_OPTIONS_CURRENCY_NLG :Gulden olandez +STR_GAME_OPTIONS_CURRENCY_NOK :Coroană norvegiană +STR_GAME_OPTIONS_CURRENCY_PLN :Zlot polonez +STR_GAME_OPTIONS_CURRENCY_RON :Leu românesc +STR_GAME_OPTIONS_CURRENCY_RUR :Rublă rusească +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar sloven +STR_GAME_OPTIONS_CURRENCY_SEK :Coroană suedeză +STR_GAME_OPTIONS_CURRENCY_TRY :Liră turcească +STR_GAME_OPTIONS_CURRENCY_SKK :Coroană slovacă +STR_GAME_OPTIONS_CURRENCY_BRL :Real brazilian +STR_GAME_OPTIONS_CURRENCY_EEK :Coroane estoniene +STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituanian +STR_GAME_OPTIONS_CURRENCY_KRW :Won sud-corean +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sud-african STR_GAME_OPTIONS_CURRENCY_CUSTOM :Personalizată... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgian (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iranian (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Ruble rusești (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexican (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Noul Dolar Taiwanez (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Chinezesc (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dolar Hong Kong (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupia Indiană (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indoneziană (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit Malaysian (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgian +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iranian +STR_GAME_OPTIONS_CURRENCY_RUB :Ruble rusești +STR_GAME_OPTIONS_CURRENCY_MXN :Peso Mexican +STR_GAME_OPTIONS_CURRENCY_NTD :Noul Dolar Taiwanez +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Chinezesc +STR_GAME_OPTIONS_CURRENCY_HKD :Dolar Hong Kong +STR_GAME_OPTIONS_CURRENCY_INR :Rupia Indiană +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indoneziană +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit Malaysian STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Salvare automată STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Alege intervalul de timp dintre salvările automate @@ -993,7 +1002,9 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Alege in # Autosave dropdown ###length 5 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Dezactivată +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_10_MINUTES :La fiecare 10 minute STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES :La fiecare 30 de minute +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES :La fiecare 60 de minute STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES :La fiecare 120 de minute STR_GAME_OPTIONS_LANGUAGE :{BLACK}Limba @@ -1031,6 +1042,13 @@ STR_GAME_OPTIONS_GUI_SCALE_3X :3x STR_GAME_OPTIONS_GUI_SCALE_4X :4x STR_GAME_OPTIONS_GUI_SCALE_5X :5x +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME :{BLACK}Sondaj automat +STR_GAME_OPTIONS_PARTICIPATE_SURVEY :{BLACK}Participă în sondaje automate +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP :{BLACK}Când este activat, OpenTTD va transmite un sondaj la ieșirea din joc +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK :{BLACK}Despre sondaj și intimitate +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP :{BLACK}Asta va deschide un navigator cu mai multe informații despre sondajul automat +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW :{BLACK}Previzualizare rezultat sondaj +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW_TOOLTIP :{BLACK}Arată rezultatul sondajului pentru jocul curent STR_GAME_OPTIONS_GRAPHICS :{BLACK}Grafică @@ -1161,6 +1179,7 @@ STR_CONFIG_SETTING_EXPAND_ALL :{BLACK}Extinde STR_CONFIG_SETTING_COLLAPSE_ALL :{BLACK}Colapsează toate STR_CONFIG_SETTING_RESET_ALL :{BLACK}Resetează toate valorile STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT :(descrierea nu este disponibilă) +STR_CONFIG_SETTING_VALUE :{PUSH_COLOUR}{ORANGE}{STRING}{POP_COLOUR} STR_CONFIG_SETTING_DEFAULT_VALUE :{LTBLUE}Valoare implicită: {ORANGE}{STRING} STR_CONFIG_SETTING_TYPE :{LTBLUE}Tip setare: {ORANGE}{STRING} STR_CONFIG_SETTING_TYPE_CLIENT :Setare client (nu se stochează în salvări; se aplică pentru toate jocurile) @@ -1540,7 +1559,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Din gri în ro STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Tonuri de gri STR_CONFIG_SETTING_SCROLLMODE :Comportament derulare vizor: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamentul derulării hărții +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Comportamentul derulării hărții. Opțiunile „poziție cursor fixă” nu funcționează pe toate sistemele, ca versiunile web, pe ecrane tactile, Linux cu Wayland, și altele ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Mută fereastra de vizualizare ținând apăsat click dreapta, poziția cursorului rămânând fixă STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Mută harta ținând apăsat click dreapta, poziția cursorului rămânând fixă @@ -1721,7 +1740,7 @@ STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_HELPTEXT :Câtă memorie STR_CONFIG_SETTING_SCRIPT_MAX_MEMORY_VALUE :{COMMA} MiB STR_CONFIG_SETTING_SERVINT_ISPERCENT :Intervaluri de service în procente: {STRING} -STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Alege dacă întreținerea vehiculelor este activată de trecerea unei anumite perioade de timp, sau scăzând un anumit procent din gradul de rezistență al vehiculului +STR_CONFIG_SETTING_SERVINT_ISPERCENT_HELPTEXT :Dacă este activată, vehiculele încearcă să se repare când fiabilitatea le scade sub un anumit procent.{}{}De exemplu, dacă fiabilitatea maximă a unui vehicul este 90% și intervalul de service este 20%, vehiculul va încerca să intre în service când ajunge la 72% fiabilitate. STR_CONFIG_SETTING_SERVINT_TRAINS :Intervalul de întreținere implicit al trenurilor: {STRING} STR_CONFIG_SETTING_SERVINT_TRAINS_HELPTEXT :Alege perioada de întreținere implicită pentru noi vehicule feroviare, dacă nu există un interval de întreținere stabilit pentru vehicul @@ -1926,6 +1945,8 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :deloc STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :Multiplicator iniţial dimensiune oraş: {STRING} STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT :Dimensiunea medie a orașelor mari față de orașele normale, la începutul jocului +STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL_HELPTEXT :Durată de timp între recalculările grafului de legături. Fiecare recalculare calculează planurile pentru o componentă a grafului. Asta înseamnă că o valoare X pentru această setare nu va actualiza graful la fiecare X secunde, ci doar o componentă va fi actualizată. O durată scurtă înseamnă mai mult timp pentru procesare, iar o durată lungă înseamnă că începutul distribuției mărfii pe noile rute va lua mai mult timp. +STR_CONFIG_SETTING_LINKGRAPH_RECALC_TIME_HELPTEXT :Durată de timp pentru fiecare recalculare unei componente a grafului de legături. Când începe recalcularea, un fir de execuție va putea rula acest număr de secunde. Cu un interval scurt, e mai probabil ca firul de execuția să nu termine la timp. Asta pauzează jocul până la terminarea execuției ("lag"). Cu un interval lung, actualizarea distribuției la schimbarea rutelor va lua mai mult timp. STR_CONFIG_SETTING_DISTRIBUTION_PAX :Modalitatea de distribuire a pasagerilor: {STRING} STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT :"Simetric" înseamnă că aproximativ același număr de pasageri va fi transportat din stația A spre stația B, precum de la B la A. "Asimetric" presupune transportul unui număr arbitrar de pasageri în fiecare direcție. "Manual" înseamnă că repartizarea pasagerilor nu va fi automatizată. @@ -1951,7 +1972,8 @@ STR_CONFIG_SETTING_DEMAND_SIZE_HELPTEXT :O valoare sub 1 STR_CONFIG_SETTING_SHORT_PATH_SATURATION :Saturaţia căilor de capacitate mică înainte de a utiliza căi de capacitate mare: {STRING} STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT :Adesea, există mai multe căi între două stații date. Cargodist va satura mai întâi calea cea mai scurtă, apoi va folosi a doua cea mai scurtă cale până când aceasta este saturată și așa mai departe. Saturația este determinată de o estimare a capacității și a utilizării planificate. Odată ce a saturat toate căile, dacă mai rămâne cerere, va supraîncărca toate căile, preferându-le pe cele cu capacitate mare. Totuși, de cele mai multe ori algoritmul nu va estima capacitatea cu acuratețe. Această setare vă permite să specificați până la ce procent o cale mai scurtă trebuie să fie saturată în prima trecere înainte de a alege următoarea mai lungă. Setați-l la mai puțin de 100% pentru a evita stațiile supraaglomerate în caz de capacitate supraestimată. -STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY :Unitate viteză: {STRING} +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY :Unitate viteză (terestru): {STRING} +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_NAUTICAL :Unități de viteză (nautice): {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Afişează viteza în interfaţă folosind unităţile selectate ###length 5 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Imperial (mph) @@ -1995,30 +2017,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}Localizare -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafică -STR_CONFIG_SETTING_SOUND :{ORANGE}Efecte sonore -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfaţă -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}General -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Câmpuri vizuale -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construcţie -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Știri / Consilieri -STR_CONFIG_SETTING_COMPANY :{ORANGE}Companie -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Contabilitate -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehicule -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizică -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Direcţionare -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitări -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Dezastre / Accidente -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generare lume -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Mediu -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autorități -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Oraşe -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrii -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribuţie cargo -STR_CONFIG_SETTING_AI :{ORANGE}Concurenţi -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Jucători virtuali -STR_CONFIG_SETTING_NETWORK :{ORANGE}Rețea +STR_CONFIG_SETTING_LOCALISATION :Localizare +STR_CONFIG_SETTING_GRAPHICS :Grafică +STR_CONFIG_SETTING_SOUND :Efecte sonore +STR_CONFIG_SETTING_INTERFACE :Interfaţă +STR_CONFIG_SETTING_INTERFACE_GENERAL :General +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Câmpuri vizuale +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construcţie +STR_CONFIG_SETTING_ADVISORS :Știri / Consilieri +STR_CONFIG_SETTING_COMPANY :Companie +STR_CONFIG_SETTING_ACCOUNTING :Contabilitate +STR_CONFIG_SETTING_VEHICLES :Vehicule +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizică +STR_CONFIG_SETTING_VEHICLES_ROUTING :Direcţionare +STR_CONFIG_SETTING_LIMITATIONS :Limitări +STR_CONFIG_SETTING_ACCIDENTS :Dezastre / Accidente +STR_CONFIG_SETTING_GENWORLD :Generare lume +STR_CONFIG_SETTING_ENVIRONMENT :Mediu +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autorități +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Oraşe +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrii +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribuţie cargo +STR_CONFIG_SETTING_AI :Concurenţi +STR_CONFIG_SETTING_AI_NPC :Jucători virtuali +STR_CONFIG_SETTING_NETWORK :Rețea STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Algoritm de rutare pentru trenuri: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Algoritm de rutare pentru trenuri @@ -2057,6 +2079,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Nu s-au # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Eroare în setările video... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... GPU incompatibil. Accelerarea hardware este dezactivată +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... Driverul GPU a dus la prăbușirea jocului. Accelerarea hardware a fost dezactivată # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -2068,7 +2091,7 @@ STR_INTRO_PLAY_HEIGHTMAP :{BLACK}Hartă t STR_INTRO_SCENARIO_EDITOR :{BLACK}Editor hartă STR_INTRO_MULTIPLAYER :{BLACK}Multiplayer -STR_INTRO_GAME_OPTIONS :{BLACK}Opţiuni +STR_INTRO_GAME_OPTIONS :{BLACK}Opțiuni STR_INTRO_HIGHSCORE :{BLACK}Tabela cu scoruri maxime STR_INTRO_CONFIG_SETTINGS_TREE :{BLACK}Setări STR_INTRO_NEWGRF_SETTINGS :{BLACK}Setări NewGRF @@ -2359,6 +2382,7 @@ STR_NETWORK_CLIENT_LIST_NEW_COMPANY :(Companie nouă STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP :{BLACK}Creează o nouă companie și intră în ea STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP :{BLACK}Aici ești tu STR_NETWORK_CLIENT_LIST_PLAYER_ICON_HOST_TOOLTIP :{BLACK}Aceasta este gazda jocului +STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT :{BLACK}{NUM} {P client clienți "de clienți"} - {NUM}/{NUM}{P companie companii "de companii"} STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT_TOOLTIP :{BLACK}Numărul de clienți conectați în prezent, numărul de companii și numărul maxim de companii permis de administratorul serverului # Matches ConnectionType @@ -2386,6 +2410,12 @@ STR_NETWORK_ASK_RELAY_NO :{BLACK}Nu STR_NETWORK_ASK_RELAY_YES_ONCE :{BLACK}Da, de data asta STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Da, nu mă mai întreba +STR_NETWORK_ASK_SURVEY_CAPTION :Participați în sondajul automat? +STR_NETWORK_ASK_SURVEY_TEXT :Vrei să participi în sondajul automat?{}OpenTTD va transmite un sondaj când ieși din joc.{}Opțiunea poate fi modificată ulterior din „Opțiuni”. +STR_NETWORK_ASK_SURVEY_PREVIEW :Previzualizează rezultatul sondajului +STR_NETWORK_ASK_SURVEY_LINK :Despre sondaj și intimitate +STR_NETWORK_ASK_SURVEY_NO :Nu +STR_NETWORK_ASK_SURVEY_YES :Da STR_NETWORK_SPECTATORS :Spectatori @@ -2676,8 +2706,11 @@ STR_STATION_BUILD_DRAG_DROP_TOOLTIP :{BLACK}Construi STR_STATION_BUILD_STATION_CLASS_TOOLTIP :{BLACK}Alege o clasă de staţii pentru afişare STR_STATION_BUILD_STATION_TYPE_TOOLTIP :{BLACK}Alege tipul de staţie pentru construcţie -STR_STATION_CLASS_DFLT :Staţie implicită +STR_STATION_CLASS_DFLT :Implicită +STR_STATION_CLASS_DFLT_STATION :Stație implicită +STR_STATION_CLASS_DFLT_ROADSTOP :Oprire implicită a drumului STR_STATION_CLASS_WAYP :Puncte de tranzit +STR_STATION_CLASS_WAYP_WAYPOINT :Punct intermediar implicit # Signal window STR_BUILD_SIGNAL_CAPTION :{WHITE}Alegere semnal @@ -2909,7 +2942,7 @@ STR_INDUSTRY_CARGOES_HOUSES :{WHITE}Case STR_INDUSTRY_CARGOES_INDUSTRY_TOOLTIP :{BLACK}Click pe industrie pentru a vedea furnizorii şi clienţii săi STR_INDUSTRY_CARGOES_CARGO_TOOLTIP :{BLACK}{STRING}{}Click pe cargo pentru a vedea furnizorii şi clienţii săi STR_INDUSTRY_DISPLAY_CHAIN :{BLACK}Afişează lanţ -STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP :{BLACK}Afişează industriile care furnizează şi acceptă cargo +STR_INDUSTRY_DISPLAY_CHAIN_TOOLTIP :{BLACK}Afișează industriile care furnizează și acceptă marfă STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP :{BLACK}Link către harta mică STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP :{BLACK}Selectează industriile afişate şi pe harta mică STR_INDUSTRY_CARGOES_SELECT_CARGO :{BLACK}Alege tipul de marfă @@ -2918,7 +2951,7 @@ STR_INDUSTRY_CARGOES_SELECT_INDUSTRY :{BLACK}Alege in STR_INDUSTRY_CARGOES_SELECT_INDUSTRY_TOOLTIP :{BLACK}Alege industria pe care dorești să o afișezi: # Land area window -STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informaţii teren +STR_LAND_AREA_INFORMATION_CAPTION :{WHITE}Informații teren STR_LAND_AREA_INFORMATION_LOCATION_TOOLTIP :{BLACK}Centrează vizorul principal pe locația dalei. Ctrl+clic deschide un vizor nou pe locația dalei STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A :{BLACK}Costul demolării: {LTBLUE}nu este cazul STR_LAND_AREA_INFORMATION_COST_TO_CLEAR :{BLACK}Costul demolării: {RED}{CURRENCY_LONG} @@ -3726,6 +3759,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detalii STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Vezi contabilizarea infrastructurii STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Dă banii STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Dă bani acestei companii +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Preluare ostilă +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Preia ostil această companie STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Schimbă poza STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Alege o nouă poză a preşedintelui @@ -3741,6 +3776,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Noul nume al pr STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Introdu suma de bani pe care vrei să o dai STR_BUY_COMPANY_MESSAGE :{WHITE}Căutăm o companie de transport care să preia societatea noastră{}{}Doriţi să cumpăraţi {COMPANY} la preţul de {CURRENCY_LONG}? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}Prin preluarea ostilă a {COMPANY}, vei cumpăra toate bunurile acesteia, vei plăti toate împrumuturile și vei plăti profitul pe doi ani.{}{}Totalul estimat este {CURRENCY_LONG}.{}{}Vrei să dai curs preluării ostile? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}Infrastructura {COMPANY} @@ -3813,6 +3849,8 @@ STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Trimite STR_VEHICLE_LIST_REPLACE_VEHICLES :Înlocuiește vehiculele STR_VEHICLE_LIST_SEND_FOR_SERVICING :Trimite in service STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Profit anul acesta: {CURRENCY_LONG} (anul trecut: {CURRENCY_LONG}) +STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] +STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT :Trimite la depou STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT :Trimite la depou @@ -4168,10 +4206,10 @@ STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP :{BLACK}Schimbă STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP :{BLACK}Schimbă tipul de marfă transportat de aeronavă ###length VEHICLE_TYPES -STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Afişează comenzile trenului. Ctrl-Click pentru a afişa orarul -STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Afişează comenzile autovehiculului. Ctrl-Click pentru a afişa orarul -STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Afişează comenzile navei. Ctrl-Click pentru a afişa orarul -STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Afişează comenzile aeronavei. Ctrl-Click pentru a afişa orarul +STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP :{BLACK}Afișează comenzile trenului. Ctrl-clic afișează orarul +STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP :{BLACK}Afișează comenzile autovehiculului. Ctrl-clic afișează orarul +STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP :{BLACK}Afișează comenzile navei. Ctrl-clic afișează orarul +STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP :{BLACK}Afișează comenzile aeronavei. Ctrl-clic afișează orarul ###length VEHICLE_TYPES STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP :{BLACK}Afişează detaliile trenului @@ -4532,8 +4570,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Estimat STR_TIMETABLE_SCHEDULED :{BLACK}Planificat STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Comută între estimare şi orar -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) @@ -4577,7 +4613,9 @@ STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}Modulul STR_AI_CONFIG_HUMAN_PLAYER :Jucator uman STR_AI_CONFIG_RANDOM_AI :IA aleator STR_AI_CONFIG_NONE :(niciunul) +STR_AI_CONFIG_NAME_VERSION :{STRING} {YELLOW}v{NUM} STR_AI_CONFIG_MAX_COMPETITORS :{LTBLUE}Numărul maxim de companii concurente: {ORANGE}{COMMA} +STR_AI_CONFIG_COMPETITORS_INTERVAL :{LTBLUE}Intervalul dintre startul competitorilor: {ORANGE}{COMMA} {P minut minute "de minute"} STR_AI_CONFIG_MOVE_UP :{BLACK}În sus STR_AI_CONFIG_MOVE_UP_TOOLTIP :{BLACK}Mută IA selectată sus în listă @@ -4590,7 +4628,7 @@ STR_AI_CONFIG_AI :{SILVER}IA STR_AI_CONFIG_CHANGE_AI :{BLACK}Selectați IA STR_AI_CONFIG_CHANGE_GAMESCRIPT :{BLACK}Selectați scriptul jocului -STR_AI_CONFIG_CHANGE_TOOLTIP :{BLACK}Încarcă un alt script +STR_AI_CONFIG_CHANGE_TOOLTIP :{BLACK}Încarcă un alt script. Ctrl+clic arată toate versiunile disponibile STR_AI_CONFIG_CONFIGURE :{BLACK}Configurază STR_AI_CONFIG_CONFIGURE_TOOLTIP :{BLACK}Configurează parametrii scriptului @@ -4636,6 +4674,7 @@ STR_TEXTFILE_VIEW_LICENCE :{BLACK}Licenţ STR_TEXTFILE_README_CAPTION :{WHITE}{STRING}, fișier readme al {STRING} STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}{STRING}, lista de modificări a {STRING} STR_TEXTFILE_LICENCE_CAPTION :{WHITE}{STRING}, licența fișierului {STRING} +STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Previzualizare a rezultatului sondajului # Vehicle loading indicators @@ -5572,11 +5611,13 @@ STR_VEHICLE_NAME :{VEHICLE} STR_WAYPOINT_NAME :{WAYPOINT} STR_JUST_CARGO :{CARGO_LONG} +STR_JUST_RIGHT_ARROW :{RIGHT_ARROW} STR_JUST_CHECKMARK :{CHECKMARK} STR_JUST_COMMA :{COMMA} STR_JUST_CURRENCY_SHORT :{CURRENCY_SHORT} STR_JUST_CURRENCY_LONG :{CURRENCY_LONG} STR_JUST_CARGO_LIST :{CARGO_LIST} +STR_JUST_DECIMAL :{DECIMAL} STR_JUST_INT :{NUM} STR_JUST_DATE_TINY :{DATE_TINY} STR_JUST_DATE_SHORT :{DATE_SHORT} diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 728f5e5cd8..76b33849d9 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -991,7 +991,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} была закрыта кредиторами! Все активы распроданы! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Основана новая транспортная компания! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} начинает строительство около г.{NBSP}{TOWN}! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} выкуплена {STRING}! Сумма сделки не раскрывается. +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} поглощена компанией {STRING}! Сумма сделки не разглашается. STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Директор) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}Компания «{STRING}» профинансировала основание города {TOWN}! @@ -1096,49 +1096,51 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Валюта STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Смена используемой в игре валюты +STR_GAME_OPTIONS_CURRENCY_CODE :{STRING} ({STRING}) + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Английский фунт (£) -STR_GAME_OPTIONS_CURRENCY_USD :Доллар США ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Евро (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Японская иена (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Австрийский шиллинг (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Бельгийский франк (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Швейцарский франк (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Чешская крона (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Немецкая марка (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Датская крона (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Испанская песета (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Финская марка (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Французский франк (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Греческая драхма (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Венгерский форинт (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Исландская крона (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Итальянская лира (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Нидерландский гульден (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Норвежская крона (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Польский злотый (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Румынский лей (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Российский рубль (старый) (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Словенский толар (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Шведская крона (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Турецкая лира (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Словацкая крона (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Бразильский реал (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Эстонская крона (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Литовский лит (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Южнокорейская вона (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Южноафриканский ранд (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Английский фунт +STR_GAME_OPTIONS_CURRENCY_USD :Доллар США +STR_GAME_OPTIONS_CURRENCY_EUR :Евро +STR_GAME_OPTIONS_CURRENCY_JPY :Японская иена +STR_GAME_OPTIONS_CURRENCY_ATS :Австрийский шиллинг +STR_GAME_OPTIONS_CURRENCY_BEF :Бельгийский франк +STR_GAME_OPTIONS_CURRENCY_CHF :Швейцарский франк +STR_GAME_OPTIONS_CURRENCY_CZK :Чешская крона +STR_GAME_OPTIONS_CURRENCY_DEM :Немецкая марка +STR_GAME_OPTIONS_CURRENCY_DKK :Датская крона +STR_GAME_OPTIONS_CURRENCY_ESP :Испанская песета +STR_GAME_OPTIONS_CURRENCY_FIM :Финская марка +STR_GAME_OPTIONS_CURRENCY_FRF :Французский франк +STR_GAME_OPTIONS_CURRENCY_GRD :Греческая драхма +STR_GAME_OPTIONS_CURRENCY_HUF :Венгерский форинт +STR_GAME_OPTIONS_CURRENCY_ISK :Исландская крона +STR_GAME_OPTIONS_CURRENCY_ITL :Итальянская лира +STR_GAME_OPTIONS_CURRENCY_NLG :Нидерландский гульден +STR_GAME_OPTIONS_CURRENCY_NOK :Норвежская крона +STR_GAME_OPTIONS_CURRENCY_PLN :Польский злотый +STR_GAME_OPTIONS_CURRENCY_RON :Румынский лей +STR_GAME_OPTIONS_CURRENCY_RUR :Российский рубль (старый) +STR_GAME_OPTIONS_CURRENCY_SIT :Словенский толар +STR_GAME_OPTIONS_CURRENCY_SEK :Шведская крона +STR_GAME_OPTIONS_CURRENCY_TRY :Турецкая лира +STR_GAME_OPTIONS_CURRENCY_SKK :Словацкая крона +STR_GAME_OPTIONS_CURRENCY_BRL :Бразильский реал +STR_GAME_OPTIONS_CURRENCY_EEK :Эстонская крона +STR_GAME_OPTIONS_CURRENCY_LTL :Литовский лит +STR_GAME_OPTIONS_CURRENCY_KRW :Южнокорейская вона +STR_GAME_OPTIONS_CURRENCY_ZAR :Южноафриканский ранд STR_GAME_OPTIONS_CURRENCY_CUSTOM :Своя... -STR_GAME_OPTIONS_CURRENCY_GEL :Грузинский лари (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Иранский риал (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Российский рубль (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Мексиканский песо (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Новый тайваньский доллар (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Китайский юань (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Гонконгский доллар (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Индийская рупия (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Индонезийская рупия (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Малайзийский ринггит (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Грузинский лари +STR_GAME_OPTIONS_CURRENCY_IRR :Иранский риал +STR_GAME_OPTIONS_CURRENCY_RUB :Российский рубль +STR_GAME_OPTIONS_CURRENCY_MXN :Мексиканский песо +STR_GAME_OPTIONS_CURRENCY_NTD :Новый тайваньский доллар +STR_GAME_OPTIONS_CURRENCY_CNY :Китайский юань +STR_GAME_OPTIONS_CURRENCY_HKD :Гонконгский доллар +STR_GAME_OPTIONS_CURRENCY_INR :Индийская рупия +STR_GAME_OPTIONS_CURRENCY_IDR :Индонезийская рупия +STR_GAME_OPTIONS_CURRENCY_MYR :Малайзийский ринггит STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Автосохранение STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Интервал автосохранения игры @@ -2169,30 +2171,30 @@ 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_GRAPHICS :{ORANGE}Графика -STR_CONFIG_SETTING_SOUND :{ORANGE}Звуковые эффекты -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Интерфейс -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Общие настройки -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Окна просмотра -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Строительство -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Новости и информация -STR_CONFIG_SETTING_COMPANY :{ORANGE}Компания -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Финансы -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Транспорт -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Физическая модель -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Маршруты -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ограничения -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Аварии и катастрофы -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Создание карты -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Окружение -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Городская администрация -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Города -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Предприятия -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Распределение грузов -STR_CONFIG_SETTING_AI :{ORANGE}Конкуренты -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Искусственный интеллект -STR_CONFIG_SETTING_NETWORK :{ORANGE}Сеть +STR_CONFIG_SETTING_LOCALISATION :Локализация +STR_CONFIG_SETTING_GRAPHICS :Графика +STR_CONFIG_SETTING_SOUND :Звуковые эффекты +STR_CONFIG_SETTING_INTERFACE :Интерфейс +STR_CONFIG_SETTING_INTERFACE_GENERAL :Общие настройки +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Окна просмотра +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Строительство +STR_CONFIG_SETTING_ADVISORS :Новости и информация +STR_CONFIG_SETTING_COMPANY :Компания +STR_CONFIG_SETTING_ACCOUNTING :Финансы +STR_CONFIG_SETTING_VEHICLES :Транспорт +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Физическая модель +STR_CONFIG_SETTING_VEHICLES_ROUTING :Маршруты +STR_CONFIG_SETTING_LIMITATIONS :Ограничения +STR_CONFIG_SETTING_ACCIDENTS :Аварии и катастрофы +STR_CONFIG_SETTING_GENWORLD :Создание карты +STR_CONFIG_SETTING_ENVIRONMENT :Окружение +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Городская администрация +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Города +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Предприятия +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Распределение грузов +STR_CONFIG_SETTING_AI :Конкуренты +STR_CONFIG_SETTING_AI_NPC :Искусственный интеллект +STR_CONFIG_SETTING_NETWORK :Сеть STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Алгоритм поиска пути для поездов: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Алгоритм поиска пути, используемый поездами @@ -3952,7 +3954,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Имя дире STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Введите сумму, которую собираетесь передать STR_BUY_COMPANY_MESSAGE :{WHITE}Мы ищем потенциального покупателя для нашей компании.{}{}Не желаете ли Вы приобрести {COMPANY} за {CURRENCY_LONG}? -STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}После поглощения компании {COMPANY} вы приобретёте все её активы. При этом вам придётся выплатить все её долги плюс сумму, эквивалентную её двойному годовому доходу.{}{}Сумма сделки оценивается в {CURRENCY_LONG}.{}{}Осуществить поглощение компании? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}После поглощения компании {COMPANY} все её активы перейдут в вашу собственность. При этом вам придётся выплатить все долги компании плюс сумму, эквивалентную её двойному годовому доходу.{}{}Сумма сделки оценивается в {CURRENCY_LONG}.{}{}Осуществить поглощение компании? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}Инфраструктура «{COMPANY}» @@ -4024,6 +4026,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Орга STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Управление транспортом, находящимся в этом списке STR_VEHICLE_LIST_REPLACE_VEHICLES :Замена транспорта STR_VEHICLE_LIST_SEND_FOR_SERVICING :Отправить на тех. обслуживание +STR_VEHICLE_LIST_CREATE_GROUP :Создать группу STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Прибыль в этом году: {CURRENCY_LONG} (в прошлом году: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4758,8 +4761,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Ожид STR_TIMETABLE_SCHEDULED :{BLACK}График STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Переключение между графиком движения и ожидаемым временем прибытия/отправления -STR_TIMETABLE_ARRIVAL_ABBREVIATION :П: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :О: +STR_TIMETABLE_ARRIVAL :Приб: {COLOUR}{DATE_TINY} +STR_TIMETABLE_DEPARTURE :Отпр: {COLOUR}{DATE_TINY} # Date window (for timetable) @@ -5851,6 +5854,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} diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 4431535ce8..303d02eb45 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1131,49 +1131,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Opcije STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valuta STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Izbor valute + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Britanska funta (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dolar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Evro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japanski jen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Austrijski šiling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski franak (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Švajcarski franak (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Češka kruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Nemačka marka (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danska kruna (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Španska pezeta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finska marka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Francuski franak (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grčka drahma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Mađarska forinta (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandska kruna (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italijanska lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Holandski gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norveška kruna (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poljski zlot (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumunski lej (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ruska rublja (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenački tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Švedska kruna (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turska lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovačka kruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilski real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estonska kruna (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litvanski litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Južnokorejski von (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Južnoafrički rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Britanska funta +STR_GAME_OPTIONS_CURRENCY_USD :Dolar +STR_GAME_OPTIONS_CURRENCY_EUR :Evro +STR_GAME_OPTIONS_CURRENCY_JPY :Japanski jen +STR_GAME_OPTIONS_CURRENCY_ATS :Austrijski šiling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski franak +STR_GAME_OPTIONS_CURRENCY_CHF :Švajcarski franak +STR_GAME_OPTIONS_CURRENCY_CZK :Češka kruna +STR_GAME_OPTIONS_CURRENCY_DEM :Nemačka marka +STR_GAME_OPTIONS_CURRENCY_DKK :Danska kruna +STR_GAME_OPTIONS_CURRENCY_ESP :Španska pezeta +STR_GAME_OPTIONS_CURRENCY_FIM :Finska marka +STR_GAME_OPTIONS_CURRENCY_FRF :Francuski franak +STR_GAME_OPTIONS_CURRENCY_GRD :Grčka drahma +STR_GAME_OPTIONS_CURRENCY_HUF :Mađarska forinta +STR_GAME_OPTIONS_CURRENCY_ISK :Islandska kruna +STR_GAME_OPTIONS_CURRENCY_ITL :Italijanska lira +STR_GAME_OPTIONS_CURRENCY_NLG :Holandski gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norveška kruna +STR_GAME_OPTIONS_CURRENCY_PLN :Poljski zlot +STR_GAME_OPTIONS_CURRENCY_RON :Rumunski lej +STR_GAME_OPTIONS_CURRENCY_RUR :Ruska rublja +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenački tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Švedska kruna +STR_GAME_OPTIONS_CURRENCY_TRY :Turska lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovačka kruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilski real +STR_GAME_OPTIONS_CURRENCY_EEK :Estonska kruna +STR_GAME_OPTIONS_CURRENCY_LTL :Litvanski litas +STR_GAME_OPTIONS_CURRENCY_KRW :Južnokorejski von +STR_GAME_OPTIONS_CURRENCY_ZAR :Južnoafrički rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Sopstvena... -STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijski lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iranski rijal (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nova ruska rublja (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksički pezos (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Novi tajvanski dolar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Kineski renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkonški dolar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indijska rupija (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonezijska rupija (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malezijski ringit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijski lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranski rijal +STR_GAME_OPTIONS_CURRENCY_RUB :Nova ruska rublja +STR_GAME_OPTIONS_CURRENCY_MXN :Meksički pezos +STR_GAME_OPTIONS_CURRENCY_NTD :Novi tajvanski dolar +STR_GAME_OPTIONS_CURRENCY_CNY :Kineski renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkonški dolar +STR_GAME_OPTIONS_CURRENCY_INR :Indijska rupija +STR_GAME_OPTIONS_CURRENCY_IDR :Indonezijska rupija +STR_GAME_OPTIONS_CURRENCY_MYR :Malezijski ringit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Auto čuvanje pozicije STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Izbor vremenskog intervala između dve automatski sačuvane pozicije @@ -2178,30 +2179,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperijalne mer STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metričke mere (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Prevod -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Zvučni efekti -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Okruženje -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Opšte -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Prikazi -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Izgradnja -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Vesti / Savetnici -STR_CONFIG_SETTING_COMPANY :{ORANGE}Preduzeće -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Računovodstvo -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vozila -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Rutiranje -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Ograničenja -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofe / Nezgode -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Stvaranje sveta -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Okoliš -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Vlasti -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Naselja -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Fabrike -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribucija tereta -STR_CONFIG_SETTING_AI :{ORANGE}Suparnici -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Računar -STR_CONFIG_SETTING_NETWORK :{ORANGE}Mreža +STR_CONFIG_SETTING_LOCALISATION :Prevod +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Zvučni efekti +STR_CONFIG_SETTING_INTERFACE :Okruženje +STR_CONFIG_SETTING_INTERFACE_GENERAL :Opšte +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Prikazi +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Izgradnja +STR_CONFIG_SETTING_ADVISORS :Vesti / Savetnici +STR_CONFIG_SETTING_COMPANY :Preduzeće +STR_CONFIG_SETTING_ACCOUNTING :Računovodstvo +STR_CONFIG_SETTING_VEHICLES :Vozila +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Rutiranje +STR_CONFIG_SETTING_LIMITATIONS :Ograničenja +STR_CONFIG_SETTING_ACCIDENTS :Katastrofe / Nezgode +STR_CONFIG_SETTING_GENWORLD :Stvaranje sveta +STR_CONFIG_SETTING_ENVIRONMENT :Okoliš +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Vlasti +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Naselja +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Fabrike +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribucija tereta +STR_CONFIG_SETTING_AI :Suparnici +STR_CONFIG_SETTING_AI_NPC :Računar +STR_CONFIG_SETTING_NETWORK :Mreža STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Pretraživanje putanja vozova: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Algoritam pronalaženja puta za vozove @@ -4724,8 +4725,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Očekiva STR_TIMETABLE_SCHEDULED :{BLACK}Po planu STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Prebacivanje između prikaza očekivanog i po planu -STR_TIMETABLE_ARRIVAL_ABBREVIATION :D: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :P: # Date window (for timetable) diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index 45615a00db..532b4b79ba 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -936,49 +936,50 @@ 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_USD :美元 ($) -STR_GAME_OPTIONS_CURRENCY_EUR :欧元 (€) -STR_GAME_OPTIONS_CURRENCY_JPY :日元 (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :澳大利亚先令 (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :比利时法郎 (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :瑞士法郎 (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :捷克克朗 (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :德国马克 (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :丹麦克朗 (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :西班牙比赛塔 (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :芬兰马克 (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :法郎 (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :希腊德拉克马 (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :匈牙利福林 (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :冰岛克朗 (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :意大利里拉 (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :荷兰盾 (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :挪威克朗 (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :波兰兹罗提 (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :罗马尼亚列伊 (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :卢布 (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :斯洛文尼亚托拉捷夫 (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :瑞典克朗 (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :土耳其里拉 (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :斯洛伐克克朗 (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :巴西里亚伊 (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :爱沙尼亚克鲁恩 (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :立陶宛立特（LTL） -STR_GAME_OPTIONS_CURRENCY_KRW :韩元（KRW） -STR_GAME_OPTIONS_CURRENCY_ZAR :南非兰特（ZAR） +STR_GAME_OPTIONS_CURRENCY_GBP :英镑 +STR_GAME_OPTIONS_CURRENCY_USD :美元 +STR_GAME_OPTIONS_CURRENCY_EUR :欧元 +STR_GAME_OPTIONS_CURRENCY_JPY :日元 +STR_GAME_OPTIONS_CURRENCY_ATS :澳大利亚先令 +STR_GAME_OPTIONS_CURRENCY_BEF :比利时法郎 +STR_GAME_OPTIONS_CURRENCY_CHF :瑞士法郎 +STR_GAME_OPTIONS_CURRENCY_CZK :捷克克朗 +STR_GAME_OPTIONS_CURRENCY_DEM :德国马克 +STR_GAME_OPTIONS_CURRENCY_DKK :丹麦克朗 +STR_GAME_OPTIONS_CURRENCY_ESP :西班牙比赛塔 +STR_GAME_OPTIONS_CURRENCY_FIM :芬兰马克 +STR_GAME_OPTIONS_CURRENCY_FRF :法郎 +STR_GAME_OPTIONS_CURRENCY_GRD :希腊德拉克马 +STR_GAME_OPTIONS_CURRENCY_HUF :匈牙利福林 +STR_GAME_OPTIONS_CURRENCY_ISK :冰岛克朗 +STR_GAME_OPTIONS_CURRENCY_ITL :意大利里拉 +STR_GAME_OPTIONS_CURRENCY_NLG :荷兰盾 +STR_GAME_OPTIONS_CURRENCY_NOK :挪威克朗 +STR_GAME_OPTIONS_CURRENCY_PLN :波兰兹罗提 +STR_GAME_OPTIONS_CURRENCY_RON :罗马尼亚列伊 +STR_GAME_OPTIONS_CURRENCY_RUR :卢布 +STR_GAME_OPTIONS_CURRENCY_SIT :斯洛文尼亚托拉捷夫 +STR_GAME_OPTIONS_CURRENCY_SEK :瑞典克朗 +STR_GAME_OPTIONS_CURRENCY_TRY :土耳其里拉 +STR_GAME_OPTIONS_CURRENCY_SKK :斯洛伐克克朗 +STR_GAME_OPTIONS_CURRENCY_BRL :巴西里亚伊 +STR_GAME_OPTIONS_CURRENCY_EEK :爱沙尼亚克鲁恩 +STR_GAME_OPTIONS_CURRENCY_LTL :立陶宛立特 +STR_GAME_OPTIONS_CURRENCY_KRW :韩元 +STR_GAME_OPTIONS_CURRENCY_ZAR :南非兰特 STR_GAME_OPTIONS_CURRENCY_CUSTOM :自定义… -STR_GAME_OPTIONS_CURRENCY_GEL :格鲁吉亚拉里(GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :伊朗里亚尔(IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :新俄罗斯卢布 (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :墨西哥比索 (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :新台币 (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :中国人民币 (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :港币 (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :印度卢布（INR） -STR_GAME_OPTIONS_CURRENCY_IDR :印尼盾 (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :马来西亚林吉特 (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :格鲁吉亚拉里 +STR_GAME_OPTIONS_CURRENCY_IRR :伊朗里亚尔 +STR_GAME_OPTIONS_CURRENCY_RUB :新俄罗斯卢布 +STR_GAME_OPTIONS_CURRENCY_MXN :墨西哥比索 +STR_GAME_OPTIONS_CURRENCY_NTD :新台币 +STR_GAME_OPTIONS_CURRENCY_CNY :中国人民币 +STR_GAME_OPTIONS_CURRENCY_HKD :港币 +STR_GAME_OPTIONS_CURRENCY_INR :印度卢布 +STR_GAME_OPTIONS_CURRENCY_IDR :印尼盾 +STR_GAME_OPTIONS_CURRENCY_MYR :马来西亚林吉特 STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}自动保存 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}选择自动保存的周期 @@ -1985,30 +1986,30 @@ 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_GRAPHICS :{ORANGE}图形 -STR_CONFIG_SETTING_SOUND :{ORANGE}音效 -STR_CONFIG_SETTING_INTERFACE :{ORANGE}界面 -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}通用 -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}视点 -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}建设 -STR_CONFIG_SETTING_ADVISORS :{ORANGE}消息/新闻 -STR_CONFIG_SETTING_COMPANY :{ORANGE}公司 -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}财务管理 -STR_CONFIG_SETTING_VEHICLES :{ORANGE}车辆 -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}物理 -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}经由 -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}限制 -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}灾难/事故 -STR_CONFIG_SETTING_GENWORLD :{ORANGE}生成地图 -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}环境 -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}政府监管 -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}城镇 -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}工业设施 -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}货物分配 -STR_CONFIG_SETTING_AI :{ORANGE}竞争 -STR_CONFIG_SETTING_AI_NPC :{ORANGE}电脑玩家 -STR_CONFIG_SETTING_NETWORK :{ORANGE}网络 +STR_CONFIG_SETTING_LOCALISATION :本地化 +STR_CONFIG_SETTING_GRAPHICS :图形 +STR_CONFIG_SETTING_SOUND :音效 +STR_CONFIG_SETTING_INTERFACE :界面 +STR_CONFIG_SETTING_INTERFACE_GENERAL :通用 +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :视点 +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :建设 +STR_CONFIG_SETTING_ADVISORS :消息/新闻 +STR_CONFIG_SETTING_COMPANY :公司 +STR_CONFIG_SETTING_ACCOUNTING :财务管理 +STR_CONFIG_SETTING_VEHICLES :车辆 +STR_CONFIG_SETTING_VEHICLES_PHYSICS :物理 +STR_CONFIG_SETTING_VEHICLES_ROUTING :经由 +STR_CONFIG_SETTING_LIMITATIONS :限制 +STR_CONFIG_SETTING_ACCIDENTS :灾难/事故 +STR_CONFIG_SETTING_GENWORLD :生成地图 +STR_CONFIG_SETTING_ENVIRONMENT :环境 +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :政府监管 +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :城镇 +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :工业设施 +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :货物分配 +STR_CONFIG_SETTING_AI :竞争 +STR_CONFIG_SETTING_AI_NPC :电脑玩家 +STR_CONFIG_SETTING_NETWORK :网络 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :火车寻路： {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :列车寻路方式 @@ -4521,8 +4522,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}预期 STR_TIMETABLE_SCHEDULED :{BLACK}表定时间 STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}切换显示（根据实际情况计算的）预期时间或表定时间 -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 65e1b2a853..62fff2c04b 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1005,49 +1005,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Možnost STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Mena STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Výber menovej jednotky + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Libra šterlingov (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Americký dolár (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japonský jen (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Rakúsky šiling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgický frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Švajčiarský frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Česká koruna (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Nemecký mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dánska koruna (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Španielské peso (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Fínsky mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Francúzsky frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grécka drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Maďarský forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandská koruna (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Talianská líra (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Holandský gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Nórska koruna (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poľský zlotý (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumunský lev (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ruský rubeľ (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovinský toliar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Švédska koruna (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turecká líra (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovenská koruna (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazílsky real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estónska koruna (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litovský litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Juhokórejský won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Juhoafrický rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra šterlingov +STR_GAME_OPTIONS_CURRENCY_USD :Americký dolár +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japonský jen +STR_GAME_OPTIONS_CURRENCY_ATS :Rakúsky šiling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgický frank +STR_GAME_OPTIONS_CURRENCY_CHF :Švajčiarský frank +STR_GAME_OPTIONS_CURRENCY_CZK :Česká koruna +STR_GAME_OPTIONS_CURRENCY_DEM :Nemecký mark +STR_GAME_OPTIONS_CURRENCY_DKK :Dánska koruna +STR_GAME_OPTIONS_CURRENCY_ESP :Španielské peso +STR_GAME_OPTIONS_CURRENCY_FIM :Fínsky mark +STR_GAME_OPTIONS_CURRENCY_FRF :Francúzsky frank +STR_GAME_OPTIONS_CURRENCY_GRD :Grécka drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Maďarský forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandská koruna +STR_GAME_OPTIONS_CURRENCY_ITL :Talianská líra +STR_GAME_OPTIONS_CURRENCY_NLG :Holandský gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Nórska koruna +STR_GAME_OPTIONS_CURRENCY_PLN :Poľský zlotý +STR_GAME_OPTIONS_CURRENCY_RON :Rumunský lev +STR_GAME_OPTIONS_CURRENCY_RUR :Ruský rubeľ +STR_GAME_OPTIONS_CURRENCY_SIT :Slovinský toliar +STR_GAME_OPTIONS_CURRENCY_SEK :Švédska koruna +STR_GAME_OPTIONS_CURRENCY_TRY :Turecká líra +STR_GAME_OPTIONS_CURRENCY_SKK :Slovenská koruna +STR_GAME_OPTIONS_CURRENCY_BRL :Brazílsky real +STR_GAME_OPTIONS_CURRENCY_EEK :Estónska koruna +STR_GAME_OPTIONS_CURRENCY_LTL :Litovský litas +STR_GAME_OPTIONS_CURRENCY_KRW :Juhokórejský won +STR_GAME_OPTIONS_CURRENCY_ZAR :Juhoafrický rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Vlastná ... -STR_GAME_OPTIONS_CURRENCY_GEL :Gruzínske lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iránsky rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Ruský rubeľ (nový) (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexické peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Taiwanský dolár (nový) (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Čínsky jüan (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongský dolár (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indická rupia (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonézska rupia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malajzijský ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Gruzínske lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iránsky rial +STR_GAME_OPTIONS_CURRENCY_RUB :Ruský rubeľ (nový) +STR_GAME_OPTIONS_CURRENCY_MXN :Mexické peso +STR_GAME_OPTIONS_CURRENCY_NTD :Taiwanský dolár (nový) +STR_GAME_OPTIONS_CURRENCY_CNY :Čínsky jüan +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongský dolár +STR_GAME_OPTIONS_CURRENCY_INR :Indická rupia +STR_GAME_OPTIONS_CURRENCY_IDR :Indonézska rupia +STR_GAME_OPTIONS_CURRENCY_MYR :Malajzijský ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Automatické ukladanie STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Výber intervalu automatického ukladania @@ -2056,30 +2057,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperialne (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrické (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalizácia -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafika -STR_CONFIG_SETTING_SOUND :{ORANGE}Zvuk -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Rozhranie -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Všeobecné -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Náhľady -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Výstavba -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Novinky / Varovania -STR_CONFIG_SETTING_COMPANY :{ORANGE}Spoločnosť -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Účtovníctvo -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vozidlá -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fyzika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Smerovanie -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Obmedzenia -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofy / Nehody -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generovanie sveta -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Prostredie -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Miestne správy -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Mestá -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Priemysel -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribúcia nákladu -STR_CONFIG_SETTING_AI :{ORANGE}Konkurenti -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Počítačový hráči -STR_CONFIG_SETTING_NETWORK :{ORANGE}Sieť +STR_CONFIG_SETTING_LOCALISATION :Lokalizácia +STR_CONFIG_SETTING_GRAPHICS :Grafika +STR_CONFIG_SETTING_SOUND :Zvuk +STR_CONFIG_SETTING_INTERFACE :Rozhranie +STR_CONFIG_SETTING_INTERFACE_GENERAL :Všeobecné +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Náhľady +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Výstavba +STR_CONFIG_SETTING_ADVISORS :Novinky / Varovania +STR_CONFIG_SETTING_COMPANY :Spoločnosť +STR_CONFIG_SETTING_ACCOUNTING :Účtovníctvo +STR_CONFIG_SETTING_VEHICLES :Vozidlá +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fyzika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Smerovanie +STR_CONFIG_SETTING_LIMITATIONS :Obmedzenia +STR_CONFIG_SETTING_ACCIDENTS :Katastrofy / Nehody +STR_CONFIG_SETTING_GENWORLD :Generovanie sveta +STR_CONFIG_SETTING_ENVIRONMENT :Prostredie +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Miestne správy +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Mestá +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Priemysel +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribúcia nákladu +STR_CONFIG_SETTING_AI :Konkurenti +STR_CONFIG_SETTING_AI_NPC :Počítačový hráči +STR_CONFIG_SETTING_NETWORK :Sieť STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Algoritmus hľadania cesty pre vlaky: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Vyhľadávač trasy pre vlaky @@ -4594,8 +4595,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Očakáv STR_TIMETABLE_SCHEDULED :{BLACK}Plánované STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Prepnúť medzi očakávaným a plánovaným -STR_TIMETABLE_ARRIVAL_ABBREVIATION :P: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :O: # Date window (for timetable) diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index 80ebd98f9f..2acfc3ee44 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1048,42 +1048,43 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Možnost STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valute STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Izbira valut + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Funt (£) -STR_GAME_OPTIONS_CURRENCY_USD :Dolar ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Jen (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Avstrijski Šiling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski Frank (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Švicarski Frank (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Češka Krona (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Nemška Marka (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danska Krona (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Pezeta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finska Marka (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Frank (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grška Drahma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Madžarski Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Islandska Krona (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italijanska Lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nizozemski Gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norveška Krona (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Poljski Zlot (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Romunski Lej (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Ruski Rubelj (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenski tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Švedska Krona (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turška lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovaška krona (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brazilski Real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :estonske krone (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litvijske Lite (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Južnokorejski Won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Južnoafriški Rant (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Funt +STR_GAME_OPTIONS_CURRENCY_USD :Dolar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Jen +STR_GAME_OPTIONS_CURRENCY_ATS :Avstrijski Šiling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski Frank +STR_GAME_OPTIONS_CURRENCY_CHF :Švicarski Frank +STR_GAME_OPTIONS_CURRENCY_CZK :Češka Krona +STR_GAME_OPTIONS_CURRENCY_DEM :Nemška Marka +STR_GAME_OPTIONS_CURRENCY_DKK :Danska Krona +STR_GAME_OPTIONS_CURRENCY_ESP :Pezeta +STR_GAME_OPTIONS_CURRENCY_FIM :Finska Marka +STR_GAME_OPTIONS_CURRENCY_FRF :Frank +STR_GAME_OPTIONS_CURRENCY_GRD :Grška Drahma +STR_GAME_OPTIONS_CURRENCY_HUF :Madžarski Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Islandska Krona +STR_GAME_OPTIONS_CURRENCY_ITL :Italijanska Lira +STR_GAME_OPTIONS_CURRENCY_NLG :Nizozemski Gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norveška Krona +STR_GAME_OPTIONS_CURRENCY_PLN :Poljski Zlot +STR_GAME_OPTIONS_CURRENCY_RON :Romunski Lej +STR_GAME_OPTIONS_CURRENCY_RUR :Ruski Rubelj +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenski tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Švedska Krona +STR_GAME_OPTIONS_CURRENCY_TRY :Turška lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovaška krona +STR_GAME_OPTIONS_CURRENCY_BRL :Brazilski Real +STR_GAME_OPTIONS_CURRENCY_EEK :estonske krone +STR_GAME_OPTIONS_CURRENCY_LTL :Litvijske Lite +STR_GAME_OPTIONS_CURRENCY_KRW :Južnokorejski Won +STR_GAME_OPTIONS_CURRENCY_ZAR :Južnoafriški Rant STR_GAME_OPTIONS_CURRENCY_CUSTOM :Po meri... -STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijski Lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iranski Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kongški dolar (HKD) +STR_GAME_OPTIONS_CURRENCY_GEL :Gruzijski Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranski Rial +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kongški dolar STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Samodejno shrani STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Izberi časovni interval samodejnega shranjevanja igre @@ -1984,29 +1985,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperične (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrične (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Lokalno -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafike -STR_CONFIG_SETTING_SOUND :{ORANGE}Zvočni učinki -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Vmesnik -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Splošno -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Pogledi -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Gradnja -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Novice/Nasveti -STR_CONFIG_SETTING_COMPANY :{ORANGE}Podjetje -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Računi -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vozila -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizika -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Usmerjanje -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Omejitve -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Katastrofe / Nesreče -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Ustvarjanje sveta -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Okolje -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Oblasti -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Mesta -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrije -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Razpored tovora -STR_CONFIG_SETTING_AI :{ORANGE}Tekmeci -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Računalniški igralci +STR_CONFIG_SETTING_LOCALISATION :Lokalno +STR_CONFIG_SETTING_GRAPHICS :Grafike +STR_CONFIG_SETTING_SOUND :Zvočni učinki +STR_CONFIG_SETTING_INTERFACE :Vmesnik +STR_CONFIG_SETTING_INTERFACE_GENERAL :Splošno +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Pogledi +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Gradnja +STR_CONFIG_SETTING_ADVISORS :Novice/Nasveti +STR_CONFIG_SETTING_COMPANY :Podjetje +STR_CONFIG_SETTING_ACCOUNTING :Računi +STR_CONFIG_SETTING_VEHICLES :Vozila +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizika +STR_CONFIG_SETTING_VEHICLES_ROUTING :Usmerjanje +STR_CONFIG_SETTING_LIMITATIONS :Omejitve +STR_CONFIG_SETTING_ACCIDENTS :Katastrofe / Nesreče +STR_CONFIG_SETTING_GENWORLD :Ustvarjanje sveta +STR_CONFIG_SETTING_ENVIRONMENT :Okolje +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Oblasti +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Mesta +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrije +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Razpored tovora +STR_CONFIG_SETTING_AI :Tekmeci +STR_CONFIG_SETTING_AI_NPC :Računalniški igralci STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Iskalnik poti za vlake: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Iskalnik poti za vlake. @@ -4221,8 +4222,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Pričako STR_TIMETABLE_SCHEDULED :{BLACK}Določen STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Preklopi med pričakovanim in določenim -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 363bcf3b4c..1b8083c64e 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -937,49 +937,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Opciones STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Unidad monetaria STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Selecciona la nnidad monetaria + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Libra británica (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dólar estadounidense (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen japonés (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Chelín austriaco (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franco suizo (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Corona checa (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marco alemán (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Corona danesa (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta española (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Markka finlandés (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franco francés (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Dracma griego (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florín húngaro (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandesa (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Florín holandés (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Corona noruega(NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polaco (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu rumano (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rublo ruso (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tólar esloveno (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Corona sueca (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca (TRY) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra británica +STR_GAME_OPTIONS_CURRENCY_USD :Dólar estadounidense +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen japonés +STR_GAME_OPTIONS_CURRENCY_ATS :Chelín austriaco +STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga +STR_GAME_OPTIONS_CURRENCY_CHF :Franco suizo +STR_GAME_OPTIONS_CURRENCY_CZK :Corona checa +STR_GAME_OPTIONS_CURRENCY_DEM :Marco alemán +STR_GAME_OPTIONS_CURRENCY_DKK :Corona danesa +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta española +STR_GAME_OPTIONS_CURRENCY_FIM :Markka finlandés +STR_GAME_OPTIONS_CURRENCY_FRF :Franco francés +STR_GAME_OPTIONS_CURRENCY_GRD :Dracma griego +STR_GAME_OPTIONS_CURRENCY_HUF :Florín húngaro +STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandesa +STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Florín holandés +STR_GAME_OPTIONS_CURRENCY_NOK :Corona noruega +STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polaco +STR_GAME_OPTIONS_CURRENCY_RON :Leu rumano +STR_GAME_OPTIONS_CURRENCY_RUR :Rublo ruso +STR_GAME_OPTIONS_CURRENCY_SIT :Tólar esloveno +STR_GAME_OPTIONS_CURRENCY_SEK :Corona sueca +STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca STR_GAME_OPTIONS_CURRENCY_SKK :Corona eslovaca -STR_GAME_OPTIONS_CURRENCY_BRL :Real brasileño (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Krooni estonio (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituana (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won surcoreano (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano (ZAR) +STR_GAME_OPTIONS_CURRENCY_BRL :Real brasileño +STR_GAME_OPTIONS_CURRENCY_EEK :Krooni estonio +STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituana +STR_GAME_OPTIONS_CURRENCY_KRW :Won surcoreano +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano STR_GAME_OPTIONS_CURRENCY_CUSTOM :Personalizada... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgiano (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial iraní (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nuevo rublo ruso (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicano (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nuevo dólar taiwanés (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chino (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dólar hongkonés (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupia india (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonesia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malasio (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgiano +STR_GAME_OPTIONS_CURRENCY_IRR :Rial iraní +STR_GAME_OPTIONS_CURRENCY_RUB :Nuevo rublo ruso +STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicano +STR_GAME_OPTIONS_CURRENCY_NTD :Nuevo dólar taiwanés +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi chino +STR_GAME_OPTIONS_CURRENCY_HKD :Dólar hongkonés +STR_GAME_OPTIONS_CURRENCY_INR :Rupia india +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonesia +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malasio STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Autoguardado STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Selección del intervalo entre guardados automáticos del juego @@ -1986,30 +1987,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperial (pies) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Métrico (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Localización -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Gráficos -STR_CONFIG_SETTING_SOUND :{ORANGE}Efectos de sonido -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfaz -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}General -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Ventanas de visualización -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construcción -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Noticias / Consejos -STR_CONFIG_SETTING_COMPANY :{ORANGE}Empresa -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Contabilidad -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehículos -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Leyes físicas -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Enrutamiento -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Limitaciones -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Desastres / Accidentes -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generación de mundo -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Ambiente -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoridades -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Municipios -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrias -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribución de carga -STR_CONFIG_SETTING_AI :{ORANGE}Competidores -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Jugadores del ordenador (IA) -STR_CONFIG_SETTING_NETWORK :{ORANGE}Red +STR_CONFIG_SETTING_LOCALISATION :Localización +STR_CONFIG_SETTING_GRAPHICS :Gráficos +STR_CONFIG_SETTING_SOUND :Efectos de sonido +STR_CONFIG_SETTING_INTERFACE :Interfaz +STR_CONFIG_SETTING_INTERFACE_GENERAL :General +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Ventanas de visualización +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construcción +STR_CONFIG_SETTING_ADVISORS :Noticias / Consejos +STR_CONFIG_SETTING_COMPANY :Empresa +STR_CONFIG_SETTING_ACCOUNTING :Contabilidad +STR_CONFIG_SETTING_VEHICLES :Vehículos +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Leyes físicas +STR_CONFIG_SETTING_VEHICLES_ROUTING :Enrutamiento +STR_CONFIG_SETTING_LIMITATIONS :Limitaciones +STR_CONFIG_SETTING_ACCIDENTS :Desastres / Accidentes +STR_CONFIG_SETTING_GENWORLD :Generación de mundo +STR_CONFIG_SETTING_ENVIRONMENT :Ambiente +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoridades +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Municipios +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrias +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribución de carga +STR_CONFIG_SETTING_AI :Competidores +STR_CONFIG_SETTING_AI_NPC :Jugadores del ordenador (IA) +STR_CONFIG_SETTING_NETWORK :Red STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Enrutador para trenes: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Enrutador a emplear en trenes @@ -4520,8 +4521,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Previsto STR_TIMETABLE_SCHEDULED :{BLACK}Programado STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Alterna entre fechas previstas y programadas -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Ll: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :S: # Date window (for timetable) diff --git a/src/lang/spanish_MX.txt b/src/lang/spanish_MX.txt index 27f02562bb..c72ba492f6 100644 --- a/src/lang/spanish_MX.txt +++ b/src/lang/spanish_MX.txt @@ -937,49 +937,50 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Opciones STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Divisa STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Elegir divisa + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Libra británica (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Dólar estadounidense (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen japonés (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Chelín austríaco (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Franco suizo (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Corona checa (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Marco alemán (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Corona danesa (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta española (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Marco finlandés (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franco francés (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Dracma griego (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Florín húngaro (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandesa (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Florín holandés (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Corona noruega (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polaco (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu rumano (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rublo ruso (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tólar esloveno (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Corona sueca (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca (TRY) +STR_GAME_OPTIONS_CURRENCY_GBP :Libra británica +STR_GAME_OPTIONS_CURRENCY_USD :Dólar estadounidense +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen japonés +STR_GAME_OPTIONS_CURRENCY_ATS :Chelín austríaco +STR_GAME_OPTIONS_CURRENCY_BEF :Franco belga +STR_GAME_OPTIONS_CURRENCY_CHF :Franco suizo +STR_GAME_OPTIONS_CURRENCY_CZK :Corona checa +STR_GAME_OPTIONS_CURRENCY_DEM :Marco alemán +STR_GAME_OPTIONS_CURRENCY_DKK :Corona danesa +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta española +STR_GAME_OPTIONS_CURRENCY_FIM :Marco finlandés +STR_GAME_OPTIONS_CURRENCY_FRF :Franco francés +STR_GAME_OPTIONS_CURRENCY_GRD :Dracma griego +STR_GAME_OPTIONS_CURRENCY_HUF :Florín húngaro +STR_GAME_OPTIONS_CURRENCY_ISK :Corona islandesa +STR_GAME_OPTIONS_CURRENCY_ITL :Lira italiana +STR_GAME_OPTIONS_CURRENCY_NLG :Florín holandés +STR_GAME_OPTIONS_CURRENCY_NOK :Corona noruega +STR_GAME_OPTIONS_CURRENCY_PLN :Zloty polaco +STR_GAME_OPTIONS_CURRENCY_RON :Leu rumano +STR_GAME_OPTIONS_CURRENCY_RUR :Rublo ruso +STR_GAME_OPTIONS_CURRENCY_SIT :Tólar esloveno +STR_GAME_OPTIONS_CURRENCY_SEK :Corona sueca +STR_GAME_OPTIONS_CURRENCY_TRY :Lira turca STR_GAME_OPTIONS_CURRENCY_SKK :Corona eslovaca (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real brasileño (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Corona estonia (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituana (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won surcoreano (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano (ZAR) +STR_GAME_OPTIONS_CURRENCY_BRL :Real brasileño +STR_GAME_OPTIONS_CURRENCY_EEK :Corona estonia +STR_GAME_OPTIONS_CURRENCY_LTL :Litas lituana +STR_GAME_OPTIONS_CURRENCY_KRW :Won surcoreano +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand sudafricano STR_GAME_OPTIONS_CURRENCY_CUSTOM :Personalizada... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgiano (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial iraní (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Nuevo rublo ruso (RUR) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicano (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Nuevo dólar taiwanés (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Yuan chino (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Dólar hongkonés (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupia india (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonesia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malasio (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari georgiano +STR_GAME_OPTIONS_CURRENCY_IRR :Rial iraní +STR_GAME_OPTIONS_CURRENCY_RUB :Nuevo rublo ruso +STR_GAME_OPTIONS_CURRENCY_MXN :Peso mexicano +STR_GAME_OPTIONS_CURRENCY_NTD :Nuevo dólar taiwanés +STR_GAME_OPTIONS_CURRENCY_CNY :Yuan chino +STR_GAME_OPTIONS_CURRENCY_HKD :Dólar hongkonés +STR_GAME_OPTIONS_CURRENCY_INR :Rupia india +STR_GAME_OPTIONS_CURRENCY_IDR :Rupia indonesia +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit malasio STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Guardado automático STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Elegir el intervalo de guardados automáticos @@ -1986,30 +1987,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperial (pies) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Métrico (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Adaptación local -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Gráficos -STR_CONFIG_SETTING_SOUND :{ORANGE}Sonido -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Interfaz -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}General -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Ventanas de vista -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Construcción -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Noticias y sugerencias -STR_CONFIG_SETTING_COMPANY :{ORANGE}Empresa -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Contabilidad -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Vehículos -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Leyes físicas -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Enrutamiento -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Restricciones -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Desastres y accidentes -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Generación de mapa -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Entorno -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Autoridades -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Localidades -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrias -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Distribución de carga -STR_CONFIG_SETTING_AI :{ORANGE}Competidores -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Jugadores no humanos -STR_CONFIG_SETTING_NETWORK :{ORANGE}Red +STR_CONFIG_SETTING_LOCALISATION :Adaptación local +STR_CONFIG_SETTING_GRAPHICS :Gráficos +STR_CONFIG_SETTING_SOUND :Sonido +STR_CONFIG_SETTING_INTERFACE :Interfaz +STR_CONFIG_SETTING_INTERFACE_GENERAL :General +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Ventanas de vista +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Construcción +STR_CONFIG_SETTING_ADVISORS :Noticias y sugerencias +STR_CONFIG_SETTING_COMPANY :Empresa +STR_CONFIG_SETTING_ACCOUNTING :Contabilidad +STR_CONFIG_SETTING_VEHICLES :Vehículos +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Leyes físicas +STR_CONFIG_SETTING_VEHICLES_ROUTING :Enrutamiento +STR_CONFIG_SETTING_LIMITATIONS :Restricciones +STR_CONFIG_SETTING_ACCIDENTS :Desastres y accidentes +STR_CONFIG_SETTING_GENWORLD :Generación de mapa +STR_CONFIG_SETTING_ENVIRONMENT :Entorno +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Autoridades +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Localidades +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrias +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Distribución de carga +STR_CONFIG_SETTING_AI :Competidores +STR_CONFIG_SETTING_AI_NPC :Jugadores no humanos +STR_CONFIG_SETTING_NETWORK :Red STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Algoritmo de rutas para trenes: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Algoritmo de búsqueda de rutas para trenes @@ -4521,8 +4522,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Esperado STR_TIMETABLE_SCHEDULED :{BLACK}Programado STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Cambiar entre esperado y programado -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Lleg: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Sal: # Date window (for timetable) diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 6ada48888f..8254e4621f 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -195,6 +195,7 @@ STR_UNITS_VELOCITY_IMPERIAL :{DECIMAL}{NBSP} STR_UNITS_VELOCITY_METRIC :{DECIMAL}{NBSP}km/h STR_UNITS_VELOCITY_SI :{DECIMAL}{NBSP}m/s STR_UNITS_VELOCITY_GAMEUNITS :{DECIMAL}{NBSP}rutor/dag +STR_UNITS_VELOCITY_KNOTS :{DECIMAL}{NBSP}knop STR_UNITS_POWER_IMPERIAL :{DECIMAL}{NBSP}hk STR_UNITS_POWER_METRIC :{DECIMAL}{NBSP}hk @@ -930,55 +931,68 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT :{BLACK}Kopiera # Game options window STR_GAME_OPTIONS_CAPTION :{WHITE}Spelinställningar +STR_GAME_OPTIONS_TAB_GENERAL :Allmänt +STR_GAME_OPTIONS_TAB_GRAPHICS :Grafik +STR_GAME_OPTIONS_TAB_SOUND :Ljud +STR_GAME_OPTIONS_TAB_SOUND_TT :{BLACK}Väljd ljud- och musikinställningar +STR_GAME_OPTIONS_VOLUME :Volym +STR_GAME_OPTIONS_SFX_VOLUME :Ljudeffekter +STR_GAME_OPTIONS_MUSIC_VOLUME :Musik +STR_GAME_OPTIONS_VOLUME_0 :0% +STR_GAME_OPTIONS_VOLUME_25 :25% +STR_GAME_OPTIONS_VOLUME_50 :50% +STR_GAME_OPTIONS_VOLUME_75 :75% +STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valutaenheter STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Välj valutaenhet + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Brittiskt pund (£) -STR_GAME_OPTIONS_CURRENCY_USD :Amerikansk dollar (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Japansk yen (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Österrikisk shilling (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belgisk franc (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Schweizisk franc (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Tjeckisk krona (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :D-mark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Dansk krona (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Spansk peseta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Finsk mark (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Fransk franc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Grekisk drachme (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Ungersk forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Isländsk krona (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Italiensk lira (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Nederländsk gulden (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norsk krona (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polsk złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Rumänsk leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rysk rubel (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovensk tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Svensk krona (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Turkisk lira (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovakisk krona (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliansk real (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estnisk krona (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litauisk litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Sydkoreansk won (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Sydafrikansk rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Brittiskt pund +STR_GAME_OPTIONS_CURRENCY_USD :Amerikansk dollar +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Japansk yen +STR_GAME_OPTIONS_CURRENCY_ATS :Österrikisk shilling +STR_GAME_OPTIONS_CURRENCY_BEF :Belgisk franc +STR_GAME_OPTIONS_CURRENCY_CHF :Schweizisk franc +STR_GAME_OPTIONS_CURRENCY_CZK :Tjeckisk krona +STR_GAME_OPTIONS_CURRENCY_DEM :D-mark +STR_GAME_OPTIONS_CURRENCY_DKK :Dansk krona +STR_GAME_OPTIONS_CURRENCY_ESP :Spansk peseta +STR_GAME_OPTIONS_CURRENCY_FIM :Finsk mark +STR_GAME_OPTIONS_CURRENCY_FRF :Fransk franc +STR_GAME_OPTIONS_CURRENCY_GRD :Grekisk drachme +STR_GAME_OPTIONS_CURRENCY_HUF :Ungersk forint +STR_GAME_OPTIONS_CURRENCY_ISK :Isländsk krona +STR_GAME_OPTIONS_CURRENCY_ITL :Italiensk lira +STR_GAME_OPTIONS_CURRENCY_NLG :Nederländsk gulden +STR_GAME_OPTIONS_CURRENCY_NOK :Norsk krona +STR_GAME_OPTIONS_CURRENCY_PLN :Polsk złoty +STR_GAME_OPTIONS_CURRENCY_RON :Rumänsk leu +STR_GAME_OPTIONS_CURRENCY_RUR :Rysk rubel +STR_GAME_OPTIONS_CURRENCY_SIT :Slovensk tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Svensk krona +STR_GAME_OPTIONS_CURRENCY_TRY :Turkisk lira +STR_GAME_OPTIONS_CURRENCY_SKK :Slovakisk krona +STR_GAME_OPTIONS_CURRENCY_BRL :Brasiliansk real +STR_GAME_OPTIONS_CURRENCY_EEK :Estnisk krona +STR_GAME_OPTIONS_CURRENCY_LTL :Litauisk litas +STR_GAME_OPTIONS_CURRENCY_KRW :Sydkoreansk won +STR_GAME_OPTIONS_CURRENCY_ZAR :Sydafrikansk rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :Egen... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgisk lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iransk rial (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Ny rysk rubel (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Mexikansk peso (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Ny taiwanesisk dollar (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Kinesisk renminbi (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongdollar (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Indisk rupie (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Indonesisk rupie (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malaysisk ringgit (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgisk lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iransk rial +STR_GAME_OPTIONS_CURRENCY_RUB :Ny rysk rubel +STR_GAME_OPTIONS_CURRENCY_MXN :Mexikansk peso +STR_GAME_OPTIONS_CURRENCY_NTD :Ny taiwanesisk dollar +STR_GAME_OPTIONS_CURRENCY_CNY :Kinesisk renminbi +STR_GAME_OPTIONS_CURRENCY_HKD :Hongkongdollar +STR_GAME_OPTIONS_CURRENCY_INR :Indisk rupie +STR_GAME_OPTIONS_CURRENCY_IDR :Indonesisk rupie +STR_GAME_OPTIONS_CURRENCY_MYR :Malaysisk ringgit STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Spara automatiskt STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Välj intervall mellan automatiskt sparande @@ -986,6 +1000,10 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Välj in # Autosave dropdown ###length 5 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF :Avstängd +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_10_MINUTES :Var 10:e minut +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_30_MINUTES :Var 30:e minut +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_60_MINUTES :Var 60:e minut +STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_120_MINUTES :Var 120:e minut STR_GAME_OPTIONS_LANGUAGE :{BLACK}Språk STR_GAME_OPTIONS_LANGUAGE_TOOLTIP :{BLACK}Välj vilket språk som ska användas @@ -1022,6 +1040,12 @@ STR_GAME_OPTIONS_GUI_SCALE_3X :3x STR_GAME_OPTIONS_GUI_SCALE_4X :4x STR_GAME_OPTIONS_GUI_SCALE_5X :5x +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_FRAME :{BLACK}Automatisk undersökning +STR_GAME_OPTIONS_PARTICIPATE_SURVEY :{BLACK}Delta i en automatisk undersökning +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_TOOLTIP :{BLACK}Om aktiverat, kommer OpenTTD att skicka en enkät när du lämnar ett spel +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK :{BLACK}Om undersökning och integritet +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_LINK_TOOLTIP :{BLACK}Detta öppnar en länk i webbläsaren med mer information om den automatiska undersökningen. +STR_GAME_OPTIONS_PARTICIPATE_SURVEY_PREVIEW :{BLACK}Förhandsgranska enkätresultat STR_GAME_OPTIONS_GRAPHICS :{BLACK}Grafik @@ -1917,6 +1941,10 @@ STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED :Inga STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :Initial stadsstorleks-multiplikator: {STRING} STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER_HELPTEXT :Storstäders genomsnittliga storlek i relation till vanliga städers vid spelets början +STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL :Uppdatera distributionsdiagram var {STRING}{NBSP}sekund{P 0:2 "" s} +STR_CONFIG_SETTING_LINKGRAPH_RECALC_INTERVAL_HELPTEXT :Tid mellan efterföljande omräkningar av länkgrafen. Varje omräkning beräknar planerna för en komponent i grafen. Det betyder att ett värde X för den här inställningen inte betyder att hela grafen kommer att uppdateras var X:e sekund. Bara viss komponent kommer att göra det. Ju kortare du ställer in den desto mer CPU-tid kommer att behövas för att beräkna den. Ju längre du ställer in den desto längre tid tar det tills lastdistributionen startar på nya rutter. +STR_CONFIG_SETTING_LINKGRAPH_RECALC_TIME :Ta {STRING}{NBSP}sekund{P 0:2 "" s} för omräkning av distributionsdiagrammet +STR_CONFIG_SETTING_LINKGRAPH_RECALC_TIME_HELPTEXT :Tid som det tar för varje omräkning av en länkdiagramkomponent. När en omräkning startas skapas en tråd som tillåts köra i detta antal sekunder. Ju kortare du ställer in detta desto mer sannolikt är det att tråden inte är färdig när den ska. Sedan stannar spelet tills det är ("lag"). Ju längre du ställer in den desto längre tid tar det för distributionen att uppdateras när rutter ändras. STR_CONFIG_SETTING_DISTRIBUTION_PAX :Distributionssätt för passagerare: {STRING} STR_CONFIG_SETTING_DISTRIBUTION_PAX_HELPTEXT :"Symmetriskt" innebär att ungefär samma antal passagerare färdas från station A till station B som från B till A. "Asymmetriskt" innebär att en godtycklig mängd passagerare kan färdas i vardera riktningen. "Manuellt" innebär att ingen automatisk distribution av passagerare sker. @@ -1943,12 +1971,14 @@ STR_CONFIG_SETTING_SHORT_PATH_SATURATION :Belastning av k STR_CONFIG_SETTING_SHORT_PATH_SATURATION_HELPTEXT :Ofta finns det flera rutter mellan två givna stationer. Godsdistributionen kommer att fylla upp den första rutten först och därefter den näst kortaste tills den är mättad osv. Mättnadsgraden bestäms utifrån en uppskattning av kapaciteten och planerad användning. När godsdristributionen har belastat samtliga rutter, och om det finns kvarvarande behov, då kommer samtliga rutter att överbelastas med preferens för rutterna med högst kapacitet. Uppskattningen av kapaciteten kommer oftast inte ske med hög noggrannhet. Denna inställning tillåter dig att ställa in hur många procent som en kort rutt ska belastas innan algoritmen ska välja nästa längre rutt. Sätt värdet till under 100 % om du vill undvika överfulla stationer i händelse av överskattad kapacitet. STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY :Hastighetsenhet: {STRING} +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_NAUTICAL :Hastighetsenheter (nautical): {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_HELPTEXT :Närhelst en hastighet visas i användargränssnittet, visa den i den valda enheten ###length 5 STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_IMPERIAL :Brittisk (mph) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_METRIC :Metrisk (km/h) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_SI :SI (m/s) STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_GAMEUNITS :Spel enheter (rutor/dag) +STR_CONFIG_SETTING_LOCALISATION_UNITS_VELOCITY_KNOTS :Knop STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER :Enhet för fordons motoreffekt: {STRING} STR_CONFIG_SETTING_LOCALISATION_UNITS_POWER_HELPTEXT :Närhelst ett fordons motoreffekt visas i användargränssnittet, visa den i den valda enheten @@ -1985,30 +2015,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Brittisk (ft) 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_GRAPHICS :{ORANGE}Grafik -STR_CONFIG_SETTING_SOUND :{ORANGE}Ljud -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Gränssnitt -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Generellt -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Vyfönster -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Konstruktion -STR_CONFIG_SETTING_ADVISORS :{ORANGE} Nyheter / Rådgivare -STR_CONFIG_SETTING_COMPANY :{ORANGE}Företag -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE} Redovisning -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Fordon -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE} Fysik -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Planering av resrutt -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE} Begränsningar -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE} Katastrofer / Olyckor -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Världsgenerering -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Miljö -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Mydigheter -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Städer -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Industrier -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Godsdistribution -STR_CONFIG_SETTING_AI :{ORANGE}Motståndare -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Datorspelare -STR_CONFIG_SETTING_NETWORK :{ORANGE}Nätverk +STR_CONFIG_SETTING_LOCALISATION :Lokalisering +STR_CONFIG_SETTING_GRAPHICS :Grafik +STR_CONFIG_SETTING_SOUND :Ljud +STR_CONFIG_SETTING_INTERFACE :Gränssnitt +STR_CONFIG_SETTING_INTERFACE_GENERAL :Generellt +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Vyfönster +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Konstruktion +STR_CONFIG_SETTING_ADVISORS : Nyheter / Rådgivare +STR_CONFIG_SETTING_COMPANY :Företag +STR_CONFIG_SETTING_ACCOUNTING : Redovisning +STR_CONFIG_SETTING_VEHICLES :Fordon +STR_CONFIG_SETTING_VEHICLES_PHYSICS : Fysik +STR_CONFIG_SETTING_VEHICLES_ROUTING :Planering av resrutt +STR_CONFIG_SETTING_LIMITATIONS : Begränsningar +STR_CONFIG_SETTING_ACCIDENTS : Katastrofer / Olyckor +STR_CONFIG_SETTING_GENWORLD :Världsgenerering +STR_CONFIG_SETTING_ENVIRONMENT :Miljö +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Mydigheter +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Städer +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Industrier +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Godsdistribution +STR_CONFIG_SETTING_AI :Motståndare +STR_CONFIG_SETTING_AI_NPC :Datorspelare +STR_CONFIG_SETTING_NETWORK :Nätverk STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Vägfinnare för tåg: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Vägfinnare som tåg ska använda @@ -2047,6 +2077,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Allokera # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Fel med video inställningarna... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... Inget kompatibelt grafikkort hittat. Hårdvaruacceleration inaktiverad +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... GPU-drivrutinen kraschade spelet. Maskinvaruacceleration inaktiverad # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -2377,6 +2408,12 @@ STR_NETWORK_ASK_RELAY_NO :{BLACK}Nej STR_NETWORK_ASK_RELAY_YES_ONCE :{BLACK}Ja, den här gången STR_NETWORK_ASK_RELAY_YES_ALWAYS :{BLACK}Ja, fråga inte igen +STR_NETWORK_ASK_SURVEY_CAPTION :Delta i automatiserad undersökning? +STR_NETWORK_ASK_SURVEY_TEXT :Vill du delta i den automatiska undersökningen?{}OpenTTD kommer att skicka en undersökning när du lämnar ett spel.{}Du kan ändra detta när som helst under "Spelalternativ". +STR_NETWORK_ASK_SURVEY_PREVIEW :Förhandsgranska enkätresultat +STR_NETWORK_ASK_SURVEY_LINK :Om undersökning och integritet +STR_NETWORK_ASK_SURVEY_NO :Nej +STR_NETWORK_ASK_SURVEY_YES :Ja STR_NETWORK_SPECTATORS :Åskådare @@ -2668,7 +2705,10 @@ STR_STATION_BUILD_STATION_CLASS_TOOLTIP :{BLACK}Välj vi STR_STATION_BUILD_STATION_TYPE_TOOLTIP :{BLACK}Välj stationstyp att bygga STR_STATION_CLASS_DFLT :Grundinställd station +STR_STATION_CLASS_DFLT_STATION :Standardstation +STR_STATION_CLASS_DFLT_ROADSTOP :Standardvägstopp STR_STATION_CLASS_WAYP :Riktmärken +STR_STATION_CLASS_WAYP_WAYPOINT :Standard vägpunkt # Signal window STR_BUILD_SIGNAL_CAPTION :{WHITE}Signalval @@ -3717,6 +3757,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Detaljer STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Visa detaljerat antal infrastruktur-element STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Ge pengar STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Ge pengar till detta företaget +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Fientligt övertagande +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Gör ett fientligt övertagande av det här företaget STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Nytt ansikte STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Välj nytt ansikte på VD:n @@ -3732,6 +3774,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Namn på VD STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Ange hur mycket pengar du vill ge STR_BUY_COMPANY_MESSAGE :{WHITE}Vi letar efter någon som vill köpa och ta över vårt företag{}{}Vill du köpa {COMPANY} för {CURRENCY_LONG}? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE} vid ett fientligt övertagande av {COMPANY} kommer du att köpa alla tillgångar, betala av alla lån och betala två års vinst.{}{}Den totala summan uppskattas till {CURRENCY_LONG}.{}{}Vill du fortsätta denna fientliga övertagningen? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}Infrastruktur för {COMPANY} @@ -3804,6 +3847,7 @@ STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Skicka i STR_VEHICLE_LIST_REPLACE_VEHICLES :Byt ut fordon STR_VEHICLE_LIST_SEND_FOR_SERVICING :Skicka på service STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Vinst detta år: {CURRENCY_LONG} (förra året: {CURRENCY_LONG}) +STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT :Skicka till depå STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT :Skicka till depå @@ -4523,8 +4567,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Förvän STR_TIMETABLE_SCHEDULED :{BLACK}Schemalagt STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Ändra mellan förväntat och schemalagt -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) @@ -4568,7 +4610,9 @@ STR_AI_CONFIG_AILIST_TOOLTIP :{BLACK}Datorspe STR_AI_CONFIG_HUMAN_PLAYER :Mänsklig spelare STR_AI_CONFIG_RANDOM_AI :Slumpa datorspelare STR_AI_CONFIG_NONE :(inget) +STR_AI_CONFIG_NAME_VERSION :{STRING} {YELLOW}v{NUM} STR_AI_CONFIG_MAX_COMPETITORS :{LTBLUE}Max antal motståndare: {ORANGE}{COMMA} +STR_AI_CONFIG_COMPETITORS_INTERVAL :{LTBLUE}Intervall mellan start av tävlande: {ORANGE}{COMMA} minut{P "" s} STR_AI_CONFIG_MOVE_UP :{BLACK}Flytta upp STR_AI_CONFIG_MOVE_UP_TOOLTIP :{BLACK}Flytta upp vald datorspelare i listan @@ -4627,6 +4671,7 @@ STR_TEXTFILE_VIEW_LICENCE :{BLACK}Licens STR_TEXTFILE_README_CAPTION :{WHITE} {STRING}-manual för {STRING} STR_TEXTFILE_CHANGELOG_CAPTION :{WHITE}Ändringshistorik för {STRING} {STRING} STR_TEXTFILE_LICENCE_CAPTION :{WHITE}Licens för {STRING}{STRING} +STR_TEXTFILE_SURVEY_RESULT_CAPTION :{WHITE}Förhandsgranskning av enkätresultat. # Vehicle loading indicators @@ -5083,6 +5128,7 @@ STR_ERROR_NO_BUOY :{WHITE}Det finn STR_ERROR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Kan inte lägga till fordonet i en tidtabell... STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Fordon kan enbart vänta vid stationer STR_ERROR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Detta fordon stannar inte vid denna station +STR_ERROR_TIMETABLE_INCOMPLETE :{WHITE}... tidtabellen är ofullständig # Sign related errors STR_ERROR_TOO_MANY_SIGNS :{WHITE}... för många skyltar @@ -5562,17 +5608,21 @@ STR_VEHICLE_NAME :{VEHICLE} STR_WAYPOINT_NAME :{WAYPOINT} STR_JUST_CARGO :{CARGO_LONG} +STR_JUST_RIGHT_ARROW :{RIGHT_ARROW} STR_JUST_CHECKMARK :{CHECKMARK} STR_JUST_COMMA :{COMMA} STR_JUST_CURRENCY_SHORT :{CURRENCY_SHORT} STR_JUST_CURRENCY_LONG :{CURRENCY_LONG} STR_JUST_CARGO_LIST :{CARGO_LIST} +STR_JUST_DECIMAL :{DECIMAL} STR_JUST_INT :{NUM} STR_JUST_DATE_TINY :{DATE_TINY} 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} diff --git a/src/lang/tamil.txt b/src/lang/tamil.txt index 9f368f734d..0b2b615438 100644 --- a/src/lang/tamil.txt +++ b/src/lang/tamil.txt @@ -896,49 +896,50 @@ 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 :பிரித்தானிய பவுண்டு (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :அமெரிக்கன் டாலர் (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :யுரோ (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :ஜப்பானிய என் (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :ஆஸ்திரிய சில்லிங் (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :பெல்கிய ப்ரேங்க் (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :சுவிஸ் ப்ரேங்க் (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :செக் கொருணா (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :டச்மார்க் (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :டேனிஷ் க்ரோன் (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :ஸ்பானிஷ் பெசெடா (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :பின்னிஷ் மார்க்கா (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :பிரெஞ்ச் ப்ரேங்க் (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :கிரேக்க ட்ரச்மா (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :ஹங்கேரிய போரின்ட் (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :ஐஸ்லாந்திய க்ரோனா (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :இத்தாலிய லிரா (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :டச்சு கில்டர் (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :நோர்வேஜிய க்ரோன் (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :போலிஷ் சிலாட்டி Złoty (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :ரோமானிய லூ (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :ரஷ்ய ரூபில்ஸ் (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :ஸ்லோவேனிய டொலர் (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :ஸ்வீடிஷ் க்ரோனா (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :துருக்கிய லிரா (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :சுலோவக் கொருணா (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :பிரேசிலிய ரியால் (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :எஸ்டோனிய க்ரூனி (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :லிதுவேனிய லிடாஸ் (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :தென்கொரிய வொன் (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :தென் ஆப்பிரிக்க ரான்ட் (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :பிரித்தானிய பவுண்டு +STR_GAME_OPTIONS_CURRENCY_USD :அமெரிக்கன் டாலர் +STR_GAME_OPTIONS_CURRENCY_EUR :யுரோ +STR_GAME_OPTIONS_CURRENCY_JPY :ஜப்பானிய என் +STR_GAME_OPTIONS_CURRENCY_ATS :ஆஸ்திரிய சில்லிங் +STR_GAME_OPTIONS_CURRENCY_BEF :பெல்கிய ப்ரேங்க் +STR_GAME_OPTIONS_CURRENCY_CHF :சுவிஸ் ப்ரேங்க் +STR_GAME_OPTIONS_CURRENCY_CZK :செக் கொருணா +STR_GAME_OPTIONS_CURRENCY_DEM :டச்மார்க் +STR_GAME_OPTIONS_CURRENCY_DKK :டேனிஷ் க்ரோன் +STR_GAME_OPTIONS_CURRENCY_ESP :ஸ்பானிஷ் பெசெடா +STR_GAME_OPTIONS_CURRENCY_FIM :பின்னிஷ் மார்க்கா +STR_GAME_OPTIONS_CURRENCY_FRF :பிரெஞ்ச் ப்ரேங்க் +STR_GAME_OPTIONS_CURRENCY_GRD :கிரேக்க ட்ரச்மா +STR_GAME_OPTIONS_CURRENCY_HUF :ஹங்கேரிய போரின்ட் +STR_GAME_OPTIONS_CURRENCY_ISK :ஐஸ்லாந்திய க்ரோனா +STR_GAME_OPTIONS_CURRENCY_ITL :இத்தாலிய லிரா +STR_GAME_OPTIONS_CURRENCY_NLG :டச்சு கில்டர் +STR_GAME_OPTIONS_CURRENCY_NOK :நோர்வேஜிய க்ரோன் +STR_GAME_OPTIONS_CURRENCY_PLN :போலிஷ் சிலாட்டி Złoty +STR_GAME_OPTIONS_CURRENCY_RON :ரோமானிய லூ +STR_GAME_OPTIONS_CURRENCY_RUR :ரஷ்ய ரூபில்ஸ் +STR_GAME_OPTIONS_CURRENCY_SIT :ஸ்லோவேனிய டொலர் +STR_GAME_OPTIONS_CURRENCY_SEK :ஸ்வீடிஷ் க்ரோனா +STR_GAME_OPTIONS_CURRENCY_TRY :துருக்கிய லிரா +STR_GAME_OPTIONS_CURRENCY_SKK :சுலோவக் கொருணா +STR_GAME_OPTIONS_CURRENCY_BRL :பிரேசிலிய ரியால் +STR_GAME_OPTIONS_CURRENCY_EEK :எஸ்டோனிய க்ரூனி +STR_GAME_OPTIONS_CURRENCY_LTL :லிதுவேனிய லிடாஸ் +STR_GAME_OPTIONS_CURRENCY_KRW :தென்கொரிய வொன் +STR_GAME_OPTIONS_CURRENCY_ZAR :தென் ஆப்பிரிக்க ரான்ட் STR_GAME_OPTIONS_CURRENCY_CUSTOM :புதிதாக... -STR_GAME_OPTIONS_CURRENCY_GEL :ஜார்ஜிய லாரி (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :ஈரானிய ரியால் (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :புதிய ரஷ்ய ரூபிள் (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :மெக்சிகன் பெசோ (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :புதிய தைவான் டாலர் (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :சீன ரென்மின்பி (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :ஹாங்காங் டாலர் (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :இந்திய ரூபாய் (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :இந்தோனேசிய ரூபியா (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :மலேசிய ரிங்கிட்டு (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :ஜார்ஜிய லாரி +STR_GAME_OPTIONS_CURRENCY_IRR :ஈரானிய ரியால் +STR_GAME_OPTIONS_CURRENCY_RUB :புதிய ரஷ்ய ரூபிள் +STR_GAME_OPTIONS_CURRENCY_MXN :மெக்சிகன் பெசோ +STR_GAME_OPTIONS_CURRENCY_NTD :புதிய தைவான் டாலர் +STR_GAME_OPTIONS_CURRENCY_CNY :சீன ரென்மின்பி +STR_GAME_OPTIONS_CURRENCY_HKD :ஹாங்காங் டாலர் +STR_GAME_OPTIONS_CURRENCY_INR :இந்திய ரூபாய் +STR_GAME_OPTIONS_CURRENCY_IDR :இந்தோனேசிய ரூபியா +STR_GAME_OPTIONS_CURRENCY_MYR :மலேசிய ரிங்கிட்டு STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}தானாக சேமி STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}தானியங்கி விளையாட்டு சேமிப்பு இடைவெளியைத் தேர்ந்தெடுக்கவும் @@ -1774,28 +1775,28 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :இம்பீ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :மெட்ரிக் (மீ) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :அனைத்துலக முறை அலகு (மீ) -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}அசைவூட்டம் -STR_CONFIG_SETTING_SOUND :{ORANGE}ஒலிகள் -STR_CONFIG_SETTING_INTERFACE :{ORANGE}இடைமுகம் -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE} பொதுவான -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}கட்டுமானம் -STR_CONFIG_SETTING_ADVISORS :{ORANGE}செய்திகள் / அறிவுரைஞர்கள் -STR_CONFIG_SETTING_COMPANY :{ORANGE}நிறுவனம் -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}கணக்கியல் -STR_CONFIG_SETTING_VEHICLES :{ORANGE}வாகனங்கள் -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}இயற்பியல் -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}வழி மாற்றல் -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}எல்லைகள் -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}பேரழிவுகள் / விபத்துகள் -STR_CONFIG_SETTING_GENWORLD :{ORANGE}உலகம் உருவாக்குதல் -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}சுற்றுச்சூழல் -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}அதிகாரிகள் -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}நகரங்கள் -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}தொழிற்சாலைகள் -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}சரக்கு பரிமாற்றம் -STR_CONFIG_SETTING_AI :{ORANGE}போட்டியாளர்கள் -STR_CONFIG_SETTING_AI_NPC :{ORANGE}கணினி வீரர்கள் -STR_CONFIG_SETTING_NETWORK :{ORANGE}இணையம் +STR_CONFIG_SETTING_GRAPHICS :அசைவூட்டம் +STR_CONFIG_SETTING_SOUND :ஒலிகள் +STR_CONFIG_SETTING_INTERFACE :இடைமுகம் +STR_CONFIG_SETTING_INTERFACE_GENERAL : பொதுவான +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :கட்டுமானம் +STR_CONFIG_SETTING_ADVISORS :செய்திகள் / அறிவுரைஞர்கள் +STR_CONFIG_SETTING_COMPANY :நிறுவனம் +STR_CONFIG_SETTING_ACCOUNTING :கணக்கியல் +STR_CONFIG_SETTING_VEHICLES :வாகனங்கள் +STR_CONFIG_SETTING_VEHICLES_PHYSICS :இயற்பியல் +STR_CONFIG_SETTING_VEHICLES_ROUTING :வழி மாற்றல் +STR_CONFIG_SETTING_LIMITATIONS :எல்லைகள் +STR_CONFIG_SETTING_ACCIDENTS :பேரழிவுகள் / விபத்துகள் +STR_CONFIG_SETTING_GENWORLD :உலகம் உருவாக்குதல் +STR_CONFIG_SETTING_ENVIRONMENT :சுற்றுச்சூழல் +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :அதிகாரிகள் +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :நகரங்கள் +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :தொழிற்சாலைகள் +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :சரக்கு பரிமாற்றம் +STR_CONFIG_SETTING_AI :போட்டியாளர்கள் +STR_CONFIG_SETTING_AI_NPC :கணினி வீரர்கள் +STR_CONFIG_SETTING_NETWORK :இணையம் STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :இரயில்களுக்கான வழிகண்டுபிடிப்பான்: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :இரயில்கள் பயன்படுத்தப்போகும் வழிகண்டுபிடிப்பான் @@ -4037,8 +4038,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}எத STR_TIMETABLE_SCHEDULED :{BLACK}அட்டவணையிடப்பட்ட STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}எதிர்பார்க்கப்பட்ட மற்றும் அட்டவணையிடப்பட்ட ஆகிவற்றிற்குள் இடைமாற்றவும் -STR_TIMETABLE_ARRIVAL_ABBREVIATION :A: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :D: # Date window (for timetable) diff --git a/src/lang/thai.txt b/src/lang/thai.txt index b190ad63cd..721b9311a4 100644 --- a/src/lang/thai.txt +++ b/src/lang/thai.txt @@ -907,43 +907,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_USD :ดอลลาร์สหรัฐ ($) +STR_GAME_OPTIONS_CURRENCY_GBP :ปอนด์สเตอร์ลิง +STR_GAME_OPTIONS_CURRENCY_USD :ดอลลาร์สหรัฐ STR_GAME_OPTIONS_CURRENCY_EUR :ยูโร -STR_GAME_OPTIONS_CURRENCY_JPY :เยน (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :ชิลลิ่งออสเตรีย (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :ฟรังก์เบลเยี่ยม (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :ฟรังก์สวิส (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :โครูนาเช็ค (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :ดอยช์มาร์ค (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :โครนเดนมาร์ค (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :เพเซต้า (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :มาร์คคา ฟินแลนด์ (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :ฟรังก์ฝรั่งเศส(FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :ดรากช์มา กรีซ (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :ฟอรินท์ ฮังการี (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :โครนา ไอซแลนด์ (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :ลิรา อิตาลี (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :กิลเดอร์ ดัชต์ (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :โครน นอร์เวย์ (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :ซโลตี โปแลนด์ (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :ลิว โรมาเนีย (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :รูเบิ้ลส์ รัสเซีย (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :โทลาร์ สโลวีเนีย (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :โครนา สวีเดน (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :ลิรา ตุรกี (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :โครูนา สโลวาเกีย (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :เรียล บราซิล (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :ครูนิ เอสโทเนีย (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :วอน เกาหลีใต้ (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :South African Rand (ZAR) +STR_GAME_OPTIONS_CURRENCY_JPY :เยน +STR_GAME_OPTIONS_CURRENCY_ATS :ชิลลิ่งออสเตรีย +STR_GAME_OPTIONS_CURRENCY_BEF :ฟรังก์เบลเยี่ยม +STR_GAME_OPTIONS_CURRENCY_CHF :ฟรังก์สวิส +STR_GAME_OPTIONS_CURRENCY_CZK :โครูนาเช็ค +STR_GAME_OPTIONS_CURRENCY_DEM :ดอยช์มาร์ค +STR_GAME_OPTIONS_CURRENCY_DKK :โครนเดนมาร์ค +STR_GAME_OPTIONS_CURRENCY_ESP :เพเซต้า +STR_GAME_OPTIONS_CURRENCY_FIM :มาร์คคา ฟินแลนด์ +STR_GAME_OPTIONS_CURRENCY_FRF :ฟรังก์ฝรั่งเศส +STR_GAME_OPTIONS_CURRENCY_GRD :ดรากช์มา กรีซ +STR_GAME_OPTIONS_CURRENCY_HUF :ฟอรินท์ ฮังการี +STR_GAME_OPTIONS_CURRENCY_ISK :โครนา ไอซแลนด์ +STR_GAME_OPTIONS_CURRENCY_ITL :ลิรา อิตาลี +STR_GAME_OPTIONS_CURRENCY_NLG :กิลเดอร์ ดัชต์ +STR_GAME_OPTIONS_CURRENCY_NOK :โครน นอร์เวย์ +STR_GAME_OPTIONS_CURRENCY_PLN :ซโลตี โปแลนด์ +STR_GAME_OPTIONS_CURRENCY_RON :ลิว โรมาเนีย +STR_GAME_OPTIONS_CURRENCY_RUR :รูเบิ้ลส์ รัสเซีย +STR_GAME_OPTIONS_CURRENCY_SIT :โทลาร์ สโลวีเนีย +STR_GAME_OPTIONS_CURRENCY_SEK :โครนา สวีเดน +STR_GAME_OPTIONS_CURRENCY_TRY :ลิรา ตุรกี +STR_GAME_OPTIONS_CURRENCY_SKK :โครูนา สโลวาเกีย +STR_GAME_OPTIONS_CURRENCY_BRL :เรียล บราซิล +STR_GAME_OPTIONS_CURRENCY_EEK :ครูนิ เอสโทเนีย +STR_GAME_OPTIONS_CURRENCY_LTL :Lithuanian Litas +STR_GAME_OPTIONS_CURRENCY_KRW :วอน เกาหลีใต้ +STR_GAME_OPTIONS_CURRENCY_ZAR :South African Rand STR_GAME_OPTIONS_CURRENCY_CUSTOM :ระบุเอง... -STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Iranian Rial (IRR) -STR_GAME_OPTIONS_CURRENCY_HKD :ดอลลาร์ฮ่องกง (HKD) -STR_GAME_OPTIONS_CURRENCY_MYR :ริงกิตมาเลเซีย (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Georgian Lari +STR_GAME_OPTIONS_CURRENCY_IRR :Iranian Rial +STR_GAME_OPTIONS_CURRENCY_HKD :ดอลลาร์ฮ่องกง +STR_GAME_OPTIONS_CURRENCY_MYR :ริงกิตมาเลเซีย STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}บันทึกเกมอัตโนมัติ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}เลือกระยะห่างระหว่างการบันทึกเกมอัตโนมัติแต่ละครั้ง @@ -1853,23 +1854,23 @@ 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_GRAPHICS :{ORANGE}กราฟิก -STR_CONFIG_SETTING_SOUND :{ORANGE}เสียงเอฟเฟกต์ -STR_CONFIG_SETTING_INTERFACE :{ORANGE}ส่วนเชื่อมต่อผู้ใช้ -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}การก่อสร้าง -STR_CONFIG_SETTING_ADVISORS :{ORANGE}ข่าวสาร / ที่ปรึกษา -STR_CONFIG_SETTING_VEHICLES :{ORANGE}ยานพาหนะ -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}กายภาพ -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}การค้นหาเส้นทางของพาหนะ -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}ภัยพิบัติ / อุบัติเหตุ -STR_CONFIG_SETTING_GENWORLD :{ORANGE}การสร้างภูมิประเทศ -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}สิ่งแวดล้อม -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}เมือง -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}อุตสาหกรรม -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}การกระจายสินค้า -STR_CONFIG_SETTING_AI :{ORANGE}คู่แข่ง -STR_CONFIG_SETTING_AI_NPC :{ORANGE}ผู้เล่นคอมพิวเตอร์ +STR_CONFIG_SETTING_LOCALISATION :มาตราวัดต่างๆ +STR_CONFIG_SETTING_GRAPHICS :กราฟิก +STR_CONFIG_SETTING_SOUND :เสียงเอฟเฟกต์ +STR_CONFIG_SETTING_INTERFACE :ส่วนเชื่อมต่อผู้ใช้ +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :การก่อสร้าง +STR_CONFIG_SETTING_ADVISORS :ข่าวสาร / ที่ปรึกษา +STR_CONFIG_SETTING_VEHICLES :ยานพาหนะ +STR_CONFIG_SETTING_VEHICLES_PHYSICS :กายภาพ +STR_CONFIG_SETTING_VEHICLES_ROUTING :การค้นหาเส้นทางของพาหนะ +STR_CONFIG_SETTING_ACCIDENTS :ภัยพิบัติ / อุบัติเหตุ +STR_CONFIG_SETTING_GENWORLD :การสร้างภูมิประเทศ +STR_CONFIG_SETTING_ENVIRONMENT :สิ่งแวดล้อม +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :เมือง +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :อุตสาหกรรม +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :การกระจายสินค้า +STR_CONFIG_SETTING_AI :คู่แข่ง +STR_CONFIG_SETTING_AI_NPC :ผู้เล่นคอมพิวเตอร์ STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :ตัวค้นหาเส้นทางสำหรับรถไฟ: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :การหาค้นหาเส้นทางของขบวนรถไฟ @@ -4180,8 +4181,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) diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index bc4017a5d0..becf2bd820 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -936,49 +936,50 @@ 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 :英鎊 (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :美元 (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :歐元 (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :日圓 (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :奧地利先令 (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :比利時法郎 (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :瑞士法郎 (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :捷克克朗 (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :德國馬克 (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :捷克克朗 (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :西班牙披索 (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :芬蘭馬克 (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :法國法朗 (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :希臘德拉克馬 (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :匈牙利福林 (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :冰島克朗 (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :義大利里拉 (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :荷蘭盾 (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :挪威克朗 (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :波蘭茲羅提 (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :羅馬尼亞列伊 (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :俄羅斯舊盧布 (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :斯洛文尼亞托拉 (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :瑞典克朗 (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :土耳其里拉 (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :斯洛伐克克朗 (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :巴西里拉 (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :愛沙尼亞克魯恩(EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :立陶宛立特 (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :韓圓 (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :南非蘭特 (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :英鎊 +STR_GAME_OPTIONS_CURRENCY_USD :美元 +STR_GAME_OPTIONS_CURRENCY_EUR :歐元 +STR_GAME_OPTIONS_CURRENCY_JPY :日圓 +STR_GAME_OPTIONS_CURRENCY_ATS :奧地利先令 +STR_GAME_OPTIONS_CURRENCY_BEF :比利時法郎 +STR_GAME_OPTIONS_CURRENCY_CHF :瑞士法郎 +STR_GAME_OPTIONS_CURRENCY_CZK :捷克克朗 +STR_GAME_OPTIONS_CURRENCY_DEM :德國馬克 +STR_GAME_OPTIONS_CURRENCY_DKK :捷克克朗 +STR_GAME_OPTIONS_CURRENCY_ESP :西班牙披索 +STR_GAME_OPTIONS_CURRENCY_FIM :芬蘭馬克 +STR_GAME_OPTIONS_CURRENCY_FRF :法國法朗 +STR_GAME_OPTIONS_CURRENCY_GRD :希臘德拉克馬 +STR_GAME_OPTIONS_CURRENCY_HUF :匈牙利福林 +STR_GAME_OPTIONS_CURRENCY_ISK :冰島克朗 +STR_GAME_OPTIONS_CURRENCY_ITL :義大利里拉 +STR_GAME_OPTIONS_CURRENCY_NLG :荷蘭盾 +STR_GAME_OPTIONS_CURRENCY_NOK :挪威克朗 +STR_GAME_OPTIONS_CURRENCY_PLN :波蘭茲羅提 +STR_GAME_OPTIONS_CURRENCY_RON :羅馬尼亞列伊 +STR_GAME_OPTIONS_CURRENCY_RUR :俄羅斯舊盧布 +STR_GAME_OPTIONS_CURRENCY_SIT :斯洛文尼亞托拉 +STR_GAME_OPTIONS_CURRENCY_SEK :瑞典克朗 +STR_GAME_OPTIONS_CURRENCY_TRY :土耳其里拉 +STR_GAME_OPTIONS_CURRENCY_SKK :斯洛伐克克朗 +STR_GAME_OPTIONS_CURRENCY_BRL :巴西里拉 +STR_GAME_OPTIONS_CURRENCY_EEK :愛沙尼亞克魯恩 +STR_GAME_OPTIONS_CURRENCY_LTL :立陶宛立特 +STR_GAME_OPTIONS_CURRENCY_KRW :韓圓 +STR_GAME_OPTIONS_CURRENCY_ZAR :南非蘭特 STR_GAME_OPTIONS_CURRENCY_CUSTOM :自訂... -STR_GAME_OPTIONS_CURRENCY_GEL :喬治亞拉里 (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :伊朗里亞爾 (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :俄羅斯盧布 (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :墨西哥披索 (MXN) +STR_GAME_OPTIONS_CURRENCY_GEL :喬治亞拉里 +STR_GAME_OPTIONS_CURRENCY_IRR :伊朗里亞爾 +STR_GAME_OPTIONS_CURRENCY_RUB :俄羅斯盧布 +STR_GAME_OPTIONS_CURRENCY_MXN :墨西哥披索 STR_GAME_OPTIONS_CURRENCY_NTD :新臺幣 (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :中國人民幣(CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :港幣 (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :印度盧比(INR) -STR_GAME_OPTIONS_CURRENCY_IDR :印尼盾 (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :馬來西亞令吉 (MYR) +STR_GAME_OPTIONS_CURRENCY_CNY :中國人民幣 +STR_GAME_OPTIONS_CURRENCY_HKD :港幣 +STR_GAME_OPTIONS_CURRENCY_INR :印度盧比 +STR_GAME_OPTIONS_CURRENCY_IDR :印尼盾 +STR_GAME_OPTIONS_CURRENCY_MYR :馬來西亞令吉 STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}自動存檔 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}選擇自動存檔頻率 @@ -1985,30 +1986,30 @@ 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_GRAPHICS :{ORANGE}圖形 -STR_CONFIG_SETTING_SOUND :{ORANGE}音效 -STR_CONFIG_SETTING_INTERFACE :{ORANGE}界面 -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}基本顯示 -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}顯示設定 -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}建造 -STR_CONFIG_SETTING_ADVISORS :{ORANGE}訊息提示 -STR_CONFIG_SETTING_COMPANY :{ORANGE}公司 -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}財務 -STR_CONFIG_SETTING_VEHICLES :{ORANGE}車輛 -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}物理 -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}路線 -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}遊戲限制 -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}災難／事故 -STR_CONFIG_SETTING_GENWORLD :{ORANGE}地圖的產生 -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}環境 -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}地方政府 -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}市鎮 -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}工業 -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}貨物分配 -STR_CONFIG_SETTING_AI :{ORANGE}競爭對手 -STR_CONFIG_SETTING_AI_NPC :{ORANGE}電腦玩家 -STR_CONFIG_SETTING_NETWORK :{ORANGE}網路 +STR_CONFIG_SETTING_LOCALISATION :本地化 +STR_CONFIG_SETTING_GRAPHICS :圖形 +STR_CONFIG_SETTING_SOUND :音效 +STR_CONFIG_SETTING_INTERFACE :界面 +STR_CONFIG_SETTING_INTERFACE_GENERAL :基本顯示 +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :顯示設定 +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :建造 +STR_CONFIG_SETTING_ADVISORS :訊息提示 +STR_CONFIG_SETTING_COMPANY :公司 +STR_CONFIG_SETTING_ACCOUNTING :財務 +STR_CONFIG_SETTING_VEHICLES :車輛 +STR_CONFIG_SETTING_VEHICLES_PHYSICS :物理 +STR_CONFIG_SETTING_VEHICLES_ROUTING :路線 +STR_CONFIG_SETTING_LIMITATIONS :遊戲限制 +STR_CONFIG_SETTING_ACCIDENTS :災難／事故 +STR_CONFIG_SETTING_GENWORLD :地圖的產生 +STR_CONFIG_SETTING_ENVIRONMENT :環境 +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :地方政府 +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :市鎮 +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :工業 +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :貨物分配 +STR_CONFIG_SETTING_AI :競爭對手 +STR_CONFIG_SETTING_AI_NPC :電腦玩家 +STR_CONFIG_SETTING_NETWORK :網路 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :列車的路徑搜尋方式：{STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :設定列車使用的路徑搜尋方式。 @@ -4523,8 +4524,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) diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index bd962a615b..2ede1a4db2 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -847,7 +847,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} iflas etti ve kapatıldı! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Yeni şirket kuruldu! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING}, {TOWN} yakınlarında inşaata başladı! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING}, {STRING} tarafından alındı! +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING},açıklanmayan bir miktar karşılığında {STRING} tarafından alındı! STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Yönetici) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} {TOWN} adlı yeni kasabanın inşaasını finanse etti! @@ -952,49 +952,51 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Para birimleri STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Para birimi seçimi +STR_GAME_OPTIONS_CURRENCY_CODE :{STRING} ({STRING}) + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Sterlin (£) -STR_GAME_OPTIONS_CURRENCY_USD :Amerikan Doları ($) -STR_GAME_OPTIONS_CURRENCY_EUR :Avro (€) -STR_GAME_OPTIONS_CURRENCY_JPY :Japon Yeni (¥) -STR_GAME_OPTIONS_CURRENCY_ATS :Avusturya Şilini (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Belçika Frankı (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :İsviçre Frankı (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Çek Korunası (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Alman markı (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Danimarka Kronu (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Pezeta (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Fin Markkası (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Fransız Frankı (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Yunan Drahmisi (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Macar Forinti (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :İzlanda Kronası (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :İtalyan Lirası (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Hollanda Guilderi (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Norveç Kronu (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Polonya Zilotisi (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Romanya Leusu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rus Rublesi (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenya Toları (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :İsveç Kronası (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Türk Lirası (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Korunası (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Brezilya Reali (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Estonya Kronu (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litvanya Litası (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Güney Kore Vonu (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Güney Afrika Randı (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Sterlin +STR_GAME_OPTIONS_CURRENCY_USD :Amerikan Doları +STR_GAME_OPTIONS_CURRENCY_EUR :Avro +STR_GAME_OPTIONS_CURRENCY_JPY :Japon Yeni +STR_GAME_OPTIONS_CURRENCY_ATS :Avusturya Şilini +STR_GAME_OPTIONS_CURRENCY_BEF :Belçika Frankı +STR_GAME_OPTIONS_CURRENCY_CHF :İsviçre Frankı +STR_GAME_OPTIONS_CURRENCY_CZK :Çek Korunası +STR_GAME_OPTIONS_CURRENCY_DEM :Alman markı +STR_GAME_OPTIONS_CURRENCY_DKK :Danimarka Kronu +STR_GAME_OPTIONS_CURRENCY_ESP :Pezeta +STR_GAME_OPTIONS_CURRENCY_FIM :Fin Markkası +STR_GAME_OPTIONS_CURRENCY_FRF :Fransız Frankı +STR_GAME_OPTIONS_CURRENCY_GRD :Yunan Drahmisi +STR_GAME_OPTIONS_CURRENCY_HUF :Macar Forinti +STR_GAME_OPTIONS_CURRENCY_ISK :İzlanda Kronası +STR_GAME_OPTIONS_CURRENCY_ITL :İtalyan Lirası +STR_GAME_OPTIONS_CURRENCY_NLG :Hollanda Guilderi +STR_GAME_OPTIONS_CURRENCY_NOK :Norveç Kronu +STR_GAME_OPTIONS_CURRENCY_PLN :Polonya Zilotisi +STR_GAME_OPTIONS_CURRENCY_RON :Romanya Leusu +STR_GAME_OPTIONS_CURRENCY_RUR :Rus Rublesi +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenya Toları +STR_GAME_OPTIONS_CURRENCY_SEK :İsveç Kronası +STR_GAME_OPTIONS_CURRENCY_TRY :Türk Lirası +STR_GAME_OPTIONS_CURRENCY_SKK :Slovak Korunası +STR_GAME_OPTIONS_CURRENCY_BRL :Brezilya Reali +STR_GAME_OPTIONS_CURRENCY_EEK :Estonya Kronu +STR_GAME_OPTIONS_CURRENCY_LTL :Litvanya Litası +STR_GAME_OPTIONS_CURRENCY_KRW :Güney Kore Vonu +STR_GAME_OPTIONS_CURRENCY_ZAR :Güney Afrika Randı STR_GAME_OPTIONS_CURRENCY_CUSTOM :Özel... -STR_GAME_OPTIONS_CURRENCY_GEL :Gürcistan Larisi (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :İran Riyali (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Yeni Rus Rublesi (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Meksika Pezosu (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Yeni Tayvan Doları (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Çin Yuanı (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Doları (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Hindistan Rupisi (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Endonezya Rupiahı (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Malezya Ringgiti (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Gürcistan Larisi +STR_GAME_OPTIONS_CURRENCY_IRR :İran Riyali +STR_GAME_OPTIONS_CURRENCY_RUB :Yeni Rus Rublesi +STR_GAME_OPTIONS_CURRENCY_MXN :Meksika Pezosu +STR_GAME_OPTIONS_CURRENCY_NTD :Yeni Tayvan Doları +STR_GAME_OPTIONS_CURRENCY_CNY :Çin Yuanı +STR_GAME_OPTIONS_CURRENCY_HKD :Hong Kong Doları +STR_GAME_OPTIONS_CURRENCY_INR :Hindistan Rupisi +STR_GAME_OPTIONS_CURRENCY_IDR :Endonezya Rupiahı +STR_GAME_OPTIONS_CURRENCY_MYR :Malezya Ringgiti STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Otomatik Kaydet STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Otomatik kaydetme sıklığını seçin @@ -2019,30 +2021,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperial (Ingil STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrik (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (Uluslararası Ölçüm Sistemi) (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Yerelleştirme -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Grafikler -STR_CONFIG_SETTING_SOUND :{ORANGE}Ses -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Arayüz -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Genel -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Görüş alanları -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}İnşaat -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Haberler / Danışmanlar -STR_CONFIG_SETTING_COMPANY :{ORANGE}Şirket -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Muhasebe -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Araçlar -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Fizik -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Yönlenme -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Sınırlamalar -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Felaketler / Kazalar -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Harita üretimi -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Ortam -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Yetkililer -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Şehirler -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Endüstri -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Kargo dağılımı -STR_CONFIG_SETTING_AI :{ORANGE}Rakipler -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Bilgisayar oyuncuları -STR_CONFIG_SETTING_NETWORK :{ORANGE}Ağ +STR_CONFIG_SETTING_LOCALISATION :Yerelleştirme +STR_CONFIG_SETTING_GRAPHICS :Grafikler +STR_CONFIG_SETTING_SOUND :Ses +STR_CONFIG_SETTING_INTERFACE :Arayüz +STR_CONFIG_SETTING_INTERFACE_GENERAL :Genel +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Görüş alanları +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :İnşaat +STR_CONFIG_SETTING_ADVISORS :Haberler / Danışmanlar +STR_CONFIG_SETTING_COMPANY :Şirket +STR_CONFIG_SETTING_ACCOUNTING :Muhasebe +STR_CONFIG_SETTING_VEHICLES :Araçlar +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Fizik +STR_CONFIG_SETTING_VEHICLES_ROUTING :Yönlenme +STR_CONFIG_SETTING_LIMITATIONS :Sınırlamalar +STR_CONFIG_SETTING_ACCIDENTS :Felaketler / Kazalar +STR_CONFIG_SETTING_GENWORLD :Harita üretimi +STR_CONFIG_SETTING_ENVIRONMENT :Ortam +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Yetkililer +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Şehirler +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Endüstri +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Kargo dağılımı +STR_CONFIG_SETTING_AI :Rakipler +STR_CONFIG_SETTING_AI_NPC :Bilgisayar oyuncuları +STR_CONFIG_SETTING_NETWORK :Ağ STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Trenler için yol bulucu: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Trenler için kullanılacak "yol bulucu" algoritma @@ -3761,6 +3763,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Ayrınt STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Ayrıntılı altyapı sayılarını göster STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Para ver STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Bu şirkete para ver +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Şirketi Devralmaya Zorla +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Bu şirketi devralmaya zorlayın STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Yeni Surat STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Müdür için yeni surat seç @@ -3776,6 +3780,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Yöneticinin is STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Vermek istediğin para miktarını gir STR_BUY_COMPANY_MESSAGE :{WHITE}Şirketimizi satın alacak birilerini arıyoruz.{}{} {COMPANY} şirketini şu fiyata almak ister misiniz: {CURRENCY_LONG}? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}{COMPANY} şirketini devralmaya zorlamak için şirketin tüm varlıklarını satın alacak, tüm kredileri geri ödeyecek ve 2 yıllık karı ödeyeceksiniz.{}{}Toplam tutar {CURRENCY_LONG} olacak.{}{}Zorunlu devralma işlemine devam etmek istediğinizden emin misiniz? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}{COMPANY} şirketinin altyapısı @@ -3847,6 +3852,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Listeyi STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Listedeki tüm araçlara talimat ver STR_VEHICLE_LIST_REPLACE_VEHICLES :Araçları Değiştir STR_VEHICLE_LIST_SEND_FOR_SERVICING :Bakıma Gönder +STR_VEHICLE_LIST_CREATE_GROUP :Grup kur STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Bu seneki kar: {CURRENCY_LONG} (geçen sene: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4569,8 +4575,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Beklenen STR_TIMETABLE_SCHEDULED :{BLACK}Programlanan STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Beklenen ile programlanan arasında geçiş yap -STR_TIMETABLE_ARRIVAL_ABBREVIATION :V: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Ç: +STR_TIMETABLE_ARRIVAL :A: {COLOUR}{DATE_TINY} +STR_TIMETABLE_DEPARTURE :D: {COLOUR}{DATE_TINY} # Date window (for timetable) @@ -5635,6 +5641,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} diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index 9682542fb4..796062c2fb 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1079,49 +1079,50 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Грошова одиниця STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Виберіть грошову одиницю + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Британський фунт (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Американський долар (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Євро (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Японська ієна (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Австрійський шилінг (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Бельгійський франк (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Швейцарський франк (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Чеська крона (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Німецька марка (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Данська крона (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Іспанська песета (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Фінська марка (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Французький франк (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Грецька драхма (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Угорський форинт (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Ісландська крона (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Італійська ліра (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Нідерландський гульден (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Норвезька крона (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Польський злотий (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Румунський лей (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Російський рубель (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Словенський талер (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Шведська крона (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Турецька ліра (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Словацька крона (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Бразильський реал (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Естонська крона (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Литовський літ (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Південнокорейський вон (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Південноафриканський ранд (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Британський фунт +STR_GAME_OPTIONS_CURRENCY_USD :Американський долар +STR_GAME_OPTIONS_CURRENCY_EUR :Євро +STR_GAME_OPTIONS_CURRENCY_JPY :Японська ієна +STR_GAME_OPTIONS_CURRENCY_ATS :Австрійський шилінг +STR_GAME_OPTIONS_CURRENCY_BEF :Бельгійський франк +STR_GAME_OPTIONS_CURRENCY_CHF :Швейцарський франк +STR_GAME_OPTIONS_CURRENCY_CZK :Чеська крона +STR_GAME_OPTIONS_CURRENCY_DEM :Німецька марка +STR_GAME_OPTIONS_CURRENCY_DKK :Данська крона +STR_GAME_OPTIONS_CURRENCY_ESP :Іспанська песета +STR_GAME_OPTIONS_CURRENCY_FIM :Фінська марка +STR_GAME_OPTIONS_CURRENCY_FRF :Французький франк +STR_GAME_OPTIONS_CURRENCY_GRD :Грецька драхма +STR_GAME_OPTIONS_CURRENCY_HUF :Угорський форинт +STR_GAME_OPTIONS_CURRENCY_ISK :Ісландська крона +STR_GAME_OPTIONS_CURRENCY_ITL :Італійська ліра +STR_GAME_OPTIONS_CURRENCY_NLG :Нідерландський гульден +STR_GAME_OPTIONS_CURRENCY_NOK :Норвезька крона +STR_GAME_OPTIONS_CURRENCY_PLN :Польський злотий +STR_GAME_OPTIONS_CURRENCY_RON :Румунський лей +STR_GAME_OPTIONS_CURRENCY_RUR :Російський рубель +STR_GAME_OPTIONS_CURRENCY_SIT :Словенський талер +STR_GAME_OPTIONS_CURRENCY_SEK :Шведська крона +STR_GAME_OPTIONS_CURRENCY_TRY :Турецька ліра +STR_GAME_OPTIONS_CURRENCY_SKK :Словацька крона +STR_GAME_OPTIONS_CURRENCY_BRL :Бразильський реал +STR_GAME_OPTIONS_CURRENCY_EEK :Естонська крона +STR_GAME_OPTIONS_CURRENCY_LTL :Литовський літ +STR_GAME_OPTIONS_CURRENCY_KRW :Південнокорейський вон +STR_GAME_OPTIONS_CURRENCY_ZAR :Південноафриканський ранд STR_GAME_OPTIONS_CURRENCY_CUSTOM :Власна... -STR_GAME_OPTIONS_CURRENCY_GEL :Грузинські ларі (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Іранський ріал (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Російський новий рубель (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Мексиканське песо (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Новий тайваньський долар (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Китайські ренміні (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Гонконгський долар (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Індійська рупія (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Індонезійська рупія (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Малайзійський рингіт (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Грузинські ларі +STR_GAME_OPTIONS_CURRENCY_IRR :Іранський ріал +STR_GAME_OPTIONS_CURRENCY_RUB :Російський новий рубель +STR_GAME_OPTIONS_CURRENCY_MXN :Мексиканське песо +STR_GAME_OPTIONS_CURRENCY_NTD :Новий тайваньський долар +STR_GAME_OPTIONS_CURRENCY_CNY :Китайські ренміні +STR_GAME_OPTIONS_CURRENCY_HKD :Гонконгський долар +STR_GAME_OPTIONS_CURRENCY_INR :Індійська рупія +STR_GAME_OPTIONS_CURRENCY_IDR :Індонезійська рупія +STR_GAME_OPTIONS_CURRENCY_MYR :Малайзійський рингіт STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Автозбереження STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Виберіть період автозбереження гри @@ -2135,30 +2136,30 @@ 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_GRAPHICS :{ORANGE}Графіки -STR_CONFIG_SETTING_SOUND :{ORANGE}Звук -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Інтерфейс -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Загальні -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Точки огляду -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Будівництво -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Новини / Поради -STR_CONFIG_SETTING_COMPANY :{ORANGE}Компанія -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Облік -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Транспорт -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Фізика -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Маршрути -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Обмеження -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Катастрофи -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Створення світу -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Довкілля -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Органи влади -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Міста -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Підприємства -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Розподіл вантажів -STR_CONFIG_SETTING_AI :{ORANGE}Конкуренти -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Віртуальні гравці -STR_CONFIG_SETTING_NETWORK :{ORANGE}Мережа +STR_CONFIG_SETTING_LOCALISATION :Локалізація +STR_CONFIG_SETTING_GRAPHICS :Графіки +STR_CONFIG_SETTING_SOUND :Звук +STR_CONFIG_SETTING_INTERFACE :Інтерфейс +STR_CONFIG_SETTING_INTERFACE_GENERAL :Загальні +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Точки огляду +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Будівництво +STR_CONFIG_SETTING_ADVISORS :Новини / Поради +STR_CONFIG_SETTING_COMPANY :Компанія +STR_CONFIG_SETTING_ACCOUNTING :Облік +STR_CONFIG_SETTING_VEHICLES :Транспорт +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Фізика +STR_CONFIG_SETTING_VEHICLES_ROUTING :Маршрути +STR_CONFIG_SETTING_LIMITATIONS :Обмеження +STR_CONFIG_SETTING_ACCIDENTS :Катастрофи +STR_CONFIG_SETTING_GENWORLD :Створення світу +STR_CONFIG_SETTING_ENVIRONMENT :Довкілля +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Органи влади +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Міста +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Підприємства +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Розподіл вантажів +STR_CONFIG_SETTING_AI :Конкуренти +STR_CONFIG_SETTING_AI_NPC :Віртуальні гравці +STR_CONFIG_SETTING_NETWORK :Мережа STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Алгоритм пошуку шляху для поїздів: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Вибір алгоритма пошуку шляху для залізничного транспорту. @@ -4681,8 +4682,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) diff --git a/src/lang/urdu.txt b/src/lang/urdu.txt index 7e9d12674f..e8e5b78098 100644 --- a/src/lang/urdu.txt +++ b/src/lang/urdu.txt @@ -861,38 +861,39 @@ 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 :برطانوی پاونڈ (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :امریکی ڈالر (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :یورو (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :جاپانی ین (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :آسٹرین شِلنگ (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :بیلجیم کا فرانک (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :سوئس فرانک (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :چیک کرونا (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :ڈچ مارک (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :ڈینش کرونے (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :اسپینی پیسیتا (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :فِنش مارکہ (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :فرنچ فرانک (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :یونانی دراچما (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :ہینگرین فورِنٹ (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :آئس لینڈ کا کرونا (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :اِٹالین لیرا (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :ڈچ گِلڈر (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :ناروئیجین کرونے (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :پولش زلوٹے (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :رومانین لیو (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :رشین روبل (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :سلوئینین تولار (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :سوئیڈش کرونا (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :ٹرکش لیرا (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :سلواک کرونا (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :برازیلین رئیل (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :اِسٹونین کرونی (EEK) +STR_GAME_OPTIONS_CURRENCY_GBP :برطانوی پاونڈ +STR_GAME_OPTIONS_CURRENCY_USD :امریکی ڈالر +STR_GAME_OPTIONS_CURRENCY_EUR :یورو +STR_GAME_OPTIONS_CURRENCY_JPY :جاپانی ین +STR_GAME_OPTIONS_CURRENCY_ATS :آسٹرین شِلنگ +STR_GAME_OPTIONS_CURRENCY_BEF :بیلجیم کا فرانک +STR_GAME_OPTIONS_CURRENCY_CHF :سوئس فرانک +STR_GAME_OPTIONS_CURRENCY_CZK :چیک کرونا +STR_GAME_OPTIONS_CURRENCY_DEM :ڈچ مارک +STR_GAME_OPTIONS_CURRENCY_DKK :ڈینش کرونے +STR_GAME_OPTIONS_CURRENCY_ESP :اسپینی پیسیتا +STR_GAME_OPTIONS_CURRENCY_FIM :فِنش مارکہ +STR_GAME_OPTIONS_CURRENCY_FRF :فرنچ فرانک +STR_GAME_OPTIONS_CURRENCY_GRD :یونانی دراچما +STR_GAME_OPTIONS_CURRENCY_HUF :ہینگرین فورِنٹ +STR_GAME_OPTIONS_CURRENCY_ISK :آئس لینڈ کا کرونا +STR_GAME_OPTIONS_CURRENCY_ITL :اِٹالین لیرا +STR_GAME_OPTIONS_CURRENCY_NLG :ڈچ گِلڈر +STR_GAME_OPTIONS_CURRENCY_NOK :ناروئیجین کرونے +STR_GAME_OPTIONS_CURRENCY_PLN :پولش زلوٹے +STR_GAME_OPTIONS_CURRENCY_RON :رومانین لیو +STR_GAME_OPTIONS_CURRENCY_RUR :رشین روبل +STR_GAME_OPTIONS_CURRENCY_SIT :سلوئینین تولار +STR_GAME_OPTIONS_CURRENCY_SEK :سوئیڈش کرونا +STR_GAME_OPTIONS_CURRENCY_TRY :ٹرکش لیرا +STR_GAME_OPTIONS_CURRENCY_SKK :سلواک کرونا +STR_GAME_OPTIONS_CURRENCY_BRL :برازیلین رئیل +STR_GAME_OPTIONS_CURRENCY_EEK :اِسٹونین کرونی STR_GAME_OPTIONS_CURRENCY_LTL :لتھوینیا کے لٹاس (لٹل) -STR_GAME_OPTIONS_CURRENCY_KRW :جنوبی کوریا کے ون(KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :جنوبی افریقہ کے رنڈ (ZAR) +STR_GAME_OPTIONS_CURRENCY_KRW :جنوبی کوریا کے ون +STR_GAME_OPTIONS_CURRENCY_ZAR :جنوبی افریقہ کے رنڈ STR_GAME_OPTIONS_CURRENCY_CUSTOM :اپنی مرضی کی ۔۔۔ STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}خود مختار بچاو @@ -1481,14 +1482,14 @@ STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER :شہر کا ش ###length 3 -STR_CONFIG_SETTING_INTERFACE :{ORANGE}انٹرفیس -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}تعمیرات -STR_CONFIG_SETTING_VEHICLES :{ORANGE}گاڑیاں -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}روٹنگ -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}شہر -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}صنعتیں -STR_CONFIG_SETTING_AI :{ORANGE}مد مقابل -STR_CONFIG_SETTING_AI_NPC :{ORANGE}کمپیوٹر کے کھلاڑی +STR_CONFIG_SETTING_INTERFACE :انٹرفیس +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :تعمیرات +STR_CONFIG_SETTING_VEHICLES :گاڑیاں +STR_CONFIG_SETTING_VEHICLES_ROUTING :روٹنگ +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :شہر +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :صنعتیں +STR_CONFIG_SETTING_AI :مد مقابل +STR_CONFIG_SETTING_AI_NPC :کمپیوٹر کے کھلاڑی STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :ریل گاڑیوں کے لئے راستہ ڈھونڈنے والا: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES :گاڑیوں کا راستہ تلاش کرنے والا: {STRING} diff --git a/src/lang/vietnamese.txt b/src/lang/vietnamese.txt index 258e7a219b..09ab232eff 100644 --- a/src/lang/vietnamese.txt +++ b/src/lang/vietnamese.txt @@ -846,7 +846,7 @@ STR_NEWS_COMPANY_BANKRUPT_TITLE :{BIG_FONT}{BLAC STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} đã bị đóng cửa bởi chủ nợ và tất cả tài sản đã bị bán đi! STR_NEWS_COMPANY_LAUNCH_TITLE :{BIG_FONT}{BLACK}Công ty vận tải mới thành lập! STR_NEWS_COMPANY_LAUNCH_DESCRIPTION :{BIG_FONT}{BLACK}{STRING} đang được xây dựng gần thị trấn {TOWN}! -STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} đã bị kiểm soát bởi {STRING}! +STR_NEWS_MERGER_TAKEOVER_TITLE :{BIG_FONT}{BLACK}{STRING} đã bị kiểm soát bởi {STRING} với số tiền không được tiết lộ! STR_PRESIDENT_NAME_MANAGER :{BLACK}{PRESIDENT_NAME}{}(Giám Đốc) STR_NEWS_NEW_TOWN :{BLACK}{BIG_FONT}{STRING} Tài trợ xây dựng Thị Xã mới {TOWN}! @@ -951,49 +951,51 @@ STR_GAME_OPTIONS_VOLUME_100 :100% STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Đơn vị tiền tệ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Lựa chọn đơn vị tiền tệ +STR_GAME_OPTIONS_CURRENCY_CODE :{STRING} ({STRING}) + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Bảng Anh (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Đô-la Mỹ (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yên Nhật (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Shilling Úc (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Phơ-răng Bỉ (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Phơ-răng Thụy Sỹ (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Séc (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Mác Đức (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Krone Đan Mạch (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Tây Ban Nha(ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Markka Phần Lan (FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Franc Pháp (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Hy Lạp (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint Hungary (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Đồng Króna (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Ý (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Guilder Hà Lan (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Krone Na Uy (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Zloty Phần Lan (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Ru-ma-ni (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rúp Nga (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Krona Thụy Điển (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Thổ Nhĩ Kỳ (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slovakia (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Đồng Real Brasil (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Kroon Estonia (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Đồng Litas Lát-vi (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won Hàn Quốc (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Nam Phi (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Bảng Anh +STR_GAME_OPTIONS_CURRENCY_USD :Đô-la Mỹ +STR_GAME_OPTIONS_CURRENCY_EUR :Euro +STR_GAME_OPTIONS_CURRENCY_JPY :Yên Nhật +STR_GAME_OPTIONS_CURRENCY_ATS :Shilling Úc +STR_GAME_OPTIONS_CURRENCY_BEF :Phơ-răng Bỉ +STR_GAME_OPTIONS_CURRENCY_CHF :Phơ-răng Thụy Sỹ +STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Séc +STR_GAME_OPTIONS_CURRENCY_DEM :Mác Đức +STR_GAME_OPTIONS_CURRENCY_DKK :Krone Đan Mạch +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Tây Ban Nha +STR_GAME_OPTIONS_CURRENCY_FIM :Markka Phần Lan +STR_GAME_OPTIONS_CURRENCY_FRF :Franc Pháp +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma Hy Lạp +STR_GAME_OPTIONS_CURRENCY_HUF :Forint Hungary +STR_GAME_OPTIONS_CURRENCY_ISK :Đồng Króna +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Ý +STR_GAME_OPTIONS_CURRENCY_NLG :Guilder Hà Lan +STR_GAME_OPTIONS_CURRENCY_NOK :Krone Na Uy +STR_GAME_OPTIONS_CURRENCY_PLN :Zloty Phần Lan +STR_GAME_OPTIONS_CURRENCY_RON :Leu Ru-ma-ni +STR_GAME_OPTIONS_CURRENCY_RUR :Rúp Nga +STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar +STR_GAME_OPTIONS_CURRENCY_SEK :Krona Thụy Điển +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Thổ Nhĩ Kỳ +STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slovakia +STR_GAME_OPTIONS_CURRENCY_BRL :Đồng Real Brasil +STR_GAME_OPTIONS_CURRENCY_EEK :Kroon Estonia +STR_GAME_OPTIONS_CURRENCY_LTL :Đồng Litas Lát-vi +STR_GAME_OPTIONS_CURRENCY_KRW :Won Hàn Quốc +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand Nam Phi STR_GAME_OPTIONS_CURRENCY_CUSTOM :Tùy chọn... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgia (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iran (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Đồng Rúp Nga mới (RUB) -STR_GAME_OPTIONS_CURRENCY_MXN :Peso México (MXN) -STR_GAME_OPTIONS_CURRENCY_NTD :Tân Đài tệ (NTD) -STR_GAME_OPTIONS_CURRENCY_CNY :Nhân dân tệ TQ (CNY) -STR_GAME_OPTIONS_CURRENCY_HKD :Đô-la Hồng Kông (HKD) -STR_GAME_OPTIONS_CURRENCY_INR :Rupee Ấn Độ (INR) -STR_GAME_OPTIONS_CURRENCY_IDR :Rupiah Indonesia (IDR) -STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit Malaysia (MYR) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgia +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iran +STR_GAME_OPTIONS_CURRENCY_RUB :Đồng Rúp Nga mới +STR_GAME_OPTIONS_CURRENCY_MXN :Peso México +STR_GAME_OPTIONS_CURRENCY_NTD :Tân Đài tệ +STR_GAME_OPTIONS_CURRENCY_CNY :Nhân dân tệ TQ +STR_GAME_OPTIONS_CURRENCY_HKD :Đô-la Hồng Kông +STR_GAME_OPTIONS_CURRENCY_INR :Rupee Ấn Độ +STR_GAME_OPTIONS_CURRENCY_IDR :Rupiah Indonesia +STR_GAME_OPTIONS_CURRENCY_MYR :Ringgit Malaysia STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Lưu tự động STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Lựa chọn khoảng thời gian tự động lưu @@ -1558,7 +1560,7 @@ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREY_TO_RED :Xám tới đ STR_CONFIG_SETTING_LINKGRAPH_COLOURS_GREYSCALE :Thang màu xám STR_CONFIG_SETTING_SCROLLMODE :Kiểu cuộn khung nhìn: {STRING} -STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Hành xử khi kéo, cuộn bản đồ +STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT :Hành xử khi kéo, cuộn bản đồ. Tùy chọn "khóa vị trí chuột" không hoạt động ở một số phiên bản, như phiên bản web, phiên bản cảm ứng, Linux với Wayland, và một số phiên bản khác ###length 4 STR_CONFIG_SETTING_SCROLLMODE_DEFAULT :Kéo cuộn khung nhìn kiểu RMB, khoá vị trí con trỏ chuột STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED :Kéo cuộn kiểu RMB, khoá vị trí con trỏ chuột @@ -2018,30 +2020,30 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Hoàng Gia (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metric (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Tiêu Chuẩn Đo Lường -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Đồ họa -STR_CONFIG_SETTING_SOUND :{ORANGE}Âm thanh -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Giao Diện -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Tổng quát -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Vùng nhìn -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Xây Dựng -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Tin tức / Cố vấn -STR_CONFIG_SETTING_COMPANY :{ORANGE}Công ty -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Kế toán -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Phương Tiện -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Vật lý -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Tìm đường -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Giới hạn -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Thiên tai / Tai nạn -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Khởi tạo bản đồ -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Môi trường -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Chính quyền -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Đô thị -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Nhà máy -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Phân bổ hàng hóa -STR_CONFIG_SETTING_AI :{ORANGE}Đối Thủ -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Nhân vật máy -STR_CONFIG_SETTING_NETWORK :{ORANGE}Kết nối +STR_CONFIG_SETTING_LOCALISATION :Tiêu Chuẩn Đo Lường +STR_CONFIG_SETTING_GRAPHICS :Đồ họa +STR_CONFIG_SETTING_SOUND :Âm thanh +STR_CONFIG_SETTING_INTERFACE :Giao Diện +STR_CONFIG_SETTING_INTERFACE_GENERAL :Tổng quát +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Vùng nhìn +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Xây Dựng +STR_CONFIG_SETTING_ADVISORS :Tin tức / Cố vấn +STR_CONFIG_SETTING_COMPANY :Công ty +STR_CONFIG_SETTING_ACCOUNTING :Kế toán +STR_CONFIG_SETTING_VEHICLES :Phương Tiện +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Vật lý +STR_CONFIG_SETTING_VEHICLES_ROUTING :Tìm đường +STR_CONFIG_SETTING_LIMITATIONS :Giới hạn +STR_CONFIG_SETTING_ACCIDENTS :Thiên tai / Tai nạn +STR_CONFIG_SETTING_GENWORLD :Khởi tạo bản đồ +STR_CONFIG_SETTING_ENVIRONMENT :Môi trường +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Chính quyền +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Đô thị +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Nhà máy +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Phân bổ hàng hóa +STR_CONFIG_SETTING_AI :Đối Thủ +STR_CONFIG_SETTING_AI_NPC :Nhân vật máy +STR_CONFIG_SETTING_NETWORK :Kết nối STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Cơ chế tìm đường cho tàu hoả: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Cơ chế tìm đường cho tàu hỏa @@ -2080,6 +2082,7 @@ STR_CONFIG_ERROR_SPRITECACHE_TOO_BIG :{WHITE}Phân b # Video initalization errors STR_VIDEO_DRIVER_ERROR :{WHITE}Lỗi ở thiết lập hình ảnh... STR_VIDEO_DRIVER_ERROR_NO_HARDWARE_ACCELERATION :{WHITE}... không tìm thấy GPU tương thích. Tăng tốc phần cứng đã được tắt +STR_VIDEO_DRIVER_ERROR_HARDWARE_ACCELERATION_CRASH :{WHITE}... trình điều khiển GPU đã làm trò chơi bị lỗi. Tăng tốc phần cứng đã được tắt # Intro window STR_INTRO_CAPTION :{WHITE}OpenTTD {REV} @@ -3759,6 +3762,8 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON :{BLACK}Chi ti STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP :{BLACK}Xem chi tiết thống kê hạ tầng STR_COMPANY_VIEW_GIVE_MONEY_BUTTON :{BLACK}Tặng tiền STR_COMPANY_VIEW_GIVE_MONEY_TOOLTIP :{BLACK}Tặng tiền cho công ty này +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_BUTTON :{BLACK}Thâu tóm thù địch +STR_COMPANY_VIEW_HOSTILE_TAKEOVER_TOOLTIP :{BLACK}Thực hiện việc thâu tóm thù địch với công ty này STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Chọn khuôn mặt khác STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Chọn khuôn mặt của người điều hành @@ -3774,6 +3779,7 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION :Tên Giám Đ STR_COMPANY_VIEW_GIVE_MONEY_QUERY_CAPTION :Nhập số tiền bạn muốn tặng STR_BUY_COMPANY_MESSAGE :{WHITE}Chúng tôi tìm một công ty để chuyển nhượng công việc kinh doanh và tài sản công ty chúng tôi.{}{}Bạn có muốn mua công ty {COMPANY} của chúng tôi với giá {CURRENCY_LONG}? +STR_BUY_COMPANY_HOSTILE_TAKEOVER :{WHITE}Khi thâu tóm thù địch công ty {COMPANY}, bạn sẽ mua hết tài sản, trả hết nợ, và trả một số tiền tương ứng với lợi nhuận trong hai năm.{}{}Tổng số tiền dự tính là {CURRENCY_LONG}.{}{}Bạn có muốn tiếp tục việc thâu tóm thù địch này? # Company infrastructure window STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION :{WHITE}Cơ sở hạ tầng của công ty {COMPANY} @@ -3845,6 +3851,7 @@ STR_VEHICLE_LIST_MANAGE_LIST :{BLACK}Quản l STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP :{BLACK}Gửi chỉ dẫn tới toàn bộ phương tiện trong danh sách STR_VEHICLE_LIST_REPLACE_VEHICLES :Thay phương tiện STR_VEHICLE_LIST_SEND_FOR_SERVICING :Gửi về bảo trì +STR_VEHICLE_LIST_CREATE_GROUP :Tạo nhóm STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR :{TINY_FONT}{BLACK}Lợi nhuận năm nay: {CURRENCY_LONG} (năm ngoái: {CURRENCY_LONG}) STR_VEHICLE_LIST_CARGO :[{CARGO_LIST}] STR_VEHICLE_LIST_NAME_AND_CARGO :{STRING} {STRING} @@ -4567,8 +4574,8 @@ STR_TIMETABLE_EXPECTED :{BLACK}Mong mu STR_TIMETABLE_SCHEDULED :{BLACK}Chốt lịch STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Chuyển giữa lịch mong muốn và lịch được chốt -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Đến: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Đi: +STR_TIMETABLE_ARRIVAL :ĐN: {COLOUR}{DATE_TINY} +STR_TIMETABLE_DEPARTURE :KH: {COLOUR}{DATE_TINY} # Date window (for timetable) @@ -5623,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} diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index ac26439e08..24303ae30f 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -894,43 +894,44 @@ STR_GAME_OPTIONS_CAPTION :{WHITE}Dewisiad STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Uned Arian STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Dewis unedau arian + ###length 42 -STR_GAME_OPTIONS_CURRENCY_GBP :Punnoedd Prydeinig (GBP) -STR_GAME_OPTIONS_CURRENCY_USD :Doleri America (USD) -STR_GAME_OPTIONS_CURRENCY_EUR :Ewro (EUR) -STR_GAME_OPTIONS_CURRENCY_JPY :Yen Siapan (JPY) -STR_GAME_OPTIONS_CURRENCY_ATS :Swllt Awstriaidd (ATS) -STR_GAME_OPTIONS_CURRENCY_BEF :Ffranc Belgaidd (BEF) -STR_GAME_OPTIONS_CURRENCY_CHF :Ffranc Swisaidd (CHF) -STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Tsecaidd (CZK) -STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) -STR_GAME_OPTIONS_CURRENCY_DKK :Krone Danaidd (DKK) -STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Sbaen (ESP) -STR_GAME_OPTIONS_CURRENCY_FIM :Markka Ffinaidd(FIM) -STR_GAME_OPTIONS_CURRENCY_FRF :Ffranc Ffrainc (FRF) -STR_GAME_OPTIONS_CURRENCY_GRD :Drachma (GRD) -STR_GAME_OPTIONS_CURRENCY_HUF :Forint (HUF) -STR_GAME_OPTIONS_CURRENCY_ISK :Krona Ynys yr Iâ (ISK) -STR_GAME_OPTIONS_CURRENCY_ITL :Lira Eidalaidd (ITL) -STR_GAME_OPTIONS_CURRENCY_NLG :Guilder (NLG) -STR_GAME_OPTIONS_CURRENCY_NOK :Krone Norwyaidd (NOK) -STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Pwylaidd (PLN) -STR_GAME_OPTIONS_CURRENCY_RON :Leu Rwmanaidd (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Rwbl Rwsaidd (RUR) -STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slofenaidd (SIT) -STR_GAME_OPTIONS_CURRENCY_SEK :Krona Swedaidd (SEK) -STR_GAME_OPTIONS_CURRENCY_TRY :Lira Twrcaidd (TRY) -STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slofacaidd (SKK) -STR_GAME_OPTIONS_CURRENCY_BRL :Real Brazilaidd (BRL) -STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Estonia (EEK) -STR_GAME_OPTIONS_CURRENCY_LTL :Litau Lithiwanaidd (LTL) -STR_GAME_OPTIONS_CURRENCY_KRW :Won De Korea (KRW) -STR_GAME_OPTIONS_CURRENCY_ZAR :Rand De Affrica (ZAR) +STR_GAME_OPTIONS_CURRENCY_GBP :Punnoedd Prydeinig +STR_GAME_OPTIONS_CURRENCY_USD :Doleri America +STR_GAME_OPTIONS_CURRENCY_EUR :Ewro +STR_GAME_OPTIONS_CURRENCY_JPY :Yen Siapan +STR_GAME_OPTIONS_CURRENCY_ATS :Swllt Awstriaidd +STR_GAME_OPTIONS_CURRENCY_BEF :Ffranc Belgaidd +STR_GAME_OPTIONS_CURRENCY_CHF :Ffranc Swisaidd +STR_GAME_OPTIONS_CURRENCY_CZK :Koruna Tsecaidd +STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark +STR_GAME_OPTIONS_CURRENCY_DKK :Krone Danaidd +STR_GAME_OPTIONS_CURRENCY_ESP :Peseta Sbaen +STR_GAME_OPTIONS_CURRENCY_FIM :Markka Ffinaidd +STR_GAME_OPTIONS_CURRENCY_FRF :Ffranc Ffrainc +STR_GAME_OPTIONS_CURRENCY_GRD :Drachma +STR_GAME_OPTIONS_CURRENCY_HUF :Forint +STR_GAME_OPTIONS_CURRENCY_ISK :Krona Ynys yr Iâ +STR_GAME_OPTIONS_CURRENCY_ITL :Lira Eidalaidd +STR_GAME_OPTIONS_CURRENCY_NLG :Guilder +STR_GAME_OPTIONS_CURRENCY_NOK :Krone Norwyaidd +STR_GAME_OPTIONS_CURRENCY_PLN :Złoty Pwylaidd +STR_GAME_OPTIONS_CURRENCY_RON :Leu Rwmanaidd +STR_GAME_OPTIONS_CURRENCY_RUR :Rwbl Rwsaidd +STR_GAME_OPTIONS_CURRENCY_SIT :Tolar Slofenaidd +STR_GAME_OPTIONS_CURRENCY_SEK :Krona Swedaidd +STR_GAME_OPTIONS_CURRENCY_TRY :Lira Twrcaidd +STR_GAME_OPTIONS_CURRENCY_SKK :Koruna Slofacaidd +STR_GAME_OPTIONS_CURRENCY_BRL :Real Brazilaidd +STR_GAME_OPTIONS_CURRENCY_EEK :Krooni Estonia +STR_GAME_OPTIONS_CURRENCY_LTL :Litau Lithiwanaidd +STR_GAME_OPTIONS_CURRENCY_KRW :Won De Korea +STR_GAME_OPTIONS_CURRENCY_ZAR :Rand De Affrica STR_GAME_OPTIONS_CURRENCY_CUSTOM :Addasedig... -STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgia (GEL) -STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iran (IRR) -STR_GAME_OPTIONS_CURRENCY_RUB :Rwbl Rwsaidd Newydd (RUB) -STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Tseina (CNY) +STR_GAME_OPTIONS_CURRENCY_GEL :Lari Georgia +STR_GAME_OPTIONS_CURRENCY_IRR :Rial Iran +STR_GAME_OPTIONS_CURRENCY_RUB :Rwbl Rwsaidd Newydd +STR_GAME_OPTIONS_CURRENCY_CNY :Renminbi Tseina STR_GAME_OPTIONS_AUTOSAVE_FRAME :{BLACK}Awtogadw STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP :{BLACK}Dewiswch pa mor aml y dylid awtogadw gemau @@ -1830,29 +1831,29 @@ STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_IMPERIAL :Imperial (ft) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_METRIC :Metrig (m) STR_CONFIG_SETTING_LOCALISATION_UNITS_HEIGHT_SI :SI (m) -STR_CONFIG_SETTING_LOCALISATION :{ORANGE}Unedau Lleol -STR_CONFIG_SETTING_GRAPHICS :{ORANGE}Graffeg -STR_CONFIG_SETTING_SOUND :{ORANGE}Sain -STR_CONFIG_SETTING_INTERFACE :{ORANGE}Rhyngwyneb -STR_CONFIG_SETTING_INTERFACE_GENERAL :{ORANGE}Cyffredinol -STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :{ORANGE}Ffenestri Golygfa -STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :{ORANGE}Adeiladu -STR_CONFIG_SETTING_ADVISORS :{ORANGE}Newyddion a Chyngor -STR_CONFIG_SETTING_COMPANY :{ORANGE}Cwmni -STR_CONFIG_SETTING_ACCOUNTING :{ORANGE}Cyfrifo -STR_CONFIG_SETTING_VEHICLES :{ORANGE}Cerbydau -STR_CONFIG_SETTING_VEHICLES_PHYSICS :{ORANGE}Ffiseg -STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Llwybro -STR_CONFIG_SETTING_LIMITATIONS :{ORANGE}Cyfyngiadau -STR_CONFIG_SETTING_ACCIDENTS :{ORANGE}Trychinebau a Damweiniau -STR_CONFIG_SETTING_GENWORLD :{ORANGE}Cread byd -STR_CONFIG_SETTING_ENVIRONMENT :{ORANGE}Amgylchedd -STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :{ORANGE}Awdurdodau -STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :{ORANGE}Trefi -STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :{ORANGE}Diwydiannau -STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :{ORANGE}Dosraniad cargo -STR_CONFIG_SETTING_AI :{ORANGE}Cystadleuwyr -STR_CONFIG_SETTING_AI_NPC :{ORANGE}Chwaraewyr Cyfrifiadurol +STR_CONFIG_SETTING_LOCALISATION :Unedau Lleol +STR_CONFIG_SETTING_GRAPHICS :Graffeg +STR_CONFIG_SETTING_SOUND :Sain +STR_CONFIG_SETTING_INTERFACE :Rhyngwyneb +STR_CONFIG_SETTING_INTERFACE_GENERAL :Cyffredinol +STR_CONFIG_SETTING_INTERFACE_VIEWPORTS :Ffenestri Golygfa +STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION :Adeiladu +STR_CONFIG_SETTING_ADVISORS :Newyddion a Chyngor +STR_CONFIG_SETTING_COMPANY :Cwmni +STR_CONFIG_SETTING_ACCOUNTING :Cyfrifo +STR_CONFIG_SETTING_VEHICLES :Cerbydau +STR_CONFIG_SETTING_VEHICLES_PHYSICS :Ffiseg +STR_CONFIG_SETTING_VEHICLES_ROUTING :Llwybro +STR_CONFIG_SETTING_LIMITATIONS :Cyfyngiadau +STR_CONFIG_SETTING_ACCIDENTS :Trychinebau a Damweiniau +STR_CONFIG_SETTING_GENWORLD :Cread byd +STR_CONFIG_SETTING_ENVIRONMENT :Amgylchedd +STR_CONFIG_SETTING_ENVIRONMENT_AUTHORITIES :Awdurdodau +STR_CONFIG_SETTING_ENVIRONMENT_TOWNS :Trefi +STR_CONFIG_SETTING_ENVIRONMENT_INDUSTRIES :Diwydiannau +STR_CONFIG_SETTING_ENVIRONMENT_CARGODIST :Dosraniad cargo +STR_CONFIG_SETTING_AI :Cystadleuwyr +STR_CONFIG_SETTING_AI_NPC :Chwaraewyr Cyfrifiadurol STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :Llwybrwr ar gyfer trenau: {STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_HELPTEXT :Llwybrwr i'w ddefnyddio ar gyfer trenau @@ -4088,8 +4089,6 @@ STR_TIMETABLE_EXPECTED :{BLACK}Disgwyli STR_TIMETABLE_SCHEDULED :{BLACK}Amserlenwyd STR_TIMETABLE_EXPECTED_TOOLTIP :{BLACK}Newid rhwng yr amser a ddisgwylir a'r amserlen -STR_TIMETABLE_ARRIVAL_ABBREVIATION :Cyr: -STR_TIMETABLE_DEPARTURE_ABBREVIATION :Gad: # Date window (for timetable) diff --git a/src/main_gui.cpp b/src/main_gui.cpp index 2a55ba2f7c..75ae7f7e8d 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -608,7 +608,7 @@ HotkeyList MainWindow::hotkeys("global", global_hotkeys); static WindowDesc _main_window_desc( WDP_MANUAL, nullptr, 0, 0, WC_MAIN_WINDOW, WC_NONE, - 0, + WDF_NO_CLOSE, _nested_main_window_widgets, lengthof(_nested_main_window_widgets), &MainWindow::hotkeys ); diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index b1e8390dcc..23a00ea917 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -704,7 +704,7 @@ static const NWidgetPart _nested_tooltips_widgets[] = { static WindowDesc _tool_tips_desc( WDP_MANUAL, nullptr, 0, 0, // Coordinates and sizes are not used, WC_TOOLTIPS, WC_NONE, - WDF_NO_FOCUS, + WDF_NO_FOCUS | WDF_NO_CLOSE, _nested_tooltips_widgets, lengthof(_nested_tooltips_widgets) ); diff --git a/src/mixer.cpp b/src/mixer.cpp index 06c6e0ef9d..bbd06b433b 100644 --- a/src/mixer.cpp +++ b/src/mixer.cpp @@ -13,10 +13,10 @@ #include #include "core/math_func.hpp" #include "framerate_type.h" +#include "mixer.h" #include "settings_type.h" #include "safeguards.h" -#include "mixer.h" #include #if defined(__MINGW32__) diff --git a/src/music.cpp b/src/music.cpp index 903e2f8714..67edfcc02b 100644 --- a/src/music.cpp +++ b/src/music.cpp @@ -13,9 +13,9 @@ /** The type of set we're replacing */ #define SET_TYPE "music" #include "base_media_func.h" +#include "random_access_file_type.h" #include "safeguards.h" -#include "random_access_file_type.h" /** @@ -133,7 +133,7 @@ bool MusicSet::FillSetDetails(IniFile *ini, const std::string &path, const std:: this->songinfo[i].filename = filename; // non-owned pointer - IniItem *item = catindex->GetItem(_music_file_names[i], false); + IniItem *item = catindex->GetItem(_music_file_names[i]); if (item != nullptr && item->value.has_value() && !item->value->empty()) { /* Song has a CAT file index, assume it's MPS MIDI format */ this->songinfo[i].filetype = MTT_MPSMIDI; @@ -158,7 +158,7 @@ bool MusicSet::FillSetDetails(IniFile *ini, const std::string &path, const std:: * the beginning, so we don't start reading e.g. root. */ while (*trimmed_filename == PATHSEPCHAR) trimmed_filename++; - item = names->GetItem(trimmed_filename, false); + item = names->GetItem(trimmed_filename); if (item != nullptr && item->value.has_value() && !item->value->empty()) break; } @@ -179,7 +179,7 @@ bool MusicSet::FillSetDetails(IniFile *ini, const std::string &path, const std:: this->songinfo[i].tracknr = tracknr++; } - item = trimmed_filename != nullptr ? timingtrim->GetItem(trimmed_filename, false) : nullptr; + item = trimmed_filename != nullptr ? timingtrim->GetItem(trimmed_filename) : nullptr; if (item != nullptr && item->value.has_value() && !item->value->empty()) { auto endpos = item->value->find(':'); if (endpos != std::string::npos) { diff --git a/src/music/CMakeLists.txt b/src/music/CMakeLists.txt index 8f87a9c936..54105bd3cb 100644 --- a/src/music/CMakeLists.txt +++ b/src/music/CMakeLists.txt @@ -36,12 +36,6 @@ if(NOT OPTION_DEDICATED) bemidi.h CONDITION HAIKU ) - - add_files( - os2_m.cpp - os2_m.h - CONDITION OPTION_OS2 - ) endif() add_files( diff --git a/src/music/midifile.cpp b/src/music/midifile.cpp index 7044079158..8aeecb0db3 100644 --- a/src/music/midifile.cpp +++ b/src/music/midifile.cpp @@ -60,8 +60,7 @@ const byte *MidiGetStandardSysexMessage(MidiSysexMessage msg, size_t &length) * RAII-compliant to make teardown in error situations easier. */ class ByteBuffer { - byte *buf; - size_t buflen; + std::vector buf; size_t pos; public: /** @@ -73,31 +72,22 @@ public: */ ByteBuffer(FILE *file, size_t len) { - this->buf = MallocT(len); - if (fread(this->buf, 1, len, file) == len) { - this->buflen = len; + this->buf.resize(len); + if (fread(this->buf.data(), 1, len, file) == len) { this->pos = 0; } else { /* invalid state */ - this->buflen = 0; + this->buf.clear(); } } - /** - * Destructor, frees the buffer. - */ - ~ByteBuffer() - { - free(this->buf); - } - /** * Return whether the buffer was constructed successfully. * @return true is the buffer contains data */ bool IsValid() const { - return this->buflen > 0; + return this->buf.size() > 0; } /** @@ -106,7 +96,7 @@ public: */ bool IsEnd() const { - return this->pos >= this->buflen; + return this->pos >= this->buf.size(); } /** @@ -149,8 +139,8 @@ public: bool ReadBuffer(byte *dest, size_t length) { if (this->IsEnd()) return false; - if (this->buflen - this->pos < length) return false; - memcpy(dest, this->buf + this->pos, length); + if (this->buf.size() - this->pos < length) return false; + std::copy(std::begin(this->buf) + this->pos, std::begin(this->buf) + this->pos + length, dest); this->pos += length; return true; } @@ -164,8 +154,8 @@ public: bool ReadDataBlock(MidiFile::DataBlock *dest, size_t length) { if (this->IsEnd()) return false; - if (this->buflen - this->pos < length) return false; - dest->data.insert(dest->data.end(), this->buf + this->pos, this->buf + this->pos + length); + if (this->buf.size() - this->pos < length) return false; + dest->data.insert(dest->data.end(), std::begin(this->buf) + this->pos, std::begin(this->buf) + this->pos + length); this->pos += length; return true; } @@ -178,7 +168,7 @@ public: bool Skip(size_t count) { if (this->IsEnd()) return false; - if (this->buflen - this->pos < count) return false; + if (this->buf.size() - this->pos < count) return false; this->pos += count; return true; } diff --git a/src/music/os2_m.cpp b/src/music/os2_m.cpp deleted file mode 100644 index 4736065678..0000000000 --- a/src/music/os2_m.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/* - * This file is part of OpenTTD. - * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. - * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . - */ - -/** @file os2_m.cpp Music playback on OS/2. */ - -#include "../stdafx.h" -#include "../openttd.h" -#include "os2_m.h" -#include "midifile.hpp" -#include "../base_media_base.h" - -#define INCL_DOS -#define INCL_OS2MM -#define INCL_WIN - -#include -#include -#include - -#include "../safeguards.h" - -/********************** - * OS/2 MIDI PLAYER - **********************/ - -/* Interesting how similar the MCI API in OS/2 is to the Win32 MCI API, - * eh? Anyone would think they both came from the same place originally! ;) - */ - -/** - * Send a midi command. - * @param cmd The command to send. - * @return The result of sending it. - */ -static long CDECL MidiSendCommand(const char *cmd, ...) -{ - va_list va; - char buf[512]; - va_start(va, cmd); - vseprintf(buf, lastof(buf), cmd, va); - va_end(va); - return mciSendString(buf, nullptr, 0, nullptr, 0); -} - -/** OS/2's music player's factory. */ -static FMusicDriver_OS2 iFMusicDriver_OS2; - -void MusicDriver_OS2::PlaySong(const MusicSongInfo &song) -{ - std::string filename = MidiFile::GetSMFFile(song); - - MidiSendCommand("close all"); - if (filename.empty()) return; - - if (MidiSendCommand("open %s type sequencer alias song", filename.c_str()) != 0) { - return; - } - - MidiSendCommand("play song from 0"); -} - -void MusicDriver_OS2::StopSong() -{ - MidiSendCommand("close all"); -} - -void MusicDriver_OS2::SetVolume(byte vol) -{ - MidiSendCommand("set song audio volume %d", ((vol/127)*100)); -} - -bool MusicDriver_OS2::IsSongPlaying() -{ - char buf[16]; - mciSendString("status song mode", buf, sizeof(buf), nullptr, 0); - return strcmp(buf, "playing") == 0 || strcmp(buf, "seeking") == 0; -} - -const char *MusicDriver_OS2::Start(const StringList &parm) -{ - return 0; -} - -void MusicDriver_OS2::Stop() -{ - MidiSendCommand("close all"); -} diff --git a/src/music/os2_m.h b/src/music/os2_m.h deleted file mode 100644 index a60f5bbfc7..0000000000 --- a/src/music/os2_m.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * This file is part of OpenTTD. - * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. - * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . - */ - -/** @file os2_m.h Base for OS2 music playback. */ - -#ifndef MUSIC_OS2_H -#define MUSIC_OS2_H - -#include "music_driver.hpp" - -/** OS/2's music player. */ -class MusicDriver_OS2 : public MusicDriver { -public: - const char *Start(const StringList ¶m) override; - - void Stop() override; - - void PlaySong(const MusicSongInfo &song) override; - - void StopSong() override; - - bool IsSongPlaying() override; - - void SetVolume(byte vol) override; - const char *GetName() const override { return "os2"; } -}; - -/** Factory for OS/2's music player. */ -class FMusicDriver_OS2 : public DriverFactoryBase { -public: - FMusicDriver_OS2() : DriverFactoryBase(Driver::DT_MUSIC, 10, "os2", "OS/2 Music Driver") {} - Driver *CreateInstance() const override { return new MusicDriver_OS2(); } -}; - -#endif /* MUSIC_OS2_H */ diff --git a/src/network/core/address.cpp b/src/network/core/address.cpp index 6e658af250..56723c2687 100644 --- a/src/network/core/address.cpp +++ b/src/network/core/address.cpp @@ -340,13 +340,11 @@ static SOCKET ListenLoopProc(addrinfo *runp) DEBUG(net, 0, "Setting reuse-address mode failed: %s", NetworkError::GetLast().AsString()); } -#ifndef __OS2__ int on = 1; if (runp->ai_family == AF_INET6 && setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (const char*)&on, sizeof(on)) == -1) { DEBUG(net, 3, "Could not disable IPv4 over IPv6: %s", NetworkError::GetLast().AsString()); } -#endif if (bind(sock, runp->ai_addr, (int)runp->ai_addrlen) != 0) { DEBUG(net, 0, "Could not bind socket on %s: %s", address.c_str(), NetworkError::GetLast().AsString()); diff --git a/src/network/core/os_abstraction.cpp b/src/network/core/os_abstraction.cpp index 205e107172..5c89bd2e9f 100644 --- a/src/network/core/os_abstraction.cpp +++ b/src/network/core/os_abstraction.cpp @@ -120,8 +120,6 @@ bool NetworkError::HasError() const { #if defined(_WIN32) return NetworkError(WSAGetLastError()); -#elif defined(__OS2__) - return NetworkError(sock_errno()); #else return NetworkError(errno); #endif diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h index 63d19a8597..006cc2601b 100644 --- a/src/network/core/os_abstraction.h +++ b/src/network/core/os_abstraction.h @@ -73,7 +73,7 @@ typedef unsigned long in_addr_t; #endif /* _WIN32 */ /* UNIX stuff */ -#if defined(UNIX) && !defined(__OS2__) +#if defined(UNIX) # if defined(OPENBSD) || defined(__NetBSD__) # define AI_ADDRCONFIG 0 # endif @@ -95,7 +95,7 @@ typedef unsigned long in_addr_t; # include # include /* According to glibc/NEWS, appeared in glibc-2.3. */ -# if !defined(__sgi__) && !defined(SUNOS) && !defined(__INNOTEK_LIBC__) \ +# if !defined(__sgi__) && !defined(SUNOS) \ && !(defined(__GLIBC__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 2)) && !defined(__dietlibc__) && !defined(HPUX) /* If for any reason ifaddrs.h does not exist on your system, comment out * the following two lines and an alternative way will be used to fetch @@ -133,63 +133,6 @@ typedef unsigned long in_addr_t; #endif /* UNIX */ -/* OS/2 stuff */ -#if defined(__OS2__) -# define SOCKET int -# define INVALID_SOCKET -1 -# define closesocket close -# define SD_RECEIVE SHUT_RD -# define SD_SEND SHUT_WR -# define SD_BOTH SHUT_RDWR - -/* Includes needed for OS/2 systems */ -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# define INADDR_NONE 0xffffffff -# include "../../3rdparty/os2/getaddrinfo.h" -# include "../../3rdparty/os2/getnameinfo.h" - -#define IPV6_V6ONLY 27 - -/* - * IPv6 address - */ -struct in6_addr { - union { - uint8_t __u6_addr8[16]; - uint16_t __u6_addr16[8]; - uint32_t __u6_addr32[4]; - } __u6_addr; /* 128-bit IP6 address */ -}; - -#define s6_addr __u6_addr.__u6_addr8 - -struct sockaddr_in6 { - uint8_t sin6_len; /* length of this struct */ - sa_family_t sin6_family; /* AF_INET6 */ - in_port_t sin6_port; /* Transport layer port # */ - uint32_t sin6_flowinfo; /* IP6 flow information */ - struct in6_addr sin6_addr; /* IP6 address */ - uint32_t sin6_scope_id; /* scope zone index */ -}; - -typedef int socklen_t; -#if !defined(__INNOTEK_LIBC__) -typedef unsigned long in_addr_t; -#endif /* __INNOTEK_LIBC__ */ - -#endif /* OS/2 */ - #ifdef __EMSCRIPTEN__ /** * Emscripten doesn't set 'addrlen' for accept(), getsockname(), getpeername() diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 8e9990a4ae..2101973117 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -498,7 +498,7 @@ public: this->FinishInitNested(WN_NETWORK_WINDOW_GAME); this->querystrings[WID_NG_CLIENT] = &this->name_editbox; - this->name_editbox.text.Assign(_settings_client.network.client_name.c_str()); + this->name_editbox.text.Assign(_settings_client.network.client_name); this->querystrings[WID_NG_FILTER] = &this->filter_editbox; this->filter_editbox.cancel_button = QueryString::ACTION_CLEAR; @@ -1058,7 +1058,7 @@ struct NetworkStartServerWindow : public Window { this->InitNested(WN_NETWORK_WINDOW_START); this->querystrings[WID_NSS_GAMENAME] = &this->name_editbox; - this->name_editbox.text.Assign(_settings_client.network.server_name.c_str()); + this->name_editbox.text.Assign(_settings_client.network.server_name); this->SetFocusedWidget(WID_NSS_GAMENAME); } diff --git a/src/newgrf.cpp b/src/newgrf.cpp index e4860aa7ca..b62895ac4f 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -370,12 +370,11 @@ static GRFError *DisableGrf(StringID message = STR_NULL, GRFConfig *config = nul if (file != nullptr) ClearTemporaryNewGRFData(file); if (config == _cur.grfconfig) _cur.skip_sprites = -1; - if (message != STR_NULL) { - config->error = std::make_unique(STR_NEWGRF_ERROR_MSG_FATAL, message); - if (config == _cur.grfconfig) config->error->param_value[0] = _cur.nfo_line; - } + if (message == STR_NULL) return nullptr; - return config->error.get(); + config->error = {STR_NEWGRF_ERROR_MSG_FATAL, message}; + if (config == _cur.grfconfig) config->error->param_value[0] = _cur.nfo_line; + return &config->error.value(); } /** @@ -2705,6 +2704,7 @@ static ChangeInfoResult GlobalVarChangeInfo(uint gvid, int numinfo, int prop, co if ((newone != STR_UNDEFINED) && (curidx < CURRENCY_END)) { _currency_specs[curidx].name = newone; + _currency_specs[curidx].code.clear(); } break; } @@ -8067,10 +8067,10 @@ static void GRFLoadError(ByteReader *buf) } /* For now we can only show one message per newgrf file. */ - if (_cur.grfconfig->error != nullptr) return; + if (_cur.grfconfig->error.has_value()) return; - _cur.grfconfig->error = std::make_unique(sevstr[severity]); - GRFError *error = _cur.grfconfig->error.get(); + _cur.grfconfig->error = {sevstr[severity]}; + GRFError *error = &_cur.grfconfig->error.value(); if (message_id == 0xFF) { /* This is a custom error message. */ @@ -11680,7 +11680,7 @@ void LoadNewGRF(uint load_index, uint num_baseset) if (num_non_static == MAX_NON_STATIC_GRF_COUNT) { DEBUG(grf, 0, "'%s' is not loaded as the maximum number of non-static GRFs has been reached", c->filename.c_str()); c->status = GCS_DISABLED; - c->error = std::make_unique(STR_NEWGRF_ERROR_MSG_FATAL, STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED); + c->error = {STR_NEWGRF_ERROR_MSG_FATAL, STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED}; continue; } num_non_static++; diff --git a/src/newgrf_config.cpp b/src/newgrf_config.cpp index 4cbc74abf8..8a7ea60e84 100644 --- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -59,6 +59,7 @@ GRFConfig::GRFConfig(const GRFConfig &config) : name(config.name), info(config.info), url(config.url), + error(config.error), version(config.version), min_loadable_version(config.min_loadable_version), flags(config.flags & ~(1 << GCF_COPY)), @@ -71,7 +72,6 @@ GRFConfig::GRFConfig(const GRFConfig &config) : param_info(config.param_info), has_param_defaults(config.has_param_defaults) { - if (config.error != nullptr) this->error = std::make_unique(*config.error); } /** @@ -589,7 +589,7 @@ compatible_grf: c->ident.md5sum = f->ident.md5sum; c->name = f->name; c->info = f->name; - c->error = nullptr; + c->error.reset(); c->version = f->version; c->min_loadable_version = f->min_loadable_version; c->num_valid_params = f->num_valid_params; diff --git a/src/newgrf_config.h b/src/newgrf_config.h index 30fe5bb9e0..dd7260b11d 100644 --- a/src/newgrf_config.h +++ b/src/newgrf_config.h @@ -116,9 +116,9 @@ struct GRFError { std::string custom_message; ///< Custom message (if present) std::string data; ///< Additional data for message and custom_message - StringID message; ///< Default message - StringID severity; ///< Info / Warning / Error / Fatal - std::array param_value; ///< Values of GRF parameters to show for message and custom_message + StringID message{}; ///< Default message + StringID severity{}; ///< Info / Warning / Error / Fatal + std::array param_value{}; ///< Values of GRF parameters to show for message and custom_message }; /** The possible types of a newgrf parameter. */ @@ -163,7 +163,7 @@ struct GRFConfig : ZeroedMemoryAllocator { GRFTextWrapper name; ///< NOSAVE: GRF name (Action 0x08) GRFTextWrapper info; ///< NOSAVE: GRF info (author, copyright, ...) (Action 0x08) GRFTextWrapper url; ///< NOSAVE: URL belonging to this GRF. - std::unique_ptr error; ///< NOSAVE: Error/Warning during GRF loading (Action 0x0B) + std::optional error; ///< NOSAVE: Error/Warning during GRF loading (Action 0x0B) uint32 version; ///< NOSAVE: Version a NewGRF can set so only the newest NewGRF is shown uint32 min_loadable_version; ///< NOSAVE: Minimum compatible version a NewGRF can define diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index bc3d3dd7b7..a6d1d1a606 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -49,7 +49,7 @@ void ShowNewGRFError() for (const GRFConfig *c = _grfconfig; c != nullptr; c = c->next) { /* Only show Fatal and Error level messages */ - if (c->error == nullptr || (c->error->severity != STR_NEWGRF_ERROR_MSG_FATAL && c->error->severity != STR_NEWGRF_ERROR_MSG_ERROR)) continue; + if (!c->error.has_value() || (c->error->severity != STR_NEWGRF_ERROR_MSG_FATAL && c->error->severity != STR_NEWGRF_ERROR_MSG_ERROR)) continue; SetDParamStr(0, c->GetName()); SetDParam (1, c->error->message != STR_NULL ? c->error->message : STR_JUST_RAW_STRING); @@ -71,7 +71,7 @@ void ShowNewGRFError() static void ShowNewGRFInfo(const GRFConfig *c, const Rect &r, bool show_params) { Rect tr = r.Shrink(WidgetDimensions::scaled.frametext); - if (c->error != nullptr) { + if (c->error.has_value()) { SetDParamStr(0, c->error->custom_message); // is skipped by built-in messages SetDParamStr(1, c->filename); SetDParamStr(2, c->error->data); @@ -405,7 +405,7 @@ struct NewGRFParametersWindow : public Window { DropDownList list; for (uint32 i = par_info.min_value; i <= par_info.max_value; i++) { - list.emplace_back(new DropDownListCharStringItem(GetGRFStringFromGRFText(par_info.value_names.find(i)->second), i, false)); + list.emplace_back(new DropDownListStringItem(GetGRFStringFromGRFText(par_info.value_names.find(i)->second), i, false)); } ShowDropDownListAt(this, std::move(list), old_val, -1, wi_rect, COLOUR_ORANGE); @@ -892,8 +892,8 @@ struct NewGRFWindow : public Window, NewGRFScanCallback { } } DrawSprite(SPR_SQUARE, pal, square_left, tr.top + square_offset_y); - if (c->error != nullptr) DrawSprite(SPR_WARNING_SIGN, 0, warning_left, tr.top + warning_offset_y); - uint txtoffset = c->error == nullptr ? 0 : warning.width; + if (c->error.has_value()) DrawSprite(SPR_WARNING_SIGN, 0, warning_left, tr.top + warning_offset_y); + uint txtoffset = !c->error.has_value() ? 0 : warning.width; DrawString(text_left + (rtl ? 0 : txtoffset), text_right - (rtl ? txtoffset : 0), tr.top + offset_y, text, h ? TC_WHITE : TC_ORANGE); tr.top += step_height; } @@ -961,7 +961,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback { list.emplace_back(new DropDownListStringItem(STR_NONE, -1, false)); for (uint i = 0; i < this->grf_presets.size(); i++) { - list.emplace_back(new DropDownListCharStringItem(this->grf_presets[i], i, false)); + list.emplace_back(new DropDownListStringItem(this->grf_presets[i], i, false)); } this->DeleteChildWindows(WC_QUERY_STRING); // Remove the parameter query window @@ -1472,7 +1472,7 @@ private: { filter.ResetState(); filter.AddLine((*a)->GetName()); - filter.AddLine((*a)->filename.c_str()); + filter.AddLine((*a)->filename); filter.AddLine((*a)->GetDescription()); return filter.GetState();; } @@ -1837,7 +1837,7 @@ static const NWidgetPart _nested_newgrf_actives_widgets[] = { NWidget(WWT_TEXT, COLOUR_MAUVE), SetDataTip(STR_NEWGRF_SETTINGS_SELECT_PRESET, STR_NULL), SetPadding(0, WidgetDimensions::unscaled.frametext.right, 0, 0), NWidget(WWT_DROPDOWN, COLOUR_YELLOW, WID_NS_PRESET_LIST), SetFill(1, 0), SetResize(1, 0), - SetDataTip(STR_JUST_STRING, STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP), + SetDataTip(STR_JUST_STRING1, STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP), EndContainer(), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_NS_PRESET_SAVE), SetFill(1, 0), SetResize(1, 0), @@ -2132,7 +2132,7 @@ struct SavePresetWindow : public Window { resize->height = FONT_HEIGHT_NORMAL; size->height = 0; for (uint i = 0; i < this->presets.size(); i++) { - Dimension d = GetStringBoundingBox(this->presets[i].c_str()); + Dimension d = GetStringBoundingBox(this->presets[i]); size->width = std::max(size->width, d.width + padding.width); resize->height = std::max(resize->height, d.height); } @@ -2158,8 +2158,7 @@ struct SavePresetWindow : public Window { for (uint i = min_index; i < max_index; i++) { if ((int)i == this->selected) GfxFillRect(br.left, tr.top, br.right, tr.top + step_height - 1, PC_DARK_BLUE); - const char *text = this->presets[i].c_str(); - DrawString(tr.left, tr.right, tr.top + offset_y, text, ((int)i == this->selected) ? TC_WHITE : TC_SILVER); + DrawString(tr.left, tr.right, tr.top + offset_y, this->presets[i], ((int)i == this->selected) ? TC_WHITE : TC_SILVER); tr.top += step_height; } break; @@ -2174,7 +2173,7 @@ struct SavePresetWindow : public Window { auto it = this->vscroll->GetScrolledItemFromWidget(this->presets, pt.y, this, WID_SVP_PRESET_LIST); if (it != this->presets.end()) { this->selected = it - this->presets.begin(); - this->presetname_editbox.text.Assign(it->c_str()); + this->presetname_editbox.text.Assign(*it); this->SetWidgetDirty(WID_SVP_PRESET_LIST); this->SetWidgetDirty(WID_SVP_EDITBOX); } diff --git a/src/openttd.cpp b/src/openttd.cpp index c37631caa8..6e1a4b0c04 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -118,7 +118,6 @@ void CallLandscapeTick(); void IncreaseDate(); void DoPaletteAnimations(); void MusicLoop(); -void ResetMusic(); void CallWindowGameTickEvent(); bool HandleBootstrap(); void OnTick_Companies(bool main_tick); diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 22d0b79389..9fea31758b 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -2946,12 +2946,10 @@ public: for (uint i = 0; i < count; ++i) { const DispatchSchedule &ds = this->vehicle->orders->GetDispatchScheduleByIndex(i); if (ds.ScheduleName().empty()) { - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_TIMETABLE_ASSIGN_SCHEDULE_ID, i, false); - item->SetParam(0, i + 1); - list.emplace_back(item); + SetDParam(0, i + 1); + list.emplace_back(new DropDownListStringItem(STR_TIMETABLE_ASSIGN_SCHEDULE_ID, i, false)); } else { - DropDownListCharStringItem *item = new DropDownListCharStringItem(ds.ScheduleName(), i, false); - list.emplace_back(item); + list.emplace_back(new DropDownListStringItem(ds.ScheduleName(), i, false)); } } if (!list.empty()) ShowDropDownList(this, std::move(list), selected, WID_O_COND_SCHED_SELECT, 0); diff --git a/src/os/CMakeLists.txt b/src/os/CMakeLists.txt index e302c448b5..0ec182dfcb 100644 --- a/src/os/CMakeLists.txt +++ b/src/os/CMakeLists.txt @@ -1,4 +1,3 @@ add_subdirectory(macosx) -add_subdirectory(os2) add_subdirectory(unix) add_subdirectory(windows) diff --git a/src/os/macosx/font_osx.cpp b/src/os/macosx/font_osx.cpp index f017e8fb88..f502fe1676 100644 --- a/src/os/macosx/font_osx.cpp +++ b/src/os/macosx/font_osx.cpp @@ -24,72 +24,26 @@ #include "safeguards.h" - -#ifdef WITH_FREETYPE - -#include -#include FT_FREETYPE_H - -extern FT_Library _library; - - -FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) -{ - FT_Error err = FT_Err_Cannot_Open_Resource; - - /* Get font reference from name. */ - UInt8 file_path[PATH_MAX]; - OSStatus os_err = -1; - CFAutoRelease name(CFStringCreateWithCString(kCFAllocatorDefault, font_name, kCFStringEncodingUTF8)); - - /* Simply creating the font using CTFontCreateWithNameAndSize will *always* return - * something, no matter the name. As such, we can't use it to check for existence. - * We instead query the list of all font descriptors that match the given name which - * does not do this stupid name fallback. */ - CFAutoRelease name_desc(CTFontDescriptorCreateWithNameAndSize(name.get(), 0.0)); - CFAutoRelease mandatory_attribs(CFSetCreate(kCFAllocatorDefault, const_cast(reinterpret_cast(&kCTFontNameAttribute)), 1, &kCFTypeSetCallBacks)); - CFAutoRelease descs(CTFontDescriptorCreateMatchingFontDescriptors(name_desc.get(), mandatory_attribs.get())); - - /* Loop over all matches until we can get a path for one of them. */ - for (CFIndex i = 0; descs.get() != nullptr && i < CFArrayGetCount(descs.get()) && os_err != noErr; i++) { - CFAutoRelease font(CTFontCreateWithFontDescriptor((CTFontDescriptorRef)CFArrayGetValueAtIndex(descs.get(), i), 0.0, nullptr)); - CFAutoRelease fontURL((CFURLRef)CTFontCopyAttribute(font.get(), kCTFontURLAttribute)); - if (CFURLGetFileSystemRepresentation(fontURL.get(), true, file_path, lengthof(file_path))) os_err = noErr; - } - - if (os_err == noErr) { - DEBUG(fontcache, 3, "Font path for %s: %s", font_name, file_path); - err = FT_New_Face(_library, (const char *)file_path, 0, face); - } - - return err; -} - -#endif /* WITH_FREETYPE */ - - -bool SetFallbackFont(FontCacheSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback) +bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, int winlangid, MissingGlyphSearcher *callback) { /* Determine fallback font using CoreText. This uses the language isocode * to find a suitable font. CoreText is available from 10.5 onwards. */ - char lang[16]; - if (strcmp(language_isocode, "zh_TW") == 0) { + std::string lang; + if (language_isocode == "zh_TW") { /* Traditional Chinese */ - strecpy(lang, "zh-Hant", lastof(lang)); - } else if (strcmp(language_isocode, "zh_CN") == 0) { + lang = "zh-Hant"; + } else if (language_isocode == "zh_CN") { /* Simplified Chinese */ - strecpy(lang, "zh-Hans", lastof(lang)); + lang = "zh-Hans"; } else { /* Just copy the first part of the isocode. */ - strecpy(lang, language_isocode, lastof(lang)); - char *sep = strchr(lang, '_'); - if (sep != nullptr) *sep = '\0'; + lang = language_isocode.substr(0, language_isocode.find('_')); } /* Create a font descriptor matching the wanted language and latin (english) glyphs. * Can't use CFAutoRelease here for everything due to the way the dictionary has to be created. */ CFStringRef lang_codes[2]; - lang_codes[0] = CFStringCreateWithCString(kCFAllocatorDefault, lang, kCFStringEncodingUTF8); + lang_codes[0] = CFStringCreateWithCString(kCFAllocatorDefault, lang.c_str(), kCFStringEncodingUTF8); lang_codes[1] = CFSTR("en"); CFArrayRef lang_arr = CFArrayCreate(kCFAllocatorDefault, (const void **)lang_codes, lengthof(lang_codes), &kCFTypeArrayCallBacks); CFAutoRelease lang_attribs(CFDictionaryCreate(kCFAllocatorDefault, const_cast(reinterpret_cast(&kCTFontLanguagesAttribute)), (const void **)&lang_arr, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks)); diff --git a/src/os/os2/CMakeLists.txt b/src/os/os2/CMakeLists.txt deleted file mode 100644 index 52534dbcbb..0000000000 --- a/src/os/os2/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -add_files( - os2.cpp - CONDITION OPTION_OS2 -) diff --git a/src/os/os2/os2.cpp b/src/os/os2/os2.cpp deleted file mode 100644 index bcb056e1b2..0000000000 --- a/src/os/os2/os2.cpp +++ /dev/null @@ -1,219 +0,0 @@ -/* - * This file is part of OpenTTD. - * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. - * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . - */ - -/** @file os2.cpp OS2 related OS support. */ - -#include "../../stdafx.h" -#include "../../openttd.h" -#include "../../gui.h" -#include "../../fileio_func.h" -#include "../../fios.h" -#include "../../openttd.h" -#include "../../core/random_func.hpp" -#include "../../string_func.h" -#include "../../textbuf_gui.h" -#include "../../thread.h" - -#include "table/strings.h" - -#include -#include -#include -#include -#include -#ifndef __INNOTEK_LIBC__ -# include -#endif - -#include "../../safeguards.h" - -#define INCL_WIN -#define INCL_WINCLIPBOARD - -#include -#ifndef __INNOTEK_LIBC__ -# include -#endif - -bool FiosIsRoot(const char *file) -{ - return file[3] == '\0'; -} - -void FiosGetDrives(FileList &file_list) -{ - uint disk, disk2, save, total; - -#ifndef __INNOTEK_LIBC__ - _dos_getdrive(&save); // save original drive -#else - save = _getdrive(); // save original drive - char wd[MAX_PATH]; - getcwd(wd, MAX_PATH); - total = 'z'; -#endif - - /* get an available drive letter */ -#ifndef __INNOTEK_LIBC__ - for (disk = 1;; disk++) { - _dos_setdrive(disk, &total); -#else - for (disk = 'A';; disk++) { - _chdrive(disk); -#endif - if (disk >= total) break; - -#ifndef __INNOTEK_LIBC__ - _dos_getdrive(&disk2); -#else - disk2 = _getdrive(); -#endif - - if (disk == disk2) { - FiosItem *fios = file_list.Append(); - fios->type = FIOS_TYPE_DRIVE; - fios->mtime = 0; -#ifndef __INNOTEK_LIBC__ - fios->name += 'A' + disk - 1; -#else - fios->name += (char)disk; -#endif - fios->name += ':'; - fios->title = fios->name; - } - } - - /* Restore the original drive */ -#ifndef __INNOTEK_LIBC__ - _dos_setdrive(save, &total); -#else - chdir(wd); -#endif -} - -std::optional FiosGetDiskFreeSpace(const std::string &path) -{ -#ifndef __INNOTEK_LIBC__ - struct diskfree_t free; - char drive = path[0] - 'A' + 1; - - if (_getdiskfree(drive, &free) == 0) { - return free.avail_clusters * free.sectors_per_cluster * free.bytes_per_sector; - } -#elif defined(HAS_STATVFS) - struct statvfs s; - - if (statvfs(path.c_str(), &s) == 0) return static_cast(s.f_frsize) * s.f_bavail; -#endif - return std::nullopt; -} - -bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb) -{ - char filename[MAX_PATH]; - - snprintf(filename, lengthof(filename), "%s" PATHSEP "%s", path, ent->d_name); - return stat(filename, sb) == 0; -} - -bool FiosIsHiddenFile(const struct dirent *ent) -{ - return ent->d_name[0] == '.'; -} - -void ShowInfo(const char *str) -{ - HAB hab; - HMQ hmq; - ULONG rc; - - /* init PM env. */ - hmq = WinCreateMsgQueue((hab = WinInitialize(0)), 0); - - /* display the box */ - rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, (const unsigned char *)str, (const unsigned char *)"OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_INFORMATION); - - /* terminate PM env. */ - WinDestroyMsgQueue(hmq); - WinTerminate(hab); -} - -void ShowOSErrorBox(const char *buf, bool system) -{ - HAB hab; - HMQ hmq; - ULONG rc; - - /* init PM env. */ - hmq = WinCreateMsgQueue((hab = WinInitialize(0)), 0); - - /* display the box */ - rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, (const unsigned char *)buf, (const unsigned char *)"OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_ERROR); - - /* terminate PM env. */ - WinDestroyMsgQueue(hmq); - WinTerminate(hab); -} - -void DoOSAbort() -{ - abort(); -} - -int CDECL main(int argc, char *argv[]) -{ - SetRandomSeed(time(nullptr)); - - /* Make sure our arguments contain only valid UTF-8 characters. */ - for (int i = 0; i < argc; i++) StrMakeValidInPlace(argv[i]); - - return openttd_main(argc, argv); -} - -std::optional GetClipboardContents() -{ -/* XXX -- Currently no clipboard support implemented with GCC */ -#ifndef __INNOTEK_LIBC__ - HAB hab = 0; - - if (WinOpenClipbrd(hab)) { - const char *text = (const char *)WinQueryClipbrdData(hab, CF_TEXT); - - if (text != nullptr) { - std::string result = text; - WinCloseClipbrd(hab); - return result; - } - - WinCloseClipbrd(hab); - } -#endif - return std::nullopt; -} - - -void OSOpenBrowser(const char *url) -{ - // stub only - DEBUG(misc, 0, "Failed to open url: %s", url); -} - -void SetCurrentThreadName(const char *) -{ -} - -int GetCurrentThreadName(char *str, const char *last) { return 0; } - -void SetSelfAsMainThread() { } -void SetSelfAsGameThread() { } -void PerThreadSetup() { } -void PerThreadSetupInit() { } - -bool IsMainThread() { return false; } -bool IsNonMainThread() { return false; } -bool IsGameThread() { return false; } -bool IsNonGameThread() { return false; } diff --git a/src/os/unix/CMakeLists.txt b/src/os/unix/CMakeLists.txt index 2db47d18f8..c38b65deaf 100644 --- a/src/os/unix/CMakeLists.txt +++ b/src/os/unix/CMakeLists.txt @@ -1,12 +1,12 @@ add_files( crashlog_unix.cpp survey_unix.cpp - CONDITION UNIX AND NOT APPLE AND NOT OPTION_OS2 + CONDITION UNIX AND NOT APPLE ) add_files( unix.cpp - CONDITION UNIX AND NOT OPTION_OS2 + CONDITION UNIX ) add_files( diff --git a/src/os/unix/font_unix.cpp b/src/os/unix/font_unix.cpp index 55b830977b..d424c832ab 100644 --- a/src/os/unix/font_unix.cpp +++ b/src/os/unix/font_unix.cpp @@ -17,13 +17,25 @@ #include "safeguards.h" -#ifdef WITH_FREETYPE - #include #include FT_FREETYPE_H extern FT_Library _library; +/** + * Split the font name into the font family and style. These fields are separated by a comma, + * but the style does not necessarily need to exist. + * @param font_name The font name. + * @return The font family and style. + */ +static std::tuple SplitFontFamilyAndStyle(std::string_view font_name) +{ + auto separator = font_name.find(','); + if (separator == std::string_view::npos) return { std::string(font_name), std::string() }; + + auto begin = font_name.find_first_not_of("\t ", separator + 1); + return { std::string(font_name.substr(0, separator)), std::string(font_name.substr(begin)) }; +} FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) { @@ -37,39 +49,26 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) auto fc_instance = FcConfigReference(nullptr); assert(fc_instance != nullptr); - FcPattern *match; - FcPattern *pat; - FcFontSet *fs; - FcResult result; - char *font_style; - char *font_family; - /* Split & strip the font's style */ - font_family = stredup(font_name); - font_style = strchr(font_family, ','); - if (font_style != nullptr) { - font_style[0] = '\0'; - font_style++; - while (*font_style == ' ' || *font_style == '\t') font_style++; - } + auto [font_family, font_style] = SplitFontFamilyAndStyle(font_name); /* Resolve the name and populate the information structure */ - pat = FcNameParse((FcChar8 *)font_family); - if (font_style != nullptr) FcPatternAddString(pat, FC_STYLE, (FcChar8 *)font_style); + FcPattern *pat = FcNameParse((FcChar8 *)font_family.data()); + if (!font_style.empty()) FcPatternAddString(pat, FC_STYLE, (FcChar8 *)font_style.data()); FcConfigSubstitute(nullptr, pat, FcMatchPattern); FcDefaultSubstitute(pat); - fs = FcFontSetCreate(); - match = FcFontMatch(nullptr, pat, &result); + FcFontSet *fs = FcFontSetCreate(); + FcResult result; + FcPattern *match = FcFontMatch(nullptr, pat, &result); if (fs != nullptr && match != nullptr) { - int i; FcChar8 *family; FcChar8 *style; FcChar8 *file; int32_t index; FcFontSetAdd(fs, match); - for (i = 0; err != FT_Err_Ok && i < fs->nfont; i++) { + for (int i = 0; err != FT_Err_Ok && i < fs->nfont; i++) { /* Try the new filename */ if (FcPatternGetString(fs->fonts[i], FC_FILE, 0, &file) == FcResultMatch && FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch && @@ -77,7 +76,7 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) FcPatternGetInteger(fs->fonts[i], FC_INDEX, 0, &index) == FcResultMatch) { /* The correct style? */ - if (font_style != nullptr && !StrEqualsIgnoreCase(font_style, (char *)style)) continue; + if (!font_style.empty() && !StrEqualsIgnoreCase(font_style, (char *)style)) continue; /* Font config takes the best shot, which, if the family name is spelled * wrongly a 'random' font, so check whether the family name is the @@ -89,7 +88,6 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) } } - free(font_family); FcPatternDestroy(pat); FcFontSetDestroy(fs); FcConfigDestroy(fc_instance); @@ -97,10 +95,7 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) return err; } -#endif /* WITH_FREETYPE */ - - -bool SetFallbackFont(FontCacheSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback) +bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, int winlangid, MissingGlyphSearcher *callback) { bool ret = false; @@ -112,13 +107,10 @@ bool SetFallbackFont(FontCacheSettings *settings, const char *language_isocode, /* Fontconfig doesn't handle full language isocodes, only the part * before the _ of e.g. en_GB is used, so "remove" everything after * the _. */ - char lang[16]; - seprintf(lang, lastof(lang), ":lang=%s", language_isocode); - char *split = strchr(lang, '_'); - if (split != nullptr) *split = '\0'; + std::string lang = ":lang=" + language_isocode.substr(0, language_isocode.find('_')); /* First create a pattern to match the wanted language. */ - FcPattern *pat = FcNameParse((FcChar8 *)lang); + FcPattern *pat = FcNameParse((const FcChar8 *)lang.c_str()); /* We only want to know the filename. */ FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_SPACING, FC_SLANT, FC_WEIGHT, nullptr); /* Get the list of filenames matching the wanted language. */ diff --git a/src/os/windows/font_win32.cpp b/src/os/windows/font_win32.cpp index 861f784f9e..c473316785 100644 --- a/src/os/windows/font_win32.cpp +++ b/src/os/windows/font_win32.cpp @@ -31,209 +31,6 @@ #include "safeguards.h" -#ifdef WITH_FREETYPE - -#include -#include FT_FREETYPE_H - -extern FT_Library _library; - -/** - * Get the short DOS 8.3 format for paths. - * FreeType doesn't support Unicode filenames and Windows' fopen (as used - * by FreeType) doesn't support UTF-8 filenames. So we have to convert the - * filename into something that isn't UTF-8 but represents the Unicode file - * name. This is the short DOS 8.3 format. This does not contain any - * characters that fopen doesn't support. - * @param long_path the path in system encoding. - * @return the short path in ANSI (ASCII). - */ -static const char *GetShortPath(const wchar_t *long_path) -{ - static char short_path[MAX_PATH]; - wchar_t short_path_w[MAX_PATH]; - GetShortPathName(long_path, short_path_w, lengthof(short_path_w)); - WideCharToMultiByte(CP_ACP, 0, short_path_w, -1, short_path, lengthof(short_path), nullptr, nullptr); - return short_path; -} - -/* Get the font file to be loaded into Freetype by looping the registry - * location where windows lists all installed fonts. Not very nice, will - * surely break if the registry path changes, but it works. Much better - * solution would be to use CreateFont, and extract the font data from it - * by GetFontData. The problem with this is that the font file needs to be - * kept in memory then until the font is no longer needed. This could mean - * an additional memory usage of 30MB (just for fonts!) when using an eastern - * font for all font sizes */ -static const wchar_t *FONT_DIR_NT = L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"; -FT_Error GetFontByFaceName(const char *font_name, FT_Face *face) -{ - FT_Error err = FT_Err_Cannot_Open_Resource; - HKEY hKey; - LONG ret; - wchar_t vbuffer[MAX_PATH], dbuffer[256]; - wchar_t *pathbuf; - const char *font_path; - uint index; - size_t path_len; - - ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, FONT_DIR_NT, 0, KEY_READ, &hKey); - - if (ret != ERROR_SUCCESS) { - DEBUG(fontcache, 0, "Cannot open registry key HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"); - return err; - } - - /* Convert font name to file system encoding. */ - wchar_t *font_namep = wcsdup(OTTD2FS(font_name).c_str()); - - for (index = 0;; index++) { - wchar_t *s; - DWORD vbuflen = lengthof(vbuffer); - DWORD dbuflen = lengthof(dbuffer); - - ret = RegEnumValue(hKey, index, vbuffer, &vbuflen, nullptr, nullptr, (byte *)dbuffer, &dbuflen); - if (ret != ERROR_SUCCESS) goto registry_no_font_found; - - /* The font names in the registry are of the following 3 forms: - * - ADMUI3.fon - * - Book Antiqua Bold (TrueType) - * - Batang & BatangChe & Gungsuh & GungsuhChe (TrueType) - * We will strip the font-type '()' if any and work with the font name - * itself, which must match exactly; if... - * TTC files, font files which contain more than one font are separated - * by '&'. Our best bet will be to do substr match for the fontname - * and then let FreeType figure out which index to load */ - s = wcschr(vbuffer, L'('); - if (s != nullptr) s[-1] = '\0'; - - if (wcschr(vbuffer, L'&') == nullptr) { - if (wcsicmp(vbuffer, font_namep) == 0) break; - } else { - if (wcsstr(vbuffer, font_namep) != nullptr) break; - } - } - - if (!SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_FONTS, nullptr, SHGFP_TYPE_CURRENT, vbuffer))) { - DEBUG(fontcache, 0, "SHGetFolderPath cannot return fonts directory"); - goto folder_error; - } - - /* Some fonts are contained in .ttc files, TrueType Collection fonts. These - * contain multiple fonts inside this single file. GetFontData however - * returns the whole file, so we need to check each font inside to get the - * proper font. */ - path_len = wcslen(vbuffer) + wcslen(dbuffer) + 2; // '\' and terminating nul. - pathbuf = AllocaM(wchar_t, path_len); - _snwprintf(pathbuf, path_len, L"%s\\%s", vbuffer, dbuffer); - - /* Convert the path into something that FreeType understands. */ - font_path = GetShortPath(pathbuf); - - index = 0; - do { - err = FT_New_Face(_library, font_path, index, face); - if (err != FT_Err_Ok) break; - - if (StrStartsWithIgnoreCase(font_name, (*face)->family_name)) break; - /* Try english name if font name failed */ - if (StrStartsWithIgnoreCase(font_name + strlen(font_name) + 1, (*face)->family_name)) break; - err = FT_Err_Cannot_Open_Resource; - - } while ((FT_Long)++index != (*face)->num_faces); - - -folder_error: -registry_no_font_found: - free(font_namep); - RegCloseKey(hKey); - return err; -} - -/** - * Fonts can have localised names and when the system locale is the same as - * one of those localised names Windows will always return that localised name - * instead of allowing to get the non-localised (English US) name of the font. - * This will later on give problems as freetype uses the non-localised name of - * the font and we need to compare based on that name. - * Windows furthermore DOES NOT have an API to get the non-localised name nor - * can we override the system locale. This means that we have to actually read - * the font itself to gather the font name we want. - * Based on: http://blogs.msdn.com/michkap/archive/2006/02/13/530814.aspx - * @param logfont the font information to get the english name of. - * @return the English name (if it could be found). - */ -static std::string GetEnglishFontName(const ENUMLOGFONTEX *logfont) -{ - static char font_name[MAX_PATH]; - const char *ret_font_name = nullptr; - uint pos = 0; - HDC dc; - HGDIOBJ oldfont; - byte *buf; - DWORD dw; - uint16 format, count, stringOffset, platformId, encodingId, languageId, nameId, length, offset; - - HFONT font = CreateFontIndirect(&logfont->elfLogFont); - if (font == nullptr) goto err1; - - dc = GetDC(nullptr); - oldfont = SelectObject(dc, font); - dw = GetFontData(dc, 'eman', 0, nullptr, 0); - if (dw == GDI_ERROR) goto err2; - - buf = MallocT(dw); - dw = GetFontData(dc, 'eman', 0, buf, dw); - if (dw == GDI_ERROR) goto err3; - - format = buf[pos++] << 8; - format += buf[pos++]; - assert(format == 0); - count = buf[pos++] << 8; - count += buf[pos++]; - stringOffset = buf[pos++] << 8; - stringOffset += buf[pos++]; - for (uint i = 0; i < count; i++) { - platformId = buf[pos++] << 8; - platformId += buf[pos++]; - encodingId = buf[pos++] << 8; - encodingId += buf[pos++]; - languageId = buf[pos++] << 8; - languageId += buf[pos++]; - nameId = buf[pos++] << 8; - nameId += buf[pos++]; - if (nameId != 1) { - pos += 4; // skip length and offset - continue; - } - length = buf[pos++] << 8; - length += buf[pos++]; - offset = buf[pos++] << 8; - offset += buf[pos++]; - - /* Don't buffer overflow */ - length = std::min(length, MAX_PATH - 1); - for (uint j = 0; j < length; j++) font_name[j] = buf[stringOffset + offset + j]; - font_name[length] = '\0'; - - if ((platformId == 1 && languageId == 0) || // Macintosh English - (platformId == 3 && languageId == 0x0409)) { // Microsoft English (US) - ret_font_name = font_name; - break; - } - } - -err3: - free(buf); -err2: - SelectObject(dc, oldfont); - ReleaseDC(nullptr, dc); - DeleteObject(font); -err1: - return ret_font_name == nullptr ? FS2OTTD((const wchar_t *)logfont->elfFullName) : std::string(ret_font_name); -} -#endif /* WITH_FREETYPE */ - struct EFCParam { FontCacheSettings *settings; LOCALESIGNATURE locale; @@ -284,38 +81,13 @@ static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXT char font_name[MAX_PATH]; convert_from_fs((const wchar_t *)logfont->elfFullName, font_name, lengthof(font_name)); -#ifdef WITH_FREETYPE - /* Add english name after font name */ - std::string english_name = GetEnglishFontName(logfont); - strecpy(font_name + strlen(font_name) + 1, english_name.c_str(), lastof(font_name)); - - /* Check whether we can actually load the font. */ - bool ft_init = _library != nullptr; - bool found = false; - FT_Face face; - /* Init FreeType if needed. */ - if ((ft_init || FT_Init_FreeType(&_library) == FT_Err_Ok) && GetFontByFaceName(font_name, &face) == FT_Err_Ok) { - FT_Done_Face(face); - found = true; - } - if (!ft_init) { - /* Uninit FreeType if we did the init. */ - FT_Done_FreeType(_library); - _library = nullptr; - } - - if (!found) return 1; -#else - const char *english_name = font_name; -#endif /* WITH_FREETYPE */ - info->callback->SetFontNames(info->settings, font_name, &logfont->elfLogFont); if (info->callback->FindMissingGlyphs()) return 1; - DEBUG(fontcache, 1, "Fallback font: %s (%s)", font_name, english_name); + DEBUG(fontcache, 1, "Fallback font: %s", font_name); return 0; // stop enumerating } -bool SetFallbackFont(FontCacheSettings *settings, const char *language_isocode, int winlangid, MissingGlyphSearcher *callback) +bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, int winlangid, MissingGlyphSearcher *callback) { DEBUG(fontcache, 1, "Trying fallback fonts"); EFCParam langInfo; diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index de3e8e573d..b09ffb80ab 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -429,10 +429,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi PerThreadSetupInit(); CrashLog::InitialiseCrashLog(); - /* Convert the command line to UTF-8. We need a dedicated buffer - * for this because argv[] points into this buffer and this needs to - * be available between subsequent calls to FS2OTTD(). */ - char *cmdline = stredup(FS2OTTD(GetCommandLine()).c_str()); + /* Convert the command line to UTF-8. */ + std::string cmdline = FS2OTTD(GetCommandLine()); /* Set the console codepage to UTF-8. */ SetConsoleOutputCP(CP_UTF8); @@ -446,7 +444,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi /* setup random seed to something quite random */ SetRandomSeed(GetTickCount()); - argc = ParseCommandLine(cmdline, argv, lengthof(argv)); + argc = ParseCommandLine(cmdline.data(), argv, lengthof(argv)); /* Make sure our arguments contain only valid UTF-8 characters. */ for (int i = 0; i < argc; i++) StrMakeValidInPlace(argv[i]); @@ -456,7 +454,6 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi /* Restore system timer resolution. */ timeEndPeriod(1); - free(cmdline); return 0; } @@ -659,23 +656,21 @@ const char *GetCurrentLocale(const char *) static WCHAR _cur_iso_locale[16] = L""; -void Win32SetCurrentLocaleName(const char *iso_code) +void Win32SetCurrentLocaleName(std::string iso_code) { /* Convert the iso code into the format that windows expects. */ - char iso[16]; - if (strcmp(iso_code, "zh_TW") == 0) { - strecpy(iso, "zh-Hant", lastof(iso)); - } else if (strcmp(iso_code, "zh_CN") == 0) { - strecpy(iso, "zh-Hans", lastof(iso)); + if (iso_code == "zh_TW") { + iso_code = "zh-Hant"; + } else if (iso_code == "zh_CN") { + iso_code = "zh-Hans"; } else { /* Windows expects a '-' between language and country code, but we use a '_'. */ - strecpy(iso, iso_code, lastof(iso)); - for (char *c = iso; *c != '\0'; c++) { - if (*c == '_') *c = '-'; + for (char &c : iso_code) { + if (c == '_') c = '-'; } } - MultiByteToWideChar(CP_UTF8, 0, iso, -1, _cur_iso_locale, lengthof(_cur_iso_locale)); + MultiByteToWideChar(CP_UTF8, 0, iso_code.c_str(), -1, _cur_iso_locale, lengthof(_cur_iso_locale)); } int OTTDStringCompare(std::string_view s1, std::string_view s2) diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 16a5cde9e5..d45bd1113a 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1002,7 +1002,7 @@ HotkeyList BuildRailToolbarWindow::hotkeys("railtoolbar", railtoolbar_hotkeys, R static const NWidgetPart _nested_build_rail_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN), - NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, WID_RAT_CAPTION), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetTextStyle(TC_WHITE), + NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, WID_RAT_CAPTION), SetDataTip(STR_JUST_STRING2, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetTextStyle(TC_WHITE), NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN), EndContainer(), NWidget(NWID_HORIZONTAL), @@ -2830,18 +2830,16 @@ DropDownList GetRailTypeDropDownList(bool for_replacement, bool all_option) const RailtypeInfo *rti = GetRailTypeInfo(rt); - StringID str = for_replacement ? rti->strings.replace_text : (rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING); - DropDownListParamStringItem *item; + SetDParam(0, rti->strings.menu_text); + SetDParam(1, rti->max_speed); if (for_replacement) { - item = new DropDownListParamStringItem(str, rt, !HasBit(avail_railtypes, rt)); + list.emplace_back(new DropDownListStringItem(rti->strings.replace_text, rt, !HasBit(avail_railtypes, rt))); } else { + StringID str = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING; DropDownListIconItem *iconitem = new DropDownListIconItem(rti->gui_sprites.build_x_rail, PAL_NONE, str, rt, !HasBit(avail_railtypes, rt)); iconitem->SetDimension(d); - item = iconitem; + list.emplace_back(iconitem); } - item->SetParam(0, rti->strings.menu_text); - item->SetParam(1, rti->max_speed); - list.emplace_back(item); } if (list.size() == 0) { diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 773367403a..b45b4c3367 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -940,7 +940,7 @@ HotkeyList BuildRoadToolbarWindow::tram_hotkeys("tramtoolbar", tramtoolbar_hotke static const NWidgetPart _nested_build_road_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN), - NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, WID_ROT_CAPTION), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetTextStyle(TC_WHITE), + NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, WID_ROT_CAPTION), SetDataTip(STR_JUST_STRING2, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetTextStyle(TC_WHITE), NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN), EndContainer(), NWidget(NWID_HORIZONTAL), @@ -2326,18 +2326,16 @@ DropDownList GetRoadTypeDropDownList(RoadTramTypes rtts, bool for_replacement, b const RoadTypeInfo *rti = GetRoadTypeInfo(rt); - DropDownListParamStringItem *item; + SetDParam(0, rti->strings.menu_text); + SetDParam(1, rti->max_speed); if (for_replacement) { - item = new DropDownListParamStringItem(rti->strings.replace_text, rt, !HasBit(avail_roadtypes, rt)); + list.emplace_back(new DropDownListStringItem(rti->strings.replace_text, rt, !HasBit(avail_roadtypes, rt))); } else { StringID str = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING; DropDownListIconItem *iconitem = new DropDownListIconItem(rti->gui_sprites.build_x_road, PAL_NONE, str, rt, !HasBit(avail_roadtypes, rt)); iconitem->SetDimension(d); - item = iconitem; + list.emplace_back(iconitem); } - item->SetParam(0, rti->strings.menu_text); - item->SetParam(1, rti->max_speed / 2); - list.emplace_back(item); } if (list.size() == 0) { @@ -2372,11 +2370,11 @@ DropDownList GetScenRoadTypeDropDownList(RoadTramTypes rtts) const RoadTypeInfo *rti = GetRoadTypeInfo(rt); + SetDParam(0, rti->strings.menu_text); + SetDParam(1, rti->max_speed); StringID str = rti->max_speed > 0 ? STR_TOOLBAR_RAILTYPE_VELOCITY : STR_JUST_STRING; DropDownListIconItem *item = new DropDownListIconItem(rti->gui_sprites.build_x_road, PAL_NONE, str, rt, !HasBit(avail_roadtypes, rt)); item->SetDimension(d); - item->SetParam(0, rti->strings.menu_text); - item->SetParam(1, rti->max_speed / 2); list.emplace_back(item); } diff --git a/src/saveload/order_sl.cpp b/src/saveload/order_sl.cpp index 13bf9f752a..d32657bf11 100644 --- a/src/saveload/order_sl.cpp +++ b/src/saveload/order_sl.cpp @@ -90,27 +90,23 @@ struct ORDRChunkHandler : ChunkHandler { /* Pre-version 5 had another layout for orders * (uint16 instead of uint32) */ len /= sizeof(uint16); - uint16 *orders = MallocT(len + 1); + std::vector orders(len); - SlCopy(orders, len, SLE_UINT16); + SlCopy(&orders[0], len, SLE_UINT16); for (size_t i = 0; i < len; ++i) { Order *o = new (i) Order(); o->AssignOrder(UnpackVersion4Order(orders[i])); } - - free(orders); } else if (IsSavegameVersionBefore(SLV_5, 2)) { len /= sizeof(uint32); - uint32 *orders = MallocT(len + 1); + std::vector orders(len); - SlCopy(orders, len, SLE_UINT32); + SlCopy(&orders[0], len, SLE_UINT32); for (size_t i = 0; i < len; ++i) { new (i) Order(orders[i]); } - - free(orders); } /* Update all the next pointer */ diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 3d543fe7b9..0cf09261ed 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -25,6 +25,7 @@ #include "saveload.h" #include "../debug.h" #include "../string_func.h" +#include "../string_func_extra.h" #include "../strings_func.h" #include "../core/bitmath_func.hpp" #include "../vehicle_base.h" @@ -779,25 +780,22 @@ static void SlStdString(void *ptr, VarType conv) return; } - char *buf = AllocaM(char, len + 1); - SlCopyBytes(buf, len); - buf[len] = '\0'; // properly terminate the string + str->resize(len); + SlCopyBytes(str->data(), len); StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK; if ((conv & SLF_ALLOW_CONTROL) != 0) { settings = settings | SVS_ALLOW_CONTROL_CODE; if (IsSavegameVersionBefore(SLV_169)) { - str_fix_scc_encoded(buf, buf + len); + char *buf = str->data(); + str->resize(str_fix_scc_encoded(buf, buf + str->size()) - buf); } } if ((conv & SLF_ALLOW_NEWLINE) != 0) { settings = settings | SVS_ALLOW_NEWLINE; } - StrMakeValidInPlace(buf, buf + len, settings); - - // Store sanitized string. - str->assign(buf); + StrMakeValidInPlace(*str, settings); } case SLA_PTRS: break; diff --git a/src/schdispatch_gui.cpp b/src/schdispatch_gui.cpp index 38d48f4892..788e29d7a6 100644 --- a/src/schdispatch_gui.cpp +++ b/src/schdispatch_gui.cpp @@ -1132,9 +1132,8 @@ struct ScheduledDispatchAddSlotsWindow : Window { auto handle_hours_dropdown = [&](uint current) { DropDownList list; for (uint i = 0; i < 24; i++) { - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false); - item->SetParam(0, i); - list.emplace_back(item); + SetDParam(0, i); + list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false)); } ShowDropDownList(this, std::move(list), MINUTES_HOUR(current), widget); }; @@ -1142,9 +1141,8 @@ struct ScheduledDispatchAddSlotsWindow : Window { auto handle_minutes_dropdown = [&](uint current) { DropDownList list; for (uint i = 0; i < 60; i++) { - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false); - item->SetParam(0, i); - list.emplace_back(item); + SetDParam(0, i); + list.emplace_back(new DropDownListStringItem(STR_JUST_INT, i, false)); } ShowDropDownList(this, std::move(list), MINUTES_MINUTE(current), widget); }; diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp index 058e6cf245..ad0bd45f28 100644 --- a/src/script/api/script_text.cpp +++ b/src/script/api/script_text.cpp @@ -141,10 +141,11 @@ SQInteger ScriptText::_set(HSQUIRRELVM vm) if (sq_gettype(vm, 2) == OT_STRING) { const SQChar *key_string; sq_getstring(vm, 2, &key_string); - StrMakeValidInPlace(const_cast(key_string)); - if (strncmp(key_string, "param_", 6) != 0 || strlen(key_string) > 8) return SQ_ERROR; - k = atoi(key_string + 6); + std::string str = StrMakeValid(key_string); + if (!StrStartsWith(str, "param_") || str.size() > 8) return SQ_ERROR; + + k = stoi(str.substr(6)); } else if (sq_gettype(vm, 2) == OT_INTEGER) { SQInteger key; sq_getinteger(vm, 2, &key); diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp index 670e6844b6..e94a7fae0c 100644 --- a/src/script/script_gui.cpp +++ b/src/script/script_gui.cpp @@ -393,7 +393,7 @@ struct ScriptSettingsWindow : 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; @@ -483,7 +483,7 @@ struct ScriptSettingsWindow : 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); @@ -1187,7 +1187,7 @@ static const NWidgetPart _nested_script_debug_widgets[] = { EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SCRD_SCRIPT_GAME), SetMinimalSize(100, 20), SetResize(1, 0), SetDataTip(STR_AI_GAME_SCRIPT, STR_AI_GAME_SCRIPT_TOOLTIP), - NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SCRD_NAME_TEXT), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_JUST_STRING, STR_AI_DEBUG_NAME_TOOLTIP), + NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_SCRD_NAME_TEXT), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_JUST_STRING2, STR_AI_DEBUG_NAME_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCRD_SETTINGS), SetMinimalSize(100, 20), SetDataTip(STR_AI_DEBUG_SETTINGS, STR_AI_DEBUG_SETTINGS_TOOLTIP), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_SCRD_RELOAD_TOGGLE), SetMinimalSize(100, 20), SetDataTip(STR_AI_DEBUG_RELOAD, STR_AI_DEBUG_RELOAD_TOOLTIP), EndContainer(), diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp index d037af2e59..22a4d7431a 100644 --- a/src/script/script_info.cpp +++ b/src/script/script_info.cpp @@ -90,11 +90,11 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm) /* Read the table, and find all properties we care about */ sq_pushnull(vm); while (SQ_SUCCEEDED(sq_next(vm, -2))) { - const SQChar *key; - if (SQ_FAILED(sq_getstring(vm, -2, &key))) return SQ_ERROR; - StrMakeValidInPlace(const_cast(key)); + const SQChar *key_string; + if (SQ_FAILED(sq_getstring(vm, -2, &key_string))) return SQ_ERROR; + std::string key = StrMakeValid(key_string); - if (strcmp(key, "name") == 0) { + if (key == "name") { const SQChar *sqvalue; if (SQ_FAILED(sq_getstring(vm, -1, &sqvalue))) return SQ_ERROR; @@ -104,51 +104,51 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm) config.name = StrMakeValid(sqvalue); std::replace_if(config.name.begin(), config.name.end(), replace_with_underscore, '_'); items |= 0x001; - } else if (strcmp(key, "description") == 0) { + } else if (key == "description") { const SQChar *sqdescription; if (SQ_FAILED(sq_getstring(vm, -1, &sqdescription))) return SQ_ERROR; config.description = StrMakeValid(sqdescription); items |= 0x002; - } else if (strcmp(key, "min_value") == 0) { + } else if (key == "min_value") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.min_value = ClampTo(res); items |= 0x004; - } else if (strcmp(key, "max_value") == 0) { + } else if (key == "max_value") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.max_value = ClampTo(res); items |= 0x008; - } else if (strcmp(key, "easy_value") == 0) { + } else if (key == "easy_value") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.easy_value = ClampTo(res); items |= 0x010; - } else if (strcmp(key, "medium_value") == 0) { + } else if (key == "medium_value") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.medium_value = ClampTo(res); items |= 0x020; - } else if (strcmp(key, "hard_value") == 0) { + } else if (key == "hard_value") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.hard_value = ClampTo(res); items |= 0x040; - } else if (strcmp(key, "random_deviation") == 0) { + } else if (key == "random_deviation") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.random_deviation = ClampTo(abs(res)); items |= 0x200; - } else if (strcmp(key, "custom_value") == 0) { + } else if (key == "custom_value") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.custom_value = ClampTo(res); items |= 0x080; - } else if (strcmp(key, "step_size") == 0) { + } else if (key == "step_size") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.step_size = ClampTo(res); - } else if (strcmp(key, "flags") == 0) { + } else if (key == "flags") { SQInteger res; if (SQ_FAILED(sq_getinteger(vm, -1, &res))) return SQ_ERROR; config.flags = (ScriptConfigFlags)res; @@ -184,9 +184,9 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm) SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm) { - const SQChar *setting_name; - if (SQ_FAILED(sq_getstring(vm, -2, &setting_name))) return SQ_ERROR; - StrMakeValidInPlace(const_cast(setting_name)); + const SQChar *setting_name_str; + if (SQ_FAILED(sq_getstring(vm, -2, &setting_name_str))) return SQ_ERROR; + std::string setting_name = StrMakeValid(setting_name_str); ScriptConfigItem *config = nullptr; for (auto &item : this->config_list) { @@ -216,9 +216,7 @@ SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm) key_string++; } int key = atoi(key_string) * sign; - StrMakeValidInPlace(const_cast(label)); - - config->labels[key] = label; + config->labels[key] = StrMakeValid(label); sq_pop(vm, 2); } diff --git a/src/settings.cpp b/src/settings.cpp index 8fac35bc03..f731997eb8 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -674,23 +674,23 @@ static void IniLoadSettings(IniFile &ini, const SettingTable &settings_table, co group = group_def; } - item = group->GetItem(s, false); + item = group->GetItem(s); if (item == nullptr && group != group_def) { /* For settings.xx.yy load the settings from [settings] yy = ? in case the previous * did not exist (e.g. loading old config files with a [settings] section */ - item = group_def->GetItem(s, false); + item = group_def->GetItem(s); } if (item == nullptr) { /* For settings.xx.zz.yy load the settings from [zz] yy = ? in case the previous * did not exist (e.g. loading old config files with a [yapf] section */ sc = s.find('.'); - if (sc != std::string::npos) item = ini.GetGroup(s.substr(0, sc))->GetItem(s.substr(sc + 1), false); + if (sc != std::string::npos) item = ini.GetGroup(s.substr(0, sc))->GetItem(s.substr(sc + 1)); } if (item == nullptr && sd->guiproc != nullptr) { SettingOnGuiCtrlData data; data.type = SOGCT_CFG_FALLBACK_NAME; if (sd->guiproc(data)) { - item = group->GetItem(data.str, false); + item = group->GetItem(data.str); } } } @@ -745,8 +745,6 @@ void ListSettingDesc::ParseValue(const IniItem *item, void *object) const static void IniSaveSettings(IniFile &ini, const SettingTable &settings_table, const char *grpname, void *object, bool) { IniGroup *group_def = nullptr, *group; - IniItem *item; - char buf[512]; for (auto &sd : settings_table) { /* If the setting is not saved to the configuration @@ -766,14 +764,15 @@ static void IniSaveSettings(IniFile &ini, const SettingTable &settings_table, co group = group_def; } - item = group->GetItem(s, true); + IniItem &item = group->GetOrCreateItem(s); - if (!item->value.has_value() || !sd->IsSameValue(item, object)) { + if (!item.value.has_value() || !sd->IsSameValue(&item, object)) { /* Value has changed, get the new value and put it into a buffer */ + char buf[512]; sd->FormatValue(buf, lastof(buf), object); /* The value is different, that means we have to write it to the ini */ - item->value.emplace(buf); + item.value.emplace(buf); } } } @@ -874,7 +873,7 @@ static void IniSaveSettingList(IniFile &ini, const char *grpname, StringList &li group->Clear(); for (const auto &iter : list) { - group->GetItem(iter.c_str(), true)->SetValue(""); + group->GetOrCreateItem(iter.c_str()).SetValue(""); } } @@ -2181,7 +2180,7 @@ static IniFileVersion LoadVersionFromConfig(IniFile &ini) { IniGroup *group = ini.GetGroup("version"); - auto version_number = group->GetItem("ini_version", false); + auto version_number = group->GetItem("ini_version"); /* Older ini-file versions don't have this key yet. */ if (version_number == nullptr || !version_number->value.has_value()) return IFV_0; @@ -2242,9 +2241,9 @@ static void GameSaveConfig(IniFile &ini, const char *grpname) static void SaveVersionInConfig(IniFile &ini) { IniGroup *group = ini.GetGroup("version"); - group->GetItem("version_string", true)->SetValue(_openttd_revision); - group->GetItem("version_number", true)->SetValue(stdstr_fmt("%08X", _openttd_newgrf_version)); - group->GetItem("ini_version", true)->SetValue(std::to_string(INIFILE_VERSION)); + group->GetOrCreateItem("version_string").SetValue(_openttd_revision); + group->GetOrCreateItem("version_number").SetValue(stdstr_fmt("%08X", _openttd_newgrf_version)); + group->GetOrCreateItem("ini_version").SetValue(std::to_string(INIFILE_VERSION)); } /* Save a GRF configuration to the given group name */ @@ -2260,7 +2259,7 @@ static void GRFSaveConfig(IniFile &ini, const char *grpname, const GRFConfig *li char *pos = key + seprintf(key, lastof(key), "%08X|", BSWAP32(c->ident.grfid)); pos = md5sumToString(pos, lastof(key), c->ident.md5sum); seprintf(pos, lastof(key), "|%s", c->filename.c_str()); - group->GetItem(key, true)->SetValue(GRFBuildParamList(c)); + group->GetOrCreateItem(key).SetValue(GRFBuildParamList(c)); } } @@ -2361,7 +2360,7 @@ void LoadFromConfig(bool startup) if (_settings_client.network.server_game_type == SERVER_GAME_TYPE_LOCAL) { IniGroup *network = generic_ini.GetGroup("network", false); if (network != nullptr) { - IniItem *server_advertise = network->GetItem("server_advertise", false); + IniItem *server_advertise = network->GetItem("server_advertise"); if (server_advertise != nullptr && server_advertise->value == "true") { _settings_client.network.server_game_type = SERVER_GAME_TYPE_PUBLIC; } @@ -2377,7 +2376,7 @@ void LoadFromConfig(bool startup) if (generic_version < IFV_NETWORK_PRIVATE_SETTINGS) { IniGroup *network = generic_ini.GetGroup("network", false); if (network != nullptr) { - IniItem *no_http_content_downloads = network->GetItem("no_http_content_downloads", false); + IniItem *no_http_content_downloads = network->GetItem("no_http_content_downloads"); if (no_http_content_downloads != nullptr) { if (no_http_content_downloads->value == "true") { _settings_client.network.no_http_content_downloads = true; @@ -2386,7 +2385,7 @@ void LoadFromConfig(bool startup) } } - IniItem *use_relay_service = network->GetItem("use_relay_service", false); + IniItem *use_relay_service = network->GetItem("use_relay_service"); if (use_relay_service != nullptr) { if (use_relay_service->value == "never") { _settings_client.network.use_relay_service = UseRelayService::URS_NEVER; diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index fb2df4995e..8214f9a193 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -45,6 +45,7 @@ #include "network/core/config.h" #include "network/network_gui.h" #include "network/network_survey.h" +#include "video/video_driver.hpp" #include #include @@ -53,7 +54,6 @@ #include #include "safeguards.h" -#include "video/video_driver.hpp" uint GetSettingIndexByFullName(const char *name); const SettingDesc *GetSettingDescription(uint index); @@ -95,7 +95,7 @@ static DropDownList BuildSetDropDownList(int *selected_index, bool allow_selecti DropDownList list; for (int i = 0; i < n; i++) { - list.emplace_back(new DropDownListCharStringItem(T::GetSet(i)->name, i, !allow_selection && (*selected_index != i))); + list.emplace_back(new DropDownListStringItem(T::GetSet(i)->name, i, !allow_selection && (*selected_index != i))); } return list; @@ -235,13 +235,19 @@ struct GameOptionsWindow : Window { switch (widget) { case WID_GO_CURRENCY_DROPDOWN: { // Setup currencies dropdown *selected_index = this->opt->locale.currency; - StringID *items = BuildCurrencyDropdown(); uint64 disabled = _game_mode == GM_MENU ? 0LL : ~GetMaskOfAllowedCurrencies(); /* Add non-custom currencies; sorted naturally */ - for (uint i = 0; i < CURRENCY_END; items++, i++) { + for (const CurrencySpec ¤cy : _currency_specs) { + int i = ¤cy - _currency_specs; if (i == CURRENCY_CUSTOM) continue; - list.emplace_back(new DropDownListStringItem(*items, i, HasBit(disabled, i))); + if (currency.code.empty()) { + list.emplace_back(new DropDownListStringItem(currency.name, i, HasBit(disabled, i))); + } else { + SetDParam(0, currency.name); + SetDParamStr(1, currency.code); + list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_CURRENCY_CODE, i, HasBit(disabled, i))); + } } std::sort(list.begin(), list.end(), DropDownListStringItem::NatSortFunc); @@ -265,20 +271,19 @@ struct GameOptionsWindow : Window { bool hide_language = IsReleasedVersion() && !_languages[i].IsReasonablyFinished(); if (hide_language) continue; bool hide_percentage = IsReleasedVersion() || _languages[i].missing < _settings_client.gui.missing_strings_threshold; - auto item = new DropDownListParamStringItem(hide_percentage ? STR_JUST_RAW_STRING : STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE, i, false); if (&_languages[i] == _current_language) { *selected_index = i; - item->SetParamStr(0, _languages[i].own_name); + SetDParamStr(0, _languages[i].own_name); } else { /* Especially with sprite-fonts, not all localized * names can be rendered. So instead, we use the * international names for anything but the current * selected language. This avoids showing a few ???? * entries in the dropdown list. */ - item->SetParamStr(0, _languages[i].name); + SetDParamStr(0, _languages[i].name); } - item->SetParam(1, (LANGUAGE_TOTAL_STRINGS - _languages[i].missing) * 100 / LANGUAGE_TOTAL_STRINGS); - list.emplace_back(item); + SetDParam(1, (LANGUAGE_TOTAL_STRINGS - _languages[i].missing) * 100 / LANGUAGE_TOTAL_STRINGS); + list.emplace_back(new DropDownListStringItem(hide_percentage ? STR_JUST_RAW_STRING : STR_GAME_OPTIONS_LANGUAGE_PERCENTAGE, i, false)); } std::sort(list.begin(), list.end(), DropDownListStringItem::NatSortFunc); break; @@ -289,10 +294,9 @@ struct GameOptionsWindow : Window { *selected_index = GetCurrentResolutionIndex(); for (uint i = 0; i < _resolutions.size(); i++) { - auto item = new DropDownListParamStringItem(STR_GAME_OPTIONS_RESOLUTION_ITEM, i, false); - item->SetParam(0, _resolutions[i].width); - item->SetParam(1, _resolutions[i].height); - list.emplace_back(item); + SetDParam(0, _resolutions[i].width); + SetDParam(1, _resolutions[i].height); + list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_RESOLUTION_ITEM, i, false)); } break; @@ -300,9 +304,8 @@ struct GameOptionsWindow : Window { for (auto it = _refresh_rates.begin(); it != _refresh_rates.end(); it++) { auto i = std::distance(_refresh_rates.begin(), it); if (*it == _settings_client.gui.refresh_rate) *selected_index = i; - auto item = new DropDownListParamStringItem(STR_GAME_OPTIONS_REFRESH_RATE_ITEM, i, false); - item->SetParam(0, *it); - list.emplace_back(item); + SetDParam(0, *it); + list.emplace_back(new DropDownListStringItem(STR_GAME_OPTIONS_REFRESH_RATE_ITEM, i, false)); } break; @@ -325,7 +328,17 @@ struct GameOptionsWindow : Window { void SetStringParameters(int widget) const override { switch (widget) { - case WID_GO_CURRENCY_DROPDOWN: SetDParam(0, _currency_specs[this->opt->locale.currency].name); break; + case WID_GO_CURRENCY_DROPDOWN: { + const CurrencySpec ¤cy = _currency_specs[this->opt->locale.currency]; + if (currency.code.empty()) { + SetDParam(0, currency.name); + } else { + SetDParam(0, STR_GAME_OPTIONS_CURRENCY_CODE); + SetDParam(1, currency.name); + SetDParamStr(2, currency.code); + } + break; + } case WID_GO_AUTOSAVE_DROPDOWN: { if (_settings_client.gui.autosave == 5) { SetDParam(0, _settings_client.gui.autosave_custom_days == 1 ? STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_DAYS_CUSTOM_SINGULAR : STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_DAYS_CUSTOM); @@ -847,7 +860,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { EndContainer(), NWidget(WWT_FRAME, COLOUR_GREY), SetDataTip(STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME, STR_NULL), - NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_CURRENCY_DROPDOWN), SetMinimalSize(100, 12), SetDataTip(STR_JUST_STRING, STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP), SetFill(1, 0), + NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_CURRENCY_DROPDOWN), SetMinimalSize(100, 12), SetDataTip(STR_JUST_STRING2, STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP), SetFill(1, 0), EndContainer(), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_GO_SURVEY_SEL), @@ -893,7 +906,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_TEXT, COLOUR_GREY), SetMinimalSize(0, 12),SetDataTip(STR_GAME_OPTIONS_RESOLUTION, STR_NULL), NWidget(NWID_SPACER), SetMinimalSize(1, 0), SetFill(1, 0), - NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_RESOLUTION_DROPDOWN), SetMinimalSize(100, 12), SetDataTip(STR_JUST_STRING, STR_GAME_OPTIONS_RESOLUTION_TOOLTIP), + NWidget(WWT_DROPDOWN, COLOUR_GREY, WID_GO_RESOLUTION_DROPDOWN), SetMinimalSize(100, 12), SetDataTip(STR_JUST_STRING2, STR_GAME_OPTIONS_RESOLUTION_TOOLTIP), EndContainer(), NWidget(NWID_HORIZONTAL), NWidget(WWT_TEXT, COLOUR_GREY), SetMinimalSize(0, 12), SetDataTip(STR_GAME_OPTIONS_REFRESH_RATE, STR_NULL), @@ -1273,7 +1286,7 @@ uint BaseSettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int if (cur_row >= max_row) return cur_row; bool rtl = _current_text_dir == TD_RTL; - int offset = (rtl ? -(int)_circle_size.width : _circle_size.width) / 2; + int offset = (rtl ? -(int)_circle_size.width : (int)_circle_size.width) / 2; int level_width = rtl ? -WidgetDimensions::scaled.hsep_indent : WidgetDimensions::scaled.hsep_indent; int x = rtl ? right : left; @@ -1291,7 +1304,7 @@ uint BaseSettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int int bottom_y = (flags & SEF_LAST_FIELD) ? halfway_y : y + SETTING_HEIGHT - 1; GfxDrawLine(x + offset, y, x + offset, bottom_y, colour); /* Small horizontal line from the last vertical line */ - GfxDrawLine(x + offset, halfway_y, x + level_width - WidgetDimensions::scaled.hsep_normal, halfway_y, colour); + GfxDrawLine(x + offset, halfway_y, x + level_width - (rtl ? -WidgetDimensions::scaled.hsep_normal : WidgetDimensions::scaled.hsep_normal), halfway_y, colour); x += level_width; this->DrawSetting(settings_ptr, rtl ? left : x, rtl ? x : right, y, this == selected); @@ -1913,7 +1926,7 @@ void SettingsPage::DrawSetting(GameSettings *settings_ptr, int left, int right, { bool rtl = _current_text_dir == TD_RTL; DrawSprite((this->folded ? SPR_CIRCLE_FOLDED : SPR_CIRCLE_UNFOLDED), PAL_NONE, rtl ? right - _circle_size.width : left, y + (SETTING_HEIGHT - _circle_size.height) / 2); - DrawString(rtl ? left : left + _circle_size.width + WidgetDimensions::scaled.hsep_normal, rtl ? right - _circle_size.width - WidgetDimensions::scaled.hsep_normal : right, y + (SETTING_HEIGHT - FONT_HEIGHT_NORMAL) / 2, this->title); + DrawString(rtl ? left : left + _circle_size.width + WidgetDimensions::scaled.hsep_normal, rtl ? right - _circle_size.width - WidgetDimensions::scaled.hsep_normal : right, y + (SETTING_HEIGHT - FONT_HEIGHT_NORMAL) / 2, this->title, TC_ORANGE); } /** Construct settings tree */ @@ -3477,7 +3490,7 @@ static const NWidgetPart _nested_cust_currency_widgets[] = { NWidget(WWT_PUSHARROWBTN, COLOUR_YELLOW, WID_CC_YEAR_DOWN), SetDataTip(AWV_DECREASE, STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP), NWidget(WWT_PUSHARROWBTN, COLOUR_YELLOW, WID_CC_YEAR_UP), SetDataTip(AWV_INCREASE, STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP), NWidget(NWID_SPACER), SetMinimalSize(5, 0), - NWidget(WWT_TEXT, COLOUR_BLUE, WID_CC_YEAR), SetDataTip(STR_JUST_STRING, STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP), SetFill(1, 0), + NWidget(WWT_TEXT, COLOUR_BLUE, WID_CC_YEAR), SetDataTip(STR_JUST_STRING1, STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP), SetFill(1, 0), EndContainer(), EndContainer(), NWidget(WWT_LABEL, COLOUR_BLUE, WID_CC_PREVIEW), diff --git a/src/settingsgen/settingsgen.cpp b/src/settingsgen/settingsgen.cpp index 94578ad35a..353f8b0f20 100644 --- a/src/settingsgen/settingsgen.cpp +++ b/src/settingsgen/settingsgen.cpp @@ -235,8 +235,8 @@ static void DumpGroup(IniLoadFile *ifile, const char * const group_name) */ static const char *FindItemValue(const char *name, IniGroup *grp, IniGroup *defaults) { - IniItem *item = grp->GetItem(name, false); - if (item == nullptr && defaults != nullptr) item = defaults->GetItem(name, false); + IniItem *item = grp->GetItem(name); + if (item == nullptr && defaults != nullptr) item = defaults->GetItem(name); if (item == nullptr || !item->value.has_value()) return nullptr; return item->value->c_str(); } @@ -327,14 +327,14 @@ static void DumpSections(IniLoadFile *ifile) for (sgn = special_group_names; *sgn != nullptr; sgn++) if (grp->name == *sgn) break; if (*sgn != nullptr) continue; - IniItem *template_item = templates_grp->GetItem(grp->name, false); // Find template value. + IniItem *template_item = templates_grp->GetItem(grp->name); // Find template value. if (template_item == nullptr || !template_item->value.has_value()) { error("Cannot find template %s", grp->name.c_str()); } DumpLine(template_item, grp, default_grp, _stored_output); if (validation_grp != nullptr) { - IniItem *validation_item = validation_grp->GetItem(grp->name, false); // Find template value. + IniItem *validation_item = validation_grp->GetItem(grp->name); // Find template value. if (validation_item != nullptr && validation_item->value.has_value()) { DumpLine(validation_item, grp, default_grp, _post_amble_output); } diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp index 5a17bd7a84..993627c9e4 100644 --- a/src/signs_gui.cpp +++ b/src/signs_gui.cpp @@ -96,7 +96,7 @@ struct SignList { const std::string &a_name = (*a)->name.empty() ? SignList::default_name : (*a)->name; filter.ResetState(); - filter.AddLine(a_name.c_str()); + filter.AddLine(a_name); return filter.GetState(); } diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp index 8a089ac3b7..fecc408267 100644 --- a/src/statusbar_gui.cpp +++ b/src/statusbar_gui.cpp @@ -242,7 +242,7 @@ static const NWidgetPart _nested_main_status_widgets[] = { static WindowDesc _main_status_desc( WDP_MANUAL, nullptr, 0, 0, WC_STATUS_BAR, WC_NONE, - WDF_NO_FOCUS, + WDF_NO_FOCUS | WDF_NO_CLOSE, _nested_main_status_widgets, lengthof(_nested_main_status_widgets) ); diff --git a/src/stdafx.h b/src/stdafx.h index 6d96d82c51..a46b7270d8 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -109,16 +109,6 @@ # define NODISCARD [[nodiscard]] #endif -#if defined(__WATCOMC__) -# define NORETURN -# define CDECL -# define WARN_FORMAT(string, args) -# define WARN_TIME_FORMAT(string) -# define FINAL -# define FALLTHROUGH -# include -#endif /* __WATCOMC__ */ - #if defined(__MINGW32__) # include // alloca() #endif @@ -234,7 +224,7 @@ # endif /* _WIN32 or WITH_ICONV */ #endif /* STRGEN || SETTINGSGEN */ -#if defined(_WIN32) || defined(__OS2__) && !defined(__INNOTEK_LIBC__) +#if defined(_WIN32) # define PATHSEP "\\" # define PATHSEPCHAR '\\' #else @@ -242,7 +232,7 @@ # define PATHSEPCHAR '/' #endif -#if defined(_MSC_VER) || defined(__WATCOMC__) +#if defined(_MSC_VER) # define PACK_N(type_dec, n) __pragma(pack(push, n)) type_dec; __pragma(pack(pop)) #elif defined(__MINGW32__) # define PRAGMA(x) _Pragma(#x) diff --git a/src/story_gui.cpp b/src/story_gui.cpp index 955126f165..b91b4c7650 100644 --- a/src/story_gui.cpp +++ b/src/story_gui.cpp @@ -255,18 +255,13 @@ protected: uint16 page_num = 1; for (const StoryPage *p : this->story_pages) { bool current_page = p->index == this->selected_page_id; - DropDownListStringItem *item = nullptr; if (!p->title.empty()) { - item = new DropDownListCharStringItem(p->title, p->index, current_page); + list.emplace_back(new DropDownListStringItem(p->title, p->index, current_page)); } else { /* No custom title => use a generic page title with page number. */ - DropDownListParamStringItem *str_item = - new DropDownListParamStringItem(STR_STORY_BOOK_GENERIC_PAGE_ITEM, p->index, current_page); - str_item->SetParam(0, page_num); - item = str_item; + SetDParam(0, page_num); + list.emplace_back(new DropDownListStringItem(STR_STORY_BOOK_GENERIC_PAGE_ITEM, p->index, current_page)); } - - list.emplace_back(item); page_num++; } @@ -958,7 +953,7 @@ GUIStoryPageElementList::SortFunction * const StoryBookWindow::page_element_sort static const NWidgetPart _nested_story_book_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_BROWN), - NWidget(WWT_CAPTION, COLOUR_BROWN, WID_SB_CAPTION), SetDataTip(STR_JUST_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_CAPTION, COLOUR_BROWN, WID_SB_CAPTION), SetDataTip(STR_JUST_STRING1, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_SHADEBOX, COLOUR_BROWN), NWidget(WWT_DEFSIZEBOX, COLOUR_BROWN), NWidget(WWT_STICKYBOX, COLOUR_BROWN), diff --git a/src/strings.cpp b/src/strings.cpp index 3940745650..a439117fe5 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1305,21 +1305,15 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg break; } - case SCC_SET_COLOUR: {// {SET_COLOUR} - int64 tc = args->GetInt64(SCC_SET_COLOUR); - if (tc >= 0 && tc < TC_END) { - buff += Utf8Encode(buff, SCC_BLUE + tc); - } - break; - } - case SCC_REVISION: // {REV} buff = strecpy(buff, _openttd_revision, last); break; case SCC_RAW_STRING_POINTER: { // {RAW_STRING} const char *raw_string = (const char *)(size_t)args->GetInt64(SCC_RAW_STRING_POINTER); - if (game_script && std::find(_game_script_raw_strings.begin(), _game_script_raw_strings.end(), raw_string) == _game_script_raw_strings.end()) { + /* raw_string can be(come) nullptr when the parameter is out of range and 0 is returned instead. */ + if (raw_string == nullptr || + (game_script && std::find(_game_script_raw_strings.begin(), _game_script_raw_strings.end(), raw_string) == _game_script_raw_strings.end())) { buff = strecat(buff, "(invalid RAW_STRING parameter)", last); break; } @@ -2047,6 +2041,14 @@ static char *FormatString(char *buff, const char *str_arg, StringParameters *arg break; } + case SCC_COLOUR: {// {COLOUR} + int64 tc = args->GetInt64(SCC_COLOUR); + if (tc >= 0 && tc < TC_END) { + buff += Utf8Encode(buff, SCC_BLUE + tc); + } + break; + } + case SCC_CONSUME_ARG: // do nothing break; @@ -2315,7 +2317,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) SetCurrentGrfLangID(_current_language->newgrflangid); #ifdef _WIN32 - extern void Win32SetCurrentLocaleName(const char *iso_code); + extern void Win32SetCurrentLocaleName(std::string iso_code); Win32SetCurrentLocaleName(_current_language->isocode); #endif diff --git a/src/table/control_codes.h b/src/table/control_codes.h index b0120a2973..2a4d8ad733 100644 --- a/src/table/control_codes.h +++ b/src/table/control_codes.h @@ -133,9 +133,9 @@ enum StringControlCode { SCC_GRAY, SCC_DKBLUE, SCC_BLACK, + SCC_COLOUR, SCC_PUSH_COLOUR, SCC_POP_COLOUR, - SCC_SET_COLOUR, SCC_CONSUME_ARG, diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h index a296cb5608..50c32c516f 100644 --- a/src/table/strgen_tables.h +++ b/src/table/strgen_tables.h @@ -58,9 +58,9 @@ static const CmdStruct _cmd_structs[] = { {"GRAY", EmitSingleChar, SCC_GRAY, 0, -1, C_DONTCOUNT}, {"DKBLUE", EmitSingleChar, SCC_DKBLUE, 0, -1, C_DONTCOUNT}, {"BLACK", EmitSingleChar, SCC_BLACK, 0, -1, C_DONTCOUNT}, + {"COLOUR", EmitSingleChar, SCC_COLOUR, 1, -1, C_NONE}, {"PUSH_COLOUR", EmitSingleChar, SCC_PUSH_COLOUR, 0, -1, C_DONTCOUNT}, {"POP_COLOUR", EmitSingleChar, SCC_POP_COLOUR, 0, -1, C_DONTCOUNT}, - {"SET_COLOUR", EmitSingleChar, SCC_SET_COLOUR, 1, -1, C_NONE}, {"REV", EmitSingleChar, SCC_REVISION, 0, -1, C_NONE}, // openttd revision string diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 0ed5f26033..b281bb3bba 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -1064,12 +1064,10 @@ struct TimetableWindow : GeneralVehicleWindow { for (uint i = 0; i < v->orders->GetScheduledDispatchScheduleCount(); i++) { const DispatchSchedule &ds = this->vehicle->orders->GetDispatchScheduleByIndex(i); if (ds.ScheduleName().empty()) { - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_TIMETABLE_ASSIGN_SCHEDULE_ID, i, false); - item->SetParam(0, i + 1); - list.emplace_back(item); + SetDParam(0, i + 1); + list.emplace_back(new DropDownListStringItem(STR_TIMETABLE_ASSIGN_SCHEDULE_ID, i, false)); } else { - DropDownListCharStringItem *item = new DropDownListCharStringItem(ds.ScheduleName(), i, false); - list.emplace_back(item); + list.emplace_back(new DropDownListStringItem(ds.ScheduleName(), i, false)); } } ShowDropDownList(this, std::move(list), order->GetDispatchScheduleIndex(), WID_VT_ASSIGN_SCHEDULE); diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index c7bbd2480b..9634fdc17c 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -719,7 +719,7 @@ static const int LTMN_HIGHSCORE = -9; ///< Show highscrore table static void AddDropDownLeagueTableOptions(DropDownList &list) { if (LeagueTable::GetNumItems() > 0) { for (LeagueTable *lt : LeagueTable::Iterate()) { - list.emplace_back(new DropDownListCharStringItem(lt->title, lt->index, false)); + list.emplace_back(new DropDownListStringItem(lt->title, lt->index, false)); } } else { list.emplace_back(new DropDownListStringItem(STR_GRAPH_MENU_COMPANY_LEAGUE_TABLE, LTMN_PERFORMANCE_LEAGUE, false)); @@ -2458,7 +2458,7 @@ static const NWidgetPart _nested_toolbar_normal_widgets[] = { static WindowDesc _toolb_normal_desc( WDP_MANUAL, nullptr, 0, 0, WC_MAIN_TOOLBAR, WC_NONE, - WDF_NO_FOCUS, + WDF_NO_FOCUS | WDF_NO_CLOSE, _nested_toolbar_normal_widgets, lengthof(_nested_toolbar_normal_widgets), &MainToolbarWindow::hotkeys ); @@ -2823,7 +2823,7 @@ static const NWidgetPart _nested_toolb_scen_widgets[] = { static WindowDesc _toolb_scen_desc( WDP_MANUAL, nullptr, 0, 0, WC_MAIN_TOOLBAR, WC_NONE, - WDF_NO_FOCUS, + WDF_NO_FOCUS | WDF_NO_CLOSE, _nested_toolb_scen_widgets, lengthof(_nested_toolb_scen_widgets), &ScenarioEditorToolbarWindow::hotkeys ); diff --git a/src/town_gui.cpp b/src/town_gui.cpp index a0895f7aa8..6d872e8445 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -37,6 +37,7 @@ #include "date_func.h" #include "core/random_func.hpp" #include "town_kdtree.h" +#include "zoom_func.h" #include "widgets/town_widget.h" #include "table/strings.h" @@ -44,7 +45,6 @@ #include #include "safeguards.h" -#include "zoom_func.h" TownKdtree _town_local_authority_kdtree(&Kdtree_TownXYFunc); @@ -449,9 +449,8 @@ public: dlist.emplace_back(new DropDownListStringItem(STR_COLOUR_DEFAULT, 0, false)); dlist.emplace_back(new DropDownListStringItem(STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE_ZERO, 1, false)); for (int i = 1; i <= 8; i++) { - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE_VALUE, i + 1, false); - item->SetParam(0, i); - dlist.emplace_back(item); + SetDParam(0, i); + dlist.emplace_back(new DropDownListStringItem(STR_CONFIG_SETTING_TOWN_MAX_ROAD_SLOPE_VALUE, i + 1, false)); } ShowDropDownList(this, std::move(dlist), HasBit(this->town->override_flags, idx) ? this->town->max_road_slope + 1 : 0, WID_TA_SETTING); break; diff --git a/src/tracerestrict_gui.cpp b/src/tracerestrict_gui.cpp index 46c5d9e990..6ebbf04568 100644 --- a/src/tracerestrict_gui.cpp +++ b/src/tracerestrict_gui.cpp @@ -662,9 +662,8 @@ static DropDownList GetGroupDropDownList(Owner owner, GroupID group_id, int &sel for (size_t i = 0; i < list.size(); ++i) { const Group *g = list[i]; if (group_id == g->index) selected = group_id; - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_GROUP_NAME, g->index, false); - item->SetParam(0, g->index | GROUP_NAME_HIERARCHY); - dlist.emplace_back(item); + SetDParam(0, g->index | GROUP_NAME_HIERARCHY); + dlist.emplace_back(new DropDownListStringItem(STR_GROUP_NAME, g->index, false)); } return dlist; @@ -716,14 +715,12 @@ DropDownList GetSlotDropDownList(Owner owner, TraceRestrictSlotID slot_id, int & const TraceRestrictSlot *s = list[i]; if (slot_id == s->index) selected = slot_id; if (s->vehicle_type == vehtype) { - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_TRACE_RESTRICT_SLOT_NAME, s->index, false); - item->SetParam(0, s->index); - dlist.emplace_back(item); + SetDParam(0, s->index); + dlist.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_SLOT_NAME, s->index, false)); } else { - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_TRACE_RESTRICT_SLOT_NAME_PREFIXED, s->index, false); - item->SetParam(0, STR_REPLACE_VEHICLE_TRAIN + s->vehicle_type); - item->SetParam(1, s->index); - dlist.emplace_back(item); + SetDParam(0, STR_REPLACE_VEHICLE_TRAIN + s->vehicle_type); + SetDParam(1, s->index); + dlist.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_SLOT_NAME_PREFIXED, s->index, false)); } } @@ -762,9 +759,8 @@ DropDownList GetCounterDropDownList(Owner owner, TraceRestrictCounterID ctr_id, for (size_t i = 0; i < list.size(); ++i) { const TraceRestrictCounter *s = list[i]; if (ctr_id == s->index) selected = ctr_id; - DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_TRACE_RESTRICT_COUNTER_NAME, s->index, false); - item->SetParam(0, s->index); - dlist.emplace_back(item); + SetDParam(0, s->index); + dlist.emplace_back(new DropDownListStringItem(STR_TRACE_RESTRICT_COUNTER_NAME, s->index, false)); } return dlist; diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 7d0061500b..1718f5008a 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1369,8 +1369,7 @@ struct RefitWindow : public Window { int offset = 1; for (const Vehicle *u = v; u != nullptr; u = u->Next()) { if (u->index == this->selected_vehicle && this->num_vehicles == 1) selected = offset; - DropDownListCharStringItem *item = new DropDownListCharStringItem(this->GetShipPartName(u), offset, false); - dlist.emplace_back(item); + dlist.emplace_back(new DropDownListStringItem(this->GetShipPartName(u), offset, false)); offset++; } diff --git a/src/video/allegro_v.cpp b/src/video/allegro_v.cpp index 7944394461..ecae4200a7 100644 --- a/src/video/allegro_v.cpp +++ b/src/video/allegro_v.cpp @@ -17,7 +17,6 @@ #include "../stdafx.h" #include "../openttd.h" #include "../gfx_func.h" -#include "../rev.h" #include "../blitter/factory.hpp" #include "../core/random_func.hpp" #include "../core/math_func.hpp" @@ -215,9 +214,8 @@ static bool CreateMainSurface(uint w, uint h) InitPalette(); - char caption[32]; - seprintf(caption, lastof(caption), "OpenTTD %s", _openttd_revision); - set_window_title(caption); + std::string caption = VideoDriver::GetCaption(); + set_window_title(caption.c_str()); enable_hardware_cursor(); select_mouse_cursor(MOUSE_CURSOR_ARROW); diff --git a/src/video/cocoa/cocoa_wnd.mm b/src/video/cocoa/cocoa_wnd.mm index 1a0233fa1d..2f15f79642 100644 --- a/src/video/cocoa/cocoa_wnd.mm +++ b/src/video/cocoa/cocoa_wnd.mm @@ -24,7 +24,6 @@ #include "../../openttd.h" #include "../../debug.h" -#include "../../rev.h" #include "cocoa_v.h" #include "cocoa_wnd.h" #include "../../settings_type.h" @@ -459,7 +458,7 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel [ self setContentMinSize:NSMakeSize(64.0f, 64.0f) ]; - std::string caption = std::string{"OpenTTD "} + _openttd_revision; + std::string caption = VideoDriver::GetCaption(); NSString *nsscaption = [ [ NSString alloc ] initWithUTF8String:caption.c_str() ]; [ self setTitle:nsscaption ]; [ self setMiniwindowTitle:nsscaption ]; diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp index 2d2feeefe2..9439e99bed 100644 --- a/src/video/dedicated_v.cpp +++ b/src/video/dedicated_v.cpp @@ -24,33 +24,6 @@ #include "../window_func.h" #include "dedicated_v.h" -#ifdef __OS2__ -# include /* gettimeofday */ -# include -# include -# include - -# define INCL_DOS -# include - -# define STDIN 0 /* file descriptor for standard input */ - -/** - * Switches OpenTTD to a console app at run-time, instead of a PM app - * Necessary to see stdout, etc. - */ -static void OS2_SwitchToConsoleMode() -{ - PPIB pib; - PTIB tib; - - DosGetInfoBlocks(&tib, &pib); - - /* Change flag from PM to VIO */ - pib->pib_ultype = 3; -} -#endif - #if defined(UNIX) # include /* gettimeofday */ # include @@ -160,11 +133,6 @@ const char *VideoDriver_Dedicated::Start(const StringList &parm) _set_error_mode(_OUT_TO_STDERR); #endif -#ifdef __OS2__ - /* For OS/2 we also need to switch to console mode instead of PM mode */ - OS2_SwitchToConsoleMode(); -#endif - DEBUG(driver, 1, "Loading dedicated server"); return nullptr; } @@ -181,7 +149,7 @@ void VideoDriver_Dedicated::MakeDirty(int left, int top, int width, int height) bool VideoDriver_Dedicated::ChangeResolution(int w, int h) { return false; } bool VideoDriver_Dedicated::ToggleFullscreen(bool fs) { return false; } -#if defined(UNIX) || defined(__OS2__) +#if defined(UNIX) static bool InputWaiting() { struct timeval tv; @@ -214,7 +182,7 @@ static void DedicatedHandleKeyInput() if (_exit_game) return; -#if defined(UNIX) || defined(__OS2__) +#if defined(UNIX) if (fgets(input_line, lengthof(input_line), stdin) == nullptr) return; #else /* Handle console input, and signal console thread, it can accept input again */ diff --git a/src/video/sdl2_v.cpp b/src/video/sdl2_v.cpp index e496e4d8cb..1431a4a5c1 100644 --- a/src/video/sdl2_v.cpp +++ b/src/video/sdl2_v.cpp @@ -10,7 +10,6 @@ #include "../stdafx.h" #include "../openttd.h" #include "../gfx_func.h" -#include "../rev.h" #include "../blitter/factory.hpp" #include "../thread.h" #include "../progress.h" @@ -367,10 +366,9 @@ bool VideoDriver_SDL_Base::CreateMainWindow(uint w, uint h, uint flags) y = r.y + std::max(0, r.h - static_cast(h)) / 4; // decent desktops have taskbars at the bottom } - char caption[50]; - seprintf(caption, lastof(caption), "OpenTTD %s", _openttd_revision); + std::string caption = VideoDriver::GetCaption(); this->sdl_window = SDL_CreateWindow( - caption, + caption.c_str(), x, y, w, h, flags); diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index c75e3536f4..878ecc4872 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -12,7 +12,6 @@ #include "../stdafx.h" #include "../openttd.h" #include "../gfx_func.h" -#include "../rev.h" #include "../blitter/factory.hpp" #include "../thread.h" #include "../progress.h" @@ -231,7 +230,6 @@ static void GetAvailableVideoMode(uint *w, uint *h) bool VideoDriver_SDL::CreateMainSurface(uint w, uint h) { SDL_Surface *newscreen, *icon; - char caption[50]; int bpp = BlitterFactory::GetCurrentBlitter()->GetScreenDepth(); bool want_hwpalette; @@ -365,8 +363,8 @@ bool VideoDriver_SDL::CreateMainSurface(uint w, uint h) InitPalette(); - seprintf(caption, lastof(caption), "OpenTTD %s", _openttd_revision); - SDL_WM_SetCaption(caption, caption); + std::string caption = VideoDriver::GetCaption(); + SDL_WM_SetCaption(caption.c_str(), caption.c_str()); GameSizeChanged(); @@ -454,7 +452,7 @@ static uint ConvertSdlKeyIntoMy(SDL_keysym *sym, WChar *character) } /* check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards) */ -#if defined(_WIN32) || defined(__OS2__) +#if defined(_WIN32) if (sym->scancode == 41) key = WKC_BACKQUOTE; #elif defined(__APPLE__) if (sym->scancode == 10) key = WKC_BACKQUOTE; diff --git a/src/video/video_driver.cpp b/src/video/video_driver.cpp index 7b3de5c216..8ac4bbb287 100644 --- a/src/video/video_driver.cpp +++ b/src/video/video_driver.cpp @@ -17,6 +17,7 @@ #include "../gfx_func.h" #include "../gfxinit.h" #include "../progress.h" +#include "../rev.h" #include "../thread.h" #include "../window_func.h" #include "video_driver.hpp" @@ -207,3 +208,12 @@ void VideoDriver::InvalidateGameOptionsWindow() { InvalidateWindowClassesData(WC_GAME_OPTIONS, 3); } + +/** + * Get the caption to use for the game's title bar. + * @return The caption. + */ +/* static */ std::string VideoDriver::GetCaption() +{ + return stdstr_fmt("OpenTTD %s", _openttd_revision); +} diff --git a/src/video/video_driver.hpp b/src/video/video_driver.hpp index 81f5aaaa31..a61db4dccd 100644 --- a/src/video/video_driver.hpp +++ b/src/video/video_driver.hpp @@ -208,6 +208,8 @@ public: return static_cast(*DriverFactoryBase::GetActiveDriver(Driver::DT_VIDEO)); } + static std::string GetCaption(); + /** * Helper struct to ensure the video buffer is locked and ready for drawing. The destructor * will make sure the buffer is unlocked no matter how the scope is exited. diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index f733a82213..abcb082994 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -11,7 +11,6 @@ #include "../openttd.h" #include "../gfx_func.h" #include "../os/windows/win32.h" -#include "../rev.h" #include "../blitter/factory.hpp" #include "../core/geometry_func.hpp" #include "../core/math_func.hpp" @@ -214,16 +213,20 @@ bool VideoDriver_Win32Base::MakeWindow(bool full_screen, bool resize) if (this->main_wnd != nullptr) { if (!_window_maximize && resize) SetWindowPos(this->main_wnd, 0, 0, 0, w, h, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE); } else { - /* Center on the workspace of the primary display. */ - MONITORINFO mi; - mi.cbSize = sizeof(mi); - GetMonitorInfo(MonitorFromWindow(0, MONITOR_DEFAULTTOPRIMARY), &mi); + int x = 0; + int y = 0; - int x = (mi.rcWork.right - mi.rcWork.left - w) / 2; - int y = (mi.rcWork.bottom - mi.rcWork.top - h) / 2; + /* For windowed mode, center on the workspace of the primary display. */ + if (!this->fullscreen) { + MONITORINFO mi; + mi.cbSize = sizeof(mi); + GetMonitorInfo(MonitorFromWindow(0, MONITOR_DEFAULTTOPRIMARY), &mi); - char window_title[64]; - seprintf(window_title, lastof(window_title), "OpenTTD %s", _openttd_revision); + x = (mi.rcWork.right - mi.rcWork.left - w) / 2; + y = (mi.rcWork.bottom - mi.rcWork.top - h) / 2; + } + + std::string window_title = VideoDriver::GetCaption(); this->main_wnd = CreateWindow(L"OTTD", OTTD2FS(window_title).c_str(), style, x, y, w, h, 0, 0, GetModuleHandle(nullptr), this); if (this->main_wnd == nullptr) usererror("CreateWindow failed"); diff --git a/src/viewport.cpp b/src/viewport.cpp index f2d92604b6..b37da62312 100644 --- a/src/viewport.cpp +++ b/src/viewport.cpp @@ -1913,6 +1913,9 @@ static void ViewportAddKdtreeSigns(ViewportDrawerDynamic *vdd, DrawPixelInfo *dp t->index, t->LabelParam2()); } + /* Do not draw signs nor station names if they are set invisible */ + if (IsInvisibilitySet(TO_SIGNS)) return; + for (const auto *si : signs) { ViewportAddString(vdd, dpi, ZOOM_LVL_OUT_16X, &si->sign, STR_WHITE_SIGN, @@ -2277,9 +2280,6 @@ static void ViewportDrawStrings(ViewportDrawerDynamic *vdd, ZoomLevel zoom, cons SetDParam(1, ss.params[1]); if (ss.colour != INVALID_COLOUR) { - /* Do not draw signs nor station names if they are set invisible */ - if (vdd->IsInvisibilitySet(TO_SIGNS) && ss.string != STR_WHITE_SIGN) continue; - if (vdd->IsTransparencySet(TO_SIGNS) && ss.string != STR_WHITE_SIGN) { /* Don't draw the rectangle. * Real colours need the TC_IS_PALETTE_COLOUR flag. diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp index 78651ab6e1..703531940e 100644 --- a/src/waypoint_gui.cpp +++ b/src/waypoint_gui.cpp @@ -22,13 +22,13 @@ #include "waypoint_base.h" #include "departures_gui.h" #include "newgrf_debug.h" +#include "zoom_func.h" #include "widgets/waypoint_widget.h" #include "table/strings.h" #include "safeguards.h" -#include "zoom_func.h" /** GUI for accessing waypoints and buoys. */ struct WaypointWindow : Window { diff --git a/src/widget.cpp b/src/widget.cpp index 523c604e49..5d1f525b67 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -2934,10 +2934,10 @@ void NWidgetLeaf::Draw(const Window *w) if (this->current_x == 0 || this->current_y == 0) return; - /* Setup a clipping rectangle... for WWT_EMPTY or WWT_TEXT, an extra scaled pixel is allowed vertically in case text shadow encroaches. */ - int extra_y = (this->type == WWT_EMPTY || this->type == WWT_TEXT) ? ScaleGUITrad(1) : 0; + /* Setup a clipping rectangle... for WWT_EMPTY or WWT_TEXT, an extra scaled pixel is allowed in case text shadow encroaches. */ + int extra = (this->type == WWT_EMPTY || this->type == WWT_TEXT) ? ScaleGUITrad(1) : 0; DrawPixelInfo new_dpi; - if (!FillDrawPixelInfo(&new_dpi, this->pos_x, this->pos_y, this->current_x, this->current_y + extra_y)) return; + if (!FillDrawPixelInfo(&new_dpi, this->pos_x, this->pos_y, this->current_x + extra, this->current_y + extra)) return; /* ...but keep coordinates relative to the window. */ new_dpi.left += this->pos_x; new_dpi.top += this->pos_y; diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp index 4d18c83c8c..b3ba152500 100644 --- a/src/widgets/dropdown.cpp +++ b/src/widgets/dropdown.cpp @@ -31,6 +31,10 @@ void DropDownListItem::Draw(const Rect &r, bool sel, Colours bg_colour) const GfxFillRect(r.left, mid, r.right, mid + WidgetDimensions::scaled.bevel.top - 1, c2); } +DropDownListStringItem::DropDownListStringItem(StringID string, int result, bool masked) : DropDownListItem(result, masked), string(GetString(string)) +{ +} + uint DropDownListStringItem::Width() const { return GetStringBoundingBox(this->String()).width + WidgetDimensions::scaled.dropdowntext.Horizontal(); @@ -51,24 +55,12 @@ void DropDownListStringItem::Draw(const Rect &r, bool sel, Colours bg_colour) co */ /* static */ bool DropDownListStringItem::NatSortFunc(std::unique_ptr const &first, std::unique_ptr const &second) { - std::string str1 = GetString(static_cast(first.get())->String()); - std::string str2 = GetString(static_cast(second.get())->String()); + std::string str1 = static_cast(first.get())->String(); + std::string str2 = static_cast(second.get())->String(); return StrNaturalCompare(str1, str2) < 0; } -StringID DropDownListParamStringItem::String() const -{ - for (uint i = 0; i < lengthof(this->decode_params); i++) SetDParam(i, this->decode_params[i]); - return this->string; -} - -StringID DropDownListCharStringItem::String() const -{ - SetDParamStr(0, this->raw_string); - return this->string; -} - -DropDownListIconItem::DropDownListIconItem(SpriteID sprite, PaletteID pal, StringID string, int result, bool masked) : DropDownListParamStringItem(string, result, masked), sprite(sprite), pal(pal) +DropDownListIconItem::DropDownListIconItem(SpriteID sprite, PaletteID pal, StringID string, int result, bool masked) : DropDownListStringItem(string, result, masked), sprite(sprite), pal(pal) { this->dim = GetSpriteSize(sprite); this->sprite_y = dim.height; @@ -81,7 +73,7 @@ uint DropDownListIconItem::Height(uint width) const uint DropDownListIconItem::Width() const { - return DropDownListParamStringItem::Width() + this->dim.width + WidgetDimensions::scaled.hsep_wide; + return DropDownListStringItem::Width() + this->dim.width + WidgetDimensions::scaled.hsep_wide; } void DropDownListIconItem::Draw(const Rect &r, bool sel, Colours bg_colour) const diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h index 87f3517048..83d989d9d6 100644 --- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -45,50 +45,25 @@ public: */ class DropDownListStringItem : public DropDownListItem { public: - StringID string; ///< String ID of item + const std::string string; ///< String of item TextColour colour_flags = TC_BEGIN; - DropDownListStringItem(StringID string, int result, bool masked) : DropDownListItem(result, masked), string(string) {} + DropDownListStringItem(StringID string, int result, bool masked); + DropDownListStringItem(const std::string &string, int result, bool masked) : DropDownListItem(result, masked), string(string) {} bool Selectable() const override { return true; } uint Width() const override; void Draw(const Rect &r, bool sel, Colours bg_colour) const override; - virtual StringID String() const { return this->string; } + const std::string &String() const { return this->string; } void SetColourFlags(TextColour colour_flags) { this->colour_flags = colour_flags; } static bool NatSortFunc(std::unique_ptr const &first, std::unique_ptr const &second); }; -/** - * String list item with parameters. - */ -class DropDownListParamStringItem : public DropDownListStringItem { -public: - uint64 decode_params[10]; ///< Parameters of the string - - DropDownListParamStringItem(StringID string, int result, bool masked) : DropDownListStringItem(string, result, masked) {} - - StringID String() const override; - void SetParam(uint index, uint64 value) { decode_params[index] = value; } - void SetParamStr(uint index, const char *str) { this->SetParam(index, (uint64)(size_t)str); } -}; - -/** - * List item containing a C char string. - */ -class DropDownListCharStringItem : public DropDownListStringItem { -public: - std::string raw_string; - - DropDownListCharStringItem(const std::string &raw_string, int result, bool masked) : DropDownListStringItem(STR_JUST_RAW_STRING, result, masked), raw_string(raw_string) {} - - StringID String() const override; -}; - /** * List item with icon and string. */ -class DropDownListIconItem : public DropDownListParamStringItem { +class DropDownListIconItem : public DropDownListStringItem { SpriteID sprite; PaletteID pal; Dimension dim; diff --git a/src/window.cpp b/src/window.cpp index e4ff58073a..86014fa0a6 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -834,7 +834,7 @@ static void DispatchRightClickEvent(Window *w, int x, int y) } /* Right-click close is enabled and there is a closebox */ - if (_settings_client.gui.right_mouse_wnd_close && w->nested_root->GetWidgetOfType(WWT_CLOSEBOX)) { + if (_settings_client.gui.right_mouse_wnd_close && (w->window_desc->flags & WDF_NO_CLOSE) == 0) { delete w; } else if (_settings_client.gui.hover_delay_ms == 0 && !w->OnTooltip(pt, wid->index, TCC_RIGHT_CLICK) && wid->tool_tip != 0) { GuiShowTooltips(w, wid->tool_tip, 0, nullptr, TCC_RIGHT_CLICK); @@ -3541,12 +3541,8 @@ void CallWindowGameTickEvent() void DeleteNonVitalWindows() { /* Note: the container remains stable, even when deleting windows. */ - for (const Window *w : Window::IterateUnordered()) { - if (w->window_class != WC_MAIN_WINDOW && - w->window_class != WC_SELECT_GAME && - w->window_class != WC_MAIN_TOOLBAR && - w->window_class != WC_STATUS_BAR && - w->window_class != WC_TOOLTIPS && + for (Window *w : Window::IterateUnordered()) { + if ((w->window_desc->flags & WDF_NO_CLOSE) == 0 && (w->flags & WF_STICKY) == 0) { // do not delete windows which are 'pinned' delete w; @@ -3563,12 +3559,9 @@ void DeleteNonVitalWindows() */ void DeleteAllNonVitalWindows() { - /* Delete every window except for stickied ones, then sticky ones as well */ - DeleteNonVitalWindows(); - - /* Note: the container remains stable, even when deleting windows. */ - for (const Window *w : Window::IterateUnordered()) { - if (w->flags & WF_STICKY) { + /* Note: the container remains stable, even when closing windows. */ + for (Window *w : Window::IterateUnordered()) { + if ((w->window_desc->flags & WDF_NO_CLOSE) == 0) { delete w; } } diff --git a/src/window_gui.h b/src/window_gui.h index a16c99f221..498f20bc17 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -163,7 +163,8 @@ enum WindowDefaultFlag { WDF_CONSTRUCTION = 1 << 0, ///< This window is used for construction; close it whenever changing company. WDF_MODAL = 1 << 1, ///< The window is a modal child of some other window, meaning the parent is 'inactive' WDF_NO_FOCUS = 1 << 2, ///< This window won't get focus/make any other window lose focus when click - WDF_NETWORK = 1 << 3, ///< This window is used for network client functionality + WDF_NO_CLOSE = 1 << 3, ///< This window can't be interactively closed + WDF_NETWORK = 1 << 4, ///< This window is used for network client functionality }; /**