(svn r23767) -Release: 1.2.0-beta2

2026-09-15 12:59:45 +00:00 · 2012-01-06 22:25:55 +00:00
263 changed files with 5573 additions and 9285 deletions
@@ -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 FINAL=
+PREDEFINED             = ENABLE_NETWORK WITH_ZLIB WITH_LZO WITH_LZMA WITH_SDL WITH_PNG WITH_FONTCONFIG WITH_FREETYPE WITH_ICU UNICODE _UNICODE _GNU_SOURCE
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
@@ -126,13 +126,6 @@ lang:
 mrproper:
 	@for dir in $(DIRS); do \
 		$(MAKE) -C $$dir mrproper; \
-	done
-# Don't be tempted to merge these two for loops. Doing that breaks make
-# --dry-run, since make has this "feature" that it always runs commands
-# containing $(MAKE), even when --dry-run is passed. The objective is of
-# course to also get a dry-run of submakes, but make is not smart enough
-# to see that a for loop runs both a submake and an actual command.
-	@for dir in $(DIRS); do \
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
@@ -37,6 +37,7 @@ 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!!
@@ -93,9 +94,15 @@ $(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),)
@@ -292,7 +299,7 @@ depend: $(DEPS)

 clean:
 	$(E) '$(STAGE) Cleaning up object files'
-	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(BIN_DIR)/baseset/openttd.32.bmp $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)
+	$(Q)rm -f $(DEPS) $(OBJS) $(TTD) $(DEPEND) $(TTD:%=$(BIN_DIR)/%) $(CONFIG_CACHE_COMPILER) $(CONFIG_CACHE_LINKER) $(CONFIG_CACHE_ENDIAN) $(CONFIG_CACHE_SOURCE) $(ENDIAN_TARGETS)

 mrproper: clean
 	$(Q)rm -f $(SRC_DIR)/rev.cpp $(SRC_DIR)/os/windows/ottdres.rc
@@ -25,7 +25,7 @@ fi
 if [ -n "$gdb" ]; then
 	$gdb ./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav
 else
-	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d script=2 -d misc=9 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' | grep -v '^dbg: \[.*\]' > tmp.regression
+	./openttd -x -c ai/regression/regression.cfg $params -g ai/regression/regression.sav -d script=2 2>&1 | awk '{ gsub("0x(\\(nil\\)|0+)(x0)?", "0x00000000", $0); gsub("^dbg: \\[script\\]", "", $0); gsub("^ ", "ERROR: ", $0); gsub("ERROR: \\[1\\] ", "", $0); gsub("\\[P\\] ", "", $0); print $0; }' > tmp.regression
 fi

 ret=0
@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 8bcc7d7b6c7fdfba27af872743e9efd6
+OPENTTD.GRF  = 42d0ea63159d5ef2971429c2402eb2ca

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

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

 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.
@@ -1,126 +1,40 @@
-1.2.0-RC1 (2012-02-19)
------------------------------------------------------------------------
- Feature: [NewGRF] Customisable tunnel portals for rail types (r23952)
- Feature: Timetabled maximum travel speeds for non-flying vehicles (r23947)
- Feature: Readme/licence/changelog viewer for AI and game scripts [FS#5047] (r23936)
- Feature: [NewGRF] 32bpp sprites in GRFs (r23897)
- Feature: [NewGRF] Support for RealSprites with multiple zoom levels (r23890)
- Feature: [NewGRF] Support for container version 2 (r23887)
- Fix: Refittability should never depend on the current capacity of a vehicle [FS#5070] (r23965)
- Fix: Do not look for missing sprites twice during startup [FS#5072] (r23963)
- Fix: [Script] Infinite recursion within a script was not caught properly, so they could cause crashes of OpenTTD instead of the AI [FS#5068] (r23962)
- Fix: [NewGRF] Make the properties for always/never refittable cargo types not behave incremental, but reset them on reassignment (r23960)
- Fix: [Network] Do not allow chat messages from pre-active clients. As they have not got the savegame yet, they will not have the interface to send them either (r23958)
- Fix: [Network] Allow sending chat to pre-active clients as the clients start accepting once they send 'map ok' to the server, which is the same moment we change their status to pre-active [FS#4990] (r23957)
- Fix: When the population of a town changes the town view might even have to change size due to different cargo requirements [FS#5062] (r23953)
- Fix: [NoGo] Never show GSGoal::Question() to spectators [FS#5063] (r23950)
- Fix: Better rounding when converting internal speed to displayed speed (r23945)
- Fix: Also list DEITY signs in the signlist in the scenario editor [FS#5061] (r23943)
- Fix: Infrastructure cache of standard road stops would get messed up when buying a company with them (r23942)
- Fix: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type (r23931)
- Fix: [Script] Do not close the parameter window when a script starts [FS#4944] (r23930)
- Fix: Do not accelerate, for smoke purposes, when you reached the track's maximum speed [FS#5053]
- Fix: 32bpp animated blitter was optimised a bit too far regarding not needing to update the colour mapping when (re)initialising the palette [FS#5056] (r23927)
- Fix: [NoGo] Some news messages would cause an assertion to be triggered due to a missing proper location for the viewport of the news message, so only allow building when valid data for the viewport is provided or no viewport is used [FS#5054] (r23924)
- Fix: Consider only the middle tile of a lock for lock-infrastructure costs. The other two tiles may be owned by other companies. Also do not count the middle tile of a lock as canal, independent of whether it is build on ground or river slope (r23920)
- Fix: [NewGRF] When determining the first refittable cargotype according to CTT order, do not rely on the GRF assigning the refit_mask property. Also check for GRFs setting the default_cargo or refittable-cargo-classes or -types properties (r23916)
- Fix: [NewGRF] Do not test validity of cargobits using a mask of cargoslots (r23914)
- Fix: [NewGRF] When testing whether a engine shall only carry the default cargo, check ctt_include_mask for being empty before applying cargo translation (r23912)
- Fix: [SDL] Handle the SDL_VIDEOEXPOSE event to solve issues with SDL 1.3 (r23910)
- Fix: [SDL] Fix keyboard-related segfault when compiling against SDL 1.3 (r23909)
- Fix: [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean (r23908)
- Fix: [Makefile] Let "make clean --dry-run" not delete Makefiles (r23907)
- Fix: [Windows installer] OpenMSX got downloaded to and extracted in the wrong (non-existent) folder [FS#5045] (r23905)
- Fix: Memory leak everytime one clicked a savegame in the load GUI (r23901)
- Fix: [NewGRF] It was not possible to import sounds from a NewGRF later in the load order (r23883)
- Remove: PNG sprite loader; use 32bpp sprites in a NewGRF (r23898)
-
-
-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 [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)
+-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)


 1.2.0-beta1 (2011-12-24)
@@ -273,15 +187,6 @@
 - 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)
@@ -32,6 +32,7 @@ set_default() {
 	os="DETECT"
 	endian="AUTO"
 	cpu_type="DETECT"
+	revision=""
 	config_log="config.log"
 	prefix_dir="/usr/local"
 	binary_dir="games"
@@ -106,6 +107,7 @@ set_default() {
 		os
 		endian
 		cpu_type
+		revision
 		config_log
 		prefix_dir
 		binary_dir
@@ -197,6 +199,8 @@ 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";;
@@ -1006,15 +1010,31 @@ check_params() {
 		fi
 	fi

-	if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then
+	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=""
 		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."
@@ -1159,11 +1179,11 @@ make_compiler_cflags() {
 		if [ -z "$first_time_icc_check" ]; then
 			first_time_icc_check=no
 			if [ $cc_version -lt 90 ]; then
-				log 1 "WARNING: you seem to be using a very old version of ICC"
+				log 1 "WARNING: you seem to be using very old version of ICC"
 				log 1 "WARNING: OpenTTD hasn't been tested with this version"
 				sleep 5
 			elif [ $cc_version -lt 120 ]; then
-				log 1 "WARNING: you seem to be using an unsupported ICC version"
+				log 1 "WARNING: you seem to be using unsupported ICC version"
 				log 1 "WARNING: ICC older than 12.0 is known to fail to compile OpenTTD"
 				sleep 5
 			fi
@@ -1236,58 +1256,6 @@ make_compiler_cflags() {
 				features="$features lto"
 			fi
 		fi
-	elif [ `basename $1 | grep 'clang'` ]; then
-		# Enable some things only for certain clang versions
-		cc_version="`$1 -v 2>&1 | head -n 1 | sed s@[^0-9]@@g | cut -c 1-2`"
-
-		# aliasing rules are not held in openttd code
-		flags="$flags -fno-strict-aliasing"
-
-		# -W alone doesn't enable all warnings enabled by -Wall; on the other hand,
-		# -Weverything enables too many useless warnings that can't be disabled (as of 3.0)
-		flags="$flags -Wall -W"
-
-		# warning: unused parameter '...'
-		flags="$flags -Wno-unused-parameter"
-
-		# warning: expression result unused
-		flags="$flags -Wno-unused-value"
-
-		# warning: multi-character character constant
-		flags="$flags -Wno-multichar"
-
-		# warning: explicitly assigning a variable of type '...' to itself
-		# it happens when using the FOR_ALL_WINDOWS_FROM_BACK_FROM macro
-		flags="$flags -Wno-self-assign"
-
-		if [ "$cc_version" -lt "30" ]; then
-			# warning: equality comparison with extraneous parentheses
-			flags="$flags -Wno-parentheses"
-			# warning: operands of ? are integers of different signs: 'unsigned int' and 'int'
-			flags="$flags -Wno-sign-compare"
-		fi
-
-		if [ "$cc_version" -ge "30" ]; then
-			# warning: equality comparison with extraneous parentheses
-			# this warning could be useful, but it warns about code in squirrel
-			flags="$flags -Wno-parentheses-equality"
-		fi
-
-		if [ "$with_ccache" != "0" -o "$with_distcc" != "0" ]; then
-			# ccache and distcc run separate preprocess and compile passes,
-			# both are fed with the same CFLAGS. Unfortunately, clang
-			# complains about -I when compiling preprocessed files:
-			# "clang: warning: argument unused during compilation: '-I /usr/include'"
-			flags="$flags -Qunused-arguments"
-		fi
-
-		if [ "$enable_assert" -eq "0" ]; then
-			# do not warn about unused variables when building without asserts
-			flags="$flags -Wno-unused-variable"
-		fi
-
-		# rdynamic is used to get useful stack traces from crash reports.
-		ldflags="$ldflags -rdynamic"
 	else
 		# Enable some things only for certain GCC versions
 		cc_version=`$1 -dumpversion | cut -c 1,3`
@@ -3120,9 +3088,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"

-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "897" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "897" ]; then
-			log 1 "checking grfcodec... needs at least version 5.1.4 (r897), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
+			log 1 "checking grfcodec... needs at least version 5.1.3 (r846), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3277,6 +3245,7 @@ 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;
@@ -3499,6 +3468,8 @@ 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"
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2012-02-19
-Release version: 1.2.0-RC1
+Last updated:    2012-01-07
+Release version: 1.2.0-beta2
 ------------------------------------------------------------------------


@@ -413,17 +413,3 @@ 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.
@@ -48,8 +48,7 @@
   -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 05 C1 00
-   -1 sprites/chars.png 450 70 01 12 8 0 -1
+   -1 * 5	 0A 01 04 C2 00
   -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
@@ -124,7 +123,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 18 6A 02
+   -1 * 5	 0A 01 17 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
@@ -148,7 +147,6 @@
   -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
@@ -326,7 +324,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 8 0 -1
+   -1 sprites/chars.png 110 250 01 12 9 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
@@ -580,7 +578,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 18 0 -2
+   -1 sprites/chars.png 110 280 01 21 17 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
@@ -844,89 +842,39 @@
   -1 sprites/chars.png 610 340 01 21 15 0 -2
   -1 sprites/mono.png 175 250 01 13 7 0 0

-// U+2010: Hyphen
-   -1 * 18	 12 04 00 01 10 20 01 01 10 20 02 01 10 20 03 01 10 20
-   -1 sprites/chars.png 480 370 01 12 4 0 -1
-   -1 sprites/chars.png 480 390 01 7 2 0 0
-   -1 sprites/chars.png 480 400 01 21 6 0 -2
-   -1 sprites/mono.png 160 270 01 13 7 0 0
-
 // U+2013: En Dash
-// U+2014: Em Dash
-// U+2015: Horizontal Bar
-   -1 * 18	 12 04 00 03 13 20 01 03 13 20 02 03 13 20 03 03 13 20
+   -1 * 18	 12 04 00 01 13 20 01 01 13 20 02 01 13 20 03 01 13 20
   -1 sprites/chars.png 630 310 01 12 8 0 -1
-   -1 sprites/chars.png 450 370 01 12 12 0 -1
-   -1 sprites/chars.png 490 370 01 12 10 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 490 390 01 7 5 0 0
-   -1 sprites/chars.png 630 340 01 21 15 0 -2
-   -1 sprites/chars.png 450 400 01 21 21 0 -2
-   -1 sprites/chars.png 490 400 01 21 18 0 -2
+   -1 sprites/chars.png 630 340 01 21 14 0 -2
   -1 sprites/mono.png 190 250 01 13 7 0 0
-   -1 sprites/mono.png 145 270 01 13 7 0 0
-   -1 sprites/mono.png 175 270 01 13 7 0 0

-// U+2018: Left Single Quotation Mark
 // U+2019: Right Single Quotation Mark
-// U+201A: Single Low-9 Quotation Mark
-// U+201B: Single High-Reversed-9 Quotation Mark
-// U+201C: Left Double Quotation Mark
-// U+201D: Right Double Quotation Mark
-// U+201E: Double Low-9 Quotation Mark
-// U+201F: Double High-Reversed-9 Quotation Mark
-   -1 * 18	 12 04 00 08 18 20 01 08 18 20 02 08 18 20 03 08 18 20
-   -1 sprites/chars.png 510 370 01 12 4 0 -1
+   -1 * 18	 12 04 00 01 19 20 01 01 19 20 02 01 19 20 03 01 19 20
   -1 sprites/chars.png 650 310 01 12 4 0 -1
-   -1 sprites/chars.png 520 370 01 12 4 0 -1
-   -1 sprites/chars.png 530 370 01 12 4 0 -1
-   -1 sprites/chars.png 660 310 01 12 7 0 -1
-   -1 sprites/chars.png 540 370 01 12 7 0 -1
-   -1 sprites/chars.png 670 310 01 12 7 0 -1
-   -1 sprites/chars.png 550 370 01 12 7 0 -1
-   -1 sprites/chars.png 510 390 01 7 1 0 0
   -1 sprites/chars.png 650 330 01 7 1 0 0
-   -1 sprites/chars.png 520 390 01 7 1 0 0
-   -1 sprites/chars.png 530 390 01 7 1 0 0
-   -1 sprites/chars.png 660 330 01 7 3 0 0
-   -1 sprites/chars.png 540 390 01 7 3 0 0
-   -1 sprites/chars.png 670 330 01 7 3 0 0
-   -1 sprites/chars.png 550 390 01 7 3 0 0
-   -1 sprites/chars.png 510 400 01 21 3 0 -2
   -1 sprites/chars.png 650 340 01 21 3 0 -2
-   -1 sprites/chars.png 520 400 01 21 3 0 -2
-   -1 sprites/chars.png 530 400 01 21 3 0 -2
-   -1 sprites/chars.png 660 340 01 21 9 0 -2
-   -1 sprites/chars.png 540 400 01 21 9 0 -2
-   -1 sprites/chars.png 670 340 01 21 9 0 -2
-   -1 sprites/chars.png 550 400 01 21 9 0 -2
-   -1 sprites/mono.png 190 270 01 13 7 0 0
   -1 sprites/mono.png 205 250 01 13 7 0 0
-   -1 sprites/mono.png 205 270 01 13 7 0 0
-   -1 sprites/mono.png 220 270 01 13 7 0 0
+
+// U+201C: Left Double Quotation Mark
+   -1 * 18	 12 04 00 01 1C 20 01 01 1C 20 02 01 1C 20 03 01 1C 20
+   -1 sprites/chars.png 660 310 01 12 7 0 -1
+   -1 sprites/chars.png 660 330 01 7 3 0 0
+   -1 sprites/chars.png 660 340 01 21 9 0 -2
   -1 sprites/mono.png 220 250 01 13 7 0 0
-   -1 sprites/mono.png 235 270 01 13 7 0 0
+
+// U+201E: Double Low-9 Quotation Mark
+   -1 * 18	 12 04 00 01 1E 20 01 01 1E 20 02 01 1E 20 03 01 1E 20
+   -1 sprites/chars.png 670 310 01 12 7 0 -1
+   -1 sprites/chars.png 670 330 01 7 3 0 0
+   -1 sprites/chars.png 670 340 01 21 9 0 -2
   -1 sprites/mono.png 235 250 01 13 7 0 0
-   -1 sprites/mono.png 250 270 01 13 7 0 0

-// U+2026: Horizontal Ellipsis
-   -1 * 18	 12 04 00 01 26 20 01 01 26 20 02 01 26 20 03 01 26 20
-   -1 sprites/chars.png 560 370 01 12 11 0 -1
-   -1 sprites/chars.png 560 390 01 7 5 0 0
-   -1 sprites/chars.png 560 400 01 21 15 0 -2
-   -1 sprites/mono.png 265 270 01 13 7 0 0
-
-// U+2039: Single Left-Pointing Angle Quotation Mark
 // U+203A: Single Right-Pointing Angle Quotation Mark
-   -1 * 18	 12 04 00 02 39 20 01 02 39 20 02 02 39 20 03 02 39 20
-   -1 sprites/chars.png 580 370 01 12 5 0 -1
+   -1 * 18	 12 04 00 01 3A 20 01 01 3A 20 02 01 3A 20 03 01 3A 20
   -1 sprites/chars.png 680 310 01 12 5 0 -1
-   -1 sprites/chars.png 580 390 01 7 2 0 0
   -1 sprites/chars.png 680 330 01 7 2 0 0
-   -1 sprites/chars.png 580 400 01 21 7 0 -2
   -1 sprites/chars.png 680 340 01 21 7 0 -2
-   -1 sprites/mono.png 280 270 01 13 7 0 0
   -1 sprites/mono.png 250 250 01 13 7 0 0

 // U+20A1: Colon Sign
@@ -1045,39 +993,15 @@
   -1 sprites/mono.png 85 270 01 13 7 0 0

 // U+2116: Numero Sign
-// U+2117: Sound Recording Copyright
-   -1 * 18	 12 04 00 02 16 21 01 02 16 21 02 02 16 21 03 02 16 21
+   -1 * 18	 12 04 00 01 16 21 01 01 16 21 02 01 16 21 03 01 16 21
   -1 sprites/chars.png 370 370 01 12 14 0 -1
-   -1 sprites/chars.png 590 370 01 12 13 0 -1
   -1 sprites/chars.png 370 390 01 7 8 0 0
-   -1 sprites/chars.png 590 390 01 7 6 0 0
   -1 sprites/chars.png 370 400 01 21 27 0 -2
-   -1 sprites/chars.png 590 400 01 21 16 0 -2
   -1 sprites/mono.png 100 270 01 13 7 0 0
-   -1 sprites/mono.png 295 270 01 13 7 0 0

 // U+2122: Trade Mark Sign
   -1 * 18	 12 04 00 01 22 21 01 01 22 21 02 01 22 21 03 01 22 21
   -1 sprites/chars.png 400 370 01 12 13 0 -1
   -1 sprites/chars.png 400 390 01 7 9 0 0
   -1 sprites/chars.png 400 400 01 21 20 0 -2
-   -1 sprites/mono.png 115 270 01 13 7 0 0
-
-// U+2212: Minus Sign
-   -1 * 18	 12 04 00 01 12 22 01 01 12 22 02 01 12 22 03 01 12 22
-   -1 sprites/chars.png 610 370 01 12 6 0 -1
-   -1 sprites/chars.png 610 390 01 7 3 0 0
-   -1 sprites/chars.png 610 400 01 21 9 0 -2
-   -1 sprites/mono.png 310 270 01 13 7 0 0
-
-// U+27E8: Mathematical Left Angle Bracket
-// U+27E9: Mathematical Right Angle Bracket
-   -1 * 18	 12 04 00 02 E8 27 01 02 E8 27 02 02 E8 27 03 02 E8 27
-   -1 sprites/chars.png 620 370 01 12 5 0 -1
-   -1 sprites/chars.png 630 370 01 12 5 0 -1
-   -1 sprites/chars.png 620 390 01 7 3 0 0
-   -1 sprites/chars.png 630 390 01 7 3 0 0
-   -1 sprites/chars.png 620 400 01 21 6 0 -2
-   -1 sprites/chars.png 630 400 01 21 6 0 -2
-   -1 sprites/mono.png 325 270 01 13 7 0 0
-   -1 sprites/mono.png 340 270 01 13 7 0 0
+   -1 sprites/mono.png 115 270 01 13 7 0 0
@@ -110,4 +110,3 @@
 #include "rivers/arctic.nfo"
 #include "rivers/tropic.nfo"
 #include "rivers/toyland.nfo"
-#include "tunnel_portals.nfo"
@@ -1,74 +0,0 @@
-//
-// $Id$
-//
-// This file is part of OpenTTD.
-// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-
-   -1 * 63	 0C "Tunnel portal overlays for railtypes by Snail (Jacopo Coletto)"
-
-// Tropical sprites.
-   -1 * 6	 07 83 01 \7! 02 11
-   -1 * 3	 05 17 10
-   -1 sprites/tunnel_portals.png 5 88 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 88 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 88 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 88 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 88 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 88 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 88 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 88 01 37 40 -31 -38
-   -1 sprites/tunnel_portals.png 5 170 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 170 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 170 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 170 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 170 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 170 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 170 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 170 01 37 40 -31 -38
-
-// Temperate grass + snow sprites.
-   -1 * 6	 07 83 01 \7= 02 25
-   -1 * 3	 05 17 10
-   -1 sprites/tunnel_portals.png 5 6 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 6 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 6 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 6 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 6 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 6 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 6 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 6 01 37 40 -31 -38
-   -1 sprites/tunnel_portals.png 5 129 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 129 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 129 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 129 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 129 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 129 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 129 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 129 01 37 40 -31 -38
-
-// Arctic grass sprites.
-   -1 * 6	 07 83 01 \7! 01 09
-   -1 * 4	 05 97 08 00
-   -1 sprites/tunnel_portals.png 5 47 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 47 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 47 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 47 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 47 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 47 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 47 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 47 01 37 40 -31 -38
-
-// Toyland sprites.
-   -1 * 6	 07 83 01 \7! 03 09
-   -1 * 4	 05 97 08 00
-   -1 sprites/tunnel_portals.png 5 211 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 211 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 211 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 211 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 211 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 211 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 211 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 211 01 37 40 -31 -38
@@ -1,21 +1,3 @@
-openttd (1.2.0~RC1) unstable; urgency=low
-
-  * New upstream release 1.2.0-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 19 Feb 2012 23:00:00 +0100
-
-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
@@ -1,6 +1,6 @@
@echo off

-set OPENTTD_VERSION=1.2.0-RC1
+set OPENTTD_VERSION=1.2.0-beta2
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0
@@ -1,58 +1,40 @@
-#
-# spec file for package openttd
-#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2007-2012 The OpenTTD developers
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
+%define dedicated       0

-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
+%define binname         openttd

-Name:           openttd
-Version:        1.2.beta4
-Release:        0
-%define srcver  1.2.0-beta4
-Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
-License:        GPL-2.0
-Group:          Amusements/Games/Strategy/Other
-Url:            http://www.openttd.org
+%define srcver          1.2.0

-Source:         http://binaries.openttd.org/releases/%{srcver}/%{name}-%{srcver}-source.tar.gz
-
-%if 0%{?suse_version} || 0%{?mdkversion}
-Recommends:     %{name}-gui
+%if %{dedicated}
+Name:           %{binname}-dedicated
+%else
+Name:           %{binname}
 %endif
+Version:        %{srcver}
+Release:        1%{?dist}
+Group:          Amusements/Games/Strategy/Other
+License:        GPLv2
+URL:            http://www.openttd.org
+Summary:        An open source clone of Chris Sawyer's Transport Tycoon Deluxe
+
+Source:         openttd%{?branch:-%{branch}}-%{srcver}-source.tar.bz2
+
+# the main package works with the exact same data package version only
+Requires:       %{binname}-data = %{version}

 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
 BuildRequires:  zlib-devel

-%if 0%{?suse_version} || 0%{?mdkversion}
-BuildRequires:  update-alternatives
-Requires:       update-alternatives
-%else
-BuildRequires:  chkconfig
-Requires:       chkconfig
-%endif
-
 %if 0%{?mdkversion}
-BuildRequires:  liblzma-devel
 BuildRequires:  liblzo-devel
+BuildRequires:  liblzma-devel
 %else
 BuildRequires:  lzo-devel
 BuildRequires:  xz-devel
 %endif

-# OBS workaround: needed by libdrm
-%if 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
+#needed by libdrm
+%if 0%{?rhel_version} >= 600
 BuildRequires:  kernel
 %endif

@@ -61,18 +43,44 @@ BuildRequires:  kernel
 BuildRequires:  pkg-config
 %endif

-# bulding openttd.grf is not required as it is a) part of source and
-# b) required only, if you want to use the original set
-%if 0%{?with_grfcodec}
+# Desktop specific tags, not needed for dedicated
+%if !%{dedicated}
+BuildRequires:  fontconfig-devel
+BuildRequires:  SDL-devel
+
 BuildRequires:  grfcodec
+
+# vendor specific dependencies
+ %if !0%{?rhel_version}
+BuildRequires:  libicu-devel
+ %endif
+ %if 0%{?rhel_version} || 0%{?fedora}
+BuildRequires:  freetype-devel
+ %endif
+ %if 0%{?suse_version} || 0%{?mdkversion}
+BuildRequires:  freetype2-devel
+ %endif
+ %if 0%{?suse_version}
+BuildRequires:  update-desktop-files
+ %endif
+%endif
+
+%if %{dedicated}
+Conflicts:      %{binname} %{binname}-gui
+%else
+Provides:       %{binname}-gui
+Conflicts:      %{binname}-dedicated
+Requires:       openttd-opensfx
+# recommends works for suse (not sles9) and mandriva, only
+ %if 0%{?suse_version} || 0%{?mdkversion}
+# require timidity is part of openmsx
+Recommends:     openttd-openmsx
+ %endif
 %endif
 # Recommends would fit better but not well supported...
-Requires:       openttd-opengfx >= 0.4.2
+Requires:       openttd-opengfx >= 0.3.2

-Obsoletes:      %{name}-data < %{version}
-Provides:       %{name}-data = %{version}
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

 %description
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
@@ -84,161 +92,70 @@ OpenTTD is licensed under the GNU General Public License version 2.0. For more
 information, see the file 'COPYING' included with every release and source
 download of the game.

-%package gui
-Summary:        OpenTTD GUI/Client (requires SDL)
+# the subpackage data needs only to build once, the dedicated version
+# can reuse the data package of the gui package
+%if !%{dedicated}
+%package data
+Summary:        Data package for OpenTTD
 Group:          Amusements/Games/Strategy/Other
+ %if 0%{?suse_version} >= 1120 || 0%{?fedora} || 0%{?mdkversion}
+BuildArch:      noarch
+ %endif
+BuildRequires:  grfcodec

-Requires:       %{name}
-Conflicts:      %{name}-dedicated
-
-BuildRequires:  SDL-devel
-BuildRequires:  fontconfig-devel
-
-%if 0%{?rhel_version} != 600
-BuildRequires:  libicu-devel
-%endif
-%if 0%{?rhel_version} || 0%{?fedora}
-BuildRequires:  freetype-devel
-%endif
-%if 0%{?suse_version} || 0%{?mdkversion}
-BuildRequires:  freetype2-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:  update-desktop-files
-%else
-BuildRequires:  desktop-file-utils
-Requires:       hicolor-icon-theme
-%endif
-
-%if 0%{?suse_version} || 0%{?mdkversion}
-Recommends:     openttd-openmsx
-Recommends:     openttd-opensfx
-%endif
-
-%description gui
-OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
-with lots of new features and enhancements. To play the game you need either
-the original data from the game or install the recommend subackages OpenGFX for
-free graphics, OpenSFX for free sounds and OpenMSX for free music.
-
-This subpackage provides the binary which needs SDL.
-
-%package dedicated
-Summary:        OpenTTD Dedicated Server binary (without SDL)
-Group:          Amusements/Games/Strategy/Other
-
-Requires:       %{name}
-Conflicts:      %{name}-gui
-
-%description dedicated
+%description data
 OpenTTD is a reimplementation of the Microprose game "Transport Tycoon Deluxe"
 with lots of new features and enhancements. To play the game you need either
 the original data from the game or the required package OpenGFX and OpenSFX.

-This subpackage provides the binary without dependency of SDL.
+This package is required by openttd gui and openttd dedicated package. This
+way it is possible to install a openttd version without SDL requirement.
+
+%endif

 %prep
 %setup -qn openttd%{?branch:-%{branch}}-%{srcver}

 # we build the grfs from sources but validate the result with the existing data
-%if 0%{?with_grfcodec}
-md5sum bin/data/* > validate.data
-%endif
+md5sum bin/baseset/* > validate.data

 %build
-# first, we build the dedicated binary and copy it to dedicated/
 ./configure \
        --prefix-dir="%{_prefix}" \
+        --binary-name="%{binname}" \
        --binary-dir="bin" \
-        --data-dir="share/%{name}" \
-        --enable-dedicated
-make %{?_smp_mflags} BUNDLE_DIR="dedicated" bundle
-
-# then, we build the common gui version which we install the usual way
-./configure \
-        --prefix-dir="%{_prefix}" \
-        --binary-name="%{name}" \
-        --binary-dir="bin" \
-        --data-dir="share/%{name}" \
-        --doc-dir="share/doc/%{name}" \
+        --data-dir="share/%{binname}" \
+        --doc-dir="share/doc/%{binname}" \
        --menu-name="OpenTTD%{?branch: %{branch}}" \
-        --menu-group="Game;StrategyGame;"
+        --menu-group="Game;StrategyGame;" \
+        --enable-dedicated="%{dedicated}" \

 make %{?_smp_mflags}

 %install
-# install the dedicated binary
-install -D -m0755 dedicated/openttd %{buildroot}%{_bindir}/%{name}-dedicated
-# install the gui binary and rename to openttd-gui
-make install INSTALL_DIR=%{buildroot}
-mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-gui
-# we need a dummy target for /etc/alternatives/openttd
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-touch %{buildroot}%{_sysconfdir}/alternatives/%{name}
-ln -s -f /etc/alternatives/%{name} %{buildroot}%{_bindir}/%{name}
-
-%if 0%{?suse_version}
-%suse_update_desktop_file -r %{name} Game StrategyGame
+%if %{dedicated}
+# dedicated package needs binary only
+install -D -m0755 bin/openttd %{buildroot}/%{_bindir}/%{binname}
 %else
-%if 0%{?fedora} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
-        --add-category=StrategyGame \
-        media/openttd.desktop
-%endif
+make install INSTALL_DIR="%{buildroot}"
+ %if 0%{?suse_version}
+%suse_update_desktop_file -r %{binname} Game StrategyGame
+ %endif
 %endif

-%if 0%{?with_grfcodec}
+%clean
+rm -rf "%{buildroot}"
+
 %check
 md5sum -c validate.data
-%endif

-%post gui
-/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-gui 10
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%post dedicated
-/usr/sbin/update-alternatives --install %{_bindir}/%{name} %{name} %{_bindir}/%{name}-dedicated 0
-
-%preun gui
-if [ "$1" = 0 ] ; then
-    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-gui
-fi
-
-%preun dedicated
-if [ "$1" = 0 ] ; then
-    /usr/sbin/update-alternatives --remove %{name} %{_bindir}/%{name}-dedicated
-fi
-
-%postun gui
-if [ "$1" -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans gui
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-# we need a file in the main package so it will be made
 %files
-%defattr(-, root, root)
-%dir %{_datadir}/doc/%{name}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/lang
-%dir %{_datadir}/%{name}/baseset
-%dir %{_datadir}/%{name}/scripts
-%dir %{_datadir}/%{name}/ai
-%{_datadir}/doc/%{name}/*
-%{_datadir}/%{name}/lang/*
-%{_datadir}/%{name}/baseset/*
-%{_datadir}/%{name}/scripts/*
-%{_datadir}/%{name}/ai/*
-%doc %{_mandir}/man6/%{name}.6.*
+%attr(755, root, root) %{_bindir}/%{binname}

-%files gui
+# all other files are for the gui version only, also no
+# subpackage needed for the dedicated version
+%if !%{dedicated}
 %defattr(-, root, root)
-%ghost %{_sysconfdir}/alternatives/%{name}
-%ghost %{_bindir}/%{name}
-%{_bindir}/%{name}-gui
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/16x16
 %dir %{_datadir}/icons/hicolor/16x16/apps
@@ -252,19 +169,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_datadir}/icons/hicolor/128x128/apps
 %dir %{_datadir}/icons/hicolor/256x256
 %dir %{_datadir}/icons/hicolor/256x256/apps
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%{_datadir}/pixmaps/%{name}.32.xpm
+%{_datadir}/applications/%{binname}.desktop
+%{_datadir}/icons/hicolor/16x16/apps/%{binname}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{binname}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{binname}.png
+%{_datadir}/icons/hicolor/64x64/apps/%{binname}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{binname}.png
+%{_datadir}/icons/hicolor/256x256/apps/%{binname}.png
+%{_datadir}/pixmaps/%{binname}.32.xpm

-%files dedicated
+%files data
 %defattr(-, root, root)
-%ghost %{_bindir}/%{name}
-%ghost %{_sysconfdir}/alternatives/%{name}
-%{_bindir}/%{name}-dedicated
+%dir %{_datadir}/doc/%{binname}
+%dir %{_datadir}/%{binname}
+%dir %{_datadir}/%{binname}/lang
+%dir %{_datadir}/%{binname}/baseset
+%dir %{_datadir}/%{binname}/scripts
+%dir %{_datadir}/%{binname}/ai
+%{_datadir}/doc/%{binname}/*
+%{_datadir}/%{binname}/lang/*
+%{_datadir}/%{binname}/baseset/*
+%{_datadir}/%{binname}/scripts/*
+%{_datadir}/%{binname}/ai/*
+%doc %{_mandir}/man6/%{binname}.6.*
+%endif

 %changelog
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 2
 !define APPV_MAINT 0
-!define APPV_BUILD 4
-!define APPV_EXTRA "-RC1"
+!define APPV_BUILD 1
+!define APPV_EXTRA "-beta2"

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -281,17 +281,17 @@ SectionEnd
 Section "Download OpenMSX (free music set)" Section5
 	SetOverwrite try

-	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\baseset\openmsx.7z"
+	NSISdl::download "http://binaries.openttd.org/installer/openmsx-${OPENMSX_BASE_VERSION}.7z" "$INSTDIR\gm\openmsx.7z"
 	Pop $R0 ;Get the return value
 	StrCmp $R0 "success" +3
 		MessageBox MB_OK "Downloading of OpenMSX failed"
 		Goto Done

 	; Let's extract the files
-	SetOutPath "$INSTDIR\baseset\"
-	NSIS7z::Extract "$INSTDIR\baseset\openmsx.7z"
+	SetOutPath "$INSTDIR\gm\"
+	NSIS7z::Extract "$INSTDIR\gm\openmsx.7z"

-	Delete "$INSTDIR\baseset\openmsx.7z"
+	Delete "$INSTDIR\gm\openmsx.7z"
 	SetOutPath "$INSTDIR\"
 Done:

@@ -573,8 +573,6 @@
    <ClInclude Include="..\src\terraform_gui.h" />
    <ClInclude Include="..\src\textbuf_gui.h" />
    <ClInclude Include="..\src\texteff.hpp" />
-    <ClInclude Include="..\src\textfile_gui.h" />
-    <ClInclude Include="..\src\textfile_type.h" />
    <ClInclude Include="..\src\tgp.h" />
    <ClInclude Include="..\src\tile_cmd.h" />
    <ClInclude Include="..\src\tile_type.h" />
@@ -686,7 +684,6 @@
    <ClCompile Include="..\src\statusbar_gui.cpp" />
    <ClCompile Include="..\src\subsidy_gui.cpp" />
    <ClCompile Include="..\src\terraform_gui.cpp" />
-    <ClCompile Include="..\src\textfile_gui.cpp" />
    <ClCompile Include="..\src\timetable_gui.cpp" />
    <ClCompile Include="..\src\toolbar_gui.cpp" />
    <ClCompile Include="..\src\town_gui.cpp" />
@@ -1082,6 +1079,8 @@
    <ClInclude Include="..\src\video\video_driver.hpp" />
    <ClCompile Include="..\src\spriteloader\grf.cpp" />
    <ClInclude Include="..\src\spriteloader\grf.hpp" />
+    <ClCompile Include="..\src\spriteloader\png.cpp" />
+    <ClInclude Include="..\src\spriteloader\png.hpp" />
    <ClInclude Include="..\src\spriteloader\spriteloader.hpp" />
    <ClCompile Include="..\src\newgrf.cpp" />
    <ClCompile Include="..\src\newgrf_airport.cpp" />
@@ -948,12 +948,6 @@
    <ClInclude Include="..\src\texteff.hpp">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\textfile_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\textfile_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="..\src\tgp.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -1287,9 +1281,6 @@
    <ClCompile Include="..\src\terraform_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\textfile_gui.cpp">
-      <Filter>GUI Source Code</Filter>
-    </ClCompile>
    <ClCompile Include="..\src\timetable_gui.cpp">
      <Filter>GUI Source Code</Filter>
    </ClCompile>
@@ -2475,6 +2466,12 @@
    <ClInclude Include="..\src\spriteloader\grf.hpp">
      <Filter>Sprite loaders</Filter>
    </ClInclude>
+    <ClCompile Include="..\src\spriteloader\png.cpp">
+      <Filter>Sprite loaders</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\spriteloader\png.hpp">
+      <Filter>Sprite loaders</Filter>
+    </ClInclude>
    <ClInclude Include="..\src\spriteloader\spriteloader.hpp">
      <Filter>Sprite loaders</Filter>
    </ClInclude>
@@ -1566,14 +1566,6 @@
 				RelativePath=".\..\src\texteff.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\textfile_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tgp.h"
 				>
@@ -2026,10 +2018,6 @@
 				RelativePath=".\..\src\terraform_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\timetable_gui.cpp"
 				>
@@ -3678,6 +3666,14 @@
 				RelativePath=".\..\src\spriteloader\grf.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\spriteloader\spriteloader.hpp"
 				>
@@ -1563,14 +1563,6 @@
 				RelativePath=".\..\src\texteff.hpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.h"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\textfile_type.h"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\tgp.h"
 				>
@@ -2023,10 +2015,6 @@
 				RelativePath=".\..\src\terraform_gui.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\..\src\textfile_gui.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\..\src\timetable_gui.cpp"
 				>
@@ -3675,6 +3663,14 @@
 				RelativePath=".\..\src\spriteloader\grf.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\spriteloader\png.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\spriteloader\spriteloader.hpp"
 				>
@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2012-02-19
-Release version: 1.2.0-RC1
+Last updated:    2012-01-07
+Release version: 1.2.0-beta2
 ------------------------------------------------------------------------


@@ -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\OpenTTD (95, 98, ME)
+		Windows: C:\My Documents (95, 98, ME)
 		         C:\Documents and Settings\<username>\My Documents\OpenTTD (2000, XP)
 		         C:\Users\<username>\Documents\OpenTTD (Vista, 7)
 		Mac OSX: ~/Documents/OpenTTD
@@ -501,8 +501,6 @@ The following compilers are known to compile OpenTTD:
    Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
    Versions 4.5 and later give invalid warnings when lto is enabled.
  - Intel C++ Compiler (ICC) 12.0.
-  - Clang/LLVM 2.9 - 3.0
-    Version 2.9 gives bogus warnings about code nonconformity.

 The following compilers are known not to compile OpenTTD:
  - Microsoft Visual C++ (MSVC) 2003 and earlier.
@@ -512,7 +510,7 @@ The following compilers are known not to compile OpenTTD:
    Version 10.0 and earlier fail a configure check and fail with recent system
        headers.
    Version 10.1 fails to compile station_gui.cpp.
-    Version 11.1 fails with an internal error when compiling network.cpp.
+    Version 11.1 fails with internal error when compiling network.cpp.
  - Clang/LLVM 2.8 and earlier.
  - (Open) Watcom.

@@ -649,7 +647,7 @@ Retired Developers:
  Serge Paquet (vurlix)           - Assistant project manager, coder (0.1 - 0.3.3)
  Dominik Scherer (dominik81)     - Lead programmer, GUI expert (0.3.0 - 0.3.6)
  Benedikt Brüggemeier (skidd13)  - Bug fixer and code reworker
-  Patric Stout (TrueBrain)        - NoProgrammer (0.3 - 1.2), sys op (active)
+  Patric Stout (TrueBrain)        - Programmer (0.3 - pre0.7), sys op (active)

 Thanks to:
  Josef Drexler                   - For his great work on TTDPatch.
@@ -306,8 +306,6 @@ tar_type.h
 terraform_gui.h
 textbuf_gui.h
 texteff.hpp
-textfile_gui.h
-textfile_type.h
 tgp.h
 tile_cmd.h
 tile_type.h
@@ -438,7 +436,6 @@ station_gui.cpp
 statusbar_gui.cpp
 subsidy_gui.cpp
 terraform_gui.cpp
-textfile_gui.cpp
 timetable_gui.cpp
 toolbar_gui.cpp
 town_gui.cpp
@@ -871,6 +868,10 @@ video/video_driver.hpp
 # Sprite loaders
 spriteloader/grf.cpp
 spriteloader/grf.hpp
+#if PNG
+spriteloader/png.cpp
+spriteloader/png.hpp
+#end
 spriteloader/spriteloader.hpp

 # NewGRF
@@ -183,7 +183,7 @@ typedef char SQChar;
 #define scstrdup	strdup
 #define scstrrchr	strrchr
 #define scstrcat	strcat
-#define MAX_CHAR 0xFFFF
+#define MAX_CHAR 0xFF
 #endif

 #define SQUIRREL_VERSION	_SC("Squirrel 2.2.5 stable - With custom OpenTTD modifications")
@@ -538,10 +538,6 @@ 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;
 		}
@@ -2,7 +2,11 @@
 #ifndef _SQLEXER_H_
 #define _SQLEXER_H_

-typedef unsigned short LexChar;
+#ifdef SQUNICODE
+typedef SQChar LexChar;
+#else
+typedef	unsigned char LexChar;
+#endif

 struct SQLexer
 {
@@ -200,10 +200,6 @@ inline SQObjectPtr &stack_get(HSQUIRRELVM v,SQInteger idx){return ((idx>=0)?(v->

 #define PUSH_CALLINFO(v,nci){ \
 	if(v->_callsstacksize == v->_alloccallsstacksize) { \
-		if (v->_callsstacksize > 65535) {\
-			v->Raise_Error(_SC("stack overflow"));\
-			return false;\
-		}\
 		v->GrowCallStack(); \
 	} \
 	v->ci = &v->_callsstack[v->_callsstacksize]; \
@@ -23,7 +23,6 @@
 #include "../network/network.h"
 #include "../settings_func.h"
 #include "../network/network_content.h"
-#include "../textfile_gui.h"

 #include "ai.hpp"
 #include "../script/api/script_log.hpp"
@@ -518,7 +517,11 @@ struct AISettingsWindow : public Window {
 	 */
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
 	{
-		this->RebuildVisibleSettings();
+		if (_game_mode == GM_NORMAL && Company::IsValidID(this->slot)) {
+			delete this;
+		} else {
+			this->RebuildVisibleSettings();
+		}
 	}
 };

@@ -560,40 +563,6 @@ static void ShowAISettingsWindow(CompanyID slot)
 	new AISettingsWindow(&_ai_settings_desc, slot);
 }

-
-/** Window for displaying the textfile of a AI. */
-struct ScriptTextfileWindow : public TextfileWindow {
-	CompanyID slot; ///< View the textfile of this CompanyID slot.
-
-	ScriptTextfileWindow(TextfileType file_type, CompanyID slot) : TextfileWindow(file_type), slot(slot)
-	{
-		this->GetWidget<NWidgetCore>(WID_TF_CAPTION)->SetDataTip(STR_TEXTFILE_README_CAPTION + file_type, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS);
-
-		const char *textfile = GetConfig(slot)->GetTextfile(file_type, slot);
-		this->LoadTextfile(textfile, (slot == OWNER_DEITY) ? GAME_DIR : AI_DIR);
-	}
-
-	/* virtual */ void SetStringParameters(int widget) const
-	{
-		if (widget == WID_TF_CAPTION) {
-			SetDParam(0, (slot == OWNER_DEITY) ? STR_CONTENT_TYPE_GAME_SCRIPT : STR_CONTENT_TYPE_AI);
-			SetDParamStr(1, GetConfig(slot)->GetName());
-		}
-	}
-};
-
-/**
- * Open the AI version of the textfile window.
- * @param file_type The type of textfile to display.
- * @param slot The slot the Script is using.
- */
-void ShowScriptTextfileWindow(TextfileType file_type, CompanyID slot)
-{
-	DeleteWindowByClass(WC_TEXTFILE);
-	new ScriptTextfileWindow(file_type, slot);
-}
-
-
 /** Widgets for the configure AI window. */
 static const NWidgetPart _nested_ai_config_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
@@ -627,11 +596,6 @@ static const NWidgetPart _nested_ai_config_widgets[] = {
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CHANGE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CHANGE, STR_AI_CONFIG_CHANGE_TOOLTIP),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_CONFIG_CONFIGURE_TOOLTIP),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CLOSE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_SETTINGS_CLOSE, STR_NULL),
-			EndContainer(),
-		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_README), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_README, STR_NULL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_CHANGELOG), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_CHANGELOG, STR_NULL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_TEXTFILE + TFT_LICENSE), SetFill(1, 0), SetResize(1, 0), SetDataTip(STR_TEXTFILE_VIEW_LICENCE, STR_NULL),
 		EndContainer(),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONTENT_DOWNLOAD), SetFill(1, 0), SetMinimalSize(279, 12), SetPadding(0, 7, 9, 7), SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT),
 	EndContainer(),
@@ -768,13 +732,6 @@ struct AIConfigWindow : public Window {

 	virtual void OnClick(Point pt, int widget, int click_count)
 	{
-		if (widget >= WID_AIC_TEXTFILE && widget < WID_AIC_TEXTFILE + TFT_END) {
-			if (this->selected_slot == INVALID_COMPANY || GetConfig(this->selected_slot) == NULL) return;
-
-			ShowScriptTextfileWindow((TextfileType)(widget - WID_AIC_TEXTFILE), this->selected_slot);
-			return;
-		}
-
 		switch (widget) {
 			case WID_AIC_DECREASE:
 			case WID_AIC_INCREASE: {
@@ -865,10 +822,6 @@ struct AIConfigWindow : public Window {
 		this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == INVALID_COMPANY || GetConfig(this->selected_slot)->GetConfigList()->size() == 0);
 		this->SetWidgetDisabledState(WID_AIC_MOVE_UP, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot - 1)));
 		this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot + 1)));
-
-		for (TextfileType tft = TFT_BEGIN; tft < TFT_END; tft++) {
-			this->SetWidgetDisabledState(WID_AIC_TEXTFILE + tft, this->selected_slot == INVALID_COMPANY || (GetConfig(this->selected_slot)->GetTextfile(tft, this->selected_slot) == NULL));
-		}
 	}
 };

@@ -109,13 +109,13 @@ static inline uint16 GetVehicleDefaultCapacity(EngineID engine, CargoID *cargo_t
 */
 static inline uint32 GetAvailableVehicleCargoTypes(EngineID engine, bool include_initial_cargo_type)
 {
-	const Engine *e = Engine::Get(engine);
-	if (!e->CanCarryCargo()) return 0;
+	uint32 cargoes = 0;
+	CargoID initial_cargo_type;

-	uint32 cargoes = e->info.refit_mask;
-
-	if (include_initial_cargo_type) {
-		SetBit(cargoes, e->GetDefaultCargoType());
+	if (GetVehicleDefaultCapacity(engine, &initial_cargo_type) > 0) {
+		const EngineInfo *ei = EngInfo(engine);
+		cargoes = ei->refit_mask;
+		if (include_initial_cargo_type && initial_cargo_type < NUM_CARGO) SetBit(cargoes, initial_cargo_type);
 	}

 	return cargoes;
@@ -240,7 +240,7 @@ bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *car
 	CargoID first_cargo = CT_INVALID;

 	do {
-		if (v->cargo_type != CT_INVALID && v->GetEngine()->CanCarryCargo()) {
+		if (v->cargo_cap > 0 && v->cargo_type != CT_INVALID) {
 			if (first_cargo == CT_INVALID) first_cargo = v->cargo_type;
 			if (first_cargo != v->cargo_type) {
 				if (cargo_type != NULL) *cargo_type = CT_INVALID;
@@ -206,7 +206,7 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool
 		 * now we will figure out what cargo the train is carrying and refit to fit this */

 		for (v = v->First(); v != NULL; v = v->Next()) {
-			if (!v->GetEngine()->CanCarryCargo()) continue;
+			if (v->cargo_cap == 0) continue;
 			/* Now we found a cargo type being carried on the train and we will see if it is possible to carry to this one */
 			if (HasBit(available_cargo_types, v->cargo_type)) return v->cargo_type;
 		}
@@ -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) == 0 || GetGroupNumEngines(_local_company, ALL_GROUP, e) == 0) {
+	if (GetGroupNumEngines(_local_company, id_g, e) || 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 */
@@ -33,7 +33,7 @@ struct MD5File {
 	uint8 hash[16];              ///< md5 sum of the file
 	const char *missing_warning; ///< warning when this file is missing

-	ChecksumResult CheckMD5(Subdirectory subdir, size_t max_size) const;
+	ChecksumResult CheckMD5(Subdirectory subdir) const;
 };

 /**
@@ -129,20 +129,6 @@ struct BaseSet {
 		/* Then fall back */
 		return this->description.Begin()->second;
 	}
-
-	/**
-	 * Calculate and check the MD5 hash of the supplied file.
-	 * @param file The file get the hash of.
-	 * @param subdir The sub directory to get the files from.
-	 * @return
-	 * - #CR_MATCH if the MD5 hash matches
-	 * - #CR_MISMATCH if the MD5 does not match
-	 * - #CR_NO_FILE if the file misses
-	 */
-	static MD5File::ChecksumResult CheckMD5(const MD5File *file, Subdirectory subdir)
-	{
-		return file->CheckMD5(subdir, SIZE_MAX);
-	}
 };

 /**
@@ -223,8 +209,6 @@ struct GraphicsSet : BaseSet<GraphicsSet, MAX_GFT, true> {
 	BlitterType blitter;       ///< Blitter of this graphics set

 	bool FillSetDetails(struct IniFile *ini, const char *path, const char *full_filename);
-
-	static MD5File::ChecksumResult CheckMD5(const MD5File *file, Subdirectory subdir);
 };

 /** All data/functions related with replacing the base graphics. */
@@ -131,7 +131,7 @@ bool BaseSet<T, Tnum_files, Tsearch_in_tars>::FillSetDetails(IniFile *ini, const
 			file->missing_warning = strdup(item->value);
 		}

-		switch (T::CheckMD5(file, BASESET_DIR)) {
+		switch (file->CheckMD5(BASESET_DIR)) {
 			case MD5File::CR_MATCH:
 				this->valid_files++;
 				/* FALL THROUGH */
@@ -417,9 +417,10 @@ void Blitter_32bppAnim::PaletteAnimate(const Palette &palette)

 	this->palette = palette;
 	/* If first_dirty is 0, it is for 8bpp indication to send the new
-	 *  palette. However, only the animation colours might possibly change.
-	 *  Especially when going between toyland and non-toyland. */
-	assert(this->palette.first_dirty == PALETTE_ANIM_START || this->palette.first_dirty == 0);
+	 *  palette. As we dont do that for 32bpp, ignore that request
+	 *  completely */
+	if (this->palette.first_dirty == 0) return;
+	assert(this->palette.first_dirty == PALETTE_ANIM_START);

 	const uint16 *anim = this->anim_buf;
 	uint32 *dst = (uint32 *)_screen.dst_ptr;
@@ -207,6 +207,55 @@ void Blitter_32bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode,
 	}
 }

+/**
+ * Resizes the sprite in a very simple way, takes every n-th pixel and every n-th row
+ *
+ * @param sprite_src sprite to resize
+ * @param zoom resizing scale
+ * @return resized sprite
+ */
+static const SpriteLoader::Sprite *ResizeSprite(const SpriteLoader::Sprite *sprite_src, ZoomLevel zoom)
+{
+	SpriteLoader::Sprite *sprite = MallocT<SpriteLoader::Sprite>(1);
+
+	if (zoom == ZOOM_LVL_NORMAL) {
+		memcpy(sprite, sprite_src, sizeof(*sprite));
+		uint size = sprite_src->height * sprite_src->width;
+		sprite->data = MallocT<SpriteLoader::CommonPixel>(size);
+		memcpy(sprite->data, sprite_src->data, size * sizeof(SpriteLoader::CommonPixel));
+		return sprite;
+	}
+
+	sprite->height = UnScaleByZoom(sprite_src->height, zoom);
+	sprite->width  = UnScaleByZoom(sprite_src->width,  zoom);
+	sprite->x_offs = UnScaleByZoom(sprite_src->x_offs, zoom);
+	sprite->y_offs = UnScaleByZoom(sprite_src->y_offs, zoom);
+
+	uint size = sprite->height * sprite->width;
+	SpriteLoader::CommonPixel *dst = sprite->data = CallocT<SpriteLoader::CommonPixel>(size);
+
+	const SpriteLoader::CommonPixel *src = (SpriteLoader::CommonPixel *)sprite_src->data;
+	const SpriteLoader::CommonPixel *src_end = src + sprite_src->height * sprite_src->width;
+
+	uint scaled_1 = ScaleByZoom(1, zoom);
+
+	for (uint y = 0; y < sprite->height; y++) {
+		if (src >= src_end) src = src_end - sprite_src->width;
+
+		const SpriteLoader::CommonPixel *src_ln = src + sprite_src->width * scaled_1;
+		for (uint x = 0; x < sprite->width; x++) {
+			if (src >= src_ln) src = src_ln - 1;
+			*dst = *src;
+			dst++;
+			src += scaled_1;
+		}
+
+		src = src_ln;
+	}
+
+	return sprite;
+}
+
 Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorProc *allocator)
 {
 	/* streams of pixels (a, r, g, b channels)
@@ -238,7 +287,7 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 	}

 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
-		const SpriteLoader::Sprite *src_orig = &sprite[z];
+		const SpriteLoader::Sprite *src_orig = ResizeSprite(sprite, z);

 		uint size = src_orig->height * src_orig->width;

@@ -322,6 +371,9 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr

 		lengths[z][0] = (byte *)dst_px_ln - (byte *)dst_px_orig[z]; // all are aligned to 4B boundary
 		lengths[z][1] = (byte *)dst_n_ln  - (byte *)dst_n_orig[z];
+
+		free(src_orig->data);
+		free(src_orig);
 	}

 	uint len = 0; // total length of data
@@ -130,7 +130,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 	}

 	for (ZoomLevel i = zoom_min; i <= zoom_max; i++) {
-		memory += sprite[i].width * sprite[i].height;
+		memory += UnScaleByZoom(sprite->height, i) * UnScaleByZoom(sprite->width, i);
 	}

 	/* We have no idea how much memory we really need, so just guess something */
@@ -150,8 +150,9 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 		temp_dst->offset[i] = offset;

 		/* cache values, because compiler can't cache it */
-		int scaled_height = sprite[i].height;
-		int scaled_width  = sprite[i].width;
+		int scaled_height = UnScaleByZoom(sprite->height, i);
+		int scaled_width  = UnScaleByZoom(sprite->width,  i);
+		int scaled_1      =   ScaleByZoom(1,              i);

 		for (int y = 0; y < scaled_height; y++) {
 			uint trans = 0;
@@ -160,10 +161,18 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 			byte *count_dst = NULL;

 			/* Store the scaled image */
-			const SpriteLoader::CommonPixel *src = &sprite[i].data[y * sprite[i].width];
+			const SpriteLoader::CommonPixel *src = &sprite->data[ScaleByZoom(y, i) * sprite->width];
+			const SpriteLoader::CommonPixel *src_end = &src[sprite->width];

 			for (int x = 0; x < scaled_width; x++) {
-				uint colour = src++->m;
+				uint colour = 0;
+
+				/* Get the colour keeping in mind the zoom-level */
+				for (int j = 0; j < scaled_1; j++) {
+					if (src->m != 0) colour = src->m;
+					/* Because of the scaling it might happen we read outside the buffer. Avoid that. */
+					if (++src == src_end) break;
+				}

 				if (last_colour == 0 || colour == 0 || pixels == 255) {
 					if (count_dst != NULL) {
@@ -847,10 +847,9 @@ 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;
 }
@@ -105,33 +105,6 @@ 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;
-	}
 };


@@ -38,12 +38,7 @@ 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;
-
-		/* Set defaults for newer properties, which old GRFs do not know */
-		CargoSpec::Get(i)->multiplier = 0x100;
-	}
+	for (CargoID i = 0; i < lengthof(CargoSpec::array); i++) CargoSpec::Get(i)->bitnum = INVALID_CARGO;

 	_cargo_mask = 0;

@@ -59,7 +59,6 @@ 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];

@@ -633,31 +633,40 @@ 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;

-	/* Test the command. */
-	_cleared_object_areas.Clear();
-	SetTownRatingTestMode(true);
-	ClearStorageChanges(false);
-	CommandCost res = proc(tile, flags, p1, p2, text);
-	SetTownRatingTestMode(false);
+	/* 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);

-	/* 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))) {
-		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));
+		/* 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);
 		}
-		cur_company.Restore();
-		return_dcpi(res, false);
 	}

 #ifdef ENABLE_NETWORK
@@ -696,11 +705,11 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 		cur_company.Restore();
 	}

-	/* 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) {
+	/* 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) {
 		assert(res.GetCost() == res2.GetCost() && res.Failed() == res2.Failed()); // sanity check
 	} else if (res2.Failed()) {
 		return_dcpi(res2, false);
@@ -345,6 +345,7 @@ 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
 };
@@ -19,13 +19,12 @@
 #include "settings_type.h"
 #include "group.h"

-/** Statistics about the economy. */
 struct CompanyEconomyEntry {
-	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.
+	Money income;
+	Money expenses;
+	int32 delivered_cargo;
+	int32 performance_history; ///< company score (scale 0-1000)
+	Money company_value;
 };

 struct CompanyInfrastructure {
@@ -35,14 +34,6 @@ struct CompanyInfrastructure {
 	uint32 water;              ///< Count of company owned track bits for canals.
 	uint32 station;            ///< Count of company owned station tiles.
 	uint32 airport;            ///< Count of company owned airports.
-
-	/** Get total sum of all owned track bits. */
-	uint32 GetRailTotal() const
-	{
-		uint32 total = 0;
-		for (RailType rt =  RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) total += this->rail[rt];
-		return total;
-	}
 };

 typedef Pool<Company, CompanyByte, 1, MAX_COMPANIES> CompanyPool;
@@ -71,6 +62,8 @@ 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.

@@ -810,13 +810,7 @@ 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);
@@ -848,17 +842,13 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			}

 			if (_network_server) {
-				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);
-				}
+				ci->client_playas = c->index;
+				NetworkUpdateClientInfo(ci->client_id);

-				if (Company::IsValidID(c->index)) {
+				if (Company::IsValidID(ci->client_playas)) {
 					_network_company_states[c->index].months_empty = 0;
 					_network_company_states[c->index].password[0] = '\0';
-					NetworkServerUpdateCompanyPassworded(c->index, false);
+					NetworkServerUpdateCompanyPassworded(ci->client_playas, 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
@@ -871,24 +861,12 @@ 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? */
-					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);
-					}
+					NetworkSendCommand(0, 0, 0, CMD_RENAME_PRESIDENT, NULL, ci->client_name, ci->client_playas);
 				}

 				/* Announce new company on network. */
 				NetworkAdminCompanyInfo(c, true);
-
-				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);
-				}
+				NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, ci->client_playas + 1);
 			}
 #endif /* ENABLE_NETWORK */
 			break;
@@ -1588,9 +1588,8 @@ struct CompanyInfrastructureWindow : Window
 		const Company *c = Company::Get((CompanyID)this->window_number);
 		Money total;

-		uint32 rail_total = c->infrastructure.GetRailTotal();
 		for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
-			if (HasBit(this->railtypes, rt)) total += RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total);
+			if (HasBit(this->railtypes, rt)) total += RailMaintenanceCost(rt, c->infrastructure.rail[rt]);
 		}
 		total += SignalMaintenanceCost(c->infrastructure.signal);

@@ -1676,10 +1675,9 @@ struct CompanyInfrastructureWindow : Window
 				/* Find the maximum count that is displayed. */
 				uint32 max_val = 1000;  // Some random number to reserve enough space.
 				Money max_cost = 10000; // Some random number to reserve enough space.
-				uint32 rail_total = c->infrastructure.GetRailTotal();
 				for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) {
 					max_val = max(max_val, c->infrastructure.rail[rt]);
-					max_cost = max(max_cost, RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
+					max_cost = max(max_cost, RailMaintenanceCost(rt, c->infrastructure.rail[rt]));
 				}
 				max_val = max(max_val, c->infrastructure.signal);
 				max_cost = max(max_cost, SignalMaintenanceCost(c->infrastructure.signal));
@@ -1741,13 +1739,12 @@ struct CompanyInfrastructureWindow : Window

 				break;

-			case WID_CI_RAIL_COUNT: {
+			case WID_CI_RAIL_COUNT:
 				/* Draw infrastructure count for each valid railtype. */
-				uint32 rail_total = c->infrastructure.GetRailTotal();
 				for (RailType rt = RAILTYPE_BEGIN; rt != RAILTYPE_END; rt++) {
 					if (HasBit(this->railtypes, rt)) {
 						SetDParam(0, c->infrastructure.rail[rt]);
-						SetDParam(1, RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total) * 12); // Convert to per year
+						SetDParam(1, RailMaintenanceCost(rt, c->infrastructure.rail[rt]) * 12); // Convert to per year
 						DrawString(r.left, r.right, y += FONT_HEIGHT_NORMAL, _settings_game.economy.infrastructure_maintenance ? STR_COMPANY_INFRASTRUCTURE_VIEW_COST : STR_WHITE_COMMA);
 					}
 				}
@@ -1757,7 +1754,6 @@ struct CompanyInfrastructureWindow : Window
 					DrawString(r.left, r.right, y += FONT_HEIGHT_NORMAL, _settings_game.economy.infrastructure_maintenance ? STR_COMPANY_INFRASTRUCTURE_VIEW_COST : STR_WHITE_COMMA);
 				}
 				break;
-			}

 			case WID_CI_ROAD_DESC:
 				DrawString(r.left, r.right, y, STR_COMPANY_INFRASTRUCTURE_VIEW_ROAD_SECT);
@@ -28,7 +28,7 @@ enum GenderEthnicity {
 	GE_BF = 1 << ETHNICITY_BLACK | 1 << GENDER_FEMALE, ///< A female of African origin (black)
 	GE_END,
 };
-DECLARE_ENUM_AS_BIT_SET(GenderEthnicity) ///< See GenderRace as a bitset
+DECLARE_ENUM_AS_BIT_SET(GenderEthnicity); ///< See GenderRace as a bitset

 /** Bitgroups of the CompanyManagerFace variable */
 enum CompanyManagerFaceVariable {
@@ -52,7 +52,7 @@ enum CompanyManagerFaceVariable {
 	CMFV_GLASSES,
 	CMFV_END,
 };
-DECLARE_POSTFIX_INCREMENT(CompanyManagerFaceVariable)
+DECLARE_POSTFIX_INCREMENT(CompanyManagerFaceVariable);

 /** Information about the valid values of CompanyManagerFace bitgroups as well as the sprites to draw */
 struct CompanyManagerFaceBitsInfo {
@@ -180,38 +180,4 @@ public:
 	inline void operator delete[](void *ptr) { free(ptr); }
 };

-/**
- * A smart pointer class that free()'s the pointer on destruction.
- * @tparam T Storage type.
- */
-template <typename T>
-class AutoFreePtr
-{
-	T *ptr; ///< Stored pointer.
-
-public:
-	AutoFreePtr(T *ptr) : ptr(ptr) {}
-	~AutoFreePtr() { free(this->ptr); }
-
-	/**
-	 * Take ownership of a new pointer and free the old one if needed.
-	 * @param ptr NEw pointer.
-	 */
-	inline void Assign(T *ptr)
-	{
-		free(this->ptr);
-		this->ptr = ptr;
-	}
-
-	/** Dereference pointer. */
-	inline T *operator ->() { return this->ptr; }
-	/** Dereference pointer. */
-	inline const T *operator ->() const { return this->ptr; }
-
-	/** Cast to underlaying regular pointer. */
-	inline operator T *() { return this->ptr; }
-	/** Cast to underlaying regular pointer. */
-	inline operator const T *() const { return this->ptr; }
-};
-
 #endif /* ALLOC_TYPE_HPP */
@@ -107,11 +107,7 @@ DEFINE_POOL_METHOD(inline void *)::AllocateItem(size_t size, size_t index)
 		assert(sizeof(Titem) == size);
 		item = (Titem *)this->alloc_cache;
 		this->alloc_cache = this->alloc_cache->next;
-		if (Tzero) {
-			/* Explicitly casting to (void *) prevets a clang warning -
-			 * we are actually memsetting a (not-yet-constructed) object */
-			memset((void *)item, 0, sizeof(Titem));
-		}
+		if (Tzero) MemSetT(item, 0);
 	} else if (Tzero) {
 		item = (Titem *)CallocT<byte>(size);
 	} else {
@@ -63,13 +63,11 @@ 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))) {
-		DEBUG(random, 0, "%08x; %02x; %04x; %02x; %s:%d", _date, _date_fract, _frame_counter, (byte)_current_company, file, line);
+		printf("Random [%d/%d] %s:%d\n", _frame_counter, (byte)_current_company, file, line);
 	}

 	return _random.Next();
@@ -17,6 +17,19 @@
 	#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.
 */
@@ -39,9 +39,6 @@ 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;

@@ -67,9 +64,6 @@ struct DebugLevel {
 	DEBUG_LEVEL(gamelog),
 	DEBUG_LEVEL(desync),
 	DEBUG_LEVEL(console),
-#ifdef RANDOM_DEBUG
-	DEBUG_LEVEL(random),
-#endif
 	};
 #undef DEBUG_LEVEL

@@ -91,21 +85,7 @@ static void debug_print(const char *dbg, const char *buf)
 		return;
 	}
 #endif /* ENABLE_NETWORK */
-	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 (strcmp(dbg, "desync") != 0) {
 #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];
@@ -118,6 +98,12 @@ 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);
 	}
 }

@@ -51,9 +51,6 @@
 	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 */
@@ -214,21 +214,27 @@ int UpdateCompanyRatingAndValue(Company *c, bool update)

 	/* Generate score depending on amount of transported cargo */
 	{
-		int numec = min(c->num_valid_stat_ent, 4);
+		const CompanyEconomyEntry *cee;
+		int numec;
+		uint32 total_delivered;
+
+		numec = min(c->num_valid_stat_ent, 4);
 		if (numec != 0) {
-			const CompanyEconomyEntry *cee = c->old_economy;
-			OverflowSafeInt64 total_delivered = 0;
+			cee = c->old_economy;
+			total_delivered = 0;
 			do {
-				total_delivered += cee->delivered_cargo.GetSum<OverflowSafeInt64>();
+				total_delivered += cee->delivered_cargo;
 			} while (++cee, --numec);

-			_score_part[owner][SCORE_DELIVERED] = ClampToI32(total_delivered);
+			_score_part[owner][SCORE_DELIVERED] = total_delivered;
 		}
 	}

 	/* Generate score for variety of cargo */
 	{
-		_score_part[owner][SCORE_CARGO] = c->old_economy->delivered_cargo.GetCount();
+		uint num = CountBits(c->cargo_types);
+		_score_part[owner][SCORE_CARGO] = num;
+		if (update) c->cargo_types = 0;
 	}

 	/* Generate score for company's money */
@@ -419,10 +425,7 @@ 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);
@@ -471,9 +474,6 @@ 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) {
@@ -597,9 +597,8 @@ static void CompaniesGenStatistics()
 			cur_company.Change(c->index);

 			CommandCost cost(EXPENSES_PROPERTY);
-			uint32 rail_total = c->infrastructure.GetRailTotal();
 			for (RailType rt = RAILTYPE_BEGIN; rt < RAILTYPE_END; rt++) {
-				if (c->infrastructure.rail[rt] != 0) cost.AddCost(RailMaintenanceCost(rt, c->infrastructure.rail[rt], rail_total));
+				if (c->infrastructure.rail[rt] != 0) cost.AddCost(RailMaintenanceCost(rt, c->infrastructure.rail[rt]));
 			}
 			cost.AddCost(SignalMaintenanceCost(c->infrastructure.signal));
 			for (RoadType rt = ROADTYPE_BEGIN; rt < ROADTYPE_END; rt++) {
@@ -1008,7 +1007,8 @@ static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID dest, Ti
 	}

 	/* Update company statistics */
-	company->cur_economy.delivered_cargo[cargo_type] += accepted;
+	company->cur_economy.delivered_cargo += accepted;
+	if (accepted > 0) SetBit(company->cargo_types, cargo_type);

 	/* Increase town's counter for town effects */
 	const CargoSpec *cs = CargoSpec::Get(cargo_type);
@@ -210,7 +210,6 @@ 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;

@@ -218,16 +217,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, or if we are using the new multiplier algorithm. */
+	/* 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. */
 	if (HasBit(this->info.callback_mask, CBM_VEHICLE_REFIT_CAPACITY) &&
-			(new_multipliers || default_cargo != cargo_type || (v != NULL && v->cargo_subtype != 0))) {
+			(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);
@@ -247,31 +246,30 @@ 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)) {
-				extra_mail_cap = GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v);
+				capacity += GetEngineProperty(this->index, PROP_AIRCRAFT_MAIL_CAPACITY, this->u.air.mail_capacity, v);
 			}
-			if (!new_multipliers && cargo_type == CT_MAIL) return capacity + extra_mail_cap;
+			if (cargo_type == CT_MAIL) return capacity;
 			default_cargo = CT_PASSENGERS; // Always use 'passengers' wrt. cargo multipliers
 			break;

 		default: NOT_REACHED();
 	}

-	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;
+	/* 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;
 		}
-		capacity = (capacity + default_multiplier / 2) / default_multiplier;
 	}

 	return capacity;
@@ -156,7 +156,6 @@ 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.
 };

 /**
@@ -119,10 +119,8 @@ 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);
 		}

@@ -27,7 +27,6 @@
 #include "landscape_type.h"
 #include "date_func.h"
 #include "core/geometry_func.hpp"
-#include "gamelog.h"

 #include "widgets/fios_widget.h"

@@ -61,7 +60,7 @@ void LoadCheckData::Clear()
 	}
 	companies.Clear();

-	GamelogFree(this->gamelog_action, this->gamelog_actions);
+	free(this->gamelog_action);
 	this->gamelog_action = NULL;
 	this->gamelog_actions = 0;

@@ -1152,7 +1152,7 @@ const Sprite *GetGlyph(FontSize size, WChar key)
 	if (width > 256 || height > 256) usererror("Font glyph is too large");

 	/* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */
-	sprite.AllocateData(ZOOM_LVL_NORMAL, width * height);
+	sprite.AllocateData(width * height);
 	sprite.type = ST_FONT;
 	sprite.width = width;
 	sprite.height = height;
@@ -57,7 +57,6 @@
 #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"
@@ -153,7 +152,6 @@ 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);
@@ -64,12 +64,14 @@ void GamelogStopAction()
 }

 /**
- * Frees the memory allocated by a gamelog
+ * Resets and frees all memory allocated - used before loading or starting a new game
 */
-void GamelogFree(LoggedAction *gamelog_action, uint gamelog_actions)
+void GamelogReset()
 {
-	for (uint i = 0; i < gamelog_actions; i++) {
-		const LoggedAction *la = &gamelog_action[i];
+	assert(_gamelog_action_type == GLAT_NONE);
+
+	for (uint i = 0; i < _gamelog_actions; i++) {
+		const LoggedAction *la = &_gamelog_action[i];
 		for (uint j = 0; j < la->changes; j++) {
 			const LoggedChange *lc = &la->change[j];
 			if (lc->ct == GLCT_SETTING) free(lc->setting.name);
@@ -77,16 +79,7 @@ void GamelogFree(LoggedAction *gamelog_action, uint gamelog_actions)
 		free(la->change);
 	}

-	free(gamelog_action);
-}
-
-/**
- * Resets and frees all memory allocated - used before loading or starting a new game
- */
-void GamelogReset()
-{
-	assert(_gamelog_action_type == GLAT_NONE);
-	GamelogFree(_gamelog_action, _gamelog_actions);
+	free(_gamelog_action);

 	_gamelog_action  = NULL;
 	_gamelog_actions = 0;
@@ -30,7 +30,6 @@ enum GamelogActionType {
 void GamelogStartAction(GamelogActionType at);
 void GamelogStopAction();

-void GamelogFree(struct LoggedAction *gamelog_action, uint gamelog_actions);
 void GamelogReset();

 /**
@@ -821,36 +821,6 @@ 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.
 *
@@ -125,7 +125,6 @@ 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();
@@ -52,16 +52,7 @@ static uint LoadGrfFile(const char *filename, uint load_index, int file_index)

 	DEBUG(sprite, 2, "Reading grf-file '%s'", filename);

-	byte container_ver = GetGRFContainerVersion();
-	if (container_ver == 0) usererror("Base grf '%s' is corrupt", filename);
-	ReadGRFSpriteOffsets(container_ver);
-	if (container_ver >= 2) {
-		/* Read compression. */
-		byte compression = FioReadByte();
-		if (compression != 0) usererror("Unsupported compression format");
-	}
-
-	while (LoadNextSprite(load_index, file_index, sprite_id, container_ver)) {
+	while (LoadNextSprite(load_index, file_index, sprite_id)) {
 		load_index++;
 		sprite_id++;
 		if (load_index >= MAX_SPRITES) {
@@ -89,20 +80,11 @@ static void LoadGrfFileIndexed(const char *filename, const SpriteID *index_tbl,

 	DEBUG(sprite, 2, "Reading indexed grf-file '%s'", filename);

-	byte container_ver = GetGRFContainerVersion();
-	if (container_ver == 0) usererror("Base grf '%s' is corrupt", filename);
-	ReadGRFSpriteOffsets(container_ver);
-	if (container_ver >= 2) {
-		/* Read compression. */
-		byte compression = FioReadByte();
-		if (compression != 0) usererror("Unsupported compression format");
-	}
-
 	while ((start = *index_tbl++) != END) {
 		uint end = *index_tbl++;

 		do {
-			bool b = LoadNextSprite(start, file_index, sprite_id, container_ver);
+			bool b = LoadNextSprite(start, file_index, sprite_id);
 			assert(b);
 			sprite_id++;
 		} while (++start <= end);
@@ -137,7 +119,7 @@ void CheckExternalFiles()
 		/* Not all files were loaded successfully, see which ones */
 		add_pos += seprintf(add_pos, last, "Trying to load graphics set '%s', but it is incomplete. The game will probably not run correctly until you properly install this set or select another one. See section 4.1 of readme.txt.\n\nThe following files are corrupted or missing:\n", used_set->name);
 		for (uint i = 0; i < GraphicsSet::NUM_FILES; i++) {
-			MD5File::ChecksumResult res = GraphicsSet::CheckMD5(&used_set->files[i], BASESET_DIR);
+			MD5File::ChecksumResult res = used_set->files[i].CheckMD5(BASESET_DIR);
 			if (res != MD5File::CR_MATCH) add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", used_set->files[i].filename, res == MD5File::CR_MISMATCH ? "corrupt" : "missing", used_set->files[i].missing_warning);
 		}
 		add_pos += seprintf(add_pos, last, "\n");
@@ -150,7 +132,7 @@ void CheckExternalFiles()
 		assert_compile(SoundsSet::NUM_FILES == 1);
 		/* No need to loop each file, as long as there is only a single
 		 * sound file. */
-		add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", sounds_set->files->filename, SoundsSet::CheckMD5(sounds_set->files, BASESET_DIR) == MD5File::CR_MISMATCH ? "corrupt" : "missing", sounds_set->files->missing_warning);
+		add_pos += seprintf(add_pos, last, "\t%s is %s (%s)\n", sounds_set->files->filename, sounds_set->files->CheckMD5(BASESET_DIR) == MD5File::CR_MISMATCH ? "corrupt" : "missing", sounds_set->files->missing_warning);
 	}

 	if (add_pos != error_msg) ShowInfoF("%s", error_msg);
@@ -280,47 +262,22 @@ bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *ful
 	return ret;
 }

-/**
- * Calculate and check the MD5 hash of the supplied GRF.
- * @param file The file get the hash of.
- * @param subdir The sub directory to get the files from.
- * @return
- * - #CR_MATCH if the MD5 hash matches
- * - #CR_MISMATCH if the MD5 does not match
- * - #CR_NO_FILE if the file misses
- */
-/* static */ MD5File::ChecksumResult GraphicsSet::CheckMD5(const MD5File *file, Subdirectory subdir)
-{
-	size_t size = 0;
-	FILE *f = FioFOpenFile(file->filename, "rb", subdir, &size);
-	if (f == NULL) return MD5File::CR_NO_FILE;
-
-	size_t max = GRFGetSizeOfDataSection(f);
-
-	FioFCloseFile(f);
-
-	return file->CheckMD5(subdir, max);
-}
-

 /**
 * Calculate and check the MD5 hash of the supplied filename.
 * @param subdir The sub directory to get the files from
- * @param max_size Only calculate the hash for this many bytes from the file start.
 * @return
 * - #CR_MATCH if the MD5 hash matches
 * - #CR_MISMATCH if the MD5 does not match
 * - #CR_NO_FILE if the file misses
 */
-MD5File::ChecksumResult MD5File::CheckMD5(Subdirectory subdir, size_t max_size) const
+MD5File::ChecksumResult MD5File::CheckMD5(Subdirectory subdir) const
 {
 	size_t size;
 	FILE *f = FioFOpenFile(this->filename, "rb", subdir, &size);

 	if (f == NULL) return CR_NO_FILE;

-	size = min(size, max_size);
-
 	Md5 checksum;
 	uint8 buffer[1024];
 	uint8 digest[16];
@@ -130,17 +130,14 @@ 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 != INVALID_COMPANY && company == _local_company) || (company == INVALID_COMPANY && Company::IsValidID(_local_company))) ShowGoalQuestion(uniqueid, type, p2, text);
+		if (company == _local_company || (company == INVALID_COMPANY && Company::IsValidID(_local_company))) ShowGoalQuestion(uniqueid, p2, text);
 	}

 	return CommandCost();
@@ -258,15 +258,13 @@ struct GoalQuestionWindow : Window {
 	char *question;
 	int buttons;
 	int button[3];
-	byte type;

-	GoalQuestionWindow(const WindowDesc *desc, WindowNumber window_number, byte type, uint32 button_mask, const char *question) : Window(), type(type)
+	GoalQuestionWindow(const WindowDesc *desc, WindowNumber window_number, uint32 button_mask, const char *question) : Window()
 	{
-		assert(type < GOAL_QUESTION_TYPE_COUNT);
 		this->question = strdup(question);

 		/* Figure out which buttons we have to enable */
-		uint bit;
+		int bit;
 		int n = 0;
 		FOR_EACH_SET_BIT(bit, button_mask) {
 			if (bit >= GOAL_QUESTION_BUTTON_COUNT) break;
@@ -289,10 +287,6 @@ 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;
@@ -347,7 +341,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, WID_GQ_CAPTION), SetDataTip(STR_WHITE_STRING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE), SetDataTip(STR_GOAL_QUESTION_CAPTION, 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),
@@ -377,7 +371,7 @@ static const WindowDesc _goal_question_list_desc(
 );


-void ShowGoalQuestion(uint16 id, byte type, uint32 button_mask, const char *question)
+void ShowGoalQuestion(uint16 id, uint32 button_mask, const char *question)
 {
-	new GoalQuestionWindow(&_goal_question_list_desc, id, type, button_mask, question);
+	new GoalQuestionWindow(&_goal_question_list_desc, id, button_mask, question);
 }
@@ -14,8 +14,9 @@

 #include "core/enum_type.hpp"

-static const uint32 GOAL_QUESTION_BUTTON_COUNT = 18; ///< Amount of buttons available.
-static const byte   GOAL_QUESTION_TYPE_COUNT   =  4; ///< Amount of question types.
+enum {
+	GOAL_QUESTION_BUTTON_COUNT = 18, ///< Amount of buttons available.
+};

 /** Types of goal destinations */
 enum GoalType {
@@ -717,7 +717,7 @@ struct DeliveredCargoGraphWindow : BaseGraphWindow {

 	virtual OverflowSafeInt64 GetGraphData(const Company *c, int j)
 	{
-		return c->old_economy[j].delivered_cargo.GetSum<OverflowSafeInt64>();
+		return c->old_economy[j].delivered_cargo;
 	}
 };

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

 void ShowEstimatedCostOrIncome(Money cost, int x, int y);

@@ -769,7 +769,6 @@ static void GenerateTerrain(int type, uint flag)
 	uint32 r = Random();

 	const Sprite *templ = GetSprite((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845, ST_MAPGEN);
-	if (templ == NULL) usererror("Map generator sprites could not be loaded");

 	uint x = r & MapMaxX();
 	uint y = (r >> MapLogX()) & MapMaxY();
@@ -2355,6 +2355,9 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Beweeg A
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Beweeg die gekose NewGRF af in die lys
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}'n Lys van die NewGRF lêers wat installer. Kliek 'n lêer om sy parameter te verander.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Lisensie
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Stel parameters
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Tokkel pallet
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Tokkel die pallet van die geselekteurde NewGRF.{}Doen dit wanneer die grafika van hierdie NewGRF pink lyk in die speletjie.
@@ -2383,6 +2386,8 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Hoeveelheid parameters: {ORANGE}{NUM}

+# NewGRF textfile window
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspekteer - {STRING}

@@ -2413,8 +2418,15 @@ 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 {1:STRING} as statiese NewGRF met {STRING} kan desinkroniesasies veroorsaak.
+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_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!
@@ -2522,10 +2534,6 @@ STR_GOALS_NONE                                                  :{ORANGE}- Geen
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Maatskappy doelwitte:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}kliek op doel om kern oorsig van industrie/stad/teël te middel. Ctrl+Kliek open 'n nuwe siens poort by industrie/stad/teël lokasie

-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsidiee
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Subsidiee op aanbod vir diens opneming:
@@ -3249,8 +3257,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Verander
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Reinig Tyd
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Vee uit die totaal van tyd vir die gespesiveerde opdrag

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Herstel Laat Teller
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Herstel die laat teller, so dat die voertuig op tyd is

@@ -3336,11 +3342,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Maak toe
 STR_AI_SETTINGS_RESET                                           :{BLACK}Herstel
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Lisensie
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -287,7 +287,6 @@ 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}ايقاف اللعبة
@@ -349,7 +348,6 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :انهاء
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :خيارات اللعبة
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :خيارات الصعوبة
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :اعدادات متقدمة
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :الذكاء الصناعي/ اعدادات اللعبة
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :إعدادات جرافيك جديده
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :خيارات الشفافية
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :عرض اسماء المدن
@@ -382,7 +380,6 @@ STR_TOWN_MENU_FOUND_TOWN                                        :جد المدي

 ############ range for subsidies menu starts
 STR_SUBSIDIES_MENU_SUBSIDIES                                    :العروض
-STR_SUBSIDIES_MENU_GOAL                                         :الاهداف الحالية
 ############ range ends here

 ############ range for graph menu starts
@@ -447,7 +444,6 @@ STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :توقل كون
 STR_ABOUT_MENU_AI_DEBUG                                         :مكتشف اخطاء الذكاء الصناعي
 STR_ABOUT_MENU_SCREENSHOT                                       :صورة من الشاشة - Ctrl-S -
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :صورة للشاشة مصغرة
-STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :تقريب الشاشة القياسي
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :صورة كبيرة لكامل الخريطة -Ctrl-G -
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :حول 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :موائم العفريتات
@@ -751,8 +747,6 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}تغي
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}العروض
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}معلومات عامة

-STR_NEWS_CUSTOM_ITEM                                            :{BIG_FONT}{BLACK}{STRING}
-
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK} ... المواطنون يحتفلون{} اول قطار وصل في {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}يحتفل الأهالي ...{}بوصول اول باص للمحطة ...{STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}الأهالي يحتفلون ... {}بوصول اول عربة الى .. {STATION}!
@@ -827,7 +821,6 @@ STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} لا يستطيع ايجاد طريق للمواصلة
 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} تائه
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}{VEHICLE} دخل العربة السنة السابقة {CURRENCY_LONG}
-STR_NEWS_AIRCRAFT_DEST_TOO_FAR                                  :{WHITE}{VEHICLE}لا يمكن الوصول للمحطة التالية لانها خارج المدى

 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}امرالاستبدال توقف {VEHICLE}
 STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}فشل تطبيق الاستبدال الذاتي ل{VEHICLE}{}{STRING}
@@ -1162,7 +1155,6 @@ STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE} الس
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}السماح ببناء محطات متلاصقة{ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}السماح بتعدد محركات NewGFR {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}

@@ -1180,7 +1172,6 @@ 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                      :الأصلي
@@ -1272,7 +1263,6 @@ 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 قبل تعليق الاسكربت: {ORANGE}{STRING}

 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}فترات الصيانة بالنسبة المئوية : {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}فترات الصيانة القياسية للقطارات: {ORANGE}{STRING} يوم / %
@@ -1365,7 +1355,6 @@ 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
@@ -1378,20 +1367,6 @@ 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}... تجاهل الاضافات الجديدة '{STRING}': متطابق مع اضافة '{STRING}'
-STR_CONFIG_ERROR_INVALID_GRF                                    :{WHITE}...تجاهل الاضافة الجديده '{STRING}': {STRING}
-STR_CONFIG_ERROR_INVALID_GRF_NOT_FOUND                          :غير متوفر
-STR_CONFIG_ERROR_INVALID_GRF_UNSAFE                             :غير امن للاستخدام
-STR_CONFIG_ERROR_INVALID_GRF_SYSTEM                             :نظام الاضافات الجديدة
-STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :غير متطابق مع هذه النسخة من OpenTTD
-STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :مجهول
-STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... نسبة الضغط '{STRING}' غير صحيحة
-
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}

@@ -2122,7 +2097,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}ضع شجر عشوائي
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}زراعة اشجار عشوائيا
@@ -2438,6 +2413,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}تحري
 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_TOGGLE_PALETTE                              :{BLACK}فتح/اغلاق اللوحة
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}فتح / اغلاق لوحة NewGRF المختارة.{} افعل هذا عندما تكون الرسومات الجديدة وردية اللون.
@@ -2468,6 +2448,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :نمط {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}عدد الانماط: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}اعرض ملف القرائة للمحتوى الجديد {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}اعرض ملف التغييرات للمحتوى الجديد {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}رخصة المحتوى الجديد {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}نظرة فاحصة - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}الاساس
@@ -2510,10 +2495,17 @@ 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                       :تحميل {1:STRING}كملف ثابت مع NewGRF {STRING}قد يتسبب بمشكلة توافق.
+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_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_FORCEFULLY_DISABLED                            :{1:STRING}تم تعطيلة بواسطة{STRING}
+STR_NEWGRF_ERROR_GRM_FAILED                                     :معلومات الاضافة غير متاحة
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING}تم تعطيلة بواسطة{4:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :شبح/ ماكرو غير معروف

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}تحذير!
@@ -2633,16 +2625,6 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW} مول
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW} اشتري حقوق النقل لسنة كاملة في هذة المدينة و المصانع التابعة لها. البلدية سوف تسمح للركاب و البضائع باستخدام محطاتك فقط. {}التكلفة: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW} ارشي السلطات المحلية لزيادة كفائة الشركة. هناك عقاب شديد اذا ما اكتشفت الرشوة. {} التكلفة: {CURRENCY_LONG}

-# Goal window
-
-# Goal question window
-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
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}العروض
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}العروض المتاحة للخدمة:
@@ -2770,7 +2752,7 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_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% من اسهم هذه الشركة, + مفتاح الاعلى لاظهار التكلفه
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}اشتري 25% من اسهم هذه الشركة
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}بيع 25% من اسهم هذه الشركة

 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :اسم الشركة
@@ -2778,8 +2760,6 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :اسم صاحب

 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}نحن نبحث عن شركة لتشتري شركتنا. {}{} عل ترغب في شراء {COMPANY} بـ {CURRENCY_LONG}؟

-# Company infrastructure window
-
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}صناعات
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}-بدون-
@@ -3346,7 +3326,6 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[قرب الن
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[وسط]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[النهاية القصوى]

-
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :اقفز الى الأمر {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :اقفز للامر{COMMA} عندما {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :اقفز للامر {COMMA} عندما {STRING} {STRING}
@@ -3363,9 +3342,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}جدول
 STR_TIMETABLE_NO_TRAVEL                                         :لا رحيل
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :المغادرة (ذاتي: بواسطة الامر اليدوي التالي)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :مسافر (ليس هناك جدولة)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :سافر بمعدل {2:VELOCITY} (بدون جدوله)
 STR_TIMETABLE_TRAVEL_FOR                                        :مسافر لـ {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :سافر لي {STRING} بمعدل {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :ويبقى لـ {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :ويسافر لـ {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA}يوم
@@ -3389,12 +3366,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}غير
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}مسح الوقت
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}مسح مقدار الوقت للامر

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}غير تحديد السرعة
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}غير السرعة القصوى للامر المختار
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}ازل تحديد السرعة
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}ازل السرعة القصوى للرحلة من الامر المختار
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}اعد ضبط العداد التأخير
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}عدل وقت التاخير للعداد حتى تصل المركبة في الوقت المحدد

@@ -3436,6 +3407,7 @@ STR_AI_DEBUG_CONTINUE                                           :{BLACK}استم
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}عدم توقيف ومواصلة الذكاء الصناعي
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}عرض صائد الاخطاء لهذه الاضافة

+
 STR_ERROR_AI_NO_AI_FOUND                                        :لا يوجد اضافات مناسبة للتحميل {} هذه اضافة غبية ولن تفعل شيئا لك {} تستطيع تحميل اضافات من الشبكة عن طريق نظام التحميل
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}واحد من الذكاء الصناعي فشل. الرجاء ابلاغ المبرمج عنه مصحوبا بصورة من شاشة مصحح الاخطاء.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW} شاشة اخطاء الذكاء الصناعي متوفرة فقط في الخادم
@@ -3450,7 +3422,6 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}انقل
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}انقل للاسفل
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}انقل الذكاء الاصطناعي المختار للاسفل

-
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK} اعداد
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK} اعداد خواص الذكاء الصناعي

@@ -3471,16 +3442,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK} اغل
 STR_AI_SETTINGS_RESET                                           :{BLACK} اعادة ضبط
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING}اقراني {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} سجل التغيير ل{STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING}رخصة {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}اعرض ملف التعليمات ريدمي
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}اعرض سجل التغييرات
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}الرخصة
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -673,7 +673,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Паказан
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Поўная анімацыя
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Поўная дэталізацыя
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Празрыстыя будынкі
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Празрыстыя надпісы
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Празрыстыя назвы станцыяў
 ############ range ends here

 ############ range for file menu starts
@@ -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
@@ -1521,7 +1521,7 @@ STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Даз
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}Адна ці некалькі клетак ў паўночным куце мапы не пустыя
 STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}Адна ці некалькі клетак берага без вады

-STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Макс. працялегласьць аб'яднанай станцыі: {ORANGE}{STRING} клет{P 0:1 ка кi ак} {RED}(вялікія значэньні запавольваюць гульню)
+STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Макс. працялегласьць станцыі: {ORANGE}{STRING} клет{P 0:1 ка кi ак} {RED}(вялікія значэньні запавольваюць гульню)
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Уключыць абслугоўваньне на верталётных пляцоўках: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Зьвязаць ляндшафтную панэль з транспартнай: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :{LTBLUE}Колер зямлі на мінімапе: {ORANGE}{STRING}
@@ -2116,10 +2116,6 @@ 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                                :агульная памылка
@@ -2138,10 +2134,6 @@ 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}Падключэньне згублена
@@ -2261,7 +2253,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Не, в

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Наладкі празрыстасьці
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Пераключэньне празрыстасці надпісаў. Ctrl+пстрычка - заблякаваць.
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Пераключыць празрыстасьць для назваў станцыяў. Ctrl+клік - заблякаваць.
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Пераключыць празрыстасьць для дрэваў. Ctrl+клік - заблякаваць.
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Пераключыць празрыстасьць для дамоў. Ctrl+клік - заблякаваць.
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Пераключыць празрыстасьць для прадпрыемстваў. Ctrl+клік - заблякаваць.
@@ -2402,7 +2394,7 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Кіру
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Выберыце кірунак аўтобуснага прыпынка
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Кірунак грузавога тэрмінала
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Выберыце кірунак грузавога тэрмінала
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Кірунак прыпынку пасажырскiх трамваяў
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Кірунак трамвайнага прыпынка
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Выберыце кірунак трамвайнага прыпынка
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Кірунак прыпынка грузавых трамваяў
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Выберыце кірунак прыпынка грузавых трамваяў
@@ -2476,7 +2468,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}Расставіць па мапе
@@ -2725,8 +2717,8 @@ STR_MAPGEN_NORTHWEST                                            :{BLACK}Паўн
 STR_MAPGEN_NORTHEAST                                            :{BLACK}Паўночны ўсход
 STR_MAPGEN_SOUTHEAST                                            :{BLACK}Паўднёвы ўсход
 STR_MAPGEN_SOUTHWEST                                            :{BLACK}Паўднёвы захад
-STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Зямля
-STR_MAPGEN_BORDER_WATER                                         :{BLACK}Вада
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Свабодны
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Водны
 STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Выпадковы
 STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Выпадковыя
 STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Уручную
@@ -2793,6 +2785,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Унiз
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Перамясьціць выбраны файл NewGRF ніжэй
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Сьпіс устаноўленых файлаў NewGRF.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Прагледзець iнструкцыю
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Журнал зьменаў
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Лiцэнзiя
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Усталяваць парамэтры
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Паказаць парамэтры
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Пераключыць палітру
@@ -2824,6 +2821,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Парамэт
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Колькасьць парамэтраў: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}Iнструкцыя набора графiкi {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}Журнал зьменаў {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}Лiцэнзiя {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Прагляд - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Бацька (parent)
@@ -2866,17 +2868,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                       :Загрузка {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_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_CORRUPT_SPRITE                                 :{YELLOW}{STRING} утрымлiвае пашкоджаны спрайт. Усе пашкоджаныя спрайты будуць паказаны чырвоным знакам пытаньня (?).
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Утрымлiвае некалькі блёкаў «Action 8» (спрайт {3:NUM})
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Чытаньне па-за канцом псэўда-спрайту (спрайт {3:NUM})
+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 недаступныя (спрайт {3:NUM})
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} быў адключаны з-за {2:STRING}
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Недапушчальны/невядомы фармат размяшчэньня спрайтаў (спрайт {3:NUM})
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Запрошаныя рэсурсы GRF недаступныя
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{2:STRING} быў адключаны з-за {4:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Няслушны/невядомы фармат разьмяшчэньня спрайтаў

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Асцярожна!
@@ -2974,7 +2976,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}Выканаць дзеяньне, выбранае ў сьпісе вышэй

@@ -3005,10 +3007,7 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Зада
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Пстрыкніце па задачы, каб паказаць прадпрыемства/горад/клетку. Ctrl+пстрычка паказвае ў новым вакне.

 # Goal question window
-STR_GOAL_QUESTION_CAPTION_QUESTION                              :Пытаньне
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Інфармацыя
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Папярэджаньне
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Памылка
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Пытаньне

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Адмова
@@ -3140,10 +3139,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 ў ў у}част{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_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_AIRPORT                         :{WHITE}{COMMA} аэрапорт{P "" ы аў}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Нiчога

@@ -3312,7 +3311,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}Сьпіс паветраных судоў - пстрыкніце для атрыманьня інфармацыі
+STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Авiятранспарт - націсьніце для атрыманьня даведкі

 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Купiць
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Купiць
@@ -3719,7 +3718,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ісьці да
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ісьці да бліжэйшага ангара
 STR_ORDER_CONDITIONAL                                           :Умоўны пераход да заданьня
 STR_ORDER_SHARE                                                 :Агульныя заданьнi
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Уставіць новае заданьне перад вылучаным, або ў канец сьпісу. Ctrl дадае на станцыях «поўная пагрузка любым грузам», на пунктах шляху - «без прыпынку», на дэпо - «абслугоўваньне». «Агульныя заданьнi» або Ctrl дазваляюць гэтаму транспарту мець агульныя заданьнi з вылучаным транспартам. Пстрычка па транспарце капiруе заданьнi гэтага транспарту. Заданьне «ў дэпо» адключае аўтаматычнае абслугоўваньне гэтага транспарту.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Уставіць новае заданьне перад вылучаным, або ў канец сьпісу. Ctrl дадае на станцыях «поўная пагрузка любым грузам», на пунктах шляху - «без прыпынку», на дэпо - «абслугоўваньне». «Агульныя заданьнi» або Ctrl дазваляюць гэтаму транспарту мець агульныя заданьнi з вылучаным транспартам. Пстрычка па транспарце капiруе заданьнi гэтага транспарту.

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Паказаць ўвесь транспарт з агульнымі заданьнямі

@@ -3799,9 +3798,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Раск
 STR_TIMETABLE_NO_TRAVEL                                         :Няма назначэньня
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Прабег (аўтаматычна; у расклад наступным заданьнем уручную)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Час у шляху (не зададзены)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Рухацца не хутчэй за {2:VELOCITY} (расклад ня вызначаны)
 STR_TIMETABLE_TRAVEL_FOR                                        :Час у шляху - {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Рухацца да {STRING} не хутчэй за {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :і чакаць {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :і рухацца да {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} д{P зень нi зён}
@@ -3825,12 +3822,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Зьмя
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Ськінуць час
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Ськінуць час у вылучаным заданьні

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Зьмянiць абмежаваньне хуткасьцi
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Зьмянiць макс. хуткасьць руху для выдзеленага заданьня
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Ачысьцiць абмежаваньне хуткасьцi
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Ачысьцiць макс. хуткасьць руху для выдзеленага заданьня
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Ськід лічыльніка
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Ськінуць лічыльнік так, каб транспарт прыбыў своечасова

@@ -3875,7 +3866,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 / скрыптоў завяршыў сваю працу аварыйна. Калі ласка, паведаміце аб гэтым аўтару скрыпту, прыклаўшы здымак вакна адладкі.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Адзін з запушчаных ШI выканаў недапушчальную аперацыю і быў закрыты. Калі ласка, паведаміце аб гэтым аўтару ШI, прыклаўшы здымак вакна адладкі.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Вакно адладкі ШІ / скрыпту даступна толькі для сэрвэра

 # AI configuration window
@@ -3926,16 +3917,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Ські
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Колькасьць дзён да старту гэтага AI/ШI пасьля папярэдняга: {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} iнструкцыя {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} сьпiс зьменаў {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} лiцэнзiя {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Прагледзець iнструкцыю
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Журнал зьменаў
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Лiцэнзiя
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -4500,79 +4481,79 @@ STR_SV_SHIP_NAME                                                :Карабел
 STR_SV_AIRCRAFT_NAME                                            :Самалёт {COMMA}

 STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{G=m}{STRING}-Паўночны
-STR_SV_STNAME_NORTH.gen                                         :{STRING}-Паўночнага
-STR_SV_STNAME_NORTH.acc                                         :{STRING}-Паўночны
-STR_SV_STNAME_SOUTH                                             :{G=m}{STRING}-Паўднёвы
-STR_SV_STNAME_SOUTH.gen                                         :{STRING}-Паўднёвага
-STR_SV_STNAME_SOUTH.acc                                         :{STRING}-Паўднёвы
-STR_SV_STNAME_EAST                                              :{G=m}{STRING}-Усходнi
-STR_SV_STNAME_EAST.gen                                          :{STRING}-Усходняга
-STR_SV_STNAME_EAST.acc                                          :{STRING}-Усходнi
-STR_SV_STNAME_WEST                                              :{G=m}{STRING}-Заходнi
-STR_SV_STNAME_WEST.gen                                          :{STRING}-Заходняга
-STR_SV_STNAME_WEST.acc                                          :{STRING}-Заходнi
-STR_SV_STNAME_CENTRAL                                           :{G=m}{STRING}-Цэнтральны
-STR_SV_STNAME_CENTRAL.gen                                       :{STRING}-Цэнтральнага
-STR_SV_STNAME_CENTRAL.acc                                       :{STRING}-Цэнтральны
-STR_SV_STNAME_TRANSFER                                          :{G=m}{STRING}-Таварны
-STR_SV_STNAME_TRANSFER.gen                                      :{STRING}-Таварнага
-STR_SV_STNAME_TRANSFER.acc                                      :{STRING}-Таварны
-STR_SV_STNAME_HALT                                              :{G=m}{STRING}-Прамежкавы
-STR_SV_STNAME_HALT.gen                                          :{STRING}-Прамежкавага
-STR_SV_STNAME_HALT.acc                                          :{STRING}-Прамежкавага
-STR_SV_STNAME_VALLEY                                            :{G=f}{STRING}-Даліна
-STR_SV_STNAME_VALLEY.gen                                        :{STRING}-Даліны
-STR_SV_STNAME_VALLEY.acc                                        :{STRING}-Даліну
-STR_SV_STNAME_HEIGHTS                                           :{G=m}{STRING}-Вышынны
-STR_SV_STNAME_HEIGHTS.gen                                       :{STRING}-Вышыннага
-STR_SV_STNAME_HEIGHTS.acc                                       :{STRING}-Вышынны
-STR_SV_STNAME_WOODS                                             :{G=m}{STRING}-Лясны
-STR_SV_STNAME_WOODS.gen                                         :{STRING}-Ляснога
-STR_SV_STNAME_WOODS.acc                                         :{STRING}-Лясны
-STR_SV_STNAME_LAKESIDE                                          :{G=m}{STRING}-Азёрны
-STR_SV_STNAME_LAKESIDE.gen                                      :{STRING}-Азёрнага
-STR_SV_STNAME_LAKESIDE.acc                                      :{STRING}-Азёрны
-STR_SV_STNAME_EXCHANGE                                          :{G=m}{STRING}-Сартавальны
-STR_SV_STNAME_EXCHANGE.gen                                      :{STRING}-Сартавальнага
-STR_SV_STNAME_EXCHANGE.acc                                      :{STRING}-Сартавальны
-STR_SV_STNAME_AIRPORT                                           :{G=m}{STRING}-Аэрапорт
-STR_SV_STNAME_AIRPORT.gen                                       :{STRING}-Аэрапорта
-STR_SV_STNAME_AIRPORT.acc                                       :{STRING}-Аэрапорт
-STR_SV_STNAME_OILFIELD                                          :{G=f}{STRING} Нафтавая плятформа
-STR_SV_STNAME_OILFIELD.gen                                      :{STRING} Нафтавай плятформы
-STR_SV_STNAME_OILFIELD.acc                                      :{STRING} Нафтавую плятформу
-STR_SV_STNAME_MINES                                             :{G=p}{STRING}-Шахты
-STR_SV_STNAME_MINES.gen                                         :{STRING}-Шахтаў
-STR_SV_STNAME_MINES.acc                                         :{STRING}-Шахты
-STR_SV_STNAME_DOCKS                                             :{G=f}{STRING}-Прыстань
-STR_SV_STNAME_DOCKS.gen                                         :{STRING}-Прыстанi
-STR_SV_STNAME_DOCKS.acc                                         :{STRING}-Прыстань
+STR_SV_STNAME_NORTH                                             :{G=f}Паўночная {STRING}
+STR_SV_STNAME_NORTH.gen                                         :Паўночнай {STRING}
+STR_SV_STNAME_NORTH.acc                                         :Паўночную {STRING}
+STR_SV_STNAME_SOUTH                                             :{G=f}Паўднёвая {STRING}
+STR_SV_STNAME_SOUTH.gen                                         :Паўднёвай {STRING}
+STR_SV_STNAME_SOUTH.acc                                         :Паўднёвую {STRING}
+STR_SV_STNAME_EAST                                              :{G=f}Усходняя {STRING}
+STR_SV_STNAME_EAST.gen                                          :Усходняй {STRING}
+STR_SV_STNAME_EAST.acc                                          :Усходнюю {STRING}
+STR_SV_STNAME_WEST                                              :{G=f}Заходняя {STRING}
+STR_SV_STNAME_WEST.gen                                          :Заходняй {STRING}
+STR_SV_STNAME_WEST.acc                                          :Заходнюю {STRING}
+STR_SV_STNAME_CENTRAL                                           :{G=f}Цэнтральная {STRING}
+STR_SV_STNAME_CENTRAL.gen                                       :Цэнтральнай {STRING}
+STR_SV_STNAME_CENTRAL.acc                                       :Цэнтральную {STRING}
+STR_SV_STNAME_TRANSFER                                          :{G=f}Таварная {STRING}
+STR_SV_STNAME_TRANSFER.gen                                      :Таварнай {STRING}
+STR_SV_STNAME_TRANSFER.acc                                      :Таварную {STRING}
+STR_SV_STNAME_HALT                                              :Прамежкавая {STRING}
+STR_SV_STNAME_HALT.gen                                          :Прамежкавай {STRING}
+STR_SV_STNAME_HALT.acc                                          :Прамежкавую {STRING}
+STR_SV_STNAME_VALLEY                                            :Даліна {STRING}
+STR_SV_STNAME_VALLEY.gen                                        :Даліны {STRING}
+STR_SV_STNAME_VALLEY.acc                                        :Даліну {STRING}
+STR_SV_STNAME_HEIGHTS                                           :{G=f}{STRING}-Вышынная
+STR_SV_STNAME_HEIGHTS.gen                                       :{STRING}-Вышыннай
+STR_SV_STNAME_HEIGHTS.acc                                       :{STRING}-Вышынную
+STR_SV_STNAME_WOODS                                             :{G=f}Лясная {STRING}
+STR_SV_STNAME_WOODS.gen                                         :Лясной {STRING}
+STR_SV_STNAME_WOODS.acc                                         :Лясную {STRING}
+STR_SV_STNAME_LAKESIDE                                          :{G=f}Азёрная {STRING}
+STR_SV_STNAME_LAKESIDE.gen                                      :Азёрнай {STRING}
+STR_SV_STNAME_LAKESIDE.acc                                      :Азёрную {STRING}
+STR_SV_STNAME_EXCHANGE                                          :{G=f}{STRING}-Сартавальная
+STR_SV_STNAME_EXCHANGE.gen                                      :{STRING}-Сартавальнай
+STR_SV_STNAME_EXCHANGE.acc                                      :{STRING}-Сартавальную
+STR_SV_STNAME_AIRPORT                                           :{G=m}Аэрапорт {STRING}
+STR_SV_STNAME_AIRPORT.gen                                       :Аэрапорта {STRING}
+STR_SV_STNAME_AIRPORT.acc                                       :Аэрапорт {STRING}
+STR_SV_STNAME_OILFIELD                                          :{G=f}Нафтавая плятформа {STRING}
+STR_SV_STNAME_OILFIELD.gen                                      :Нафтавай плятформы {STRING}
+STR_SV_STNAME_OILFIELD.acc                                      :Нафтавую плятформу {STRING}
+STR_SV_STNAME_MINES                                             :{G=p}Шахты {STRING}
+STR_SV_STNAME_MINES.gen                                         :Шахтаў {STRING}
+STR_SV_STNAME_MINES.acc                                         :Шахты {STRING}
+STR_SV_STNAME_DOCKS                                             :{G=f}Прыстань {STRING}
+STR_SV_STNAME_DOCKS.gen                                         :Прыстанi {STRING}
+STR_SV_STNAME_DOCKS.acc                                         :Прыстань {STRING}
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
-STR_SV_STNAME_ANNEXE                                            :{G=m}{STRING}-Дадатковы
-STR_SV_STNAME_ANNEXE.gen                                        :{STRING}-Дадатковага
-STR_SV_STNAME_ANNEXE.acc                                        :{STRING}-Дадатковы
-STR_SV_STNAME_SIDINGS                                           :{G=m}{STRING}-Запасны
-STR_SV_STNAME_SIDINGS.gen                                       :{STRING}-Запаснога
-STR_SV_STNAME_SIDINGS.acc                                       :{STRING}-Запасны
+STR_SV_STNAME_ANNEXE                                            :{G=f}{STRING}-Дадатковая
+STR_SV_STNAME_ANNEXE.gen                                        :{STRING}-Дадатковай
+STR_SV_STNAME_ANNEXE.acc                                        :{STRING}-Дадатковую
+STR_SV_STNAME_SIDINGS                                           :{G=f}{STRING}-Запасная
+STR_SV_STNAME_SIDINGS.gen                                       :{STRING}-Запасной
+STR_SV_STNAME_SIDINGS.acc                                       :{STRING}-Запасную
 STR_SV_STNAME_BRANCH                                            :{G=m}{STRING}-Тупік
 STR_SV_STNAME_BRANCH.gen                                        :{STRING}-Тупіка
 STR_SV_STNAME_BRANCH.acc                                        :{STRING}-Тупік
-STR_SV_STNAME_UPPER                                             :{G=m}{STRING} Верхнi
-STR_SV_STNAME_UPPER.gen                                         :{STRING} Верхняга
-STR_SV_STNAME_UPPER.acc                                         :{STRING} Верхнi
-STR_SV_STNAME_LOWER                                             :{G=m}{STRING}-Нiжнi
-STR_SV_STNAME_LOWER.gen                                         :{STRING}-Нiжняга
-STR_SV_STNAME_LOWER.acc                                         :{STRING}-Нiжнi
-STR_SV_STNAME_HELIPORT                                          :{G=f}{STRING}-Пляцоўка
-STR_SV_STNAME_HELIPORT.gen                                      :{STRING}-Пляцоўкi
-STR_SV_STNAME_HELIPORT.acc                                      :{STRING}-Пляцоўку
-STR_SV_STNAME_FOREST                                            :{G=m}{STRING}-Лес
-STR_SV_STNAME_FOREST.gen                                        :{STRING}-Леса
-STR_SV_STNAME_FOREST.acc                                        :{STRING}-Лес
-STR_SV_STNAME_FALLBACK                                          :{NBSP}{STRING}, станцыя №{NUM}
+STR_SV_STNAME_UPPER                                             :{G=f}Верхняя {STRING}
+STR_SV_STNAME_UPPER.gen                                         :Верхняй {STRING}
+STR_SV_STNAME_UPPER.acc                                         :Верхнюю {STRING}
+STR_SV_STNAME_LOWER                                             :{G=f}Нiжняя {STRING}
+STR_SV_STNAME_LOWER.gen                                         :Нiжняй {STRING}
+STR_SV_STNAME_LOWER.acc                                         :Нiжнюю {STRING}
+STR_SV_STNAME_HELIPORT                                          :{G=f}Пляцоўка {STRING}
+STR_SV_STNAME_HELIPORT.gen                                      :Пляцоўкі {STRING}
+STR_SV_STNAME_HELIPORT.acc                                      :Пляцоўку {STRING}
+STR_SV_STNAME_FOREST                                            :{G=m}Лес {STRING}
+STR_SV_STNAME_FOREST.gen                                        :Леса {STRING}
+STR_SV_STNAME_FOREST.acc                                        :Лес {STRING}
+STR_SV_STNAME_FALLBACK                                          :г. {NBSP}{STRING}, станцыя №{NUM}
 ############ end of savegame specific region!

 ##id 0x8000
@@ -2447,6 +2447,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mover ba
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move o NewGRF selecionado para baixo
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos NewGRF instalados.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Ler o Leiame
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Log de mudanças
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licença
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alterna paleta
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
@@ -2477,6 +2482,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parãmetro {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Número de parâmetros: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF Leiame de {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF log de mudanças de {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licença de {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspecionar - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Principal
@@ -2519,10 +2529,17 @@ 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 {1:STRING} como um NewGRF estático em conjunto com {STRING} pode causar desincronias
+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_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_FORCEFULLY_DISABLED                            :{1:STRING} foi desativado por {STRING}
+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.

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Cuidado!
@@ -2650,10 +2667,6 @@ STR_GOALS_NONE                                                  :{G=m}{ORANGE}-
 STR_GOALS_COMPANY_TITLE                                         :{G=m}{BLACK}Objetivos da empresa:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Clique num objetivo para centralizar a visualização principal numa indústria/cidade.Ctrl+Clique abre uma nova janela na localização da indústria/cidade

-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsídios
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Ofertas de transporte subsidiados
@@ -3427,8 +3440,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Mudar a
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Limpar Horário
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Limpar a quantidade de tempo para a ordem destacada

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Restabelecer Contador de Atraso
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Restabelecer o contador de atraso,então o veículo estará pontual

@@ -3518,16 +3529,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Resetar
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Número de dias para começar esta IA após a última: {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} Leiame de {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} log de mudanças de {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licença de {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Ler o Leiame
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Log de mudanças
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licença
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -1753,8 +1753,6 @@ 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                                :обща грешка
@@ -1819,8 +1817,6 @@ 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}
@@ -2370,8 +2366,9 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Надо
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Премества избрания NewGRF файл надолу в списъка
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Списък на инсталираните NewGRF файлове. Изберете файл за да промените параметрите му

+# 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}Прилагане на промените
@@ -2401,6 +2398,8 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Парамет
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Брой параметри: {ORANGE}{NUM}

+# NewGRF textfile window
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Инспектирай - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Родител
@@ -2442,8 +2441,13 @@ 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                       :Зареждане на {1:STRING} като статичен NewGRF заедно с {STRING} може да доведе до проблеми.
+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_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
@@ -2559,7 +2563,7 @@ STR_GOALS_NONE                                                  :{ORANGE}- Ни
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Цели на компанията:

 # Goal question window
-STR_GOAL_QUESTION_CAPTION_QUESTION                              :Въпрос
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Въпрос

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Недобре
@@ -2652,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}Приходи от МПС-та
@@ -3038,7 +3042,6 @@ 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}
@@ -3303,8 +3306,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Пром
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Изчисти времето
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Изчисти времетраенето на маркираната заповед

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Преправи закъснялата бройка
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time

@@ -3356,14 +3357,12 @@ 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
@@ -3378,17 +3377,12 @@ 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}Затвори
 STR_AI_SETTINGS_RESET                                           :{BLACK}Рестартиране
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -361,7 +361,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Mostra noms i s
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Animació completa
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Detall complet
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Edificis Transparents
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Senyals transparents
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Signes d'estació transparents
 ############ range ends here

 ############ range for file menu starts
@@ -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                                :Zoom màxim en la captura de pantalla
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ampliació 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,10 +1800,6 @@ 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 es massa lent per mantenir-se connectat al servidor
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}El teu ordenador ha tardat massa a descarregar el mapa
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}El teu ordenador ha tardat massa a unir-se al servidor

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :error general
@@ -1822,10 +1818,6 @@ 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                       :General temps d'espera esgotat
-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ó
@@ -1929,7 +1921,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, sort

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcions de transparència
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Commuta la transparència de les senyals. Ctrl+Clic per bloquejar
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Commuta la transparència dels rètols d'estació. Ctrl+Clic per bloquejar
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Commuta la transparència dels arbres. Ctrl+Clic per bloquejar
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Commuta la transparència de les cases. Ctrl+Clic per bloquejar
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Commuta la transparència de les indústries. Ctrl+Clic per bloquejar
@@ -2070,9 +2062,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientac
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Selecciona l'orientació de la parada d'autobús
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Orientació Estació de Mercaderies
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Selecciona l'orientació del moll de càrrega de camions
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientació estació de tramvies de passatgers
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientació estació passatgers
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Selecciona l'orientació de l'estació de tramvies de passatgers
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientació estació de tramvies de mercaderies
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientació estació mercaderies
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Selecciona l'orientació de l'estació de tramvies de mercaderies

 # Waterways toolbar (last two for SE only)
@@ -2140,7 +2132,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmissors

 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Arbres
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecciona el tipus d'arbre a plantar. Si la casella ja conté un arbre, s'afegiran més arbres d'altres espècies independentment de quin estigui seleccionat
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecciona el tipus d'arbre a plantar
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbres de tipus aleatori
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Situar arbres de tipus aleatori. Shift commuta construeix/mostra el cost estimat
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Arbres Aleatoris
@@ -2457,8 +2449,12 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mou aval
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mou avall l'arxiu NewGRF seleccionat de la llista
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Una llista d'arxius NewGRF que estan instal·lats.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Veure llegeixme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Registra de canvis
+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
@@ -2488,6 +2484,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paràmetre {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Nombre de paràmetres: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}Llegeixme del NewGRF de {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}Registre de canvis del NewGRF de {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}Llicència del NewGRF de {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspecciona - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Pare
@@ -2520,7 +2521,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 de NewGRF: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Ha passat un error fatal d'un 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}
@@ -2530,17 +2531,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 {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_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_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 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_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_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 (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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Alerta!
@@ -2588,7 +2589,7 @@ STR_NEWGRF_SCAN_ARCHIVES                                        :Escanejant arxi
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA} Senyal{P "" s}
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Coincideix Majúscules/Minúscules
 STR_SIGN_LIST_CLEAR                                             :{BLACK}Neteja el filtre
-STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Commuta minúscules/majúscules en comparar els noms de les senyals contra la cadena filtrant
+STR_SIGN_LIST_MATCH_CASE_TOOLTIP                                :{BLACK}Commuta minúscules/majúscules en comparar els noms del signes contra la cadena de filtre
 STR_SIGN_LIST_CLEAR_TOOLTIP                                     :{BLACK}Neteja la cadena de filtre

 # Sign window
@@ -2596,7 +2597,7 @@ STR_EDIT_SIGN_CAPTION                                           :{WHITE}Edita el
 STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ves a la propera senyal
 STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ves a la senyal anterior

-STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Posa un nom a la senyal
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Posa el nom del signe

 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Poblacions
@@ -2668,32 +2669,6 @@ 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:
@@ -2804,11 +2779,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} 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_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_NONE                            :{WHITE}Cap

 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir Seu
@@ -2831,8 +2806,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% 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_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_COMPANY_NAME_QUERY_CAPTION                     :Nom Empresa
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nom President
@@ -3363,7 +3338,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ves al dipòsit
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ves a l'hangar més proper
 STR_ORDER_CONDITIONAL                                           :Ordre de salt condicionada
 STR_ORDER_SHARE                                                 :Comparteix ordres
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Afegeix una nova ordre abans de la seleccionada, o afegeix-la al final de la llista. Ctrl crea les ordres d'estació 'carrega qualsevol càrrega', les ordres de punt de control 'sense parada' i les ordres de cotxeres 'revisió'. 'Comparteix ordres' o Ctrl permet que aquest vehicle comparteixi ordres amb el vehicle seleccionat. Clicant un vehicle copia les ordres des d'aquest vehicle. Una ordre de cotxeres desactiva la revisió automàtica del vehicle
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Afegeix una nova ordre abans de la seleccionada, o afegeix-la al final de la llista. Ctrl crea les ordres d'estació 'carrega qualsevol càrrega', les ordres de punt de control 'sense parada' i les ordres de cotxeres 'revisió'. 'Comparteix ordres' o Ctrl permet que aquest vehicle comparteixi ordres amb el vehicle seleccionat. Clicant un vehicle copia les ordres des d'aquest vehicle

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostra tots els vehicles que tenen les mateixes ordres

@@ -3443,9 +3418,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horari -
 STR_TIMETABLE_NO_TRAVEL                                         :Sense viatge
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viatge (automàtic; programat per la següent ordre manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viatge (fora d'horari)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel amb almenys {2:VELOCITY} (sense horari)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viatge a {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viatge per {STRING} amb almenys {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :i estigues {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :i viatge per {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} di{P a es}
@@ -3469,12 +3442,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Canvia l
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Esborra Temps
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Esborra la quantitat de temps de l'ordre marcada

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Canvia el límit de velocitat
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Canvia la velocitat de viatge màxima de l'ordre seleccionada
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Esborra el límit de velocitat
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Esborra la velocitat de viatge màxima de l'ordre seleccionada
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset. control de retard
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reseteja el comptador de retards, de manera que el vehicle serà puntual

@@ -3519,7 +3486,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}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_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_DEBUG_SERVER_ONLY                                  :{YELLOW}IA / La finestra de depuració només està disponible pel servidor

 # AI configuration window
@@ -3570,16 +3537,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Número de dies per començar aquesta IA després de l'anterior (dóna o pren): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}Llegeixme del {STRING} de {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Registre de canvis del {STRING} de {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}Llicència del {STRING} de {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Veure llegeixme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Registra de canvis
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Llicència
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -456,7 +456,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Prikazani znako
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Sve animacije
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Svi detalji
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Prozirne građevine
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Prozirni znakovi
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Prozirni znakovi postaja
 ############ range ends here

 ############ range for file menu starts
@@ -1895,10 +1895,6 @@ 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 presporo za držanje koraka sa serverom
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Vašem računalu je trebalo previše vremena za preuzimanje mape
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Vašem računalu je trebalo previše vremena za pridruživanje na server

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :opća greška
@@ -1917,10 +1913,6 @@ 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
@@ -2024,7 +2016,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Ne, iza

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Postavke prozirnosti
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Namjesti prozirnost za znakove. Ctrl+klik za zaključavanje
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Namjesti prozirnost za znakove postaja. Ctrl+klik za zaključavanje
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Namjesti prozirnost za drveće. Ctrl+klik za zaključavanje
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Namjesti prozirnost za kuće. Ctrl+klik za zaključavanje
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Namjesti prozirnost za industrije. Ctrl+klik za zaključavanje
@@ -2165,9 +2157,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Smjer au
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Odaberi smjer autobusne postaje
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Smjer kamionskog terminala
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Odaberi smjer kamionskog terminala
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orijentacija stanice putničkog tramvaja
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orijentacija putničkog tramvaja
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Odaberi smjer putničke tramvajske postaje
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orijentacija stanice teretnog tramvaja
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orijentacija teretnog tramvaja
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Odaberi smjer teretne tramvajske postaje

 # Waterways toolbar (last two for SE only)
@@ -2235,7 +2227,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. Ako polje već ima drvo, ovo će dodati još drveća raznih vrsta neovisno o odabranoj vrsti
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Odaberi vrstu drveta za sadnju
 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
@@ -2552,8 +2544,12 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK} Pomakni
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pomakni odabranu NewGRF datoteku dolje na listi
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Popis instaliranih NewGRF datoteka.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Pogledaj "pročitaj me" datoteku
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Zapis izmjena
+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
@@ -2583,6 +2579,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametar {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Broj parametara: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF "pročitaj me" datoteka od {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF zapis izmjena od {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licenca od {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Pregledaj - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Matični
@@ -2615,7 +2616,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}Dogodila se kobna pogreška u NewGRF-u: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Kobna NewGRF pogreška se dogodila: {}{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}
@@ -2625,17 +2626,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 {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_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_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 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_MULTIPLE_ACTION_8                              :Sadrži višestruke Action 8 unose
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Učitavanje izvan kraja pseudo-spritea.
 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 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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Oprez!
@@ -2764,10 +2765,7 @@ 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_QUESTION                              :Pitanje
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informacija
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Upozorenje
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Greška
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Pitanje

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Poništi
@@ -3147,7 +3145,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 procijenjeni 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_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.

@@ -3458,7 +3456,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Idi do najbliž
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Idi do najbližeg hangara
 STR_ORDER_CONDITIONAL                                           :Uvjetovani skok na naredbu
 STR_ORDER_SHARE                                                 :Dijeli naredbe
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Umetni novu naredbu prije označene naredbe, ili dodaj na kraj liste. Ctrl određuje naredbe stanice 'napuni do kraja bilo koji teret', naredbe prolaznih točki 'non-stop', a naredbe depoa 'servisiraj'. 'Dijeli naredbe' ili Ctrl dozvoljava da ovo vozilo dijeli naredbe sa odabranim vozilom. Klik na vozilo kopira naredbe tog vozila. Naredba depoa isključuje automatsko servisiranje vozila.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Umetni novu naredbu prije označene naredbe, ili dodaj na kraj liste. Ctrl određuje naredbe stanice 'napuni do kraja bilo koji teret', naredbe prolazni točki 'non-stop', a naredbe depoa 'servisiraj'. 'Dijeli naredbe' ili Ctrl dozvoljava da ovo vozilo dijeli naredbe sa odabranim vozilom. Klik na vozilo kopira naredbe tog vozila.

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Pokaži sva vozila koja dijele ovaj raspored.

@@ -3538,9 +3536,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Vozni re
 STR_TIMETABLE_NO_TRAVEL                                         :Nema putovanja
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Putovanje (automatsko; prema rasporedu sljedeće ručno određene naredbe)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Putovanje (izvan voznog reda)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Putuj uz najviše {2:VELOCITY} (not timetabled)
 STR_TIMETABLE_TRAVEL_FOR                                        :Putovanje za {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Putuj prema {STRING} uz najviše {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :i boravak za {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :i putovanje za {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dan{P "" a a}
@@ -3564,12 +3560,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Promijen
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Obriši vrijeme
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Obriši vrijeme potrebno za označenu naredbu

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Izmijeni limit brzine
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Izmijeni maksimalnu putnu brzinu za označenu naredbu
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Izbriši limit brzine
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Izbriši maksimalnu putnu brzinu za označenu naredbu
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Poništi brojač kašnjenja
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Resetiraj brojač kašnjenja, kako bi vozilo stiglo na vrijeme

@@ -3665,16 +3655,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Resetira
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Broj dana za start ovog UI-ja nakon prethodnog (otprilike): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} "pročitaj me" datoteka od {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} zapis izmjena od {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licenca od {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Pogledaj "pročitaj me" datoteku
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Zapis izmjena
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licenca
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -1898,8 +1898,6 @@ 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í
@@ -2537,6 +2535,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Dolů
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Posunout označenou grafiku dolů
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Seznam grafických souborů, které jsou nainstalovány.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Zobrazit readme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK} Novinky ve verzi
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licence
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nastavit parametry
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Přepnout paletu
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}U vybrané grafiky přepne paletu.{}Je to užitečné, když se ti ve hře zobrazuje růžově
@@ -2567,6 +2570,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametr {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Počet prametrů: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF readme {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF změny ve verzi {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licence {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Zkoumání - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Rodič
@@ -2609,10 +2617,17 @@ 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í {1:STRING} jako statické grafiky spolu s {STRING} může způsobit chybu synchronizace
+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_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_FORCEFULLY_DISABLED                            :{1:STRING} byla vypnuta {STRING}
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varování!
@@ -2739,20 +2754,6 @@ 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:
@@ -3527,8 +3528,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Změnit
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Smazat čas
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Zrušit čas pro splnění jízdního příkazu

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Zapomenout zpoždění
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Smazat zpoždění, takže vozidlo pojede na čas

@@ -3623,16 +3622,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zavřít
 STR_AI_SETTINGS_RESET                                           :{BLACK}Obnovit nastavení
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} readme {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} změny ve verzi {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licence {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Zobrazit readme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK} Novinky ve verzi
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licence
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -2445,6 +2445,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Flyt ned
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Flyt det valgte NewGRF sæt ned i listen
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}En liste over de NewGRF sæt der er installeret.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Se readme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Ændringslog
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licens
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Indstil parameter
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Slå palette til/fra
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Slå palette til/fra i den valgte NewGRF.{}Gør dette når grafik fra denne NewGRF ser lyserøde ud i spillet
@@ -2475,6 +2480,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Antal parametrer: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF readme for {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF ændringslog for {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licens for {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspicer - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Forældrer
@@ -2517,10 +2527,17 @@ 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 {1:STRING} som statisk NewGRF med {STRING} kan forårsage de-sykronisering.
+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_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_FORCEFULLY_DISABLED                            :{1:STRING} blev deaktiveret af {STRING}
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!
@@ -2648,10 +2665,6 @@ STR_GOALS_NONE                                                  :{ORANGE}- Ingen
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Selskabsmål:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klik på mål for at centrere hovedvinduet over industri/by/felt Ctrl+klik åbner et nyt vindue over industri/by/felt lokation

-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Tilskudsordninger
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Tilskudsordninger i licitation:
@@ -3425,8 +3438,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ændre h
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nulstil tid
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nulstil tiden for den markerede ordre

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nulstil forsinkelse
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nulstil forsinkelses-tæller, så transportmidlet kommer til tiden

@@ -3522,16 +3533,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Nulstil
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Antal dage denne AI skal starte efter den forrige (plus/minus): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} readme for {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} ændringslog for {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licens for {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Se readme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Ændringslog
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licens
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -360,7 +360,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Toon tegenstand
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Alle animaties
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Alle details
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Transparante gebouwen
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparante borden
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparante stationsborden
 ############ range ends here

 ############ range for file menu starts
@@ -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 ingetrokken:{}{}{STRING}route 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_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!
@@ -1740,7 +1740,7 @@ STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Kijk toe
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nieuw bedrijf

 # Network client list
-STR_NETWORK_CLIENTLIST_KICK                                     :Gooi uit het spel
+STR_NETWORK_CLIENTLIST_KICK                                     :Schop uit het spel
 STR_NETWORK_CLIENTLIST_BAN                                      :Verban uit het spel
 STR_NETWORK_CLIENTLIST_GIVE_MONEY                               :Geef geld
 STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL                             :Praat met iedereen
@@ -1799,10 +1799,6 @@ 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 jouw computer te lang totdat uw computer zich aanmeldde
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Het duurde jouw computer te lang om de kaart te downloaden
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Het duurde jouw computer te lang om met de server te verbinden

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :algemene fout
@@ -1821,10 +1817,6 @@ 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
@@ -2139,7 +2131,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. Als de tegel al bomen bevat zullen er meer bomen van verschillende types bij komen, onafhankelijk van het geselecteerde type.
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Kies een soort boom om te planten
 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
@@ -2216,10 +2208,10 @@ STR_INDUSTRY_CARGOES_NOTIFY_SMALLMAP_TOOLTIP                    :{BLACK}Kies de

 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Landinformatie
-STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Sloopkosten: {LTBLUE}Niet mogelijk
+STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Sloopkosten: {LTBLUE}niet mogelijk
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Sloopkosten: {RED}{CURRENCY_LONG}
 STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Opbrengst bij verwijdering: {LTBLUE}{CURRENCY_LONG}
-STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Geen
+STR_LAND_AREA_INFORMATION_OWNER_N_A                             :(geen)
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eigenaar: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Eigenaar van weg: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Eigenaar van tramrails: {LTBLUE}{STRING}
@@ -2456,6 +2448,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Naar ben
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar beneden in de lijst
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Een lijst van de NewGRF-bestanden die zijn geïnstalleerd.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Bekijk leesme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Wijzigingen
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licentie
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Stel parameters in
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Laat parameters zien
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palet omzetten
@@ -2487,6 +2484,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Aantal parameters: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF leesme van {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF wijzigingen van {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF licentie van {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspecteer - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Huidig
@@ -2529,17 +2531,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 {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_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_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 acties 8 (sprite {3:NUM})
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Voorbij het einde van pseudo-sprite gelezen (sprite {3:NUM})
+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_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 (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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Waarschuwing!
@@ -2665,13 +2667,10 @@ 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 locatie
+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

 # Goal question window
-STR_GOAL_QUESTION_CAPTION_QUESTION                              :Vraag
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informatie
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Waarschuwing
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Fout
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Vraag

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Annuleren
@@ -3058,7 +3057,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 locatie
+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_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
@@ -3362,7 +3361,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ga naar dichtst
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ga naar dichtstbijzijnde hangar
 STR_ORDER_CONDITIONAL                                           :Conditionele order sprong
 STR_ORDER_SHARE                                                 :Orders delen
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Voeg een nieuwe order in voor de geselecteerde order, of voeg het toe aan het eind van de lijst. Ctrl+klik maakt stationsorders "Eén soort vracht volledig laden", controlepost-orders "Ga non-stop via" en depot-orders "Onderhoud bij". "Orders delen" of Ctrl laat dit voertuig de orders delen met het geselecteerde voertuig. Klikken op een voertuig kopieert de orders van dat voertuig. Een depot order schakelt automatisch onderhoud van een voertuig uit.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Voeg een nieuwe order in voor de geselecteerde order, of voeg het toe aan het eind van de lijst. Ctrl+klik maakt stationsorders "Eén soort vracht volledig laden", controlepost-orders "Ga non-stop via" en depot-orders "Onderhoud bij". "Orders delen" of Ctrl laat dit voertuig de orders delen met het geselecteerde voertuig. Klikken op een voertuig kopieert de orders van dat voertuig

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Toon alle voertuigen met dezelfde gedeelde orders

@@ -3442,9 +3441,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Dienstre
 STR_TIMETABLE_NO_TRAVEL                                         :Niet rijden
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rijd (automatisch; volgens dienstregeling bij volgende handmatige bestemming)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reis (geen dienstregeling)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Reis met maximaal {2:VELOCITY} (geen tijdschema)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis naar {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Reis {STRING} met maximaal {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :en blijf voor {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :en rijd naar {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dag{P "" en}
@@ -3468,12 +3465,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Verander
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Verwijder tijd
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Verwijder de tijdsduur die de geselecteerde order mag duren

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Wijzig Maximum Snelheid
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Wijzig de maximum snelheid voor de gekozen order
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Verwijder Snelheidslimiet
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Verwijder de maximum snelheid van de gekozen order
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset vertragingsteller
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset de vertragingsteller zodat het voertuig op tijd is

@@ -3569,16 +3560,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Herstell
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Aantal dagen dat deze AI start na de vorige (ongeveer): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} leesme van {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} wijzigingen van {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licentie van {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Bekijk leesme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Wijzigingen
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licentie
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3614,7 +3595,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 dorpslocaties
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kaartmaken afgebroken...{}... geen geschikte dorpslokaties
 STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... er is geen stad in dit scenario

 STR_ERROR_PNGMAP                                                :{WHITE}Kan landschap uit PNG niet laden...
@@ -360,7 +360,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Competitor sign
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Full animation
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Full detail
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Transparent buildings
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparent signs
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparent station signs
 ############ range ends here

 ############ range for file menu starts
@@ -1800,9 +1800,7 @@ STR_NETWORK_ERROR_KICKED                                        :{WHITE}You were
 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 is too slow to keep up with the server
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Your computer took too long to download the map
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Your computer took too long to join the server
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Your computer took too long to join

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :general error
@@ -1821,10 +1819,6 @@ 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
@@ -1928,7 +1922,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, quit

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for signs. Ctrl+Click to lock
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Toggle transparency for trees. Ctrl+Click to lock
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Toggle transparency for houses. Ctrl+Click to lock
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Toggle transparency for industries. Ctrl+Click to lock
@@ -2069,9 +2063,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bus Stat
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Select bus station orientation
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Lorry Station Orientation
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Select lorry loading bay orientation
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passenger Tram Station Orientation
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passenger Tram Orientation
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Select passenger tram station orientation
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Freight Tram Station Orientation
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Freight Tram Orientation
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Select freight tram station orientation

 # Waterways toolbar (last two for SE only)
@@ -2139,7 +2133,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. If the tile already has a tree, this will add more trees of mixed types independent of the selected type
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant
 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
@@ -2456,6 +2450,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Move Dow
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move the selected NewGRF file down the list
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A list of the NewGRF files that are installed.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}View readme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Changelog
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}License
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Show parameters
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toggle palette
@@ -2487,6 +2486,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING1}: {ORANGE}{STRING1}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Number of parameters: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF readme of {RAW_STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF changelog of {RAW_STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF license of {RAW_STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspect - {STRING5}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Parent
@@ -2520,26 +2524,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: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_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_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 {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_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_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 (sprite {3:NUM})
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite (sprite {3:NUM})
+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_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 (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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
@@ -2668,10 +2672,7 @@ 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_QUESTION                              :Question
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Warning
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Question

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancel
@@ -3362,7 +3363,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Go to nearest d
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Go to nearest hangar
 STR_ORDER_CONDITIONAL                                           :Conditional order jump
 STR_ORDER_SHARE                                                 :Share orders
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Insert a new order before the highlighted order, or add to end of list. Ctrl makes station orders 'full load any cargo', waypoint orders 'non-stop' and depot orders 'service'. 'Share orders' or Ctrl lets this vehicle share orders with the selected vehicle. Clicking a vehicle copies the orders from that vehicle. A depot order disables automatic servicing of the vehicle
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Insert a new order before the highlighted order, or add to end of list. Ctrl makes station orders 'full load any cargo', waypoint orders 'non-stop' and depot orders 'service'. 'Share orders' or Ctrl lets this vehicle share orders with the selected vehicle. Clicking a vehicle copies the orders from that vehicle

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Show all vehicles that share this schedule

@@ -3442,9 +3443,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel with at most {2:VELOCITY} (not timetabled)
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING1}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING1} with at most {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :and stay for {STRING1}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING1}
 STR_TIMETABLE_DAYS                                              :{COMMA} day{P "" s}
@@ -3468,12 +3467,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Change t
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Clear Time
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Clear the amount of time for the highlighted order

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Change Speed Limit
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Change the maximum travel speed of the highlighted order
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Clear Speed Limit
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Clear the maximum travel speed of the highlighted order
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset Late Counter
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time

@@ -3569,16 +3562,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{RAW_STRING}: {ORANGE}{STRING1}
 STR_AI_SETTINGS_START_DELAY                                     :Number of days to start this AI after the previous one (give or take): {ORANGE}{STRING1}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} readme of {RAW_STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} changelog of {RAW_STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} licence of {RAW_STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}View readme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Changelog
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licence
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -360,7 +360,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Competitor sign
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Full animation
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Full detail
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Transparent buildings
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparent signs
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparent station signs
 ############ range ends here

 ############ range for file menu starts
@@ -1799,10 +1799,6 @@ 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
@@ -1821,10 +1817,6 @@ 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
@@ -1928,7 +1920,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, quit

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for signs. Ctrl+Click to lock
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Toggle transparency for trees. Ctrl+Click to lock
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Toggle transparency for houses. Ctrl+Click to lock
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Toggle transparency for industries. Ctrl+Click to lock
@@ -2069,9 +2061,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bus Stat
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Select bus station orientation
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Truck Station Orientation
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Select Truck loading bay orientation
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passenger Tram Station Orientation
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passenger Tram Orientation
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Select passenger tram station orientation
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Freight Tram Station Orientation
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Freight Tram Orientation
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Select freight tram station orientation

 # Waterways toolbar (last two for SE only)
@@ -2139,7 +2131,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. If the tile already has a tree, this will add more trees of mixed types independent of the selected type
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant
 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
@@ -2456,6 +2448,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Move Dow
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move the selected NewGRF file down the list
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A list of the NewGRF files that are installed.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}View readme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Changelog
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}License
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Show parameters
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toggle palette
@@ -2487,6 +2484,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Number of parameters: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF readme of {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF changelog of {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF license of {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspect - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Parent
@@ -2529,17 +2531,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 {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_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_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                              :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_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite
 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 (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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
@@ -2668,10 +2670,7 @@ 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_QUESTION                              :Question
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Warning
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Question

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancel
@@ -3466,8 +3465,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Change t
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Clear Time
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Clear the amount of time for the highlighted order

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset Late Counter
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time

@@ -3563,16 +3560,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Number of days to start this AI after the previous one (give or take): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} readme of {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} changelog of {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} license of {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}View readme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Changelog
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}License
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -360,7 +360,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Competitor sign
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Full animation
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Full detail
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Transparent buildings
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparent signs
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparent station signs
 ############ range ends here

 ############ range for file menu starts
@@ -1800,9 +1800,7 @@ STR_NETWORK_ERROR_KICKED                                        :{WHITE}You were
 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 is too slow to keep up with the server
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Your computer took too long to download the map
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Your computer took too long to join the server
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Your computer took too long to join

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :general error
@@ -1821,10 +1819,6 @@ 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
@@ -1928,7 +1922,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, quit

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for signs. Ctrl+Click to lock
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Toggle transparency for trees. Ctrl+Click to lock
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Toggle transparency for houses. Ctrl+Click to lock
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Toggle transparency for industries. Ctrl+Click to lock
@@ -2069,9 +2063,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bus Stat
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Select bus station orientation
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Truck Station Orientation
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Select truck loading bay orientation
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passenger Streetcar Station Orientation
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Passenger Streetcar Orientation
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Select passenger streetcar station orientation
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Freight Streetcar Station Orientation
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Freight Streetcar Orientation
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Select freight streetcar station orientation

 # Waterways toolbar (last two for SE only)
@@ -2139,7 +2133,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. If the tile already has a tree, this will add more trees of mixed types independent of the selected type
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant
 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
@@ -2456,6 +2450,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Move Dow
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move the selected NewGRF file down the list
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A list of the NewGRF files that are installed

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}View readme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Changelog
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}License
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Show parameters
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toggle palette
@@ -2487,6 +2486,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Number of parameters: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF readme of {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF changelog of {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF license of {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspect - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Parent
@@ -2529,17 +2533,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 {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_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_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 (sprite {3:NUM})
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end of pseudo-sprite (sprite {3:NUM})
+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_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 (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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
@@ -2668,10 +2672,7 @@ 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_QUESTION                              :Question
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Warning
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Error
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Question

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancel
@@ -3362,7 +3363,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Go to nearest d
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Go to nearest hangar
 STR_ORDER_CONDITIONAL                                           :Conditional order jump
 STR_ORDER_SHARE                                                 :Share orders
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Insert a new order before the highlighted order, or add to end of list. Ctrl makes station orders 'full load any cargo', waypoint orders 'non-stop' and depot orders 'maintenance'. 'Share orders' or Ctrl lets this vehicle share orders with the selected vehicle. Clicking a vehicle copies the orders from that vehicle. A depot order disables automatic maintenance of the vehicle
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Insert a new order before the highlighted order, or add to end of list. Ctrl makes station orders 'full load any cargo', waypoint orders 'non-stop' and depot orders 'maintenance'. 'Share orders' or Ctrl lets this vehicle share orders with the selected vehicle. Clicking a vehicle copies the orders from that vehicle

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Show all vehicles that share this schedule

@@ -3442,9 +3443,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_NO_TRAVEL                                         :No travel
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Travel (automatic; timetabled by next manual order)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Travel (not timetabled)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Travel with at most {2:VELOCITY} (not timetabled)
 STR_TIMETABLE_TRAVEL_FOR                                        :Travel for {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Travel for {STRING} with at most {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :and stay for {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :and travel for {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} day{P "" s}
@@ -3468,12 +3467,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Change t
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Clear Time
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Clear the amount of time for the highlighted order

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Change Speed Limit
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Change the maximum travel speed of the highlighted order
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Clear Speed Limit
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Clear the maximum travel speed of the highlighted order
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset Late Counter
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time

@@ -3569,16 +3562,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Number of days to start this AI after the previous one (give or take): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} readme of {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} changelog of {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} license of {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}View readme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Changelog
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}License
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -745,7 +745,6 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Ŝarĝa
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Subvencioj
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Ĝeneralaj informoj

-
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Enloĝantoj festas . . .{}Unua trajno alvenas ĉe {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}Enloĝantoj festas . . .{}Unua buso alvenas en {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}Enloĝantoj festas . . .{}Unua ŝarĝaŭto alvenas en {STATION}!
@@ -1352,8 +1351,6 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}Aŭtoma

 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Ŝanĝu agord-valoron

-# Config errors
-
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}

@@ -2352,6 +2349,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Malsupre
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Movu la elektitan NewGRF-dosieron malsupren en la listo
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Listo da instalitaj NewGRF-dosieroj. Alklaku dosieron por ŝanĝi la parametrojn

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Vidi legumin
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Ŝanĝarĥivo
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licenco
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Agordu parametrojn
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Baskuligi paletron
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Apliku ŝanĝojn
@@ -2381,6 +2383,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametro {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Nombro da parametroj: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF legumin de {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF-a ŝanĝarĥivo de {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF-a licenco de {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspektu - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Magistro
@@ -2416,9 +2423,14 @@ 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_FORCEFULLY_DISABLED                            :{1:STRING} estis malaktivata per {STRING}
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Atentu!
@@ -2525,12 +2537,6 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW}Pagu la
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW}Aĉetu ekskluzivajn transportrajtojn en la urbo por 1 jaro. La urbo nur permesos pasaĝerojn kaj kargojn uzi la staciojn de via entrepreno.{}Cost: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Subaĉetu la lokajn estrojn por pliigi vian rendimenton, riskante grandan punon je kaptiĝo.{}Kosto: {CURRENCY_LONG}

-# Goal window
-
-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subvencioj
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Subvencioj haveblas por jenaj servoj:
@@ -2666,8 +2672,6 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nomo de la Mana

 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Ni serĉas transportkompanion por transpreni nian kompanion.{}{}Ĉu vi volas aĉeti {COMPANY} por {CURRENCY_LONG}?

-# Company infrastructure window
-
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrioj
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Neniu -
@@ -3228,7 +3232,6 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[near end]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[middle]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[far end]

-
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Saltu al ordono {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :Saltu al ordono {COMMA} kiam {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Saltu al ordonu {COMMA} kiam {STRING} {STRING}
@@ -3267,8 +3270,6 @@ STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ŝanĝu

 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Vakigi tempon

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reigu malfruan kalkulumon
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reigu malfruan kalkulumon, tiel la veturilon estos akuratan

@@ -3307,6 +3308,7 @@ STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Malpaŭz
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Vidu forigeraran eligon de ĉiu tio AI


+
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI-agordo
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Homa ludanto
@@ -3317,7 +3319,6 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Movi ele
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Movi suben
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Movi elektitan AI-on suben en la listo

-
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Agordi
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Agordi parametroj de la AI

@@ -3338,16 +3339,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fermi
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reŝargo
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} legumin de {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING}-a ŝanĝarĥivo de {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING}-a licenco de {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Vidi legumin
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Ŝanĝarĥivo
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licenco
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -222,8 +222,8 @@ STR_ABBREV_NONE                                                 :{TINY_FONT}EI
 STR_ABBREV_ALL                                                  :{TINY_FONT}KÕIK

 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :{COMMA} reisija{P "" d}
-STR_BAGS                                                        :{COMMA} kot{P t id}
+STR_PASSENGERS                                                  :{COMMA} reisija{P "" s}
+STR_BAGS                                                        :{COMMA} kott{P "" i}
 STR_TONS                                                        :{COMMA} tonn{P "" i}
 STR_LITERS                                                      :{COMMA} liit{P er rit}
 STR_ITEMS                                                       :{COMMA} ühik{P "" ut}
@@ -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}Kuupäev
+STR_SORT_BY_CAPTION_DATE                                        :{BLACK}Daatum
 # 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 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_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_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
@@ -417,7 +417,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Konkurentide ni
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Täielik animeerimine
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Kõik täpsustused
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Läbipaistvad hooned
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Läbipaistvad sildid
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Läbinähtavad jaama nimesildid
 ############ range ends here

 ############ range for file menu starts
@@ -503,8 +503,7 @@ STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Lülita konsool sisse/välja
 STR_ABOUT_MENU_AI_DEBUG                                         :Tehismõistuse / GameScript-i silumine
 STR_ABOUT_MENU_SCREENSHOT                                       :Ekraanitõmmis
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Suurendatud ekraanitõmmis
-STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Tavasuurendusega ekraanitõmmis
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Suumitud ekraanitõmmis
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Terve kaardi ekraanitõmmis
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD' kohta
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite aligner
@@ -803,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}Uued sõidukid
+STR_NEWS_MESSAGE_TYPE_NEW_VEHICLES                              :{YELLOW}Uus veerem
 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
@@ -993,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}Automaatne salvestus
+STR_GAME_OPTIONS_AUTOSAVE_FRAME                                 :{BLACK}Isesalvestus
 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_TOOLTIP                      :{BLACK}Vali automaatselt mängu salvestamise vahemik

 STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_OFF                          :Väljas
@@ -1856,10 +1855,6 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sinu sis
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sind visati mängust välja
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Selles serveris on petmine keelatud
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Sa saatsid serverile liiga palju käsklusi korraga
-STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Sisestasid parooli liiga kaua
-STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Arvutil võttis liitumisega liiga kaua aega
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Kaardi allalaadimine võttis liiga kaua aega
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Serveriga liitumine võttis liiga kaua aega

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :üldine viga
@@ -1878,10 +1873,6 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :server viskas v
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :üritas pettust kasutada
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server on täis
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :saatis liiga palju käsklusi
-STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :ei saanud õigeaegselt parooli
-STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :üldine aegumine
-STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :kaardi laadimine võttis liiga kaua aega
-STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :kaardi töötlemine võttis liiga kaua aega
 ############ End of leave-in-this-order

 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Võimalik ühenduse katkemine
@@ -1985,7 +1976,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Ei, lahk

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Läbipaistvusvalikud
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Muuda jaamamärkide läbipaistvust. Ctrl+klõps lukustab
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Vaheta jaamamärkide läbipaistvust. Ctrl+klõps lukustab
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Vaheta puude läbipaistvust. Ctrl+klõps lukustab
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Vaheta majade läbipaistvust. Ctrl+klõps lukustab
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Vaheta tööstusehitiste läbipaistvust. Ctrl+klõps lukustab
@@ -2086,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                                :Konsool, terasest
+STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Ulgtugi, terasest
 STR_BRIDGE_NAME_SUSPENSION_CONCRETE                             :Rippsild, betoonist
 STR_BRIDGE_NAME_WOODEN                                          :Puidust
 STR_BRIDGE_NAME_CONCRETE                                        :Betoonist
@@ -2097,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 lõik. Ctrl vahetab tee ehitamise/eemaldamise vahel. Shift kuvab ehitamisehinna.
+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_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 ostmiseks ja hooldamiseks). 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_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
@@ -2126,9 +2117,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bussijaa
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Vali bussijaamale suund
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Laadimisplatsi suund
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Vali laadimisplatsile suund
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Reisitrammi Jaama Suund
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Reisitrammi suund
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Vali reisitrammijaama suund
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Kaubatrammi Jaama Suund
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Kaubatrammi suund
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Vali kaubatrammijaama suund

 # Waterways toolbar (last two for SE only)
@@ -2196,7 +2187,7 @@ STR_OBJECT_CLASS_TRNS                                           :Saatejaamad

 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Puud
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vali istutatava puu liik. Kui ruudus juba on puu, siis lisatakse rohkem eri liikide puid, olenemata valikust
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Istutatava puu liigi valimine
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Suvalised puutüübid
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Istutab suvalisi puid. Shift valib ehitamise/hinna kuvamise režiimi
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Suvalised puud
@@ -2513,8 +2504,12 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Liiguta
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}NewGRF-faili liigutamine loendis alla
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}NewGRF failidest nimekiri installeerimata. Parameetrite muutmiseks klõpsa failil.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Vaata abi
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Muudatuste logi
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Litsents
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Vali parameetrid
-STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Näita parameetreid
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Vaheta paletti
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Vaheta valitud NewGRF-i paletti.{}Tee seda, kui NewGRF-i graafika paistab mängus roosa.
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Rakenda muudatused
@@ -2544,6 +2539,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameeter {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Parameetrite arv: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}{STRING} NewGRF abi.
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF muudatuste logi {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF litsents {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspekteeri- {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Vanem
@@ -2586,17 +2586,17 @@ 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 {1:STRING} staatilise NewGRF-na koos {STRING} võib põhjustada sünkrooni katkemist.
-STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Ootamatu sprite (sprite {3:NUM})
-STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ootamatu tegevus 0 property {4:HEX} (sprite {3:NUM})
-STR_NEWGRF_ERROR_INVALID_ID                                     :Katse kasutada vigast ID'd (sprite {3:NUM})
+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_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sisaldab vigast pilti. Kõiki vigaseid pilte näidatakse punase küsimärgina (?)
-STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sisaldab mitut Action 8 kirjet (sprite {3:NUM})
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Loe pseudo-sprite lõpust edasi (sprite {3:NUM})
+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 GRFi ressursid ei ole saadaval (sprite {3:NUM})
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} blokeeriti {STRING} poolt
-STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Kehtetu/tundmatu sprite'i asetuse formaat (sprite {3:NUM})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Ettevaatust!
@@ -2724,32 +2724,6 @@ 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
-STR_GOAL_QUESTION_CAPTION_QUESTION                              :Küsimus
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Teave
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Hoiatus
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Viga
-
-### Start of Goal Question button list
-STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Tühista
-STR_GOAL_QUESTION_BUTTON_OK                                     :OK
-STR_GOAL_QUESTION_BUTTON_NO                                     :Ei
-STR_GOAL_QUESTION_BUTTON_YES                                    :Jah
-STR_GOAL_QUESTION_BUTTON_DECLINE                                :Keeldu
-STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Nõustu
-STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Eira
-STR_GOAL_QUESTION_BUTTON_RETRY                                  :Proovi uuesti
-STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Eelmine
-STR_GOAL_QUESTION_BUTTON_NEXT                                   :Järgmine
-STR_GOAL_QUESTION_BUTTON_STOP                                   :Peata
-STR_GOAL_QUESTION_BUTTON_START                                  :Alusta
-STR_GOAL_QUESTION_BUTTON_GO                                     :Mine
-STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Jätka
-STR_GOAL_QUESTION_BUTTON_RESTART                                :Alusta uuesti
-STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Lükka edasi
-STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Anna alla
-STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Sulge
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Toetused
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Pakutavad toetused teenusepakkumise eest:
@@ -2860,11 +2834,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Mitte ü
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Firmaväärtus: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% on ettevõtte {COMPANY} käes)
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktuur:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} röö{P bas pad}
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} sõidutee tük{P k id}
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} veekogu ruu{P t dud}
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} jaama ruu{P t dud}
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} lennuväl{P i jad}
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} rööpad
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} sõidutee tükid
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} veekogu ruudud
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} jaama ruudud
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} lennuväljad
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Puudub

 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Ehita peakorter
@@ -2938,7 +2912,7 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO                                :{BLACK}Toodab:
 STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Toodab: {YELLOW}{STRING}{STRING}, {STRING}{STRING}
 ############ range for produces ends

-STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootlikuse muutmine (kaheksaga jaguv, kuni 2040)
+STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootlikuse muutmine
 STR_CONFIG_GAME_PRODUCTION_LEVEL                                :{WHITE}Muuda tootlikkuse taset (protsent, kuni 800%)

 # Vehicle lists
@@ -3099,7 +3073,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}Osta uus laev
+STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Ehita uus laev
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Ehita uus lennuk

 STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klooni rong
@@ -3161,11 +3135,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 Sõidukite Vahetamist
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Alusta veovahendite 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 Sõidukite Asendamine
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lõpeta veovahendite asendamine
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Vajuta lõpetamaks vasakult valitud veduri asendust

 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Asendamisel: {ORANGE}{STRING}
@@ -3344,7 +3318,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 käskluste lõpp - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :- - Jagatud sihtpunktide lõpp - -

 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Peatusteta
@@ -3356,8 +3330,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                                    :Täis laadida kogu laadung
-STR_ORDER_DROP_FULL_LOAD_ANY                                    :Täis laadida mistahes last
+STR_ORDER_DROP_FULL_LOAD_ALL                                    :Laadi kõik täis
+STR_ORDER_DROP_FULL_LOAD_ANY                                    :Laadi üks täis
 STR_ORDER_DROP_NO_LOADING                                       :Mitte laadida
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Valitud sihtpunktis pealelaadimise protseduuri muutmine

@@ -3523,8 +3497,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Muuda, k
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Tühista aeg
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Tühista esile tõstetud sihtpunkti ajaperiood

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Tühista hilinemisloendur
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Tühista hilinemisloendur, et sõiduk ei jääks hiljaks

@@ -3620,16 +3592,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Nulli
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Päevade arv eelmise tehismõistuse alustamisest pärast mida antud tehismõistus alustab (umbkaudne): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} {STRING} abi.
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} muudatuste logi {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING} litsents {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Vaata abi
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Muudatuste logi
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Litsents
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -360,7 +360,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Vastustajien ky
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Täysi animointi
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Kaikki yksityiskohdat
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Läpinäkyvät rakennukset
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Läpinäkyvät kyltit
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Läpinäkyvät asemakyltit
 ############ range ends here

 ############ range for file menu starts
@@ -1799,10 +1799,6 @@ 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 on liian hidas pysyäkseen palvelimen tahdissa
-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
@@ -1821,10 +1817,6 @@ 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
@@ -1928,7 +1920,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Ei, sulj

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Läpinäkyvyysasetukset
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Muuta kylttien läpinäkyvyyttä. Ctrl+Klik lukitaksesi
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Muuta asemakylttien läpinäkyvyyttä. Ctrl+Klik lukitaksesi
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Klik lukitaksesi
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Klik lukitaksesi
@@ -2139,7 +2131,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. Jos ruudussa on jo puu, tämä lisää uusia puita riippumatta valitun puun tyypistä
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Valitse istutettava puutyyppi.
 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.
@@ -2456,6 +2448,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Siirrä
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa alaspäin
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista asennetuista NewGRF-tiedostoista.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Näytä readme-tiedosto
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Muutosloki
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Lisenssi
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Aseta parametrit
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Näytä parametrit
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Käytä eri palettia
@@ -2487,6 +2484,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametri {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Parametrien määrä: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF:n {STRING} readme-tiedosto
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF:n {STRING} muutosloki
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF:n {STRING} lisenssi
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Tutki - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Vanhempi
@@ -2529,17 +2531,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 {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_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_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sisältää korruptoituneen spriten. Kaikki korruptoituneet spritet näkyvät punaisina kysymysmerkkeinä (?)
-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_MULTIPLE_ACTION_8                              :Sisältää useamman Action 8 -kohdan
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Luku pseudo-spriten ohi
 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 (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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varoitus!
@@ -2668,10 +2670,7 @@ 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_QUESTION                              :Kysymys
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Tietoa
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Varoitus
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Virhe
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Kysymys

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Peruuta
@@ -2830,7 +2829,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 ostamatta osuuksia
+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_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
@@ -3362,7 +3361,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Mene lähimmäl
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Mene lähimmälle varikolle
 STR_ORDER_CONDITIONAL                                           :Ehdollinen hyppykäsky
 STR_ORDER_SHARE                                                 :Jaa käskyt
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Lisää uusi käsky ennen valittua, tai lisää listan viimeiseksi. Ctrl tekee asemakäskyistä 'lastaa täyteen kaikki rahti', reittipistekäskyistä 'non-stop' ja veturitallikäskyistä 'huolto'. 'Jaa käskyt' jakaa käskyt valitun kulkuneuvon kanssa. Kulkuneuvon klikkaaminen kopioi käskyt siitä kulkuneuvosta. Varikkokäsky poistaa käytöstä automaattisen huollon
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Lisää uusi käsky ennen valittua, tai lisää listan viimeiseksi. Ctrl tekee asemakäskyistä 'lastaa täyteen kaikki rahti', reittipistekäskyistä 'non-stop' ja veturitallikäskyistä 'huolto'. 'Jaa käskyt' jakaa käskyt valitun kulkuneuvon kanssa. Kulkuneuvon klikkaaminen kopioi käskyt siitä kulkuneuvosta

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

@@ -3442,9 +3441,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Aikataul
 STR_TIMETABLE_NO_TRAVEL                                         :Ei kulkua
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Kulje (automaattinen; aikataulu seuraavan manuaalisen käskyn mukaisesti)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Kiertävä (ei aikataulua)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Kulje enimmillään {2:VELOCITY} (ei aikataulutettu)
 STR_TIMETABLE_TRAVEL_FOR                                        :Kulje kohteeseen {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Kulje kohteeseen {STRING} enintään {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :ja odota {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :ja kulje {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} päivä{P "" ä}
@@ -3468,12 +3465,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Aseta ku
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nollaa aika
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nollaa tämän rivin aika

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Muuta nopeusrajoitusta
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Muuta valitun määräyksen suurinta sallittua nopeutta
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Tyhjennä nopeusrajoitus
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Tyhjennä valitun määräyksen suurin sallittu nopeus
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nollaa myöhästymislaskuri
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nollaa myöhästymislaskuri, jotta vaunu olisi taas aikataulussa

@@ -3569,16 +3560,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Palauta
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Päiviä edellisen tekoälyn aloittamisesta tämän tekoälyn aloittamiseen (arvio): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING}:n {STRING} readme-tiedosto
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING}:n {STRING} muutosloki
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING}:n {STRING} lisenssi
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Näytä readme-tiedosto
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Muutosloki
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Lisenssi
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -726,7 +726,6 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Cambios
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Subsidios
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Información xeral

-
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Celebración cidadá . . .{}Chega o primeiro tren a {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}Celebración cidadá . . .{}¡Chega o primeiro autobús a {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}Celebración cidadá . . .{}¡Chega o primeiro camión a {STATION}!
@@ -1030,7 +1029,6 @@ STR_SEA_LEVEL_LOW                                               :Baixo
 STR_SEA_LEVEL_MEDIUM                                            :Medio
 STR_SEA_LEVEL_HIGH                                              :Alto

-
 STR_DISASTER_NONE                                               :Ningún
 STR_DISASTER_REDUCED                                            :Reducido
 STR_DISASTER_NORMAL                                             :Normal
@@ -1180,7 +1178,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :longo (31 Dec 2
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :corto (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Pausar automáticamente ó comezo dunha nova partida: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}Usa-la lista avanzada de vehículos: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS                           :{LTBLUE}Usar indicadores de carga: {ORANGE}{STRING}
@@ -1286,8 +1283,6 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Buscado

 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Cambia-lo valor

-# Config errors
-
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}

@@ -1324,7 +1319,6 @@ STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Mostra-l
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Buscar contidos novos e actualizados para descargar
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Saír 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Saír
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}¿Estás seguro de querer saír e volver a {STRING}?
@@ -1789,7 +1783,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... perd
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... arquivo non escribible
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Non se puido descomprimi-lo arquivo descargado

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcións de Transparencia
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Habilitar transparencia para as sinais das estacións. CTRL+Click para bloquear.
@@ -1835,7 +1828,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Constru
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Construír/eliminar vías, sinais, puntos de ruta e estacións. Pulsando CTRL tamén borra a vía de puntos de ruta e estacións
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convertir/Actualizar tipo de vía

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orient. do Dep. de Trens
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selecciona-la orientación do depósito de ferrocarrís
@@ -2090,7 +2082,6 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Campos
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Terra cuberta de neve
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Deserto

-
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Estrada
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Estrada con iluminación
 STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Estrada con árbores
@@ -2282,6 +2273,7 @@ STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Non hai
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ficheiro non atopado
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desactivado

+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Pechar
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Reiniciar
@@ -2313,8 +2305,12 @@ 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 {1:STRING} como NewGRF estático con {STRING} pode causar desincronizacións.
+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_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!
@@ -2342,8 +2338,6 @@ STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRI

 # 'User removed essential NewGRFs'-placeholders for stuff without specs

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de Sinais - {COMMA} Sina{P l is}
 STR_SIGN_LIST_CLEAR                                             :{BLACK}Borrar filtro
@@ -2410,12 +2404,6 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW} Subven
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW}Compra-los dereitos exclusivos de transporte na cidade durante 1 ano. A autoridade só permitirá que os pasaxeiros e as mercadorías usen as estacións da túa compañía.{}Custo: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Suborna-la autoridade local para mellorá-la túa puntuación, co risco dunha gran penalización se o descobren.{}Custo: {CURRENCY_LONG}

-# Goal window
-
-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsidios
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Sibsidios en oferta para sevicios que transporten:
@@ -2549,8 +2537,6 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nome Do Preside

 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Buscamos unha compañía de transporte para adquiri-la nosa compañía{}{}¿Queres comprar {COMPANY} por {CURRENCY_LONG}?

-# Company infrastructure window
-
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrias
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Ningunha -
@@ -3005,8 +2991,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Parar
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Saltar esta orde a non ser que sexa necesario o servizo

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Datos do vehículo para basa lo salto
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Porcentaxe de carga
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Fiabilidade
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Velocidade máxima
@@ -3077,13 +3061,10 @@ STR_ORDER_NO_UNLOAD                                             :(Non descargar
 STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Non descargar e esperar a carga completa)
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Non descargar e esperar a calquera carga completa)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[preto do final]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[medio]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[lonxe do final]

-
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Saltar á orde {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :Saltar á orde {COMMA} cando {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Saltar á orde {COMMA} cando {STRING} {STRING}
@@ -3123,8 +3104,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambiar
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Borrar Tempo
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Quitar a cantidade de tempo para a orde seleccionada

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reiniciar Contador de Retraso
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reiniciar o contador de atraso, para que o vehículo vaia en punto

@@ -3158,6 +3137,7 @@ STR_AI_DEBUG_RELOAD                                             :{BLACK}Recargar
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Mata-la IA, recargar o script, e reinicia-la IA
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Continuar

+
 STR_ERROR_AI_NO_AI_FOUND                                        :Non se atopou ningunha AI adecuada para cargar.{} Esta AI é un bot e non vai facer nada.{}Podes descargar varias AIs no sistema de contido online.
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Fallou unha das IA en execución. Por favor, informa ó autor desta IA cunha captura da Fiestra de Depuración de IA.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}A fiestra de Depuración de IA só está dispoñible para o servidor
@@ -3172,7 +3152,6 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Mover a
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Baixar
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Mover a IA seleccionada hacia abaixo na lista

-
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurar
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configura-los parámetros da IA

@@ -3193,10 +3172,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Pechar
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reiniciar
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3242,7 +3217,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... algo
 STR_ERROR_BMPMAP                                                :{WHITE}Non se pode carga-la paisaxe desde o BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... non se puido convertí-lo tipo de imaxe.

-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Aviso de escala
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Non se recomenda redimensionar moito o mapa de orixe. ¿Continuar coa xeración?

@@ -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}Städte gründen
+STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Stadt 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,11 +357,11 @@ 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                         :Fremde Stationsnamen & Schilder zeigen
+STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Schilder von Wettbewerbern anzeigen
 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
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparenz für Schilder
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparenz für Stationsnamen
 ############ range ends here

 ############ range for file menu starts
@@ -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                       :Wasserstraßenbau
+STR_WATERWAYS_MENU_WATERWAYS_CONSTRUCTION                       :Wasserwegebau
 ############ 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}Betriebsgewinn
-STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Einkommen
+STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Betriebsgewinndiagramm
+STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Einkommensdiagramm
 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}Firmenwert
+STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Firmenwertdiagramm

 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 ein/aus
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Zufällige Wiedergabe an/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.
@@ -1129,7 +1129,7 @@ STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Erlaubt
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Verbessertes Beladeverfahren nutzen: {ORANGE}{STRING}
 STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}Fahrzeuge schrittweise beladen: {ORANGE}{STRING}
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}Stationen werden nur mit Fracht beliefert, wenn ein Fahrzeug sie von dort abholt: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}Industrien beliefern nur Stationen mit passendem Transport: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_BRIDGE_LENGTH                            :{LTBLUE}Maximale Brückenlänge: {ORANGE}{STRING} Feld{P 0:1 "" er}
 STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH                            :{LTBLUE}Maximale Tunnellänge: {ORANGE}{STRING} Feld{P 0:1 "" er}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Manueller Bau von Rohstoffindustrien: {ORANGE}{STRING}
@@ -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}Finanzieren von Gebäuden erlauben: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :{LTBLUE}Finazieren von Gebäuden erlaubens: {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                  :Meistbenutzter
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :Meistbenutzer
 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}/%
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Vorgegebenes Wartungsintervall für Flugzeuge: {ORANGE}{STRING} Tag{P 0:1 "" e}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}/%
+STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Vorgegebenes Wartungsintervall für Schiffe: {ORANGE}{STRING} Tag{P 0:1 "" e}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 Karte oder Szenario erstellen
+STR_INTRO_TOOLTIP_SCENARIO_EDITOR                               :{BLACK}Eine eigene Spielwelt / eigenes Szenario kreieren
 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                                :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_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_FREIGHT_WAGON                                        :Güterwaggon
 STR_LIVERY_BUS                                                  :Bus
 STR_LIVERY_TRUCK                                                :Lastwagen
-STR_LIVERY_PASSENGER_SHIP                                       :Passagierschiff
+STR_LIVERY_PASSENGER_SHIP                                       :Passagierfähre
 STR_LIVERY_FREIGHT_SHIP                                         :Frachter
 STR_LIVERY_HELICOPTER                                           :Hubschrauber
 STR_LIVERY_SMALL_PLANE                                          :Kleines Flugzeug
@@ -1801,9 +1801,7 @@ 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 ist sehr langsam, sodass er nicht mit dem Server mithalten kann
-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
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Dieser Computer brauchte zu lange, dem Spiel beizutreten

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :Allgemeiner Fehler
@@ -1822,10 +1820,6 @@ 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
@@ -1878,12 +1872,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 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_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_ALREADY_HERE                        :{SILVER}Diese Erweiterung ist schon vorhanden
-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_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_NAME                                         :{SILVER}Name: {WHITE}{STRING}
 STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Version: {WHITE}{STRING}
 STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}Beschreibung: {WHITE}{STRING}
@@ -1912,32 +1906,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}Alle Dateien heruntergeladen
+STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Herunterladen abgeschlossen
 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 Server für Online-Erweiterungen herstellen...
+STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Kann keine Verbindung mit dem Inhalts-Server 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, Grafiken herunterladen
+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_NO_QUIT                                    :{BLACK}Nein, OpenTTD beenden

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparenzeinstellungen
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Transparenz für Schilder 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_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_INVISIBLE_TOOLTIP                               :{BLACK}Objekte unsichtbar statt transparent machen

 # Base for station construction window(s)
@@ -1995,7 +1989,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}Bahnhofsgröße durch Klicken und Ziehen frei wählbar
+STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bahnhof durch Klicken, Ziehen und Loslassen bauen

 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
@@ -2005,13 +1999,13 @@ STR_STATION_CLASS_WAYP                                          :Wegpunkte

 # Signal window
 STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalauswahl
-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_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_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){}Dies ist der einfachste Signaltyp. Bei Verwendung dieses Signaltyps darf sich immer nur ein Zug im Signalabschnitt aufhalten
+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_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
@@ -2051,12 +2045,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}Einbahnstraßenbau ein/aus
+STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Aktiviere/Deaktiviere Einbahnstraßenbau
 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 und Abriss der Straße umschalten
+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_TRAMWAYS       :{BLACK}Zwischen Bau und Abriss von Straßenbahngleisen umschalten

 # Road depot construction window
@@ -2076,8 +2070,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}Wasserstraßenbau
-STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Wasserstraßen
+STR_WATERWAYS_TOOLBAR_CAPTION                                   :{WHITE}Wasserwegebau
+STR_WATERWAYS_TOOLBAR_CAPTION_SE                                :{WHITE}Wasserwege
 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
@@ -2140,7 +2134,7 @@ STR_OBJECT_CLASS_TRNS                                           :Sendemasten

 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Bäume
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Wähle die zu pflanzende Baumart. Wenn auf dem Feld schon ein Baum steht, wird eine zufällige Baumart gepflanzt
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Wähle die zu pflanzende Baumart
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Zufällige Baumart
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Zufällige Baumart pflanzen. Shift schaltet zwischen Bauen und Kostenvoranschlag um
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Zufällige Bäume
@@ -2457,6 +2451,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Nach unt
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Die ausgewählte NewGRF-Datei in der Liste nach unten verschieben
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Eine Liste der installierten NewGRF-Dateien.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Readme anzeigen
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Änderungen
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Lizenz
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parameter setzen
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Zeige Parameter
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Farbpalette ändern
@@ -2488,6 +2487,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Anzahl Parameter: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}NewGRF - Readme von {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}NewGRF Änderungen von {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}NewGRF Lizenz von {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Inspiziere - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}übergeordnetes Object
@@ -2502,11 +2506,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- und Schriftsprites (springt ggf. vom ersten bis zum letzten 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_GOTO_BUTTON                                  :{BLACK}Gehe zu 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_GOTO_TOOLTIP                                 :{BLACK}Gehe zum ausgewählten Sprite. Wenn das Sprite 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 und überspringe alle Pseudo-, Recolour- und Schriftsprites (springt ggf. vom letzten bis zum ersten 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_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}
@@ -2520,7 +2524,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
@@ -2530,21 +2534,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 {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_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_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 (Sprite {3:NUM})
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lesezugriff über das Ende des Pseudosprites hinaus (Sprite {3:NUM})
+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_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 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})
+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

 # 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 diesbezüglich keine Fehlerberichte 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 keine diesbezüglichen Bugreports 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)
@@ -2669,10 +2673,7 @@ 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_QUESTION                              :Frage
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Hinweis
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Warnung
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Fehler
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Frage

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Abbruch
@@ -2804,11 +2805,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ü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_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_NONE                            :{WHITE}Keine

 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Firmensitz bauen
@@ -3052,7 +3053,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 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_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_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

@@ -3291,11 +3292,11 @@ STR_ORDERS_END_OF_ORDERS                                        :- - Ende der Au
 STR_ORDERS_END_OF_SHARED_ORDERS                                 :- - Ende des gemeinsam genutzten Fahrplans - -

 # Order bottom buttons
-STR_ORDER_NON_STOP                                              :{BLACK}ohne Zwischenhalt
+STR_ORDER_NON_STOP                                              :{BLACK}ohne Halt
 STR_ORDER_GO_TO                                                 :Fahre zu
-STR_ORDER_GO_NON_STOP_TO                                        :Fahre ohne Zwischenhalt zu
+STR_ORDER_GO_NON_STOP_TO                                        :Fahre ohne Halt zu
 STR_ORDER_GO_VIA                                                :Fahre über
-STR_ORDER_GO_NON_STOP_VIA                                       :Fahre ohne Zwischenhalt über
+STR_ORDER_GO_NON_STOP_VIA                                       :Fahre ohne Halt über
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Ändert Stoppverhalten des ausgewählten Auftrags

 STR_ORDER_TOGGLE_FULL_LOAD                                      :{BLACK}Vollladen einer Fracht
@@ -3336,7 +3337,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}Die Bedingung, die erfüllt werden muss
+STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Vergleich der Farzeuginformation mit eingegebenen Wert
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :gleich
 STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS                     :ungleich
 STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :kleiner als
@@ -3346,7 +3347,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 Fahrzeuginformation verglichen wird
+STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Wert der mit Farzeuginformation verglichen wird
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Wert für den Vergleich eingeben

 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Überspringen
@@ -3363,16 +3364,16 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Nächstes Depot
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Nächster Hangar
 STR_ORDER_CONDITIONAL                                           :Bedingter Sprung zu Auftrag
 STR_ORDER_SHARE                                                 :Gemeinsame Aufträge
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Einen neuen Auftrag vor dem markierten Auftrag oder am Ende der Liste einfügen. Strg halten, um für Stationen 'Vollladen einer Fracht', für Wegpunkte 'ohne Zwischenhalt' und für Depots 'Wartung' auszuwählen. 'Gemeinsame Aufträge' erlauben es, für mehrere Fahrzeuge nur einen Fahrplan und eine Auftragsliste zu verwenden. Durch Klicken auf ein Fahrzeug werden die Aufträge durch die des ausgewählten Fahrzeugs ersetzt. Wartungs- und Depotaufträge schalten die automatische Wartung aus.
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Einen neuen Auftrag vor dem markierten Auftrag oder am Ende der Liste einfügen. Strg halten, um für Stationen 'Vollladen einer Fracht', für Wegpunkte 'ohne Halt' und für Depots 'Wartung' auszuwählen. 'Gemeinsame Aufträge' erlauben ein Fahrzeug auszuwählen mit dem dieses die Aufträge teilt. Klicken auf ein Fahrzeug kopiert die Aufträge von diesem

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Alle Fahrzeuge mit demselben Fahrplan anzeigen

 # String parts to build the order string
 STR_ORDER_GO_TO_WAYPOINT                                        :Fahre über {WAYPOINT}
-STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Fahre ohne Zwischenhalt über {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Fahre ohne Halt über {WAYPOINT}

 STR_ORDER_SERVICE_AT                                            :Falls nötig, fahre zwecks Wartung zu
-STR_ORDER_SERVICE_NON_STOP_AT                                   :Fahre ohne Zwischenhalt zwecks Wartung zu
+STR_ORDER_SERVICE_NON_STOP_AT                                   :Fahre ohne Halt zwecks Wartung zu

 STR_ORDER_NEAREST_DEPOT                                         :nächsten
 STR_ORDER_NEAREST_HANGAR                                        :dem nächsten Hangar
@@ -3443,9 +3444,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Fahrplan
 STR_TIMETABLE_NO_TRAVEL                                         :Nicht unterwegs
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Unterwegs (automatisch; Fahrplan abhängig vom nächsten manuellen Auftrag)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Unterwegs (ohne Fahrplan)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Fahrt mit höchstens {2:VELOCITY} (ohne Fahrplan)
 STR_TIMETABLE_TRAVEL_FOR                                        :Unterwegs für {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Fahrt zu {STRING} mit höchstens {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :und {STRING} lang bleiben
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :und {STRING} lang unterwegs
 STR_TIMETABLE_DAYS                                              :{COMMA} Tag{P "" e}
@@ -3469,12 +3468,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Zeitrahm
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Zeit löschen
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Zeitrahmen für den markierten Auftrag löschen

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Tempolimit ändern
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Tempolimit beim Ausführen des ausgewählten Auftrags ändern
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Tempolimit löschen
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Geschwindigkeitsbegrenzung beim Ausführen des ausgewählten Auftrags löschen
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Verspätung löschen
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Verspätungsmelder zurücksetzen (das Fahrzeug gilt dann als pünktlich).

@@ -3482,8 +3475,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}Fahrplanmäßig
-STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Umschalten zwischen Anzeige der erwarteten Ankunftszeit und des Fahrplans
+STR_TIMETABLE_SCHEDULED                                         :{BLACK}Geplant
+STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Umschalten zwischen erwarteter Ankunftszeit und Fahrplan

 STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :an
 STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :ab
@@ -3499,32 +3492,32 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Jahr aus


 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}KI- und Skript-Debug
+STR_AI_DEBUG                                                    :{WHITE}Debug der KI oder des Skripts
 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}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_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_MATCH_CASE                                         :{BLACK}Groß/Klein beachten
-STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Festlegen, ob bei der Suche auf Groß- und Kleinschreibung geachtet werden soll
+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_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-Ausgabe dieser KI anzeigen
+STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Debug-Ausgaben dieser KI anschauen
 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 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_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_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 Skript, das im nächsten Spiel geladen wird
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Das im nächsten Spiel zu ladende Skript
 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
@@ -3570,16 +3563,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Zurücks
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Ungefährer Abstand in Tagen zwischen dem Starten dieser KI und dem der vorherigen : {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} - Readme von {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}{STRING} Änderungen von {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}{STRING}-Lizenz von {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Readme anzeigen
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Änderungen
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Lizenz
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3632,7 +3615,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 leeres Platzhalter-Soundset wurde gefunden. Soundsets können bei Bedarf als Erweiterung heruntergeladen werden (siehe Hauptmenü)
+STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Nur ein Notbehelfs-Soundset wurde gefunden. Sounds können bei Bedarf als Erweiterung heruntergeladen werden (siehe Hauptmenü)

 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot gespeichert als '{STRING}'
@@ -4145,16 +4128,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                   :Zuckertransporter
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_SUGAR_TRUCK                   :Zuckerlaster
 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                       :Spielzeugtransporter
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Batterietransporter
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_TOY_VAN                       :Spielwarentransporter
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_BATTERY_TRUCK                 :Batterielaster
 STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_FIZZY_DRINK_TRUCK             :Limonadentransporter
-STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Plastiktransporter
+STR_VEHICLE_NAME_TRAIN_WAGON_RAIL_PLASTIC_TRUCK                 :Plastiklaster
 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
@@ -4190,12 +4173,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 (Magnetschwebebahn)
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_PASSENGER_CAR               :Passagierwaggon
 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                   :Güterwaggon
+STR_VEHICLE_NAME_TRAIN_WAGON_MAGLEV_GOODS_VAN                   :Warenwaggon
 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
@@ -2481,6 +2481,9 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Μετα
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Μετακίνηστε το επιλεγμένο αρχείο NewGRF κάτω στη λίστα
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Μια λίστα με τα άρχεια NewGRF που είναι εγκατεστημένα. Κάντε κλικ σε ένα αρχείο για αλλάξετε τις παραμέτρους του

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Άδεια
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Ρύθμιση παραμέτρων
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Εναλλαγή παλέτας
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Εναλλάσει την παλέττα του επιλεγμένου NewGRF.{}Κάντε αυτό όταν τα γραφίκα από αυτό το NewGRF δείχνουν ροζ μέσα στο παιχνίδι
@@ -2511,6 +2514,8 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Παράμετ
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Πλήθος παραμέτρων: {ORANGE}{NUM}

+# NewGRF textfile window
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Επιθεώρηση - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Γονικό
@@ -2553,9 +2558,16 @@ 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                       :Η φόρτωση του {1:STRING} ως στατικό NewGRF με {STRING} μπόρει να προκαλέσει αποσυγχρονισμούς
+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_CORRUPT_SPRITE                                 :{YELLOW}{STRING} περιέχει ένα κατεστραμμένο sprite. Όλα τα κατεστραμμένα sprites θα εμφανίζονται ως ένα κόκκινο ερωματικό (?)
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :Το {1:STRING} απενεργοποιήθηκε από το {STRING}
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Προσοχή!
@@ -2671,10 +2683,6 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Δωρ

 # Goal window

-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Χρηματοδοτήσεις
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Τρέχουσες χρηματοδοτήσεις για ανάληψη υπηρεσιών:
@@ -3422,8 +3430,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Αλλά
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Καθαρισμός χρόνων
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Καθαρίζει το χρόνο της επιλεγμένης επιλογής

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Επαναφορά Μετρητή Καθυστέρησης
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Επαναφορά του μετρητή καθυστέρησης, ώστε το όχημα να είναι στην ώρα του

@@ -3501,11 +3507,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Κλεί
 STR_AI_SETTINGS_RESET                                           :{BLACK}Επαναφορά
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Άδεια
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -2326,6 +2326,8 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}העבר
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}מעביר את הקובץ שנבחר כלפי מטה ברשימה
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK} רשימת קבצי שדרוג גראפי מותקנים

+# Additional textfiles accompanying NewGRFs
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}קבע ערכים
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}החלף פלטת צבעים
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}מחליף את פלטת הצבעים עבור קובץ השדרוג הגראפי שנבחר. השתמש באפשרות זו אם הצבעים שהתקבלו אינם די ברורים
@@ -2350,6 +2352,8 @@ STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}אתחל
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}הגדר את כל הפרמטרים לערך ברירת המחדל שלהם
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}מספר הגדרות: {ORANGE}{NUM}

+# NewGRF textfile window
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}בדוק - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}הורה
@@ -2370,12 +2374,20 @@ 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 {1:STRING} as static NewGRF with {STRING} could cause desyncs.
+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_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}!אזהרה
@@ -2481,10 +2493,6 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}שחד

 # Goal window

-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}סובסידיות
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK} :סובסידיות למימון שירותי הובלה
@@ -3201,8 +3209,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}שנה
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}אפס זמן
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}אפס את פרק הזמן לשהייה ביעד שנבחר

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}אפס מונה איחורים
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}אפס את מונה האיחורים על מנת לאפשר לכלי להגיע בזמן

@@ -3277,10 +3283,6 @@ STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}אל ת
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}סגור
 STR_AI_SETTINGS_RESET                                           :{BLACK}אתחל

-
-# Textfile window
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -423,7 +423,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Az ellenfelek f
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Teljes animáció
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Minden részlet
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Átlátszó épületek
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Átlátszó feliratok
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Állomásnevek keret nélkül
 ############ range ends here

 ############ range for file menu starts
@@ -509,8 +509,7 @@ 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                                :Teljes nagyítású képmentés
-STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Alapértelmezett nagyítású képmentés
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Kinagyított 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ő
@@ -1863,10 +1862,6 @@ 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éped túl lassú, hogy tartsa a szerver sebességét
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Túl sokáig tartott a térkép letöltése a számítógépednek
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Túl sokáig tartott a szerverhez való csatlakozása a számítógépednek

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :általános hiba
@@ -1885,10 +1880,6 @@ 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
@@ -1992,7 +1983,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Nem, az

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Átlátszósági beállítások
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Átlátszó feliratok bekapcsolása. Ctrl+Kattintással zárolható
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Keret nélküli állomásnevek bekapcsolása. Ctrl+Kattintással zárolható
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Fák átlátszóságának bekapcsolása. Ctrl+Kattintással zárolható
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Épületek átlátszóságának bekapcsolása. Ctrl+Kattintással zárolható
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Gazdasági létesítmények átlátszóságának bekapcsolása. Ctrl+Kattintással zárolható
@@ -2133,9 +2124,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Buszmeg
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Buszmegálló helyzetének kiválasztása
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Rakodóhely helyzete
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Teherautó-rakodó helyzetének kiválasztása
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Villamos-utasváró helyzete
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Villamosmegálló helyzete
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Villamos-utasváró helyzetének kiválasztása
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Tehervillamos-állomás helyzete
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Villamosmegálló helyzete
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Tehervillamos-állomás helyzetének kiválasztása

 # Waterways toolbar (last two for SE only)
@@ -2203,7 +2194,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. 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_PLANT_TREE_TOOLTIP                                          :{BLACK}Válaszd ki, melyik fát ülteted
 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
@@ -2520,8 +2511,12 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Le
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}A kiválasztott NewGRF-et lefelé mozgatja a listán
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A feltelepített NewGRF-ek listája.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Readme megtekintése
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Változások listája
+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
@@ -2551,6 +2546,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Paraméter {NUM
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Paraméterek száma: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}{STRING} NewGRF readme-je
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}A(z) {STRING} NewGRF változásainak listája
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}A(z) {STRING} NewGRF licence
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Megtekintés - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Szülő
@@ -2583,7 +2583,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}Egy végzetes NewGRF hiba történt: {}{STRING}
+STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}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 +2593,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                       :{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_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_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ö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_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_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                                     :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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Figyelem!
@@ -2731,32 +2731,6 @@ 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
@@ -3115,7 +3089,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 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_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_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

@@ -3426,7 +3400,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Legközelebbi j
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Legközelebbi hangárba
 STR_ORDER_CONDITIONAL                                           :Feltételes ugrás
 STR_ORDER_SHARE                                                 :Menetrend megosztása
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Új utasítás beillesztése a kijelölt utasítás elé vagy a lista végére. Ctrl+Kattintás állomásoknál 'bármiből teljes rakományra vár'-t, ellenőrző pontoknál 'Non-stop'-ot, járműtelepeknél 'Javításra menj' parancsot ad a célponthoz. 'Menetrend megosztása' esetén a jármű megosztja az utasításait a kiválasztott járművel. Ha járműtelep szerepel a menetrendben, kikapcsolja az automatikus javításokat
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Új utasítás beillesztése a kijelölt utasítás elé vagy a lista végére. Ctrl+Kattintás állomásoknál 'bármiből teljes rakományra vár'-t, ellenőrző pontoknál 'Non-stop'-ot, járműtelepeknél 'Javításra menj' parancsot ad a célponthoz. 'Menetrend megosztása' esetén a jármű megosztja az utasításait a kiválasztott járművel.

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Megmutatja az összes járművet, amik megosztják ezt a menetrendet

@@ -3503,14 +3477,12 @@ STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Átkapcs

 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Menetrend - egy utasítás kijelöléshez kattints rá

-STR_TIMETABLE_NO_TRAVEL                                         :Nincs menet
-STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Menet (automata; menetrend a következő kézi utasítás alapján)
+STR_TIMETABLE_NO_TRAVEL                                         :Nincs utazás
+STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Megy (automata; menetrend a következő kézi utasítás alapján)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Következő célpontig a menetidő időzítetlen
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Menet {2:VELOCITY} max. sebességgel (nincs menetrend)
-STR_TIMETABLE_TRAVEL_FOR                                        :Menetidő: {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Menetidő: {STRING} {VELOCITY} max. sebességgel
+STR_TIMETABLE_TRAVEL_FOR                                        :Következő célpontig rendelkezésre álló menetidő: {STRING}
 STR_TIMETABLE_STAY_FOR                                          :állomásra és maradj ott {STRING}ig
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :és a menetidő: {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :és menj {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} nap
 STR_TIMETABLE_TICKS                                             :{COMMA} tick

@@ -3532,12 +3504,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}A kijel
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Idő törlése
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}A kijelölt menetrendi sorhoz tartozó végrehajtási idő törlése

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Sebességkorlátozás megváltoztatása
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Kijelölt utasítás legnagyobb utazósebességének megváltoztatása
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Sebességkorlátozás törlése
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Maximális utazósebesség törlése a kijelölt utasításból
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Késés nullázása
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Késés-számláló nullázása, azaz a jármű pontos lesz

@@ -3582,7 +3548,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ó 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_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_DEBUG_SERVER_ONLY                                  :{YELLOW}Az MI / Játékszkript nyomkövetés ablak csak a szerver számára elérhető

 # AI configuration window
@@ -3633,16 +3599,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Visszaá
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Az előző MI indításától eltelt napok száma ezen MI indításáig (megközelítőleg): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}{STRING} {STRING} readme-je
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}A(z) {STRING} {STRING} változásainak listája
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}A(z) {STRING} {STRING} licence
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Readme megtekintése
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Változások listája
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licenc
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -739,7 +739,6 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Breytin
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Samstarfssamningar
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Almennar upplýsingar

-
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Bæjarbúar fagna . . .{}Fyrsta lest kemur við á {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}Bæjarbúar fagna . . .{}Fyrsti strætisvagn kemur við á {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}Bæjarbúar fagna . . .{}Fyrsti vörubíll kemur við á {STATION}!
@@ -1325,8 +1324,6 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Leiðs

 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Breyta gildi stillingar

-# Config errors
-
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}

@@ -1834,7 +1831,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... teng
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... skráin er ekki skrifanleg
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Gat ekki afþjappað niðurhöluðu skránni

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Stilling gegnsæjis
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Virkja/afvirkja gegnsæji stöðvaskiltia. CTRL+smella til að læsa.
@@ -1881,7 +1877,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Byggja l
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Skipta á milli byggja/fjarlægja lestarteina, lestarljós, leiðarsteina og lestarstöðvar. Haltu Ctrl inni til að líka fjarlægja lestarteina úr leiðarsteinum og lestarstöðvum
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Breyta/uppfæra gerð lestarteins

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Lega lestarskýlis
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Veldu legu lestarskýlis
@@ -2150,7 +2145,6 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Akur
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snjóþekið land
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Eyðimörk

-
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Vegur
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Vegur með götuljósum
 STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Trjáskreyttur vegur
@@ -2351,6 +2345,7 @@ STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Engar up
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Viðeigandi skrá finnst ekki
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Óvirkt

+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Breyta NewGRF stillingum
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Loka
@@ -2401,8 +2396,13 @@ 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 {1:STRING} er hlaðið sem kyrrstæðu NewGRF ásamt {STRING} gætu orðið hnökrar á keyrslu leiksins.
+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_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
@@ -2512,12 +2512,6 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW}Kosta b
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW} Kaupa 1 árs flutningsrétt í þessum bæ. Bæjaryfirvöld munu aðeins leyfa notkun á þínum flutningsleiðum.{} Kostnaður: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Múta bæjaryfirvöldum til að auka við fylgi þitt, með hættu á þungri refsingu komist það upp.{} Kostnaður: {CURRENCY_LONG}

-# Goal window
-
-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Samstarfssamningar
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Samstarfssamningar í boði fyrir eftirfarandi þjónustur:
@@ -2653,8 +2647,6 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nafn forstöðu

 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Við erum að leita að flutningsfyrirtæki til að taka yfir okkar rekstri.{}{}Viltu kaupa {COMPANY} fyrir {CURRENCY_LONG}?

-# Company infrastructure window
-
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Iðnaðir
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Enginn -
@@ -3185,13 +3177,10 @@ STR_ORDER_NO_UNLOAD                                             :(Ekki afhlaða
 STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ekki afhlaða en býða fullfermis)
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ekki afhlaða og bíða hvaða fullfermis sem er)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[upphaf]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[miðja]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[endir]

-
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Hoppa í skipun {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :Hoppa í skipun {COMMA} þegar {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Hoppa í skipun {COMMA} þegar {STRING} {STRING}
@@ -3231,8 +3220,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Breyta t
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Hreinsa tíma
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Hreinsa tímann fyrir valda skipun

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Endurstilla seinkunnarteljara
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Endurstilla seinkunarteljara, svo farartækið verði á réttum tíma

@@ -3274,6 +3261,7 @@ STR_AI_DEBUG_CONTINUE                                           :{BLACK}Áfram
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Láta gerfigreind halda áfram.
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Skoða ferlisupplýsingar frá þessari gerfigreind

+
 STR_ERROR_AI_NO_AI_FOUND                                        :Engin nothæf gerfigreind fundin.{}Þetta er platgerfigreind sem gerir ekkert.{}Hægt er að ná í gerfigreindir með 'Ná í viðbætur af netinu' valmöguleikanum.
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Ein af gervigreindunum hrundi. Vinsamlega gerðu höfundi gervigreindarinnar viðvart og sendu inn mynd af aflúsunarglugga gervigreindarinnar.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Aflúsunargluggi gervigreindar er aðeins aðgengilegur á þjóni
@@ -3288,7 +3276,6 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Færa va
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Færa niður
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Færa valda gerfigreind niður listann

-
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Stilla
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Stilltu eiginleika gervigreindarinnar

@@ -3309,10 +3296,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Loka
 STR_AI_SETTINGS_RESET                                           :{BLACK}Frumstilla
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -2448,6 +2448,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Kebawah
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pindahkan berkas NewGRF yang terpilih kebagian bawah daftar
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Daftar file NewGRF yang diinstal.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Lihat readme
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Catatan Perubahan
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Lisensi
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Atur parameter
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Tandai palet
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Tandai palet NewGRF terpilih.{}Lakukan ini ketika grafis NewGRF ini terlihat berwarna merah muda di dalam permainan
@@ -2478,6 +2483,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parameter {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Jumlah parameter: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}keterangan NewGRF dari {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}Catatan perubahan NewGRF dari {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}Lisensi NewGRF dari {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Memeriksa - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Induk
@@ -2520,10 +2530,17 @@ 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 {1:STRING} secara statis dengan {STRING} dapat menyebabkan de-sinkronisasi
+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_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_FORCEFULLY_DISABLED                            :{1:STRING} dinonaktifkan oleh {STRING}
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Peringatan!
@@ -2651,10 +2668,6 @@ STR_GOALS_NONE                                                  :{ORANGE}- Tidak
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Target perusahaan:
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klik pada tujuan untuk mengarahkan pandangan pada tengah industri/kota/kotak. Ctrl+klik untuk membuka jendela baru pada lokasi industri/kota/kotak

-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsidi
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Penawaran subsidi jasa transportasi:
@@ -3428,8 +3441,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ubah jum
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Hapus waktu
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Hapus jumlah waktu pada tujuan yang terpilih

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Kembalikan penghitung waktu keterlambatan seperti semula, sehingga kendaraan akan selalu tepat waktu

@@ -3525,16 +3536,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Jalankan AI setelah berapa hari : {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}keterangan {STRING} dari {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Catatan perubahan {STRING} dari {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}Lisensi {STRING} dari {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Lihat readme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Catatan Perubahan
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Lisensi
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -742,7 +742,6 @@ STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Athruit
 STR_NEWS_MESSAGE_TYPE_SUBSIDIES                                 :{YELLOW}Fordheontais
 STR_NEWS_MESSAGE_TYPE_GENERAL_INFORMATION                       :{YELLOW}Faisnéis ginearálta

-
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIG_FONT}{BLACK}Saoránaigh ag ceiliúradh . . .{}Tagann an chéad traein isteach ag {STATION}!
 STR_NEWS_FIRST_BUS_ARRIVAL                                      :{BIG_FONT}{BLACK}Saoránaigh ag ceiliúradh . . .{}Tagann an chéad bus isteach ag {STATION}!
 STR_NEWS_FIRST_TRUCK_ARRIVAL                                    :{BIG_FONT}{BLACK}Saoránaigh ag ceiliúradh . . .{}Tagann an chéad trucail isteach ag {STATION}!
@@ -1051,7 +1050,6 @@ STR_SEA_LEVEL_HIGH                                              :Ard
 STR_SEA_LEVEL_CUSTOM                                            :Saincheaptha
 STR_SEA_LEVEL_CUSTOM_PERCENTAGE                                 :Saincheaptha ({NUM}%)

-
 STR_DISASTER_NONE                                               :Gan tubaistí
 STR_DISASTER_REDUCED                                            :Laghdaithe
 STR_DISASTER_NORMAL                                             :Gnáth
@@ -1219,7 +1217,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :fada (31 Noll 2
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :gearr (31-12-2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

-
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Cuir cluiche ar sos go huathoibríoch agus cluiche nua á thosú: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL                          :{LTBLUE}Agus an cluiche ar sos, ceadaigh: {ORANGE}{STRING}
 STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS               :gníomh ar bith
@@ -1346,8 +1343,6 @@ STR_CONFIG_SETTING_REVERSE_AT_SIGNALS                           :{LTBLUE}Aisiomp

 STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Athraigh luach an tsocraithe

-# Config errors
-
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}

@@ -1384,7 +1379,6 @@ STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Taispeá
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Seiceáil le haghaidh inneachar nua agus nuashonruithe le híoslódáil
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Téigh amach as 'OpenTTD'

-
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Amach
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}An bhfuil tú cinnte gur mhaith leat dul amach as OpenTTD agus filleadh ar {STRING}?
@@ -1859,7 +1853,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... cail
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... níl an comhad inscríofa
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Níorbh fhéidir an comhad íoslódáilte a dhíchomhbhrú

-
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Roghanna Trédhearcachta
 STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Scoránaigh trédhearcacht do chomharthaí stáisiún. Ctrl+Cliceáil le glasáil.
@@ -1906,7 +1899,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Tóg tol
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Athraigh idir tógáil/baint le haghaidh ráillí iarnróid, comharthaí, pointí bealaigh agus stáisiúin. Coinnigh síos Ctrl chun ráillí a bhaint ó phointí bealaigh agus ó stáisiúin freisin
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Tiontaigh/Uasghrádaigh an cineál ráille

-
 # Rail depot construction window
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Treoshuíomh an Iosta Traenach
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Roghnaigh treosuíomh an iosta iarnróid
@@ -2177,7 +2169,6 @@ STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Garrantaí
 STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Talamh faoi shneachta
 STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Fásach

-
 STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Bóthair
 STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Bóthair le soilse sráide
 STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Bóthair le crainn ar gach taobh
@@ -2380,6 +2371,7 @@ STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Níor aims
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Díchumasaithe
 STR_NEWGRF_SETTINGS_INCOMPATIBLE                                :{RED}Neamhchomhoiriúnach leis an leagan seo de OpenTTD

+
 # NewGRF parameters window
 STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Athraigh na paraiméadair NewGRF
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Dún
@@ -2431,8 +2423,13 @@ 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 {1:STRING} a lódáil mar NewGRF statach le {STRING}.
+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_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
@@ -2470,8 +2467,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} de <las
 STR_NEWGRF_INVALID_ENGINE                                       :<samhail feithicle neamhbhailí>
 STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<tionscal neamhbhailí>

-# NewGRF scanning window
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Liosta Comhartaí - {COMMA} {P Ch Ch Ch gC C}omhartha
 STR_SIGN_LIST_MATCH_CASE                                        :{BLACK}Meaitseáil an cás
@@ -2542,12 +2537,6 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW}Tabhair
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW}Ceannaigh cearta eisiacha iompair ar feadh bliana sa bhaile seo. Ní cheadóidh údarás an bhaile do phaisinéirí agus lastas ach na stáisiúin atá agatsa a úsáid.{}Costas: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Tabhair breab don údarás áitiúil chun do rátáil a mhéadú, leis an mbaol ann go mbeidh pionós trom ort má bheirtear ort.{}Costas: {CURRENCY_LONG}

-# Goal window
-
-# Goal question window
-
-### Start of Goal Question button list
-
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Fordheontais
 STR_SUBSIDIES_OFFERED_TITLE                                     :{BLACK}Fordheontais le fáil do sheirbhísí chun:
@@ -2683,8 +2672,6 @@ STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Ainm an Bhainis

 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Tá cuideachta iompair á lorg againn chun seilbh a ghlacadh ar ár gcuideachta.{}{}An bhfuil fonn ort seilbh a ghlacadh ar {COMPANY} ar chostas {CURRENCY_LONG}?

-# Company infrastructure window
-
 # Industry directory
 STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Tionscail
 STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Ceann ar bith -
@@ -3146,8 +3133,6 @@ STR_ORDER_DROP_HALT_DEPOT                                       :Stop
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Téigh thar an t-ordú seo ach amháin má theastaíonn seirbhísiú

 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Sonraí feithicle a bhunófar an léim air
-
-# Conditional order variables, must follow order of OrderConditionVariable enum
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Céatadán lódáilte
 STR_ORDER_CONDITIONAL_RELIABILITY                               :Iontaofacht
 STR_ORDER_CONDITIONAL_MAX_SPEED                                 :Luas uasta
@@ -3225,13 +3210,10 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Ná dílódái
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ná dílódáil agus fan ar lasta iomlán ar bith)
 STR_ORDER_NO_UNLOAD_NO_LOAD                                     :(Ná dílódáil agus ná lódáil)

-
-
 STR_ORDER_STOP_LOCATION_NEAR_END                                :[taobh is gaire]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[lár]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[taobh is faide]

-
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Léim chuig ordú {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :Léim chuig ordú {COMMA} nuair {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Léim chuig ordú {COMMA} nuair {STRING} {STRING}
@@ -3272,8 +3254,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Athraigh
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Glan Am
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Glan an méid ama don ordú aibhsithe

-
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Athshocraigh an tAmadóir Moille
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Athshocraigh an t-amadóir moille, le go mbeidh an fheithicil ar am

@@ -3315,6 +3295,7 @@ STR_AI_DEBUG_CONTINUE                                           :{BLACK}Lean ar
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Cuir deireadh leis an sos agus lean leis an AI
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Amharc ar aschur dífhabhtaithe an AI seo

+
 STR_ERROR_AI_NO_AI_FOUND                                        :Níor aimsíodh AI feiliúnach le lódáil.{}Is AI caoch é an AI seo agus ní dhéanfaidh sé aon rud.{}Is féidir leat roinnt AI a íoslódáil leis an gcóras 'Inneachar Ar Líne'..
 STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Thuairteáil ceann de na AIanna atá ar rith. Déan é seo a thuairisciú d'údar an AI le do thoil, le seat scáileáin den Fhuinneog Dífhabhtaithe AI ag gabháil leis.
 STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Níl an fhuinneog Dífhabhtú AI ar fáil ach don fhreastalaí amháin
@@ -3329,7 +3310,6 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Bog an A
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Bog Síos
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Bog an AI roghnaithe síos sa liosta

-
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Cumraigh
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Cumraigh paraiméadair an AI

@@ -3350,10 +3330,6 @@ STR_AI_SETTINGS_CLOSE                                           :{BLACK}Dún
 STR_AI_SETTINGS_RESET                                           :{BLACK}Athshocraigh
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}

-
-# Textfile window
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
@@ -3400,7 +3376,6 @@ STR_ERROR_PNGMAP_MISC                                           :{WHITE}... chua
 STR_ERROR_BMPMAP                                                :{WHITE}Ní féidir tírdhreach a lódáil ó BMP...
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... níorbh fhéidir an cineál íomhá a thiontú.

-
 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Rabhadh faoin scála
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ní mholtar duit méid na léarscáile foinsí a athrú an iomarca. Lean leis an nginiúint?

@@ -362,7 +362,7 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Mostra nomi e c
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Animazione completa
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Massimo dettaglio
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Edifici trasparenti
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Cartelli trasparenti
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Nomi stazioni trasparenti
 ############ range ends here

 ############ range for file menu starts
@@ -1823,10 +1823,6 @@ 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 è troppo lento per restare al passo col server
-STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Il compiuter ha impiegato troppo tempo per il download della mappa
-STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Il computer ha impiegato troppo tempo per l'ingresso al server

 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :errore generale
@@ -1845,10 +1841,6 @@ 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
@@ -1952,7 +1944,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, esci

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opzioni trasparenza
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Attiva/disattiva la trasparenza dei cartelli. CTRL+clic per bloccare
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Attiva/disattiva la trasparenza dei nomi delle stazioni. CTRL+clic per bloccare
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Attiva/disattiva la trasparenza degli alberi. CTRL+clic per bloccare
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Attiva/disattiva la trasparenza degli edifici. CTRL+clic per bloccare
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Attiva/disattiva la trasparenza delle industrie. CTRL+clic per bloccare
@@ -2167,7 +2159,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. Se nel riquadro sono già presenti alberi, ne aggiunge altri di vari tipi, indipendentemente dal tipo selezionato
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Seleziona il tipo di albero da piantare
 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
@@ -2484,6 +2476,11 @@ STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Sposta g
 STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Sposta il file NewGRF selezionato più in basso nell'elenco
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Elenco dei file NewGRF installati.

+# Additional textfiles accompanying NewGRFs
+STR_NEWGRF_SETTINGS_VIEW_README                                 :{BLACK}Visualizza file leggimi
+STR_NEWGRF_SETTINGS_VIEW_CHANGELOG                              :{BLACK}Changelog
+STR_NEWGRF_SETTINGS_VIEW_LICENSE                                :{BLACK}Licenza
+
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Imposta parametri
 STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Mostra parametri
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alterna tavolozze
@@ -2515,6 +2512,11 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME                              :Parametro {NUM}
 STR_NEWGRF_PARAMETERS_SETTING                                   :{STRING}: {ORANGE}{STRING}
 STR_NEWGRF_PARAMETERS_NUM_PARAM                                 :{LTBLUE}Numero di parametri: {ORANGE}{NUM}

+# NewGRF textfile window
+STR_NEWGRF_README_CAPTION                                       :{WHITE}File leggimi del NewGRF {STRING}
+STR_NEWGRF_CHANGELOG_CAPTION                                    :{WHITE}Changelog del NewGRF {STRING}
+STR_NEWGRF_LICENSE_CAPTION                                      :{WHITE}Licenza del NewGRF {STRING}
+
 # NewGRF inspect window
 STR_NEWGRF_INSPECT_CAPTION                                      :{WHITE}Ispeziona - {STRING}
 STR_NEWGRF_INSPECT_PARENT_BUTTON                                :{BLACK}Padre
@@ -2535,10 +2537,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 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_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_GOTO_CAPTION                                 :{WHITE}Vai a

@@ -2546,8 +2548,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 irreversibile: {SILVER}{STRING}
-STR_NEWGRF_ERROR_FATAL_POPUP                                    :{WHITE}Si è verificato un errore irreversibile nel NewGRF: {}{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_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}
@@ -2557,17 +2559,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 {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_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_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 (sprite {3:NUM})
-STR_NEWGRF_ERROR_READ_BOUNDS                                    :Lettura oltre la fine dello pseudo-sprite (sprite {3:NUM})
+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_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 (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})
+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

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Attenzione!
@@ -2696,10 +2698,7 @@ 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_QUESTION                              :Domanda
-STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informazione
-STR_GOAL_QUESTION_CAPTION_WARNING                               :Avviso
-STR_GOAL_QUESTION_CAPTION_ERROR                                 :Errore
+STR_GOAL_QUESTION_CAPTION                                       :{WHITE}Domanda

 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Annulla
@@ -3390,7 +3389,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Deposito più v
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Hangar più vicino
 STR_ORDER_CONDITIONAL                                           :Salto condizionale
 STR_ORDER_SHARE                                                 :Condividi ordini
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Inserisce un nuovo ordine prima di quello selezionato, o lo aggiunge alla fine della lista. Facendo clic con CTRL gli ordini verso le stazioni diventano 'attendi qualsiasi pieno carico', quelli verso waypoint 'no-stop' e quelli verso depositi 'manutenzione'. L'opzione 'Condividi ordini' o il tasto CTRL consentono a questo veicolo di condividere gli ordini con un veicolo selezionato. Cliccando su un veicolo gli ordini vengono copiati dallo stesso. Gli ordini verso i depositi disattivano la manutenzione automatica del veicolo
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Inserisce un nuovo ordine prima di quello selezionato, o lo aggiunge alla fine della lista. Facendo clic con CTRL gli ordini verso le stazioni diventano 'attendi qualsiasi pieno carico', quelli verso waypoint 'no-stop' e quelli verso depositi 'manutenzione'. L'opzione 'Condividi ordini' o il tasto CTRL consentono a questo veicolo di condividere gli ordini con un veicolo selezionato. Cliccando su un veicolo gli ordini vengono invece copiati dallo stesso

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostra tutti i veicoli che condividono questa lista ordini

@@ -3470,9 +3469,7 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tabella
 STR_TIMETABLE_NO_TRAVEL                                         :Nessun viaggio
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viaggia (automatico; orario basato sul successivo ordine manuale)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viaggia (senza orario)
-STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaggia a non più di {2:VELOCITY} (senza orario)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viaggia per {STRING}
-STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viaggia per {STRING} a non più di {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :e sosta per {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viaggia per {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} giorn{P o i}
@@ -3496,12 +3493,6 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambia l
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Elimina tempo
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Elimina l'impostazione della quantità di tempo per l'ordine selezionato

-STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Cambia limite di velocità
-STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Cambia l'impostazione del limite di velocità per l'ordine selezionato
-
-STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Elimina limite di velocità
-STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Elimina l'impostazione del limite di velocità per l'ordine selezionato
-
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Azzera ritardo
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Azzera il contatore del ritardo, in modo che il veicolo sia considerato in orario

@@ -3597,16 +3588,6 @@ STR_AI_SETTINGS_RESET                                           :{BLACK}Reimpost
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
 STR_AI_SETTINGS_START_DELAY                                     :Giorni da attendere per l'avvio di questa IA dopo la precedente (approssimativo): {ORANGE}{STRING}

-
-# Textfile window
-STR_TEXTFILE_README_CAPTION                                     :{WHITE}File leggimi del {STRING} {STRING}
-STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Changelog del {STRING} {STRING}
-STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}Licenza del {STRING} {STRING}
-STR_TEXTFILE_VIEW_README                                        :{BLACK}Visualizza file leggimi
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Changelog
-STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Licenza
-
-
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINY_FONT}{WHITE}{NUM}%{UP_ARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UP_ARROW}
--- a/Show More
+++ b/Show More