(svn r23879) -Release: 1.2.0-beta4

french - 52 changes by OliTTD
lithuanian - 4 changes by Stabilitronas

Doxyfile

@@ -195,7 +195,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           =
 INCLUDE_FILE_PATTERNS  =
-PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE FINAL=
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

Makefile.src.in

@@ -37,7 +37,6 @@ STAGE          = !!STAGE!!
 MAKEDEPEND     = !!MAKEDEPEND!!
 CFLAGS_MAKEDEP = !!CFLAGS_MAKEDEP!!
 SORT           = !!SORT!!
-REVISION       = !!REVISION!!
 AWK            = !!AWK!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
@@ -94,15 +93,9 @@ $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STR
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 
-ifdef REVISION
-# Use specified revision (which should be of the form "r000").
-REV := $(REVISION)
-REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
-else
 # Use autodetected revisions
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
 REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
-endif
 
 # Make sure we have something in REV and REV_NR
 ifeq ($(REV),)

bin/baseset/orig_dos.obg

@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
+OPENTTD.GRF  = 39704043e69f463d6300605004891d91
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_dos_de.obg

@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
+OPENTTD.GRF  = 39704043e69f463d6300605004891d91
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_win.obg

@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca
+OPENTTD.GRF  = 39704043e69f463d6300605004891d91
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

changelog.txt

@@ -1,40 +1,88 @@
+1.2.0-beta4 (2012-02-04)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Give NewGRF defined level crossings and rail depots access to the townzone (r23866)
+- Feature: [NewGRF] New algorithm (activated via an engine flag) to determine the capacity of vehicles. This allows vehicles to better control the capacity for cargotypes which they know; and let cargo NewGRFs influence the capacity for cargos the vehicle NewGRF does not know, but which the vehicle is refittable to due to cargo classes (r23861)
+- Feature: [NewGRF] Add cargo property 1D to set the capacity multipliers when refitting vehicles, which do not use callback 15 (r23860)
+- Feature: Allow command line options -e and -g to be combined to load saves/scenarios directly into SE (r23839)
+- Feature: [NoGo] Allow querying orders of vehicles [FS#4994] (r23837)
+- Change: Do not let towns (ever) remove objects [FS#5001, FS#5002] (r23842)
+- Change: Make signs placed in scenario editor belong to the GS. That way they are always shown in game and are not editable [FS#4999] (r23835)
+- Fix: Generate industry subsidies again [FS#5039] (r23876)
+- Fix: [NoGo/NoAI] Scripts with a bad comparator could lock up OpenTTD [FS#5004] (r23870)
+- Fix: Make the colour of the dropdown items for opening the vehicle list for which the company has no vehicles looking less horrid [FS#5020] (r23867)
+- Fix: Railtype overlays were drawn 'only transparent' on invisible bridges (r23864)
+- Fix: Inserting conditional orders for ships checked the wrong orders wrt. maximum distance (r23859)
+- Fix: Out of bounds read for slowdown parameter caused desync when railtype >= 4, vehicles were fast, and the original acceleration model was used [FS#5007] (r23855)
+- Fix: Infrastructure cache could get out of sync when overbuilding a drive through road stop (r23851)
+- Fix: When the network is lagging, you try to copy a vehicle's order but accidentally create a station order and then copy the vehicle's order (before the first command is executed) one could trigger an assertion from the pool [FS#5008] (r23849)
+- Fix: When removing road or tram from a tram+road stop, the owner of the road stop's cache was updated instead of the owner of the removed infrastructure (r23847)
+- Fix: Infrastructure count for stations was not updated properly on company takeover. And do not count buoys while loading a game either (r23844)
+- Fix: Clear NewGRF vehicle cache when their owner changes (r23841)
+- Fix: Assertion got hit when destroing a dock when a ship was loading [FS#5000] (r23838)
+- Fix: If a vehicle is not refittable to any cargo in the CTT, then pick the first refittable cargoslot (r23836)
+
+
+1.2.0-beta3 (2012-01-21)
+------------------------------------------------------------------------
+- Feature: [NoGo] Allow to chose the goal question window's title from a (small) set of options [FS#4992] (r23827)
+- Feature: [NewGRF] Enhance some fatal NewGRF errors with the spritenumber that caused the problem (r23809)
+- Fix: Loading empty GS strings/translations failed [FS#4996] (r23829)
+- Fix: Return early from SlString() for empty strings, before doing invalid things which surprisingly do not break everything. (r23828)
+- Fix: The detailed performance rating window showed the cargo count of the current quarter instead of the last quarter like the tooltip says [FS#4972] (r23826)
+- Fix: Removal of towns with 0 population failed during map generation [FS#4951] (r23819)
+- Fix: [Network] Desync due to different NewGRF version at client and server [FS#4962] (r23817)
+- Fix: [NewGRF] Textstack was not properly used when storing parameters for the error message window [FS#4969] (r23803)
+- Fix: Game lobby gui not updated when new company information becomes available [FS#4968] (r23802)
+- Fix: Reading the UTF-8 BOM from AI/GS files on big-endian machines failed (r23801)
+- Fix: Move 'refitable to' text above custom newgrf text in build vehicle gui [FS#4958] (r23792)
+- Fix: [NewGRF] Resize text panel for parameter description if it does not fit in 4 lines [FS#4960] (r23791)
+- Fix: [NewGRF] While we can only show one error per NewGRF, fatal errors should always disable the GRF. Also give those errors precedence over other information (r23789)
+- Fix: [NewGRF] Failure to load newgrf files that use action 0 general prop 15 with a missing language file (r23788)
+- Fix: Crash due to genders used for station name in hangar string of Italian translation [FS#4965] (r23782)
+- Fix: Under certain circumstances, e.g. a single invalid order, trying to determine the next order state could end up in an infinite loop [FS#4964] (r23781)
+- Fix: [Network] Missing naming of some errors[FS#4963] (r23780)
+- Fix: Trim all control codes and the likes from strings being passed into the AI. If the AI would be displaying them later we would be showing those control codes as question marks [FS#4957] (r23778)
+- Fix: Hide the PCX screenshot format from the options window, if a 32bpp blitter is used (r23775)
+- Fix: [NewGRF] Update all cached train properties if a train vehicle enters a new railtype (r23773)
+
+
 1.2.0-beta2 (2012-01-07)
 ------------------------------------------------------------------------
--Feature: [NewGRF] Allow read-only display of NewGRF parameters, if GRF list may not be edited (r23760)
--Feature: [NewGRF] Alternate rail type label list (r23758)
--Feature: Make the default secondary sort method for the server list the number of clients instead of the name (r23710)
--Feature: Try harder to sort text instead of fancy characters in the server names (r23709)
--Feature: Make a distinction between fully zoomed in and default zoomed in screenshots [FS#4916] (r23695)
--Feature: Add ability to adjust brightness of colour after remapping for 32bpp sprites (r23670)
--Feature: [GS] GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17 (r23731)
--Feature: Australian translation (r23730)
--Fix: Make default timeouts for certain network states lower and configurable [FS#4955] (r23764)
--Fix: Check whether a water tile is really empty when overbuilding it with an object [FS#4956] (r23763)
--Fix: The check for duplicate town names was not really working [FS#4951] (r23759)
--Fix: Missing locking causing crash is extreme case when being in the MP lobby [FS#4938] (r23752)
--Fix: [Win32] Work around a possible deadlock when initialising threaded drawing (r23749)
--Fix: Make vehicle variables A8 and A9 always return 0. Returning cur_image is a potential desyncer due to Action1 in static NewGRFs (r23748)
--Fix: Also set 'info' to NULL if 'instance' dies (for both AI and GS); avoids invalid memory reads (r23746)
--Fix: If autorefit fails, count the vehicle capacity nevertheless, if it is already carrying the right thing (r23745)
--Fix: [NewGRF] Check the version of the right GRF [FS#4923] (r23744)
--Fix: [NewGRF] Call CB 15E for all vehicles before actually executing any refit [FS#4906] (r23743)
--Fix: Cheating to different climates messes things even more up than changing NewGRFs in-game so it was removed [FS#4939] (r23733)
--Fix: When cheating into another company, the SignList was not updated [FS#4942] (r23728)
--Fix: Reading memory of a temporary (already deconstructed) object is invalid (r23721)
--Fix: [Script] Show the script debug window also when the game script crashes [FS#4935] (r23720)
--Fix: Extraction of music packs failed [FS#4930] (r23719)
--Fix: [AI] Rescanai caused crash when the AI settings of an AI was opened [FS#4936] (r23718)
--Fix: Ships going to wrong dock location when moving the dock while the game is paused [FS#4927] (r23717)
--Fix: The amount of goals was too low [FS#4928] (r23699)
--Fix: Hardcode the original defaults for loading old savegames if they could totally mess with the game's behaviour [FS#4859] (r23693)
--Fix: Infrastructure count of canals/locks/ship depots was not updated properly when a company went into bankruptcy or was taken over [FS#4921] (r23686)
--Fix: When fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing [FS#4912] (r23683)
--Fix: Vehicle numbers got misaccounted when autoreplacing failed due to length checks [FS#4914] (r23681)
--Fix: [AI] Prevent removal of the (AI) company the local player is in [FS#4915] (r23680)
--Fix: [Script] Close the editbox of settings when changing an AI, to avoid invalid memory read/write (r23678)
--Fix: [Script] Invalidate AI Parameters window when changing AI [FS#4909] (r23677)
--Fix: When removing road stops the wrong tile was checked for updating the infrastructure cache [FS#4913] (r23676)
--Fix: [Script] The 'Configure' button in the 'AI / Game Configuration' window did not get enabled when activating a GameScript (r23668)
+- Feature: [NewGRF] Allow read-only display of NewGRF parameters, if GRF list may not be edited (r23760)
+- Feature: [NewGRF] Alternate rail type label list (r23758)
+- Feature: Make the default secondary sort method for the server list the number of clients instead of the name (r23710)
+- Feature: Try harder to sort text instead of fancy characters in the server names (r23709)
+- Feature: Make a distinction between fully zoomed in and default zoomed in screenshots [FS#4916] (r23695)
+- Feature: Add ability to adjust brightness of colour after remapping for 32bpp sprites (r23670)
+- Feature: [GS] GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17 (r23731)
+- Feature: Australian translation (r23730)
+- Fix: Make default timeouts for certain network states lower and configurable [CVE-2012-0049] [FS#4955] (r23764)
+- Fix: Check whether a water tile is really empty when overbuilding it with an object [FS#4956] (r23763)
+- Fix: The check for duplicate town names was not really working [FS#4951] (r23759)
+- Fix: Missing locking causing crash is extreme case when being in the MP lobby [FS#4938] (r23752)
+- Fix: [Win32] Work around a possible deadlock when initialising threaded drawing (r23749)
+- Fix: Make vehicle variables A8 and A9 always return 0. Returning cur_image is a potential desyncer due to Action1 in static NewGRFs (r23748)
+- Fix: Also set 'info' to NULL if 'instance' dies (for both AI and GS); avoids invalid memory reads (r23746)
+- Fix: If autorefit fails, count the vehicle capacity nevertheless, if it is already carrying the right thing (r23745)
+- Fix: [NewGRF] Check the version of the right GRF [FS#4923] (r23744)
+- Fix: [NewGRF] Call CB 15E for all vehicles before actually executing any refit [FS#4906] (r23743)
+- Fix: Cheating to different climates messes things even more up than changing NewGRFs in-game so it was removed [FS#4939] (r23733)
+- Fix: When cheating into another company, the SignList was not updated [FS#4942] (r23728)
+- Fix: Reading memory of a temporary (already deconstructed) object is invalid (r23721)
+- Fix: [Script] Show the script debug window also when the game script crashes [FS#4935] (r23720)
+- Fix: Extraction of music packs failed [FS#4930] (r23719)
+- Fix: [AI] Rescanai caused crash when the AI settings of an AI was opened [FS#4936] (r23718)
+- Fix: Ships going to wrong dock location when moving the dock while the game is paused [FS#4927] (r23717)
+- Fix: The amount of goals was too low [FS#4928] (r23699)
+- Fix: Hardcode the original defaults for loading old savegames if they could totally mess with the game's behaviour [FS#4859] (r23693)
+- Fix: Infrastructure count of canals/locks/ship depots was not updated properly when a company went into bankruptcy or was taken over [FS#4921] (r23686)
+- Fix: When fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing [FS#4912] (r23683)
+- Fix: Vehicle numbers got misaccounted when autoreplacing failed due to length checks [FS#4914] (r23681)
+- Fix: [AI] Prevent removal of the (AI) company the local player is in [FS#4915] (r23680)
+- Fix: [Script] Close the editbox of settings when changing an AI, to avoid invalid memory read/write (r23678)
+- Fix: [Script] Invalidate AI Parameters window when changing AI [FS#4909] (r23677)
+- Fix: When removing road stops the wrong tile was checked for updating the infrastructure cache [FS#4913] (r23676)
+- Fix: [Script] The 'Configure' button in the 'AI / Game Configuration' window did not get enabled when activating a GameScript (r23668)
 
 
 1.2.0-beta1 (2011-12-24)
@@ -187,6 +235,15 @@
 - Fix: Change the centre of train vehicles to depend on the vehicle length instead of being fixed at 4/8th of the original vehicle length to make sure shortened vehicles do not block tiles they should not block [FS#2379,FS#3569] (r23290)
 
 
+1.1.5 (2012-01-14)
+------------------------------------------------------------------------
+- Fix: Make default timeouts for certain network states lower and configurable [CVE-2012-0049] [FS#4955] (r23764)
+- Fix: Check whether a water tile is really empty when overbuilding it with an object [FS#4956] (r23763)
+- Fix: Missing locking causing crash in extreme case when being in the MP lobby [FS#4938] (r23752)
+- Fix: Clear the backed up orders of a removed station as well, otherwise one could create orders to a station that was never in the original backupped orders. For example a road vehicle trying to go to a buoy [FS#4876] (r23464)
+- Fix: Do not assume all industries that cut trees have tile (0,0) and wait until all tiles of an industry are completed before starting to cut trees (r23458)
+
+
 1.1.4 (2011-12-05)
 ------------------------------------------------------------------------
 - Fix: Savegames made with the Catalan town name generator would trigger a 'savegame corrupt' exception [FS#4866] (r23418)

config.lib

@@ -32,7 +32,6 @@ set_default() {
 	os="DETECT"
 	endian="AUTO"
 	cpu_type="DETECT"
-	revision=""
 	config_log="config.log"
 	prefix_dir="/usr/local"
 	binary_dir="games"
@@ -107,7 +106,6 @@ set_default() {
 		os
 		endian
 		cpu_type
-		revision
 		config_log
 		prefix_dir
 		binary_dir
@@ -199,8 +197,6 @@ detect_params() {
 			--cpu-type)                   prev_p="cpu_type";;
 			--cpu-type=*)                 cpu_type="$optarg";;
 
-			--revision=*)                 revision="$optarg";;
-
 			--cc-build)                   prevp_p="cc_build";;
 			--cc-build=*)                 cc_build="$optarg";;
 			--cc-host)                    prevp_p="cc_host";;
@@ -1010,31 +1006,15 @@ check_params() {
 		fi
 	fi
 
-	if [ -n "$revision" ]; then
-		log 1 "checking revision... $revision"
-		log 1 "WARNING: we do not advise you to use this setting"
-		log 1 "WARNING: in most cases it is not safe for network use"
-		log 1 "WARNING: USE WITH CAUTION!"
-
-		sleep 5
-	elif [ -f "$ROOT_DIR/version" ]; then
-		revision="`cat $ROOT_DIR/version`"
-
-		log 1 "checking revision... $revision"
-	elif [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
-		revision=""
+	if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
 		log 1 "checking revision... svn detection"
 	elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then
-		revision=""
 		log 1 "checking revision... git detection"
 	elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`hg help 2>/dev/null`" ]; then
-		revision=""
 		log 1 "checking revision... hg detection"
 	elif [ -f "$ROOT_DIR/.ottdrev" ]; then
-		revision=""
 		log 1 "checking revision... source tarball"
 	else
-		revision=""
 		log 1 "checking revision... no detection"
 		log 1 "WARNING: there is no means to determine the version."
 		log 1 "WARNING: please use a subversion, mercurial, or git checkout of OpenTTD."
@@ -3245,7 +3225,6 @@ make_sed() {
 		s@!!SRCS!!@$SRCS@g;
 		s@!!OS!!@$os@g;
 		s@!!CONFIGURE_FILES!!@$CONFIGURE_FILES@g;
-		s@!!REVISION!!@$revision@g;
 		s@!!AWK!!@$awk@g;
 		s@!!DISTCC!!@$distcc@g;
 		s@!!NFORENUM!!@$nforenum@g;
@@ -3468,8 +3447,6 @@ showhelp() {
 	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
 	echo "                                 DOS/WINCE/PSP/HAIKU"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
-	echo "  --revision=rXXXX               overwrite the revision detection."
-	echo "                                 Use with care!"
 	echo ""
 	echo "Paths:"
 	echo "  --prefix-dir=dir               specifies the prefix for all installed"

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2012-01-07
-Release version: 1.2.0-beta2
+Last updated:    2012-02-04
+Release version: 1.2.0-beta4
 ------------------------------------------------------------------------
 
 
@@ -413,3 +413,17 @@ Not all NewGRFs, AIs, game scripts are found [FS#4887]:
 	tar file is the same as other content on the file system or in another
 	tar file, it is possible that content is not found. A more thorough
 	explanation and solutions are described in section 4.4 of readme.txt.
+
+Mouse cursor going missing with SDL [FS#4997]:
+	Under certain circumstances SDL does not notify OpenTTD of changes
+	with respect to the mouse pointer, specifically whether the mouse
+	pointer is within the bounds of OpenTTD or not. For example, if you
+	Alt-tab to another application the mouse cursor will still be shown
+	in OpenTTD, and when you move the mouse outside of the OpenTTD
+	window so the cursor gets hidden, open/move another application on
+	top of the OpenTTD window and then Alt-tab back into OpenTTD the
+	cursor will not be shown.
+
+	We cannot fix this problem as SDL simply does not provide the
+	required information in these corner cases. This is a bug in SDL
+	and as such there is little that we can do about it.

media/extra_grf/chars.nfo

@@ -48,7 +48,8 @@
    -1 sprites/chars.png 30 70 01 12 8 0 -1
    -1 * 5	 0A 01 01 BF 00
    -1 sprites/chars.png 70 70 01 12 9 0 -1
-   -1 * 5	 0A 01 04 C2 00
+   -1 * 5	 0A 01 05 C1 00
+   -1 sprites/chars.png 450 70 01 12 8 0 -1
    -1 sprites/chars.png 110 70 01 12 6 0 -1
    -1 sprites/chars.png 120 70 01 12 6 0 -1
    -1 sprites/chars.png 130 70 01 12 6 0 -1
@@ -123,7 +124,7 @@
    -1 sprites/chars.png 380 40 01 21 20 0 -2
    -1 sprites/chars.png 410 40 01 21 20 0 -2
    -1 sprites/chars.png 440 40 01 21 24 0 -2
-   -1 * 5	 0A 01 17 6A 02
+   -1 * 5	 0A 01 18 6A 02
    -1 sprites/chars.png 480 40 01 21 14 0 -2
    -1 sprites/chars.png 500 40 01 21 14 0 -2
    -1 sprites/chars.png 520 40 01 21 14 0 -2
@@ -147,6 +148,7 @@
    -1 sprites/chars.png 50 100 01 21 17 0 -2
    -1 sprites/chars.png 70 100 01 21 14 0 -2
    -1 sprites/chars.png 90 100 01 21 14 0 -2
+   -1 sprites/chars.png 450 100 01 21 14 0 -2
    -1 * 5	 0A 01 01 85 02
    -1 sprites/chars.png 140 100 01 21 12 0 -2
    -1 * 5	 0A 01 01 88 02
@@ -324,7 +326,7 @@
    -1 sprites/chars.png 50 250 01 12 8 0 -1
    -1 sprites/chars.png 70 250 01 12 6 0 -1
    -1 sprites/chars.png 90 250 01 12 9 0 -1
-   -1 sprites/chars.png 110 250 01 12 9 0 -1
+   -1 sprites/chars.png 110 250 01 12 8 0 -1
    -1 sprites/chars.png 130 250 01 12 6 0 -1
    -1 sprites/chars.png 150 250 01 12 9 0 -1
    -1 sprites/chars.png 170 250 01 12 6 0 -1
@@ -578,7 +580,7 @@
    -1 sprites/chars.png 50 280 01 21 18 0 -2
    -1 sprites/chars.png 70 280 01 21 15 0 -2
    -1 sprites/chars.png 90 280 01 21 19 0 -2
-   -1 sprites/chars.png 110 280 01 21 17 0 -2
+   -1 sprites/chars.png 110 280 01 21 18 0 -2
    -1 sprites/chars.png 130 280 01 21 13 0 -2
    -1 sprites/chars.png 150 280 01 21 15 0 -2
    -1 sprites/chars.png 170 280 01 21 11 0 -2
@@ -843,11 +845,16 @@
    -1 sprites/mono.png 175 250 01 13 7 0 0
 
 // U+2013: En Dash
-   -1 * 18	 12 04 00 01 13 20 01 01 13 20 02 01 13 20 03 01 13 20
+// U+2014: Em Dash
+   -1 * 18	 12 04 00 02 13 20 01 02 13 20 02 02 13 20 03 02 13 20
    -1 sprites/chars.png 630 310 01 12 8 0 -1
+   -1 sprites/chars.png 450 370 01 12 11 0 -1
    -1 sprites/chars.png 630 330 01 7 4 0 0
+   -1 sprites/chars.png 450 390 01 7 6 0 0
    -1 sprites/chars.png 630 340 01 21 14 0 -2
+   -1 sprites/chars.png 450 400 01 21 20 0 -2
    -1 sprites/mono.png 190 250 01 13 7 0 0
+   -1 sprites/mono.png 145 270 01 13 7 0 0
 
 // U+2019: Right Single Quotation Mark
    -1 * 18	 12 04 00 01 19 20 01 01 19 20 02 01 19 20 03 01 19 20

os/debian/changelog

@@ -1,3 +1,15 @@
+openttd (1.2.0~beta4) unstable; urgency=low
+
+  * New upstream release 1.2.0-beta4
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 04 Feb 2012 16:00:00 +0100
+
+openttd (1.2.0~beta3) unstable; urgency=low
+
+  * New upstream release 1.2.0-beta3
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 21 Jan 2012 16:00:00 +0100
+
 openttd (1.2.0~beta2) unstable; urgency=low
 
   * New upstream release 1.2.0-beta2

os/os2/installer/make_installer.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.2.0-beta2
+set OPENTTD_VERSION=1.2.0-beta4
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0

os/windows/installer/install.nsi

@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 2
 !define APPV_MAINT 0
-!define APPV_BUILD 1
-!define APPV_EXTRA "-beta2"
+!define APPV_BUILD 3
+!define APPV_EXTRA "-beta4"
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2012-01-07
-Release version: 1.2.0-beta2
+Last updated:    2012-02-04
+Release version: 1.2.0-beta4
 ------------------------------------------------------------------------
 
 
@@ -262,7 +262,7 @@ system:
 		directory if it is your personal directory, i.e. "~/", or when it is the
 		root directory, i.e. "/".
 	2. Your personal directory
-		Windows: C:\My Documents (95, 98, ME)
+		Windows: C:\My Documents\OpenTTD (95, 98, ME)
 		         C:\Documents and Settings\<username>\My Documents\OpenTTD (2000, XP)
 		         C:\Users\<username>\Documents\OpenTTD (Vista, 7)
 		Mac OSX: ~/Documents/OpenTTD

src/3rdparty/squirrel/include/squirrel.h

@@ -183,7 +183,7 @@ typedef char SQChar;
 #define scstrdup	strdup
 #define scstrrchr	strrchr
 #define scstrcat	strcat
-#define MAX_CHAR 0xFF
+#define MAX_CHAR 0xFFFF
 #endif
 
 #define SQUIRREL_VERSION	_SC("Squirrel 2.2.5 stable - With custom OpenTTD modifications")

src/3rdparty/squirrel/squirrel/sqbaselib.cpp

@@ -538,6 +538,10 @@ bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, SQInteger root, SQInteger bott
 		if(!_sort_compare(v,arr->_values[root],arr->_values[maxChild],func,ret))
 			return false;
 		if (ret < 0) {
+			if (root == maxChild) {
+				v->Raise_Error(_SC("inconsistent compare function"));
+				return false; // We'd be swapping ourselve. The compare function is incorrect
+			}
 			_Swap(arr->_values[root],arr->_values[maxChild]);
 			root = maxChild;
 		}

src/3rdparty/squirrel/squirrel/sqlexer.h

@@ -2,11 +2,7 @@
 #ifndef _SQLEXER_H_
 #define _SQLEXER_H_
 
-#ifdef SQUNICODE
-typedef SQChar LexChar;
-#else
-typedef	unsigned char LexChar;
-#endif
+typedef unsigned short LexChar;
 
 struct SQLexer
 {

src/autoreplace_gui.cpp

@@ -49,7 +49,7 @@ static int CDECL EngineNumberSorter(const EngineID *a, const EngineID *b)
  */
 void InvalidateAutoreplaceWindow(EngineID e, GroupID id_g)
 {
-	if (GetGroupNumEngines(_local_company, id_g, e) || GetGroupNumEngines(_local_company, ALL_GROUP, e) == 0) {
+	if (GetGroupNumEngines(_local_company, id_g, e) == 0 || GetGroupNumEngines(_local_company, ALL_GROUP, e) == 0) {
 		/* We don't have any of this engine type.
 		 * Either we just sold the last one, we build a new one or we stopped replacing it.
 		 * In all cases, we need to update the left list */

src/build_vehicle_gui.cpp

@@ -847,9 +847,10 @@ int DrawVehiclePurchaseInfo(int left, int right, int y, EngineID engine_number)
 		y += FONT_HEIGHT_NORMAL;
 	}
 
+	if (refittable) y = ShowRefitOptionsList(left, right, y, engine_number);
+
 	/* Additional text from NewGRF */
 	y = ShowAdditionalText(left, right, y, engine_number);
-	if (refittable) y = ShowRefitOptionsList(left, right, y, engine_number);
 
 	return y;
 }

src/cargo_type.h

@@ -105,6 +105,33 @@ public:
 	{
 		return this->amount[cargo];
 	}
+
+	/**
+	 * Get the sum of all cargo amounts.
+	 * @return The sum.
+	 */
+	template <typename T>
+	inline const T GetSum() const
+	{
+		T ret = 0;
+		for (size_t i = 0; i < lengthof(this->amount); i++) {
+			ret += this->amount[i];
+		}
+		return ret;
+	}
+
+	/**
+	 * Get the amount of cargos that have an amount.
+	 * @return The amount.
+	 */
+	inline byte GetCount() const
+	{
+		byte count = 0;
+		for (size_t i = 0; i < lengthof(this->amount); i++) {
+			if (this->amount[i] != 0) count++;
+		}
+		return count;
+	}
 };
 
 

src/cargotype.cpp

@@ -38,7 +38,12 @@ void SetupCargoForClimate(LandscapeID l)
 
 	/* Reset and disable all cargo types */
 	memset(CargoSpec::array, 0, sizeof(CargoSpec::array));
-	for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) CargoSpec::Get(i)->bitnum = INVALID_CARGO;
+	for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) {
+		CargoSpec::Get(i)->bitnum = INVALID_CARGO;
+
+		/* Set defaults for newer properties, which old GRFs do not know */
+		CargoSpec::Get(i)->multiplier = 0x100;
+	}
 
 	_cargo_mask = 0;
 

src/cargotype.h

@@ -59,6 +59,7 @@ struct CargoSpec {
 	uint8 legend_colour;
 	uint8 rating_colour;
 	uint8 weight;                    ///< Weight of a single unit of this cargo type in 1/16 ton (62.5 kg).
+	uint16 multiplier;               ///< Capacity multiplier for vehicles. (8 fractional bits)
 	uint16 initial_payment;
 	uint8 transit_days[2];
 

src/command.cpp

@@ -633,40 +633,31 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 	if (exec_as_spectator) cur_company.Change(COMPANY_SPECTATOR);
 
 	bool test_and_exec_can_differ = (cmd_flags & CMD_NO_TEST) != 0;
-	bool skip_test = _networking && (cmd & CMD_NO_TEST_IF_IN_NETWORK) != 0;
 
-	/* Do we need to do a test run?
-	 * Basically we need to always do this, except when
-	 * the no-test-in-network flag is giving and we're
-	 * in a network game (e.g. restoring orders would
-	 * fail this test because the first order does not
-	 * exist yet when inserting the second, giving that
-	 * a wrong insert location and ignoring the command
-	 * and thus breaking restoring). However, when we
-	 * just want to do cost estimation we don't care
-	 * because it's only done once anyway. */
-	CommandCost res;
-	if (estimate_only || !skip_test) {
-		/* Test the command. */
-		_cleared_object_areas.Clear();
-		SetTownRatingTestMode(true);
-		ClearStorageChanges(false);
-		res = proc(tile, flags, p1, p2, text);
-		SetTownRatingTestMode(false);
+	/* Test the command. */
+	_cleared_object_areas.Clear();
+	SetTownRatingTestMode(true);
+	ClearStorageChanges(false);
+	CommandCost res = proc(tile, flags, p1, p2, text);
+	SetTownRatingTestMode(false);
 
-		/* Make sure we're not messing things up here. */
-		assert(exec_as_spectator ? _current_company == COMPANY_SPECTATOR : cur_company.Verify());
+	/* Make sure we're not messing things up here. */
+	assert(exec_as_spectator ? _current_company == COMPANY_SPECTATOR : cur_company.Verify());
 
-		/* If the command fails, we're doing an estimate
-		 * or the player does not have enough money
-		 * (unless it's a command where the test and
-		 * execution phase might return different costs)
-		 * we bail out here. */
-		if (res.Failed() || estimate_only ||
-				(!test_and_exec_can_differ && !CheckCompanyHasMoney(res))) {
-			cur_company.Restore();
-			return_dcpi(res, false);
+	/* If the command fails, we're doing an estimate
+	 * or the player does not have enough money
+	 * (unless it's a command where the test and
+	 * execution phase might return different costs)
+	 * we bail out here. */
+	if (res.Failed() || estimate_only ||
+			(!test_and_exec_can_differ && !CheckCompanyHasMoney(res))) {
+		if (!_networking || _generating_world || (cmd & CMD_NETWORK_COMMAND) != 0) {
+			/* Log the failed command as well. Just to be able to be find
+			 * causes of desyncs due to bad command test implementations. */
+			DEBUG(desync, 1, "cmdf: %08x; %02x; %02x; %06x; %08x; %08x; %08x; \"%s\" (%s)", _date, _date_fract, (int)_current_company, tile, p1, p2, cmd & ~CMD_NETWORK_COMMAND, text, GetCommandName(cmd));
 		}
+		cur_company.Restore();
+		return_dcpi(res, false);
 	}
 
 #ifdef ENABLE_NETWORK
@@ -705,11 +696,11 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 		cur_company.Restore();
 	}
 
-	/* If the test and execution can differ, or we skipped the test
-	 * we have to check the return of the command. Otherwise we can
-	 * check whether the test and execution have yielded the same
-	 * result, i.e. cost and error state are the same. */
-	if (!test_and_exec_can_differ && !skip_test) {
+	/* If the test and execution can differ we have to check the
+	 * return of the command. Otherwise we can check whether the
+	 * test and execution have yielded the same result,
+	 * i.e. cost and error state are the same. */
+	if (!test_and_exec_can_differ) {
 		assert(res.GetCost() == res2.GetCost() && res.Failed() == res2.Failed()); // sanity check
 	} else if (res2.Failed()) {
 		return_dcpi(res2, false);

src/command_type.h

@@ -345,7 +345,6 @@ DECLARE_ENUM_AS_BIT_SET(DoCommandFlag)
  */
 enum FlaggedCommands {
 	CMD_NETWORK_COMMAND       = 0x0100, ///< execute the command without sending it on the network
-	CMD_NO_TEST_IF_IN_NETWORK = 0x0200, ///< When enabled, the command will bypass the no-DC_EXEC round if in network
 	CMD_FLAGS_MASK            = 0xFF00, ///< mask for all command flags
 	CMD_ID_MASK               = 0x00FF, ///< mask for the command ID
 };

src/company_base.h

@@ -19,12 +19,13 @@
 #include "settings_type.h"
 #include "group.h"
 
+/** Statistics about the economy. */
 struct CompanyEconomyEntry {
-	Money income;
-	Money expenses;
-	int32 delivered_cargo;
-	int32 performance_history; ///< company score (scale 0-1000)
-	Money company_value;
+	Money income;               ///< The amount of income.
+	Money expenses;             ///< The amount of expenses.
+	CargoArray delivered_cargo; ///< The amount of delivered cargo.
+	int32 performance_history;  ///< Company score (scale 0-1000)
+	Money company_value;        ///< The value of the company.
 };
 
 struct CompanyInfrastructure {
@@ -62,8 +63,6 @@ struct CompanyProperties {
 
 	byte block_preview;              ///< Number of quarters that the company is not allowed to get new exclusive engine previews (see CompaniesGenStatistics).
 
-	uint32 cargo_types;              ///< Which cargo types were transported the last year.
-
 	TileIndex location_of_HQ;        ///< Northern tile of HQ; #INVALID_TILE when there is none.
 	TileIndex last_build_coordinate; ///< Coordinate of the last build thing by this company.
 

src/company_cmd.cpp

@@ -810,7 +810,13 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			/* Has the network client a correct ClientIndex? */
 			if (!(flags & DC_EXEC)) return CommandCost();
 			NetworkClientInfo *ci = NetworkClientInfo::GetByClientID(client_id);
+#ifndef DEBUG_DUMP_COMMANDS
+			/* When replaying the client ID is not a valid client; there
+			 * are actually no clients at all. However, the company has to
+			 * be created, otherwise we cannot rerun the game properly.
+			 * So only allow a NULL client info in that case. */
 			if (ci == NULL) return CommandCost();
+#endif /* NOT DEBUG_DUMP_COMMANDS */
 
 			/* Delete multiplayer progress bar */
 			DeleteWindowById(WC_NETWORK_STATUS_WINDOW, WN_NETWORK_STATUS_WINDOW_JOIN);
@@ -842,13 +848,17 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			}
 
 			if (_network_server) {
-				ci->client_playas = c->index;
-				NetworkUpdateClientInfo(ci->client_id);
+				if (ci != NULL) {
+					/* ci is only NULL when replaying.
+					 * When replaying no client is actually in need of an update. */
+					ci->client_playas = c->index;
+					NetworkUpdateClientInfo(ci->client_id);
+				}
 
-				if (Company::IsValidID(ci->client_playas)) {
+				if (Company::IsValidID(c->index)) {
 					_network_company_states[c->index].months_empty = 0;
 					_network_company_states[c->index].password[0] = '\0';
-					NetworkServerUpdateCompanyPassworded(ci->client_playas, false);
+					NetworkServerUpdateCompanyPassworded(c->index, false);
 
 					/* XXX - When a client joins, we automatically set its name to the
 					 * client's name (for some reason). As it stands now only the server
@@ -861,12 +871,24 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 					 * TODO: Perhaps this could be improved by when the client is ready
 					 * with joining to let it send itself the command, and not the server?
 					 * For example in network_client.c:534? */
-					NetworkSendCommand(0, 0, 0, CMD_RENAME_PRESIDENT, NULL, ci->client_name, ci->client_playas);
+					if (ci != NULL) {
+						/* ci is only NULL when replaying.
+						 * When replaying, the command to rename the president will
+						 * automatically be ran, so this is not even needed to get
+						 * the exact same state. */
+						NetworkSendCommand(0, 0, 0, CMD_RENAME_PRESIDENT, NULL, ci->client_name, c->index);
+					}
 				}
 
 				/* Announce new company on network. */
 				NetworkAdminCompanyInfo(c, true);
-				NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, ci->client_playas + 1);
+
+				if (ci != NULL) {
+					/* ci is only NULL when replaying.
+					 * When replaying, the message that someone started a new company
+					 * is not interesting at all. */
+					NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, c->index + 1);
+				}
 			}
 #endif /* ENABLE_NETWORK */
 			break;

src/core/random_func.cpp

@@ -63,11 +63,13 @@ void SetRandomSeed(uint32 seed)
 #include "../network/network_server.h"
 #include "../network/network_internal.h"
 #include "../company_func.h"
+#include "../fileio_func.h"
+#include "../date_func.h"
 
 uint32 DoRandom(int line, const char *file)
 {
 	if (_networking && (!_network_server || (NetworkClientSocket::IsValidID(0) && NetworkClientSocket::Get(0)->status != NetworkClientSocket::STATUS_INACTIVE))) {
-		printf("Random [%d/%d] %s:%d\n", _frame_counter, (byte)_current_company, file, line);
+		DEBUG(random, 0, "%08x; %02x; %04x; %02x; %s:%d", _date, _date_fract, _frame_counter, (byte)_current_company, file, line);
 	}
 
 	return _random.Next();

src/core/random_func.hpp

@@ -17,19 +17,6 @@
 	#define Random OTTD_Random
 #endif /* __APPLE__ */
 
-/**************
- * Warning: DO NOT enable this unless you understand what it does
- *
- * If enabled, in a network game all randoms will be dumped to the
- *  stdout if the first client joins (or if you are a client). This
- *  is to help finding desync problems.
- *
- * Warning: DO NOT enable this unless you understand what it does
- **************/
-
-//#define RANDOM_DEBUG
-
-
 /**
  * Structure to encapsulate the pseudo random number generators.
  */

src/debug.cpp

@@ -39,6 +39,9 @@ int _debug_sl_level;
 int _debug_gamelog_level;
 int _debug_desync_level;
 int _debug_console_level;
+#ifdef RANDOM_DEBUG
+int _debug_random_level;
+#endif
 
 uint32 _realtime_tick = 0;
 
@@ -64,6 +67,9 @@ struct DebugLevel {
 	DEBUG_LEVEL(gamelog),
 	DEBUG_LEVEL(desync),
 	DEBUG_LEVEL(console),
+#ifdef RANDOM_DEBUG
+	DEBUG_LEVEL(random),
+#endif
 	};
 #undef DEBUG_LEVEL
 
@@ -85,7 +91,21 @@ static void debug_print(const char *dbg, const char *buf)
 		return;
 	}
 #endif /* ENABLE_NETWORK */
-	if (strcmp(dbg, "desync") != 0) {
+	if (strcmp(dbg, "desync") == 0) {
+		static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
+		if (f == NULL) return;
+
+		fprintf(f, "%s%s\n", GetLogPrefix(), buf);
+		fflush(f);
+#ifdef RANDOM_DEBUG
+	} else if (strcmp(dbg, "random") == 0) {
+		static FILE *f = FioFOpenFile("random-out.log", "wb", AUTOSAVE_DIR);
+		if (f == NULL) return;
+
+		fprintf(f, "%s\n", buf);
+		fflush(f);
+#endif
+	} else {
 #if defined(WINCE)
 		/* We need to do OTTD2FS twice, but as it uses a static buffer, we need to store one temporary */
 		TCHAR tbuf[512];
@@ -98,12 +118,6 @@ static void debug_print(const char *dbg, const char *buf)
 		NetworkAdminConsole(dbg, buf);
 #endif /* ENABLE_NETWORK */
 		IConsoleDebug(dbg, buf);
-	} else {
-		static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
-		if (f == NULL) return;
-
-		fprintf(f, "%s%s\n", GetLogPrefix(), buf);
-		fflush(f);
 	}
 }
 

src/debug.h

@@ -51,6 +51,9 @@
 	extern int _debug_gamelog_level;
 	extern int _debug_desync_level;
 	extern int _debug_console_level;
+#ifdef RANDOM_DEBUG
+	extern int _debug_random_level;
+#endif
 
 	void CDECL debug(const char *dbg, const char *format, ...) WARN_FORMAT(2, 3);
 #endif /* NO_DEBUG_MESSAGES */

src/economy.cpp

@@ -214,27 +214,21 @@ int UpdateCompanyRatingAndValue(Company *c, bool update)
 
 	/* Generate score depending on amount of transported cargo */
 	{
-		const CompanyEconomyEntry *cee;
-		int numec;
-		uint32 total_delivered;
-
-		numec = min(c->num_valid_stat_ent, 4);
+		int numec = min(c->num_valid_stat_ent, 4);
 		if (numec != 0) {
-			cee = c->old_economy;
-			total_delivered = 0;
+			const CompanyEconomyEntry *cee = c->old_economy;
+			OverflowSafeInt64 total_delivered = 0;
 			do {
-				total_delivered += cee->delivered_cargo;
+				total_delivered += cee->delivered_cargo.GetSum<OverflowSafeInt64>();
 			} while (++cee, --numec);
 
-			_score_part[owner][SCORE_DELIVERED] = total_delivered;
+			_score_part[owner][SCORE_DELIVERED] = ClampToI32(total_delivered);
 		}
 	}
 
 	/* Generate score for variety of cargo */
 	{
-		uint num = CountBits(c->cargo_types);
-		_score_part[owner][SCORE_CARGO] = num;
-		if (update) c->cargo_types = 0;
+		_score_part[owner][SCORE_CARGO] = c->old_economy->delivered_cargo.GetCount();
 	}
 
 	/* Generate score for company's money */
@@ -425,7 +419,10 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 				assert(new_owner != INVALID_OWNER);
 
 				v->owner = new_owner;
+
+				/* Owner changes, clear cache */
 				v->colourmap = PAL_NONE;
+				v->InvalidateNewGRFCache();
 
 				if (v->IsEngineCountable()) {
 					GroupStatistics::CountEngine(v, 1);
@@ -474,6 +471,9 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 		UpdateSignalsInBuffer();
 	}
 
+	/* Add airport infrastructure count of the old company to the new one. */
+	if (new_owner != INVALID_OWNER) Company::Get(new_owner)->infrastructure.airport += Company::Get(old_owner)->infrastructure.airport;
+
 	/* convert owner of stations (including deleted ones, but excluding buoys) */
 	Station *st;
 	FOR_ALL_STATIONS(st) {
@@ -1007,8 +1007,7 @@ static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID dest, Ti
 	}
 
 	/* Update company statistics */
-	company->cur_economy.delivered_cargo += accepted;
-	if (accepted > 0) SetBit(company->cargo_types, cargo_type);
+	company->cur_economy.delivered_cargo[cargo_type] += accepted;
 
 	/* Increase town's counter for town effects */
 	const CargoSpec *cs = CargoSpec::Get(cargo_type);

src/engine.cpp

@@ -210,6 +210,7 @@ uint Engine::DetermineCapacity(const Vehicle *v, uint16 *mail_capacity) const
 
 	if (!this->CanCarryCargo()) return 0;
 
+	bool new_multipliers = HasBit(this->info.misc_flags, EF_NO_DEFAULT_CARGO_MULTIPLIER);
 	CargoID default_cargo = this->GetDefaultCargoType();
 	CargoID cargo_type = (v != NULL) ? v->cargo_type : default_cargo;
 
@@ -217,16 +218,16 @@ uint Engine::DetermineCapacity(const Vehicle *v, uint16 *mail_capacity) const
 		*mail_capacity = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v);
 	}
 
-	/* Check the refit capacity callback if we are not in the default configuration.
-	 * Note: This might change to become more consistent/flexible/sane, esp. when default cargo is first refittable. */
+	/* Check the refit capacity callback if we are not in the default configuration, or if we are using the new multiplier algorithm. */
 	if (HasBit(this->info.callback_mask, CBM_VEHICLE_REFIT_CAPACITY) &&
-			(default_cargo != cargo_type || (v != NULL && v->cargo_subtype != 0))) {
+			(new_multipliers || default_cargo != cargo_type || (v != NULL && v->cargo_subtype != 0))) {
 		uint16 callback = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, this->index, v);
 		if (callback != CALLBACK_FAILED) return callback;
 	}
 
 	/* Get capacity according to property resp. CB */
 	uint capacity;
+	uint extra_mail_cap = 0;
 	switch (this->type) {
 		case VEH_TRAIN:
 			capacity = GetEngineProperty(this->index, PROP_TRAIN_CARGO_CAPACITY,        this->u.rail.capacity, v);
@@ -246,30 +247,31 @@ uint Engine::DetermineCapacity(const Vehicle *v, uint16 *mail_capacity) const
 		case VEH_AIRCRAFT:
 			capacity = GetEngineProperty(this->index, PROP_AIRCRAFT_PASSENGER_CAPACITY, this->u.air.passenger_capacity, v);
 			if (!IsCargoInClass(cargo_type, CC_PASSENGERS)) {
-				capacity += GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v);
+				extra_mail_cap = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v);
 			}
-			if (cargo_type == CT_MAIL) return capacity;
+			if (!new_multipliers && cargo_type == CT_MAIL) return capacity + extra_mail_cap;
 			default_cargo = CT_PASSENGERS; // Always use 'passengers' wrt. cargo multipliers
 			break;
 
 		default: NOT_REACHED();
 	}
 
-	/* Apply multipliers depending on cargo- and vehicletype.
-	 * Note: This might change to become more consistent/flexible. */
-	if (this->type != VEH_SHIP && default_cargo != cargo_type) {
-		switch (default_cargo) {
-			case CT_PASSENGERS: break;
-			case CT_MAIL:
-			case CT_GOODS: capacity *= 2; break;
-			default:       capacity *= 4; break;
-		}
-		switch (cargo_type) {
-			case CT_PASSENGERS: break;
-			case CT_MAIL:
-			case CT_GOODS: capacity /= 2; break;
-			default:       capacity /= 4; break;
+	if (!new_multipliers) {
+		/* Use the passenger multiplier for mail as well */
+		capacity += extra_mail_cap;
+		extra_mail_cap = 0;
+	}
+
+	/* Apply multipliers depending on cargo- and vehicletype. */
+	if (new_multipliers || (this->type != VEH_SHIP && default_cargo != cargo_type)) {
+		uint16 default_multiplier = new_multipliers ? 0x100 : CargoSpec::Get(default_cargo)->multiplier;
+		uint16 cargo_multiplier = CargoSpec::Get(cargo_type)->multiplier;
+		capacity *= cargo_multiplier;
+		if (extra_mail_cap > 0) {
+			uint mail_multiplier = CargoSpec::Get(CT_MAIL)->multiplier;
+			capacity += (default_multiplier * extra_mail_cap * cargo_multiplier + mail_multiplier / 2) / mail_multiplier;
 		}
+		capacity = (capacity + default_multiplier / 2) / default_multiplier;
 	}
 
 	return capacity;

src/engine_type.h

@@ -156,6 +156,7 @@ enum EngineMiscFlags {
 	EF_RAIL_IS_MU = 2, ///< Rail vehicle is a multiple-unit (DMU/EMU)
 	EF_RAIL_FLIPS = 3, ///< Rail vehicle can be flipped in the depot
 	EF_AUTO_REFIT = 4, ///< Automatic refitting is allowed
+	EF_NO_DEFAULT_CARGO_MULTIPLIER = 5, ///< Use the new capacity algorithm. The default cargotype of the vehicle does not affect capacity multipliers. CB 15 is also called in purchase list.
 };
 
 /**

src/error_gui.cpp

@@ -119,8 +119,10 @@ public:
 	{
 		this->position.x = x;
 		this->position.y = y;
+		if (textref_stack_size > 0) StartTextRefStackUsage(textref_stack_size, textref_stack);
 		CopyOutDParam(this->decode_params, this->strings, detailed_msg == INVALID_STRING_ID ? summary_msg : detailed_msg, lengthof(this->decode_params));
 		if (textref_stack_size > 0) {
+			StopTextRefStackUsage();
 			MemCpyT(this->textref_stack, textref_stack, textref_stack_size);
 		}
 

src/game/game_instance.cpp

@@ -57,6 +57,7 @@
 #include "../script/api/game/game_map.hpp.sq"
 #include "../script/api/game/game_marine.hpp.sq"
 #include "../script/api/game/game_news.hpp.sq"
+#include "../script/api/game/game_order.hpp.sq"
 #include "../script/api/game/game_rail.hpp.sq"
 #include "../script/api/game/game_railtypelist.hpp.sq"
 #include "../script/api/game/game_road.hpp.sq"
@@ -152,6 +153,7 @@ void GameInstance::RegisterAPI()
 	SQGSMap_Register(this->engine);
 	SQGSMarine_Register(this->engine);
 	SQGSNews_Register(this->engine);
+	SQGSOrder_Register(this->engine);
 	SQGSRail_Register(this->engine);
 	SQGSRailTypeList_Register(this->engine);
 	SQGSRoad_Register(this->engine);

src/gfx.cpp

@@ -821,6 +821,36 @@ Dimension GetStringMultiLineBoundingBox(StringID str, const Dimension &suggestio
 	return box;
 }
 
+
+/**
+ * Calculates height of string (in pixels). The string is changed to a multiline string if needed.
+ * @param str string to check
+ * @param maxw maximum string width
+ * @return height of pixels of string when it is drawn
+ */
+int GetStringHeight(const char *str, int maxw)
+{
+	char buffer[DRAW_STRING_BUFFER];
+
+	strecpy(buffer, str, lastof(buffer));
+
+	uint32 tmp = FormatStringLinebreaks(buffer, lastof(buffer), maxw);
+
+	return GetMultilineStringHeight(buffer, GB(tmp, 0, 16), FS_NORMAL);
+}
+
+/**
+ * Calculate string bounding box for multi-line strings.
+ * @param str        String to check.
+ * @param suggestion Suggested bounding box.
+ * @return Bounding box for the multi-line string, may be bigger than \a suggestion.
+ */
+Dimension GetStringMultiLineBoundingBox(const char *str, const Dimension &suggestion)
+{
+	Dimension box = {suggestion.width, GetStringHeight(str, suggestion.width)};
+	return box;
+}
+
 /**
  * Draw string, possibly over multiple lines.
  *

src/gfx_func.h

@@ -125,6 +125,7 @@ Dimension GetStringBoundingBox(StringID strid);
 uint32 FormatStringLinebreaks(char *str, const char *last, int maxw, FontSize start_fontsize = FS_NORMAL);
 int GetStringHeight(StringID str, int maxw);
 Dimension GetStringMultiLineBoundingBox(StringID str, const Dimension &suggestion);
+Dimension GetStringMultiLineBoundingBox(const char *str, const Dimension &suggestion);
 void LoadStringWidthTable(bool monospace = false);
 
 void DrawDirtyBlocks();

src/goal.cpp

@@ -130,14 +130,17 @@ CommandCost CmdGoalQuestion(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 {
 	uint16 uniqueid = (GoalType)GB(p1, 0, 16);
 	CompanyID company = (CompanyID)GB(p1, 16, 8);
+	byte type = GB(p1, 24, 8);
 
 	if (_current_company != OWNER_DEITY) return CMD_ERROR;
 	if (StrEmpty(text)) return CMD_ERROR;
 	if (company != INVALID_COMPANY && !Company::IsValidID(company)) return CMD_ERROR;
 	if (CountBits(p2) < 1 || CountBits(p2) > 3) return CMD_ERROR;
+	if (p2 >= (1 << GOAL_QUESTION_BUTTON_COUNT)) return CMD_ERROR;
+	if (type >= GOAL_QUESTION_TYPE_COUNT) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
-		if (company == _local_company || (company == INVALID_COMPANY && Company::IsValidID(_local_company))) ShowGoalQuestion(uniqueid, p2, text);
+		if (company == _local_company || (company == INVALID_COMPANY && Company::IsValidID(_local_company))) ShowGoalQuestion(uniqueid, type, p2, text);
 	}
 
 	return CommandCost();

src/goal_gui.cpp

@@ -258,13 +258,15 @@ struct GoalQuestionWindow : Window {
 	char *question;
 	int buttons;
 	int button[3];
+	byte type;
 
-	GoalQuestionWindow(const WindowDesc *desc, WindowNumber window_number, uint32 button_mask, const char *question) : Window()
+	GoalQuestionWindow(const WindowDesc *desc, WindowNumber window_number, byte type, uint32 button_mask, const char *question) : Window(), type(type)
 	{
+		assert(type < GOAL_QUESTION_TYPE_COUNT);
 		this->question = strdup(question);
 
 		/* Figure out which buttons we have to enable */
-		int bit;
+		uint bit;
 		int n = 0;
 		FOR_EACH_SET_BIT(bit, button_mask) {
 			if (bit >= GOAL_QUESTION_BUTTON_COUNT) break;
@@ -287,6 +289,10 @@ struct GoalQuestionWindow : Window {
 	virtual void SetStringParameters(int widget) const
 	{
 		switch (widget) {
+			case WID_GQ_CAPTION:
+				SetDParam(0, STR_GOAL_QUESTION_CAPTION_QUESTION + this->type);
+				break;
+
 			case WID_GQ_BUTTON_1:
 				SetDParam(0, STR_GOAL_QUESTION_BUTTON_CANCEL + this->button[0]);
 				break;
@@ -341,7 +347,7 @@ struct GoalQuestionWindow : Window {
 static const NWidgetPart _nested_goal_question_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE),
-		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE), SetDataTip(STR_GOAL_QUESTION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, WID_GQ_CAPTION), SetDataTip(STR_WHITE_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE),
 		NWidget(WWT_EMPTY, INVALID_COLOUR, WID_GQ_QUESTION), SetMinimalSize(300, 0), SetPadding(8, 8, 8, 8), SetFill(1, 0),
@@ -371,7 +377,7 @@ static const WindowDesc _goal_question_list_desc(
 );
 
 
-void ShowGoalQuestion(uint16 id, uint32 button_mask, const char *question)
+void ShowGoalQuestion(uint16 id, byte type, uint32 button_mask, const char *question)
 {
-	new GoalQuestionWindow(&_goal_question_list_desc, id, button_mask, question);
+	new GoalQuestionWindow(&_goal_question_list_desc, id, type, button_mask, question);
 }

src/goal_type.h

@@ -14,9 +14,8 @@
 
 #include "core/enum_type.hpp"
 
-enum {
-	GOAL_QUESTION_BUTTON_COUNT = 18, ///< Amount of buttons available.
-};
+static const uint32 GOAL_QUESTION_BUTTON_COUNT = 18; ///< Amount of buttons available.
+static const byte   GOAL_QUESTION_TYPE_COUNT   =  4; ///< Amount of question types.
 
 /** Types of goal destinations */
 enum GoalType {

src/graph_gui.cpp

@@ -717,7 +717,7 @@ struct DeliveredCargoGraphWindow : BaseGraphWindow {
 
 	virtual OverflowSafeInt64 GetGraphData(const Company *c, int j)
 	{
-		return c->old_economy[j].delivered_cargo;
+		return c->old_economy[j].delivered_cargo.GetSum<OverflowSafeInt64>();
 	}
 };
 

src/gui.h

@@ -53,7 +53,7 @@ void ShowTownDirectory();
 void ShowIndustryDirectory();
 void ShowSubsidiesList();
 void ShowGoalsList();
-void ShowGoalQuestion(uint16 id, uint32 button_mask, const char *question);
+void ShowGoalQuestion(uint16 id, byte type, uint32 button_mask, const char *question);
 
 void ShowEstimatedCostOrIncome(Money cost, int x, int y);
 

src/lang/afrikaans.txt

@@ -2418,15 +2418,8 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} moet
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} vereis OpenTTD uitgawe {STRING} of beter.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :die GRF lêer dit was ontwerp om te vertaal
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Te veel NewGRFs gelaai
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Die laai van {2:STRING} as statiese NewGRF met {4:STRING} kan desinkroniesasies veroorsaak.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Onverwagte "sprite".
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Onbekende Aksie 0 waarde.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Pooging om onvoldoende ID te gebruik.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Die laai van {1:STRING} as statiese NewGRF met {STRING} kan desinkroniesasies veroorsaak.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} het 'n korrupte "sprite". Alle korrupte "sprites" sal gewys word as 'n rooi vraag teken (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Bevat veelvuldige Aksie 8 inskrywings.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lees verby einde van pseudo-sprite.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Gevraagde GRF hulpbronne nie beskikbaar nie
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ongeldige/onbekende sprite uitleg formaat
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Versigtig!

src/lang/arabic_egypt.txt

@@ -2495,17 +2495,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} يج
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} يتطلب نسخة {STRING} من النسخة المفتوحة او احدث .
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :تم تصميم ملف GRF بغرض الترجمة
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :العديد من NewGRF تم تحميلها
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :تحميل {2:STRING}كملف ثابت مع NewGRF {4:STRING}قد يتسبب بمشكلة توافق.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :خطأ غير متوقع
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :طلب غير معروف 0 بدون خصائص
-STR_NEWGRF_ERROR_INVALID_ID                                     :محاولة استخدام ID معرف غير معروف .
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :تحميل {1:STRING}كملف ثابت مع NewGRF {STRING}قد يتسبب بمشكلة توافق.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} يحتوي على خصائص غير صالحة. جميع الخصائص الغير صالحة سوف يشار لها بعلامة استفهام حمراء.
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :يحتوي على اوامر متعددة - 8 مدخلات
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :خطأ في قرائة البرمجة
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}ملف الرسوم المستخدم حاليا يفتقد لبعض الرسوم الاساسية.{}الرجاء حدث ملف الرسوم.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :معلومات الاضافة غير متاحة
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING}تم تعطيلة بواسطة{4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :شبح/ ماكرو غير معروف
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING}تم تعطيلة بواسطة{STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}تحذير!

src/lang/belarusian.txt

@@ -759,7 +759,7 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Кансоль
 STR_ABOUT_MENU_AI_DEBUG                                         :Наладка штучнага інтэлекту (ШІ/AI) / скрыптоў
 STR_ABOUT_MENU_SCREENSHOT                                       :Здымак экрана (Ctrl+S)
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Здымак экрана ў звычайным маштабе
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Здымак экрана ў макс. набліжэньні
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Павялiчаны здымак экрана па змоўчаньнi
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Здымак усёй мапы (Ctrl+G)
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Аб гульні OpenTTD
@@ -2116,6 +2116,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Дост
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Вас выкінулі з гульні
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Махлярства не дазволена на гэтым сэрвэры
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Вы дасылалi да сэрвэра занадта шмат камандаў
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Вы задоўга ня можаце ўвесьцi пароль
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Ваш кампутар задоўга ня можа далучыцца
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Вы задоўга пампуеце мапу
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Вы задоўга далучаецеся да сэрвэра
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :агульная памылка
@@ -2134,6 +2138,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :Вас выкі
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :паспрабаваў махляваць
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :сэрвэр перапоўнены
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :дасылаў занадта шмат каманд
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :пароль не атрыманы своечасова
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :агульны перапынак
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :мапа пампуецца задоўга
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :апрацоўка мапы iдзе задоўга
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Падключэньне згублена
@@ -2868,17 +2876,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} па
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} патрабуе OpenTTD вэрсіі {STRING} або вышэй.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :файл GRF, які ім перакладаецца.
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Загружана занадта шмат новай графікі.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Загрузка {2:STRING} у якасьці статычнага NewGRF з {4:STRING} можа выклікаць памылку сынхранізацыі.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Нечаканы спрайт.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Невядомая ўласьцівасьць для Action 0.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Выкарыстоўваецца няправільны ID.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Загрузка {1:STRING} у якасьці статычнага NewGRF з {STRING} можа выклікаць памылку сынхранізацыі.
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Нечаканы спрайт (спрайт {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Невядомая ўласьцівасьць у «Action 0» {4:HEX} (спрайт {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Спроба выкарыстаньня недапушчальнага ідэнтыфікатара (спрайт {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} утрымлiвае пашкоджаны спрайт. Усе пашкоджаныя спрайты будуць паказаны чырвоным знакам пытаньня (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Зьмяшчае некалькі Action 8 дзеяньняў.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Дадзеныя раптоўна скончыліся.
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Утрымлiвае некалькі блёкаў «Action 8» (спрайт {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Чытаньне па-за канцом псэўда-спрайту (спрайт {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}У бягучым наборы базавай графікі адсутнічаюць выявы некаторых аб'ектаў.{}Калі ласка, абнавіце модуль базавай графікі.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Запрошаныя рэсурсы GRF недаступныя
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} быў адключаны з-за {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Няслушны/невядомы фармат разьмяшчэньня спрайтаў
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Запытаныя рэсурсы GRF недаступныя (спрайт {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} быў адключаны з-за {2:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Недапушчальны/невядомы фармат размяшчэньня спрайтаў (спрайт {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Асцярожна!
@@ -2976,7 +2984,7 @@ STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}Адмі
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Рэйтынг транспартных кампаніяў
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Даступныя дзеяньні:
-STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Тое, што можна зрабіць у гэтым горадзе - клікніце, каб даведацца больш
+STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Сьпіс магчымых дзеяньняў у гэтым горадзе - пстрыкніце для дадатковых зьвестак
 STR_LOCAL_AUTHORITY_DO_IT_BUTTON                                :{BLACK}Скарыстаць
 STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Выканаць дзеяньне, выбранае ў сьпісе вышэй
 
@@ -3007,7 +3015,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Зада
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Пстрыкніце па задачы, каб паказаць прадпрыемства/горад/клетку. Ctrl+пстрычка паказвае ў новым вакне.
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Пытаньне
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Пытаньне
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Інфармацыя
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Папярэджаньне
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Памылка
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Адмова
@@ -3139,10 +3150,10 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}няма
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Кошт кампаніі: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% валодае {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Iнфраструктура:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} чыгуначн{P ы ыя ых} элемэнт{P "" ы аў}
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} дарожн{P ы ыя ых} элемэнт{P "" ы аў}
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} водн{P ая ыя ых} клетк{P а i ак}
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} станцыйн{P ая ыя ых} клетк{P а i ак}
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} чыгуначн{P ы ыя ых} {P ў ў у}част{P ак кi аў}
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} дарожн{P ы ыя ых} {P ў ў у}част{P ак кi аў}
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} водн{P ы ыя ых} {P ў ў у}част{P ак кi аў}
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} {P ў ў у}част{P ак кi аў} занята станцыямі
 STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} аэрапорт{P "" ы аў}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Нiчога
 
@@ -3311,7 +3322,7 @@ STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Далё
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Выбар вагонаў - клікніце для даведкі
 STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Сьпiс аўтатранспарту - націсьніце для атрыманьня даведкі
 STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Сьпiс караблёў - націсьніце для атрыманьня даведкі
-STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Авiятранспарт - націсьніце для атрыманьня даведкі
+STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Сьпіс паветраных судоў - пстрыкніце для атрыманьня інфармацыі
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Купiць
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Купiць
@@ -3866,7 +3877,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Гуль
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Паказаць журнал працы гульнёвага скрыпту
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Ня знойдзена прыдатных модуляў ШI,{}таму канкурэнты нічога рабіць не будуць.{}Модулі ШI можна спампаваць праз сістэму анлайн-кантэнту.
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Адзін з запушчаных ШI выканаў недапушчальную аперацыю і быў закрыты. Калі ласка, паведаміце аб гэтым аўтару ШI, прыклаўшы здымак вакна адладкі.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Адзін з запушчаных ШI / скрыптоў завяршыў сваю працу аварыйна. Калі ласка, паведаміце аб гэтым аўтару скрыпту, прыклаўшы здымак вакна адладкі.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Вакно адладкі ШІ / скрыпту даступна толькі для сэрвэра
 
 # AI configuration window

src/lang/brazilian_portuguese.txt

@@ -2529,17 +2529,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} deve
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} requer versão {STRING} ou maior do OpenTTD
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :o arquivo GRF foi designado para tradução
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Muitas NewGRFs estão carregadas
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregar {2:STRING} como um NewGRF estático em conjunto com {4:STRING} pode causar desincronias
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite não esperado
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propriedade Ação Desconhecida 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de usar ID inválido
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregar {1:STRING} como um NewGRF estático em conjunto com {STRING} pode causar desincronias
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém um sprite corrupto. Todos os sprites corruptos serão exibidos como um "?" vermelho
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém entradas múltiplas de Ação 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Continuar lendo após o fim do pseudo-sprite
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Estão faltando alguns sprites na base de gráficos em uso.{}Por favor atualize a base de gráficos
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF requisitados não estão dispon.
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} foi desativado por {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato de layout de sprite inválido/desconh.
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} foi desativado por {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Cuidado!

src/lang/bulgarian.txt

@@ -1753,6 +1753,8 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Забр
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Бяхте изхвърлен от играта
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Маменето не е разрешено на този сървър
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Ти изпращаше прекалено много команди към сървъра
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Отнети твърде дълго време да въведеш паролата
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Отнети твърде дълго време да се свържеш
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :обща грешка
@@ -1817,6 +1819,8 @@ STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Избе
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Премахнете всички
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Размаркирай всичко
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Филтър по таг/име:
+STR_CONTENT_OPEN_URL                                            :{BLACK}Посети уебсайта
+STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}Посети уебсайта за това съдържание
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Сваляне
 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Започни свалянето на избраните модули
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Общо за сваляне: {WHITE}{BYTES}
@@ -2369,6 +2373,7 @@ STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Спис
 # Additional textfiles accompanying NewGRFs
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Настройване на параметрите
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Покажи параметрите
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Превключване на палитрата
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Превключване на палитрата на избрания NewGRF.{}Когато графиката от NewGRF изглежда розова в играта
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Прилагане на промените
@@ -2441,13 +2446,8 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} тр
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} изисква OpenTTD версия {STRING} или по-нова.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF файлат беше предназначен да преведе
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Прекалено много графики (NewGRF) са заредени.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Зареждане на {2:STRING} като статичен NewGRF заедно с {4:STRING} може да доведе до проблеми.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Неочакван обект.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Неизвестна Action 0 собственост.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Опит да се използва невалидно ID.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Зареждане на {1:STRING} като статичен NewGRF заедно с {STRING} може да доведе до проблеми.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} съдържа повреден обект. Вскички повредени обекти ще бъдат показани като червена въпросителна (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Съдържа множество Действие 8 вписвания.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Прочети след края на псевдо sprite
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Текущите основни графики имат празни картинки.{}Моля обновете си основните графики.
 
 # NewGRF related 'general' warnings
@@ -2563,7 +2563,7 @@ STR_GOALS_NONE                                                  :{ORANGE}- Ни
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Цели на компанията:
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Въпрос
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Въпрос
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Недобре
@@ -2656,10 +2656,10 @@ STR_FINANCES_EXPENDITURE_INCOME_TITLE                           :{WHITE}Разх
 STR_FINANCES_YEAR                                               :{WHITE}{NUM}
 STR_FINANCES_SECTION_CONSTRUCTION                               :{GOLD}Строеж
 STR_FINANCES_SECTION_NEW_VEHICLES                               :{GOLD}Нови МПС-та
-STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}Оперативни разходи на влака
+STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}Оперативни разходи на влаковете
 STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}Оперативни разходи на МПС-то
-STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Оперативни разходи на самолета
-STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Оперативни разходи на кораба
+STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Оперативни разходи на самолетите
+STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Оперативни разходи на корабите
 STR_FINANCES_SECTION_PROPERTY_MAINTENANCE                       :{GOLD}Разходи по поддръжка
 STR_FINANCES_SECTION_TRAIN_INCOME                               :{GOLD}Приходи от влакове
 STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME                        :{GOLD}Приходи от МПС-та
@@ -3042,6 +3042,7 @@ STR_VEHICLE_STATUS_STOPPED                                      :{RED}Спрян
 STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Спира, {VELOCITY}
 STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Няма мощност
 STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Изчакване на свободен път
+STR_VEHICLE_STATUS_AIRCRAFT_TOO_FAR                             :{ORANGE}Прекалено далече до следващата дестинация
 
 STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Отиващ към {STATION}, {VELOCITY}
 STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Без заповеди, {VELOCITY}
@@ -3357,12 +3358,14 @@ STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Прем
 
 STR_AI_CONFIG_AI                                                :{SILVER}AI-та
 
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Избери {STRING}
 STR_AI_CONFIG_CHANGE_AI                                         :AI
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Програмен език на играта
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Конфигуриране
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Конфигурирайте параметрите на AI
 
 # Available AIs window
+STR_AI_LIST_CAPTION                                             :{WHITE}Налични {STRING}
 STR_AI_LIST_CAPTION_AI                                          :AI-та
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Програмни езици на играта
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Кликнете за да изберете AI
@@ -3377,6 +3380,7 @@ STR_AI_LIST_CANCEL                                              :{BLACK}Отме
 STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Не променяй AI
 
 # AI Parameters
+STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Параметри
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Програмен език на играта
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Затвори

src/lang/catalan.txt

@@ -447,7 +447,7 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Canvia al terminal
 STR_ABOUT_MENU_AI_DEBUG                                         :IA / Depuració de l'script del joc
 STR_ABOUT_MENU_SCREENSHOT                                       :Captura de pantalla
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ampliació en la captura de pantalla
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zoom màxim en la captura de pantalla
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Zoom predeterminat en les captures de pantalla
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Captura de pantalla de tot el mapa
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Quant a 'OpenTTD'
@@ -1800,6 +1800,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Estàs e
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}T'han fet fora del joc
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}No es permet fer trampes en aquest servidor
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Estaves enviant massa ordres al servidor
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Has tardat massa a introduir la contrasenya
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}El teu ordenador ha tardat massa a unir-se
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Has tardat massa a descarregar el mapa
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Has tardat massa a unir-te al servidor
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :error general
@@ -1818,6 +1822,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :tret pel servid
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :s'ha intentat utilitzar una trampa
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor ple
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :estava enviant massa ordres
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :no s'ha rebut la contrasenya a temps
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :temps d'espera general
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :la descàrrega del mapa ha tardat massa
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :el processat del mapa ha tardat massa
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possible pèrdua de connexió
@@ -2455,6 +2463,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Registra
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Llicència
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Estableix paràm.
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Mostra els paràmetres
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Commuta paleta
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Commuta la paleta del NewGRF seleccionat.{}Fes això quan els gràfics del NewGRF en el joc siguin rosats
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplica els canvis
@@ -2521,7 +2530,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Alerta: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Error: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatal: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ha passat un error fatal d'un NewGRF: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ha passat un error fatal de NewGRF: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} no funcionarà amb la versió de TTDPatch informada per OpenTTD
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} és per la versió {STRING} de TTD
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} està dissenyat per ser utilitzat amb {STRING}
@@ -2531,17 +2540,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} ha d
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} necessita OpenTTD versió {STRING} o més modern
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :l'arxiu GRF dissenyat està pendent de traduir
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Hi ha massa arxius NewGRF carregats
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregant {2:STRING} com a NewGRF estàtic amb {4:STRING} podria causar desincronitzacions
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite no esperat
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Acció desconeguda 0 atributs
-STR_NEWGRF_ERROR_INVALID_ID                                     :Intenta utilitzar una ID invàlida
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregant {1:STRING} com a NewGRF estàtic amb {STRING} podria causar desincronitzacions
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite inesperat (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propietat d'acció 0 desconeguda {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Intent d'utilitzar una ID invàlid (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} conté un sprite corrupte. Tots els sprites corruptes seran mostrats amb un interrogant vermell (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Conté múltiples Accions 8 entrades
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lectura després de la fi d'un pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Conté múltiples entrades d'acció 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :S'ha llegit després del final d'un pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Al joc de gràfics base establert actualment li falten un nombre d'sprites.{}Si us plau actualitza el joc de gràfics base
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Els recursos GRF demanats no estan disponibles
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} ha estat desactivat per {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Format de disposició d'Sprites invàlid/desconegut
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Els recursos GRF demanats no estan disponibles (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} ha estat desactivat per {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Format de disposició d'sprite invàlid/desconegut (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Alerta!
@@ -2669,6 +2678,32 @@ STR_GOALS_NONE                                                  :{ORANGE}- Cap -
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Objectius de la companyia:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Clica sobre l'objectiu per centrar la vista principal sobre la indústria/poble/cel·la. Ctrl+clic per obrir una nova vista sobre la indústria/poble/cel·la
 
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pregunta
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informació
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Alerta
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancel·la
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :No
+STR_GOAL_QUESTION_BUTTON_YES                                    :Si
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Declina
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Accepta
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignora
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Reintenta
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Anterior
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Següent
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Para
+STR_GOAL_QUESTION_BUTTON_START                                  :Comença
+STR_GOAL_QUESTION_BUTTON_GO                                     :Ves
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Continua
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Reinicia
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Postposa
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Rendir-se
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Tanca
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subvencions
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Subvencions per prestació de serveis oferts:
@@ -2779,11 +2814,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Cap
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor de l'Empresa: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propietat de {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastructura:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} troços de via
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} troços de carretera
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} cel·les d'aigua
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} cel·les d'estació
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroports
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} tros{P "" sos} de via
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} tros{P "" sos} de carretera
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} cel·l{P a es} d'aigua
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} cel·l{P a es} d'estació
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroport{P "" s}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Cap
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir Seu
@@ -2806,8 +2841,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Canvia e
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Compra un 25% d'accions
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vendre un 25% d'accions
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Compra el 25% d'accions d'aquesta companyia. Shift+Clic mostra el cost estimat sense comprar cap acció
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Ven un 25% d'accions d'aquesta companyia. Shift+Clic mostra el cost estimat sense vendre cap acció
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Compra el 25% de les accions d'aquesta companyia. Shift+Clic mostra el cost estimat sense comprar cap acció
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Ven un 25% de les accions d'aquesta companyia. Shift+Clic mostra el cost estimat sense vendre cap acció
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nom Empresa
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nom President
@@ -3486,7 +3521,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Script d
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Comprova el registre de l'script de joc
 
 STR_ERROR_AI_NO_AI_FOUND                                        :No s'ha trobat una IA adequada per carregar.{}Aquesta IA és una IA falsa i no farà res.{}Pots descarregar diverses IAs via el sistema de "Contingut en línia"
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Una de les IAs s'ha penjat. Si us plau reporta això a l'autor de la IA amb una captura de pantalla de la finestra de depuració IA
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Un dels scripts s'ha penjat. Si us plau reporta això a l'autor de l'script amb una captura de pantalla de la finestra de depuració IA / Script
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}IA / La finestra de depuració només està disponible pel servidor
 
 # AI configuration window

src/lang/croatian.txt

@@ -1895,6 +1895,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Zabranje
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Izbačen si iz igre
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Na ovome poslužitelju varanje nije dopušteno
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Slali ste previše naredbi na server
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Trebalo vam je previše vremena za unošenje lozinke
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Vaše računalo je trebalo previše vremena za spajanje
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Trebalo vam je previše vremena za preuzimanje mape
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Trebalo vam je previše vremena za pridruživanje na server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :opća greška
@@ -1913,6 +1917,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :izbačen od str
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :je pokušao varati
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :poslužitelj je pun
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :slao je previše naredbi
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :lozinka nije zaprimljena na vrijeme
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :opći istek vremena
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :preuzimanje mape je predugo trajalo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :procesiranje map je predugo trajalo
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Moguć gubitak veze
@@ -2227,7 +2235,7 @@ STR_OBJECT_CLASS_TRNS                                           :Odašiljači
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Drveće
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Odaberi vrstu drveta za sadnju
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Odaberi vrstu drveta za sadnju. Ako polje već ima drvo, ovo će dodati još drveća raznih vrsta neovisno o odabranoj vrsti
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Raznovrsno drveće
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Posadi raznovrsno drveće. Shift mijenja prikaz građenje/procjena troškova.
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Nasumično odabrano drveće
@@ -2550,6 +2558,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Zapis iz
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licenca
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Postavi parametre
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Prikaži parametre
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Aktiviraj paletu
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Prilagodi paletu izabranog NewGRF-a.{}Učini ovo kada grafike iz ovog NewGRF-a izgledaju ljubičasto tijekom igre.
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potvrdi promjene
@@ -2616,7 +2625,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Upozorenje: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Greška: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Kobno: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Kobna NewGRF pogreška se dogodila: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Dogodila se kobna pogreška u NewGRF-u: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} neće raditi sa TTDPatch verzijom prijavljenom u OpenTTD
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} je za {STRING} verziju TTD-a.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} je napravljen da se koristi sa {STRING}
@@ -2626,17 +2635,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} se m
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} zahtijeva OpenTTD verziju {STRING} ili noviju.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF datoteka je dizajnirana za prijevod
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Previše učitanih NewGRF-ova.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Učitavanjem {2:STRING} kao statičnog NewGRF s {4:STRING} može uzrokovati deharmonizaciju
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neočekivani sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nepoznato svojstvo Action 0.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Pokušaj uporabe neispravnog ID-a
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Učitavanjem {1:STRING} kao statičnog NewGRF s {STRING} može uzrokovati deharmonizaciju
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neočekivani sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nepoznata vrijednost Action 0 {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Pokušaj korištenja pogrešnog ID-a (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sadrži neispravan sprite. Svi neispravni grafički znakovi bit će pokazani kao crveni upitnik (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sadrži višestruke Action 8 unose
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Učitavanje izvan kraja pseudo-spritea.
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sadrži višestruke unose za Action 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Pročitaj nakon kraja od pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Baznom grafičkom setu u uporabi nedostaju neki spriteovi.{}Ažurirajte bazni grafički set
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Zatraženi GRF resursi nisu raspoloživi
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} je isključen od strane {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Pogrešan/nepoznat prikaz formata sprite-a
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Zatraženi GRF resursi nisu dostupni (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} je isključen od strane {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Pogrešan/nepoznat format raspored sprite-a (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Oprez!
@@ -2765,7 +2774,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Ciljevi
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klikni na cilj za centriranje središnjeg pogleda na industriju/grad/pločicu. Ctrl+Klik otvara novi prozor s pogledom na lokaciju industrije/grada/pločice
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Pitanje
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pitanje
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informacija
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Upozorenje
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Greška
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Poništi
@@ -3145,7 +3157,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloniraj
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloniraj zrakoplov
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ovo će kupiti kopiju vlaka uključujući sve vagone. Kliknite na ovaj gumb i onda na vlak unutar ili izvan spremišta. Ctrl+Klik će dijeliti naredbe. Shift+Klik prikazuje trošak bez kupnje.
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ovo će kupiti kopiju cestovnog vozila. Klikni na ovaj gumb i onda na cestovno vozilo unutar ili izvan spremišta. CTRL+Klik će dijeliti naredbe. Shift+Klik prikazuje trošak bez kupnje.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ovo će kupiti kopiju cestovnog vozila. Klikni na ovaj gumb i onda na cestovno vozilo unutar ili izvan spremišta. CTRL+Klik će dijeliti naredbe. Shift+Klik prikazuje procijenjeni trošak bez kupnje.
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ovo će kupiti kopiju broda. Klikni na ovaj gumb i onda na brod unutar ili izvan spremišta. Ctrl+Klik će dijeliti naredbe. Shift+Klik prikazuje trošak bez kupnje.
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ovo će kupiti kopiju zrakoplova. Klikni ovaj gumb i onda na zrakoplov unutar ili izvan hangara. Control+Klik će dijeliti naredbe. Shift+Klik prikazuje trošak bez kupnje.
 

src/lang/czech.txt

@@ -1898,6 +1898,8 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :vyhozen servere
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :se pokoušel podvádět
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :na serveru je plno
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :posílal příliš mnoho příkazů
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :stahování mapy trvalo příliš dlouho
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :zpracování mapy trvalo příliš dlouho
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Pravděpodobná ztráta spojení
@@ -2617,17 +2619,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} mus
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} potřebuje verzi OpenTTD {STRING} nebo vyšší
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :grafika, která se měla přeložit
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Je nahráno příliš mnoho grafik
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Nahrání {2:STRING} jako statické grafiky spolu s {4:STRING} může způsobit chybu synchronizace
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Nepředpokládaný sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Neznámá vlastnost Action 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Pokus o použití neplatného ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Nahrání {1:STRING} jako statické grafiky spolu s {STRING} může způsobit chybu synchronizace
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} obsahuje poškozený sprite. Všechny takové se zobrazí jako červený otazník (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Obsahuje víc GRF akcí 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čtení za koncem pseudo-spritu
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Právě používanému základnímu grafickému setu chybí obrázky.{}Prosím, updatujte ho
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Požadované zdroje grafiky nejsou k dispozici
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} byla vypnuta {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Chybný/neznámý formát sprajtu
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} byla vypnuta {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varování!
@@ -2754,6 +2749,20 @@ STR_GOALS_TEXT                                                  :{ORANGE}{STRING
 STR_GOALS_NONE                                                  :{ORANGE}- Žádné -
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Cíle společnosti:
 
+# Goal question window
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Zrušit
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Ne
+STR_GOAL_QUESTION_BUTTON_YES                                    :Ano
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Odmítnout
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Příjmout
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Předchozí
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Další
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Odložit
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Vzdát se
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Dotace
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Nabídnuté dotace pro službu:

src/lang/danish.txt

@@ -2527,17 +2527,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} skal
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} kræver OpenTTD version {STRING} eller højere.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF filen, som den er lavet til at oversætte,
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :For mange NewGRF sæt er indlæst.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Indlæsning af {2:STRING} som statisk NewGRF med {4:STRING} kan forårsage de-sykronisering.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uventet grafikelement.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukendt Action 0 egenskab.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøg på brug af ugyldig ID.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Indlæsning af {1:STRING} som statisk NewGRF med {STRING} kan forårsage de-sykronisering.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} indeholder en ødelagt sprite. Alle ødelagte sprites vil blive vist som et rødt spørgsmålstegn (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Indeholder flere "Action 8" poster.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Læs forbi enden af pseudo-sprite
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det brugte basis graftik sæt mangler en række elementer.{}Updater venligst grafik sættet
-STR_NEWGRF_ERROR_GRM_FAILED                                     :De valgte GRF ressourcer er ikke tilgængelige
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} blev deaktiveret af {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ugyldig/ukendt sprite layout format
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} blev deaktiveret af {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!

src/lang/dutch.txt

@@ -842,7 +842,7 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}{STATION
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION} accepteert voortaan {STRING} en {STRING}
 
 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Subsidieaanbod is verlopen:{}{}{STRING} van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd
-STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subsidie teruggetrokken:{}{}{STRING}route van {STRING} naar {STRING} is nu niet meer gesubsidieerd
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subsidie ingetrokken:{}{}{STRING}route van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Subsidie aangeboden:{}{}Eerste {STRING}route van {STRING} naar {STRING} krijgt een jaar lang subsidie van de gemeente!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Subsidie uitgereikt aan {STRING}!{}{}{STRING}route van {STRING} naar {STRING} krijgt volgend jaar 50% extra betaald!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Subsidie uitgereikt aan {STRING}!{}{}{STRING}route van {STRING} naar {STRING} krijgt volgend jaar dubbel betaald!
@@ -1799,6 +1799,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Je bent
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Je bent van de server geschopt
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Valsspelen is niet toegestaan op deze server
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Je stuurde te veel commando's naar de server
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Het invoeren van het wachtwoord duurde te lang
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Het duurde te lang totdat uw computer zich aanmeldde
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Het duurde je te lang om de kaart te downloaden
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Het duurde je te lang om met de server te verbinden
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :algemene fout
@@ -1817,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :eruit geschopt
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :probeerde vals te spelen
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server is vol
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :stuurde te veel commando's
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :wachtwoord niet op tijd ontvangen
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :algemene timeout
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :downloaden van de kaart duurde te lang
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :verwerken van de kaart duurde te lang
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Mogelijk verbinding verbroken
@@ -2131,7 +2139,7 @@ STR_OBJECT_CLASS_TRNS                                           :Zender
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Bomen
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Kies een soort boom om te planten
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Kies een soort boom om te planten. Als de tegel al bomen bevat zullen er meer bomen van verschillende types bij komen, onafhankelijk van het geselecteerde type.
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Willekeurige soorten bomen
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plant bomen van willekeurige soort. Shift+klik wisselt tussen bouwen/toont verwachte kosten
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Willekeurige bomen
@@ -2531,17 +2539,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} moet
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} heeft OpenTTD versie {STRING} of beter nodig
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :het GRF-bestand die het probeert te vertalen
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Er zijn te veel NewGRFs geladen
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Laden van {2:STRING} als statische NewGRF met {4:STRING} kan desynchronisatiefouten (desyncs) veroorzaken
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Onverwachte afbeelding
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Onbekende 'Action 0'-eigenschap
-STR_NEWGRF_ERROR_INVALID_ID                                     :Poging tot gebruik ongeldig ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Laden van {1:STRING} als statische NewGRF met {STRING} kan desynchronisatiefouten (desyncs) veroorzaken
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Onverwachte sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Onbekende Actie 0 eigenschap {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Poging om ongeldig ID te gebruiken (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} bevat een ongeldige afbeelding. Alle ongeldige afbeeldingen worden getoond als een rood vraagteken (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Bevat meerdere 'Action 8'-elementen
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lees voorbij einde van pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Bevat meerdere acties 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Voorbij het einde van pseudo-sprite gelezen (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}De huidige basis graphics-set mist een aantal sprites..{}Werk de graphics-set bij aub
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Gevraagde GRF middelen niet beschikbaar
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} is uitgeschakeld door {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ongeldig/onbekend sprite layout formaat
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Gevraagde GRF middelen niet beschikbaar (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} is uitgeschakeld door {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ongeldig/onbekend sprite lay-out-formaat (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Waarschuwing!
@@ -2667,10 +2675,13 @@ STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Algemene
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Geen -
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Bedrijfsdoelen:
-STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klik op doel om venster te centreren op industrie/stad/tegel. Ctrl+Klik opent een nieuw venster op industrie/stad/tegel lokatie
+STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klik op doel om venster te centreren op industrie/stad/tegel. Ctrl+Klik opent een nieuw venster op industrie/stad/tegel locatie
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Vraag
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Vraag
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informatie
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Waarschuwing
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Fout
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Annuleren
@@ -3057,7 +3068,7 @@ STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Hierdoor
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centreer het scherm op de locatie van het treindepot. Ctrl+klik opent een nieuw scherm op de locatie van het treindepot
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centreer het scherm op de locatie van de garage. Ctrl+klik opent een nieuw scherm op de locatie van de garage
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centreer hoofdscherm op de locatie van het dok. Ctrl+klik opent een nieuw scherm op de locatie van het dok
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centreer het scherm op de locatie van de hangar. Ctrl+klik opent een nieuw venster op de hangar lokatie
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centreer het scherm op de locatie van de hangar. Ctrl+klik opent een nieuw venster op de hangar locatie
 
 STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Geef een lijst van alle treinen met dit depot in hun orders
 STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Geef een lijst van alle wegvoertuigen met deze garage in hun orders
@@ -3595,7 +3606,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE                                 :<niet beschikba
 STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spel was opgeslagen in een versie zonder tram-ondersteuning. Alle trams zijn verwijderd
 
 # Map generation messages
-STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kaartmaken afgebroken...{}... geen geschikte dorpslokaties
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kaartmaken afgebroken...{}... geen geschikte dorpslocaties
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... er is geen stad in dit scenario
 
 STR_ERROR_PNGMAP                                                :{WHITE}Kan landschap uit PNG niet laden...

src/lang/english.txt

@@ -1801,6 +1801,8 @@ STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheating
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}You were sending too many commands to the server
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}You took too long to enter the password
 STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Your computer took too long to join
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}You took too long to download the map
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}You took too long to join the server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :general error
@@ -1819,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :kicked by serve
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :was trying to use a cheat
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server full
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :was sending too many commands
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :received no password in time
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :general timeout
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :downloading map took too long
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :processing map took too long
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possible connection loss
@@ -2133,7 +2139,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmitters
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Trees
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant. If the tile already has a tree, this will add more trees of mixed types independent of the selected type
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Trees of random type
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Place trees of random type. Shift toggles building/showing cost estimate
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Random Trees
@@ -2524,26 +2530,26 @@ STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Warning: {
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Error: {SILVER}{RAW_STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatal: {SILVER}{RAW_STRING}
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}A fatal NewGRF error has occurred: {}{STRING5}
-STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING1} will not work with the TTDPatch version reported by OpenTTD
-STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING1} is for the {STRING1} version of TTD
-STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING1} is designed to be used with {STRING1}
-STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Invalid parameter for {1:STRING1}: parameter {STRING1} ({NUM})
-STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING1} must be loaded before {STRING1}
-STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING1} must be loaded after {STRING1}
-STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING1} requires OpenTTD version {STRING1} or better
+STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:RAW_STRING} will not work with the TTDPatch version reported by OpenTTD
+STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:RAW_STRING} is for the {RAW_STRING} version of TTD
+STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:RAW_STRING} is designed to be used with {RAW_STRING}
+STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Invalid parameter for {1:RAW_STRING}: parameter {RAW_STRING} ({NUM})
+STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:RAW_STRING} must be loaded before {RAW_STRING}
+STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:RAW_STRING} must be loaded after {RAW_STRING}
+STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:RAW_STRING} requires OpenTTD version {RAW_STRING} or better
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :the GRF file it was designed to translate
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Too many NewGRFs are loaded
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {2:RAW_STRING} as static NewGRF with {4:RAW_STRING} could cause desyncs
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unexpected sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unknown Action 0 property
-STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use invalid ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {1:RAW_STRING} as static NewGRF with {RAW_STRING} could cause desyncs
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unexpected sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unknown Action 0 property {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use invalid ID (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{RAW_STRING} contains a corrupt sprite. All corrupt sprites will be shown as a red question mark (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}The currently used base graphics set is missing a number of sprites.{}Please update the base graphics set
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Requested GRF resources not available
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:RAW_STRING} was disabled by {4:RAW_STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Invalid/unknown sprite layout format
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Requested GRF resources not available (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:RAW_STRING} was disabled by {2:RAW_STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Invalid/unknown sprite layout format (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
@@ -2672,7 +2678,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Company
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Click on goal to centre main view on industry/town/tile. Ctrl+Click opens a new viewport on industry/town/tile location
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Question
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Question
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Warning
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancel

src/lang/english_AU.txt

@@ -1799,6 +1799,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}You are
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}You were kicked out of the game
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheating is not allowed on this server
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}You were sending too many commands to the server
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}You took too long to enter the password
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Your computer took too long to join
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}You took too long to download the map
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}You took too long to join the server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :general error
@@ -1817,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :kicked by serve
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :was trying to use a cheat
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server full
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :was sending too many commands
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :received no password in time
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :general timeout
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :downloading map took too long
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :processing map took too long
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possible connection loss
@@ -2531,17 +2539,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} must
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} requires OpenTTD version {STRING} or better
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :the GRF file it was designed to translate
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Too many NewGRFs are loaded
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {2:STRING} as static NewGRF with {4:STRING} could cause desyncs
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unexpected sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unknown Action 0 property
-STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use invalid ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {1:STRING} as static NewGRF with {STRING} could cause desyncs
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unexpected sprite (sptite{3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unknown Action 0 property {4:HEX} (sprite{3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use invalid ID (sprite{3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contains a corrupt sprite. All corrupt sprites will be shown as a red question mark (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contians multiple Action 8 entries (sprite{3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of psuedo-sprite (sprite{3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}The currently used base graphics set is missing a number of sprites.{}Please update the base graphics set
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Requested GRF resources not available
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} was disabled by {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Invalid/unknown sprite layout format
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Requested GRF resources not available (sprite{3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} was disabled by {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Invalid/unknown sprite layout format (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
@@ -2670,7 +2678,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Company
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Click on goal to centre main view on industry/town/tile. Ctrl+Click opens a new viewport on industry/town/tile location
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Question
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Question
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Warning
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancel

src/lang/english_US.txt

@@ -1801,6 +1801,8 @@ STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheating
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}You were sending too many commands to the server
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}You took too long to enter the password
 STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Your computer took too long to join
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}You took too long to download the map
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}You took too long to join the server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :general error
@@ -1819,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :kicked by serve
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :was trying to use a cheat
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server full
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :was sending too many commands
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :received no password in time
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :general timeout
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :downloading map took too long
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :processing map took too long
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possible connection loss
@@ -2133,7 +2139,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmitters
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Trees
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant. If the tile already has a tree, this will add more trees of mixed types independent of the selected type
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Trees of random type
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Place trees of random type. Shift toggles building/showing cost estimate
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Random Trees
@@ -2533,17 +2539,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} must
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} requires OpenTTD version {STRING} or better
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :the GRF file it was designed to translate
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Too many NewGRFs are loaded
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {2:STRING} as static NewGRF with {4:STRING} could cause desyncs
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unexpected sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unknown Action 0 property
-STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use invalid ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {1:STRING} as static NewGRF with {STRING} could cause desyncs
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unexpected sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unknown Action 0 property {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use invalid ID (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contains a corrupt sprite. All corrupt sprites will be shown as a red question mark (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}The currently used base graphics set is missing a number of sprites.{}Please update the base graphics set
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Requested GRF resources not available
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} was disabled by {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Invalid/unknown sprite layout format
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Requested GRF resources not available (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} was disabled by {2:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Invalid/unknown sprite layout format (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
@@ -2672,7 +2678,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Company
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Click on goal to center main view on industry/town/tile. Ctrl+Click opens a new viewport on industry/town/tile location
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Question
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Question
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Warning
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancel

src/lang/esperanto.txt

@@ -2423,14 +2423,9 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} devi
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} bezonas OpenTTD versio {STRING} aŭ pli bona
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :la GRF-dosiero estas farita por traduki
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Tro da NewGRF-oj estas ŝarĝataj
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neatendita bildeto.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Atenco uzi nevalida ID.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} enhavas rompitan bildeton. Ĉiuj rompitaj bildetoj aspektos kiel ruĝaj demandsignoj (?).
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Legis ekster limo de pseŭdobildeto.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}La nuntempe uza baza grafikaĵaro estas manka nombro da bildetoj.{} Bonvolu renovigu la baza grafikaĵaro.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Peta GRF provizoj ne haveblas
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} estis malaktivata per {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Malvalida/nekonata bildeta formeca muntumo
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} estis malaktivata per {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Atentu!

src/lang/estonian.txt

@@ -314,7 +314,7 @@ STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Pindala:
 # These are used in buttons
 STR_SORT_BY_CAPTION_POPULATION                                  :{BLACK}Rahvaarv
 STR_SORT_BY_CAPTION_NAME                                        :{BLACK}Nimi
-STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Daatum
+STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Kuupäev
 # These are used in dropdowns
 STR_SORT_BY_NAME                                                :Nimi
 STR_SORT_BY_PRODUCTION                                          :Toodang
@@ -366,10 +366,10 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Kuva ett
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Kuva nimekiri ettevõtte õhusõidukitest. Ctrl+klõpsu abil saab rühma või sõidukinimekirja vahel lülitada
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Suurenda vaadet
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Vähenda vaadet
-STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Ehita rööbasteed
-STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Ehita maanteid
-STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Ehita laevadokke
-STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Ehita lennuvälju
+STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Ehita raudtee
+STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Ehita maantee
+STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Ehita laevakai
+STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Ehita lennuväli
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Maastiku tööriistade avamine maa tõstmiseks/langetamiseks, puude istutamiseks, jne.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Näita heli/muusika akent
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Näita viimast teadet, kuva teadete valikud
@@ -802,7 +802,7 @@ STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_COMPANY        :{YELLOW}Ettevõ
 STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_OTHER          :{YELLOW}Konkurentide poolt teenindavate tööstuste toodangumuutused
 STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_UNSERVED                 :{YELLOW}Ülejäänud tööstuste toodangumuutused
 STR_NEWS_MESSAGE_TYPE_ADVICE_INFORMATION_ON_COMPANY             :{YELLOW}Teave ja nõuanded ettevõtte sõidukite kohta
-STR_NEWS_MESSAGE_TYPE_NEW_VEHICLES                              :{YELLOW}Uus veerem
+STR_NEWS_MESSAGE_TYPE_NEW_VEHICLES                              :{YELLOW}Uued sõidukid
 STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Veoste vastuvõtutingimuste muutumine
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Toetused
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Üldine teave
@@ -992,7 +992,7 @@ STR_GAME_OPTIONS_TOWN_NAME_ITALIAN                              :Itaalia
 STR_GAME_OPTIONS_TOWN_NAME_CATALAN                              :Katalaani
 ############ end of townname region
 
-STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Isesalvestus
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Automaatne salvestus
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vali automaatselt mängu salvestamise vahemik
 
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Väljas
@@ -2077,7 +2077,7 @@ STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},
 STR_SELECT_BRIDGE_SCENEDIT_INFO                                 :{GOLD}{STRING},{} {VELOCITY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Rippsild, terasest
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Raamistikuga, terasest
-STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Ulgtugi, terasest
+STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Konsool, terasest
 STR_BRIDGE_NAME_SUSPENSION_CONCRETE                             :Rippsild, betoonist
 STR_BRIDGE_NAME_WOODEN                                          :Puidust
 STR_BRIDGE_NAME_CONCRETE                                        :Betoonist
@@ -2088,11 +2088,11 @@ STR_BRIDGE_TUBULAR_SILICON                                      :Torujas, siliko
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Sõiduteede ehitamine
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Trammiteede ehitamine
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Ehita sõidutee blokk. Ctrl valib tee ehitamise/eemaldamise. Shift valib ehitamise/hinna kuvamise režiimi
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Ehita sõidutee lõik. Ctrl vahetab tee ehitamise/eemaldamise vahel. Shift kuvab ehitamisehinna.
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Ehita trammitee blokk. Ctrl valib tee ehitamise/eemaldamise. Shift valib ehitamise/hinna kuvamise režiimi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Ehita autotee osa kasutades Autoroad režiimi. Ctrl valib tee ehitamise/eemaldamise. Shift valib ehitamise/hinna kuvamise režiimi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Ehita trammitee osa kasutades Autotram režiimi. Ctrl valib trammitee ehitamise/eemaldamise. Shift valib ehitamise/hinna kuvamise režiimi
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Depoo ehitamine (veovahendite ehitamiseks ja hooldamiseks). Shift valib ehitamise/hinna kuvamise režiimi
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Depoo ehitamine (veovahendite ostmiseks ja hooldamiseks). Shift valib ehitamise/hinna kuvamise režiimi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Ehita trammidepoo (veeremi ehitamiseks ja hoolduseks). Shift valib ehitamise/hinna kuvamise režiimi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Ehita bussijaam. Ctrl võimaldab jaamasid ühendada. Shift valib ehitamise/hinna kuvamise režiimi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Ehita reisitrammijaam. Ctrl võimaldab jaamasid ühendada. Shift valib ehitamise/hinna kuvamise režiimi
@@ -2586,17 +2586,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} peab
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} nõuab OpenTTD osa {STRING} või uuemat
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF fail, mis tehti tõlkimiseks,
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Liiga palju NewGRF-e on laaditud
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Laadides {2:STRING} staatilise NewGRF-na koos {4:STRING} võib põhjustada sünkrooni katkemist.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Ootamatu sprait
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Tundmatu Action 0 omadus
-STR_NEWGRF_ERROR_INVALID_ID                                     :Vale tunnuse kasutamise proov
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Laadides {1:STRING} staatilise NewGRF-na koos {STRING} võib põhjustada sünkrooni katkemist.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sisaldab vigast pilti. Kõiki vigaseid pilte näidatakse punase küsimärgina (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sisaldab mitmeid Action 8 kirjeid
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Loeti pseudo-sprite'i lõpust kaugemale
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Hetkel kasutatavast alus graafikapaketist puuduvad mõned spraidid.{}Palun uuenda alus graafikapaketti
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Soovitud GRF ressurss ei ole saadaval
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} blokeeriti {4:STRING} poolt
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Vigane/tundmatu spriidi asetuse formaat
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} blokeeriti {STRING} poolt
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Ettevaatust!
@@ -2724,6 +2717,10 @@ STR_GOALS_NONE                                                  :{ORANGE}- Mitte
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Ettevõtte eesmärgid:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Kliki sihtmärgil et liikuda põhikuvas tööstuse/linna/ruudu asukohale. Ctrl+klõps avab uue vaateakna tööstuse/linna/ruudu asukohas
 
+# Goal question window
+
+### Start of Goal Question button list
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Toetused
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Pakutavad toetused teenusepakkumise eest:
@@ -3073,7 +3070,7 @@ STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Uus lenn
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Osta uus rongi veok
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Ehita uus mootorsõiduk
-STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Ehita uus laev
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Osta uus laev
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Ehita uus lennuk
 
 STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klooni rong
@@ -3135,11 +3132,11 @@ STR_REPLACE_VEHICLE_AIRCRAFT                                    :Õhusõiduk
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vali asendatav veduritüüp
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vali uus vedur, millega sa soovid vasakult valitud vedurit asendada.
 
-STR_REPLACE_VEHICLES_START                                      :{BLACK}Alusta veovahendite asendamist
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Alusta veokite asendamist
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Vajuta vasakul asuva veduri asendamiseks paremal valitud veduriga
 STR_REPLACE_NOT_REPLACING                                       :{BLACK}Ei asenda praegu
 STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Ühtegi veovahendit pole valitud
-STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lõpeta veovahendite asendamine
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lõpeta veokite asendamine
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Vajuta lõpetamaks vasakult valitud veduri asendust
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Asendamisel: {ORANGE}{STRING}
@@ -3318,7 +3315,7 @@ STR_ORDER_INDEX                                                 :{COMMA}:{NBSP}
 STR_ORDER_TEXT                                                  :{STRING} {STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :- - Sihtpunktide lõpp - -
-STR_ORDERS_END_OF_SHARED_ORDERS                                 :- - Jagatud sihtpunktide lõpp - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :- - Jagatud käskluste lõpp - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Peatusteta
@@ -3330,8 +3327,8 @@ STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Valitud
 
 STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Laadi üks täis
 STR_ORDER_DROP_LOAD_IF_POSSIBLE                                 :Võimalusel laadi
-STR_ORDER_DROP_FULL_LOAD_ALL                                    :Laadi kõik täis
-STR_ORDER_DROP_FULL_LOAD_ANY                                    :Laadi üks täis
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Täis laadida kogu laadung
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Täis laadida mistahes last
 STR_ORDER_DROP_NO_LOADING                                       :Mitte laadida
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Valitud sihtpunktis pealelaadimise protseduuri muutmine
 

src/lang/finnish.txt

@@ -1799,6 +1799,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sinut on
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sinut potkittiin pihalle palvelimelta
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Huijaaminen ei ole sallittua tällä palvelimella
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Lähetit liian monta komentoa palvelimelle
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Käytit liian paljon aikaa salasanan syöttämiseen
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Tietokoneesi käytti liian paljon aikaa liittymiseen
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Kartan lataus kesti liian kauan
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Palvelimelle liittyminen kesti liian kauan
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :yleinen virhe
@@ -1817,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :palvelin potki
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :yritti käyttää huijausta
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :palvelin täynnä
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :lähetti liian monta komentoa
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :salasanaa ei vastaanotettu ajoissa
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :yleinen aikakatkaisu
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :kartan lataaminen kesti liian kauan
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :kartan käsittely kesti liian kauan
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Mahdollinen yhteyden menetys
@@ -2131,7 +2139,7 @@ STR_OBJECT_CLASS_TRNS                                           :Lähettimet
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Puita
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Valitse istutettava puutyyppi.
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Valitse istutettava puutyyppi. Jos ruudussa on jo puu, tämä lisää uusia puita riippumatta valitun puun tyypistä
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Sattumanvaraisia puita
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Aseta sattumanvaraisia puita. Shift vaihtaa istutustilan ja kustannearvion välillä
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Satunnaisia puita.
@@ -2531,17 +2539,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} tule
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} vaatii OpenTTD:n version {STRING} tai uudemman
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF-tiedosto jonka se muuntaa
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Liian monta NewGRF:ää on ladattu
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :NewGRF:n {2:STRING} lataaminen staattisena NewGRF:nä {4:STRING}:n kanssa saattaa aiheuttaa nykimistä
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Odottamaton sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Tuntematon Action 0 -ominaisuus
-STR_NEWGRF_ERROR_INVALID_ID                                     :Virheellisen ID:n käyttöyritys
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :NewGRF:n {1:STRING} lataaminen staattisena NewGRF:nä {STRING}:n kanssa saattaa aiheuttaa nykimistä
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Odottamaton sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Tuntematon Action 0-ominaisuus {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Yritys käyttää virheellistä ID:tä (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sisältää korruptoituneen spriten. Kaikki korruptoituneet spritet näkyvät punaisina kysymysmerkkeinä (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sisältää useamman Action 8 -kohdan
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Luku pseudo-spriten ohi
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sisältää useita Action 8-merkintöjä (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Luku pseudo-spriten ohi (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Käytössä olevasta perusgrafiikkapaketista puuttuu spritejä.{}Ole hyvä ja päivitä perusgrafiikkapaketti
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Pyydetyt GRF-resurssit eivät ole saatavilla
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{4:STRING} poisti käytöstä NewGRF:n {2:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Virheellinen/tuntematon spriten asetteluformaatti
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Pyydetyt GRF-resurssit eivät ole saatavilla (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} poisti käytöstä NewGRF:n {1:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Virheellinen/tuntematon spriten asettelumuoto (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varoitus!
@@ -2670,7 +2678,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Yhtiön
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klikkaa tavoitetta keskittääksesi päänäkymän teollisuuteen/kaupunkiin/ruutuun. Ctrl+Klik avaa uuden näkymän teollisuuden/kaupungin/ruudun sijaintiin
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Kysymys
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Kysymys
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Tietoa
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Varoitus
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Virhe
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Peruuta
@@ -2829,7 +2840,7 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Muuta p
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Osta 25{NBSP}%:n osuus yhtiöstä
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Myy 25{NBSP}%:n osuus yhtiöstä
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Osta 25{NBSP}%:n osuus tästä yhtiöstä. Shift+Klik näyttää kustannearvion myymättä osuuksia
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Osta 25{NBSP}%:n osuus tästä yhtiöstä. Shift+Klik näyttää kustannearvion ostamatta osuuksia
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Myy 25{NBSP}%:n osuus tästä yhtiöstä. Shift+Klik näyttää tuottoarvion myymättä osuuksia
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Yhtiön nimi

src/lang/galician.txt

@@ -2305,12 +2305,8 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} debe
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} require OpenTTD versión {STRING} ou posterior.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :o ficheiro GRF foi deseñado para traducir
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Cargáronse demasiados NewGRFs.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Cargar {2:STRING} como NewGRF estático con {4:STRING} pode causar desincronizacións.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite inesperado.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propiedade Action 0 descoñecida.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Intento de usar un ID inválido.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Cargar {1:STRING} como NewGRF estático con {STRING} pode causar desincronizacións.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contén un sprite corrupto. Tódolos sprites corruptos mostraránse coma una interrogación vermella (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contén múltiples entradas Action 8.
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}¡Atención!

src/lang/german.txt

@@ -329,7 +329,7 @@ STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Startdat
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SET_DATE                           :{BLACK}Startdatum eingeben
 STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY         :{BLACK}Weltkarte anzeigen, Städteverzeichnis
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landfläche erzeugen
-STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Stadt gründen
+STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Städte gründen
 STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION                        :{BLACK}Industrie errichten
 STR_SCENEDIT_TOOLBAR_ROAD_CONSTRUCTION                          :{BLACK}Straße bauen
 STR_SCENEDIT_TOOLBAR_PLANT_TREES                                :{BLACK}Bäume pflanzen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
@@ -357,7 +357,7 @@ STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Städtenamen an
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Stationsnamen anzeigen
 STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Wegpunktsnamen anzeigen
 STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Schilder anzeigen
-STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Schilder von Wettbewerbern anzeigen
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Fremde Stationsnamen & Schilder zeigen
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Vollständige Animation
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Vollständige Detailansicht
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Transparenz für Gebäude
@@ -418,7 +418,7 @@ STR_ROAD_MENU_TRAM_CONSTRUCTION                                 :Straßenbahnbau
 ############ range ends here
 
 ############ range for waterways construction menu starts
-STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Wasserwegebau
+STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Wasserstraßenbau
 ############ range ends here
 
 ############ range for airport construction menu starts
@@ -525,11 +525,11 @@ STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINY_FONT}{STR
 STR_GRAPH_Y_LABEL                                               :{TINY_FONT}{STRING}
 STR_GRAPH_Y_LABEL_NUMBER                                        :{TINY_FONT}{COMMA}
 
-STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Betriebsgewinndiagramm
-STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Einkommensdiagramm
+STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Betriebsgewinn
+STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Einkommen
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Beförderte Frachteinheiten
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Bewertung der Firmenleistung (Höchstwert: 1000)
-STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Firmenwertdiagramm
+STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Firmenwert
 
 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}Frachtbeförderungspreise
 STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL                           :{TINY_FONT}{BLACK}Tage unterwegs
@@ -622,7 +622,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}Programm
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Wähle 'Ezy Street style music'-Programm
 STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}Programm 'Benutzerdefiniert 1' wählen
 STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Programm 'Benutzerdefiniert 2' wählen
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Zufällige Wiedergabe an/aus
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Zufällige Wiedergabe ein/aus
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Zeige Musiktitelauswahl
 
 STR_ERROR_NO_SONGS                                              :{WHITE}Ein Musikset ohne Musikdateien wurde ausgewählt. Es kann folglich nichts abgespielt werden.
@@ -1149,7 +1149,7 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}Fahrzeu
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Spielfeld scrollen, wenn die Maus am Bildrand anstößt: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Bestechen der Stadtverwaltung erlauben: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}Den Erwerb exklusiver Transportrechte erlauben: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :{LTBLUE}Finazieren von Gebäuden erlaubens: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :{LTBLUE}Finanzieren von Gebäuden erlauben: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :{LTBLUE}Finanzierung von Straßenbauarbeiten erlauben: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :{LTBLUE}Schenken von Geld an andere Firmen erlauben: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :{LTBLUE}Frachtgewicht erhöhen, um schwere Züge zu simulieren: {ORANGE}{STRING}
@@ -1256,7 +1256,7 @@ STR_CONFIG_SETTING_QUICKGOTO                                    :{LTBLUE}Schnell
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE                            :{LTBLUE}Gleistyp bei Spielbeginn/geladenem Spiel: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST                      :Erster verfügbarer
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST                       :Letzter verfügbarer
-STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :Meistbenutzer
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :Meistbenutzter
 STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Reservierte Gleise hervorheben: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}Belasse Bauwerkzeuge aktiv nach Benutzung: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Zwischensummen für Kategorien bei Firmenausgaben:{ORANGE}{STRING}
@@ -1280,9 +1280,9 @@ STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Vorgege
 STR_CONFIG_SETTING_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Vorgegebenes Wartungsintervall für Züge: {ORANGE}abgeschaltet
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES                        :{LTBLUE}Vorgegebenes Wartungsintervall für Fahrzeuge: {ORANGE}{STRING} Tag{P 0:1 "" e}/%
 STR_CONFIG_SETTING_SERVINT_ROAD_VEHICLES_DISABLED               :{LTBLUE}Vorgegebenes Wartungsintervall für Fahrzeuge: {ORANGE}abgeschaltet
-STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Vorgegebenes Wartungsintervall für Flugzeuge: {ORANGE}{STRING} Tag{P 0:1 "" e}e/%
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Vorgegebenes Wartungsintervall für Flugzeuge: {ORANGE}{STRING} Tag{P 0:1 "" e}/%
 STR_CONFIG_SETTING_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Vorgegebenes Wartungsintervall für Flugzeuge: {ORANGE}abgeschaltet
-STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Vorgegebenes Wartungsintervall für Schiffe: {ORANGE}{STRING} Tag{P 0:1 "" e}e/%
+STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Vorgegebenes Wartungsintervall für Schiffe: {ORANGE}{STRING} Tag{P 0:1 "" e}/%
 STR_CONFIG_SETTING_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Vorgegebenes Wartungsintervall für Schiffe: {ORANGE}abgeschaltet
 STR_CONFIG_SETTING_NOSERVICE                                    :{LTBLUE}Wartung deaktivieren, wenn Pannen abgeschaltet: {ORANGE}{STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :{LTBLUE}Berücksichtige Waggonhöchstgeschwindigkeit: {ORANGE}{STRING}
@@ -1416,7 +1416,7 @@ STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Ein neue
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Ein gespeichertes Spiel laden
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Ein neues Spiel mit Reliefkarte als Landschaft starten
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Starte ein neues Spiel basierend auf einem Szenario
-STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Eine eigene Spielwelt / eigenes Szenario kreieren
+STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Eine eigene Karte oder Szenario erstellen
 STR_INTRO_TOOLTIP_MULTIPLAYER                                   :{BLACK}Mehrspieler-Spiel beginnen
 
 STR_INTRO_TOOLTIP_TEMPERATE                                     :{BLACK}Landschaft mit gemäßigtem Klima auswählen
@@ -1494,15 +1494,15 @@ STR_LIVERY_MONORAIL                                             :Einschienenbahn
 STR_LIVERY_MAGLEV                                               :Magnetschwebebahn
 STR_LIVERY_DMU                                                  :VT
 STR_LIVERY_EMU                                                  :ET
-STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passagierwagen (Dampf)
-STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passagierwagen (Diesel)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passagierwagen (elektr.)
-STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Passagierwagen (Einsch.)
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Passagierwagen (Magnet.)
+STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passagierwaggon (Dampf)
+STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passagierwaggon (Diesel)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passagierwaggon (elektrisch)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Passagierwaggon (Einschienenbahn)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Passagierwaggon (Magnetschwebebahn)
 STR_LIVERY_FREIGHT_WAGON                                        :Güterwaggon
 STR_LIVERY_BUS                                                  :Bus
 STR_LIVERY_TRUCK                                                :Lastwagen
-STR_LIVERY_PASSENGER_SHIP                                       :Passagierfähre
+STR_LIVERY_PASSENGER_SHIP                                       :Passagierschiff
 STR_LIVERY_FREIGHT_SHIP                                         :Frachter
 STR_LIVERY_HELICOPTER                                           :Hubschrauber
 STR_LIVERY_SMALL_PLANE                                          :Kleines Flugzeug
@@ -1801,7 +1801,9 @@ STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sie wurd
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Mogeln ist auf diesem Server nicht erlaubt
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Es wurden zu viele Kommandos an den Server gesendet
 STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Zeit für die Eingabe des Passwortes wurde überschritten
-STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Dieser Computer brauchte zu lange, dem Spiel beizutreten
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Dieser Computer brauchte zu lange, um dem Spiel beizutreten
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Das Herunterladen der Karte dauerte zu lange
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Der Beitritt zum Server dauerte zu lange
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :Allgemeiner Fehler
@@ -1820,6 +1822,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :vom Server hina
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :hat versucht zu mogeln
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :Server voll
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :sendete zu viele Kommandos
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :Zeitüberschreitung beim Senden des Passworts
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :Allgemeine Zeitüberschreitung
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :das Herunterladen der Karte dauerte zu lange
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :Verarbeitung der Karte dauerte zu lange
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Möglicher Verbindungsabbruch
@@ -1872,12 +1878,12 @@ STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Herunter
 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Beginne die ausgewählten Erweiterung(en) herunterzuladen
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Gesamtgröße der ausgewählten Erweiterungen: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}Beschreibung der Erweiterung
-STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Diese ist nicht zum Herunterladen ausgewählt
-STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Dies ist zum Herunterladen ausgewählt
-STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED                        :{SILVER}Diese Abhängigkeit wurde zum Herunterladen ausgewählt
+STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Diese Erweiterung ist nicht zum Herunterladen ausgewählt
+STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Diese Erweiterung ist zum Herunterladen ausgewählt
+STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED                        :{SILVER}Diese Erweiterung wird für eine andere Erweiterung benötigt
 STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Diese Erweiterung ist schon vorhanden
-STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}Die Erweiterung ist unbekannt und kann nicht von OpenTTD heruntergeladen werden
-STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Das ist ein Ersatz für {G einen eine ein ""} existiernd{G en e es e} {STRING}
+STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}Diese Erweiterung stammt aus einer unbekannten Quelle und kann von OpenTTD nicht heruntergeladen werden
+STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Das ist ein Ersatz für {G einen eine ein ""} existierend{G en e es e} {STRING}
 STR_CONTENT_DETAIL_NAME                                         :{SILVER}Name: {WHITE}{STRING}
 STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Version: {WHITE}{STRING}
 STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}Beschreibung: {WHITE}{STRING}
@@ -1906,32 +1912,32 @@ STR_CONTENT_TYPE_GS_LIBRARY                                     :Skript - Biblio
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}Lade Erweiterungen herunter...
 STR_CONTENT_DOWNLOAD_INITIALISE                                 :{WHITE}Fordere Dateien an...
 STR_CONTENT_DOWNLOAD_FILE                                       :{WHITE}Lade momentan herunter: {STRING} ({NUM} von {NUM})
-STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Herunterladen abgeschlossen
+STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Alle Dateien heruntergeladen
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} von {BYTES} heruntergeladen ({NUM} %)
 
 # Content downloading error messages
-STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Kann keine Verbindung mit dem Inhalts-Server herstellen...
+STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Kann keine Verbindung mit dem Server für Online-Erweiterungen herstellen...
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD                            :{WHITE}Herunterladen fehlgeschlagen...
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... Verbindung verloren
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... kann Datei nicht schreiben
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kann heruntergeladene Datei nicht entpacken
 
 STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}Fehlende Grafiken
-STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}OpenTTD benötigt Basisgrafiken, um zu funktionieren, es konnten aber keine gefunden werden. Darf OpenTTD diese herunterladen und installieren?
-STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Ja, download die Grafiken
+STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}OpenTTD benötigt Basisgrafiken, um zu funktionieren. Es konnten aber keine gefunden werden. Darf OpenTTD diese herunterladen und installieren?
+STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Ja, Grafiken herunterladen
 STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Nein, OpenTTD beenden
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparenzeinstellungen
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Transparenz für Stationsschilder einstellen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Transparenz für Bäume einstellen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Transparenz für Häuser einstellen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Transparenz für Industrien einstellen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Transparenz für Bauten wie Bahnhöfe, Depots und Wegpunkte einstellen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Transparenz für Brücken einstellen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Transparenz für Bauten wie Leuchttürme und Sendemasten einstellen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Transparenz für Oberleitungen. Strg+Klick, um Umschalten zu verhindern
-STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Transparenz für Ladestandsanzeige einstellen. Strg+Klick, um Umschalten zu verhindern
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Transparenz für Stationsschilder einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Transparenz für Bäume einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Transparenz für Häuser einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Transparenz für Industrien einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Transparenz für Bauten wie Bahnhöfe, Depots und Wegpunkte einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Transparenz für Brücken einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Transparenz für Bauten wie Leuchttürme und Sendemasten einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Transparenz für Oberleitungen einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Transparenz für Ladestandsanzeige einstellen. Strg+Klick, um Umschalten zu verhindern bzw. wieder zu erlauben
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Objekte unsichtbar statt transparent machen
 
 # Base for station construction window(s)
@@ -1989,7 +1995,7 @@ STR_STATION_BUILD_NUMBER_OF_TRACKS_TOOLTIP                      :{BLACK}Anzahl d
 STR_STATION_BUILD_PLATFORM_LENGTH                               :{BLACK}Bahnsteiglänge
 STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Bahnsteiglänge wählen
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Drop
-STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bahnhof durch Klicken, Ziehen und Loslassen bauen
+STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bahnhofsgröße durch Klicken und Ziehen frei wählbar
 
 STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Eine Stationsart zum Anzeigen auswählen
 STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Die Stationsart auswählen, die gebaut werden soll
@@ -1999,13 +2005,13 @@ STR_STATION_CLASS_WAYP                                          :Wegpunkte
 
 # Signal window
 STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalauswahl
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Blocksignal (Formsignal){}Dieses ist der einfachste Signaltyp. Er erlaubt nur einem Zug zu einem gegebenen Zeitpunkt den Signalabschnitt zu durchfahren
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Blocksignal (Formsignal){}Dies ist der einfachste Signaltyp. Bei Verwendung dieses Signaltyps darf sich immer nur ein Zug im Signalabschnitt aufhalten
 STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Einfahrsignal (Formsignal){}Zeigt grün, wenn im nächsten Block mindestens ein Ausfahrsignal grün zeigt. Andernfalls zeigt es rot
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Ausfahrsignal (Formsignal){}Verhält sich wie ein Blocksignal, wird jedoch benötigt, um den Einfahr- oder Kombinationssignalen des Blockes "frei" zu melden
 STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinationssignal (Formsignal){}Das Kombinationssignal ist gleichzeitig Aus- und Einfahrsignal. Somit werden umfangreiche Signalverschaltungen möglich
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Pfadsignal (Formsignal){}Erlaubt mehreren Zügen gleichzeitig, einen Signalabschnitt zu befahren, sofern sie separate Gleisabschnitte belegen können. Pfadsignale können von hinten durchfahren werden
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Einseitiges Pfadsignal (Formsignal):{}Erlaubt mehreren Zügen, einen Signalabschnitt zu befahren, sofern sie separate Gleisabschnitte belegen können. Einseitige Pfadsignale können nicht von hinten durchfahren werden
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Blocksignal (Lichtsignal){}Signale ermöglichen den unfallfreien Betrieb mehrerer Züge in einem Gleissystem
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Blocksignal (Lichtsignal){}Dies ist der einfachste Signaltyp. Bei Verwendung dieses Signaltyps darf sich immer nur ein Zug im Signalabschnitt aufhalten
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Einfahrsignal (Lichtsignal){}Zeigt grün, wenn im folgenden Block mindestens ein Ausfahrsignal grün zeigt. Andernfalls zeigt es rot
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Ausfahrsignal (Lichtsignal){}Verhält sich wie ein Blocksignal, gibt jedoch das Signal an Einfahr- und Kombinationssignale im vorherliegenden Block weiter
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinationssignal (Lichtsignal){}Das Kombinationssignal ist gleichzeitig Aus- und Einfahrsignal. Somit werden umfangreiche Signalverschaltungen möglich
@@ -2045,12 +2051,12 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Busbahnh
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Straßenbahnhaltestelle bauen. Strg+Klick, um Stationen zu verbinden. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Lkw-Ladeplatz bauen. Strg+Klick, um Stationen zu verbinden. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION               :{BLACK}Güterstraßenbahnhaltestelle bauen. Strg+Klick, um Stationen zu verbinden. Shift schaltet zwischen Bauen und Kostenvoranschlag um
-STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Aktiviere/Deaktiviere Einbahnstraßenbau
+STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Einbahnstraßenbau ein/aus
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Straßenbrücke bauen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Straßenbahnbrücke bauen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Straßentunnel bauen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Straßenbahntunnel bauen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
-STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Zwischen Bau/Abriss der Straße umschalten
+STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Zwischen Bau und Abriss der Straße umschalten
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Zwischen Bau und Abriss von Straßenbahngleisen umschalten
 
 # Road depot construction window
@@ -2070,8 +2076,8 @@ STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Ausricht
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Ausrichtung der Güterstraßenbahnhaltestelle auswählen
 
 # Waterways toolbar (last two for SE only)
-STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Wasserwegebau
-STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Wasserwege
+STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Wasserstraßenbau
+STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Wasserstraßen
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Kanäle bauen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Schleusen bauen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Werft bauen (für den Kauf und die Wartung von Schiffen benötigt). Shift schaltet zwischen Bauen und Kostenvoranschlag um
@@ -2506,11 +2512,11 @@ STR_NEWGRF_INSPECT_QUERY_CAPTION                                :{WHITE}NewGRF-V
 # Sprite aligner window
 STR_SPRITE_ALIGNER_CAPTION                                      :{WHITE}Ausrichtung von Sprite {COMMA} ({STRING})
 STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Nächstes Sprite
-STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Gehe zum nächsten normalen Sprite und überspringe alle Pseudo-/Recolour-/Schriftsprites und geht ggf. vom ersten zum letzten Sprite
+STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Gehe zum nächsten normalen Sprite und überspringe alle Pseudo-, Recolour- und Schriftsprites (springt ggf. vom ersten bis zum letzten Sprite)
 STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Gehe zu Sprite
-STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Gehe zum ausgewählten Sprite. Wenn das Sprite kein normales Sprite ist, gehe zum nächsten normalen Sprite
+STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Gehe zum ausgewählten Sprite. Wenn dieses kein normales Sprite ist, gehe zum nächsten normalen Sprite
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Vorheriges Sprite
-STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Gehe zum vorherigen normalen Sprite (überspring alle Pseudo-/Recolour-/Schrift-Sprites und springt vom letzten zum ersten Sprite)
+STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Gehe zum vorherigen normalen Sprite und überspringe alle Pseudo-, Recolour- und Schriftsprites (springt ggf. vom letzten bis zum ersten Sprite)
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Darstellung des aktuellen Sprites. Die Ausrichtung wird beim Zeichnen des Sprites ignoriert
 STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Bewege die Sprites und ändere dadurch die X- und Y-Offsets
 STR_SPRITE_ALIGNER_OFFSETS                                      :{BLACK}X-Offset: {NUM}, Y-Offset: {NUM}
@@ -2524,7 +2530,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Warnung: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Fehler: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Schwerer Fehler: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ein schwerer NewGRF Fehler ist aufgetreten: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ein schwerer NewGRF-Fehler ist aufgetreten: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} funktioniert nicht im Zusammenhang mit der von OpenTTD ermittelten TTDPatch-Version
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} ist für die {STRING}-Version von TTD
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} ist für die Nutzung mit {STRING} vorgesehen
@@ -2534,21 +2540,21 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} muss
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} Benötigt OpenTTD-Version {STRING} oder höher
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :der NewGRF-Datei, die es übersetzen soll,
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Zu viele NewGRFs geladen
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Das Laden von {2:STRING} als statisches NewGRF mit {4:STRING} könnte Synchronisationsfehler hervorrufen
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unerwartetes Sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :NewGRF Fehler: 'Unknown Action 0 property'
-STR_NEWGRF_ERROR_INVALID_ID                                     :Es wurde versucht, eine ungültige ID zu verwenden
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Das Laden von {1:STRING} als statisches NewGRF mit {STRING} könnte Synchronisationsfehler hervorrufen
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unerwartetes Sprite (Sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unbekannte Action 0 - Property {4:HEX} (Sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Zugriff auf eine ungültige ID (Sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} enthält kaputte Sprites. Diese werden als Fragezeichen (?) dargestellt
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Enthält mehrere "Action 8" Einträge
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lesezugriff über das Ende des Pseudosprites hinaus
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Enthält mehrere Action 8 - Einträge (Sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lesezugriff über das Ende des Pseudosprites hinaus (Sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Den momentan verwendeten Basisgrafiken fehlen Sprites.{}Durch ein Update der Basisgrafiken kann dieser Fehler behoben werden
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Die angeforderten GRF-Ressourcen sind nicht verfügbar
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} wurde von {4:STRING} deaktiviert
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ungültiges/unbekanntes SpriteLayout-Format
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Die angeforderte GRF-Ressource ist nicht verfügbar (Sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} wurde von {STRING} deaktiviert
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ungültiges oder unbekanntes Format für Spritelayout (Sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Achtung!
-STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Änderungen während eines laufenden Spiels können zum Absturz von OpenTTD oder sonstigem unerwünschten Verhalten führen. Bitte keine diesbezüglichen Bugreports verfassen.{}Trotzdem fortfahren?
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Änderungen während eines laufenden Spiels können zum Absturz von OpenTTD oder sonstigem unerwünschten Verhalten führen. Bitte diesbezüglich keine Fehlerberichte verfassen.{}Trotzdem fortfahren?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Datei kann nicht hinzugefügt werden: NewGRF-ID bereits vergeben
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Passende Datei nicht gefunden (kompatible NewGRF geladen)
@@ -2673,7 +2679,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Firmensp
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klick auf Ziel zentriert Hauptansicht auf Industrie/Stadt/Feld. Strg+Klick öffnet eine darauf zentrierte Zusatzansicht
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Frage
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Frage
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Hinweis
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Warnung
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Fehler
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Abbruch
@@ -2805,11 +2814,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Keine
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Firmenwert: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% Eigentum von {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktur:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} Schienenstücke
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} Straßenfelder
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} Wasserfelder
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} Bahnhofsfelder
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} Flughäfen
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} Schienenstück{P "" e}
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} Straßenfeld{P "" er}
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} Wasserfeld{P "" er}
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} Stationsfeld{P "" er}
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} Flugh{P afen äfen}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Keine
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Firmensitz bauen
@@ -3053,7 +3062,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Schiff k
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Flugzeug kopieren
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Kauft eine Kopie des Zuges mit allen Waggons. Klicke diese Schaltfläche und dann auf einen Zug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan. Shift schaltet zwischen Bauen und Kostenvoranschlag um
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Kauft eine Kopie des Fahrzeuges. Klicke diese Schaltfläche und dann auf ein Fahrzeug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan. Shift schaltet zwischen Bauen und Kostenvoranschlag um
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Kauft eine Kopie des Fahrzeuges. Klicke auf diese Schaltfläche und dann auf ein Fahrzeug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Kauft eine Kopie des Schiffes. Klicke diese Schaltfläche und dann auf eine Schiff innerhalb oder außerhalb der Werft. Strg+Klick erzeugt gemeinsamen Fahrplan. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Kauft eine Kopie des Flugzeuges. Klicke auf diese Schaltfläche und dann auf ein Flugzeug innerhalb oder außerhalb des Hangars. Strg+Klick erzeugt gemeinsamen Fahrplan. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 
@@ -3337,7 +3346,7 @@ STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Benötigt Inspe
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Immer
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Verbleibende Laufzeit (Jahre)
 
-STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Vergleich der Farzeuginformation mit eingegebenen Wert
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Die Bedingung, die erfüllt werden muss
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :gleich
 STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :ungleich
 STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :kleiner als
@@ -3347,7 +3356,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :größer gleich
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :wahr
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :falsch
 
-STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Wert der mit Farzeuginformation verglichen wird
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Wert, der mit Fahrzeuginformation verglichen wird
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Wert für den Vergleich eingeben
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Überspringen
@@ -3475,8 +3484,8 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Erfassen
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Zeiten automatisch bei der nächsten Fahrt eintragen (Mit Strg+Klick wird versucht, die aktuellen Wartezeiten beizubehalten)
 
 STR_TIMETABLE_EXPECTED                                          :{BLACK}Voraussichtlich
-STR_TIMETABLE_SCHEDULED                                         :{BLACK}Geplant
-STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Umschalten zwischen erwarteter Ankunftszeit und Fahrplan
+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
@@ -3492,32 +3501,32 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Jahr aus
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}Debug der KI oder des Skripts
+STR_AI_DEBUG                                                    :{WHITE}KI- und Skript-Debug
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Name des Skripts
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Einstellungen
 STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Einstellungen des Skripts ändern
 STR_AI_DEBUG_RELOAD                                             :{BLACK}KI erneut laden
-STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Stoppe die KI, lade das Script neu und starte de KI erneut
-STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}An/Ausschalten des Unterbrechens, wenn eine KI Log-Nachricht dem Unterbrechungs-Text entspricht
-STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Unterbrechung bei:
-STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Unterbrechung an
-STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Wenn eine KI Log-Nachricht auf diesen Text paßt, wird das Spiel pausiert
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}KI stoppen, neu laden und erneut starten
+STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Festlegen, ob die KI beim Auftauchen des Suchtextes in der KI-Log-Ausgabe angehalten wird
+STR_AI_DEBUG_BREAK_ON_LABEL                                     :{BLACK}Anhalten bei:
+STR_AI_DEBUG_BREAK_STR_OSKTITLE                                 :{BLACK}Anhalten bei
+STR_AI_DEBUG_BREAK_STR_TOOLTIP                                  :{BLACK}Erscheint dieser Suchtext in der KI-Log-Ausgabe, werden KI und Spiel angehalten
 STR_AI_DEBUG_MATCH_CASE                                         :{BLACK}Groß/Klein beachten
-STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Für den Vergleich der KI Log-Nachrichten mit dem Unterbrechungs-Text den passenden Fall umschalten
+STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Festlegen, ob bei der Suche auf Groß- und Kleinschreibung geachtet werden soll
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Fortfahren
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Pause aufheben und die KI weiter ausführen
-STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Debug-Ausgaben dieser KI anschauen
+STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Debug-Ausgabe dieser KI anzeigen
 STR_AI_GAME_SCRIPT                                              :{BLACK}Skript
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Überprüfe die Aufzeichnungen des Skripts
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Keine passende KI gefunden.{}Diese KI ist ein Platzhalter und wird nichts tun.{}KIs können im Hauptmenü als Erweiterung heruntergeladen werden
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Eine der laufenden KIs oder Scripte ist abgestürzt. Es ist nett, den Fehler dem Autor der KI oder des Scripts mittels eines Screenshots vom Debug-Fenster unter Angabe der OpenTTD und KI- bzw. Script-Versionsnummer zu melden
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Eine der laufenden KIs oder ein Skript ist abgestürzt. Der Fehler sollte dem Autor der KI oder des Skripts mittels eines Screenshots vom Debug-Fenster unter Angabe der OpenTTD- Version und der KI- bzw. Skript-Versionsnummer gemeldet werden.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Debugfenster für KI oder Skripte ist nur auf dem Server verfügbar
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}KI / Skripte einstellen
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Das im nächsten Spiel zu ladende Skript
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Das Skript, das im nächsten Spiel geladen wird
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}Die KIs, die im nächsten Spiel geladen werden
 STR_AI_CONFIG_HUMAN_PLAYER                                      :menschlicher Spieler
 STR_AI_CONFIG_RANDOM_AI                                         :Zufällige KI
@@ -3615,7 +3624,7 @@ STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalieru
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Zu starke Skalierung des Spielfeldes wird nicht empfohlen. Generierung dennoch fortsetzen?
 
 # Soundset messages
-STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Nur ein Notbehelfs-Soundset wurde gefunden. Sounds können bei Bedarf als Erweiterung heruntergeladen werden (siehe Hauptmenü)
+STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Nur ein leeres Platzhalter-Soundset wurde gefunden. Soundsets können bei Bedarf als Erweiterung heruntergeladen werden (siehe Hauptmenü)
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot gespeichert als '{STRING}'
@@ -4128,16 +4137,16 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COPPER_ORE_HOPPER             :Kupfererzwaggon
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_WATER_TANKER                  :Wassertanker
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FRUIT_TRUCK                   :Fruchttransporter
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK                  :Kautschukwaggon
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK                   :Zuckerlaster
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK                   :Zuckertransporter
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER           :Zuckerwattewaggon
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER                 :Karamellwaggon
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN                    :Luftblasentransporter
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER                   :Colatanker
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN                     :Bonbontransporter
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :Spielwarentransporter
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Batterielaster
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :Spielzeugtransporter
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Batterietransporter
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :Limonadentransporter
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Plastiklaster
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Plastiktransporter
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC           :'X2001' (Elektrisch)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC   :'Millennium Z1' (Elektrisch)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :Wizzowow Z99
@@ -4173,12 +4182,12 @@ STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC      :Lev2 'Cyclops'
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV3_PEGASUS_ELECTRIC      :Lev3 'Pegasus' (elektrisch)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV4_CHIMAERA_ELECTRIC     :Lev4 'Chimaera' (elektrisch)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_WIZZOWOW_ROCKETEER         :Wizzowow Rocketeer
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PASSENGER_CAR               :Passagierwaggon
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PASSENGER_CAR               :Passagierwaggon (Magnetschwebebahn)
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_MAIL_VAN                    :Postwaggon
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COAL_CAR                    :Kohlewaggon
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_OIL_TANKER                  :Öltanker
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_LIVESTOCK_VAN               :Viehtransporter
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GOODS_VAN                   :Warenwaggon
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GOODS_VAN                   :Güterwaggon
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GRAIN_HOPPER                :Getreidetransporter
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WOOD_TRUCK                  :Holzwaggon
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_IRON_ORE_HOPPER             :Eisenerzwaggon

src/lang/greek.txt

@@ -2558,16 +2558,9 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :Το {1:STRING}
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :Το {1:STRING} απαιτεί έκδοση OpenTTD {STRING} ή καλύτερη
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :Το αρχείο GRF είναι σχεδιασμένο για να μεταφράζει
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Έχουν φορτωθεί πολλά NewGRF.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Η φόρτωση του {2:STRING} ως στατικό NewGRF με {4:STRING} μπόρει να προκαλέσει αποσυγχρονισμούς
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Αναπάντεχο sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Άγνωστη ιδιότητα Action 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Προσπάθεια να χρησιμοποιήθει λάθος ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Η φόρτωση του {1:STRING} ως στατικό NewGRF με {STRING} μπόρει να προκαλέσει αποσυγχρονισμούς
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} περιέχει ένα κατεστραμμένο sprite. Όλα τα κατεστραμμένα sprites θα εμφανίζονται ως ένα κόκκινο ερωματικό (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Περιέχει πολλαπλές Action 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Διάβασμα τέλους του ψεύδο-sprite
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Δεν είναι διαθέσιμοι οι πόροι του GRF που ζητήσατε
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :Το {2:STRING} απενεργοποιήθηκε από το {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Άκυρη/άγνωστη μορφή διάταξης sprite
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :Το {1:STRING} απενεργοποιήθηκε από το {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Προσοχή!

src/lang/hebrew.txt

@@ -2374,20 +2374,12 @@ STR_NEWGRF_ERROR_MSG_FATAL                                      :{SILVER}{STRING
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}התרחשה שגיאה קריטית ב-NewGRF: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} לא יעבוד עם גרסת ה-TTDPatch שדווחה ע"י OpenTTD.
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} היא עבור גרסת {STRING} של TTD.
-STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} תוכנן עבור {NBSP}{2:STRING}
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :פרמטר לא חוקי עבור {1:STRING}: פרמטר {STRING} ({NUM})
-STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{1:STRING} לפני הטענת {NBSP}{2:STRING} יש להטעין את
-STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} לאחר הטענת {NBSP}{2:STRING} יש להטעין את
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} דורש גרסת {STRING} של OpenTTD ומעלה.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :קובץ השדרוג הגראפי אותו יועד לתרגם
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :יותר מידי קבצי שדרוג גראפי פתוחים בן זמנית
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {2:STRING} as static NewGRF with {4:STRING} could cause desyncs.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Unexpected sprite.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Unknown Action 0 property.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use invalid ID.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Loading {1:STRING} as static NewGRF with {STRING} could cause desyncs.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contains a corrupt sprite. All corrupt sprites will be shown as a red question mark (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :קרא מעבר לסוף הפיה המדומה.
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}!אזהרה

src/lang/hungarian.txt

@@ -509,7 +509,8 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Átváltás konzolra
 STR_ABOUT_MENU_AI_DEBUG                                         :MI / Játékszkript nyomkövetés
 STR_ABOUT_MENU_SCREENSHOT                                       :Képmentés
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Kinagyított képmentés
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Teljes nagyítású képmentés
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Alapértelmezett nagyítású képmentés
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Képmentés teljes térképről
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Az 'OpenTTD'-ről
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite elhelyező
@@ -1862,6 +1863,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Ki vagy
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Ki lettél rúgva a szerverről
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Ez a szerver nem engedi a csalást
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Túl sok parancsot küldtél a szervernek
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Túl sokáig tartott a jelszó beírása
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}A számítógépednek túl sok időbe tartott csatlakozni
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Túl sokáig tartott a térkép letöltése
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Túl sokáig tartott a szerverhez való csatlakozás
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :általános hiba
@@ -1880,6 +1885,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :a szerver kirú
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :csalni próbált
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :a szerver megtelt
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :túl sok parancsot küldött
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :nem érkezett jelszó időben
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :általános időtúllépés
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :térkép letöltés túl sokáig tartott
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :térkép feldolgozás túl sokáig tartott
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Lehetséges, hogy elveszett a kapcsolat
@@ -2194,7 +2203,7 @@ STR_OBJECT_CLASS_TRNS                                           :Adótornyok
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Fák
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Válaszd ki, melyik fát ülteted
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Válaszd ki, melyik fát ülteted. Ha már van fa a mezőn, akkor ezzel újabb fákat ültethetsz attól függetlenül, hogy melyik fatípust választottad ki
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Véletlenszerű fafélék
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Véletlenszerűen kiválasztott fákat helyez el. Shift lenyomásával megmutatja a becsült költséget
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Véletlenszerű fák
@@ -2517,6 +2526,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Változ
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licenc
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Paraméterek beállítása
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Paraméterek megjelenítése
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palettaváltás
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}A kiválasztott NewGRF palettájának váltása.{}Akkor használd, ha a NewGRF-ból származó grafikai elemek rózsaszínként jelennek meg
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Alkalmazás
@@ -2583,7 +2593,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Figyelmeztetés: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Hiba: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Végzetes hiba: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Végzetes NewGRF hiba történt: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Egy végzetes NewGRF hiba történt: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} nem fog működni az OpenTTD által jelentett TTDPatch verzióval
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} a TTD {STRING} verziójához van
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} úgy lett tervezve, hogy együtt lesz használva ezzel: {STRING}
@@ -2593,17 +2603,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} musz
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} csak a {STRING} vagy újabb verziójú OpenTTD-vel működik
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :az adott GRF fájl célja egy másik lefordítása
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Túl sok NewGRF van betöltve
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{2:STRING} betöltése mint statikus NewGRF {4:STRING} mellett ütközést okozhat
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Váratlan sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ismeretlen Action 0 tulajdonság
-STR_NEWGRF_ERROR_INVALID_ID                                     :Érvénytelen ID-használati kisérlet
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{1:STRING} betöltése mint statikus NewGRF {STRING} mellett ütközést okozhat
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Váratlan sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ismeretlen Action 0 tulajdonság {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Érvénytelen ID használat (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} hibás sprite-ot tartalmaz. Minden hibás sprite piros kérdőjellel (?) kerül jelölésre
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Többszörös Action 8 bejegyzést tartalmaz
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Ál-sprite távoli végének olvasása
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Több Action 8 bejegyzést tartalmaz (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Ál-sprite távoli végének olvasása (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}A jelenleg használt grafikus alapcsomagból hiányzik számos sprite.{}Kérlek frissítsd a grafikus alapcsomagot
-STR_NEWGRF_ERROR_GRM_FAILED                                     :A kívánt GRF források nem elérhetőek
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} kikapcsolva {4:STRING} által
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Érvénytelen/ismeretlen sprite felépítés formátum
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Kért GRF források nem elérhetőek (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} kikapcsolva {STRING} által
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Érvénytelen/ismeretlen sprite szerkezet formátum (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Figyelem!
@@ -2731,6 +2741,32 @@ STR_GOALS_NONE                                                  :{ORANGE}- Nincs
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Cég céljai:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Kattintással a fő nézetet a célra állítja. Ctrl+Kattintással új látképet nyit a gazdasági épület/település/mező helyéről
 
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Kérdés
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Információ
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Figyelmeztetés
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Hiba
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Mégse
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Nem
+STR_GOAL_QUESTION_BUTTON_YES                                    :Igen
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Visszautasít
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Elfogad
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Kihagyás
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Újra
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Előző
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Következő
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Megállj
+STR_GOAL_QUESTION_BUTTON_START                                  :Indít
+STR_GOAL_QUESTION_BUTTON_GO                                     :Megy
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Folytat
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Újrakezd
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Elhalaszt
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Felad
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Bezár
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Támogatások
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Támogatás jár
@@ -3089,7 +3125,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Hajó m
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Repülőgép másolása
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ide kattintva elkészítheted egy teljes vonat másolatát. Kattints ide, majd a másolandó vonatra. Ctrl+Kattintással a menetrendet is megosztod. Shift+Kattintással megmutatja a becsült költséget vásárlás nélkül
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ide kattintva elkészítheted egy közúti jármű másolatát. Kattints ide, majd a másolandó járműre. Ctrl+Kattintással a menetrendet is megosztod. Shift+Kattintással megmutatja a becsült költséget vásárlás nélkül
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ide kattintva megveheted egy közúti jármű másolatát. Kattints ide, majd a másolandó járműre a járműtelepen belül vagy kívül. Ctrl+Kattintással a menetrendet is megosztod. Shift+Kattintással megmutatja a becsült költséget vásárlás nélkül
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ide kattintva elkészítheted egy hajó másolatát. Kattints ide, majd a másolandó hajóra. Ctrl+Kattintással a menetrendet is megosztod. Shift+Kattintással megmutatja a becsült költséget vásárlás nélkül
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ide kattintva elkészítheted egy repülőgép másolatát. Kattints ide, majd a másolandó repülőgépre. Ctrl+Kattintással a menetrendet is megosztod. Shift+Kattintással megmutatja a becsült költséget vásárlás nélkül
 
@@ -3548,7 +3584,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Játéks
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Játékszkript napló ellenőrzése
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Nincs MI, amit be lehetne tölteni.{}A jelenlegi MI csak dísz és nem fog semmit csinálni.{}MI-k letöltéséhez használd a tartalomletöltő rendszert
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Az egyik futó MI futása közben hiba történt. Kérjük jelezd ezt az MI készítőjének az MI nyomkövetés ablakról készített képernyőmentéssel
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Az egyik futó szkript futása közben hiba történt. Kérjük jelezd ezt a szkript készítőjének az MI / Játékzkript nyomkövetés ablakról készített képernyőmentéssel
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Az MI / Játékszkript nyomkövetés ablak csak a szerver számára elérhető
 
 # AI configuration window

src/lang/icelandic.txt

@@ -2396,13 +2396,8 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} ver
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} þarf OpenTTD útgáfu {STRING} eða nýrri.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF skránni sem það var hannað til að þýða
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Of mörg NewGRF eru hlaðin.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Ef {2:STRING} er hlaðið sem kyrrstæðu NewGRF ásamt {4:STRING} gætu orðið hnökrar á keyrslu leiksins.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Óviðbúin hreyfimynd.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Óþekktur „Action 0“ eiginleiki
-STR_NEWGRF_ERROR_INVALID_ID                                     :Reyndi að notast við rangt ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Ef {1:STRING} er hlaðið sem kyrrstæðu NewGRF ásamt {STRING} gætu orðið hnökrar á keyrslu leiksins.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inniheldur gallaða mynd. Allar gallaðar myndir munu birtast sem rauð spurningamerki (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inniheldur margar „Action 8“ færslur
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lesa eftir lokin á gerfi-hreyfimynd
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Grunnteiknisafnið sem er í notkun vantar hluta af hreyfimyndunum.{}Vinsamlegast uppfærðu grunnteiknisafnið.
 
 # NewGRF related 'general' warnings

src/lang/indonesian.txt

@@ -2530,17 +2530,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} haru
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} membutuhkan OpenTTD versi {STRING} atau yang lebih tinggi
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :Berkas NewGRF telah didesain untuk diterjemahkan
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Terlalu banyak berkas NewGRF yang dimuat
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Memuat NewGRF {2:STRING} secara statis dengan {4:STRING} dapat menyebabkan de-sinkronisasi
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite tidak diharapkan
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Properti 'Action 0' tidak diketahui
-STR_NEWGRF_ERROR_INVALID_ID                                     :Mencoba menggunakan ID yang tidak sah
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Memuat NewGRF {1:STRING} secara statis dengan {STRING} dapat menyebabkan de-sinkronisasi
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} terdapat sprite yang rusak. Semua sprite rusak akan ditandai dengan tanda tanya merah (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Memiliki banyak entri untuk 'Action 8'
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Batas akhir pseudo-sprite tercapai
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Beberapa 'sprite' tidak terdapat pada Set Grafik Dasar yang sedang digunakan.{}Silahkan update Set Grafik Dasar
-STR_NEWGRF_ERROR_GRM_FAILED                                     :GRF yang diminta tidak tidak tersedia
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} dinonaktifkan oleh {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :format sprite tidak dikenal/salah
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} dinonaktifkan oleh {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Peringatan!

src/lang/irish.txt

@@ -2423,13 +2423,8 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :Ní mór {1:STR
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING}: Tá an leagan {STRING} nó níos fearr de OpenTTD de dhíth uaidh
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :an comhad GRF a bhí sé deartha a aistriú
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Tá an iomarca NewGRF lódáilte.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :D'fhéadfaí go mbeidh díshioncronú ann má dhéantar {2:STRING} a lódáil mar NewGRF statach le {4:STRING}.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite gan choinne.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Airí Gníomh 0 anaithnid.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Iarracht ID neamhbhailí a úsáid.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :D'fhéadfaí go mbeidh díshioncronú ann má dhéantar {1:STRING} a lódáil mar NewGRF statach le {STRING}.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}Tá sprite truaillithe in {STRING}. Taispeánfar gach sprite truaillithe mar chomhartha ceiste (?) dearg.
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Tá iontrálacha Gníomh 8 iolracha ann.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Léadh thar deireadh an bhréag-sprite.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Tá roinnt sprite in easnamh sa tsraith bhunúsach grafaicí atá in úsáid faoi láthair.{}Déan úasghrádú ar an tsraith bhunúsach grafaicí le do thoil
 
 # NewGRF related 'general' warnings

src/lang/italian.txt

@@ -1823,6 +1823,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sei stat
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sei stato espulso dalla partita
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}I trucchi non sono ammessi su questo server
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Stavano venendo inviati troppi comandi al server
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Si è impiegato troppo tempo ad inserire la password
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Il computer ha impiegato troppo tempo ad entrare nella partita
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Il download della mappa ha richiesto troppo tempo
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}L'ingresso al server ha richiesto troppo tempo
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :errore generale
@@ -1841,6 +1845,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :espulso dal ser
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :ha provato a usare un trucco
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server pieno
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :stava inviando troppi comandi
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :nessuna password ricevuta in tempo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :timeout generico
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :il download della mappa ha richiesto troppo tempo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :l'elaborazione della mappa ha richiesto troppo tempo
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possibile perdita di connessione
@@ -2159,7 +2167,7 @@ STR_OBJECT_CLASS_TRNS                                           :Trasmettitori
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Alberi
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Seleziona il tipo di albero da piantare
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Seleziona il tipo di albero da piantare. Se nel riquadro sono già presenti alberi, ne aggiunge altri di vari tipi, indipendentemente dal tipo selezionato
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Alberi casuali
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Pianta alberi di specie a caso. MAIUSC alterna fra costruzione e stima dei costi
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Alberi casuali
@@ -2537,10 +2545,10 @@ STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Va allo
 STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Precedente
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Procede al precedente sprite normale, saltanto qualsiasi sprite speciale, di ricoloramento o carattere e tornando all'ultimo se viene raggiunto l'inizio
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Rappresentazione dello sprite corrente. L'allineamento viene ignorato in questa casella.
-STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Sposta lo sprite, cambiando gli spiazzamenti X e Y
-STR_SPRITE_ALIGNER_OFFSETS                                      :{BLACK}Spiazzamento X: {NUM}, Y: {NUM}
-STR_SPRITE_ALIGNER_PICKER_BUTTON                                :{BLACK}Raccogli
-STR_SPRITE_ALIGNER_PICKER_TOOLTIP                               :{BLACK}Raccoglie gli sprite da un qualsiasi punto dello schermo
+STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Sposta lo sprite, cambiando i posizionamenti X e Y
+STR_SPRITE_ALIGNER_OFFSETS                                      :{BLACK}Posizionamento X: {NUM}, Y: {NUM}
+STR_SPRITE_ALIGNER_PICKER_BUTTON                                :{BLACK}Scegli
+STR_SPRITE_ALIGNER_PICKER_TOOLTIP                               :{BLACK}Sceglie uno o più sprite da un qualsiasi punto dello schermo
 
 STR_SPRITE_ALIGNER_GOTO_CAPTION                                 :{WHITE}Vai a
 
@@ -2548,8 +2556,8 @@ STR_SPRITE_ALIGNER_GOTO_CAPTION                                 :{WHITE}Vai a
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Attenzione: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Errore: {SILVER}{STRING}
-STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Errore fatale: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Si è verificato un errore fatale NewGRF: {}{STRING}
+STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Errore irreversibile: {SILVER}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Si è verificato un errore irreversibile nel NewGRF: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} non funziona con la versione di TTDPatch riferita da OpenTTD
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} è per la versione {STRING} di TTD
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} è progettato per essere usato con {STRING}
@@ -2559,17 +2567,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} deve
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} richiede OpenTTD versione {STRING} o superiore
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :il file GRF che era progettato per tradurre
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Troppi NewGRF caricati
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Caricare {2:STRING} come NewGRF statico insieme a {4:STRING} può causare errori di sincronizzazione
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite inatteso
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Proprietà sconosciuta per l'azione 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativo di utilizzare un ID non valido
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Caricare {1:STRING} come NewGRF statico insieme a {STRING} può causare errori di sincronizzazione
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite inatteso (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Proprietà {4:HEX} sconosciuta per l'azione 0 (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativo di utilizzare un ID non valido (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contiene degli sprite corrotti. Tutti gli sprite corrotti saranno mostrati come punti interrogativi (?) rossi
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contiene occorrenze multiple dell'azione 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lettura oltre la fine dello pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contiene occorrenze multiple dell'azione 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lettura oltre la fine dello pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Nel pacchetto grafico di base attualmente in uso mancano alcuni sprite.{}È consigliabile aggiornare il pacchetto grafico di base
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Risorsa GRF richiesta non disponibile
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} è stato disabilitato da {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato di layout dello sprite non valido o sconosciuto
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Risorsa GRF richiesta non disponibile (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} è stato disabilitato da {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato di layout dello sprite sconosciuto o non valido (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Attenzione!
@@ -2698,7 +2706,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Obiettiv
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Fare clic su un obiettivo per centrare la visuale principale sull'industria, città o riquadro. CTRL+clic mostra l'industria/città/riquadro in una mini visuale
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Domanda
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Domanda
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informazione
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Avviso
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Errore
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Annulla

src/lang/japanese.txt

@@ -2444,22 +2444,14 @@ STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING}はOp
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING}はTTDの{STRING}バージョンのみに対応しています。
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING}を使用時に、{STRING}を入にしなければなりません
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :{1:STRING}のパラメータが不正：パラメータ　{STRING}（{NUM}）
-STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{2:STRING}を読み込む前、{1:STRING}を読み込まなければなりません。
 STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING}は{STRING}の読み込み後のみに読み込めます。
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} は OpenTTD バージョン {STRING} もしくはそれ以降のバージョンが必要です。
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :訳しにデザインされたGRFファイル
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :読み込んだ NewGRF が多すぎます。
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{4:STRING} を {2:STRING} を含む固定的な NewGRF として開くと、同期エラーを起こす可能性があります。
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :予期しないスプライトを見つけました。
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :不明な Action 0 プロパティ。
-STR_NEWGRF_ERROR_INVALID_ID                                     :無効な ID の使用の試行
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{2:STRING} を {1:STRING} を含む固定的な NewGRF として開くと、同期エラーを起こす可能性があります。
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} は壊れたスプライトを含みます。壊れたスプライトは赤疑問符として表示されます。
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :複数の Action 8 エントリーを含んでいます。
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :擬似スプライト読込:既に終端に達しました
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}現在を使ってるグラフィックセットが複数のダータが無いです。.{}セットを更新して下さいますよう、お願いします。
-STR_NEWGRF_ERROR_GRM_FAILED                                     :要求されたGRFリソースは使用不能です。
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING}は{4:STRING}により無効にされました。
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :不正な、または未知のスプライトレイアウトフォーマットです。
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING}は{STRING}により無効にされました。
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}注意！

src/lang/korean.txt

@@ -447,7 +447,7 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :콘솔 켜기/끄기
 STR_ABOUT_MENU_AI_DEBUG                                         :AI / 게임 스크립트 디버그
 STR_ABOUT_MENU_SCREENSHOT                                       :스크린샷 찍기
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :확대된 스크린샷 찍기
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :최대로 확대된 스크린샷 찍기
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :지도 전체 스크린샷
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD'에 대해서
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :스프라이트 정렬도구
@@ -1124,12 +1124,12 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}자동
 STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}열차를 위한 경사면의 경사도: {ORANGE}{STRING}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}자동차를 위한 경사면의 경사도 {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}열차/선박의 90도 회전을 금지함: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}역이 붙어있지 않아도 같은 이름으로 역을 짓는 것을 허용: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}역이 붙어있지 않거나 방향이 달라도 같은 이름으로 역을 짓는 것을 허용: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}향상된 수송 알고리즘 사용: {ORANGE}{STRING}
 STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}화물을 차량에 단계적으로 싣기: {ORANGE}{STRING}
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}인플레이션(화폐가치하락) 켬: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}수요가 있을때만 화물을 역에 옮겨놓음: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :{LTBLUE}다리의 최대 길이: {ORANGE}{STRING}칸
+STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :{LTBLUE}다리의 최대 길이: {ORANGE}{STRING} 타일
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}터널의 최대 길이: {ORANGE}{STRING} 타일{P 0:1 "" s}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}1차 산업 시설 건설 방법: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :없음 (건설 불가)
@@ -1158,8 +1158,8 @@ STR_CONFIG_SETTING_PLANE_CRASHES_NONE                           :없음
 STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :적음
 STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :보통
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}도시 소유의 도로 위에 버스 정류장 건설 허용: {ORANGE}{STRING}
-STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}경쟁자가 소유중인 도로를 통과하는 버스 정류장 건설 허용: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}정거장 근처에 건물 짓기 허용: {ORANGE}{STRING}
+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}경쟁자 소유의 도로 위에 버스 정류장 건설 허용: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}역 바로 옆에 역의 건설을 허용: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}여러 개의 NewGRF 엔진 세트를 허용: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}이미 차량이 존재하면 이 설정을 변경하실 수 없습니다.
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :{LTBLUE}기반시설 유지비: {ORANGE}{STRING}
@@ -1175,7 +1175,7 @@ STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}차량
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}옛날 차량을 사라지지 않고 계속 만들 수 있게 함: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}차량이 오래되면 자동 교체: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}차량이 최고수명의 {ORANGE}{STRING}{LTBLUE}개월 전/후이면 자동 교체
-STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}자동 교체를 위한 자동 교체 최소 요구 자금: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}차량 자동교체시 최소 추가요구 자금: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}오류 메시지 표시: {ORANGE}{STRING}초 동안
 STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}마우스를 갖다 댈때 도구팁이 뜨는 데 걸리는 시간: {ORANGE}{STRING}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}마우스를 갖다 댈때 도구팁이 뜨는 데 걸리는 시간: {ORANGE}오른쪽 클릭으로 바로
@@ -1249,9 +1249,9 @@ STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_NON_LANDSCAPING      :지형 편집
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_ALL_ACTIONS              :모든 행동
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}진보된 차량 목록 사용: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :{LTBLUE}적재 정도 표시: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :{LTBLUE}시간표를 일(日)이 아닌 틱으로 표시: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :{LTBLUE}열차 시간표의 1일을 74틱으로 바꿔 표시: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TIMETABLE_SHOW_ARRIVAL_DEPARTURE             :{LTBLUE}시간표에서 출발일과 도착일 표시: {ORANGE}{STRING}
-STR_CONFIG_SETTING_QUICKGOTO                                    :{LTBLUE}빠른 행선지 설정: {ORANGE}{STRING}
+STR_CONFIG_SETTING_QUICKGOTO                                    :{LTBLUE}행선지 설정 후 계속해서 행선지 지정: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE                            :{LTBLUE}철도 형식 기본값 설정 (게임 시작/불러온 후): {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST                      :처음 사용 가능한 것
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST                       :최신 기술의 철도
@@ -1271,8 +1271,8 @@ STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :{LTBLUE}컴퓨
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}컴퓨터의 항공기 사용을 허가하지 않음: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}컴퓨터의 선박 사용을 허가하지 않음: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}멀티플레이에서 AI를 허용: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :{LTBLUE}스크립트가 일시 중지되기 전의 #opcodes: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}멀티플레이에서 컴퓨터 플레이어의 참여를 허용: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :{LTBLUE}스크립트가 일시 중지되기 전의 #opcodes (멀티플레이시 느려지면 값을 낮추십시오): {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}백분율에 의한 점검 주기: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}열차 기본 점검 간격: {ORANGE}{STRING} 일/%
@@ -1292,7 +1292,7 @@ STR_CONFIG_SETTING_STARTING_YEAR                                :{LTBLUE}시작
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}부드러운 경제(더욱 작은 변화) 옵션 사용: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}다른 회사의 지분을 사는 것을 허용: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :{LTBLUE}공장에 원자재투입시 생산되는 물품의 무게 비율: {ORANGE}{STRING}%
-STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}드래그 할때 신호기를 매 {ORANGE}{STRING}타일마다 설치
+STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}신호기 드래그로 설치시 {ORANGE}{STRING}타일 간격으로 설치
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}전자식 신호기의 사용: {ORANGE}{STRING}년 이후에
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}신호기 설치시 신호기 선택 창을 띄움: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}기본적으로 만들 신호기 종류: {ORANGE}{STRING}
@@ -1343,7 +1343,7 @@ STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :느림
 STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :보통
 STR_CONFIG_SETTING_TOWN_GROWTH_FAST                             :빠름
 STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :매우 빠름
-STR_CONFIG_SETTING_LARGER_TOWNS                                 :{LTBLUE}대도시가 되는 도시의 비율: {ORANGE}1 대 {STRING}
+STR_CONFIG_SETTING_LARGER_TOWNS                                 :{LTBLUE}대도시가 되는 도시의 비율: {ORANGE}{STRING}개 중에 1개
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :{LTBLUE}대도시가 되는 도시의 비율: {ORANGE}없음
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :{LTBLUE}초기의 도시 크기 배수: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :{LTBLUE}도로 건설 중 부조리한 도로 요소를 제거: {ORANGE}{STRING}
@@ -2131,7 +2131,7 @@ STR_OBJECT_CLASS_TRNS                                           :송신기
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}나무
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}심을 나무의 종류 선택
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}심고싶은 나무의 종류를 선택합니다. 이미 나무가 심어져있는 경우에는 선택한 나무의 크기를 키웁니다.
 STR_TREES_RANDOM_TYPE                                           :{BLACK}무작위 나무
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}여러 종류의 나무를 심습니다. SHIFT를 누르고 나무를 심으면 예상 가격을 볼 수 있습니다.
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}무작위로 나무 심기
@@ -2530,17 +2530,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING}{G 1
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING}는 OpenTTD {STRING} 버전이나 그 이상이 필요합니다.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF 파일 자체는 번역용으로 디자인됨
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :NewGRF이 너무 많습니다.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{4:STRING}{G 4 "을" "를"} 포함한 정적 NewGRF {2:STRING}{G 2 "을" "를"} 불러오는 것은 비동기화를 일으킬 수 있습니다.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :예기치 않은 객체
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :알수없는 액션 0 속성
-STR_NEWGRF_ERROR_INVALID_ID                                     :유효하지 않은 ID 사용 시도
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{2:STRING}{G 2 "을" "를"} 포함한 정적 NewGRF {1:STRING}{G 1 "을" "를"} 불러오는 것은 비동기화를 일으킬 수 있습니다.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} 에 손상된 객체가 있습니다. 모든 손상된 객체는 붉은 물음표로 보일 것입니다.
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Action 8 엔트리가 여러 개 존재합니다.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :객체의 읽기 범위를 초과했습니다.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}최근에 이용한 기본 그래픽 세트에 객체가 많이 손실되었습니다.{}기본 그래픽 세트를 업데이트 하십시오.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :요청한 GRF 제원을 사용할 수 없습니다
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING}(은)는 {4:STRING} 때문에 사용할 수 없습니다
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :유효하지 않은/알수 없는 스프라이트 구조 형식
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING}(은)는 {STRING} 때문에 사용할 수 없습니다
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}경고!
@@ -2668,6 +2661,10 @@ STR_GOALS_NONE                                                  :{ORANGE}- 없
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}회사 목표:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}산업시설/마을/지도의 위치로 화면을 이동하려면 클릭하십시오. Ctrl+클릭하면 산업시설/마을/지도를 표시하는 외부화면을 엽니다.
 
+# Goal question window
+
+### Start of Goal Question button list
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}보조금
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}제공되는 보조금:
@@ -3066,7 +3063,7 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}가격:
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}비용: {CURRENCY_LONG} 무게: {WEIGHT_SHORT}{}속력: {VELOCITY}  힘: {POWER}  최대 T.E.: {6:FORCE}{}유지비: {4:CURRENCY_LONG}/년{}용량: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}가격: {CURRENCY_LONG} 최고속력: {VELOCITY}{}수송량: {CARGO_LONG}, {CARGO_LONG}{}운행비용: {CURRENCY_LONG}/년
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}가격: {CURRENCY_LONG} 최고속력: {VELOCITY}{}수송량: {CARGO_LONG}{}운행비용: {CURRENCY_LONG}/년
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}가격: {CURRENCY_LONG} 최고속력: {VELOCITY} 항속거리: {7:COMMA} 칸{}수용량: {CARGO_LONG}, {CARGO_LONG}{}운행비용: {CURRENCY_LONG}/년
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}가격: {CURRENCY_LONG} 최고 속력: {VELOCITY} 항속거리: {7:COMMA} 칸{}수용량: {CARGO_LONG}, {CARGO_LONG}{}운행비용: {CURRENCY_LONG}/년
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}가격: {CURRENCY_LONG} 최고 속력: {VELOCITY} 항속거리: {7:COMMA} 칸{}수용량: {CARGO_LONG}{}운행비용: {CURRENCY_LONG}/년
 
 # Autoreplace window
@@ -3485,7 +3482,7 @@ STR_AI_GAME_SCRIPT                                              :{G=f}{BLACK}게
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}게임 스크립트 기록 체크
 
 STR_ERROR_AI_NO_AI_FOUND                                        :불러올 인공지능이 없습니다.{}이 인공지능은 불용품이며 아무 기능도 하지 않을 것입니다.{}'온라인 컨텐츠 체크' 기능으로 다른 인공지능을 다운받으세요.
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}작동중인 인공지능 중 하나가 충돌했습니다. 인공지능 디버그 창에서 스크린샷을 찍어 인공지능 제작자에게 보고하십시오.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}작동중인 스크립트 중 하나가 충돌했습니다. 인공지능 / 게임 스크립트 디버그 창에서 스크린샷을 찍어 인공지능 제작자에게 보고하십시오.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI / 게임 스크립트 디버그창은 오직 서버만 사용 가능합니다
 
 # AI configuration window

src/lang/lithuanian.txt

@@ -907,7 +907,7 @@ STR_NEWS_AIRCRAFT_DEST_TOO_FAR                                  :{WHITE}{VEHICLE
 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} sustojo nes nepavyko nurodytas remontas
 STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}Nepavyko atnaujinti {VEHICLE}{}{STRING}
 
-STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLACK}Naujų{STRING} nėra!
+STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLACK}Naujas {STRING} jau yra prieinamas visiems!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Naujas{STRING} -  {ENGINE}
 
@@ -1565,14 +1565,14 @@ STR_LIVERY_STEAM                                                :Garo Variklis
 STR_LIVERY_DIESEL                                               :Dyzelinis Variklis
 STR_LIVERY_ELECTRIC                                             :Elektrinis Variklis
 STR_LIVERY_MONORAIL                                             :Vienbėgis Variklis
-STR_LIVERY_MAGLEV                                               :„Maglev“ Variklis
+STR_LIVERY_MAGLEV                                               :„Maglev“ variklis
 STR_LIVERY_DMU                                                  :DMU
 STR_LIVERY_EMU                                                  :EMU
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Keleivinis Vagonas (Garinis)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Keleivinis Vagonas (Dyzelinis)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Keleivinis Vagonas (Elektrinis)
 STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Keleivinis vagonas (vienbėgis)
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Keleivinis vagonas ("Maglev")
+STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Keleivinis vagonas („Maglev“)
 STR_LIVERY_FREIGHT_WAGON                                        :Vagonas
 STR_LIVERY_BUS                                                  :Autobusas
 STR_LIVERY_TRUCK                                                :Krovininis
@@ -1874,6 +1874,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Tau užd
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Tu išmestas iš žaidimo (KICK)
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Sukčiavimas neleidžiamas tinklo žaidime
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Tu siuntei per daug komandų į serverį
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Jūs per ilgai užtrukote įvedinėdami slaptažodį
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Jūsų kompiuteris užtruko per ilgai prisijungiant
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Per ilgai užtrukote parsisiųsdami žemėlapį
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Per ilgai užtrukote jungdamiesi prie serverio
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :klaida
@@ -1892,6 +1896,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :išmestas serve
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :bandė sukčiauti
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serveris pilnas
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :siuntė per daug komandų
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :laiku negavo slaptažodžio
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :pasibaigė laikas
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :žemėlapio parsisiuntimas užtruko per ilgai
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :žemėlapio apdorojimas užtruko per ilgai
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Galimas ryšio praradimas
@@ -2206,7 +2214,7 @@ STR_OBJECT_CLASS_TRNS                                           :Siųstuvai
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Medžiai
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Pasirinkite norimų sodinti medžių tipą
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Pasirinkite norimų sodinti medžių tipą. Jei langelyje jau auga koks nors medis, bus pasodinti atsitiktiniai, nebūtinai pasirinkto tipo, medžiai
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Atsitiktiniai medžiai
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Sodina atsitiktinės rūšies medžius. Shift perjungia tarp kainos parodymo/statymo
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Atsitiktiniai medžiai
@@ -2529,6 +2537,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Pasikeit
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licencija
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nustatyti parametrus
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Rodyti parametrus
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Kaitalioti paletę
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Kaitalioja parinkto NewGRF paletę.{}Darykite jei pajungta grafika nuspalvinta rožine spalva
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Pritaikyti pakeitimus
@@ -2605,17 +2614,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} turi
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} reikalauja OpenTTD versijos {STRING} arba naujesnės
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF failas, kurį turėjo išversti
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Įkelta per daug NewGRF
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Įkėlimas {2:STRING} kaip statinio NewGRF su {4:STRING} gali sukelti desinchronizacijas
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Nenumatytas spraitas
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nenumatytas spraitas
-STR_NEWGRF_ERROR_INVALID_ID                                     :Bandymas naudoti netinkamą ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Įkėlimas {1:STRING} kaip statinio NewGRF su {STRING} gali sukelti desinchronizacijas
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Netikėtas spruklys (spruklys {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nežinoma veiksmo 0 savybė {4:HEX} (spruklys {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Bandymas panaudoti neteisingą ID (spruklys {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} turi sugadintą spraitą. Visi sugadinti spraitai bus rodomi kaip raudoni klaustukai (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Turi kelis veiksmus (Action 8)
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Įvyko skaitymas už pseudo-spraito pabaigos
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Susideda iš keleto veiksmo 8 įrašų (spruklys {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Skaitymas už pseudospruklio pabaigos (spruklys {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Šiuo metu naudojamam grafikos rinkiniui trūksta keletos spraitų.{}Atnaujinkite pagrindinį grafikos rinkinį
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Prašyti GRF ištekliai nėra galimi
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} buvo išjungta: {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neteisingas/nežinomas animacinio objekto išdėstymas
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Pageidautas GRF resursas yra neprieinamas (spruklys {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} buvo išjungta: {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neteisingas/nežinomas spruklio išdėstymo formatas (spruklys {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Įspėjimas!
@@ -2744,7 +2753,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Kompanij
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Paspaudus ant nurodymo bus rodoma gamykla/miestas/vieta. Paspaudus laikant VALD (CTRL) klavišą bus atidarytas naujas langas su gamykla/miestu/vieta
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Klausimas
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Klausimas
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informacija
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Perspėjimas
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Klaida
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Atšaukti
@@ -2875,22 +2887,22 @@ STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Neturi
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Kompanijos vertė: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% priklauso {COMPANY})
-STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktūra
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} bėgių dalys
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} kelio dalys
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} vandens langeliai
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} stoties langeliai
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} oro uostai
+STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktūra:
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} bėgių dal{P is ys ių}
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} kelio dal{P is ys ių}
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} vandens langeli{P s ai ų}
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} stoties langeli{P s ai ų}
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} oro uost{P as ai ų}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nieko
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Pastatyti firmos bustinę
-STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Statyi įmonės būstinę
+STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Statyti įmonės būstinę
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Apžiūrėti būstinę
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Žiūrėti įmonės būstinę
-STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Perkelti bustinę
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Perstatyti kompanijos bustinę kitur už 1% kompanijos vertės. Shift+Click parodys kainą neperstatant būstinės
-STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Smulkmenos
-STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Peržiūrėti smulkenę infrastrukūrą
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Perkelti būstinę
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Perstatyti kompanijos būstinę kitur už 1% kompanijos vertės. Shift+Click parodys kainą neperstatant būstinės
+STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Detaliau
+STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Peržiūrėti detalesnę infrastruktūros informaciją
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Naujas veidas
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Pasirink naują veidą
@@ -2922,7 +2934,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Vandens l
 STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Kanalai
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Stotys:
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}Stoties langeliai
-STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}Oro uostas
+STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}Oro uostai
 STR_COMPANY_INFRASTRUCTURE_VIEW_COST                            :{WHITE}{1:CURRENCY_LONG}/met ({0:COMMA})
 STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENCY_LONG}/met
 
@@ -3124,7 +3136,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kopijuot
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kopijuoti lėktuvą
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Tai nupirks traukinio kopiją su visais vagonais. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Ctrl+Click nukopijuojami nurodymai. Shift+Click parodys kainą neperkant
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Tai nupirks automobilio kopiją. Spragtelkite šį mygtuką, o tada automobilį esantį garaže arba už jo ribų. Ctrl+Click nukopijuojami nurodymai. Shift+Click parodys kainą neperkant
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Tai nupirks automobilio kopiją. Spragtelkite šį mygtuką, o tada automobilį esantį garaže arba už jo ribų. Ctrl+Paspaudimas nukopijuojami nurodymai. Shift+Paspaudimas parodys kainą neperkant
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Tai nupirks laivo kopiją. Spragtelkite šį mygtuką, o tada laivą esantį depe arba už jo ribų. Ctrl+Click nukopijuojami nurodymai. Shift+Click parodys kainą neperkant
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Tai nupirks lėktuvo kopiją. Spragtelkite šį mygtuką, o tada lėktuvą esantį angare arba už jo ribų. Spragtelėjus laikant Ctrl+Click nukopijuojami nurodymai. Shift+Click parodys kainą neperkant
 
@@ -3151,23 +3163,57 @@ STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Spragtel
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Ar tikrai norite parduoti visas tr. priemones esančias šiame depe?
 
 # Engine preview window
-STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Automobilių gamintojo žinutė
-STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Mes ką tik sukūrėme naują {STRING.ka}! Ar norėtumėt vienerius metus išskirtinėmis teisėmis bandyti šią transporto priemonęm, kol dar nepradėta jos serijinė gamyba?
+STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Žinutė nuo transporto priemonių gamintojo
+STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Mes ką tik sukūrėme naują {STRING.ka}! Ar norėtumėt vienerius metus išskirtinėmis teisėmis bandyti šią transporto priemonę, kol dar nepradėta jos serijinė gamyba?
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :lokomotyvas
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.kas                      :lokomotyvas
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.ko                       :lokomotyvo
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.kam                      :lokomotyvui
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.ka                       :lokomotyvą
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.kuo                      :lokomotyvu
+STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE.kur                      :lokomotyve
 STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :automobilis
 STR_ENGINE_PREVIEW_ROAD_VEHICLE.kas                             :automobilis
+STR_ENGINE_PREVIEW_ROAD_VEHICLE.ko                              :automobilio
+STR_ENGINE_PREVIEW_ROAD_VEHICLE.kam                             :automobiliui
 STR_ENGINE_PREVIEW_ROAD_VEHICLE.ka                              :automobilį
+STR_ENGINE_PREVIEW_ROAD_VEHICLE.kuo                             :automobiliu
+STR_ENGINE_PREVIEW_ROAD_VEHICLE.kur                             :automobilyje
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :lėktuvas
+STR_ENGINE_PREVIEW_AIRCRAFT.kas                                 :lėktuvas
+STR_ENGINE_PREVIEW_AIRCRAFT.ko                                  :lėktuvo
+STR_ENGINE_PREVIEW_AIRCRAFT.kam                                 :lėktuvui
+STR_ENGINE_PREVIEW_AIRCRAFT.ka                                  :lėktuvą
+STR_ENGINE_PREVIEW_AIRCRAFT.kuo                                 :lėktuvu
+STR_ENGINE_PREVIEW_AIRCRAFT.kur                                 :lėktuve
 STR_ENGINE_PREVIEW_SHIP                                         :laivas
-STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :vienbegis lokomotyvas
+STR_ENGINE_PREVIEW_SHIP.kas                                     :laivas
+STR_ENGINE_PREVIEW_SHIP.ko                                      :laivo
+STR_ENGINE_PREVIEW_SHIP.kam                                     :laivui
+STR_ENGINE_PREVIEW_SHIP.ka                                      :laivą
+STR_ENGINE_PREVIEW_SHIP.kuo                                     :laivu
+STR_ENGINE_PREVIEW_SHIP.kur                                     :laive
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :vienbėgis lokomotyvas
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.kas                      :vienbėgis lokomotyvas
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.ko                       :vienbėgio lokomotyvo
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.kam                      :vienbėgiui lokomotyvui
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.ka                       :vienbėgį lokomotyvą
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.kuo                      :vienbėgiu lokomotyvu
+STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.kur                      :vienbėgiame lokomotyve
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :„Maglev“ lokomotyvas
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.kas                        :„Maglev“ lokomotyvas
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.ko                         :„Maglev“ lokomotyvo
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.kam                        :„Maglev“ lokomotyvui
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.ka                         :„Maglev“ lokomotyvą
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.kuo                        :„Maglev“ lokomotyvu
+STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.kur                        :„Maglev“ lokomotyve
 
-STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kaina: {CURRENCY_LONG} Svoris: {WEIGHT_SHORT}{}Greitis: {VELOCITY}  Galia: {POWER}{}Eksplotacijos išlaidos: {CURRENCY_LONG}/metus{}Talpa: {CARGO_LONG}
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kaina: {CURRENCY_LONG} Svoris: {WEIGHT_SHORT}{}Greitis: {VELOCITY}  Galia: {POWER}{}Eksploatavimo išlaidos: {CURRENCY_LONG}/metams{}Talpa: {CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Kaina: {CURRENCY_LONG} Svoris: {WEIGHT_SHORT}{}Greitis: {VELOCITY}  Galia: {POWER}  Maks. T.E.: {6:FORCE}{}Einamosios išlaidos: {4:CURRENCY_LONG}/yr{}Talpa: {5:CARGO_LONG}
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kaina: {CURRENCY_LONG} Maks. Greitis: {VELOCITY}{}Talpa: {CARGO_LONG}, {CARGO_LONG}{}Važiavimo kaina: {CURRENCY_LONG}/yr
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kaina: {CURRENCY_LONG} Maks. Greitis: {VELOCITY}{}Talpa: {CARGO_LONG}{}Važiavimo kaina: {CURRENCY_LONG}/yr
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Kaina: {CURRENCY_LONG} Didž. greitis: {VELOCITY} Nuotolis: {7:COMMA} langeliai{}Talpa: {CARGO_LONG}, {CARGO_LONG}{}Eksploatavimo išlaidos: {CURRENCY_LONG}/m
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Kaina: {CURRENCY_LONG} Didž. greitis: {VELOCITY} Nuotolis: {7:COMMA} langeliai{}Talpa: {CARGO_LONG}{}Eksploatavimo išlaidos: {CURRENCY_LONG}/m
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kaina: {CURRENCY_LONG} Didž. greitis: {VELOCITY}{}Talpa: {CARGO_LONG}, {CARGO_LONG}{}Eksploatavimo išlaidos: {CURRENCY_LONG}/metams
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kaina: {CURRENCY_LONG} Didž. Greitis: {VELOCITY}{}Talpa: {CARGO_LONG}{}Eksploatacijos išlaidos: {CURRENCY_LONG}/metams
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Kaina: {CURRENCY_LONG} Didž. greitis: {VELOCITY} Nuotolis: {7:COMMA} langeliai{}Talpa: {CARGO_LONG}, {CARGO_LONG}{}Eksploatavimo išlaidos: {CURRENCY_LONG}/metams
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Kaina: {CURRENCY_LONG} Didž. greitis: {VELOCITY} Nuotolis: {7:COMMA} langeliai{}Talpa: {CARGO_LONG}{}Eksploatavimo išlaidos: {CURRENCY_LONG}/metams
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Keisti tr. priemones {STRING}
@@ -3228,7 +3274,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Perkompl
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Pertvarkyti laivą kitokio tipo krovinio vežimui
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Pakeisti lektuvo pervezamu kroviniu tipa
 
-STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Pakeisti traukinio vaziavimo krypti
+STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Pakeisti traukinio važiavimo kryptį
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Apgrezti automobili
 
 STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Parodyti traukinio uzduotis. Ctrl+Paspaudimas rodo traukinio tvarkaraštį
@@ -3239,7 +3285,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Rodyti l
 STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Rodyti detalia traukinio informacija
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Rodyti detalia automobilio informacija
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Rodyti laivo informacija
-STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Rodyti lektuvo informacija
+STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Rodyti lėktuvo informaciją
 
 STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Dabartinė traukinio užduotis - paspausk ęia, jei nori sustabdyti/paleisti traukinį. Ctrl+Paspaudimas nukels į užduoties vietą
 STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Automobilio užduotis - spustelk čia, jei nori sustabdyti/paleisti automobilį. Ctrl+Paspaudimas nukels į užduoties vietą
@@ -4128,32 +4174,32 @@ STR_SV_SHIP_NAME                                                :Laivas {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Lėktuvas {COMMA}
 
 STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Šiaurė
-STR_SV_STNAME_SOUTH                                             :{STRING} Pietūs
-STR_SV_STNAME_EAST                                              :{STRING} Rytai
-STR_SV_STNAME_WEST                                              :{STRING} Vakarai
-STR_SV_STNAME_CENTRAL                                           :{STRING} Centrinė
-STR_SV_STNAME_TRANSFER                                          :{STRING} Perdavimas
-STR_SV_STNAME_HALT                                              :{STRING} Galine
-STR_SV_STNAME_VALLEY                                            :{STRING} Slenio
-STR_SV_STNAME_HEIGHTS                                           :{STRING} Aukštumų
-STR_SV_STNAME_WOODS                                             :{STRING} Giria
-STR_SV_STNAME_LAKESIDE                                          :{STRING} Ežero
-STR_SV_STNAME_EXCHANGE                                          :{STRING} Pusiaukelė
+STR_SV_STNAME_NORTH                                             :{STRING} šiaurinė
+STR_SV_STNAME_SOUTH                                             :{STRING} pietinė
+STR_SV_STNAME_EAST                                              :{STRING} rytinė
+STR_SV_STNAME_WEST                                              :{STRING} vakarinė
+STR_SV_STNAME_CENTRAL                                           :{STRING} centrinė
+STR_SV_STNAME_TRANSFER                                          :{STRING} perdavimo
+STR_SV_STNAME_HALT                                              :{STRING} galinė
+STR_SV_STNAME_VALLEY                                            :{STRING} slėnio
+STR_SV_STNAME_HEIGHTS                                           :{STRING} aukštumų
+STR_SV_STNAME_WOODS                                             :{STRING} giria
+STR_SV_STNAME_LAKESIDE                                          :{STRING} ežero
+STR_SV_STNAME_EXCHANGE                                          :{STRING} pusiaukelės
 STR_SV_STNAME_AIRPORT                                           :{STRING} oro uostas
-STR_SV_STNAME_OILFIELD                                          :{STRING} Naftos Platforma
-STR_SV_STNAME_MINES                                             :{STRING} Kasyklos
-STR_SV_STNAME_DOCKS                                             :{STRING} Dokai
+STR_SV_STNAME_OILFIELD                                          :{STRING} naftos platforma
+STR_SV_STNAME_MINES                                             :{STRING} kasyklos
+STR_SV_STNAME_DOCKS                                             :{STRING} dokai
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
-STR_SV_STNAME_ANNEXE                                            :{STRING} Kreivoji
-STR_SV_STNAME_SIDINGS                                           :{STRING} Apylanka
-STR_SV_STNAME_BRANCH                                            :{STRING} Atsaka
+STR_SV_STNAME_ANNEXE                                            :{STRING} kreivoji
+STR_SV_STNAME_SIDINGS                                           :{STRING} apylanka
+STR_SV_STNAME_BRANCH                                            :{STRING} atšaka
 STR_SV_STNAME_UPPER                                             :Aukštutinė {STRING}
 STR_SV_STNAME_LOWER                                             :Žemutinė {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Sraigtasparniu Aikstele
-STR_SV_STNAME_FOREST                                            :{STRING} Miškas
+STR_SV_STNAME_HELIPORT                                          :{STRING} sraigtasparnių aikštelė
+STR_SV_STNAME_FOREST                                            :{STRING} miškas
 STR_SV_STNAME_FALLBACK                                          :{STRING} Stotelė #{NUM}
 ############ end of savegame specific region!
 

src/lang/luxembourgish.txt

@@ -2530,17 +2530,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} muss
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} brauch OpenTTD Versioun {STRING} oder méi nei
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF Datei déi designed gouf fir ze iwwersetzen
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Zevill NewGRFen gelueden.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{2:STRING} als statësch NewGRF lueden mat {4:STRING} kann Desyncs efirrufen
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Onerwaard Sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Onbekannt Action 0 Besëtz
-STR_NEWGRF_ERROR_INVALID_ID                                     :Probéiert eng invalid ID ze benotzen
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{1:STRING} als statësch NewGRF lueden mat {STRING} kann Desyncs efirrufen
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} huet eng korrupt Sprite. All korrupt Sprites ginn als Fragezeichen (?) duergestallt
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Huet e puer Action 8 Einträg
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Iwwert d'Enn vum pseudo-sprite liesen
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}D'momentan benotzten Grafikset huet e puer Sprites ze mann. {}W.e.g d'Basisgrafikset updaten
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Ugefroten GRF net verfügbar
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} gouf ausgeschalt vun {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ongültëgen/onbekannten Sprite Layout Format
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} gouf ausgeschalt vun {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Opgepasst!

src/lang/malay.txt

@@ -2529,17 +2529,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} mest
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} memerlukan OpenTTD versi {STRING} atau kemudian.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :fail GRF yang ianya direka untuk menterjemah
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Terlalu banyak NewGRF dimuatkan.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Memuatkan {2:STRING} sebagai NewGRF statik dengan {4:STRING} mungkin boleh menyebabkan kesilapan sinkronisasi (desync).
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Peperi yang tidak disangka.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Tindakan 0 yang tidak diketahui
-STR_NEWGRF_ERROR_INVALID_ID                                     :Percubaan menggunakan ID yang tidak sah.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Memuatkan {1:STRING} sebagai NewGRF statik dengan {STRING} mungkin boleh menyebabkan kesilapan sinkronisasi (desync).
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} mengandungi peperi yang rosak. Semua peperi yang rosak akan ditunjukkan menggunakan tanda soal (?) merah.
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Mengandungi beberapa Tindakan 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Pembacaan melebihi penghujung pseudo-sprite.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Set asas grafik yang sedang digunakan, hilang sebilangan sprites.{}Sila mengemaskini set asas grafik
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Sumber GRF yang diminta tiada diperolehi
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} telah dinyahaktifkan oleh {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Susun atur format bidadari yang salah / tidak diketahui
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} telah dinyahaktifkan oleh {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Amaran!

src/lang/norwegian_bokmal.txt

@@ -1801,6 +1801,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Du er ba
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Du ble kastet ut av spillet
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Juksing er ikke tillatt på denne tjeneren
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Du sendte for mange kommandoer til serveren
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Du brukte for lang tid på å skrive inn passordet
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Din PC brukte for lang tid på å koble til
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Du brukte for lang tid på å laste ned kartet
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Du brukte for lang tid på å koble til tjeneren
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :generell feil
@@ -1819,6 +1823,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :kastet ut av tj
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :prøvde å jukse
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :tjeneren er full
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :sendte for mange kommandoer
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :mottok ikke passord tidsnok
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :generelt tidsavbrudd
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :nedlasting av kart tok for lang tid
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :behandling av kartet tok for lang tid
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Mulig tap av tilkobling
@@ -2133,7 +2141,7 @@ STR_OBJECT_CLASS_TRNS                                           :Radiosendere
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Trær
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Velg typen tre som skal plantes
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Velg typen tre som skal plantes. Hvis feltet allerede har et tre, vil dette plante flere typer trær uavhengig av den valgte typen
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Trær av tilfeldig type
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plasser trær av tilfeldig type. Shift slår av/på kostnadsestimat
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Tilfeldige trær
@@ -2479,7 +2487,7 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Inkompatib
 
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Forandre NewGRF-parametre
-STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Nær
+STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Lukk
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Tilbakestill
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Sett alle parametere til standardverdi
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
@@ -2506,9 +2514,9 @@ STR_NEWGRF_INSPECT_QUERY_CAPTION                                :{WHITE}NewGRF-v
 STR_SPRITE_ALIGNER_CAPTION                                      :{WHITE}Forskyver sprite {COMMA} ({STRING})
 STR_SPRITE_ALIGNER_NEXT_BUTTON                                  :{BLACK}Neste sprite
 STR_SPRITE_ALIGNER_NEXT_TOOLTIP                                 :{BLACK}Fortsett til neste normale sprite og hopp over enhver pseudo-/omfargings-/skrifttype- sprite, samt start om ved begynnelsen
-STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Gå til grafikk
+STR_SPRITE_ALIGNER_GOTO_BUTTON                                  :{BLACK}Gå til figur
 STR_SPRITE_ALIGNER_GOTO_TOOLTIP                                 :{BLACK}Gå til gitt sprite. Hvis spriten ikke er en normal sprite, fortsett til neste normale sprite
-STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Forrige grafikk
+STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Forrige figur
 STR_SPRITE_ALIGNER_PREVIOUS_TOOLTIP                             :{BLACK}Fortsett til forrige normale sprite og hopp over enhver pseudo-/omfargings-/skrifttype- sprite, samt start om ved begynnelsen
 STR_SPRITE_ALIGNER_SPRITE_TOOLTIP                               :{BLACK}Forhåndsvisning av valgt sprite. Innrettingen ignoreres når spriten tegnes
 STR_SPRITE_ALIGNER_MOVE_TOOLTIP                                 :{BLACK}Flytt spriten rundt omkring, for å endre X- og Y-forskyvningene
@@ -2533,17 +2541,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} må
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} krever OpenTTD versjon {STRING} eller nyere.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF-filen den var laget for å oversette
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :For mange NewGRFer innlastet.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Å laste inn {2:STRING} som statisk NewGRF med {4:STRING} kan forårsake synkroniseringsfeil.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uventet sprite.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukjent "Action 0"-egenskap.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøk på å bruke ugyldig ID.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Å laste inn {1:STRING} som statisk NewGRF med {STRING} kan forårsake synkroniseringsfeil.
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uventet figur (figur {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukjent Handling 0 egenskap {4:HEX} (figur {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøkt å bruke ugyldig ID (figur {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inneholder en ødelagt sprite. Alle ødelagte spriter vil bli vist som røde spørsmålstegn (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneholder flere "Action 8"-oppføringer
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leste forbi slutten på pseudo-sprite.
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneholder flere Handling 8 oppføringer (figur {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leste forbi slutten av pseudo-figur (figur {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det nåværende grafikksettet mangler en del spriter.{}Vennligst oppdater grafikksettet.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Etterspurte GRF-resurser var ikke tilgjengelige
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} ble deaktivert av {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ugyldig/ukjent sprite layoutformat
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Etterspurte GRF-ressurser ikke tilgjengelig (figur {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} ble deaktivert av {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ugyldig/ukjent figur layout-format (figur {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!
@@ -2672,7 +2680,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Firmaets
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}klikk på mål for å gå til industri/by/rute . Ctrl+klikk åpner et nytt tilleggsvindu over industriens/byens/rutens beliggenhet
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Spørsmål
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Spørsmål
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informasjon
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Advarsel
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Feil
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Avbryt

src/lang/norwegian_nynorsk.txt

@@ -2533,17 +2533,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} må
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} Treng OpenTTD versjon {STRING} eller betre.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF fila den var laga for å omsetje
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :For mange NewGRF-er lasta inn.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Å laste inn {2:STRING} som statisk NewGRF med {4:STRING} kan forårsaka synkroniseringsfeil.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uventa grafikk.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukjend hending-0-eigenskap.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøk på å bruka ugyldig ID.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Å laste inn {1:STRING} som statisk NewGRF med {STRING} kan forårsaka synkroniseringsfeil.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inneheld øydelagd grafikk. All øydelagd grafikk vil bli vist som raude spørsmålsteikn (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneheld fleire "Action 8"-oppføringar.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Las forbi slutten på pseudo-grafikk.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det nåværande grafikksettet manglar ein del bilete.{}Vennligst oppdater grafikksettet.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Etterspurde GRF-ressursar er ikkje tilgjengelege
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} vart deaktivert av {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ugyldig/ukjend sprite layoutformat
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} vart deaktivert av {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Åtvaring!
@@ -2672,7 +2665,7 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Målet
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klikk på mål for å gå til industri/by/rute. Ctrl+klikk åpner eit nytt tilleggsvindauge over industrien/byen/ruta sin lokasjon.
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Spørsmål
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Spørsmål
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Avbryt

src/lang/polish.txt

@@ -825,7 +825,8 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Przełącz konsolę
 STR_ABOUT_MENU_AI_DEBUG                                         :Debugowanie SI / GameScript
 STR_ABOUT_MENU_SCREENSHOT                                       :Zrzut ekranu
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zrzut powiększenia bez okien
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Pełne przybliżenie na screenshocie
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Screenshot z przybliżeniem domyślnym
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Zrzut ekranu całej mapy
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Info o 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Wyrównywanie sprite-ów
@@ -2178,6 +2179,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Masz zab
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Zostałeś wyrzucony z serwera
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Ułatwienia są niedozwolone na tym serwerze
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Wysyłano zbyt dużo komend na serwer
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Zbyt długo wprowadzałeś hasło
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Twój komputer zbyt długo probował się połączyć
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Pobieranie mapy trwało zbyt długo
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Zbyt długo łączyłeś się do serwera
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :błąd ogólny
@@ -2196,6 +2201,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :wyrzucony przez
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :próbował użyć ułatwień
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serwer jest pełny
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :wysyłał zbyt wiele komend
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :nie otrzymano hasła w odpowiednim czasie
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :przekroczono czas
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :pobieranie mapy trwało zbyt długo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :przetwarzanie mapy trwało za długo
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Możliwa utrata połączenia
@@ -2510,7 +2519,7 @@ STR_OBJECT_CLASS_TRNS                                           :Nadajniki
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Drzewa
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Wybierz typ drzew do sadzenia
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Wybierz typ drzew do sadzenia. Jeśli na wybranym miejscu są już drzewa, to dodasz więcej drzew różnego typu, bez względu na wybraną opcję.
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Drzewa różnych rodzajów
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Sadzenie drzew różnych rodzajów. Shift przełącza pomiędzy trybem sadzenia a szacowaniem jego kosztów
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Losowe drzewa
@@ -2833,6 +2842,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Lista zm
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licencja
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Ustaw parametry
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Pokaż parametry
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Zmień paletę
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Zmień paletę kolorów wybranego NewGRF.{}Zrób to gdy grafika tego NewGRF jest różowa
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Zastosuj zmiany
@@ -2909,17 +2919,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} musi
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} wymaga OpenTTD w wersji {STRING} lub nowszej
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :pliku GRF który miał być tłumaczony
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Wczytano zbyt wiele NewGRF
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Ładowanie {2:STRING} jako statyczne NewGRF z {4:STRING} może spowodować desynchronizacje
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Nieoczekiwany obrazek
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nieznana własność Action 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Próba użycia nieprawidłowego ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Ładowanie {1:STRING} jako statyczne NewGRF z {STRING} może spowodować desynchronizacje
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Nieoczekiwany sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nieznana wartość Action 0 {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Próba użycia niepoprawnego ID (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} zawiera uszkodzoną teksturę. Wszystkie uszkodzone tekstury będą pokazane jako czerwony znak zapytania (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Zawiera wiele wpisów Action 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Odczyt poza koniec pseudo obrazków
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Zawiera wiele wpisów Action 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Odczyt poza obszar pseudo-sprite'u (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Aktualnie używany zestaw grafik jest niekompletny.{}Proszę zaktualizować podstawowy zestaw grafik
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Wymagane zasoby GRF są niedostępne
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} został wyłączony przez {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Błędny lub nieznany format układu obrazów
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Potrzebne źródło GRF nie jest dostępne (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} został wyłączony przez {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Niepoprawny/nieznany format układu sprite'u (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Uwaga!
@@ -3047,6 +3057,32 @@ STR_GOALS_NONE                                                  :{ORANGE}- Brak
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Cele firmy:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Kliknij na celu by wyśrodkować widok na przedsiębiorstwie/mieście/tytule. Ctrl+kliknięcie otwiera nowe okno podglądu lokacji danego przedsiębiorstwa.miasta/tytułu
 
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pytanie
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informacja
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Ostrzeżenie
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Błąd
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Anuluj
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Nie
+STR_GOAL_QUESTION_BUTTON_YES                                    :Tak
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Odrzuć
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Akceptuj
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignoruj
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Spróbuj ponownie
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Poprzedni
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Następny
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Stop
+STR_GOAL_QUESTION_BUTTON_START                                  :Start
+STR_GOAL_QUESTION_BUTTON_GO                                     :Idź
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Kontynuuj
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Restartuj
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Odłóż
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Poddaj się
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Zamknij
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsydia
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Oferta subsydiów dla usługi przewozu:
@@ -3157,11 +3193,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Brak
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Wartość firmy: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% w posiadaniu przez {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktura:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} elementy kolei
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} elementy drogi
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} pola wody
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} pola stacji
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} lotniska
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} element{P "" y ów} kolei
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} element{P "" y ów} drogi
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} p{P ole ola ól} wody
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} p{P ole ola ól} stacji
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} lotnisk{P o a ""}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Żaden
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Budowa Siedziby
@@ -3870,7 +3906,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Game Scr
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Sprawdź log Game Script
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Nie znaleziono SI do wczytania.{}SI jest nieaktywne i nic nie robi.{}Możesz ściągnąć SI z 'Dodatki Online' w głównym menu gry
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna z działających SI przestała działać. Prosimy o zgłoszenie tego autorowi SI dołączając zrzut ekranu okna odpluskwiania SI
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jeden z uruchomionych skryptów przestał działać. Prosimy o zgłoszenie tego autorowi skryptu dołączając zrzut ekranu okna debugowania SI / GameScript
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Okno debugowania SI / GameScript jest dostępne tylko na serwerze
 
 # AI configuration window

src/lang/portuguese.txt

@@ -219,7 +219,7 @@ STR_UNITS_HEIGHT_SI                                             :{COMMA} m
 
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Insira uma frase para filtrar por
-STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Insira uma palavra chave para filtrar a lista por
+STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Insira uma palavra-chave para filtrar a lista por
 
 STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Seleccione forma de ordenação (descendente/ascendente)
 STR_TOOLTIP_SORT_CRITERIA                                       :{BLACK}Seleccione critério de ordenação
@@ -242,7 +242,7 @@ STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolir
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Por Omissão
 STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
-STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_OK                                                   :{BLACK}Confirmar
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :\1234567890'« qwertyuiop+´asdfghjklçº~<zxcvbnm,.-
@@ -305,7 +305,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Mostrar
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Mostrar tabela de classificação de empresas
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Financiar a construção de uma nova indústria
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Mostrar lista de comboios da empresa. Ctrl+Clique alterna entre abrir a lista de grupos/veículos
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Mostrar lista de veículos de estrada da empresa. Ctrl+Clique alterna entre abrir a lista de grupos/veículos
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Mostrar lista de veículos rodoviários da empresa. Ctrl+Clique alterna entre abrir a lista de grupos/veículos
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Mostrar lista de barcos da empresa. Ctrl+Clique alterna entre abrir a lista de grupos/veículos
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Mostrar lista de aeronaves da empresa. Ctrl+Clique alterna entre abrir a lista de grupos/veículos
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Ampliar
@@ -383,7 +383,7 @@ STR_TOWN_MENU_FOUND_TOWN                                        :Fundar cidade
 
 ############ range for subsidies menu starts
 STR_SUBSIDIES_MENU_SUBSIDIES                                    :Subsídios
-STR_SUBSIDIES_MENU_GOAL                                         :Objetivos atuais
+STR_SUBSIDIES_MENU_GOAL                                         :Objetivos actuais
 ############ range ends here
 
 ############ range for graph menu starts
@@ -447,8 +447,8 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Mostrar/ocultar consola
 STR_ABOUT_MENU_AI_DEBUG                                         :Depuração da IA/Scripts de Jogo
 STR_ABOUT_MENU_SCREENSHOT                                       :Captura de ecrã
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Captura com ampliação máxima
-STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Captura com ampliação normal
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Captura com resolução máxima
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Captura com resolução normal
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Captura de mapa
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Sobre o OpenTTD...
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alinhador de gráficos
@@ -579,7 +579,7 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Dinheiro
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Empréstimo:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Número de veículos que lucraram no último ano. Isto inclui veículos de estrada, comboios, barcos e aeronaves.
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Número de veículos que lucraram no último ano. Isto inclui veículos rodoviários, comboios, barcos e aeronaves.
 STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de segmentos de estação recentemente atendidos. Cada parte de uma estação (ex. estação ferroviária, paragem de autocarro, aeroporto) é contabilizada, mesmo se estiverem ligadas como uma só.
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}O lucro do veículo com o rendimento menor (só são considerados veículos com mais de 2 anos)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Dinheiro conseguido no mês com os lucros mais baixos dos últimos 12 trimestres
@@ -677,7 +677,7 @@ STR_SMALLMAP_LEGENDA_STATIONS_AIRPORTS_DOCKS                    :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES                       :{TINY_FONT}{BLACK}Edifícios/Indústrias
 STR_SMALLMAP_LEGENDA_VEHICLES                                   :{TINY_FONT}{BLACK}Veículos
 STR_SMALLMAP_LEGENDA_TRAINS                                     :{TINY_FONT}{BLACK}Comboios
-STR_SMALLMAP_LEGENDA_ROAD_VEHICLES                              :{TINY_FONT}{BLACK}Veículos de Estrada
+STR_SMALLMAP_LEGENDA_ROAD_VEHICLES                              :{TINY_FONT}{BLACK}Veículos Rodoviários
 STR_SMALLMAP_LEGENDA_SHIPS                                      :{TINY_FONT}{BLACK}Barcos
 STR_SMALLMAP_LEGENDA_AIRCRAFT                                   :{TINY_FONT}{BLACK}Aeronaves
 STR_SMALLMAP_LEGENDA_TRANSPORT_ROUTES                           :{TINY_FONT}{BLACK}Rotas de Transporte
@@ -763,13 +763,13 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIG_FONT}{BLAC
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIG_FONT}{BLACK}Cidadãos celebram . . .{}Primeira aeronave chega a {STATION}!
 
 STR_NEWS_TRAIN_CRASH                                            :{BIG_FONT}{BLACK}Acidente de Comboios!{}{COMMA} mortem numa explosão após a colisão!
-STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BIG_FONT}{BLACK}Acidente de Veículo de Estrada!{}Condutor morre na explosão após a colisão com um comboio!
-STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BIG_FONT}{BLACK}Acidente de Veículo de Estrada!{}{COMMA} morrem na explosão após a colisão com um comboio!
+STR_NEWS_ROAD_VEHICLE_CRASH_DRIVER                              :{BIG_FONT}{BLACK}Acidente com Veículo Rodoviário!{}Condutor morre na explosão após a colisão com um comboio!
+STR_NEWS_ROAD_VEHICLE_CRASH                                     :{BIG_FONT}{BLACK}Acidente com Veículo Rodoviário{}{COMMA} morrem na explosão após a colisão com um comboio!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIG_FONT}{BLACK}Acidente de Aeronave!{}{COMMA} morrem na explosão em {STATION}!
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIG_FONT}{BLACK}Acidente de Aeronave!{}Avião ficou sem combustível, {COMMA} morrem no incêndio!
 
 STR_NEWS_DISASTER_ZEPPELIN                                      :{BIG_FONT}{BLACK}Acidente de Zepelim em {STATION}!
-STR_NEWS_DISASTER_SMALL_UFO                                     :{BIG_FONT}{BLACK}Veículo de Estrada destruído em colisão com OVNI!
+STR_NEWS_DISASTER_SMALL_UFO                                     :{BIG_FONT}{BLACK}Veículo rodoviário destruído em colisão com OVNI!
 STR_NEWS_DISASTER_AIRPLANE_OIL_REFINERY                         :{BIG_FONT}{BLACK}Explosão da Refinaria de Petróleo em {TOWN}!
 STR_NEWS_DISASTER_HELICOPTER_FACTORY                            :{BIG_FONT}{BLACK}Fábrica destruída em circunstâncias suspeitas em {TOWN}!
 STR_NEWS_DISASTER_BIG_UFO                                       :{BIG_FONT}{BLACK}OVNI pousa em {TOWN}!
@@ -905,7 +905,7 @@ STR_GAME_OPTIONS_MEASURING_UNITS_METRIC                         :Métrico
 STR_GAME_OPTIONS_MEASURING_UNITS_SI                             :Sistema Internacional
 ############ end of measuring units region
 
-STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Veículos de estrada
+STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Veículos rodoviários
 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_TOOLTIP                 :{BLACK}Seleccione o lado da estrada por onde os veículos circulam
 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT                    :Circular pela esquerda
 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_RIGHT                   :Circular pela direita
@@ -1121,7 +1121,7 @@ STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Permiti
 STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Comprimento máximo de comboios: {ORANGE}{STRING} tile{P 0:1 "" s}
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :{LTBLUE}Quantidade de fumo/faíscas de veículos: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Modelo de aceleração de comboios: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Tipo de aceleração dos veículos de estrada: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Tipo de aceleração dos veículos rodoviários: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Declive das inclinações para comboios: {ORANGE}{STRING}%
 STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS                 :{LTBLUE}Declive das inclinações para v. de estrada: {ORANGE}{STRING}%
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Proibir comboios e barcos fazer curvas de 90º: {ORANGE}{STRING}
@@ -1145,7 +1145,7 @@ STR_CONFIG_SETTING_STOP_LOCATION                                :{LTBLUE}Ordens
 STR_CONFIG_SETTING_STOP_LOCATION_NEAR_END                       :no extremo perto
 STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :no meio
 STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :no extremo longe
-STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}Fila de veículos de estrada (com efeitos de quantidade): {ORANGE}{STRING}
+STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}Fila de veículos rodoviários (com efeitos de quantidade): {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o rato está na borda do mapa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}Permitir comprar exclusivo dos direitos de transportes: {ORANGE}{STRING}
@@ -1263,12 +1263,12 @@ STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Agrupar
 
 STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING                  :{LTBLUE}Desativar construção de infra-estrutura quando não estão disponíveis veículos adequados: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Máximo de comboios por empresa: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Máximo de veículos de estrada por empresa: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MAX_ROAD_VEHICLES                            :{LTBLUE}Máximo de veículos rodoviários por empresa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Máximo de aeronaves por empresa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_SHIPS                                    :{LTBLUE}Máximo de barcos por empresa: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :{LTBLUE}Desactivar comboios para o computador: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :{LTBLUE}Desactivar veículos de estrada para o computador: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :{LTBLUE}Desactivar veículos rodoviários para o computador: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactivar aeronaves para o computador: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Desactivar barcos para o computador: {ORANGE}{STRING}
 
@@ -1297,12 +1297,12 @@ STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Ao arra
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Usar automaticamente sinais clássicos antes de: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Activar ferramenta de sinais: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Tipo de farol padrão para construir: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Faróis de obstrução
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Faróis de rota
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Faróis para rota de mão única
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Sinais de bloqueio
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Sinais de rota
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Sinais de sentido único
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :{LTBLUE}Trocar tipos de faróis: {ORANGE}{STRING}
-STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Apenas faróis de obstrução
-STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Apenas faróis de rota
+STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Apenas sinais de bloqueio
+STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Apenas sinais de rota
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :Todos
 
 STR_CONFIG_SETTING_TOWN_LAYOUT                                  :{LTBLUE}Disposição de estradas para novas cidades: {ORANGE}{STRING}
@@ -1373,7 +1373,7 @@ STR_CONFIG_SETTING_PATHFINDER_NPF                               :NPF
 STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED                  :YAPF {BLUE}(Recomendado)
 
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Sistema de encaminhar comboios: {ORANGE}{STRING}
-STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :{LTBLUE}Sistema de encaminhar veículos de estrada: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :{LTBLUE}Sistema de encaminhar veículos rodoviários: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Sistema de encaminhar barcos: {ORANGE}{STRING}
 STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}Inversão automática nos sinais: {ORANGE}{STRING}
 
@@ -1479,7 +1479,7 @@ STR_LIVERY_CAPTION                                              :{WHITE}Novo Esq
 
 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Exibir esquema de cores geral
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Exibir esquemas de cores dos comboios
-STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Exibir esquemas de cores dos veículos de estrada
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Exibir esquemas de cores dos veículos rodoviários
 STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Exibir esquemas de cores dos barcos
 STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Exibir esquema de cores da aeronave
 STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Seleccione a cor primária para o veículo seleccionado
@@ -1603,7 +1603,7 @@ STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versão
 STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Endereço do servidor: {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data de início: {WHITE}{DATE_SHORT}
 STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Data actual: {WHITE}{DATE_SHORT}
-STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protegido por palavra passe!
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protegido por palavra-chave!
 STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVIDOR DESLIGADO
 STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVIDOR CHEIO
 STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSÃO INCOMPATÍVEL
@@ -1628,7 +1628,7 @@ STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Iniciar
 
 STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nome do jogo:
 STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}O nome do jogo será mostrado aos outros jogadores no menu de selecção de jogos multi-jogador
-STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Definir palavra passe
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Definir palavra-chave
 STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Proteja o jogo com uma senha se não desejar que pessoas indesejadas se juntem
 
 STR_NETWORK_START_SERVER_LAN_INTERNET                           :Rede Local / Internet
@@ -1755,18 +1755,18 @@ STR_NETWORK_SPECTATORS                                          :Espectadores
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Insira a quantidade de dinheiro que pretende dar
 
 # Network set password
-STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não gravar a palavra passe introduzida
-STR_COMPANY_PASSWORD_OK                                         :{BLACK}Atribuir nova palavra passe à empresa
-STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Palavra passe da empresa
-STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Palavra passe predefinida da empresa
-STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Usar a palavra passe desta empresa como predefinida para novas empresas
+STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não gravar a palavra-chave introduzida
+STR_COMPANY_PASSWORD_OK                                         :{BLACK}Atribuir nova palavra-chave à empresa
+STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Palavra-chave da empresa
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Palavra-chave predefinida da empresa
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Usar a palavra-chave desta empresa como predefinida para novas empresas
 
 # Network company info join/password
 STR_COMPANY_VIEW_JOIN                                           :{BLACK}Entrar
 STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Entrar e jogar por esta empresa
-STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Palavra passe
-STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Use palavra passe para prevenir utilizadores não autorizados de entrar na sua empresa.
-STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Definir palavra passe da empresa
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Palavra-chave
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Use palavra-chave para prevenir utilizadores não autorizados de entrar na sua empresa.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Definir palavra-chave da empresa
 
 # Network chat
 STR_NETWORK_CHAT_SEND                                           :{BLACK}Enviar
@@ -1800,6 +1800,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Foi bani
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Você foi expulso do jogo
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Batotas não são permitidas neste servidor
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Estava a enviar demasiados comandos ao servidor
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Demorou demasiado tempo a introduzir a palavra-chave
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}O seu computador demorou demasiado a ligar a rede
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Demorou demasiado a transferir o mapa
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Demorou demasiado a ligar ao servidor
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :erro geral
@@ -1818,6 +1822,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :avisado pelo se
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :estava a tentar usar batota
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor cheio
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :estava a enviar demasiados comandos
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :não foi recebida palavra-chave a tempo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :demasiado tempo (geral)
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :demorou demasiado a transferir o mapa
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :demorou demasiado a processar o mapa
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possível perda de conexão
@@ -2016,7 +2024,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Aumentar
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Seleccione Ponte Ferroviária
-STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Seleccionar Ponte de Estrada
+STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Seleccionar Ponte Rodoviária
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selecção de ponte - clique na ponte desejada para a construir
 STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
 STR_SELECT_BRIDGE_SCENEDIT_INFO                                 :{GOLD}{STRING},{} {VELOCITY}
@@ -2037,7 +2045,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION                     :{BLACK}Construi
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION                  :{BLACK}Construir secção de carris para eléctricos. Ctrl alterna a construção/remoção de carris para eléctricos. Shift alterna contruir/mostrar custo estimado
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD                         :{BLACK}Construir estradas usando o modo automático. Ctrl alterna a construção/remoção de estradas. Shift alterna contruir/mostrar custo estimado
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM                         :{BLACK}Construir carris para eléctricos usando o modo automático. Ctrl alterna a construção/remoção de carris para eléctricos. Shift alterna contruir/mostrar custo estimado
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Construir depósito de veículos de estrada (para compra e manutenção de veículos de estrada). Shift alterna contruir/mostrar custo estimado
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT               :{BLACK}Construir depósito de veículos rodoviários (para compra e manutenção de veículos rodoviários). Shift alterna contruir/mostrar custo estimado
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT               :{BLACK}Construir depósito de eléctricos (para compra e manutenção). Shift alterna contruir/mostrar custo estimado
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION                      :{BLACK}Construir estação de autocarros. Ctrl permite juntar estações. Shift alterna contruir/mostrar custo estimado
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION           :{BLACK}Construir paragem de eléctricos para passageiros. Ctrl permite juntar estações. Shift alterna contruir/mostrar custo estimado
@@ -2132,7 +2140,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmissores
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Árvores
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Escolha um tipo de árvore para plantar
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Escolha um tipo de árvore para plantar. Se o quadrado já tiver uma árvore, serão adicionadas mais árvores de difrentes tipos independentemente do tipo selecionado
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Árvores de tipo aleatório
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Colocar árvores de tipo aleatório. Shift alterna contruir/mostrar custo estimado
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Plantar Aleatoriamente
@@ -2246,13 +2254,28 @@ STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :{STRING} linha
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :{STRING} linha com sinais de saída
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :{STRING} linha com sinais combinados
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :{STRING} linha com sinais de caminho
-STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :{STRING} linha com sinais de caminho unico
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :{STRING} linha com sinais de sentido único
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :{STRING} linha com bloqueio e pré-sinais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :{STRING} linha com bloqueio e sinais de saida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :{STRING} linha com bloqueio e sinais combinados
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :{STRING} linha com bloqueio e sinais de rota
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :{STRING} linha com bloqueio e sinais de sentido único
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :{STRING} linha com pré-sinais e sinais de saida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :{STRING} linha com pré-sinais e sinais combinados
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :{STRING} linha com pré-sinais e sinais de rota
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :{STRING} linha com pré-sinais e sinais de sentido único
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :{STRING} linha com sinais de saida e sinais combinados
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :{STRING} linha com sinais de saida e sinais de rota
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :{STRING} linha com sinais de saida e de sentido único
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :{STRING} linha com sinais combinados e sinais de rota
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :{STRING} linha com sinais combinados e sentido unico
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :{STRING} linha com sinais de rota e de sentido unico
 STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :{STRING} depósito de comboios
 
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Estrada
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Estrada com iluminação
 STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Estrada com árvores
-STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depósito de veículos de estrada
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depósito de veículos rodoviários
 STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Passagem de nível
 STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Linha de eléctrico
 
@@ -2282,7 +2305,7 @@ STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Depósito naval
 # Industries come directly from their industry names
 
 STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Túnel ferroviário
-STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Túnel de estrada
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Túnel rodoviário
 
 STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ponte ferroviária suspensa em aço
 STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEEL                    :Ponte ferroviária com vigas em aço
@@ -2290,21 +2313,21 @@ STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ponte ferroviá
 STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Ponte ferroviária suspensa de betão reforçado
 STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Ponte ferroviária de madeira
 STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Ponte ferroviária de betão
-STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Ponte de estrada tubular
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Ponte rodoviária tubular
 
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ponte de estrada suspensa em aço
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ponte de estrada com vigas em aço
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ponte de estrada cantilever em aço
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Ponte de estrada suspensa de betão reforçado
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ponte de estrada de madeira
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Ponte de estrada de betão
-STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Ponte de estrada tubular
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ponte rodoviária suspensa em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ponte rodoviária com vigas em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ponte rodoviária cantilever em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Ponte rodoviária suspensa de betão reforçado
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ponte rodoviária de madeira
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Ponte rodoviária de betão
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Ponte rodoviária tubular
 
 STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aqueduto
 
 STR_LAI_OBJECT_DESCRIPTION_TRANSMITTER                          :Transmissor
 STR_LAI_OBJECT_DESCRIPTION_LIGHTHOUSE                           :Farol
-STR_LAI_OBJECT_DESCRIPTION_COMPANY_HEADQUARTERS                 :Sede de Empresa
+STR_LAI_OBJECT_DESCRIPTION_COMPANY_HEADQUARTERS                 :Sede de empresa
 STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND                   :Terreno propriedade de uma empresa
 
 # About OpenTTD window
@@ -2352,16 +2375,16 @@ STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Clique p
 STR_MAPGEN_RANDOM                                               :{BLACK}Gerar aleatório
 STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Mudar a semente aleatória para a criação do terreno
 STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Criação do terreno:
-STR_MAPGEN_TREE_PLACER                                          :{BLACK}Colocação de árvores:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Alg. de colocação de árvores:
 STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tipo de terreno:
 STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nível do mar:
 STR_MAPGEN_QUANTITY_OF_RIVERS                                   :{BLACK}Rios:
 STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Suavidade:
 STR_MAPGEN_VARIETY                                              :{BLACK}Variedade da distribuição:
-STR_MAPGEN_GENERATE                                             :{WHITE}Criar
+STR_MAPGEN_GENERATE                                             :{WHITE}Gerar
 
 # Strings for map borders at game generation
-STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Cantos do mapa:
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Limites do mapa:
 STR_MAPGEN_NORTHWEST                                            :{BLACK}Noroeste
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordeste
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sudeste
@@ -2372,7 +2395,7 @@ STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aleatór
 STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aleatório
 STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
 
-STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotação mapa alt.:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotação mapa de alt.:
 STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nome mapa de alt.:
 STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}Tamanho:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} x {NUM}
@@ -2440,6 +2463,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Lista de
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licença
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Mostrar parametros
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alternar palete
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna a palete do NewGRF seleccionado.{}Alterne quando os gráficos deste NewGRF aparecerem a cor-de-rosa no jogo
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplicar alterações
@@ -2506,7 +2530,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Aviso: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Erro: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Fatal: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ocorreu um erro fatal no NewGRF: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ocorreu um erro fatal num NewGRF: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} não funciona com a versão do TTDPatch reportada por OpenTTD.
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} é para a versão {STRING} do TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} foi concebido para ser usado com {STRING}
@@ -2516,17 +2540,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} deve
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} requer a versão {STRING} ou superior do OpenTTD.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :ficheiro GRF concebido para o traduzir
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Demasiados NewGRFs carregados.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregar {2:STRING} como NewGRF estático com {4:STRING} pode causar dessincronização.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Objecto gráfico inesperado
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propriedade de Action 0 desconhecida.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de usar ID inválido
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregar {1:STRING} como NewGRF estático com {STRING} pode causar dessincronização.
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Gráfico inválido (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propriedade Action 0 desconhecida {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de uso de ID Inválido (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém um objecto gráfico corrompido. Todos os objectos gráficos corrompidos serão apresentados como um ponto de interrogação (?) vermelho.
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém múltiplas entradas Action 8.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leitura ultrapassou o fim do pseudo-gráfico.
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém múltiplas entradas Action 8 - (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leitura além dos limites do pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}O conjunto de gráficos base actual tem objectos gráficos em falta.{}Por favor faça a sua actualização.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :{G=m}Recursos GRF pedidos não disponíveis
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} foi desactivado por {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato gráfico inválido/desconhecido
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF pedidos não disponíveis (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} foi desactivado por {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato de Gráfico Inválido ou desconhecido (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Alerta!
@@ -2655,8 +2679,30 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Objetivo
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Clique no objetivo para centrar a vista principal na indústria/cidade/quadrado. Ctrl+clique abre uma nova vista na localização da indústria/cidade/quadrado
 
 # Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Questão
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informação
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Aviso
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Erro
 
 ### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancelar
+STR_GOAL_QUESTION_BUTTON_OK                                     :Confirmar
+STR_GOAL_QUESTION_BUTTON_NO                                     :Não
+STR_GOAL_QUESTION_BUTTON_YES                                    :Sim
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Recusar
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Aceitar
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignorar
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Repetir
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Anterior
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Próximo
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Parar
+STR_GOAL_QUESTION_BUTTON_START                                  :Iniciar
+STR_GOAL_QUESTION_BUTTON_GO                                     :Partir
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Continuar
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Reiniciar
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Adiar
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Render-se
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Fechar
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsídios
@@ -2674,7 +2720,7 @@ STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATION_FEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Nenhuma -
-STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleccionar todas as acções
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleccionar todas as instalações
 STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Seleccionar todos os tipos de carga (incluindo carga sem espera)
 STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Nenhuma carga em espera
 
@@ -2708,7 +2754,7 @@ STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrar
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Alterar o nome da estação
 
 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
-STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostrar todos os veículos de estrada que têm esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostrar todos os veículos rodoviários que têm esta estação nas ordens de serviço
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostrar todas as aeronaves que têm esta estação nas ordens de serviço
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostrar todos os barcos que têm esta estação nas ordens de serviço
 
@@ -2735,7 +2781,7 @@ STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Circulaç
 STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Circulação de Barcos
 STR_FINANCES_SECTION_PROPERTY_MAINTENANCE                       :{GOLD}Manutenção de Propriedades
 STR_FINANCES_SECTION_TRAIN_INCOME                               :{GOLD}Lucros dos Comboios
-STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME                        :{GOLD}Lucros dos V. de Estrada
+STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME                        :{GOLD}Lucros dos V. Rodoviários
 STR_FINANCES_SECTION_AIRCRAFT_INCOME                            :{GOLD}Lucros das Aeronaves
 STR_FINANCES_SECTION_SHIP_INCOME                                :{GOLD}Lucros dos Barcos
 STR_FINANCES_SECTION_LOAN_INTEREST                              :{GOLD}Juros do Empréstimo
@@ -2747,7 +2793,7 @@ STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balanço
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Empréstimo
 STR_FINANCES_MAX_LOAN                                           :{WHITE}Empréstimo Máximo: {BLACK}{CURRENCY_LONG}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY_LONG}
-STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pedir emprestado {CURRENCY_LONG}
+STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pedir empréstimo {CURRENCY_LONG}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Aumentar empréstimo. Ctrl+Clique aumenta tanto empréstimo quanto possível
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Pagar empréstimo {CURRENCY_LONG}
 STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Pagar parte do empréstimo. Ctrl+Clique paga tanto empréstimo quanto possível
@@ -2761,18 +2807,18 @@ STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurad
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Cores:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Veículos:
 STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} comboio{P "" s}
-STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} veículo{P "" s} de estrada
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} veículo{P "" s} rodoviário{P "" s}
 STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aeronave{P "" s}
 STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} barco{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nenhum
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor da empresa: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propriedade de {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraestrutura:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} peças de caminho-de-ferro
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} peças de estrada
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} quadrados de água
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} quadrados de estação
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroportos
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} peça{P "" s} de caminho-de-ferro
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} peça{P "" s} de estrada
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} quadrado{P "" s} de água
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} quadrado{P "" s} de estação
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroporto{P "" s}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nenhum
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir sede
@@ -2790,13 +2836,13 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Cores
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Alterar cores dos veículos
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Empresa
 STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP                           :{BLACK}Alterar nome da empresa
-STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Presidente
+STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Nome do Presidente
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Alterar nome do presidente
 
-STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Comprar 25% de acções
-STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender 25% de acções
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Comprar 25% de acções nesta empresa. Shift+Clique mostra valor estimado sem comprar nenhuma ação
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 25% de acções nesta empresa. Shift+Clique mostra valor estimado sem vender nenhuma ação
+STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Comprar 25% das acções
+STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender 25% das acções
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Comprar 25% das acções nesta empresa. Shift+Clique mostra valor estimado sem comprar nenhuma acção
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 25% das acções nesta empresa. Shift+Clique mostra valor estimado sem vender nenhuma acção
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nome da Empresa
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nome do Presidente
@@ -2809,7 +2855,7 @@ STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Peças de
 STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Sinais
 STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Peças de estrada:
 STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD                            :{WHITE}Estrada
-STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY                         :{WHITE}Caminho de elétrico
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY                         :{WHITE}Via para elétricos
 STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Quadrados de água:
 STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Canais
 STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Estações:
@@ -2851,12 +2897,12 @@ STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Mudar o
 
 # Vehicle lists
 STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Comboio{P "" s}
-STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Veículo{P "" s} de Estrada
+STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING} - {COMMA} Veículo{P "" s} Rodoviário{P "" s}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Barco{P "" s}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronave{P "" s}
 
 STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Comboios - clique num comboio para informações
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Veículos de estrada - clique num veículo para informações
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Veículos rodoviários - clique num veículo para informações
 STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Barcos - clique num barco para informações
 STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aeronaves - clique numa aeronave para informações
 
@@ -2885,12 +2931,12 @@ STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordens p
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Todos os Comboios
-STR_GROUP_ALL_ROAD_VEHICLES                                     :Todos os veículos de estrada
+STR_GROUP_ALL_ROAD_VEHICLES                                     :Todos os veículos rodoviários
 STR_GROUP_ALL_SHIPS                                             :Todos os barcos
 STR_GROUP_ALL_AIRCRAFTS                                         :Todas as aeronaves
 
 STR_GROUP_DEFAULT_TRAINS                                        :Comboios sem grupo
-STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Veículos sem grupo
+STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Veículos rodoviários sem grupo
 STR_GROUP_DEFAULT_SHIPS                                         :Barcos sem grupo
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aeronaves sem grupo
 
@@ -2912,7 +2958,7 @@ STR_BUY_VEHICLE_TRAIN_MONORAIL_CAPTION                          :Novos Veículos
 STR_BUY_VEHICLE_TRAIN_MAGLEV_CAPTION                            :Novos Veículos Maglev
 
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :Novos Veículos Sobre Carris
-STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION                            :Novos Veículos de Estrada
+STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION                            :Novos Veículos Rodoviários
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :Novos Barcos
 STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :Nova Aeronave
 
@@ -2931,14 +2977,14 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {G
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Custo: {GOLD}{CURRENCY_LONG}{BLACK} Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões Motorizados: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Reconvertível em: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Reconvertível para: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Todos os tipos de carga
 STR_PURCHASE_INFO_ALL_BUT                                       :Todas menos {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Máx. Força de Tracção: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Alcance: {GOLD}{COMMA} quadrados
 
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Lista de veículos ferroviários - clique num veículo para informações
-STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Lista de veículos de estrada - clique num veículo para informações
+STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Lista de veículos rodoviários - clique num veículo para informações
 STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Lista de barcos - clique num barco para informações
 STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Lista de aeronaves - clique na aeronave para informações
 
@@ -2948,7 +2994,7 @@ STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Comprar
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Comprar Aeronave
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Comprar o veículo ferroviário seleccionado. Shift+Clique mostra estimativa de custo, sem comprar
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Comprar o veículo de estrada seleccionado. Shift+Clique mostra estimativa de custo, sem comprar
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Comprar o veículo rodoviário seleccionado. Shift+Clique mostra estimativa de custo, sem comprar
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Comprar barco seleccionado. Shift+Clique mostra estimativa de custo, sem comprar
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Comprar aeronave seleccionada. Shift+Clique mostra estimativa de custo, sem comprar
 
@@ -2958,12 +3004,12 @@ STR_BUY_VEHICLE_SHIP_RENAME_BUTTON                              :{BLACK}Renomear
 STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON                          :{BLACK}Renomear
 
 STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP                            :{BLACK}Renomear tipo de veículo ferroviário
-STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Renomear tipo de veículo de estrada
+STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Renomear tipo de veículo rodoviário
 STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP                             :{BLACK}Renomear tipo de barco
 STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}Renomear tipo de aeronave
 
 STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Renomear tipo de veículo ferroviário
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo de veículo de estrada
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Renomear tipo de veículo rodoviário
 STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Renomear tipo de barco
 STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Renomear tipo de aeronave
 
@@ -2984,7 +3030,7 @@ STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Barcos -
 STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aeronave - faça clique direito na aeronave para informações
 
 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Arraste o veículo ferroviário para aqui para o vender
-STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arraste o veículo de estrada para aqui para o vender
+STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arraste o veículo rodoviário para aqui para o vender
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arraste o barco para aqui para o vender
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arraste a aeronave para aqui para a vender
 
@@ -2996,7 +3042,7 @@ STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vender t
 STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vender todas as aeronaves no hangar
 
 STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autosubstituir todos os comboios no depósito
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autosubstituir todos os veículos de estrada no depósito
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autosubstituir todos os veículos rodoviários no depósito
 STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autosubstituir todos os barcos no depósito
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autosubstituir todas as aeronaves no hangar
 
@@ -3006,7 +3052,7 @@ STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Novos Ba
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Nova Aeronave
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Comprar novo veículo ferroviário
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Comprar novo veículo de estrada
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Comprar novo veículo rodoviário
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Comprar novo barco
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Comprar nova aeronave
 
@@ -3016,12 +3062,12 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clonar B
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clonar Aeronave
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Esta acção comprará uma cópia de um comboio, incluindo as carruagens. Clique neste botão e, de seguida, num comboio que se encontre dentro ou fora do depósito. Ctrl+Clique irá partilhar as ordens. Shift+Clique mostra estimativa de custo, sem comprar
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Esta acção comprará uma cópia de um veículo. Clique neste botão e, de seguida, num veículo que se encontre dentro ou fora do depósito. Ctrl+Clique irá partilhar as ordens. Shift+Clique mostra estimativa de custo, sem comprar
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Esta acção comprará uma cópia de um veículo rodoviário. Clique neste botão e, de seguida, num veículo que se encontre dentro ou fora de um depósito. Ctrl+Clique irá partilhar as ordens. Shift+Clique mostra estimativa de custo, sem comprar
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Esta acção comprará uma cópia de um barco. Clique neste botão e, de seguida, num barco que se encontre dentro ou fora do depósito. Ctrl+Clique irá partilhar as ordens. Shift+Clique mostra estimativa de custo, sem comprar
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Esta acção comprará uma cópia de uma aeronave. Clique neste botão e, de seguida, numa aeronave que se encontre dentro ou fora do hangar. Ctrl+Clique ira partilhar as ordens. Shift+Clique mostra estimativa de custo, sem comprar
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar visualização na localização de um depósito ferroviário. Ctrl+Clique abre um novo visualizador na localização do depósito ferroviário
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do depósito de veículos de estrada. Ctrl+Clique abre um novo visualizador na localização do depósito de veículos
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar visualização na localização do depósito de veículos rodoviários. Ctrl+Clique abre um novo visualizador na localização do depósito de veículos
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar visualização na localização do depósito naval. Ctrl+Clique abre um novo visualizador na localização do depósito naval
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar visualização na localização do hangar. Ctrl+Clique abre um novo visualizador na localização do hangar
 
@@ -3036,7 +3082,7 @@ STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Pression
 STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Pressione botão esquerdo do rato para imobilizar todas as aeronaves no hangar
 
 STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Pressione botão esquerdo do rato para iniciar todos os comboios no depósito
-STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos de estrada no depósito
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos rodoviários no depósito
 STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Pressione botão esquerdo do rato para iniciar todos os barcos no depósito
 STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Pressione botão esquerdo do rato para iniciar todas as aeronaves no hangar
 
@@ -3046,7 +3092,7 @@ STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Está p
 STR_ENGINE_PREVIEW_CAPTION                                      :{WHITE}Mensagem de um fabricante de veículos
 STR_ENGINE_PREVIEW_MESSAGE                                      :{GOLD}Projectámos um novo modelo de {STRING} - gostaria de ter um ano de exclusividade de uso deste veículo, de modo a que possamos avaliar o seu desempenho antes de o disponibilizar globalmente?
 STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE                          :locomotiva ferroviária
-STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :veículo de estrada
+STR_ENGINE_PREVIEW_ROAD_VEHICLE                                 :veículo rodoviário
 STR_ENGINE_PREVIEW_AIRCRAFT                                     :aeronave
 STR_ENGINE_PREVIEW_SHIP                                         :barco
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotiva monocarril
@@ -3062,7 +3108,7 @@ STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Preço:
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
 STR_REPLACE_VEHICLE_TRAIN                                       :Comboio
-STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Veículo de estrada
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Veículo rodoviário
 STR_REPLACE_VEHICLE_SHIP                                        :Barco
 STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeronave
 
@@ -3125,7 +3171,7 @@ STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Mostrar
 STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Mostrar ordens da aeronave. Ctrl+Clique para mostrar o horário da aeronave
 
 STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Mostrar detalhes do comboio
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo de estrada
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Mostrar detalhes do veículo rodoviário
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Mostrar detalhes do barco
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Mostrar detalhes da aeronave
 
@@ -3162,7 +3208,7 @@ STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
 
 STR_VEHICLE_DETAILS_TRAIN_RENAME                                :{BLACK}Renomear comboio
-STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear veículo de estrada
+STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Renomear veículo rodoviário
 STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Renomear barco
 STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Renomear aeronave
 
@@ -3193,7 +3239,7 @@ STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Aumentar
 STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Diminuir intervalo de serviço por 10. Ctrl+Clique diminui o intervalo de serviço por 5
 
 STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Renomear comboio
-STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear veículo de estrada
+STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Renomear veículo rodoviário
 STR_QUERY_RENAME_SHIP_CAPTION                                   :{WHITE}Renomear barco
 STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Renomear aeronave
 
@@ -3294,7 +3340,7 @@ STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Dados de
 # Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Percentagem de carga
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Fiabilidade
-STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Velocidade máximo
+STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Velocidade máxima
 STR_ORDER_CONDITIONAL_AGE                                       :Idade (anos)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Requer manutenção
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Sempre
@@ -3341,7 +3387,7 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Serviço sem pa
 STR_ORDER_NEAREST_DEPOT                                         :o mais próximo
 STR_ORDER_NEAREST_HANGAR                                        :o hangar mais próximo
 STR_ORDER_TRAIN_DEPOT                                           :Depósito ferroviário
-STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de veículos de estrada
+STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de veículos rodoviários
 STR_ORDER_SHIP_DEPOT                                            :Depósito naval
 STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
@@ -3564,7 +3610,7 @@ STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}O jogo f
 STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Geração de mapa abortada...{}... não há locais apropriados para cidades
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... não existe nenhuma cidade neste cenário
 
-STR_ERROR_PNGMAP                                                :{WHITE}Impossível carregar paisagem de PNG...
+STR_ERROR_PNGMAP                                                :{WHITE}Impossível carregar paisagem do PNG...
 STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... ficheiro não encontrado
 STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... não pode converter tipo de imagem. Necessário PNG de 8 ou 24 bits.
 STR_ERROR_PNGMAP_MISC                                           :{WHITE}... alguma coisa correu mal (provavelmente um ficheiro corrompido)
@@ -3582,15 +3628,15 @@ STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Só foi
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Captura de ecrã gravada para o disco como '{STRING}' com sucesso
-STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Captura de ecrã falhada!
+STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}A captura de ecrã falhou!
 
 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Mensagem
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Mensagem de {STRING}
 
 # Generic construction errors
-STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}Fora da borda do mapa
-STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP                              :{WHITE}Muito perto da borda do mapa
+STR_ERROR_OFF_EDGE_OF_MAP                                       :{WHITE}Fora dos limites do mapa
+STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP                              :{WHITE}Muito perto dos limites do mapa
 STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY                     :{WHITE}Dinheiro insuficiente - necessário {CURRENCY_LONG}
 STR_ERROR_FLAT_LAND_REQUIRED                                    :{WHITE}É necessário terreno plano
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Terreno inclinado na direcção incorrecta
@@ -3608,7 +3654,7 @@ STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{1:STRIN
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Não permitido durante pausa
 
 # Local authority errors
-STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}A autoridade local de {TOWN} não autoriza
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}A autoridade local de {TOWN} não autorizou
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} a autoridade local recusa permitir que outro aeroporto seja construído nesta cidade
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} a autoridade local não permite a construção do aeroporto devido à poluição sonora
 STR_ERROR_BRIBE_FAILED                                          :{WHITE}A sua tentativa de suborno foi descoberta por um investigador regional
@@ -3618,8 +3664,8 @@ STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Não é
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Não é possível baixar terreno aqui...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Não é possível nivelar o terreno aqui...
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}A escavação estragaria o túnel
-STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Já está ao nível do mar
-STR_ERROR_TOO_HIGH                                              :{WHITE}Demasiado alto
+STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... já está ao nível do mar
+STR_ERROR_TOO_HIGH                                              :{WHITE}... demasiado alto
 STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... já plano
 
 # Company related errors
@@ -3634,8 +3680,8 @@ STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Não é
 STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Não é possível ceder capital proveniente de empréstimo bancário...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Não é possível comprar empresa...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Não é possível construir sede da empresa...
-STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Não é possível comprar 25% de acções nesta empresa...
-STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Não é possível vender 25% de acções nesta empresa...
+STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Não é possível comprar 25% das acções nesta empresa...
+STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Não é possível vender 25% das acções nesta empresa...
 STR_ERROR_PROTECTED                                             :{WHITE}Esta empresa ainda não troca acções...
 
 # Town related errors
@@ -3643,7 +3689,7 @@ STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Não é
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Não é possível renomear cidade...
 STR_ERROR_CAN_T_FOUND_TOWN_HERE                                 :{WHITE}Não é possível construir uma cidade aqui...
 STR_ERROR_CAN_T_EXPAND_TOWN                                     :{WHITE}Não é possível expandir cidade...
-STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... muito perto da borda do mapa
+STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... muito perto do limite do mapa
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... muito perto de outra cidade
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... demasiadas cidades
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... não existe mais espaço no mapa
@@ -3727,14 +3773,14 @@ STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bói
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Não é possível construir depósito aqui...
-STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Não é possível construir depósito de veículos de estrada aqui...
+STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Não é possível construir depósito de veículos rodoviários aqui...
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Não é possível construir depósito para eléctricos neste local...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Não é possível construir depósito naval aqui...
 
 STR_ERROR_CAN_T_RENAME_DEPOT                                    :{WHITE}Não é possível alterar o nome do depósito...
 
 STR_ERROR_TRAIN_MUST_BE_STOPPED_INSIDE_DEPOT                    :{WHITE}... tem que estar parado dentro do depósito
-STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... deve estar parado num depósito de veículos de estrada
+STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... deve estar parado num depósito de veículos rodoviários
 STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT                     :{WHITE}... tem que estar parado no depósito
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED_INSIDE_HANGAR                :{WHITE}... tem que estar parado no hangar
 
@@ -3775,7 +3821,7 @@ STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Não é
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Deverá remover a estrada primeiro
-STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}... estradas de um sentido não podem ter junções
+STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}... estradas de sentido único não podem ter junções
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}Não é possível construir estrada aqui...
 STR_ERROR_CAN_T_BUILD_TRAMWAY_HERE                              :{WHITE}Não é possível construir carris para eléctricos neste local...
 STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Não é possível remover estrada daqui...
@@ -3838,7 +3884,7 @@ STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Impossí
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Comboio no caminho
-STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Veículo de estrada no caminho
+STR_ERROR_ROAD_VEHICLE_IN_THE_WAY                               :{WHITE}Veículo rodoviário no caminho
 STR_ERROR_SHIP_IN_THE_WAY                                       :{WHITE}Barco no caminho
 STR_ERROR_AIRCRAFT_IN_THE_WAY                                   :{WHITE}Aeronave no caminho
 
@@ -3848,12 +3894,12 @@ STR_ERROR_CAN_T_REFIT_SHIP                                      :{WHITE}Não é
 STR_ERROR_CAN_T_REFIT_AIRCRAFT                                  :{WHITE}Não é possível converter aeronave...
 
 STR_ERROR_CAN_T_RENAME_TRAIN                                    :{WHITE}Não é possível renomear comboio...
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Não é possível renomear veículo de estrada...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE                             :{WHITE}Não é possível renomear veículo rodoviário...
 STR_ERROR_CAN_T_RENAME_SHIP                                     :{WHITE}Não é possível renomear barco...
 STR_ERROR_CAN_T_RENAME_AIRCRAFT                                 :{WHITE}Não é possível renomear aeronave...
 
 STR_ERROR_CAN_T_STOP_START_TRAIN                                :{WHITE}Não é possível iniciar/parar comboio...
-STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Não é possível iniciar/parar veículo de estrada...
+STR_ERROR_CAN_T_STOP_START_ROAD_VEHICLE                         :{WHITE}Não é possível iniciar/parar veículo rodoviário...
 STR_ERROR_CAN_T_STOP_START_SHIP                                 :{WHITE}Não é possível iniciar/parar barco...
 STR_ERROR_CAN_T_STOP_START_AIRCRAFT                             :{WHITE}Não é possível iniciar/parar aeronave...
 
@@ -3863,17 +3909,17 @@ STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT                              :{WHITE}Não é
 STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR                         :{WHITE}Não é possível mandar aeronave para o hangar...
 
 STR_ERROR_CAN_T_BUY_TRAIN                                       :{WHITE}Não é possível comprar veículo ferroviário...
-STR_ERROR_CAN_T_BUY_ROAD_VEHICLE                                :{WHITE}Não é possível comprar veículo de estrada...
+STR_ERROR_CAN_T_BUY_ROAD_VEHICLE                                :{WHITE}Não é possível comprar veículo rodoviário...
 STR_ERROR_CAN_T_BUY_SHIP                                        :{WHITE}Não é possível comprar barco...
 STR_ERROR_CAN_T_BUY_AIRCRAFT                                    :{WHITE}Não é possível comprar aeronave...
 
 STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}Não é possível renomear tipo de veículo ferroviário...
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Não é possível renomear tipo de veículo de estrada...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}Não é possível renomear tipo de veículo rodoviário...
 STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}Não é possível renomear tipo de barco...
 STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}Não é possível renomear tipo de aeronave...
 
 STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}Não é possível vender veículo ferroviário...
-STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Não é possível vender veículo de estrada...
+STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Não é possível vender veículo rodoviário...
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Não é possível vender barco...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Não é possível vender aeronave...
 
@@ -3947,7 +3993,7 @@ STR_TOWN_BUILDING_NAME_MODERN_OFFICE_BUILDING_1                 :Edifício de es
 STR_TOWN_BUILDING_NAME_WAREHOUSE_1                              :Armazém
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_3                           :Edifício de escritórios
 STR_TOWN_BUILDING_NAME_STADIUM_1                                :Estádio
-STR_TOWN_BUILDING_NAME_OLD_HOUSES_1                             :Casas velhas
+STR_TOWN_BUILDING_NAME_OLD_HOUSES_1                             :Casas antigas
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Casas de campo
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Casas
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Apartamentos
@@ -4011,7 +4057,7 @@ STR_INDUSTRY_NAME_SUGAR_MINE                                    :{G=f}Mina de A
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sem nome
 STR_SV_TRAIN_NAME                                               :Comboio {COMMA}
-STR_SV_ROAD_VEHICLE_NAME                                        :Veículo de Estrada {COMMA}
+STR_SV_ROAD_VEHICLE_NAME                                        :Veículo Rodoviário {COMMA}
 STR_SV_SHIP_NAME                                                :Barco {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Aeronave {COMMA}
 
@@ -4321,8 +4367,8 @@ STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Ponto de contro
 
 STR_FORMAT_DEPOT_NAME_TRAIN                                     :Depósito de Comboios de {TOWN}
 STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :Depósito de Comboios de {TOWN} #{COMMA}
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :Depósito de Veículos de Estrada de {TOWN}
-STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :Depósito de Veículos de Estrada de {TOWN} #{COMMA}
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE                              :Depósito de Veículos Rodoviários de {TOWN}
+STR_FORMAT_DEPOT_NAME_ROAD_VEHICLE_SERIAL                       :Depósito de Veículos Rodoviários de {TOWN} #{COMMA}
 STR_FORMAT_DEPOT_NAME_SHIP                                      :Depósito naval de {TOWN}
 STR_FORMAT_DEPOT_NAME_SHIP_SERIAL                               :Depósito naval de {TOWN} #{COMMA}
 STR_FORMAT_DEPOT_NAME_AIRCRAFT                                  :Hangar de {STATION}

src/lang/romanian.txt

@@ -1799,6 +1799,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Accesul
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Ai fost dat afară din joc
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheat-urile nu sunt permise pe acest server
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Trimiteai prea multe comenzi către server
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}A expirat timpul pentru introducerea unei parole
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}A expirat timpul pentru conectarea calculatorului dvs.
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}A expirat timpul pentru descărcarea hărţii
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}A expirat timpul pentru conectarea la server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :eroare generală
@@ -1817,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :dat afară de p
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :a încercat să folosească un cheat
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server plin
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :trimitea prea multe comenzi
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :a expirat timpul alocat pentru transmiterea parolei
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :a expirat timpul alocat
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :a expirat timpul alocat descărcării hărţii
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :a expirat timpul alocat procesării hărţii
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Posibilă pierdere a conexiunii
@@ -2441,11 +2449,11 @@ STR_NEWGRF_SETTINGS_ADD_FILE_TOOLTIP                            :{BLACK}Adaugă
 STR_NEWGRF_SETTINGS_RESCAN_FILES                                :{BLACK}Redetectează fişierele
 STR_NEWGRF_SETTINGS_RESCAN_FILES_TOOLTIP                        :{BLACK}Actualizează lista de fişiere NewGRF disponibile
 STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Elimină
-STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Elimină fişierul NewGRF ales din listă
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Elimină fişierul NewGRF selectat din listă
 STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Mută în sus
-STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Mută fişierul NewGRF ales mai sus în listă
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Mută fişierul NewGRF selectat mai sus în listă
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mută în jos
-STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mută fişierul NewGRF ales mai jos în listă
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mută fişierul NewGRF selectat mai jos în listă
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}O listă a fişierelor NewGRF instalate.
 
 # Additional textfiles accompanying NewGRFs
@@ -2531,17 +2539,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} treb
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} necesită OpenTTD versiunea {STRING} sau mai nouă
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :fişierul GRF conceput pentru traducere
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Sunt încărcate prea multe NewGRF-uri
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Încărcarea {2:STRING} ca un NewGRF static cu {4:STRING} ar putea cauza desincronizări
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Imagine neaşteptată/eronată
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Proprietate Action 0 necunoscută
-STR_NEWGRF_ERROR_INVALID_ID                                     :Încercare de folosire a unui ID invalid
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Încărcarea {1:STRING} ca un NewGRF static cu {STRING} ar putea cauza desincronizări
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Element grafic neașteptat (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Proprietate necunoscută pentru Acțiunea 0 {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Încercare de a folosi un ID invalid (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} conţine o imagine coruptă. Toate imaginile corupte vor fi afişate ca semne de întrebare (?) roşii
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Conţine multiple înregistrări Action 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Citire dincolo de sfârşitul pseudo-imaginii
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Conține mai multe intrări pentru Acțiunea 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Citire după sfîrșitul preudo-elementului grafic (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Unele imagini lipsesc din setul grafic de bază.{}Vă rugăm actualizaţi setul grafic de bază
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Resursele GRF solicitate nu sunt disponibile
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} a fost dezactivat de {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formatul de poziţionare al imaginii este invalid/necunoscut
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Resursele GRF solicitate nu sunt disponibile (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} a fost dezactivat de {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Structură necunoscută/invalidă pentru elementul grafic (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Atenţie!
@@ -2670,7 +2678,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Ţintele
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Click pe ţintă pentru a centra ecranul principal pe industrie/oraş/zonă. Ctrl+Click deschide o fereastră nouă de vizualizare a industriei/oraşului/zonei
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Întrebare
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Întrebare
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informație
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Atenționare
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Eroare
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Anulează
@@ -2806,7 +2817,7 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA}
 STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} pătrățele cu drumuri
 STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} pătrățele de apă
 STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} pătrățele stații
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeropor{P "" uri}
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroport{P "" uri}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nici una
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Constr. sediu

src/lang/russian.txt

@@ -771,7 +771,7 @@ STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLA
 STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}Программа - «{STRING}»
 STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Очистить
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Очистка пользовательской программы
-STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Кликните по названию трека для добавления в пользовательскую программу
+STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Щёлкните по названию трека для добавления в пользовательскую программу
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Выберите дорожку для удаления из пользовательского списка
 
 # Highscore window
@@ -1639,7 +1639,7 @@ STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Наст
 STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Настройка цветовой схемы авиатранспорта
 STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Настройка основного цвета
 STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Настройка дополнительного цвета
-STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Выберите цветовую схему для изменения, либо несколько схем с Ctrl. Кликните на чекбокс для использования выбранной схемы.
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Выберите цветовую схему для изменения, либо несколько схем с Ctrl. Щёлкните по флажку для использования выбранной схемы.
 
 STR_LIVERY_DEFAULT                                              :Стандарт. раскраска
 STR_LIVERY_STEAM                                                :Паровоз
@@ -1955,6 +1955,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Вас
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Вас выкинули из игры
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Чит-коды не разрешены на этом сервере
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Вы посылали на сервер слишком много команд
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Вы не успели ввести пароль
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Ваш компьютер не успел подключиться
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Вы не успели загрузить карту
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Вы не успели подключиться к серверу
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :общая ошибка
@@ -1973,6 +1977,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :вас выки
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :попытался применить чит
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :сервер переполнен
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :посылал слишком много команд
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :пароль не получен вовремя
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :время вышло
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :загрузка карты заняла слишком много времени
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :обработка карты заняла слишком много времени
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Подключение утеряно
@@ -2196,7 +2204,7 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Увел
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Выберите железнодорожный мост
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Выберите тип моста
-STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Выбор моста - кликните на изображении моста, который вы хотите построить
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Выбор моста - щёлкните по изображению моста, который вы хотите построить
 STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING}{}{VELOCITY}; {WHITE}{CURRENCY_LONG}
 STR_SELECT_BRIDGE_SCENEDIT_INFO                                 :{GOLD}{STRING},{} {VELOCITY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Висячий стальной
@@ -2315,7 +2323,7 @@ STR_OBJECT_CLASS_TRNS                                           :Передат
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Деревья
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Выбор типа деревьев для посадки
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Выберите тип деревьев для посадки. Если на участке уже есть деревья, будут добавлены несколько деревьев различного типа, независимо от выбранного.
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Деревья случайного типа
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Высадка деревьев случайного типа. При нажатом Shift - оценка стоимости высадки.
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Расставить по карте
@@ -2518,7 +2526,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Сохр
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Загрузить сценарий
 STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Загрузить карту
 STR_SAVELOAD_SAVE_HEIGHTMAP                                     :{WHITE}Сохранить карту высот
-STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Кликните, чтобы перейти к текущей папке загрузки/сохранения по умолчанию
+STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Щёлкните, чтобы перейти к текущей папке загрузки/сохранения по умолчанию
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} свободно
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Список дисков, папок и сохранённых игр
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Выбранное название для сохранения игры
@@ -2621,7 +2629,7 @@ STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Назв
 STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Удалить набор
 STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Удалить выбранный набор
 STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Добавить
-STR_NEWGRF_SETTINGS_ADD_FILE_TOOLTIP                            :{BLACK}Добавить выбранный файл NewGRF в вашу конфигурацию
+STR_NEWGRF_SETTINGS_ADD_FILE_TOOLTIP                            :{BLACK}Добавить выбранный файл NewGRF в ваш список
 STR_NEWGRF_SETTINGS_RESCAN_FILES                                :{BLACK}Обновить
 STR_NEWGRF_SETTINGS_RESCAN_FILES_TOOLTIP                        :{BLACK}Обновить список доступных файлов NewGRF
 STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Удалить
@@ -2630,7 +2638,7 @@ STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Ввер
 STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Переместить выбранный файл NewGRF выше по списку
 STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Вниз
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Переместить выбранный файл NewGRF ниже по списку
-STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Список установленных файлов NewGRF
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Список используемых файлов NewGRF
 
 # Additional textfiles accompanying NewGRFs
 STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Посмотреть инструкцию
@@ -2643,14 +2651,14 @@ STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Пере
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Переключить палитру для выбраного NewGRF файла.{}Используйте переключение, если графика отрисовывается розовым цветом.
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Применить изменения
 
-STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Найти недостающий контент в сети
-STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Отметьте, чтобы найти недостающий контент в сети
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Найти отсутствующие файлы в сети
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Попытаться найти отсутствующие файлы в сети
 
 STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Имя файла: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Версия: {SILVER}{NUM}
-STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Треб. версия игры не ниже {SILVER}{NUM}
-STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}Сумма MD5: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Совместимо с версией не ниже: {SILVER}{NUM}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Палитра: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Параметры: {SILVER}{STRING}
 
@@ -2715,17 +2723,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} до
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} требует OpenTTD версии {STRING} или выше.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :файл GRF, который им переводится.
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Загружено слишком много модулей NewGRF
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Загрузка {2:STRING} в качестве статического NewGRF с {4:STRING} может вызвать рассинхронизацию.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Неожиданный спрайт.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Неизвестное свойство для Action 0.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Попытка использования неправильного ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Загрузка {1:STRING} в качестве статического NewGRF с {STRING} может вызвать рассинхронизацию.
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Неверный спрайт (спрайт {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Неизвестное свойство у «Action 0» {4:HEX} (спрайт {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Попытка использования недопустимого идентификатора (спрайт {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} содержит повреждённый спрайт. Все повреждённые спрайты будут показаны красным знаком вопроса (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Содержит несколько Action 8 действий.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Данные внезапно закончились.
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Содержит несколько блоков «Action 8» (спрайт {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Чтение за концом псевдо-спрайта (спрайт {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}В текущем наборе базовой графики отсутствуют изображения некоторых объектов.{}Пожалуйста, обновите модуль базовой графики.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Запрошенные ресурсы GRF недоступны
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} был отключён из-за {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Неверный/неизвестный формат расположения спрайтов
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Запрошенные ресурсы GRF недоступны (спрайт {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} был отключён из-за {2:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Недопустимый/неизвестный формат расположения спрайтов (спрайт {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Осторожно!
@@ -2823,7 +2831,7 @@ STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}Адми
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Рейтинг транспортных компаний
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Доступные действия:
-STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}То, что можно сделать в этом городе - кликните для получения доп. сведений
+STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Список возможных действий в этом городе - щёлкните для получения доп. сведений
 STR_LOCAL_AUTHORITY_DO_IT_BUTTON                                :{BLACK}Применить
 STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Выполнить выделенное действие в списке выше
 
@@ -2854,7 +2862,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Зада
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Щёлкните по задаче, чтобы показать предприятие/город/клетку. Ctrl+щелчок показывает в новом окне.
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Вопрос
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Вопрос
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Информация
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Предупреждение
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Ошибка
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Отменить
@@ -3073,10 +3084,10 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} корабл{P ь я ей}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} единиц{P а ы ""} авиатранспорта
 
-STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Поезда - нажмите для получения справки
-STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Автомобили - кликните для получения справки
-STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Корабли - нажмите для получения справки
-STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Авиатранспорт - нажмите для получения справки
+STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP                             :{BLACK}Поезда - щёлкните для получения информации
+STR_VEHICLE_LIST_ROAD_VEHICLE_TOOLTIP                           :{BLACK}Автомобили - щёлкните для получения информации
+STR_VEHICLE_LIST_SHIP_TOOLTIP                                   :{BLACK}Корабли - щёлкните для получения информации
+STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Авиатранспорт - щёлкните для получения информации
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINY_FONT}{BLACK}Прибыль в этом году: {CURRENCY_LONG} (в прошлом году: {CURRENCY_LONG})
 
@@ -3155,10 +3166,10 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Всё, кро
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Макс. тяговое усилие: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Дальность: {GOLD}{COMMA} клет{P ка ки ок}
 
-STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Выбор вагонов - кликните для справки
-STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Список автотранспорта - кликните для получения информации
-STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Список кораблей - нажмите для получения справки
-STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Авиатранспорт - нажмите для получения справки
+STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Список локомотивов и вагонов - щёлкните для получения информации
+STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Список автотранспорта - щёлкните для получения информации
+STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Список кораблей - щёлкните для получения информации
+STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Список воздушных судов - щёлкните для получения информации
 
 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Купить
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Купить автомобиль
@@ -3357,10 +3368,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Пока
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Показать информацию о корабле
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Показать сведения об авиатранспорте.
 
-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Текущее действие поезда; кликните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Текущее действие автомобиля; кликните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Текущее действие корабля; кликните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Текущее действие воздушного судна; кликните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Текущее действие поезда; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Текущее действие автомобиля; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Текущее действие корабля; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Текущее действие воздушного судна; щёлкните для его остановки/запуска. Ctrl+щелчок - обзор пункта назначения.
 
 # Messages in the start stop button in the vehicle view
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Разгрузка/Погрузка

src/lang/serbian.txt

@@ -1994,6 +1994,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Vi ste z
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Vi ste izbačeni iz ove partije
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Varanja nisu dozvoljena na ovom serveru
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Slali ste previše naredbi na server
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Previše dugo se nije unala lozinka
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Računaru je previše dugo trebalo da se priključi
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Previše dugo je trajalo preuzimanje terena
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Previše dugo je trajalo priključivanje serveru
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :opšta greška
@@ -2012,6 +2016,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :izbačen od str
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :pokušaj korišćenja varanja
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server je pun
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :je slao previše naredbi
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :lozinka nije primljena na vreme
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :istekao veremnski rok
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :preuzimanje terena je previše dugo trajalo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :obrađivanje terena je previše dugo trajalo
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Moguć gubitak veze
@@ -2726,17 +2734,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} mora
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} zahteva {STRING} ili višu verziju OpenTTD-a
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF datoteka nije prilagođena za prevod
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Previše učitanih NewGRF-ova
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Učitavanje {2:STRING} kao statične NewGRF sa {4:STRING} može da izazove desinhronizacije
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Nepredviđen sprajt
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nepoznato svojstvo Action 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Pokušano korišćenje nepostojećeg ID-ja
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Učitavanje {1:STRING} kao statične NewGRF sa {STRING} može da izazove desinhronizacije
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neočekivani sprajt (sprajt {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Nepoznato svojstvo Akcije 0 {4:HEX} (sprajt {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Pokušaj korišćenja neispravnog ID-ja (sprajt {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sadrži neispravan sprajt. Svi neispravni sprajtovi će biti prikazani kao crveni znakovi pitanja (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sadrži višestruke Action 8 unose
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čitanje posle završetka pseudo-sprajta
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sadrži više Akcija 8 ulaza (sprajt {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čitanje iza završetka pseudo-sprajta (sprajt {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Odabranom skupu osnovnih grafika nedostaje neki broj sprajtova.{}Molimo Vas da ga ažurirate
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Zatraženi GRF resusrsi nisu dostupni
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} je isključen od strane {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neispravan/nepoznat format rasporeda sprajta
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Traženi GRF resursi nisu dostupni (sprajt {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} je isključen od strane {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neispravan/nepoznat format prikazivanja sprajta (sprajt {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Oprez!
@@ -2865,7 +2873,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Ciljevi
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klikom na cilj premešta se glavni pogled na fabriku/naselje/pločicu. Ctrl+Kilk otvara novi pogled na lokaciju fabrike/naselja/pločice
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Pitanje
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pitanje
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Obaveštenje
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Upozorenje
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Greška
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Otkaži

src/lang/simplified_chinese.txt

@@ -287,6 +287,7 @@ STR_SORT_BY_INTRO_DATE                                          :设计日期
 STR_SORT_BY_RUNNING_COST                                        :运行费用
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :功率/运行费用 比值
 STR_SORT_BY_CARGO_CAPACITY                                      :运载能力
+STR_SORT_BY_RANGE                                               :航行距离
 
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}暂停游戏
@@ -446,6 +447,7 @@ STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :切换到控制
 STR_ABOUT_MENU_AI_DEBUG                                         :AI 调试
 STR_ABOUT_MENU_SCREENSHOT                                       :屏幕截图
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :高清截图
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :默认缩放模式下的屏幕截图
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :全地图截图
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :关于 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite 对齐
@@ -1178,6 +1180,7 @@ STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}错误
 STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}鼠标停留时显示工具提示的延迟时间: {ORANGE}{STRING}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}显示提示： {ORANGE}右击
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}在城镇名称的标签中同时显示人口：{ORANGE}{STRING}
+STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :{LTBLUE}图表曲线宽度: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}生成地形：{ORANGE}{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :原始算法
@@ -1234,6 +1237,7 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :完整时间 (2
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :英式时间 (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :简短形式 (2008-12-31)
 
+STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE                       :{LTBLUE}当NewGRF没有指定调色板时，使用: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_DOS                   :DOS调色板
 STR_CONFIG_SETTING_NEWGRF_DEFAULT_PALETTE_WIN                   :Windows调色板
 
@@ -1377,8 +1381,10 @@ STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}改变
 STR_CONFIG_ERROR                                                :{WHITE}配置文件错误...
 STR_CONFIG_ERROR_ARRAY                                          :{WHITE}... 函数错误 '{STRING}'
 STR_CONFIG_ERROR_INVALID_VALUE                                  :{WHITE}...对 '{STRING}'设置了错误值'{STRING}'
+STR_CONFIG_ERROR_DUPLICATE_GRFID                                :{WHITE}... 忽略 NewGRF '{STRING}': 重复的 GRF ID '{STRING}'
 STR_CONFIG_ERROR_INVALID_GRF                                    :{WHITE}... 忽略了无效的 NewGRF '{STRING}': {STRING}
 STR_CONFIG_ERROR_INVALID_GRF_NOT_FOUND                          :未找到
+STR_CONFIG_ERROR_INVALID_GRF_UNSAFE                             :静态使用时不安全
 STR_CONFIG_ERROR_INVALID_GRF_SYSTEM                             :系统NewGRF
 STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :与当前版本OpenTTD不兼容
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :未知
@@ -1423,7 +1429,7 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}连接
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}查看AI和脚本设定
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}退出 'OpenTTD'
 
-STR_INTRO_TRANSLATION                                           :{BLACK}中文语言版本缺失了 {NUM} 条翻译。 请注册成为翻译人员，以帮助OpenTTD发展。详见readme.txt。
+STR_INTRO_TRANSLATION                                           :{BLACK}中文语言版本缺失了 {NUM} 条翻译。 请注册成为翻译人员，以帮助OpenTTD发展。{}详见readme.txt。
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}退出
@@ -1791,6 +1797,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}您的IP
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}您已被踢出服务器
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}此服务器不允许作弊
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}您向服务器发送操作指令过于频繁
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}输入密码用时过长
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}游戏连接时间过长
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}下载地图用时过长
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}加入服务器用时过长
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :一般错误
@@ -1809,6 +1819,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :被服务器踢
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :正在尝试作弊
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :服务器满员
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :操作指令过于频繁
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :没有在规定时间内收到密码
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :超时
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :下载地图用时过长
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :处理地图用时过长
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}失去链接
@@ -1889,6 +1903,7 @@ STR_CONTENT_TYPE_HEIGHTMAP                                      :高度图
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :基本音效
 STR_CONTENT_TYPE_BASE_MUSIC                                     :基本音乐
 STR_CONTENT_TYPE_GAME_SCRIPT                                    :游戏脚本
+STR_CONTENT_TYPE_GS_LIBRARY                                     :脚本库
 
 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}下载中...
@@ -1905,6 +1920,9 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... 文
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}无法解压该扩展包
 
 STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}缺失图形组
+STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}OpenTTD 需要基础图形组用以绘制界面。您是否希望 OpenTTD 下载并安装以下图形组？
+STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}是的，下载之
+STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}不，退出
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}透明选项
@@ -1952,6 +1970,10 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}建设
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}切换建设/拆除铁轨、信号灯、路点和车站。按住 Ctrl 键可在移除路点和车站时同时移除铁轨。
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}转换/升级 铁路类型
 
+STR_RAIL_NAME_RAILROAD                                          :铁路
+STR_RAIL_NAME_ELRAIL                                            :电气化铁路
+STR_RAIL_NAME_MONORAIL                                          :单轨铁路
+STR_RAIL_NAME_MAGLEV                                            :磁悬浮铁路
 
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}列车车库方向
@@ -2105,7 +2127,9 @@ STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}购买
 
 # Object construction window
 STR_OBJECT_BUILD_CAPTION                                        :{WHITE}物体选单
+STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}选择建设项目. 按住SHIFT键建设可以显示建设费用
 STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}选择要建造的物件类型
+STR_OBJECT_BUILD_PREVIEW_TOOLTIP                                :{BLACK}物件预览
 STR_OBJECT_BUILD_SIZE                                           :{BLACK}大小: {GOLD}{NUM} x {NUM} 瓦
 
 STR_OBJECT_CLASS_LTHS                                           :灯塔
@@ -2221,6 +2245,14 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :田地
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :雪地
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :沙漠
 
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :{STRING} 轨道
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :有信号灯的{STRING}铁轨
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :{STRING} 预信号灯轨道
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :{STRING} 出口信号灯轨道
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :{STRING} 复合信号灯轨道
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :{STRING} 普通信号灯轨道
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :{STRING} 单向信号灯轨道
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :{STRING} 列车车库
 
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :公路
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :带路灯的公路
@@ -2408,8 +2440,12 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}将选
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}已经安装的 NewGRF 文件列表{}点击可以改变参数
 
 # Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}查看说明
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}更新日志
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}版权信息
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}设置参数
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}显示参数
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}切换调色板
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}切换选定GRF的调色.{}本功能用于游戏使用时GRF呈粉色
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}应用
@@ -2440,6 +2476,9 @@ STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORAN
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}参数数目: {ORANGE}{NUM}
 
 # NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NEWGRF {STRING} 的说明
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF {STRING} 的更新日志
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF {STRING} 的版权信息
 
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}检查 - {STRING}
@@ -2483,17 +2522,14 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} 必
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} 需要OpenTTD V {STRING} 或更高版本
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF 被设计为可平移
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :加载的NewGRF太多
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :使用 {2:STRING} 为静态 NewGRF 与 {4:STRING} 可能造成同步错误
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :未可预料的 sprite 错误。
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :未知的动作属性值： 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :尝试使用无效配置值
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :使用 {1:STRING} 为静态 NewGRF 与 {STRING} 可能造成同步错误
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :异常sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :未知的Action 0 属性 {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :尝试使用非法ID (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} 含有损坏的图形元素{}所有损坏的图形元素{}将显示为红色的问号（？）
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :包含复数的 Action 8 入口。
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :读取最后的伪 Sprite 结尾
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}当前基础图组缺失参数.{}请进行修正
-STR_NEWGRF_ERROR_GRM_FAILED                                     :所必需的GRF资源不可用
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} 被 {4:STRING} 禁用
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :非法的/未知的 sprite 输出格式
+STR_NEWGRF_ERROR_GRM_FAILED                                     :GRF源文件不可访问 (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} 被 {STRING} 禁用
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}注意！
@@ -2566,6 +2602,11 @@ STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}上月
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}城镇发展所必需的货物：
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{RED} 需要： {ORANGE}{STRING}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} 冬季的需求
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}已运输 {GREEN}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}已运输：{CARGO_TINY} /{RED}总需求： {CARGO_LONG}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (已运输)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}城镇每 {ORANGE}{COMMA}{BLACK} 天成长一次
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}城镇每 {ORANGE}{COMMA}{BLACK} 天成长一次(加速中)
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK} 城镇发展正在 {RED}停滞 {BLACK}！
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}当前城镇噪音: {ORANGE}{COMMA}{BLACK}  最大: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}将屏幕中心移动到城镇所在的位置. 单击的同时按住Ctrl会在新视点中显示城镇位置
@@ -2615,6 +2656,28 @@ STR_GOALS_NONE                                                  :{ORANGE}- 无
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}公司目标:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}点击使得视图移动到该工业/城镇/地块. Ctrl+左键 在该处创建一个视点.
 
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :帮助索引
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :取消
+STR_GOAL_QUESTION_BUTTON_OK                                     :确定
+STR_GOAL_QUESTION_BUTTON_NO                                     :取消
+STR_GOAL_QUESTION_BUTTON_YES                                    :确定
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :接受
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :忽略
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :重试
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :上一个
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :下一个
+STR_GOAL_QUESTION_BUTTON_STOP                                   :停止
+STR_GOAL_QUESTION_BUTTON_START                                  :开始
+STR_GOAL_QUESTION_BUTTON_GO                                     :开始
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :继续
+STR_GOAL_QUESTION_BUTTON_RESTART                                :重新开启
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :暂缓
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :放弃
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :关闭
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}财政补贴项目
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}尚未中标的项目：
@@ -2708,6 +2771,7 @@ STR_FINANCES_BORROW_BUTTON                                      :{BLACK}贷款 {
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}贷款{}Ctrl+点击 可贷款最大额度
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}还款 {CURRENCY_LONG}
 STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}偿还贷款{}Ctrl+点击 可最大额度偿还贷款
+STR_FINANCES_INFRASTRUCTURE_BUTTON                              :{BLACK}设施
 
 # Company view
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANY_NUM}
@@ -2723,6 +2787,13 @@ STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}无
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}公司市值：{WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% 由 {COMPANY} 所有)
+STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}设施:
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} 轨道交通
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} 道路
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} 水运
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} 站台
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} 机场
+STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}无
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}设立总部
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}建立公司总部
@@ -2730,6 +2801,8 @@ STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}查看
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}查看公司总部
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}重置总部
 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}以公司市值 1% 的代价重建总部，按住 Shift 键单击可以显示所需资金
+STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}固定资产维护费明细
+STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}显示详细的设施情况
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}新的头像
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}为总裁选择新头像
@@ -2751,6 +2824,19 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :总裁姓名
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}我们正在寻找一家愿意收购我们的公司。{}{}您愿意收购 {COMPANY} ({CURRENCY_LONG}) 吗？
 
 # Company infrastructure window
+STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}{COMPANY} 的设施
+STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}铁路：
+STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}信号灯
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}道路：
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD                            :{WHITE}普通道路
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY                         :{WHITE}电车线路
+STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}水运：
+STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}运河
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}站台：
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}车站
+STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}机场
+STR_COMPANY_INFRASTRUCTURE_VIEW_COST                            :{WHITE}每年{1:CURRENCY_LONG} ({0:COMMA})
+STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}每年{CURRENCY_LONG}
 
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}工业设施
@@ -2869,6 +2955,7 @@ STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}可改
 STR_PURCHASE_INFO_ALL_TYPES                                     :所有类型
 STR_PURCHASE_INFO_ALL_BUT                                       :除了 {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}最大牵引力：{GOLD}{FORCE}
+STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}航行距离: {GOLD}{COMMA} 格
 
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}列车选择列表 - 点击可以查看详细信息
 STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}汽车列表 - 点击可以查看详细信息
@@ -2989,6 +3076,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}售价
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}售价：{CURRENCY_LONG} 重量：{WEIGHT_SHORT}{}速度：{VELOCITY}  功率：{POWER}  最大牵引力：{6:FORCE}{}运行费用{4:CURRENCY_LONG}/年{}运载能力：{5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}售价：{CURRENCY_LONG} 最大速度：{VELOCITY}{}运载能力：{CARGO_LONG}, {CARGO_LONG}{}运行成本：{CURRENCY_LONG} /年
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}售价：{CURRENCY_LONG} 最大速度：{VELOCITY}{}运载能力：{CARGO_LONG}{}运行成本：{CURRENCY_LONG} /年
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}费用: {CURRENCY_LONG} 最大速度: {VELOCITY} 航行距离: {7:COMMA} 格{}运载量: {CARGO_LONG}, {CARGO_LONG}{}运营成本: {CURRENCY_LONG}/年
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}购买费用: {CURRENCY_LONG} 最大速度: {VELOCITY} 航行距离: {7:COMMA} 格{}运载量: {CARGO_LONG}{}运营成本: {CURRENCY_LONG}/年
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}更新 {STRING}
@@ -3103,6 +3192,7 @@ STR_VEHICLE_INFO_AGE                                            :{COMMA} 年 ({C
 STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} 年 ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}最大速度：{LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_MAX_SPEED_RANGE                                :{BLACK}最大速度: {LTBLUE}{VELOCITY} {BLACK}航行距离: {LTBLUE}{COMMA} 格
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}重量：{LTBLUE}{WEIGHT_SHORT} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 最大速度：{LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}重量：{LTBLUE}{WEIGHT_SHORT} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 最大速度：{LTBLUE}{VELOCITY} {BLACK}最大牵引力：{LTBLUE}{FORCE}
 
@@ -3208,6 +3298,8 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}改变
 
 STR_ORDER_REFIT                                                 :{BLACK}改装
 STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}选择要在调度计划中改装的货物类型{}CTRL+单击 可以去掉改装计划
+STR_ORDER_REFIT_AUTO                                            :{BLACK}自动改装
+STR_ORDER_DROP_REFIT_AUTO                                       :固定货物
 STR_ORDER_DROP_REFIT_AUTO_ANY                                   :可用类型
 
 STR_ORDER_SERVICE                                               :{BLACK}保养
@@ -3297,6 +3389,18 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :（不卸载并
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :（不卸货并装满任意货物离开）
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(不卸货也不装货)
 
+STR_ORDER_AUTO_REFIT                                            :(自动改装为运载 {STRING})
+STR_ORDER_FULL_LOAD_REFIT                                       :(装满所有货物，允许自动改装为运载 {STRING})
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :装满任意货物，允许自动改装为运载 {STRING})
+STR_ORDER_UNLOAD_REFIT                                          :(卸货且装载，允许自动改装为运载 {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(卸货且装满所有货物，允许自动改装为运载 {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(卸货且装满任意货物，允许自动改装为运载 {STRING})
+STR_ORDER_TRANSFER_REFIT                                        :(联运且装载，允许自动改装为运载 {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(联运且装满所有货物，允许自动改装为运载 {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(联运且装满任意货物，允许自动改装为运载 {STRING})
+STR_ORDER_NO_UNLOAD_REFIT                                       :(不卸货且装载，允许自动改装为运载 {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(不卸货且装满所有货物，允许自动改装为运载 {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(不卸货且装满任意货物，允许自动改装为运载 {STRING})
 
 STR_ORDER_AUTO_REFIT_ANY                                        :可用类型
 

src/lang/slovak.txt

@@ -51,8 +51,8 @@ STR_CARGO_PLURAL_STEEL                                          :Oceľ
 STR_CARGO_PLURAL_STEEL.g                                        :ocele
 STR_CARGO_PLURAL_VALUABLES                                      :Cennosti
 STR_CARGO_PLURAL_VALUABLES.g                                    :cennosti
-STR_CARGO_PLURAL_COPPER_ORE                                     :Medenná ruda
-STR_CARGO_PLURAL_COPPER_ORE.g                                   :medennej rudy
+STR_CARGO_PLURAL_COPPER_ORE                                     :Medená ruda
+STR_CARGO_PLURAL_COPPER_ORE.g                                   :medenej rudy
 STR_CARGO_PLURAL_MAIZE                                          :Kukuricu
 STR_CARGO_PLURAL_MAIZE.g                                        :kukurice
 STR_CARGO_PLURAL_FRUIT                                          :Ovocie
@@ -81,16 +81,16 @@ STR_CARGO_PLURAL_COLA                                           :Kofolu
 STR_CARGO_PLURAL_COLA.g                                         :kofoly
 STR_CARGO_PLURAL_COTTON_CANDY                                   :Cukrovú vatu
 STR_CARGO_PLURAL_COTTON_CANDY.g                                 :cukrovej vaty
-STR_CARGO_PLURAL_BUBBLES                                        :Bubliniek
+STR_CARGO_PLURAL_BUBBLES                                        :Bublinky
 STR_CARGO_PLURAL_BUBBLES.g                                      :bubliniek
 STR_CARGO_PLURAL_TOFFEE                                         :Karamelky
 STR_CARGO_PLURAL_TOFFEE.g                                       :karameliek
-STR_CARGO_PLURAL_BATTERIES                                      :Batérie
-STR_CARGO_PLURAL_BATTERIES.g                                    :batérií
-STR_CARGO_PLURAL_PLASTIC                                        :Žuvačiek
-STR_CARGO_PLURAL_PLASTIC.g                                      :žuvačiek
-STR_CARGO_PLURAL_FIZZY_DRINKS                                   :Šumienku
-STR_CARGO_PLURAL_FIZZY_DRINKS.g                                 :šumienky
+STR_CARGO_PLURAL_BATTERIES                                      :Baterky
+STR_CARGO_PLURAL_BATTERIES.g                                    :bateriek
+STR_CARGO_PLURAL_PLASTIC                                        :Umelina
+STR_CARGO_PLURAL_PLASTIC.g                                      :umeliny
+STR_CARGO_PLURAL_FIZZY_DRINKS                                   :Malinovky
+STR_CARGO_PLURAL_FIZZY_DRINKS.g                                 :Malinoviek
 
 # Singular cargo name
 STR_CARGO_SINGULAR_NOTHING                                      :
@@ -116,8 +116,8 @@ STR_CARGO_SINGULAR_STEEL                                        :Oceľ
 STR_CARGO_SINGULAR_STEEL.g                                      :ocele
 STR_CARGO_SINGULAR_VALUABLES                                    :Cennosti
 STR_CARGO_SINGULAR_VALUABLES.g                                  :cennosti
-STR_CARGO_SINGULAR_COPPER_ORE                                   :Medenná ruda
-STR_CARGO_SINGULAR_COPPER_ORE.g                                 :medennej rudy
+STR_CARGO_SINGULAR_COPPER_ORE                                   :Medená ruda
+STR_CARGO_SINGULAR_COPPER_ORE.g                                 :medenej rudy
 STR_CARGO_SINGULAR_MAIZE                                        :Kukurica
 STR_CARGO_SINGULAR_MAIZE.g                                      :kukurice
 STR_CARGO_SINGULAR_FRUIT                                        :Ovocie
@@ -146,16 +146,16 @@ STR_CARGO_SINGULAR_COLA                                         :Kofola
 STR_CARGO_SINGULAR_COLA.g                                       :kofoly
 STR_CARGO_SINGULAR_COTTON_CANDY                                 :Cukrová vata
 STR_CARGO_SINGULAR_COTTON_CANDY.g                               :cukrovej vaty
-STR_CARGO_SINGULAR_BUBBLE                                       :Bublina
-STR_CARGO_SINGULAR_BUBBLE.g                                     :bublin
+STR_CARGO_SINGULAR_BUBBLE                                       :Bublinka
+STR_CARGO_SINGULAR_BUBBLE.g                                     :bublinky
 STR_CARGO_SINGULAR_TOFFEE                                       :Karamel
 STR_CARGO_SINGULAR_TOFFEE.g                                     :karamelu
-STR_CARGO_SINGULAR_BATTERY                                      :Batéria
-STR_CARGO_SINGULAR_BATTERY.g                                    :baterii
-STR_CARGO_SINGULAR_PLASTIC                                      :Žuvačka
-STR_CARGO_SINGULAR_PLASTIC.g                                    :zuvaciek
-STR_CARGO_SINGULAR_FIZZY_DRINK                                  :Šumienka
-STR_CARGO_SINGULAR_FIZZY_DRINK.g                                :sumienky
+STR_CARGO_SINGULAR_BATTERY                                      :Baterka
+STR_CARGO_SINGULAR_BATTERY.g                                    :baterky
+STR_CARGO_SINGULAR_PLASTIC                                      :Umelina
+STR_CARGO_SINGULAR_PLASTIC.g                                    :umeliny
+STR_CARGO_SINGULAR_FIZZY_DRINK                                  :Malinovka
+STR_CARGO_SINGULAR_FIZZY_DRINK.g                                :malinovky
 
 # Quantity of cargo
 STR_QUANTITY_NOTHING                                            :
@@ -170,7 +170,7 @@ STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} d
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} železnej rudy
 STR_QUANTITY_STEEL                                              :{WEIGHT_LONG} ocele
 STR_QUANTITY_VALUABLES                                          :{COMMA} vr{P ece ecia iec} cennosti
-STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} medennej rudy
+STR_QUANTITY_COPPER_ORE                                         :{WEIGHT_LONG} medenej rudy
 STR_QUANTITY_MAIZE                                              :{WEIGHT_LONG} kukurice
 STR_QUANTITY_FRUIT                                              :{WEIGHT_LONG} ovocia
 STR_QUANTITY_DIAMONDS                                           :{COMMA} deb{P na ny ien} diamantov
@@ -185,11 +185,11 @@ STR_QUANTITY_TOYS                                               :{COMMA} hrač{P
 STR_QUANTITY_SWEETS                                             :{COMMA} deb{P na ny ien} cukrikov
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} kofoly
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} cukrovej vaty
-STR_QUANTITY_BUBBLES                                            :{COMMA} bublin{P a y ""}
+STR_QUANTITY_BUBBLES                                            :{COMMA} bublin{P ka ky iek}
 STR_QUANTITY_TOFFEE                                             :{WEIGHT_LONG} karamelu
-STR_QUANTITY_BATTERIES                                          :{COMMA} bateri{P a e i}
-STR_QUANTITY_PLASTIC                                            :{VOLUME_LONG} žuvačiek
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} šumien{P ka ky ok}
+STR_QUANTITY_BATTERIES                                          :{COMMA} baterk{P a y iek}
+STR_QUANTITY_PLASTIC                                            :{VOLUME_LONG} umeliny
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} malinov{P ka ky iek}
 STR_QUANTITY_N_A                                                :Nie je
 
 # Two letter abbreviation of cargo name
@@ -223,8 +223,8 @@ STR_ABBREV_CANDYFLOSS                                           :{TINY_FONT}CV
 STR_ABBREV_BUBBLES                                              :{TINY_FONT}BU
 STR_ABBREV_TOFFEE                                               :{TINY_FONT}KR
 STR_ABBREV_BATTERIES                                            :{TINY_FONT}BT
-STR_ABBREV_PLASTIC                                              :{TINY_FONT}ZU
-STR_ABBREV_FIZZY_DRINKS                                         :{TINY_FONT}SU
+STR_ABBREV_PLASTIC                                              :{TINY_FONT}UM
+STR_ABBREV_FIZZY_DRINKS                                         :{TINY_FONT}MA
 STR_ABBREV_NONE                                                 :{TINY_FONT}NIC
 STR_ABBREV_ALL                                                  :{TINY_FONT}VS.
 
@@ -304,7 +304,7 @@ STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolác
 
 # Query window
 STR_BUTTON_DEFAULT                                              :{BLACK}Štandardné
-STR_BUTTON_CANCEL                                               :{BLACK}Zrušit
+STR_BUTTON_CANCEL                                               :{BLACK}Zrušiť
 STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
@@ -510,7 +510,8 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Zobraziť / skryť konzolu
 STR_ABOUT_MENU_AI_DEBUG                                         :Umelá inteligencia / Ladenie skriptov
 STR_ABOUT_MENU_SCREENSHOT                                       :Snímka
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Priblížená snímka
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Plne priblížená snímka
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Snímka s predvoleným priblížením
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Veľká snímka celej mapy
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :O hre 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite zarovnávač
@@ -903,10 +904,10 @@ STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIG_FONT}{BLAC
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIG_FONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nové {STRING} dostupné!  -  {ENGINE}
 
-STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} uz neprijima {STRING}
-STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} uz neprijima {STRING} alebo {STRING}
-STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}{STATION} teraz prijima {STRING}
-STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION} teraz prijima {STRING} a {STRING}
+STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} už neprijíma {STRING}
+STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION} už neprijíma {STRING} alebo {STRING}
+STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}{STATION} teraz prijíma {STRING}
+STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION} teraz prijíma {STRING} a {STRING}
 
 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}Ponuka dotácie skončila:{}{}Preprava {STRING.g} z {STRING} do {STRING} už nebude dotovaná
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Dotácie stiahnuté:{}{}Preprava {STRING.g} z {STRING} do {STRING} už nie je dotovaná
@@ -1422,7 +1423,7 @@ STR_CONFIG_SETTING_STATIONS                                     :{ORANGE}Stanice
 STR_CONFIG_SETTING_ECONOMY                                      :{ORANGE}Ekonomika
 STR_CONFIG_SETTING_AI                                           :{ORANGE}Konkurenti
 STR_CONFIG_SETTING_DISPLAY_OPTIONS                              :{ORANGE}Možnosti zobrazenia
-STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Styk
+STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Chovanie
 STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}Signály
 STR_CONFIG_SETTING_STATIONS_CARGOHANDLING                       :{ORANGE}Manipulácia s tovarom
 STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Počítačový hráči
@@ -1498,7 +1499,7 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skontrol
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Zobraz umelú inteligenciu a nastavenia hry
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Ukončiť OpenTTD
 
-STR_INTRO_TRANSLATION                                           :{BLACK}V preklade chýba {NUM} {P v "" eta,ety,iet}. Prosím pomôžte urobiť OpenTTD lepším a prihláste sa ako prekladateľ. Viac detailov v readme.txt
+STR_INTRO_TRANSLATION                                           :{BLACK}V preklade chýba {NUM} v{P eta ety iet}. Prosím pomôžte urobiť OpenTTD lepším a prihláste sa ako prekladateľ. Viac detailov v readme.txt
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Koniec
@@ -1671,19 +1672,19 @@ STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Počiat
 STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Aktuálny dátum: {WHITE}{DATE_SHORT}
 STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Heslo:
 STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER JE OFFLINE
-STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER JE PLNY
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER JE PLNÝ
 STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}ROZNE VERZIE
 STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF Chyba
 
 STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pripojit sa
-STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Obnovit server
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Obnoviť server
 STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Obnovit info o serveri
 
-STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Najst server
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Nájsť server
 STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Hladať server po sieti
-STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Pridat server
+STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Pridať server
 STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Pridá server do zoznamu, v ktorom sa vždy budú hľadať prebiehajúce hry
-STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Spustit server
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Spustiť server
 STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Spustiť vlastný server
 
 STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Zadajte vaše meno
@@ -1866,6 +1867,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Si zablo
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Bol si vyhodeny z hry
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheatovanie nie je povolene na tomto serveri
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Posielali ste priveľa príkazov serveru
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Príliš dlho si zadával heslo
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Počítač vstupoval príliš dlho
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Mapa sa sťahovala príliš dlho
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Príliš dlho si vstupoval na server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :generalna chyba
@@ -1880,10 +1885,14 @@ STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :chybna revizia
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :meno sa uz pouziva
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :nespravne heslo
 STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :zlá spoločnosť-id in DoCommand
-STR_NETWORK_ERROR_CLIENT_KICKED                                 :vyhodeny zo servera
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :vyhodený zo servera
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :sa pokusal cheatovat
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server je plny
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :posielal priveľa príkazov
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :nebolo včas obdržané heslo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :všeobecný timeout
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :sťahovanie mapy trvalo príliš dlho
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :spracovanie mapy trvalo príliš dlho
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Možná ztráta pripojenia
@@ -2090,7 +2099,7 @@ STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Závesný oceľ
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Pilierový oceľový
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Visutý oceľový
 STR_BRIDGE_NAME_SUSPENSION_CONCRETE                             :Závesný betónový
-STR_BRIDGE_NAME_WOODEN                                          :Dreveny
+STR_BRIDGE_NAME_WOODEN                                          :Drevený
 STR_BRIDGE_NAME_CONCRETE                                        :Betónový
 STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Krytý oceľový
 STR_BRIDGE_TUBULAR_SILICON                                      :Krytý plastový
@@ -2521,6 +2530,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Log zmie
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licencia
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nastavit parametre
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Ukázať parametre
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Prepnúť paletu
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Prepnúť paletu na zvolené NewGRF.{}Vykonajte to ak grafika z tohoto NewGRF je v hre ružová
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potvrdit zmeny
@@ -2587,7 +2597,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Upozornenie: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Chyba: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Kritická chyba: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Nastala závažná chyba pri použití NewGRF: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Nastala závažná chyba NewGRF: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} nebude fungovať s TTDPatch verziou nahlásenou OpenTTD.
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} je pre verziu {STRING} TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} je navrhnutý pre použitie s {STRING}
@@ -2597,17 +2607,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} mus
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} vyžaduje verziu OpenTTD {STRING} alebo vyššiu.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF súbor bol navrhnutý na preklad
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Načítaných priveľa súborov NewGRF.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Načítanie {2:STRING} ako statického NewGRF s {4:STRING} môže spôsobiť chybné zobrazenie.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neočakávaný sprite.
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Neznáma nehnuteľnosť Akcia 0.
-STR_NEWGRF_ERROR_INVALID_ID                                     :Pokus o použitie neplatného ID.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Načítanie {1:STRING} ako statického NewGRF s {STRING} môže spôsobiť chybné zobrazenie.
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neočakávaný sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Neznáma vlastnosť Action 0 {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Pokus o použitie neplatného ID (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} obsahuje poškodený sprite. Všetky poškodené sprajty budú zobrazené ako červený otáznik (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Obsahuje viac položiek Action 8.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čítam do konca pseudo-spriteov
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Obsahuje viacnásobné záznamy Action 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čítanie za koncom pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}V používanej základnej grafickej sade chýbajú niektoré grafické objekty.{}Aktualizujte prosím základnú grafickú sadu.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Požadované zdroje GRF nie sú k dispozícií
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} bol vypnutý {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neplatný/neznámy formát usporiadania Sprite-u
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Požadované GRF prostriedky nie sú dosupné (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} bol vypnutý {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Nesprávny/neznámy formát rozloženia sprite(ov) (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Upozornenie!
@@ -2661,7 +2671,7 @@ STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Zmazať
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Upravit text popisu
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Prejst na dalsiu znacku
-STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Prejst na predchádzajúcu znacku
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Prejsť na predchádzajúcu značku
 
 STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Zadajte názov pre popis
 
@@ -2735,6 +2745,32 @@ STR_GOALS_NONE                                                  :{ORANGE}- Nič
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Ciele spoločnosti:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klikni pre vycentrovanie na priemysel/mesto/políčko. Ctrl+klik otvorí nové okno s priemyslom/mestom/políčkom
 
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Otázka
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informácie
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Varovanie
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Chyba
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Zrušiť
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Nie
+STR_GOAL_QUESTION_BUTTON_YES                                    :Áno
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Odmietnuť
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Prijať
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ingorovať
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Skúsiť znova
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Predchádzajúci
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Nasledujúci
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Zastaviť
+STR_GOAL_QUESTION_BUTTON_START                                  :Spustiť
+STR_GOAL_QUESTION_BUTTON_GO                                     :Choď
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Pokračovať
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Spustiť znova
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Odložiť
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Vzdať
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Zavrieť
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Dotácie
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Ponúknuté dotácie:
@@ -2761,7 +2797,7 @@ STR_STATION_VIEW_WAITING_TITLE                                  :{BLACK}Čaká:
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO_LONG}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO_SHORT} na ceste z {STATION})
 
-STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Prijima
+STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Prijíma
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Zobraziť zoznam prijímaného nákladu
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Prijíma: {WHITE}{STRING}
 
@@ -2771,14 +2807,14 @@ STR_STATION_VIEW_CARGO_RATINGS_TITLE                            :{BLACK}Hodnoten
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 
 ############ range for rating starts
-STR_CARGO_RATING_APPALLING                                      :Hrozne
-STR_CARGO_RATING_VERY_POOR                                      :Veľmi zle
-STR_CARGO_RATING_POOR                                           :Zle
-STR_CARGO_RATING_MEDIOCRE                                       :Priemerne
-STR_CARGO_RATING_GOOD                                           :Dobre
+STR_CARGO_RATING_APPALLING                                      :Hrozné
+STR_CARGO_RATING_VERY_POOR                                      :Veľmi zlé
+STR_CARGO_RATING_POOR                                           :Zlé
+STR_CARGO_RATING_MEDIOCRE                                       :Priemerné
+STR_CARGO_RATING_GOOD                                           :Dobré
 STR_CARGO_RATING_VERY_GOOD                                      :Veľmi dobré
-STR_CARGO_RATING_EXCELLENT                                      :Vyborne
-STR_CARGO_RATING_OUTSTANDING                                    :Perfektne
+STR_CARGO_RATING_EXCELLENT                                      :Výborné
+STR_CARGO_RATING_OUTSTANDING                                    :Perfektné
 ############ range for rating ends
 
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Vycentrovať pohľad na pozíciu stanice. Ctrl+klik otvorí nové okno s pohľadom na stanicu
@@ -2845,11 +2881,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Žiadne
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Hodnota spolocnosti: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% vlastní {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraštruktúra:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} políčka železnice
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} políčka cesty
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} políčka vody
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} políčka stanice
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} letiská
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} políč{P ko ka ok} železnice
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} políč{P ko ka ok} cesty
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} políč{P ko ka ok} vody
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} políč{P ko ka ok} stanice
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} let{P isko iská ísk}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Žiadne
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Postaviť sídlo
@@ -2872,8 +2908,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Zmeniť
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kúpiť 25% podiel v spoločnosti
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Predať 25% podiel v spoločnosti
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Kúpiť 25% podiel v tejto spoločnosti. Shift+klik zobrazí predpokladanú cenu
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Predať 25% podiel v tejto spoločnosti. Shift+klik zobrazí predpokladanú cenu
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Kúpiť 25% podiel v tejto spoločnosti. Shift+klik zobrazí predpokladanú cenu bez zakúpenia podielu.
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Predať 25% podiel v tejto spoločnosti. Shift+klik zobrazí predpokladanú cenu bez predaja podielu.
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Názov spoločnosti
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Meno prezidenta
@@ -3092,10 +3128,10 @@ STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klonova
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonovať loď
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonovať lietadlo
 
-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Vytvorí kópiu vlaku vrátane vozňov. Klikni na toto tlačidlo a potom na vlak v depe alebo mimo neho. Stlačením CTRL budú príkazy zdielané. Shift+klik zobrazí odhad nákladov
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Vytvorí kópiu cestného vozidla. Klikni na toto tlačidlo a potom na vozidlo v garáži alebo mimo nej. CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Vytvorí kópiu lode. Klikni na toto tlačidlo a následne na loď v depe alebo mimo neho. CTRL+klik skopíruje aj príkazy
-STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Vytvorí kópiu lietadla. Klikni na toto tlačidlo a potom na lietadlo v hangári alebo mimo neho. CTRL+Klik budú príkazy zdielané. Shift+klik zobrazí odhad nákladov
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Zakúpi kópiu vlaku vrátane vozňov. Klikni na toto tlačidlo a potom na vlak v depe alebo mimo neho. Stlačením CTRL budú príkazy zdielané. Shift+klik zobrazí odhad nákladov
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Zakúpi kópiu cestného vozidla. Klikni na toto tlačidlo a potom na vozidlo v garáži alebo mimo nej. CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Zakúpi kópiu lode. Klikni na toto tlačidlo a následne na loď v depe alebo mimo neho. CTRL+klik skopíruje aj príkazy
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Zakúpi kópiu lietadla. Klikni na toto tlačidlo a potom na lietadlo v hangári alebo mimo neho. CTRL+Klik budú príkazy zdielané. Shift+klik zobrazí odhad nákladov
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Poloha depa uprostred hlavného okna. CTRL+klik otvorí nové okno s pohľadom na depo
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Pohoha garáže uprostred hlavného okna. CTRL+klik otvorí nový pohľad na umiestnenie garáže
@@ -3182,9 +3218,9 @@ STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Poslať
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Poslať lietadlo do hangáru. CTRL+klik len servis
 
 STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Zakúpi kópiu vlaku vrátane vozňov. CTRL+klik bude zdieľať príkazy. Shift+Klik ukáže odhadované náklady bez kúpy
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Vytvorí kópiu cestného vozidla. Stlačením CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Vytvorí kópiu lode. Stlačením CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Vytvorí kópiu lietadla. Stlačením CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Zakúpi kópiu cestného vozidla. Stlačením CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Zakúpi kópiu lode. Stlačením CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Zakúpi kópiu lietadla. Stlačením CTRL+klik budú príkazy zdieľané. Shift+klik zobrazí odhad nákladov
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Povoliť vlaku pokračovať v ceste bez čakania na zelenú
 
@@ -3282,7 +3318,7 @@ STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Celkový
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT})
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO_LONG} ({CARGO_SHORT}) (x{NUM})
 
-STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prazdny
+STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Prázdny
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO_LONG} z {STATION}
 STR_VEHICLE_DETAILS_CARGO_FROM_MULT                             :{LTBLUE}{CARGO_LONG} z {STATION} (x{NUM})
 
@@ -3552,7 +3588,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Skript
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Pozri log skriptu
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Nebolo nájdená žiadne použitelné AI.{}Toto AI je hlúpe a nebude nič robiť.{}Môžete si stiahnúť niekoľko AI cez 'Online Obsah' systém.
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna z AI padla. Prosím nahláste to autorovi AI a priložte screenshot Debugovacej obrazovky AI.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jeden z bežiacich skriptov. Prosím nahláste to autorovi a priložte screenshot Debugovacej obrazovky.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Umelá inteligencia / Okno ladenia je dostupné len pre server
 
 # AI configuration window
@@ -4044,21 +4080,21 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Malá Banka
 
 ##id 0x4800
 # industry names
-STR_INDUSTRY_NAME_COAL_MINE                                     :Uholná baňa
-STR_INDUSTRY_NAME_POWER_STATION                                 :Elektraren
+STR_INDUSTRY_NAME_COAL_MINE                                     :Uhoľná baňa
+STR_INDUSTRY_NAME_POWER_STATION                                 :Elektráreň
 STR_INDUSTRY_NAME_SAWMILL                                       :Píla
-STR_INDUSTRY_NAME_FOREST                                        :Les
+STR_INDUSTRY_NAME_FOREST                                        :Lesy
 STR_INDUSTRY_NAME_OIL_REFINERY                                  :Ropná rafinéria
-STR_INDUSTRY_NAME_OIL_RIG                                       :Ropny vrt
-STR_INDUSTRY_NAME_FACTORY                                       :Tovaren
-STR_INDUSTRY_NAME_PRINTING_WORKS                                :Tlaciaren
+STR_INDUSTRY_NAME_OIL_RIG                                       :Ropná plošina
+STR_INDUSTRY_NAME_FACTORY                                       :Továreň
+STR_INDUSTRY_NAME_PRINTING_WORKS                                :Tlačiareň
 STR_INDUSTRY_NAME_STEEL_MILL                                    :Oceliareň
 STR_INDUSTRY_NAME_FARM                                          :Farma
-STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :Medenná baňa
-STR_INDUSTRY_NAME_OIL_WELLS                                     :Ropná plošina
+STR_INDUSTRY_NAME_COPPER_ORE_MINE                               :Medená baňa
+STR_INDUSTRY_NAME_OIL_WELLS                                     :Ropný vrt
 STR_INDUSTRY_NAME_BANK                                          :Banka
 STR_INDUSTRY_NAME_FOOD_PROCESSING_PLANT                         :Potravinársky podnik
-STR_INDUSTRY_NAME_PAPER_MILL                                    :Výroba papiera
+STR_INDUSTRY_NAME_PAPER_MILL                                    :Papierne
 STR_INDUSTRY_NAME_GOLD_MINE                                     :Zlatá baňa
 STR_INDUSTRY_NAME_BANK_TROPIC_ARCTIC                            :Banka
 STR_INDUSTRY_NAME_DIAMOND_MINE                                  :Diamantová baňa
@@ -4069,16 +4105,16 @@ STR_INDUSTRY_NAME_WATER_SUPPLY                                  :Vodný zdroj
 STR_INDUSTRY_NAME_WATER_TOWER                                   :Vodojem
 STR_INDUSTRY_NAME_FACTORY_2                                     :Továreň
 STR_INDUSTRY_NAME_FARM_2                                        :Farma
-STR_INDUSTRY_NAME_LUMBER_MILL                                   :Pila
+STR_INDUSTRY_NAME_LUMBER_MILL                                   :Píla
 STR_INDUSTRY_NAME_COTTON_CANDY_FOREST                           :Les cukrovej vaty
-STR_INDUSTRY_NAME_CANDY_FACTORY                                 :Cukrovar
-STR_INDUSTRY_NAME_BATTERY_FARM                                  :Výroba batérii
-STR_INDUSTRY_NAME_COLA_WELLS                                    :Výroba kofoly
-STR_INDUSTRY_NAME_TOY_SHOP                                      :Hrackarstvo
-STR_INDUSTRY_NAME_TOY_FACTORY                                   :Výroba hračiek
-STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :Žuvačkové fontány
-STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :Výroba šumienky
-STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :Bublifuk
+STR_INDUSTRY_NAME_CANDY_FACTORY                                 :Cukríkáreň
+STR_INDUSTRY_NAME_BATTERY_FARM                                  :Baterková farma
+STR_INDUSTRY_NAME_COLA_WELLS                                    :Kofolové studne
+STR_INDUSTRY_NAME_TOY_SHOP                                      :Hračkárstvo
+STR_INDUSTRY_NAME_TOY_FACTORY                                   :Továreň na hračky
+STR_INDUSTRY_NAME_PLASTIC_FOUNTAINS                             :Umelinové fontány
+STR_INDUSTRY_NAME_FIZZY_DRINK_FACTORY                           :Továreň na malinovku
+STR_INDUSTRY_NAME_BUBBLE_GENERATOR                              :Generátor bubliniek
 STR_INDUSTRY_NAME_TOFFEE_QUARRY                                 :Karamelový lom
 STR_INDUSTRY_NAME_SUGAR_MINE                                    :Cukrová baňa
 
@@ -4171,13 +4207,13 @@ STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_RUBBER_TRUCK                  :Vagón na kauč
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK                   :Vagón na cukor
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COTTON_CANDY_HOPPER           :Vagón na cukrovú vatu
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOFFEE_HOPPER                 :Vagón na karamel
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN                    :Vagón na bubliny
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BUBBLE_VAN                    :Vagón na bublinky
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_COLA_TANKER                   :Vagón na kofolu
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_CANDY_VAN                     :Vagón na cukríky
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :Vagón na hračky
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Vagón na batérie
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :Vagón na šumienku
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Vagón na žuvačky
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Vagón na baterky
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :Vagón na malinovku
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Vagón na umelinu
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_X2001_ELECTRIC           :'X2001' (Elektricky)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_MILLENNIUM_Z1_ELECTRIC   :'Millennium Z1' (Elektricky)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MONORAIL_WIZZOWOW_Z99             :Wizzowow Z99
@@ -4194,20 +4230,20 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_STEEL_TRUCK               :Vagon na ocel
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_ARMORED_VAN               :Obrneny vagon
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FOOD_VAN                  :Vagon na jedlo
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PAPER_TRUCK               :Vagon na papier
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER         :Vagon na medennu rudu
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COPPER_ORE_HOPPER         :Vagón na medenú rudu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_WATER_TANKER              :Vagon na vodu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FRUIT_TRUCK               :Vagon na ovocie
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_RUBBER_TRUCK              :Vagon na kaucuk
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_SUGAR_TRUCK               :Vagon na cukor
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COTTON_CANDY_HOPPER       :Vagon na cukrovu vatu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOFFEE_HOPPER             :Vagon na karamel
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN                :Vagón na bubliny
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BUBBLE_VAN                :Vagón na bublinky
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_COLA_TANKER               :Vagon na kofolu
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_CANDY_VAN                 :Vagon na cukriky
 STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_TOY_VAN                   :Vagón na hračky
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK             :Vagon na baterie
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK         :Vagon na sumienku
-STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK             :Vagón na žuvačky
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_BATTERY_TRUCK             :Vagón na baterky
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_FIZZY_DRINK_TRUCK         :Vagón na malinovku
+STR_VEHICLE_NAME_TRAIN_WAGON_MONORAIL_PLASTIC_TRUCK             :Vagón na umelinu
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV1_LEVIATHAN_ELECTRIC    :Lev1 'Leviathan' (Elektricky)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV2_CYCLOPS_ELECTRIC      :Lev2 'Cyclops' (Elektricky)
 STR_VEHICLE_NAME_TRAIN_ENGINE_MAGLEV_LEV3_PEGASUS_ELECTRIC      :Lev3 'Pegasus' (Elektricky)
@@ -4226,20 +4262,20 @@ STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_STEEL_TRUCK                 :Vagon na ocel
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_ARMORED_VAN                 :Obrneny vagon
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FOOD_VAN                    :Vagon na jedlo
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PAPER_TRUCK                 :Vagon na papier
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER           :Vagon na medennu rudu
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COPPER_ORE_HOPPER           :Vagón na medenú rudu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_WATER_TANKER                :Vagon na vodu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FRUIT_TRUCK                 :Vagon na ovocie
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_RUBBER_TRUCK                :Vagon na kaucuk
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_SUGAR_TRUCK                 :Vagon na cukor
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COTTON_CANDY_HOPPER         :Vagon na cukrovu vatu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOFFEE_HOPPER               :Vagon na karamel
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN                  :Vagón na bubliny
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BUBBLE_VAN                  :Vagón na bublinky
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_COLA_TANKER                 :Vagon na kofolu
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_CANDY_VAN                   :Vagon na cukriky
 STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_TOY_VAN                     :Vagón na hračky
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK               :Vagon na baterie
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK           :Vagon na sumienku
-STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK               :Vagón na žuvačky
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_BATTERY_TRUCK               :Vagón na baterky
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_FIZZY_DRINK_TRUCK           :Vagón na malinovku
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PLASTIC_TRUCK               :Vagón na umelinu
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_REGAL_BUS                     :MPS Regal Autobus
 STR_VEHICLE_NAME_ROAD_VEHICLE_HEREFORD_LEOPARD_BUS              :Hereford Leopard Autobus
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_BUS                        :Foster Autobus
@@ -4271,9 +4307,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_GRAIN_TRUCK                  :Goss - Obilie
 STR_VEHICLE_NAME_ROAD_VEHICLE_WITCOMBE_WOOD_TRUCK               :Witcombe - Drevo
 STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_WOOD_TRUCK                 :Foster - Drevo
 STR_VEHICLE_NAME_ROAD_VEHICLE_MORELAND_WOOD_TRUCK               :Moreland - Drevo
-STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_IRON_ORE_TRUCK                :MPS - Zelezna ruda
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_IRON_ORE_TRUCK                :Uhl - Zelezna ruda
-STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :Chippy - Zelezna ruda
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_IRON_ORE_TRUCK                :MPS - Železná ruda
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_IRON_ORE_TRUCK                :Uhl - Železná ruda
+STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_IRON_ORE_TRUCK             :Chippy - Železná ruda
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_STEEL_TRUCK                :Balogh - Ocel
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Uhl - Ocel
 STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Kelling - Ocel
@@ -4286,9 +4322,9 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :Chippy - Jedlo
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_PAPER_TRUCK                   :Uhl - Papier
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_PAPER_TRUCK                :Balogh - Papier
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_PAPER_TRUCK                   :MPS - Papier
-STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_COPPER_ORE_TRUCK              :MPS - Medenna ruda
-STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COPPER_ORE_TRUCK              :Uhl - Medenna ruda
-STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_COPPER_ORE_TRUCK             :Goss - Medenna ruda
+STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_COPPER_ORE_TRUCK              :MPS - Medená ruda
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_COPPER_ORE_TRUCK              :Uhl - Medená ruda
+STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_COPPER_ORE_TRUCK             :Goss - Medená ruda
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_WATER_TANKER                  :Uhl - Voda
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_WATER_TANKER               :Balogh - Voda
 STR_VEHICLE_NAME_ROAD_VEHICLE_MPS_WATER_TANKER                  :MPS - Voda
@@ -4316,18 +4352,18 @@ STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_TOY_VAN                  :Wizzowow - Hra
 STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_CANDY_TRUCK           :MightyMover - Cukríky
 STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_CANDY_TRUCK           :Powernaught - Cukríky
 STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_CANDY_TRUCK              :Wizzowow - Cukríky
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BATTERY_TRUCK         :MightyMover - Baterie
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BATTERY_TRUCK         :Powernaught - Baterie
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK            :Wizzowow - Baterie
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK           :MightyMover - Sumienka
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK           :Powernaught - Sumienka
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK        :Wizzowow - Sumienka
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK         :MightyMover - Žuvačky
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK         :Powernaught - Žuvačky
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK            :Wizzowow - Žuvačky
-STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BUBBLE_TRUCK          :MightyMover - Bubliny
-STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BUBBLE_TRUCK          :Powernaught - Bubliny
-STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BUBBLE_TRUCK             :Wizzowow - Bubliny
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BATTERY_TRUCK         :MightyMover - Baterky
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BATTERY_TRUCK         :Powernaught - Baterky
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BATTERY_TRUCK            :Wizzowow - Baterky
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_FIZZY_DRINK           :MightyMover - Malinovka
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_FIZZY_DRINK           :Powernaught - Malinovka
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_FIZZY_DRINK_TRUCK        :Wizzowow - Malinovka
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_PLASTIC_TRUCK         :MightyMover - Umelina
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_PLASTIC_TRUCK         :Powernaught - Umelina
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_PLASTIC_TRUCK            :Wizzowow - Umelina
+STR_VEHICLE_NAME_ROAD_VEHICLE_MIGHTYMOVER_BUBBLE_TRUCK          :MightyMover - Bublinky
+STR_VEHICLE_NAME_ROAD_VEHICLE_POWERNAUGHT_BUBBLE_TRUCK          :Powernaught - Bublinky
+STR_VEHICLE_NAME_ROAD_VEHICLE_WIZZOWOW_BUBBLE_TRUCK             :Wizzowow - Bublinky
 STR_VEHICLE_NAME_SHIP_MPS_OIL_TANKER                            :MPS - Ropa
 STR_VEHICLE_NAME_SHIP_CS_INC_OIL_TANKER                         :CS-Inc. - Ropa
 STR_VEHICLE_NAME_SHIP_MPS_PASSENGER_FERRY                       :MPS Trajekt

src/lang/slovenian.txt

@@ -502,6 +502,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Izhod
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Možnosti igre
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Nastavitve težavnosti
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Napredne nastavitve
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :UI/Nastavitve igre
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF nastavitve
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Nastavitve prozornega pogleda
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Imena mest prikazana
@@ -599,6 +600,7 @@ STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Vklopi/Izklopi
 STR_ABOUT_MENU_AI_DEBUG                                         :Razhročevanje UI / skript
 STR_ABOUT_MENU_SCREENSHOT                                       :Zajemi sliko
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zajemi približano sliko
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Zajem slike pri privzeti povečavi
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Zajemi celostno sliko
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :O 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Uravnavanje sličice
@@ -978,6 +980,7 @@ STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} ne najde poti za nadaljevanje
 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}Vozilo {VEHICLE} je izgubljeno
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}{VEHICLE} povzroča izgubo. Lanski dobiček je bil {CURRENCY_LONG}
+STR_NEWS_AIRCRAFT_DEST_TOO_FAR                                  :{WHITE}{VEHICLE} ne more do naslednjega cilja, ker je predaleč
 
 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} je ustavljen zaradi neuspele preureditve
 STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}Samoobnova ni uspela na {VEHICLE}{}{STRING}
@@ -1267,7 +1270,7 @@ STR_CONFIG_SETTING_BUILDONSLOPES                                :{LTBLUE}Dovoli
 STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}Dovoli oblikovanje terena pod objekti, tiri, ipd. (samonaklon): {ORANGE}{STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Dovoli bolj resnični območni zajem postaj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Dovoli odstanitev mestnih cest in mostov: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Največja dolžina vlakov: {ORANGE}{STRING} plošč{P a i e ""}
+STR_CONFIG_SETTING_TRAIN_LENGTH                                 :{LTBLUE}Največja dolžina vlakov: {ORANGE}{STRING} polj{P e i a ""}
 STR_CONFIG_SETTING_SMOKE_AMOUNT                                 :{LTBLUE}Količina dima/isker vozil: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Model pospeškov vlakov: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL              :{LTBLUE}Model pospeškov cestnih vozil: {ORANGE}{STRING}
@@ -1279,13 +1282,13 @@ STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Uporabi
 STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}Postopno polni vozila: {ORANGE}{STRING}
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}Inflacija: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}Dostavi tovor postaji le ob povpraševanju: {ORANGE}{STRING}
-STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :{LTBLUE}Največja dolžina mostov: {ORANGE}{STRING} plošč{P a i e ""}
-STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}Največja dolžina predorov: {ORANGE}{STRING} plošč{P a i e ""}
+STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :{LTBLUE}Največja dolžina mostov: {ORANGE}{STRING} polj{P e i a ""}
+STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}Največja dolžina predorov: {ORANGE}{STRING} polj{P e i a ""}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Glavni ročni način gradnje industrij: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :brez
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :kot ostale industrije
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :obetaven
-STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :{LTBLUE}Izravnan teren okrog industrij: {ORANGE}{STRING} plošč{P a i e ""}
+STR_CONFIG_SETTING_INDUSTRY_PLATFORM                            :{LTBLUE}Izravnan teren okrog industrij: {ORANGE}{STRING} polj{P e i a ""}
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Dovoli več enakih industrij na mesto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Prikaz signalov na vozni smeri: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Prikaz okna financ na koncu leta: {ORANGE}{STRING}
@@ -1298,6 +1301,7 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}Cestna
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Premakni okno, ko je miška na robu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Dovoli podkupovanje mestnih oblasti: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}Dovoli nakup ekskluzivnih prevoznih dovoljenj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :{LTBLUE}Dovoli naložbe v zgradbe: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :{LTBLUE}Dovoli financiranje obnove lokalnih cest: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :{LTBLUE}Dovoli pošiljanje denarja drugim podjetjem: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :{LTBLUE}Koeficient teže tovora za simulacijo težkih vlakov: {ORANGE}{STRING}
@@ -1311,6 +1315,7 @@ STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Dovoli
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Dovoli gradnjo združljivih postaj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Omogoči večkratni set NewGRF pogona: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Sprememba teh nastavitev ni mogoča, ko so tam vozila
+STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :{LTBLUE}Vzdrževanje infrastrukture: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}Letališča nikoli ne potečejo: {ORANGE}{STRING}
 
@@ -1328,11 +1333,12 @@ STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Trajanj
 STR_CONFIG_SETTING_HOVER_DELAY                                  :{LTBLUE}Pokaži obvestilo: {ORANGE}Lebdi {STRING} sekund{P o i e ""}
 STR_CONFIG_SETTING_HOVER_DELAY_DISABLED                         :{LTBLUE}Pokaži obvestilo: {ORANGE}Desni klik
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}Prikaz števila prebivalcev ob imenu mesta: {ORANGE}{STRING}
+STR_CONFIG_SETTING_GRAPH_LINE_THICKNESS                         :{LTBLUE}Debelina črt grafov: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}Urejevalnik terena: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Original
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
-STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Največja oddaljenost od roba za naftne rafinerije: {ORANGE}{STRING} plošč{P a i e ""}
+STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Največja oddaljenost od roba za naftne rafinerije: {ORANGE}{STRING} polj{P a i e ""}
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :{LTBLUE}Nadmorska višina snežne odeje: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Valovitost terena (samo TerraGenesis) : {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Zelo zglajen
@@ -1419,6 +1425,7 @@ STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Onemogo
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Onemogoči ladje za računalnik: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Dovoli UI v večigralskem načinu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :{LTBLUE}#opkode pred skripti so zadržane: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Obdobja servisiranja so v procentih: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Privzeto obdobje servisiranja za vlake: {ORANGE}{STRING} d{P an neva nevi ni}/%
@@ -1438,7 +1445,7 @@ STR_CONFIG_SETTING_STARTING_YEAR                                :{LTBLUE}Začetn
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}Omogoči gladko ekonomijo (več manjših sprememb): {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}Dovoli kupovanje delnic od drugih podjetij: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FEEDER_PAYMENT_SHARE                         :{LTBLUE}Odstotek profita, ki se plača na prestopnih prevozih: {ORANGE}{STRING}%
-STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Med vlečenjem postavi signale vsak{P 0:1 o i e ih}: {ORANGE}{STRING} ploščic{P 0:1 o i e ""}
+STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Med vlečenjem postavi signale vsak{P 0:1 o i a ih}: {ORANGE}{STRING} polj{P 0:1 e i a ""}
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Samodejno postavi semaforje pred: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Omogoči vmesnik signalov: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Privzet tip signalov za gradnjo: {ORANGE}{STRING}
@@ -1475,6 +1482,14 @@ STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Radij l
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}Radij lepljenja oken: {ORANGE}onemogočeno
 STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Največje število nelepljivih oken: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Največje število nelepljivih oken: {ORANGE}izklopljen
+STR_CONFIG_SETTING_ZOOM_MIN                                     :{LTBLUE}Največji nivo povečave: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ZOOM_MAX                                     :{LTBLUE}Največja oddaljenost pogleda: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ZOOM_LVL_MIN                                 :4x
+STR_CONFIG_SETTING_ZOOM_LVL_IN_2X                               :2x
+STR_CONFIG_SETTING_ZOOM_LVL_NORMAL                              :Normalno
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X                              :2x
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X                              :4x
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X                              :8x
 STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}Hitrost rasti mesta: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :Brez
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :Počasi
@@ -1503,6 +1518,7 @@ STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Usmerja
 STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}Vlaki
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}Mesta
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Industrije
+STR_CONFIG_SETTING_ECONOMY_SCRIPTS                              :{ORANGE}Skripti
 
 STR_CONFIG_SETTING_PATHFINDER_OPF                               :Original
 STR_CONFIG_SETTING_PATHFINDER_NPF                               :NPF
@@ -1516,7 +1532,19 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}Avtomat
 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Spremeni vrednost
 
 # Config errors
+STR_CONFIG_ERROR                                                :{WHITE}Napaka s konfiguracijsko datoteko...
+STR_CONFIG_ERROR_ARRAY                                          :{WHITE}... napaka v razporeditvi '{STRING}'
+STR_CONFIG_ERROR_INVALID_VALUE                                  :{WHITE}... neveljavna vrednost '{STRING}' za '{STRING}'
+STR_CONFIG_ERROR_TRAILING_CHARACTERS                            :{WHITE}... zaključnih znakov na koncu nastavitve '{STRING}'
+STR_CONFIG_ERROR_DUPLICATE_GRFID                                :{WHITE}... neskladne NewGRF '{STRING}': podvojitev ID-ja GRF s/z '{STRING}'
+STR_CONFIG_ERROR_INVALID_GRF                                    :{WHITE}... neupoštev neveljavne NewGRF '{STRING}': {STRING}
+STR_CONFIG_ERROR_INVALID_GRF_NOT_FOUND                          :ni najdeno
+STR_CONFIG_ERROR_INVALID_GRF_UNSAFE                             :nevarno za statično rabo
+STR_CONFIG_ERROR_INVALID_GRF_SYSTEM                             :sistemski NewGRF
+STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :nezdružljivo s to različico OpenTTD
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :neznano
+STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... nivo stiskanja '{STRING}' ni veljaven
+STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... format shranjevanja igre '{STRING}' ni na voljo. Vračanje na '{STRING}'
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1533,6 +1561,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Težavno
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Napredne nastavitve
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF nastavitve
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Preveri razpoložljive vsebine
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}UI / Nastavitve igre
 STR_INTRO_QUIT                                                  :{BLACK}Izhod
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Začni novo igro. Ctrl+Klik preskoči konfiguracijo sveta
@@ -1552,6 +1581,7 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Prikazi
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Prikaz naprednih nastavitev
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži nastavitve NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Preveri posodobljene vsebine na strežniku,{} ki so na voljo za prenos
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Prikaži UI in Nastavitve igre
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Izhod iz 'OpenTTD'
 
 STR_INTRO_TRANSLATION                                           :{BLACK}Temu prevodu manjka {NUM} vnos{P "" a i ov}. Prosimo pomagaj izboljšati OpenTTD in se vpiši za prevajanje. Preveri readme.txt za podrobnosti.
@@ -1922,6 +1952,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Izvrzen/
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Brcnjen/a si bil/a iz igre
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Goljufanje ni dovoljeno na tem strežniku
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Pošiljal si preveč ukazov strežniku
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Tvoj čas za vnos gesla je bil predolg
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Tvoj računalnik se je predolgo povezoval
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Tvoj prenos ozemlja je trajal predolgo
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Priklop na strežnik je trajal predolgo
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :splošna napaka
@@ -1940,6 +1974,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :brcnjen od gost
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :je poskusil/a uporabiti goljufanje
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :gostitelj zaseden
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :je pošiljal preveč ukazov
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :ni bilo pravočasno prejetega gesla
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :čas je potekel
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :prenos ozemlja je trajal predolgo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :obdelava ozemlja je trajala predolgo
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Povezava je mogoče prekinjena
@@ -1987,6 +2025,7 @@ STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Nobena
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Označi vse, da ne bo prenešeno
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Oznaka/ime filtra:
 STR_CONTENT_OPEN_URL                                            :{BLACK}Obišči spletno stran
+STR_CONTENT_OPEN_URL_TOOLTIP                                    :{BLACK}Obišči spletno mesto za to vsebino
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Prenesi
 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Požene prenos izbranih vsebin
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Skupna velikost prenosa: {WHITE}{BYTES}
@@ -2035,6 +2074,10 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... pove
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... datoteka ni zapisljiva
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}No mogoče razpakiranje prenešene datoteke
 
+STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}Manjkajoče grafike
+STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}OpenTTD potrebuje grafike za delovanje, a ni nobenih najdenih. Dovoliš OpenTTD-ju da prenese in namesti te grafike?
+STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Da, prenesi grafike
+STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Ne, zapusti OpenTTD
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Nastavitve prozornega pogleda
@@ -2082,6 +2125,10 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Zgradi
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Preklopi gradnja/rušenje železniških prog, signalov, točk poti in postaj. Držanje Ctrl odstrani tudi tire s točk poti in postaj
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Pretvori/nadgradi tip tirov. Shift preklaplja med izgradnjo in predvidenimi stroški
 
+STR_RAIL_NAME_RAILROAD                                          :Železnica
+STR_RAIL_NAME_ELRAIL                                            :Električna železnica
+STR_RAIL_NAME_MONORAIL                                          :Enotirna železnica
+STR_RAIL_NAME_MAGLEV                                            :Magnetna železnica
 
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Smer žel. garaže
@@ -2238,14 +2285,14 @@ STR_OBJECT_BUILD_CAPTION                                        :{WHITE}Izbor zg
 STR_OBJECT_BUILD_TOOLTIP                                        :{BLACK}Izberi zgradbo za postavitev. Shift preklaplja med izgradnjo in predvidenimi stroški
 STR_OBJECT_BUILD_CLASS_TOOLTIP                                  :{BLACK}Izberi vrsto objekta za gradnjo
 STR_OBJECT_BUILD_PREVIEW_TOOLTIP                                :{BLACK}Predogled zgradbe
-STR_OBJECT_BUILD_SIZE                                           :{BLACK}Velikost: {GOLD}{NUM} x {NUM} plošč
+STR_OBJECT_BUILD_SIZE                                           :{BLACK}Velikost: {GOLD}{NUM} x {NUM} polj
 
 STR_OBJECT_CLASS_LTHS                                           :Svetilniki
 STR_OBJECT_CLASS_TRNS                                           :Oddajniki
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Drevesa
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Izberi vrsto drevesa za sajenje
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Izberi vrsto drevesa za sajenje. Če polje že vsebuje drevesa, bodo dodatna drevesa mešanega tipa neodvisno od izbire
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Drevesa naključne vrste
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Postavi drevesa naključne vrste. Shift preklaplja med izgradnjo in predvidenimi stroški
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Naključna drevesa
@@ -2353,6 +2400,29 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Polja
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Zasnežen teren
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Puščava
 
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :{STRING} tiri
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :{STRING}tiri s signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :{STRING} tiri s pred-signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :{STRING} tiri z izhodnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :{STRING} tiri s kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :{STRING} tiri s signali steze
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :{STRING} tiri s signali za enosmerno stezo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :{STRING} tiri z normalnimi in pred-signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :{STRING} tiri z normalnimi in izhodnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :{STRING} tiri z normalnimi in kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :{STRING} tiri z normalnimi in steznimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :{STRING} tiri z normalnimi in enosmernimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :{STRING} tiri s pred in izhodnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :{STRING} tiri s pred in kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :{STRING} tiri s pred in steznimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :{STRING} tiri s pred in enosmernimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :{STRING} tiri z izhodnimi in kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :{STRING} tiri z izhodnimi in steznimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :{STRING} tiri z izhodnimi in enosmernimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :{STRING} tiri s kombiniranimi in steznimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :{STRING} tiri s kombiniranimi in enosmernimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :{STRING} tiri s steznimi in enosmernimi signali
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :{STRING} železniška garaža
 
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Cesta
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Cesta z razsvetljavo
@@ -2510,7 +2580,7 @@ STR_GENERATION_TREE_GENERATION                                  :{BLACK}Ustvarja
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Ustvarjanje zgradbe
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generiranje grobih in skalnatih tal
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Nastavljanje igre
-STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Zagnano ponavljanje kvadratkov
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Zagnano ponavljanje polj
 STR_GENERATION_PREPARING_SCRIPT                                 :{BLACK}Poganjam skripto
 STR_GENERATION_PREPARING_GAME                                   :{BLACK}Priprave igre
 
@@ -2540,6 +2610,9 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Premakne
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Seznam nameščenih NewGRF datotek.
 
 # Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Prikaži preberi-me datoteko
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Zamenjaj dnevnik
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licenca
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nastavi parametre
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Prikaži parametre
@@ -2573,6 +2646,9 @@ STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORAN
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Število parametrov: {ORANGE}{NUM}
 
 # NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF preberi-me od {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF zamenjaj dnevnik od {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licenca od {STRING}
 
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Preglej - {STRING}
@@ -2616,17 +2692,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} je p
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} potrebuje OpenTTD različico {STRING} ali boljšo
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF datoteka je bila narejena za prevod
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Preveč NewGrf-jev je naloženih
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Nalaganje {2:STRING} kot statični NewGRF z/s {4:STRING} lahko povzroči desinhronizacijo
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Nepričakovana sličica
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Neznan ukaz 0 lastnosti
-STR_NEWGRF_ERROR_INVALID_ID                                     :Poskus uporabe neveljavnega ID-ja
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Nalaganje {1:STRING} kot statični NewGRF z/s {STRING} lahko povzroči desinhronizacijo
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Nepričakovana sličica (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Neznan ukaz 0 lastnost {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Poskus uporabe neveljavnega ID (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} vsebuje eno poškodovano sličico. Vse poškodovane sličice se bodo prikazale kot rdeči vprašaji (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Vsebuje večkratne Action 8 vnose
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Preberi po koncu navidezne sličice
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Vsebuje več Ukaz 8 vnosov (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Prebrana datoteka preko meje za sličice (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}V uporabljenem osnovnem setu grafik manjkajo sličice.{}Prosim, posodobi osnovni set grafik
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Zahtevane GRF sestavine niso razpoložljive
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} je bil izklopljen zaradi {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neveljaven/nepoznan format sistema sličic
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Zahtevani viri GRF niso na voljo (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} je bil izklopljen zaradi {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neveljaven/neznan format zapisa sličic (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Pozor!
@@ -2655,6 +2731,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Vlak '{V
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{STRING}' javlja napačno informacijo
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informacija o preureditvi tovornih zmogljivosti za '{1:ENGINE}' je različna od seznama nakupa po konstrukciji. To lahko povzroči, da bi samoobnova ne uspela pravilno
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' hrošč je povzročil neskončen povratni ciklus proizvodnje
+STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}Povratni klic {1:HEX} je odgovoril z neznanim/neveljavnim rezultatom {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<neveljaven tovor>
@@ -2699,6 +2776,12 @@ STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Pošte p
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Količina potrebnega tovora za rast mesta:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} potrebno
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} je potreben pozimi
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} dostavljeno
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (še potrebno)
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (dostavljeno)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Mesto raste vsak{P 0 "" a e ih} {ORANGE}{COMMA}{BLACK} d{P an neva ni ni}
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}Mesto raste vsak{P 0 "" a e ih} {ORANGE}{COMMA}{BLACK} d{P an neva ni ni} (z naložbami)
+STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}Mesto {RED}ne{BLACK} raste
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Meja hrupa v mestu: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Osredotoči pogled na lokacijo mesta. Ctrl+Klik odpre nov pogled na lokaciji mesta
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Mestni svet
@@ -2745,9 +2828,13 @@ STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globalni
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Brez -
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Cilji podjetja:
+STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klikni na cilj za pogled na industrijo/mesto/polje. Ctrl+Klik odpre novo okno na industrijo/mesto/polje
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Vprašanje
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Vprašanje
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informacije
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Opozorilo
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Napaka
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Prekliči
@@ -2862,6 +2949,7 @@ STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Izposoja
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Povečaj višino posojila. Ctrl+Klik izposodi največ, kar je mogoče
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Vračilo {CURRENCY_LONG}
 STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Odplačaj del posojila. Ctrl+Klik odplača največ, kar je mogoče
+STR_FINANCES_INFRASTRUCTURE_BUTTON                              :{BLACK}Infrastruktura
 
 # Company view
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANY_NUM}
@@ -2877,6 +2965,13 @@ STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Brez
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Vrednost podjetja: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% v lasti podjetja {COMPANY})
+STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktura:
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} kos{P "" a i ov} tirov
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} odsek{P "" a i ov} ceste
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} polj{P e i a ""} vode
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} polj{P e i a ""} postaj
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} letališč{P e i a ""}
+STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Brez
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Zgradi sedež podjetja
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Zgradi sedež podjetja
@@ -2884,6 +2979,8 @@ STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Poglej s
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Poglej sedež podjetja
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Preseli sedež
 STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Preseli sedež podjetja drugam za ceno 1% vrednosti podjetja. Shift+Klik prikaže predviden strošek brez selitve
+STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Podrobnosti
+STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Podrobni prikaz količine infrastrukture
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nov obraz
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Izberi nov obraz za direktorja
@@ -2905,6 +3002,19 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Direktorjevo im
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Iščemo novega lastnika, ki bi prevzel naše podjetje.{}{}Ali želiš odkupiti podjetje {COMPANY} za ceno {CURRENCY_LONG}?
 
 # Company infrastructure window
+STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}Infrastruktura od {COMPANY}
+STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}Kosi tirov:
+STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}Signali
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}Odseki cest:
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD                            :{WHITE}Cesta
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY                         :{WHITE}Tramvaj
+STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}Polja vode:
+STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}Kanali
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}Postaje:
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}Polja postaj
+STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}Letališča
+STR_COMPANY_INFRASTRUCTURE_VIEW_COST                            :{WHITE}{1:CURRENCY_LONG}/leto ({0:COMMA})
+STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENCY_LONG}/leto
 
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrije
@@ -3144,6 +3254,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {C
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Cena: {CURRENCY_LONG} Teža: {WEIGHT_SHORT}{}Hitrost: {VELOCITY}  Moč: {POWER}  Max. T.E.: {6:FORCE}{}Stroški: {4:CURRENCY_LONG}/yr{}Zmogljivost: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cena: {CURRENCY_LONG} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO_LONG}, {CARGO_LONG}{}Cena delovanja: {CURRENCY_LONG}/leto
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cena: {CURRENCY_LONG} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO_LONG}{}Cena delovanja: {CURRENCY_LONG}/leto
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cena: {CURRENCY_LONG} Max. Hitrost: {VELOCITY} Domet: {7:COMMA} polj{}Zmogljivost: {CARGO_LONG}, {CARGO_LONG}{}Stroški delovanja: {CURRENCY_LONG}/leto
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cena: {CURRENCY_LONG} Max. Hitrost: {VELOCITY} Domet: {7:COMMA} polj{}Zmogljivost: {CARGO_LONG}{}Stroški delovanja: {CURRENCY_LONG}/leto
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamenjaj {STRING}
@@ -3258,6 +3370,7 @@ STR_VEHICLE_INFO_AGE                                            :{COMMA} let{P o
 STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} let{P o i a ""} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. hitrost: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_MAX_SPEED_RANGE                                :{BLACK}Max. hitrost: {LTBLUE}{VELOCITY} {BLACK}Domet: {LTBLUE}{COMMA} polj
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Teža: {LTBLUE}{WEIGHT_SHORT} {BLACK}Moč: {LTBLUE}{POWER}{BLACK} Max. hitrost: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Teža: {LTBLUE}{WEIGHT_SHORT} {BLACK}Moč: {LTBLUE}{POWER}{BLACK} Max. hitrost: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
 
@@ -3363,6 +3476,9 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Spremeni
 
 STR_ORDER_REFIT                                                 :{BLACK}Preuredi
 STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Izberi preureditev za vrsto tovora, ki ga želiš. Ctrl+Klik za odstranitev ukaza preureditve
+STR_ORDER_REFIT_AUTO                                            :{BLACK}Samo-predelava
+STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Izberi kateri tip tovora se bo uporabil v tem ukazu. Ctrl+Klik za odstranitev ukaza samo-predelave. Samo-predelava bo izvedena le, če vozilo to dovoli
+STR_ORDER_DROP_REFIT_AUTO                                       :Določen tovor
 STR_ORDER_DROP_REFIT_AUTO_ANY                                   :Tovor na voljo
 
 STR_ORDER_SERVICE                                               :{BLACK}Servis
@@ -3452,6 +3568,18 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ne razloži in
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ne razloži in počakaj na polno česarkoli)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Ne razloži in ne naloži)
 
+STR_ORDER_AUTO_REFIT                                            :(Samo-predelaj za {STRING})
+STR_ORDER_FULL_LOAD_REFIT                                       :(Naporni in samo-predelaj za {STRING})
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :(Napolni katerikoli tovor s samo-predelavo za {STRING})
+STR_ORDER_UNLOAD_REFIT                                          :(Raztovori in napolni tovor s samo-predelavo za {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :(Raztovori in počakaj na polni tovor s samo-predelavo za {STRING})
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :(Raztovori in počakaj na katerikoli tovor s samo-predelavo za {STRING})
+STR_ORDER_TRANSFER_REFIT                                        :(Pretovori in napolni tovor s samo-predelavo za {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :(Pretovori in počakaj na tovor s samo-predelavo za {STRING})
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :(Pretovori in počakaj na katerikoli tovor s samo-predelavo za {STRING})
+STR_ORDER_NO_UNLOAD_REFIT                                       :(Brez raztovarjanja napolni tovor s samo-predelavo za {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :(Brez raztovarjanja počakaj na tovor s samo-predelavo za {STRING})
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :(Brez raztovarjanja počakaj na katerikoli tovor s samo-predelavo za {STRING})
 
 STR_ORDER_AUTO_REFIT_ANY                                        :tovor na voljo
 
@@ -3459,6 +3587,7 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[začetna stran
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[sredina]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[konec]
 
+STR_ORDER_OUT_OF_RANGE                                          :{RED} (Naslednji cilj je izven dosega)
 
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Skoči na ukaz {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :Skoči na ukaz {COMMA}, ko je {STRING} {STRING} {COMMA}
@@ -3541,6 +3670,7 @@ STR_AI_DEBUG_CONTINUE                                           :{BLACK}Nadaljuj
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Nadaljuj izvajanje UI
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Oglej si razhroščevalni izpis UI
 STR_AI_GAME_SCRIPT                                              :{BLACK}Skripta
+STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Preveri dnevnik skriptov igre
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Ni na voljo nobene uporabne UI.{}Ta UI je navidezen in ne bo storil ničesar. UI so na voljo preko 'Prenosa vsebin'
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Ena izmed zagnanih UI se je sesula. Prosim, javi to avtorju UI s priloženo sliko zaslona v orodju za razhroščevanje UI
@@ -3548,6 +3678,8 @@ STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Okno ra
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Nastavitve UI / igre
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Skript igre, ki bo naložen v naslednji igri
+STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}UI, ki bodo naložene v naslednji igri
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Igralec
 STR_AI_CONFIG_RANDOM_AI                                         :Naključni UI
 STR_AI_CONFIG_NONE                                              :(brez)
@@ -3564,6 +3696,7 @@ STR_AI_CONFIG_CHANGE                                            :{BLACK}Izberi {
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :UI
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Skripta
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Naloži drugi skript
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Nastavi
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Nastavi parametre Skripte
 
@@ -3589,6 +3722,7 @@ STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Skripta
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zapri
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetiraj
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
+STR_AI_SETTINGS_START_DELAY                                     :Število dni zamika med zagonom sledeče po predhodni UI: {ORANGE}{STRING}
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
@@ -3675,6 +3809,7 @@ STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Ni dovol
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} mestna oblast tega ne dovoli
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} mestni svet prepoveduje gradnjo še enega letališča v tem mestu
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :Lokalne oblasti mesta {WHITE}{TOWN} ne dovolijo gradnje letališča zaradi hrupa
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Tvoj poskus podkupovanja je odkril regijski preiskovalec
 
 # Levelling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Tukaj ni možen dvig terena...
@@ -4489,6 +4624,7 @@ STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLA
 STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}

src/lang/spanish.txt

@@ -245,8 +245,8 @@ STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
 STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
-STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
-STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|QWERTYUIOP{{}}ASDFGHJKL:"  ZXCVBNM<>? .
+STR_OSK_KEYBOARD_LAYOUT                                         :º1234567890'¡\qwertyuiop`+asdfghjklñ´ç<zxcvbnm,.- .
+STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :ª!"·$%&/()=?¿|QWERTYUIOP^*ASDFGHJKLѨÇ>ZXCVBNM;:_ .
 
 # Measurement tooltip
 STR_MEASURE_LENGTH                                              :{BLACK}Longitud: {NUM}
@@ -554,9 +554,9 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ENGINEER                   :Ingeniero
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRAFFIC_MANAGER            :Gerente de tráfico
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TRANSPORT_COORDINATOR      :Coordinador de transporte
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_ROUTE_SUPERVISOR           :Supervisor de ruta
-STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_DIRECTOR                   :Director
-STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHIEF_EXECUTIVE            :Jefe ejecutivo
-STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHAIRMAN                   :Director general
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_DIRECTOR                   :Directivo
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHIEF_EXECUTIVE            :Subdirector
+STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_CHAIRMAN                   :Director
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Presidente
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnate
 
@@ -896,12 +896,12 @@ STR_GAME_OPTIONS_CURRENCY_EEK                                   :Krooni Estonio
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Personalizada...
 ############ end of currency region
 
-STR_GAME_OPTIONS_MEASURING_UNITS_FRAME                          :{BLACK}Medir unidades
-STR_GAME_OPTIONS_MEASURING_UNITS_DROPDOWN_TOOLTIP               :{BLACK}Medir unidades seleccionadas
+STR_GAME_OPTIONS_MEASURING_UNITS_FRAME                          :{BLACK}Unidades de medida
+STR_GAME_OPTIONS_MEASURING_UNITS_DROPDOWN_TOOLTIP               :{BLACK}Unidades de medida seleccionadas
 
 ############ start of measuring units region
-STR_GAME_OPTIONS_MEASURING_UNITS_IMPERIAL                       :Imperial
-STR_GAME_OPTIONS_MEASURING_UNITS_METRIC                         :Métrico
+STR_GAME_OPTIONS_MEASURING_UNITS_IMPERIAL                       :Imperiales
+STR_GAME_OPTIONS_MEASURING_UNITS_METRIC                         :Métricas
 STR_GAME_OPTIONS_MEASURING_UNITS_SI                             :SI
 ############ end of measuring units region
 
@@ -1521,9 +1521,9 @@ STR_FACE_FEMALE_BUTTON                                          :{BLACK}Mujer
 STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Selecciona cara femenina
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Cara Nueva
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generar cara al azar
-STR_FACE_ADVANCED                                               :{BLACK}Avanzado
+STR_FACE_ADVANCED                                               :{BLACK}Avanzada
 STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selección avanzada de caras
-STR_FACE_SIMPLE                                                 :{BLACK}Simple
+STR_FACE_SIMPLE                                                 :{BLACK}Sencilla
 STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selección simple de caras
 STR_FACE_LOAD                                                   :{BLACK}Cargar
 STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Cargar cara favorita
@@ -1573,7 +1573,7 @@ STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Conexió
 STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Seleccione entre un juego en Internet o en una Red de Área Local
 STR_NETWORK_SERVER_LIST_LAN                                     :LAN
 STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
-STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nombre del Jugador:
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nombre del jugador:
 STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Este es el nombre con el que otros jugadores le identificarán
 
 STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nombre
@@ -1800,6 +1800,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Se ha pr
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Has sido expulsado del servidor
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}No se permiten trucos en este servidor
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Estabas enviando demasiados comandos al servidor
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Tardaste demasiado en introducir la contraseña
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Su ordenador tardó demasiado tiempo en conectar
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Llevó demasiado tiempo descargar el mapa
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Llevó demasiado tiempo conectar al servidor
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :error general
@@ -1818,6 +1822,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :expulsado por e
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :ha intentado usar un truco
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor lleno
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :estaba enviando demasiados comandos
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :no se recibió la contraseña a tiempo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :timeout general
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :la descarga del mapa llevó demasiado tiempo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :el procesado del mapa llevó demasiado tiempo
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Posible pérdida de conexión
@@ -2264,7 +2272,7 @@ STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :{STRING} con se
 STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :{STRING} con señales de ruta y señales de ruta de un solo sentido
 STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :{STRING} depósito de tren
 
-STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Road
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Carretera
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Carretera con farolas
 STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Carretera arbolada
 STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depósito de carretera
@@ -2479,7 +2487,7 @@ STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Incompatib
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Cambiar parámetros NewGRF
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Cerrar
-STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reset
+STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reiniciar
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Fijar todos los parámetros a su valor por defecto
 STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parámetro {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
@@ -2522,7 +2530,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Atención: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Error: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Error Fatal: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Un error fatal de NewGRF ha ocurrido: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ha ocurrido un error fatal de NewGRF: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} no funcionará con la con la versión de TTDPatch reportada por OpenTTD
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} es la para la versión {STRING} de TTD
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} está diseñado para ser usado con {STRING}
@@ -2532,17 +2540,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} debe
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} requiere OpenTTD versión {STRING} o superior
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :El fichero GRF ha sido diseñado para ser traducido
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Demasiados NewGRFs han sido cargados
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Cargar {2:STRING} como NewGRF estático con {4:STRING} puede causar desincronizaciones
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite inesperado
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Acción 0 con propiedad desconocida
-STR_NEWGRF_ERROR_INVALID_ID                                     :Intento de usar un ID incorrecto
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Cargar {1:STRING} como NewGRF estático con {STRING} puede causar desincronizaciones
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite inesperado (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propiedad de Acción 0 desconocida {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Intento de usar una ID inválida (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contiene un sprite corrupto. Todos los sprites corruptos serán mostrados como un interrogante rojo (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contiene múltiples entradas Action 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lectura después del final de un pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contiene múltiples entradas de Acción 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lectura mas allá del fin de un pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Al conjunto de gráficos base actualmente en uso le faltan algunos sprites.{}El conjunto de gráficos base debe ser actualizado
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF requeridos no disponibles
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} fue desactivado por {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato de distribución de sprite inválido o desconocido
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF solicitados no disponibles (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} fue desactivado por {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato de colocación de sprites inválido o desconocido (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}¡Precaución!
@@ -2671,7 +2679,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Metas de
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Click en una meta para centrar la vista principal en la casilla, industria o pueblo. Ctrl+Click abre una nueva vista en esa localización
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Pregunta
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pregunta
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Información
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Advertencia
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancelar
@@ -2803,11 +2814,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ninguno
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor de la empresa: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propiedad de {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraestructura:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} trozos de ferrocarril
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} trozos de carretera
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} casillas de agua
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} casillas de estación
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeropuertos
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} trozo{P "" s} de ferrocarril
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} trozo{P "" s} de carretera
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} casilla{P "" s} de agua
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} casilla{P "" s} de estación
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeropuerto{P "" s}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Ninguna
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir Sede
@@ -2831,7 +2842,7 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Cambiar
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Comprar un 25% de sus acciones
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender 25% de acciones
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Comprar 25% de acciones de esta empresa. Shift+Click muestra una estimación del precio sin comprar ninguna acción
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 25% acciones de esta empresa. Shift+Click muestra una estimación del precio sin vender ninguna acción
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 25% acciones de esta empresa. Shift+Click muestra una estimación del beneficio sin vender ninguna acción
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nombre Empresa
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nombre del Presidente
@@ -3446,7 +3457,7 @@ STR_TIMETABLE_TRAVEL_FOR                                        :Viajar durante
 STR_TIMETABLE_STAY_FOR                                          :y esperar {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :y viajar durante {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} día{P "" s}
-STR_TIMETABLE_TICKS                                             :{COMMA} tick{P "" s}
+STR_TIMETABLE_TICKS                                             :{COMMA} tic{P "" s}
 
 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Los horarios tomarán {STRING} para completarse
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Estos horarios tomarán {STRING} para completarse (no todos los horarios)
@@ -3510,7 +3521,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Script d
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Comprobar el registro del Script de Juego
 
 STR_ERROR_AI_NO_AI_FOUND                                        :No se encontró IA apropiada para cargar.{}Esta es una IA por defecto que no realiza acción alguna.{}Puedes descargar nuevas IAs mediante el sistema de 'Contenido Online'
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Una de las IA ejecutadas ha fallado. Por favor, reporte el fallo al autor de la misma desde la ventana Depuración de IA
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Uno de los scripts ejecutados ha fallado. Por favor, reporte el fallo al autor del script con una captura de la ventana de IA / Script
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}La ventana de depuración de scripts solo está disponible para el servidor
 
 # AI configuration window
@@ -4056,7 +4067,7 @@ STR_SV_STNAME_SOUTH                                             :{STRING} Sur
 STR_SV_STNAME_EAST                                              :{STRING} Este
 STR_SV_STNAME_WEST                                              :{STRING} Oeste
 STR_SV_STNAME_CENTRAL                                           :{STRING} Central
-STR_SV_STNAME_TRANSFER                                          :{STRING} Intercambio
+STR_SV_STNAME_TRANSFER                                          :{STRING} Transferencia
 STR_SV_STNAME_HALT                                              :{STRING} Parada
 STR_SV_STNAME_VALLEY                                            :Valle de {STRING}
 STR_SV_STNAME_HEIGHTS                                           :Cumbres de {STRING}

src/lang/swedish.txt

@@ -1297,7 +1297,7 @@ STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Använd
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Standardsignal-typ: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Normal
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Avancerad
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Avancerad enväga
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Avancerad envägssignal
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :{LTBLUE}Gå igenom signaltyper: {ORANGE}{STRING}
 STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Endast normala
 STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Endast avancerade
@@ -2453,6 +2453,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Ändring
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licens
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parametrar
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Visa parametrar
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Byt palett
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Ändra palett för markerad NewGRF.{}Gör detta när grafiken från denna NewGRF är rosa i spelet
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Spara ändringar
@@ -2529,17 +2530,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} mås
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} kräver OpenTTD version {STRING} eller bättre
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF-filen den var designad att översätta
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :För många NewGRFer är laddade
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Att ladda {2:STRING} som statisk NewGRF med {4:STRING} kan orsaka desynkronisering
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Oförväntad sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Okänd egenskap för Action 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Försökte att använda ett ogiltigt ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Att ladda {1:STRING} som statisk NewGRF med {STRING} kan orsaka desynkronisering
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Oväntat spriteobjekt (spriteobjekt {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Okänd Action 0-egenskap {4:HEX} (spriteobjekt {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Försökt att använda ett ogiltligt ID (spriteobjekt {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} innehåller en skadad bild. Alla korrupta bilder kommer att visas som ett rött frågetecken (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Innehåller flera Action 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Läste förbi slutetet av pseudo-sprite
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Innehåller flera Action 8 (spriteobjekt {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Läste förbi slutet av pseudo-spriteobjekt (spriteobjekt {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det aktiva grafikpaketet saknar ett antal bilder.{}Var vänlig och uppdatera grafikpaketet
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Efterfrågade GRF-resurser är ej tillgängliga
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} har inaktiverats av {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ogiltig/okänd sprite layout format
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Efterfrågade GRF-resurser är inte tillgängliga (spriteobjekt {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} har inaktiverats av {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Felaktig/okänd layout-format av spriteobjekt (spriteobjekt {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varning!
@@ -2668,8 +2669,30 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Företag
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klicka på målet för att centrera huvudvyn på industrin/byn/rutan. Ctrl+klick gör så att ett nytt vyfönster öppnas över platsen för industrin/byn/rutan
 
 # Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Fråga
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Varning
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Fel
 
 ### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Avbryt
+STR_GOAL_QUESTION_BUTTON_OK                                     :Okej
+STR_GOAL_QUESTION_BUTTON_NO                                     :Nej
+STR_GOAL_QUESTION_BUTTON_YES                                    :Ja
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Avböj
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Acceptera
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignorera
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Försök igen
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Föregående
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Nästa
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Stoppa
+STR_GOAL_QUESTION_BUTTON_START                                  :Starta
+STR_GOAL_QUESTION_BUTTON_GO                                     :Gå
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Fortsätt
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Starta om
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Skjut upp
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Ge upp
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Stäng
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subventioner
@@ -2809,7 +2832,7 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Byt VD:n
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Köp 25% andelar i företaget
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sälj 25% andelar i företaget
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Köp 25% andelar i detta företag. Shift+klick visar kostnad utan att köpa
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Sälj 25% andelar i detta företag. Shift+klick visar kostnad utan att köpa
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Sälj 25% andelar i detta företag. Shift+klick visar inkomst utan att sälja
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Företagsnamn
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Namn på VD
@@ -3488,7 +3511,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Spelskri
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Visa debug-utskrifter för spelskript
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Ingen passande datorspelare hittades.{}Denna datorspelare är en test-datorspelare och kommer inte göra någonting.{}Du kan ladda ner nya datorspelare genom spelets 'Online-innehåll'-system
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En av datorspelarna har krachat. Vänligen raportera detta till datorspelarens skapare med en skärmdump på 'AI-felsökning'-fönstret
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En av datorspelarna har krachat. Vänligen raportera detta till datorspelarens skapare med en skärmdump på förstret 'Felsökning av datorspelare / spelskript'
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Felsökning av datorspelare / spelskript är bara tillgänglig för servern
 
 # AI configuration window

src/lang/traditional_chinese.txt

@@ -2439,18 +2439,12 @@ STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} 跟
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} 只適合用於 TTD 版本 {STRING}
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} 必須跟 {STRING} 一起使用
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :{1:STRING} 的參數無效：參數 {STRING} ({NUM})
-STR_NEWGRF_ERROR_LOAD_BEFORE                                    :載入 {2:STRING} 前必須先載入 {1:STRING}
 STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} 必須要在 {STRING} 之後載入
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} 需要 OpenTTD 版本 {STRING} 或更新的版本
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF 檔案翻譯後出現錯誤
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :已載入太多 NewGRF
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :與{4:STRING} 將 {2:STRING} 載入為靜態 NewGRF 可能會讓遊戲失去同步
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :未預期的 sprite
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :未知的動作 0 屬性
-STR_NEWGRF_ERROR_INVALID_ID                                     :嘗試使用無效的 ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :與{2:STRING} 將 {1:STRING} 載入為靜態 NewGRF 可能會讓遊戲失去同步
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} 包含了毀損的 sprite。所有毀損的 sprite 會以紅色問號 (？) 顯示。
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :包含多個 Action 8 輸入。
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :讀取偽 Sprite 的過去結尾。
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}目前使用的基本圖形集少了某些 sprite。{}請更新基本圖形集。
 
 # NewGRF related 'general' warnings

src/lang/turkish.txt

@@ -1800,6 +1800,8 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sunucuya
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Oyundan atıldınız
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Bu sunucuda hileler kapalı
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Sunucuya çok fazla komut gönderiyordunuz
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Şifre girmeniz çok uzun sürdü
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Bilgisayarınızın katılması çok uzun sürdü
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :genel hata
@@ -2240,6 +2242,29 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Mera
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Karlı arazi
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Çöl
 
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :{STRING} ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :{STRING} blok sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :{STRING} ön sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :{STRING} çıkış sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :{STRING} karışık sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :{STRING} yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :{STRING} tek yön yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :{STRING} blok ve ön sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :{STRING} blok ve çıkış sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :{STRING} blok ve karışık sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :{STRING} blok ve yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :{STRING} blok ve tek yön yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :{STRING} ön ve çıkış sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :{STRING} ön ve karışık sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :{STRING} ön ve yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :{STRING} ön ve tek yön yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :{STRING} çıkış ve karışık sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :{STRING} çıkış ve yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :{STRING} çıkış ve tek yön yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :{STRING} karışık ve tek yön yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :{STRING} karışık ve tek yön yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :{STRING} yol ve tek yön yol sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :{STRING} tren deposu
 
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Yol
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Sokak lambalı yol
@@ -2427,8 +2452,12 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Seçili
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Yüklü NewGRF dosyalarının listesidir. Seçeneklerini değiştirmek için bir dosyayı tıklayın
 
 # Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Benioku dosyasını göster
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Değişiklik kayıtları
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Lisans
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parametreler
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Parametreleri göster
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palet değiştir
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Seçili NewGRF'nin paletini değiştir.{}Bu işlemi bu NewGRF'nin grafikleri oyun içerisinde pembe görünüyorsa yapın.
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Uygula
@@ -2459,6 +2488,9 @@ STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORAN
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Parametre sayısı: {ORANGE}{NUM}
 
 # NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}{STRING} adlı NewGRF'nin benioku dosyası
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}{STRING} adlı NewGRF'nin değişiklik kaydı
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}{STRING} adlı NewGRF'nin lisansı
 
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}İncele - {STRING}
@@ -2502,17 +2534,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} sonr
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} OpenTTD {STRING} veya daha yüksek bir sürüm gerektirir
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF dosyası çeviri için yapılmış
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Çok fazla NewGRF yüklendi
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{2:STRING} adlı NewGRF'yi {4:STRING} ile birlikte kullanmak senkronizasyon sorunu oluşturabilir
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Beklenmeyen sprayt
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Bilinmeyen Action 0 özelliği
-STR_NEWGRF_ERROR_INVALID_ID                                     :Geçersiz ID kullanımı denemesi
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :{1:STRING} adlı NewGRF'yi {STRING} ile birlikte kullanmak senkronizasyon sorunu oluşturabilir
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} bozuk bir sprayt içeriyor. Tüm bozuk spraytlar kırmızı bir soru işareti (?) olarak görünecektir
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Birden fazla Action 8 girişi içeriyor
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Pseudo-sprite bitiminden sonrasını okudu
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Kullanımda olan temel grafik kümesi bazı spraytları içermiyor.{}Lütfen temel grafik kümesini güncelleyin
-STR_NEWGRF_ERROR_GRM_FAILED                                     :İstenen GRF kaynakları mevcut değil
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} {4:STRING} tarafından deaktive edildi
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Geçersiz/bilinmeyen sprayt biçimi
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} {STRING} tarafından deaktive edildi
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Uyarı!
@@ -2541,6 +2566,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}'{VEHICL
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' geçersiz bilgi vermektedir
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}'{1:ENGINE}' için kargo tür değişim bilgisi yapımdan sonraki alım listesinden farklı. Bu otomatik yenileme-değiştirmenin kargo türünü doğru şekilde değiştirmesine engel olabilir
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' üretim yordamında sonsuz döngüye neden oldu
+STR_NEWGRF_BUGGY_UNKNOWN_CALLBACK_RESULT                        :{WHITE}{1:HEX} adlı callback hata ya da geçersiz sonuç döndü {2:HEX}
 
 # 'User removed essential NewGRFs'-placeholders for stuff without specs
 STR_NEWGRF_INVALID_CARGO                                        :<geçersiz kargo>
@@ -2585,6 +2611,12 @@ STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Geçen a
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Kasaba büyümesi için gerekli kargo:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} gerekli
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} kışın gerekir
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} taşındı
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (hala ihtiyaç var)
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (taşındı)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Kasaba {ORANGE}{COMMA}{BLACK} günde bir büyür
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}Kasaba {ORANGE}{COMMA}{BLACK} günde bir büyür (finanse edildiğinde)
+STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}Kasaba {RED}büyümüyor{BLACK}
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Kasabadaki gürültü sınırı: {ORANGE}{COMMA}{BLACK}  En fazla: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Ana görüntüyü şehrin üzerine ortala
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Belediye
@@ -2633,6 +2665,29 @@ STR_GOALS_NONE                                                  :{ORANGE}- Hiçb
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Şirket hedefleri:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Ana görünümü istenen fabrika/kasaba/kareye getirmek için hedefe tıklayın. Ctrl+Tıklama fabrika/kasaba/kare konumunda yeni bir pencerede görünüm açar
 
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Soru
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :İptal
+STR_GOAL_QUESTION_BUTTON_OK                                     :Tamam
+STR_GOAL_QUESTION_BUTTON_NO                                     :Hayır
+STR_GOAL_QUESTION_BUTTON_YES                                    :Evet
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Reddet
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Kabul et
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Göz ardı et
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Yeniden dene
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Önceki
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Sonraki
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Dur
+STR_GOAL_QUESTION_BUTTON_START                                  :Başla
+STR_GOAL_QUESTION_BUTTON_GO                                     :Git
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Devam et
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Yeniden başlat
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Ertele
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Yenilgiyi kabul et
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Kapat
+
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Teşvikler
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Teklif edilmiş teşvikler:
@@ -3253,6 +3308,10 @@ STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Seçili
 
 STR_ORDER_REFIT                                                 :{BLACK}Modifiye
 STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Bu talimatta değiştirilecek kargo türünü seçin. Değiştirmeyi kaldırmak için Ctrl ile tıklayın
+STR_ORDER_REFIT_AUTO                                            :{BLACK}Otomatik modifiye et
+STR_ORDER_REFIT_AUTO_TOOLTIP                                    :{BLACK}Bu emirde hangi cargo tipine otomatik modify edileceğini seçin. Ctrl+Tık ile modifye emrini kaldırın. Otomatik modifiye izin verilen araçlarda mümkündür
+STR_ORDER_DROP_REFIT_AUTO                                       :Sabit kargo tipi
+STR_ORDER_DROP_REFIT_AUTO_ANY                                   :Var olan kargo tipi
 
 STR_ORDER_SERVICE                                               :{BLACK}Bakım
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Her zaman git
@@ -3341,7 +3400,20 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Boşaltma ve t
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Boşaltma ve herhangi bir tam dolduruşu bekle)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Boşaltma ve yükleme yok)
 
+STR_ORDER_AUTO_REFIT                                            :({STRING} taşımak için otomatik modifiye et)
+STR_ORDER_FULL_LOAD_REFIT                                       :({STRING} taşımak için otomatik modifiye et ve tam doldur)
+STR_ORDER_FULL_LOAD_ANY_REFIT                                   :({STRING} taşımak için otomatik modifiye et ve herhangi bir kargoyu tam doldur)
+STR_ORDER_UNLOAD_REFIT                                          :({STRING} taşımak için otomatik modifiye et ve boşalt)
+STR_ORDER_UNLOAD_FULL_LOAD_REFIT                                :({STRING} taşımak için otomatik modifiye et, boşalt ve tam doldur)
+STR_ORDER_UNLOAD_FULL_LOAD_ANY_REFIT                            :({STRING} taşımak için otomatik modifiye et, boşalt ve herhangi bir kargoyu tam doldur)
+STR_ORDER_TRANSFER_REFIT                                        :({STRING} taşımak için otomatik modifiye et, aktar ve kargo al)
+STR_ORDER_TRANSFER_FULL_LOAD_REFIT                              :({STRING} taşımak için otomatik modifiye et, aktar ve tam doldur)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY_REFIT                          :({STRING} taşımak için otomatik modifiye et, aktar ve herhangi bir kargoyu tam doldur)
+STR_ORDER_NO_UNLOAD_REFIT                                       :({STRING} taşımak için otomatik modifiye et, boşaltmadan kargo al)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_REFIT                             :({STRING} taşımak için otomatik modifiye et ve boşaltmadan tam doldur)
+STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY_REFIT                         :({STRING} taşımak için otomatik modifiye et, boşaltmadan herhangi bir kargoyu tam doldur)
 
+STR_ORDER_AUTO_REFIT_ANY                                        :var olan kargo tipi
 
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[yakın uç]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[orta]
@@ -3569,6 +3641,7 @@ STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Oyun dur
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} belediyesi buna izin vermiyor
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} belediyesi bu şehir için başka havalimanına izin vermiyor
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} belediyesi gürültü endişesiyle havalimanına izin vermiyor
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Rüşvet teşebbüsünüz müfettişler tarafından tespit edildi
 
 # Levelling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Burada arazi yükseltilemez...

src/lang/ukrainian.txt

@@ -1158,7 +1158,7 @@ STR_DIFFICULTY_LEVEL_SETTING_CITY_APPROVAL                      :{LTBLUE}Від
 ############ range for difficulty settings ends
 
 STR_NONE                                                        :нема
-STR_FUNDING_ONLY                                                :Тільки фінансування
+STR_FUNDING_ONLY                                                :тільки профінансоване
 STR_MINIMAL                                                     :мінімально
 STR_NUM_VERY_LOW                                                :дуже мало
 STR_NUM_LOW                                                     :мало
@@ -1895,7 +1895,7 @@ STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Вста
 # Network chat
 STR_NETWORK_CHAT_SEND                                           :{BLACK}Відправити
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Команда] :
-STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Личное] {STRING}:
+STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Приватне] {STRING}:
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Всім] :
 
 STR_NETWORK_CHAT_COMPANY                                        :[Команда] {STRING}: {WHITE}{STRING}
@@ -1924,6 +1924,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Вас
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Вас відключено від гри
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}На цьому сервері грати нечесно не можна
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Ви посилали забагато команд серверу
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Ви занадто довго вводили пароль
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Ви дуже довго приєднувалися
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Ви дуже довго завантажували мапу
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Ви дуже довго приєднувалися до серверу
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :фатальна помилка
@@ -1942,6 +1946,8 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :відключ
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :спроба грати нечесно
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :сервер переповнений
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :посилав забагато команд
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :вчасно не отримав пароль
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :мапа дуже довго завантажувалась
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Можлива втрата з'єднання
@@ -2579,6 +2585,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Змін
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Ліцензія
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Встановлення параметрів
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Показати параметри
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Переключити палітру
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Переключити палітру обраного NewGRF.{}Зробіть це, якщо графіка з цього NewGRF виглядає рожевою у грі
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Застосувати зміни
@@ -2655,17 +2662,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} ма
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} потребує версію OpenTTD не нижче {STRING}
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF-файл, для якого це призначалось перекласти
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Завантажено забагато NewGRF-файлів
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Завантаження {2:STRING} як статичного NewGRF з {4:STRING} може викликати десинхронізацію
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Неочікуваний спрайт
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Невідома властивість Action 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Спроба використання невірного ID
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Завантаження {1:STRING} як статичного NewGRF з {STRING} може викликати десинхронізацію
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} містить зіпсований спрайт. Усі зіпсовані спрайти будуть показані як червоний знак питання (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Містить багато записів Action 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Читання за кінцем псевдоспрайту
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}У базовому наборі графіки, що зараз використовується не вистачає спрайтів.{}Будь-ласка оновіть базовий набір графіки
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Запитуваний GRF ресурс є недоступним
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} був вимкнений {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Невірний/невідомий формат розміщення спрайтів
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} був вимкнений {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Обережно!
@@ -2794,8 +2794,27 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Цілі
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Клік мишкою на цілі (меті) відобразить по центру промисловість/місто/клітинку у головному вікні. Ctrl+клік відкриє міні-вікно
 
 # Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Питання
 
 ### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Відмінити
+STR_GOAL_QUESTION_BUTTON_OK                                     :Гаразд
+STR_GOAL_QUESTION_BUTTON_NO                                     :Ні
+STR_GOAL_QUESTION_BUTTON_YES                                    :Так
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Відхилити
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Прийняти
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ігнорувати
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Спробувати ще раз
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Попереднє
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Наступне
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Стоп
+STR_GOAL_QUESTION_BUTTON_START                                  :Старт
+STR_GOAL_QUESTION_BUTTON_GO                                     :Вперед
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Продовжити
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Перезапустити
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Відкласти
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Здатися
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Закрити
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Субсидії

src/lang/unfinished/basque.txt

@@ -747,6 +747,7 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Aldaket
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Subsidioak
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Informazio generala
 
+
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Hiritarrak ospatzen dute . . .{} {STATION}era heltzen den lehenengo trena!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}Hiritarrek ospatzen dute . . .{} {STATION}era heltzen del lehenengo autobusa!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}Hiritarrek ospatzen dute . . .{} {STATION}era heltzen den lehenengo kamioia!
@@ -1299,6 +1300,8 @@ STR_CONFIG_SETTING_PATHFINDER_YAPF_RECOMMENDED                  :YAPF {BLUE}(Gom
 
 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Ezarpenaren balioa aldatu
 
+# Config errors
+
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
 
@@ -1401,6 +1404,8 @@ STR_NETWORK_CONNECTING_DOWNLOADING_2                            :{BLACK}{BYTES}
 
 # Network messages
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Komandu gehiegi bidaltzen hari zara zerbitzarira
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Luzeegia hartu duzu pasahitza idatzi
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Zure ordenagailua hartu luzeegia join
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :komandu gehiegi bidali dira
@@ -1593,6 +1598,7 @@ STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Ikusi "i
 STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Aldaketak
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Lizentzia
 
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Erakutsi parametroak
 
 
 STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Bertsioa: {SILVER}{NUM}
@@ -1637,8 +1643,7 @@ STR_SPRITE_ALIGNER_GOTO_CAPTION                                 :{WHITE}Joan "sp
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}NewGRF errore larri bat gertatu da: {}{STRING}
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Aukeratuta daukazun oinarrizko grafiko paketean "sprite" batzuk falta dira.{}Mesedez eguneratu oinarrizko grafiko paketea
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Eskatutako GRF baliabideak ez daude erabilgarri
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} desgaitua izan da {4:STRING}(en)gatik
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} desgaitua izan da {STRING}(en)gatik
 
 # NewGRF related 'general' warnings
 
@@ -1685,6 +1690,21 @@ STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPAN
 
 
 
+# Goal window
+
+# Goal question window
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Hurrengoa
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Stop
+STR_GOAL_QUESTION_BUTTON_START                                  :Hasi
+STR_GOAL_QUESTION_BUTTON_GO                                     :joan
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Jarraitu
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Restart
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :atzeratzeko
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :errendizioaren
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Itxi
+
 # Subsidies window
 
 # Station list window
@@ -1723,6 +1743,8 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 
 
 
+# Company infrastructure window
+
 # Industry directory
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
 
@@ -1886,6 +1908,7 @@ STR_ORDER_IMPLICIT                                              :(Implizitua)
 
 
 
+
 # Time table window
 
 
@@ -1912,13 +1935,13 @@ STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Berriz e
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}IA honen depurazio emaitza ikusi
 
 
-
 # AI configuration window
 
 STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Gora Mugitu
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Behera Mugitu
 
 
+
 # Available AIs window
 
 
@@ -2082,6 +2105,12 @@ STR_SV_STNAME_WAYPOINT                                          :{STRING}
 # Vehicle names
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_STEEL_TRUCK                   :Uhl Altzairu Kamioia
 STR_VEHICLE_NAME_ROAD_VEHICLE_KELLING_STEEL_TRUCK               :Kelling Altzairu Kamioia
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_ARMORED_TRUCK              :Foster Blindatuak Kamioia
+STR_VEHICLE_NAME_ROAD_VEHICLE_FOSTER_FOOD_VAN                   :Foster Elikadura Van
+STR_VEHICLE_NAME_ROAD_VEHICLE_PERRY_FOOD_VAN                    :Perry Elikadura Van
+STR_VEHICLE_NAME_ROAD_VEHICLE_CHIPPY_FOOD_VAN                   :Chippy Elikadura Van
+STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_PAPER_TRUCK                   :Uhl Paper Kamioia
+STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_PAPER_TRUCK                :Balogh Paper Kamioia
 STR_VEHICLE_NAME_ROAD_VEHICLE_GOSS_COPPER_ORE_TRUCK             :Goss Kobre Kamioia
 STR_VEHICLE_NAME_ROAD_VEHICLE_BALOGH_FRUIT_TRUCK                :Balogh Fruit Kamioia
 STR_VEHICLE_NAME_ROAD_VEHICLE_UHL_FRUIT_TRUCK                   :Uhl Fruta Kamioia

src/lang/unfinished/frisian.txt

@@ -287,6 +287,7 @@ STR_SORT_BY_INTRO_DATE                                          :Yntroduksjedatu
 STR_SORT_BY_RUNNING_COST                                        :Bedriuwskosten
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Vermogen/Bedriuwskosten
 STR_SORT_BY_CARGO_CAPACITY                                      :Frachtkapasiteit
+STR_SORT_BY_RANGE                                               :Beryk
 
 # Tooltips for the main toolbar
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausear spul
@@ -442,8 +443,8 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Skeakel console oan/ût
 STR_ABOUT_MENU_AI_DEBUG                                         :AI / GameScript debug
 STR_ABOUT_MENU_SCREENSHOT                                       :Skermfoto
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :tichtby helje skermfoto
-STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :skermfoto fan de hiele wrald
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Tichtby helje skermfoto
+STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Skermfoto fan de hiele wrald
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Oer 'IepenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Flakken rjochtsje
 ############ range ends here
@@ -694,7 +695,7 @@ STR_SMALLMAP_LEGENDA_DESERT                                     :{TINY_FONT}{BLA
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINY_FONT}{BLACK}Snie
 
 STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Set doarpsnammen oan/út op 'e kaart
-STR_SMALLMAP_CENTER                                             :{BLACK} Set dit plak sintraal yn de kaart
+STR_SMALLMAP_CENTER                                             :{BLACK}Set dit plak sintraal yn de kaart
 STR_SMALLMAP_INDUSTRY                                           :{TINY_FONT}{STRING} ({NUM})
 STR_SMALLMAP_COMPANY                                            :{TINY_FONT}{COMPANY}
 STR_SMALLMAP_TOWN                                               :{TINY_FONT}{WHITE}{TOWN}
@@ -745,6 +746,7 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Feroari
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Subsydzjes
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Algemiene ynformaasje
 
+STR_NEWS_CUSTOM_ITEM                                            :{BIG_FONT}{BLACK}{STRING}
 
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Ynwenners fiere feest . . .{}Earste trein komt oan yn {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}Ynwenners fiere feest . . .{}Earste bus komt oan yn {STATION}!
@@ -1308,6 +1310,12 @@ STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}Plak fa
 STR_CONFIG_SETTING_STATUSBAR_POS                                :{LTBLUE}Posysje fan statusbar: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Maximum oantal non-sticky finsters: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Maximum oantal non-sticky finsters: {ORANGE}ferbean
+STR_CONFIG_SETTING_ZOOM_LVL_MIN                                 :4x
+STR_CONFIG_SETTING_ZOOM_LVL_IN_2X                               :2x
+STR_CONFIG_SETTING_ZOOM_LVL_NORMAL                              :Normaal
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X                              :2x
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X                              :4x
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X                              :8x
 STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}Tempo fan stêdsútwreiding: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :gjin
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :langsaam
@@ -1601,6 +1609,8 @@ STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Taskôgj
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nei Bedriuw
 
 # Network client list
+STR_NETWORK_CLIENTLIST_KICK                                     :Skoppe
+STR_NETWORK_CLIENTLIST_GIVE_MONEY                               :Jouw jild
 
 STR_NETWORK_SERVER                                              :Tsjinner
 
@@ -1608,13 +1618,19 @@ STR_NETWORK_SERVER                                              :Tsjinner
 # Network set password
 
 # Network company info join/password
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Mei spielje
 
 # Network chat
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Stjoer
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
+STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Privee] {STRING}:
+STR_NETWORK_CHAT_ALL_CAPTION                                    :[Yderiin] :
 
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] Oan {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_CLIENT                                         :[Privee] {STRING}: {WHITE}{STRING}
+STR_NETWORK_CHAT_TO_CLIENT                                      :[Privee] Nei {STRING}: {WHITE}{STRING}
+STR_NETWORK_CHAT_ALL                                            :[Yderiin] {STRING}: {WHITE}{STRING}
 
 # Network messages
 STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Koe de tsjinner net starte
@@ -1631,6 +1647,7 @@ STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Mooglik
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION                    :{WHITE}De lêste{NUM} secondes {P "" s} is gjin data oankom fan e server
 
 # Network related errors
+STR_NETWORK_SERVER_MESSAGE                                      :*** {1:STRING}
 ############ Leave those lines in this order!!
 ############ End of leave-in-this-order
 STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} der is ien bykommen(Client #{2:NUM})
@@ -1650,6 +1667,7 @@ STR_CONTENT_DETAIL_FILESIZE                                     :{SILVER}Bestân
 
 # Order of these is important!
 STR_CONTENT_TYPE_NEWGRF                                         :NewGRF
+STR_CONTENT_TYPE_AI                                             :AI
 STR_CONTENT_TYPE_SCENARIO                                       :Lânskip
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Hichtemap
 
@@ -1720,6 +1738,7 @@ STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selektea
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selektear brêge
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brêge seleksje - klik op de brêge dyst boue wolst
 STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY_LONG}
+STR_SELECT_BRIDGE_SCENEDIT_INFO                                 :{GOLD}{STRING},{} {VELOCITY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hingbrêge, Stiel
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Brêge mei balken, Stiel
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Fakwurkbrêge, Stiel
@@ -1958,12 +1977,14 @@ STR_MAPGEN_BY                                                   :{BLACK}*
 
 # Strings for map borders at game generation
 
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} x {NUM}
 
 
 # SE Map generation
 
 
 # Map generation progress
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Objekt meitsje
 
 # NewGRF settings
@@ -2020,10 +2041,11 @@ STR_SPRITE_ALIGNER_PREVIOUS_BUTTON                              :{BLACK}Foarig f
 STR_SPRITE_ALIGNER_GOTO_CAPTION                                 :{WHITE}Gea ny flak
 
 # NewGRF (self) generated warnings/errors
+STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Warskôging: {SILVER}{STRING}
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} makke om te brûken tegeare my{STRING}
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Tevolle NewGRF's binne laden
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} wie útskeakele troch {4:STRING}
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} wie útskeakele troch {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Warskôging!
@@ -2096,6 +2118,11 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING            :{YELLOW}Begjin
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY            :{YELLOW}Bou in stânbyld ter eare fan jo bedriuw.{}Kostet: {CURRENCY_LONG}
 
 # Goal window
+STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
+
+# Goal question window
+
+### Start of Goal Question button list
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsydzjes
@@ -2207,6 +2234,7 @@ STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Wy sykje
 # Company infrastructure window
 
 # Industry directory
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2222,6 +2250,7 @@ STR_INDUSTRY_VIEW_REQUIRES_CARGO_CARGO_CARGO                    :{BLACK}Nedich:
 ############ range for requires ends
 
 ############ range for produces starts
+STR_INDUSTRY_VIEW_WAITING_STOCKPILE_CARGO                       :{YELLOW}{CARGO_LONG}{STRING}{BLACK}
 STR_INDUSTRY_VIEW_PRODUCES_CARGO                                :{BLACK}Produseart: {YELLOW}{STRING}{STRING}
 STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Produseart: {YELLOW}{STRING}{STRING}, {STRING}{STRING}
 ############ range for produces ends
@@ -2281,6 +2310,9 @@ STR_DEPOT_CAPTION                                               :{WHITE}{DEPOT}
 STR_DEPOT_RENAME_TOOLTIP                                        :{BLACK}jou nije namme oan depot
 STR_DEPOT_RENAME_DEPOT_CAPTION                                  :Jou nije namme oan depot
 
+STR_DEPOT_NO_ENGINE                                             :{BLACK}-
+STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
+STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO_LONG} ({CARGO_SHORT})
 
 
 
@@ -2311,6 +2343,7 @@ STR_REPLACE_VEHICLE_AIRCRAFT                                    :Fleanmasine
 
 
 # Vehicle view
+STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 
 
 
@@ -2365,6 +2398,8 @@ STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Selektea
 
 # Order view
 
+STR_ORDER_INDEX                                                 :{COMMA}:{NBSP}
+STR_ORDER_TEXT                                                  :{STRING} {STRING} {STRING}
 
 
 # Order bottom buttons
@@ -2391,8 +2426,11 @@ STR_ORDER_GO_TO_WAYPOINT                                        :Lâns {WAYPOINT
 STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Oanienwei lâns {WAYPOINT}
 
 
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {DEPOT}
 
 
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_IMPLICIT                                              :(Ymplisyt)
 
@@ -2440,9 +2478,13 @@ STR_ERROR_AI_NO_AI_FOUND                                        :Gjin geskikte c
 # AI configuration window
 
 
+STR_AI_CONFIG_AI                                                :{SILVER}AIs
 
+STR_AI_CONFIG_CHANGE_NONE                                       :
+STR_AI_CONFIG_CHANGE_AI                                         :AI
 
 # Available AIs window
+STR_AI_LIST_CAPTION_AI                                          :AIs
 
 STR_AI_LIST_VERSION                                             :{BLACK}Ferzje: {NUM}
 STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
@@ -2451,10 +2493,17 @@ STR_AI_LIST_ACCEPT                                              :{BLACK}Akseptea
 STR_AI_LIST_CANCEL                                              :{BLACK}Annulearje
 
 # AI Parameters
+STR_AI_SETTINGS_CAPTION_AI                                      :AI
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Slúte
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 
 # Vehicle loading indicators
+STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
+STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
+STR_PERCENT_DOWN_SMALL                                          :{TINY_FONT}{WHITE}{NUM}%{DOWN_ARROW}
+STR_PERCENT_DOWN                                                :{WHITE}{NUM}%{DOWN_ARROW}
+STR_PERCENT_UP_DOWN_SMALL                                       :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}{DOWN_ARROW}
+STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UP_ARROW}{DOWN_ARROW}
 
 # Income 'floats'
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINY_FONT}{RED}Kostet: {CURRENCY_LONG}
@@ -3226,6 +3275,7 @@ STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLA
 STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}

src/lang/unfinished/persian.txt

@@ -113,7 +113,7 @@ STR_QUANTITY_DIAMONDS                                           :{COMMA} بست
 STR_QUANTITY_FOOD                                               :{WEIGHT_LONG} غذا
 STR_QUANTITY_PAPER                                              :{WEIGHT_LONG}از کاغذ
 STR_QUANTITY_GOLD                                               :{COMMA} بسته‌ی طلا
-STR_QUANTITY_WATER                                              :{VOLUME_LONG} آب
+STR_QUANTITY_WATER                                              :{VOLUME_LONG}از آب
 STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} گندم
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} کائوچو
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} شکر
@@ -446,7 +446,8 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :باز و بسته کردن کنسول
 STR_ABOUT_MENU_AI_DEBUG                                         :خطایابی هوش مصنوعی
 STR_ABOUT_MENU_SCREENSHOT                                       :تصویر از بازی
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :عکس از صفحه زوم شده
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :عکس از صفحه تمام بزرگنمایی شده
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :اندازه پیش فرض عکس برداری از صفحه
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :تصویر از همه نقشه
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD' درباره
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :تراز کردن تصویر گرافیکی
@@ -1147,6 +1148,7 @@ STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}جاد
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}جابجا‌شدن نمایش هنگام نزدیک شدن نشانگر موس به لبه ها: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}قابلیت رشوه دادن به مقامات محلی: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}قابلیت انحصاری کردن حقوق حمل و نقل: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :{LTBLUE}اجازه ساخت و ساز ساختمان: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :{LTBLUE}قابلیت بازسازی خیابان‌های شهر: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :{LTBLUE}قابلیت فرستادن پول به بقیه شرکت‌ها: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :{LTBLUE}مضرب برای بار قطار تا حس قطار سنگین به وجود آید: {ORANGE}{STRING}
@@ -1160,6 +1162,7 @@ STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}اجا
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}قابلیت ساخت ایستگاه‌های متصل به هم: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}قابلیت استفاده از چندین بسته NewGRF: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}تغییر دادن این تنظیم هنگامی که خودرو وجود دارد ممکن نیست
+STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :{LTBLUE}تعمیر و نگهداری زیرساخت ها: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :{LTBLUE}فرودگاه‌ها هیچ‌گاه از کار نیافتند: {ORANGE}{STRING}
 
@@ -1269,6 +1272,7 @@ STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}غیر
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}غیر فعال بودن کشتی برای رایانه: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}امکان حضور هوش مصنوعی در بازی چندنفره: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SCRIPT_MAX_OPCODES                           :{LTBLUE}#opcodes before scripts are suspended: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}درصد زمان برای تعمیر/نگهداری به نسبت زمان کار: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}فاصله زمانی پیش فرض برای تعمیر/بازنگری قطار: {ORANGE}{STRING} روز/%
@@ -1325,6 +1329,14 @@ STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}چسب
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}چسبيدن پنجره ها به هم در نزديک شدن به يکديگر: {ORANGE}غیرفعال
 STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}بیشترین تعداد پنجره‌های غیرمهم: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}بیشترین مقدار پنجره های غیرمهم: {ORANGE}غیرفعال
+STR_CONFIG_SETTING_ZOOM_MIN                                     :{LTBLUE}بیشترین حد زوم به درون: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ZOOM_MAX                                     :{LTBLUE}بیشترین حد زوم به بیرون: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ZOOM_LVL_MIN                                 :4x
+STR_CONFIG_SETTING_ZOOM_LVL_IN_2X                               :2x
+STR_CONFIG_SETTING_ZOOM_LVL_NORMAL                              :عادی
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_2X                              :2x
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_4X                              :4x
+STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X                              :8x
 STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}سرعت رشد شهر: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :هیچکدام
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :آهسته
@@ -1353,6 +1365,7 @@ STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}مسی
 STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}قطارها
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}شهرها
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}صنایع
+STR_CONFIG_SETTING_ECONOMY_SCRIPTS                              :{ORANGE}کدها
 
 STR_CONFIG_SETTING_PATHFINDER_OPF                               :اصلی
 STR_CONFIG_SETTING_PATHFINDER_NPF                               :NPF
@@ -1366,6 +1379,18 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}برگ
 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}تغییر مقدار
 
 # Config errors
+STR_CONFIG_ERROR                                                :{WHITE}خطا در فایل تنظیمات...
+STR_CONFIG_ERROR_ARRAY                                          :{WHITE}... خطا در آرایه '{STRING}'
+STR_CONFIG_ERROR_INVALID_VALUE                                  :{WHITE}... مقدار نامعتبر '{STRING}' برای '{STRING}'
+STR_CONFIG_ERROR_TRAILING_CHARACTERS                            :{WHITE}...کاراکترهای انتهایی در پایان تنظیم '{STRING}'
+STR_CONFIG_ERROR_DUPLICATE_GRFID                                :{WHITE}...نادیده گرفتن فایل NewGRF '{STRING}': شناسه تکراری با '{STRING}'
+STR_CONFIG_ERROR_INVALID_GRF                                    :{WHITE}... نادیده گرفتن فایل NewGRF '{STRING}': {STRING}
+STR_CONFIG_ERROR_INVALID_GRF_NOT_FOUND                          :پیدا نشد
+STR_CONFIG_ERROR_INVALID_GRF_UNSAFE                             :ناامن برای استفاده ایستا
+STR_CONFIG_ERROR_INVALID_GRF_SYSTEM                             :system NewGRF
+STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :با این ورژن از OpenTTD همخوانی ندارد
+STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :ناشناخته
+STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... سطح فشردگی'{STRING}' معتبر نیست
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... قالب ذخیره بازی '{STRING}' در دسترس نیست.برگردان به '{STRING}'
 
 # Intro window
@@ -1774,6 +1799,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}شما
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}شما از بازی اخراج شدید
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}تقلب روی این سرویس دهنده ممنوع است
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}شما دستورات بسیار زیادی به سرویس دهنده فرستادید
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}شما بیش از حد زمان برای وارد کردن گذرواژه صرف کردید
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}رایانه شما بیش از حد برای پیوستن به بازی زمان صرف کرده
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}شما بیش از حد زمان برای بارگیری نقشه گذراندید
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}شما بیش از حد زمان برای پیوستن به سرویس دهنده گذراندید
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :خطای اصلی
@@ -1792,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :اخراج تو
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :تلاش کرد از تقلب استفاده کند
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :سرویس دهنده پر
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :دستورات زیادی ارسال کرده
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :هیچ گذرواژه ای در زمان مقرر دریافت نگردید
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :خطای کلی طول کشیدن زمان بیش از حد
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :بارگیری نقشه بیش از حد طول کشید
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :پردازش نقشه بیش از حد طول کشید
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}اتصال مورد استفاده قطع شد
@@ -1888,6 +1921,9 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... ار
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... فایل قابلیت درج ندارد
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}بازگشایی فایل بارگیری شده ممکن نیست
 
+STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}گرافیک های یافت نشده
+STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}بله, فایلهای گرافیک را بارگیری کن
+STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}خیر, خروج OpenTTD
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}گزینه های شفافیت
@@ -2421,8 +2457,11 @@ STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}لیست
 
 # Additional textfiles accompanying NewGRFs
 STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}مشاهده راهنما
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}گزارش تغییر
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}گواهی
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}ثبت پارامترها
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}نمایش پارامترها
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}تغییر پالت
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}تغییر نوع پالت برای NewGRF مورد نظر.{}اگر گرافیک صورتی رنگ به نظر آمد این پالت را تغییر دهید
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}ثبت تغییرات
@@ -2454,6 +2493,8 @@ STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}تعد
 
 # NewGRF textfile window
 STR_NEWGRF_README_CAPTION                                       :{WHITE}راهنمای NewGRF {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF گزارش تغییرات {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF گواهی {STRING}
 
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}رسیدگی - {STRING}
@@ -2497,17 +2538,10 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} با
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} نیاز به OpenTTD با ویرایش {STRING} یا بالاتر نیاز است
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :فایل GRF برای ترجمه شدن طراحی شده
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :تعداد NewGRF بیشتر از حد می باشد
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :در حال بارگزاری {2:STRING} به عنوان NewGRF ایستا با {4:STRING} مشکل همخوانی دارد
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :تصویر غیر منتظره
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :ویژگی فعالیت 0 ناشناخته است
-STR_NEWGRF_ERROR_INVALID_ID                                     :تلاش برای استفاده از آی دی نا معتبر
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :در حال بارگزاری {1:STRING} به عنوان NewGRF ایستا با {STRING} مشکل همخوانی دارد
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} دارای یک تصویر خراب می باشد. تصویرهای خراب با علامت سوال قرمز (؟) نشان داده شدند.
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :دارای چندین ورودی فعالیت 8 می باشد
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :خواندن تصویر از انتها گذشت
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}بسته گرافیک استفاده شده تعدادی از تصاوبر را ندارد.{}لطفا بسته گرافیکی را به روز کنید
-STR_NEWGRF_ERROR_GRM_FAILED                                     :منبع GRF درخواست شده در دسترس نمی باشد.
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} غیر فعال گردیده توسط {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :طرح با قالب ناشناخته/نامعتبر
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} غیر فعال گردیده توسط {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}اخطار!
@@ -2555,6 +2589,7 @@ STR_NEWGRF_SCAN_ARCHIVES                                        :جستجوی د
 STR_SIGN_LIST_CAPTION                                           :{WHITE}لیست امضاء - {COMMA} امضاء{P "" "ها"}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}حالت تطبیق
 STR_SIGN_LIST_CLEAR                                             :{BLACK}پاک کردن همه فیلترها
+STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}تاثیر/عدم تاثیر کوچک یا بزرگ بودن حروف برای فیلتر کردن
 STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}پاک کردن متن فیلتر
 
 # Sign window
@@ -2580,6 +2615,12 @@ STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}نامه
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}نوع بار برای رشد شهر:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} ضروری
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} در زمستان ضروری است
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} دریافت گردید
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (هنوز نیاز است)
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (دریافت گردیده)
+STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}رشد شهر هر {ORANGE}{COMMA}{BLACK} روز
+STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}رشد شهر هر {ORANGE}{COMMA}{BLACK} روز (ساخته شده)
+STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}شهر رشد {RED}نمی {BLACK} کند
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}حد سروصدا در شهر: {ORANGE}{COMMA}{BLACK}  بیشینه: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}نمایش شهر در وسط صفحه نمایش. کنترل+کلیک یک نمای اضافه از شهر باز می کند
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}مقامات محلی
@@ -2626,6 +2667,30 @@ STR_GOALS_GLOBAL_TITLE                                          :{BLACK}اهدا
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- هیچکدام -
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}اهداف شرکت:
+STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}روی هدف کلیک کنید تا نمای اصلی را به مرکز صنایع/شهر/قطعه ببرد. Ctrl+Click یک نمای جدید از محل صنایع/شهر قطعه باز می کند
+
+# Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :سوال
+
+### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :لغو
+STR_GOAL_QUESTION_BUTTON_OK                                     :باشد
+STR_GOAL_QUESTION_BUTTON_NO                                     :خیر
+STR_GOAL_QUESTION_BUTTON_YES                                    :بله
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :غیرقایل قبول
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :قبول
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :نادیده گرفتن
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :تلاش دوباره
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :قبلی
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :بعدی
+STR_GOAL_QUESTION_BUTTON_STOP                                   :ایست
+STR_GOAL_QUESTION_BUTTON_START                                  :راه‌اندازی
+STR_GOAL_QUESTION_BUTTON_GO                                     :برو
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :ادامه
+STR_GOAL_QUESTION_BUTTON_RESTART                                :راه‌اندازی دوباره
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :به تاخیر انداختن
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :تسلیم
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :بستن
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}یارانه ها
@@ -2685,28 +2750,64 @@ STR_STATION_VIEW_RENAME_STATION_CAPTION                         :نام گذار
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}تغییر نام نقطه مسیر
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}تغییر نام شناور
 
+STR_EDIT_WAYPOINT_NAME                                          :{WHITE}ویرایش نام نقطه راه
 
 # Finances window
+STR_FINANCES_EXPENDITURE_INCOME_TITLE                           :{WHITE}هزینه/دریافتی
+STR_FINANCES_YEAR                                               :{WHITE}{NUM}
+STR_FINANCES_SECTION_CONSTRUCTION                               :{GOLD}ساخت و ساز
+STR_FINANCES_SECTION_NEW_VEHICLES                               :{GOLD}خودرو های جدید
+STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}هزینه های نگهداری قطار
+STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}هزینه های نگهداری خودروهای جاده
+STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}هزینه های نگهداری هواپیما
+STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}هزینه های نگهداری کشتی
+STR_FINANCES_SECTION_PROPERTY_MAINTENANCE                       :{GOLD}هزینه های نگهداری مستغلات
+STR_FINANCES_SECTION_TRAIN_INCOME                               :{GOLD}درآمد قطارها
+STR_FINANCES_INFRASTRUCTURE_BUTTON                              :{BLACK}زیرساخت
 
 # Company view
 
 STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} هواپیما
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}ارزش شرکت: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% توسط {COMPANY} خریداری شده)
+STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}زیرساخت:
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} قطعه {P ی های} ریل
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} قطعه{P ی های}راه
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} قطعه{P ی های}آب
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} قطعه{P ی های}ایستگاه
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} فرودگاه{P "" ها}
+STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}هیچکدام
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}ساخت ساختمان مرکزی
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}دیدن ساختمان مرکزی
+STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}جزییات
+STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}مشاهده جزییات تعداد زیرساخت ها
 
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}25% سهام شرکت را بخر
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}25% سهام شرکت را بفروش
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}25% سهام این شرکت را بخر.Shift+Click برآورد قیمت سهام را نشان می دهد بدون فروختن سهام.
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}25% سهام این شرکت را بفروش.دکمه Shift+Clickبرآورد قیمت را نمایش می دهد بدون فروش سهام
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}25% سهام این شرکت را بخر.Shift+Click برآورد قیمت سهام را بدون فروش سهام نشان می دهد.
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}25% سهام این شرکت را بفروش.دکمه Shift+Clickبرآورد قیمت را بدون فروش سهام نمایش می دهد
 
 
 
 # Company infrastructure window
+STR_COMPANY_INFRASTRUCTURE_VIEW_CAPTION                         :{WHITE}زیرساخت {COMPANY}
+STR_COMPANY_INFRASTRUCTURE_VIEW_RAIL_SECT                       :{GOLD}قطعه های ریل:
+STR_COMPANY_INFRASTRUCTURE_VIEW_SIGNALS                         :{WHITE}نشانگرها
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT                       :{GOLD}قطعه های راه:
+STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD                            :{WHITE}راه
+STR_COMPANY_INFRASTRUCTURE_VIEW_TRAMWAY                         :{WHITE}تراموا
+STR_COMPANY_INFRASTRUCTURE_VIEW_WATER_SECT                      :{GOLD}قسمتهای زیر آب:
+STR_COMPANY_INFRASTRUCTURE_VIEW_CANALS                          :{WHITE}کانال ها
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATION_SECT                    :{GOLD}ایستگاه ها:
+STR_COMPANY_INFRASTRUCTURE_VIEW_STATIONS                        :{WHITE}قطعه های ایستگاه
+STR_COMPANY_INFRASTRUCTURE_VIEW_AIRPORTS                        :{WHITE}فرودگاه ها
+STR_COMPANY_INFRASTRUCTURE_VIEW_COST                            :{WHITE}{1:CURRENCY_LONG}/سال ({0:COMMA})
+STR_COMPANY_INFRASTRUCTURE_VIEW_TOTAL                           :{WHITE}{CURRENCY_LONG}/سال
 
 # Industry directory
 
@@ -3029,16 +3130,16 @@ STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}پاک
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}رفع اشکالات هوش مصنوعی
-STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}نام هوش مصنوعی
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}نام کد
 STR_AI_DEBUG_RELOAD                                             :{BLACK}بازگشایی مجدد هوش مصنوعی
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}از بین بردن هوش مصنوعی. بازگشایی اسکریپت. و شروع مجدد هوش مصنوعی
 STR_AI_GAME_SCRIPT                                              :{BLACK}کدبازی
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}دیدن گزارش های کد بازی
 
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}صفحه رفع اشکال هوش مصنوعی فقط برای سرور قابل دسترس است
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}صفحه رفع اشکال کد فقط برای سرور قابل دسترس است
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}تنظیمات هوش مصنوعی
+STR_AI_CONFIG_CAPTION                                           :{WHITE}تنظیمات هوش مصنوعی / بازی
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}کد بازی که در بازی بعدی بارگذاری می شود
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}هوش مصنوعی که در بازی بعدی بارگذاری می شود
 STR_AI_CONFIG_HUMAN_PLAYER                                      :بازیکن آدمیزاد
@@ -3055,21 +3156,21 @@ STR_AI_CONFIG_CHANGE_AI                                         :هوش مصنو
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :کد بازی
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}بارگزاری کد دیگر
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}تنظیم
-STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}تنظبم پارامتر های مربوط به هوش مصنوعی
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}تنظبم پارامتر های مربوط به کد
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}در دسترس {STRING}
 STR_AI_LIST_CAPTION_AI                                          :هوش های مصنوعی(AIs)
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :کدهای بازی
-STR_AI_LIST_TOOLTIP                                             :{BLACK}برای انتخلب هوش مصنوعی کلیک کنید
+STR_AI_LIST_TOOLTIP                                             :{BLACK}برای انتخاب روی یک کد کلیک کنید
 
 STR_AI_LIST_VERSION                                             :{BLACK}ویرایش: {NUM}
 STR_AI_LIST_URL                                                 :{BLACK}آدرس اینترنتی: {STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}قبول
-STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}انتخاب هوش مصنوعی مشخص شده
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}انتخاب کد مشخص شده
 STR_AI_LIST_CANCEL                                              :{BLACK}لغو
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}هوش مصنوعی را تغییر نده
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}کد را تغییر نده
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} پارامترها
@@ -3077,6 +3178,7 @@ STR_AI_SETTINGS_CAPTION_AI                                      :هوش مصنو
 STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :کد بازی
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}بستن
 STR_AI_SETTINGS_RESET                                           :{BLACK}بازنشاندن
+STR_AI_SETTINGS_START_DELAY                                     :تعداد روزهایی که این بازیگر هوش مصنوعی پس از بازیگر هوش مصنوعی قبلی قبل از اتصال صبر می کند(کم و بیش): {ORANGE}{STRING}
 
 # Vehicle loading indicators
 
@@ -3772,6 +3874,7 @@ STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLA
 STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}

src/lang/unfinished/thai.txt

@@ -2275,11 +2275,8 @@ STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT                     :วัตถุ
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}เกิดความผิดพลาดร้ายแรงเกี่ยวกับ NewGRF: {}{STRING}
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite.
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}กราฟิกพื้นฐานที่ใช้อยู่นี้ขาดตัวเลขของสไปรท์{}Please update the base graphics set.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :ไม่มี GRF ให้เรียกใช้
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} ถูกยกเลิกโดย {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :ไม่ถูกต้อง/ไม่รู้จักข้อมูลเลย์เอาท์ของแผ่นภาพ
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} ถูกยกเลิกโดย {STRING}
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}คำเตือน!

src/lang/vietnamese.txt

@@ -446,7 +446,8 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Bật/tắt bảng lệnh
 STR_ABOUT_MENU_AI_DEBUG                                         :Gỡ rối AI / GameScript
 STR_ABOUT_MENU_SCREENSHOT                                       :Ảnh chụp màn hình
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Phóng to ảnh chụp màn hình
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Phóng to đầy đủ ảnh chụp màn hình
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Phóng to mặc định ảnh chụp màn hình
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Ảnh màn hình toàn bản đồ
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Về 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Trình điều chỉnh sprite
@@ -1798,6 +1799,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Bạn b
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Bạn bị đá khỏi ván chơi
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheat không được phép ở server này
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Bạn vừa gửi lên máy chủ quá nhiều lệnh
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Bạn nhập mật khẩu quá trễ
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Máy của bạn mất quá nhiều thời gian tham gia
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Thời gian tải bản đồ quá lâu
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Thời gian tham gia máy chủ quá lâu
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :lỗi chung
@@ -1816,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :bí đá bởi
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :đã cố sử dụng cheat
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server đầy
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :có quá nhiều lệnh được gởi lên
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :không nhận được mật khẩu đúng thời hạn
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :lỗi quá thời gian
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :tải bản đồ quá thời gian
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :xử lý bản đồ quá thời gian
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Kết nối có thể đã bị mất
@@ -2130,7 +2139,7 @@ STR_OBJECT_CLASS_TRNS                                           :Tháp tín hi
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Cây Cối
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Chọn loại cây để trồng
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Chọn loại cây để trồng. Nếu ô đó đã có cây, thao tác này sẽ thêm hỗn hợp nhiều cây khác độc lập với loại đã chọn
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Loại cây ngẫu nhiên
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Trồng ngẫu nhiên các loại cây. Shift+Click để xem chi phí dự tính
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Trồng ngẫu nhiên
@@ -2453,6 +2462,7 @@ STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Lịch s
 STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Giấy phép
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Đặt tham số
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Hiển thị tham số
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Đổi bảng màu
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Đổi bảng màu của NewGRF.{}Hãy thực hiện việc này nếu NewGRF bị chuyển màu hồng trong khi chơi
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Áp dụng thay đổi
@@ -2519,7 +2529,7 @@ STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Cảnh báo: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_ERROR                                      :{RED}Lỗi: {SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_FATAL                                      :{RED}Lỗi nghiêm trọng: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Xảy ra lỗi NewGRF gây hư hỏng: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Xảy ra lỗi NewGRF nghiêm trọng: {}{STRING}
 STR_NEWGRF_ERROR_VERSION_NUMBER                                 :{1:STRING} sẽ không hoạt động với phiên bản TTDPatch version theo như báo cáo của OpenTTD.
 STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{1:STRING} để dành cho phiên bản {STRING} của TTD.
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{1:STRING} được thiết kế để xài với {STRING}
@@ -2529,17 +2539,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{1:STRING} ph
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} yêu cầu phiên bản OpenTTD {STRING} hoặc cao hơn.
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF file được thiết kế để phiên dịch
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Quá nhiều NewGRFs đã nạp.
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Nạp {2:STRING} như là NewGRF tĩnh với {4:STRING} có thể gây mất đồng bộ
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Sprite không mong muốn
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Không biết về thuộc tích action 0
-STR_NEWGRF_ERROR_INVALID_ID                                     :Sử dụng ID không hợp lệ.
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Nạp {1:STRING} như là NewGRF tĩnh với {STRING} có thể gây mất đồng bộ
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :sprite không hợp lệ (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Thuộc tính thực thi 0 chưa định nghĩa {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Sử dụng IT không hợp lệ (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} bị hỏng sprite. Tất cả các sprite sẽ hiện thị với dấu hỏi (?) màu đỏ.
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Chứa nhiều mục action 8.
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Đọc tới điểm cuối của sprite-giả
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Có nhiều mục thực thi 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Đọc quá giới hạn của sprite giả (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Gói đồ họa bạn đang dùng thiếu một số mẫu đồ họa.{}Hãy cập nhật gói đồ họa lên phiên bản mới.
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Tài nguyên GRF được yêu cầu không có sẵn
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} bị tắt bởi {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Khuôn dạng sprite không hợp lệ/không hiểu
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Dữ liệu GRF theo yêu cầu không hợp lệ (sprite {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} bị tắt bởi {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Định dạng Sprite không hợp lệ hoặc chưa định nghĩa (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Chú Ý!
@@ -2668,8 +2678,25 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Các m
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Click vào mục tiêu để canh giữa cửa sổ lớn chính vào ô/đô thị/nhà máy tương ứng. Ctrl+Click để mở bằng các cửa sổ bổ sung tương ứng
 
 # Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Câu Hỏi
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Thông Tin
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Cảnh Báo
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Lỗi
 
 ### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Hủy bỏ
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Không
+STR_GOAL_QUESTION_BUTTON_YES                                    :Có
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Từ chối
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Chấp nhận
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Bỏ qua
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Thử lại
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Trước
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Sau
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Dừng
+STR_GOAL_QUESTION_BUTTON_START                                  :Bắt đầu
+STR_GOAL_QUESTION_BUTTON_GO                                     :Đi
 STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Tiếp tục
 STR_GOAL_QUESTION_BUTTON_RESTART                                :Làm lại
 STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Hoãn lại
@@ -2813,8 +2840,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Đổi t
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Mua 25% cổ phần công ty
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Bán 25% cổ phần công ty
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Mua 25% cổ phần công ty này. Shift+Click để xem giá mua dự tính
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Bán 25% cổ phần công ty này. Shift+Click để xem giá bán dự tính
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Mua 25% cổ phần công ty này. Shift+Click để xem giá mua ước tính khi chưa mua
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Bán 25% cổ phần công ty này. Shift+Click để xem giá bán ước tính khi chưa bán
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Tên Công Ty
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Tên Giám Đốc
@@ -3034,7 +3061,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Tạo t
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Tạo máy bay giống hệt
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Thao tác này mua một đoàn tàu giống hệt tàu cũ, gồm cả đầu máy và toa xe. Ctrl+Click để tạo tàu mới chia sẻ lộ trình. Shift+Click để xem giá mua dự tính
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Thao tác này mua ôtô giống hệt ôtô cũ, gồm cả loại hàng chuyên chở. Ctrl+Click để tạo ôtô chia sẻ lộ trình. Shift+Click để xem giá mua dự tính
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Thao tác này mua ôtô giống hệt ôtô cũ.Click vào nút này để thực hiện thao tác đối với xe trong xưởng hoặc ngoài xưởng. Ctrl+Click để tạo ôtô chia sẻ lộ trình. Shift+Click để xem giá mua ước tính
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Thao tác này mua tàu thuỷ giống hệt tàu thuỷ cũ, gồm cả loại hàng chuyên chở. Ctrl+Click để tạo tàu thuỷ chia sẻ lộ trình. Shift+Click để xem giá mua dự tính
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Thao tác này mua máy bay giống hệt máy bay cũ, gồm cả loại hàng chuyên chở. Ctrl+Click để tạo máy bay chia sẻ lộ trình. Shift+Click để xem giá mua dự tính
 

src/lang/welsh.txt

@@ -446,7 +446,7 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Toglu Consol
 STR_ABOUT_MENU_AI_DEBUG                                         :Dadnamu AI / GameScript
 STR_ABOUT_MENU_SCREENSHOT                                       :Ciplun
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ciplun agos
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ciplun lefel mwyhád uchaf
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Ciplun pellter rhagosodedig
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Ciplun o'r map cyfan
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Gwybodaeth am 'OpenTTD'
@@ -667,8 +667,8 @@ STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}Dangos d
 STR_SMALLMAP_TOOLTIP_SHOW_TRANSPORT_ROUTES_ON                   :{BLACK}Dangos llwybrau cludo ar y map
 STR_SMALLMAP_TOOLTIP_SHOW_VEGETATION_ON_MAP                     :{BLACK}Dangos llystyfiant ar y map
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Dangos perchnogion tir ar y map
-STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Cliciwch ar ddiwydiant i doglo ei arddangos. Mae Ctrl+Clicio'n cuddio pob math ond yr un a ddewiswyd. Ctrl+Cliciwch arno eto i ddangos pob diwydiant
-STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Cliciwch ar gwmni i doglo arddangos ei eiddo. Mae Ctrl+Clicio'n cuddio pob cwmni ond yr un a ddewiswyd. Ctrl+Cliciwch arno eto i ddangos pob cwmni
+STR_SMALLMAP_TOOLTIP_INDUSTRY_SELECTION                         :{BLACK}Cliciwch ar ddiwydiant i doglo ei arddangos. Mae Ctrl+Clic'n cuddio pob math ond yr un a ddewiswyd. Ctrl+Cliciwch arno eto i ddangos pob diwydiant
+STR_SMALLMAP_TOOLTIP_COMPANY_SELECTION                          :{BLACK}Cliciwch ar gwmni i doglo arddangos ei eiddo. Mae Ctrl+Clic yn cuddio pob cwmni ond yr un a ddewiswyd. Ctrl+Cliciwch arno eto i ddangos pob cwmni
 
 STR_SMALLMAP_LEGENDA_ROADS                                      :{TINY_FONT}{BLACK}Ffyrdd
 STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINY_FONT}{BLACK}Rheilffyrdd
@@ -983,12 +983,12 @@ STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}amlhau y
 STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}newid y raddfa gyfnewid o eich arian cyfred i un Punt (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Gwahanydd: {ORANGE}{STRING}
-STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Creu yr ysgar i eich arian Cyfred
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Dewis y nod gwahanu ar gyfer eich arian
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Rhagddodiad: {ORANGE}{STRING}
-STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Creu yr rhagddodiad i eich arian Cyfred
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Dewis y rhagddodiad ar gyfer eich arian
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Olddodiad: {ORANGE}{STRING}
-STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Creu yr olddodiad i eich arian Cyfred
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Dewis yr ôl-lddodiad ar gyfer eich arian
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Newid i'r Ewro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Newid i'r Ewro: {ORANGE}byth
@@ -1411,7 +1411,7 @@ STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Gwirio C
 STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Gosodiadau AI / Gêm
 STR_INTRO_QUIT                                                  :{BLACK}Gadael
 
-STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Dechrau gêm newydd. Mae Ctrl+Clicio yn hepgor dewisiadau map
+STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Dechrau gêm newydd. Mae Ctrl+Clic yn hepgor dewisiadau map
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Llwytho Gêm sydd wedi'i Gadw
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Dechrau gêm newydd, gan ddefnyddio'r map uchder fel tirwedd
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Dechrau gêm newydd, gan ddefnyddio senario wedi'i haddasu
@@ -1799,6 +1799,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Rydych c
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}YCafoch chi eich cicio o'r gêm
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Ni chaniateir twyllo ar y gweinydd hwn
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Roeddech yn gyrru gormod o orchmynion i'r gweinydd
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Fe gymeroch ormod o amser i fewnbynnu'r cyfrinair
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Roedd eich cyfrifiadur yn cymeryd gormod o amser i ymuno
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Fe gymeroch ormod o amser i lawrlwytho'r map
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Fe gymeroch ormod o amser i ymuno a'r gweinydd
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :gwall cyffredinol
@@ -1817,6 +1821,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :wedi cael cic g
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :yn ceisio twyllo
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :gweinydd llawn
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :yn gyrru gormod o orchmynion
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :ni dderbyniwyd cyfrinair mewn amser
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :goramseriad cyffredinol
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :goramseru wrth lawrlwytho'r map
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :goramseru wrth brosesu'r map
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Colled cysylltiad o bosib
@@ -2131,7 +2139,7 @@ STR_OBJECT_CLASS_TRNS                                           :Tyrrau Darlledu
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Coed
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Dewiswch y math o goeden i'w phlannu
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Dewiswch y math o goeden i'w phlannu. Os oes coeden yno'n barod, bydd hyn yn plannu mwy o goed o fath ar hap
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Coed o fath ar hap
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Gosod coed o fath ar hap. Mae Shift yn toglo adeiladu/dangos amcangyfrif cost
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Coed ar hap
@@ -2531,17 +2539,17 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :Rhaid i {1:STRI
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :Mae {1:STRING} angen OpenTTD fersiwn {STRING} neu'n well
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :y ffeil GRF y gynllunio i gyfieithu
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Mae gormod o NewGRFau wedi'u llwytho
-STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Gallai llwytho {2:STRING} fel NewGRF statig gyda {4:STRING} achosi dadsyncroneiddio
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Corlun annisgwyliedig
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Priodwedd Gweithred 0 anhysbys
-STR_NEWGRF_ERROR_INVALID_ID                                     :Ceisio defnyddio ID annilys
+STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Gallai llwytho {1:STRING} fel NewGRF statig gyda {STRING} achosi dadsyncroneiddio
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Corlun annisgwyliedig (corlun {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Priodwedd Gweithred 0 anhysbys {4:HEX} (corlun {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Ceisio defnyddio ID annilys (corlun {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}Mae'r {STRING} yn cynnwys corlun llygredig. Bydd corluniau llygredig yn cael eu dynodi gan farc cwestiwn coch (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Mae'n cynnwys mwy nac un Gweithred 8
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Darllen wedi diwedd y llid-gorlun
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Yn cynnwys sawl cofnod Gweithred 8 (corlun {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Darllen heibio i ddiwedd llid-gorlun (corlun {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Mae'r set raffeg sylfaenol a ddefnyddir ar hyn o bryd yn brin o sawl corlun{}Diweddarwch y set raffeg sylfaenol i ddatrys hyn
-STR_NEWGRF_ERROR_GRM_FAILED                                     :Nid yw'r adnoddau GRF a geiswyd ar gael
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :Fe analluogwyd {2:STRING} gan {4:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Fformat gosodiad corlun annilys/anhysbys
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Nid yw'r adnoddau GRF a geisiwyd ar gael (corlun {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :Fe analluogwyd {1:STRING} gan {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Fformat cynllun corlun annilys/anhysbys (corlun {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Rhybudd!
@@ -2670,7 +2678,10 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Nodau cw
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Cliciwch ar nod i ganoli'r brif olygfa ar y diwydiant/tref/teil Mae Ctrl+Clic yn agor ffenestr golwg newydd ar leoliad y diwydiant/tref/teil
 
 # Goal question window
-STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Cwestiwn
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Cwestiwn
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Gwybodaeth
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Rhybudd
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Gwall
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Canslo
@@ -2802,11 +2813,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Dim
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Gwerth cwmni: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% yn eiddo {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Tanadeiledd:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} darnau rheilffordd
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} darnau ffordd
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} teiliau dŵr
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} teiliau gorsaf
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} meysydd awyr
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} darn{P "" au} rheilffordd
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} darn{P "" au} ffordd
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} teil{P "" iau} dŵr
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} teil{P "" iau} gorsaf
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} {P maes meysydd} awyr
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Dim
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Adeiladu Pencadlys
@@ -2814,7 +2825,7 @@ STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Adeiladu
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Gweld pencadlys cwmni
 STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP                                :{BLACK}Gweld pencadlys y cwmni
 STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Ail-leoli pencadlys cwmni
-STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Ailadeiladu pencadlys cwmni mewn man arall am 1% o werth y cwmni. Mae Shift+Clicio yn dangos amcangyfrif o'r gost heb adleoli
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Ailadeiladu pencadlys cwmni mewn man arall am 1% o werth y cwmni. Mae Shift+Clic yn dangos amcangyfrif o'r gost heb adleoli
 STR_COMPANY_VIEW_INFRASTRUCTURE_BUTTON                          :{BLACK}Manylion
 STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Gweld cyfansymau tanadeiledd manwl
 
@@ -2829,8 +2840,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Newid en
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Prynu cyfran o 25% o'r cwmni
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Gwerthu cyfran o 25% o'r cwmni
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Prynu cyfran o 25% o'r cwmni hwn. Mae Shift+Clicio yn dangos amcangyfrif o'r gost heb brynnu cyfran
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Gwerthu cyfran o 25% o'r cwmni hwn. Mae Shift+Clic yn dangos amcangyfrif o'r gost heb werthu cyfran
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Prynu cyfran o 25% yn y cwmni yma. Mae Shift+Clic yn dangos amcangyfrif o'r gost heb brynnu cyfran
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Gwerthu cyfran o 25% yn y cwmni yma. Mae Shift+Clic yn dangos amcangyfrif o'r elw heb werthu cyfran
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Enw Cwmni
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Enw Rheolwr
@@ -2880,7 +2891,7 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO                                :{BLACK}Cynhyrch
 STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Cynhyrchu: {YELLOW}{STRING}{STRING}, {STRING}{STRING}
 ############ range for produces ends
 
-STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Newid cynnyrch (multiple of 8, up to 2040)
+STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Newid cynnyrch (lluosrif o 8, hyd at 2040)
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Newid y lefel cynhyrchu (canran, hyd at 800%)
 
 # Vehicle lists
@@ -3050,7 +3061,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Dyblygu
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Dyblygu Awyren
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Bydd hyn yn prynu copi o'r trên gan gynnwys pob cerbyd. Cliciwch ar y botwm hwn ac yna ar drên sydd tu fewn neu tu allan i'r depo. Mae Ctrl+Clic yn rhannu'r gorchmynion, tra fo Shift+Clic yn dangos amcangyfrif o'r gost
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Bydd hyn yn adeiladu copi o a cerbyd ffordd. Cliciwch ar y botwm hwn ac yna ar gerbyd sydd tu fewn neu tu allan i'r depo. Mae Ctrl+Clic yn rhannu'r gorchmynion, tra fo Shift+Clic yn dangos amcangyfrif o'r gost
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Bydd hyn yn adeiladu copi o gerbyd ffordd. Cliciwch ar y botwm hwn ac yna ar gerbyd sydd tu fewn neu tu allan i'r depo. Mae Ctrl+Clic yn rhannu'r gorchmynion, tra fo Shift+Clic yn dangos amcangyfrif o'r gost heb brynnu
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Bydd hyn yn adeiladu copi o long. Cliciwch ar y botwm hwn ac yna ar long sydd tu fewn neu tu allan i'r depo. Mae Ctrl+Clic yn rhannu'r gorchmynion, tra fo Shift+Clic yn dangos amcangyfrif o'r gost
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Bydd hyn yn adeiladu copi o awyren. Cliciwch ar y botwm hwn ac yna ar awyren sydd tu fewn neu tu allan i'r awyrendy. Mae Ctrl+Clic yn rhannu'r gorchmynion, tra fo Shift+Clic yn dangos amcangyfrif o'r gost
 
@@ -3509,7 +3520,7 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Game Scr
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Gwirio'r log Game Script
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Ni ganfuwyd AI addas i lwytho.{}AI ffug yw hwn na wnai unrhyw beth.{}Gallwch lawrlwytho sawl AI drwy'r system 'Cynnwys Arlein'
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Mae AI a oedd yn rhedeg wedi chwalu. A fyddwch cystad ag adrodd am hyn i awdur yr AI ynghyd â sgrin-gipiad o'r Ffenestr Ddadnamu AI
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Mae sgript a oedd yn rhedeg wedi chwalu. A fyddwch cystad ag adrodd am hyn i awdur yr sgript ynghyd â sgrin-gipiad o'r Ffenestr Ddadnamu AI/GameScript
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Mae'r Ffenestr Ddadnamu AI / GameScript ar gael ar gyfer y gweinydd yn unig
 
 # AI configuration window

src/network/network.cpp

@@ -315,8 +315,13 @@ StringID GetNetworkErrorMsg(NetworkErrorCode err)
 		STR_NETWORK_ERROR_CLIENT_KICKED,
 		STR_NETWORK_ERROR_CLIENT_CHEATER,
 		STR_NETWORK_ERROR_CLIENT_SERVER_FULL,
-		STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS
+		STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS,
+		STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD,
+		STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER,
+		STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP,
+		STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN,
 	};
+	assert_compile(lengthof(network_error_strings) == NETWORK_ERROR_END);
 
 	if (err >= (ptrdiff_t)lengthof(network_error_strings)) err = NETWORK_ERROR_GENERAL;
 

src/network/network_admin.cpp

@@ -412,13 +412,13 @@ NetworkRecvStatus ServerNetworkAdminSocketHandler::SendCompanyEconomy()
 		p->Send_uint64(company->money);
 		p->Send_uint64(company->current_loan);
 		p->Send_uint64(income);
-		p->Send_uint16(company->cur_economy.delivered_cargo);
+		p->Send_uint16(min(UINT16_MAX, company->cur_economy.delivered_cargo.GetSum<OverflowSafeInt64>()));
 
 		/* Send stats for the last 2 quarters. */
 		for (uint i = 0; i < 2; i++) {
 			p->Send_uint64(company->old_economy[i].company_value);
 			p->Send_uint16(company->old_economy[i].performance_history);
-			p->Send_uint16(company->old_economy[i].delivered_cargo);
+			p->Send_uint16(min(UINT16_MAX, company->old_economy[i].delivered_cargo.GetSum<OverflowSafeInt64>()));
 		}
 
 		this->SendPacket(p);