(svn r16905) -Release: 0.7.2-RC2

- Fix: When marking trains stuck do not reset the unload/stuck counter when the vehicle is unloading. It will be automatically reset once the vehicle wants to leave the station [FS#3046] (r16901)
- Fix: [NoAI]: Small errors in the API documentation [FS#3037] (r16865)
- Fix: Savegames from before 0.4 would get their waypoint 'index' messed up (r16854)
- Fix: Cargo payments were not destroyed when a vehicle was destructed. This only happened when you crashed a vehicle while it was unloading [FS#3032, FS#3046] (r16801)

Makefile.in

@@ -93,7 +93,7 @@ ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
 	@echo " Going to reconfigure with last known settings..."
 	@echo "----------------"
 # Make sure we don't lock config.cache
-	@$(shell cat config.cache | sed 's~\\ ~\\\\ ~g') || exit 1
+	@$(shell cat config.cache | sed 's@\\ @\\\\ @g') || exit 1
 	@echo "----------------"
 	@echo "Reconfig done. Please re-execute make."
 	@echo "----------------"

Makefile.msvc

@@ -19,8 +19,8 @@ BIN_DIR = "$(ROOT_DIR)/bin"
 SRC_DIR = "$(ROOT_DIR)/src"
 BUNDLE_DIR = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
-TTD = "openttd.exe"
-TARGET := $(shell echo $(PLATFORM) | sed "s~win64~x64~;s~win32~Win32~")
+TTD = openttd.exe
+TARGET := $(shell echo $(PLATFORM) | sed "s@win64@x64@;s@win32@Win32@")
 
 all:
 	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)

Makefile.src.in

@@ -4,7 +4,6 @@ CC_BUILD     = !!CC_BUILD!!
 CXX_BUILD    = !!CXX_BUILD!!
 WINDRES      = !!WINDRES!!
 STRIP        = !!STRIP!!
-CC_CFLAGS    = !!CC_CFLAGS!!
 CFLAGS       = !!CFLAGS!!
 CFLAGS_BUILD = !!CFLAGS_BUILD!!
 LIBS         = !!LIBS!!
@@ -28,7 +27,6 @@ CFLAGS_MAKEDEP= !!CFLAGS_MAKEDEP!!
 SORT         = !!SORT!!
 REVISION     = !!REVISION!!
 AWK          = !!AWK!!
-GCC295       = !!GCC295!!
 CONFIG_CACHE_COMPILER = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_COMPILER!!
 CONFIG_CACHE_LINKER   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_LINKER!!
 CONFIG_CACHE_ENDIAN   = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_ENDIAN!!
@@ -53,20 +51,6 @@ CFLAGS_MAKEDEP += -I $(SRC_OBJS_DIR) -I $(LANG_OBJS_DIR) -I $(SCRIPT_SRC_DIR)
 
 ENDIAN_TARGETS := endian_target.h $(ENDIAN_CHECK)
 
-# This 'sed' basicly just removes 'const' from the line if it is a 2+D array
-# For more information, please check:
-#  http://maillist.openttd.org/pipermail/devs/2007-April/000284.html
-#  http://maillist.openttd.org/pipermail/devs/2007-February/000248.html
-GCC295_FIX=sed -r 's~^(\t*)(.*)( const )([A-Za-z0-9_ ]+(\[.*\]){2,})(( = \{)|(;))(.*)$$~\1\2 \4\6\8\9~g'
-# This 'sed' removes the 3rd '4' in the # lines of the -E output of
-#  gcc 2.95.3 and lower, as it should indicate that it is a C-linkage, but the
-#  compiler can't handle that information (just don't ask). So we remove it
-#  and then it compiles happily and without bitching :)
-# Furthermore gcc 2.95 has some trouble with protected and private when
-#  accessing the protected/private stuff of the enclosing class (or the
-#  super class of the enclosing class).
-GCC295_FIX_2=sed -e 's~\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$~\1~g;s~private:~public:~g;s~protected:~public:~g'
-
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -98,7 +82,7 @@ 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")
+REV_NR := $(shell echo $(REVISION) | sed "s@[^0-9]@@g")
 else
 # Use autodetected revisions
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
@@ -114,7 +98,7 @@ REV_NR := 0
 endif
 
 # This helps to recompile if flags change
-RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CC_CFLAGS) $(CFLAGS)" ]; then echo "$(CC_CFLAGS) $(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_COMPILER) 2>/dev/null`" != "$(CFLAGS)" ]; then echo "$(CFLAGS)" > $(CONFIG_CACHE_COMPILER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_LINKER) 2>/dev/null`" != "$(LDFLAGS) $(LIBS)" ]; then echo "$(LDFLAGS) $(LIBS)" > $(CONFIG_CACHE_LINKER); fi )
 RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORCE)" ]; then echo "$(ENDIAN_FORCE)" > $(CONFIG_CACHE_ENDIAN); fi )
 
@@ -143,15 +127,15 @@ endif
 
 $(OBJS_C:%.o=%.d): %.d: $(SRC_DIR)/%.c $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's~^$(@F:%.d=%.o):~$@ $(@:%.d=%.o):~' > $@
+	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_CPP:%.o=%.d): %.d: $(SRC_DIR)/%.cpp $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's~^$(@F:%.d=%.o):~$@ $(@:%.d=%.o):~' > $@
+	$(Q)$(CXX_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
-	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's~^$(@F:%.d=%.o):~$@ $(@:%.d=%.o):~' > $@
+	$(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@
 
 $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP)
 	$(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -182,7 +166,7 @@ endif
 
 # Convert x:/... paths to /x/... for mingw
 ifeq ($(OS), MINGW)
-	@cat Makefile.dep.tmp | sed 's~\([a-zA-Z]\):\/~\/\1\/~g' > Makefile.dep.tmp.mingw
+	@cat Makefile.dep.tmp | sed 's@/\([a-zA-Z]\):\/@\/\1\/@g' > Makefile.dep.tmp.mingw
 	@cp Makefile.dep.tmp.mingw Makefile.dep.tmp
 	@rm -f Makefile.dep.tmp.mingw
 endif
@@ -192,7 +176,7 @@ endif
 	@$(AWK) '                           \
 	/^# DO NOT/ { print $$0 ; next}     \
 	/^#/ {next}                         \
-	/:/ {                               \
+	/: / {                               \
 		left = NF - 1;                    \
 		for (n = 2; n <= NF; n++) {       \
 			if (match($$n, "^$(ROOT_DIR)") == 0) { \
@@ -211,7 +195,7 @@ endif
 	{                                   \
 		print $$0                         \
 	}                                   \
-	' < Makefile.dep.tmp | sed 's~  *~ ~g;s~ $$~~' | $(SORT) > Makefile.dep
+	' < Makefile.dep.tmp | sed 's@  *@ @g;s@ $$@@' | $(SORT) > Makefile.dep
 
 	$(Q)rm -f Makefile.dep.tmp Makefile.dep.tmp.bak
 
@@ -226,17 +210,9 @@ endif
 
 # Compile all the files according to the targets
 
-$(OBJS_C): %.o: $(SRC_DIR)/%.c $(DEP_MASK) $(FILE_DEP)
-	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.c=%.c)'
-	$(Q)$(CC_HOST) $(CC_CFLAGS) $(CFLAGS) -c -o $@ $<
-
 $(OBJS_CPP): %.o: $(SRC_DIR)/%.cpp $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-ifeq ($(GCC295), 1)
-	$(Q)$(CXX_HOST) -E $(CFLAGS) $< | $(GCC295_FIX) | $(GCC295_FIX_2) | $(CXX_HOST) $(CFLAGS) -c -o $@ -x c++ -
-else
 	$(Q)$(CXX_HOST) $(CFLAGS) -c -o $@ $<
-endif
 
 $(OBJS_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP)
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.mm=%.mm)'
@@ -280,10 +256,10 @@ $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 # Revision files
 
 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
-	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s~@@REVISION@@~$(REV_NR)~g;s~@@VERSION@@~$(REV)~g;s~@@MODIFIED@@~$(MODIFIED)~g;s~@@DATE@@~`date +%d.%m.%y`~g" > $(SRC_DIR)/rev.cpp
+	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/rev.cpp
 
 $(SRC_DIR)/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/ottdres.rc.in
-	$(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s~@@REVISION@@~$(REV_NR)~g;s~@@VERSION@@~$(REV)~g;s~@@DATE@@~`date +%d.%m.%y`~g" > $(SRC_DIR)/ottdres.rc
+	$(Q)cat $(SRC_DIR)/ottdres.rc.in | sed "s@\!\!REVISION\!\!@$(REV_NR)@g;s@!!VERSION!!@$(REV)@g;s@!!DATE!!@`date +%d.%m.%y`@g" > $(SRC_DIR)/ottdres.rc
 
 FORCE:
 

bin/ai/regression/regression.nut

@@ -1077,9 +1077,10 @@ function Regression::Sign()
 	print("  BuildSign(33409, 'Some other Sign'): " + sign_id);
 	print("  RemoveSign(" + sign_id + "):                       " + AISign.RemoveSign(sign_id));
 	print("");
-	print("  GetMaxSignID():    " + AISign.GetMaxSignID());
-	for (local i = -1; i < AISign.GetMaxSignID() + 1; i++) {
-		if (AISign.IsValidSign(i)) j++;
+	local list = AISignList();
+	list.Sort(AIAbstractList.SORT_BY_ITEM, true);
+	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
+		j++;
 		print("  Sign " + i);
 		print("    IsValidSign():   " + AISign.IsValidSign(i));
 		print("    GetName():       " + AISign.GetName(i));

bin/ai/regression/regression.txt

@@ -1072,7 +1072,7 @@
   GetAutoRenewStatus();        true
   SetAutoRenewStatus(true);    false
   SetAutoRenewStatus(false);   true
-  GetAutoRenewMonths();        -6
+  GetAutoRenewMonths();        6
   SetAutoRenewMonths(-12);     true
   GetAutoRenewMonths();        -12
   SetAutoRenewMonths(-12);     false
@@ -7242,11 +7242,6 @@
   BuildSign(33409, 'Some other Sign'): 2
   RemoveSign(2):                       true
 
-  GetMaxSignID():    3
-  Sign -1
-    IsValidSign():   false
-    GetName():       (null : 0x00000000)
-    GetLocation():   -1
   Sign 0
     IsValidSign():   true
     GetName():       Some Sign
@@ -7255,14 +7250,6 @@
     IsValidSign():   true
     GetName():       Test2
     GetLocation():   33411
-  Sign 2
-    IsValidSign():   false
-    GetName():       (null : 0x00000000)
-    GetLocation():   -1
-  Sign 3
-    IsValidSign():   false
-    GetName():       (null : 0x00000000)
-    GetLocation():   -1
   Valid Signs:       2
 
 --Station--

config.lib

@@ -5,7 +5,7 @@ log() {
 }
 
 set_default() {
-	released_version="0.7.1-RC1"
+	released_version="0.7.2-RC2"
 
 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -415,7 +415,7 @@ save_params() {
 	configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters"
 	for p in $save_params_array; do
 		eval "v=\"\$$p\""
-		p=`echo "$p" | sed 's~_~-~g;s~\n~~g;s~ ~\\ ~g'`
+		p=`echo "$p" | sed 's@_@-@g;s@\n@@g;s@ @\\ @g'`
 		# Only save those params that aren't empty
 		configure="$configure --$p=\"$v\""
 	done
@@ -815,6 +815,7 @@ check_params() {
 	fi
 
 	if [ "$os" = "OSX" ]; then
+		check_osx_sdk
 		# Test on G5
 
 		if [ "$enable_osx_g5" != "0" ]; then
@@ -903,7 +904,7 @@ check_params() {
 			doc_dir="$data_dir/docs"
 		fi
 	else
-		doc_dir="`echo $doc_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
+		doc_dir="`echo $doc_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
 	fi
 
 	if [ "$icon_theme_dir" = "1" ]; then
@@ -913,7 +914,7 @@ check_params() {
 			icon_theme_dir=""
 		fi
 	else
-		icon_theme_dir="`echo $icon_theme_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
+		icon_theme_dir="`echo $icon_theme_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
 	fi
 
 	if [ "$personal_dir" = "1" ]; then
@@ -925,7 +926,7 @@ check_params() {
 			personal_dir=".openttd"
 		fi
 	else
-		personal_dir="`echo $personal_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
+		personal_dir="`echo $personal_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
 	fi
 
 	if [ "$shared_dir" = "1" ]; then
@@ -936,7 +937,7 @@ check_params() {
 			shared_dir=""
 		fi
 	else
-		shared_dir="`echo $shared_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
+		shared_dir="`echo $shared_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
 	fi
 
 	if [ "$man_dir" = "1" ]; then
@@ -947,7 +948,7 @@ check_params() {
 			man_dir=""
 		fi
 	else
-		man_dir="`echo $man_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
+		man_dir="`echo $man_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
 	fi
 
 	if [ "$menu_dir" = "1" ]; then
@@ -958,7 +959,7 @@ check_params() {
 			menu_dir=""
 		fi
 	else
-		menu_dir="`echo $menu_dir | sed 's~\([^\]\)\\\\ ~\1\\\\\\\\ ~g;s~\([^\]\) ~\1\\\\\\\\ ~g'`"
+		menu_dir="`echo $menu_dir | sed 's@\([^\]\)\\\\ @\1\\\\\\\\ @g;s@\([^\]\) @\1\\\\\\\\ @g'`"
 	fi
 
 	# "set_universal_binary_flags" needs to be before "detect_iconv"
@@ -1008,13 +1009,74 @@ check_params() {
 	fi
 }
 
+make_compiler_cflags() {
+	# Params:
+	# $1 - compiler
+	# $2 - the current cflags
+	# $3 - variable to finally write to
+
+	flags="$2"
+
+	if [ `echo $1 | cut -c 1-3` = "icc" ]; then
+		# Enable some things only for certain ICC versions
+		cc_version=`$1 -dumpversion | cut -c 1-4`
+
+
+		if [ "$cc_version" = "10.1" ]; then
+			flags="$flags -Wno-multichar"
+		fi
+
+		if [ "$cc_version" = "11.0" ]; then
+			# warning 1899: multicharacter character literal (potential portability problem) (e.g. 'FOOD')
+			# vec report defaults to telling where it did loop vectorisation, which is not very important
+			flags="$flags -vec-report=0 -wd1899"
+		fi
+	else
+		# Enable some things only for certain GCC versions
+		cc_version=`$1 -dumpversion | cut -c 1,3`
+
+		if [ $cc_version -lt 30 ]; then
+			log 1 "configure: error: gcc older than 3.0 can't compile OpenTTD because of its poor template support"
+			exit 1
+		fi
+
+		flags="$flags -Wall -Wno-multichar -Wsign-compare -Wundef"
+		flags="$flags -Wwrite-strings -Wpointer-arith"
+		flags="$flags -Wno-uninitialized"
+
+		flags="$flags -W -Wno-unused-parameter -Wformat=2"
+		flags="$flags -Wredundant-decls"
+
+		if [ $enable_assert -eq 0 ]; then
+			# Do not warn about unused variables when building without asserts
+			flags="$flags -Wno-unused-variable"
+		fi
+
+		if [ $cc_version -ge 40 ]; then
+			# GCC 4.0+ complains about that we break strict-aliasing.
+			#  On most places we don't see how to fix it, and it doesn't
+			#  break anything. So disable strict-aliasing to make the
+			#  compiler all happy.
+			flags="$flags -fno-strict-aliasing"
+		fi
+
+		if [ $cc_version -ge 42 ]; then
+			# GCC 4.2+ automatically assumes that signed overflows do
+			# not occur in signed arithmetics, whereas we are not
+			# sure that they will not happen. It furthermore complains
+			# about it's own optimized code in some places.
+			flags="$flags -fno-strict-overflow"
+		fi
+	fi
+
+	eval "$3=\"$flags\""
+}
+
 make_cflags_and_ldflags() {
 	# General CFlags for BUILD
 	CFLAGS_BUILD=""
 	# General CFlags for HOST
 	CFLAGS="$CFLAGS -D$os"
-	# CFlags for HOST and C-Compiler
-	CC_FLAGS=""
 	# Libs to compile. In fact this is just LDFLAGS
 	LIBS="-lstdc++"
 	# LDFLAGS used for HOST
@@ -1063,58 +1125,16 @@ make_cflags_and_ldflags() {
 		CFLAGS="$CFLAGS -DNO_THREADS"
 	fi
 
-	if [ `echo $cc_host | cut -c 1-3` = "icc" ]; then
-		# Enable some things only for certain ICC versions
-		cc_version=`$cc_host -dumpversion | cut -c 1-4`
-
-
-		if [ "$cc_version" = "10.1" ]; then
-			CFLAGS="$CFLAGS -Wno-multichar"
-		fi
-	else
-		# Enable some things only for certain GCC versions
-		cc_version=`$cc_host -dumpversion | cut -c 1,3`
-
-		if [ $cc_version -ge 29 ]; then
-			CFLAGS="$CFLAGS -Wall -Wno-multichar -Wsign-compare -Wundef"
-			CFLAGS="$CFLAGS -Wwrite-strings -Wpointer-arith"
-			CFLAGS="$CFLAGS -Wno-uninitialized"
-
-			CC_CFLAGS="$CC_CFLAGS -Wstrict-prototypes"
-		fi
-
-		gcc295=""
-		if [ "$cc_version" = 29 ]; then
-			# Make sure we mark GCC 2.95 flag for Makefile.src.in, as we
-			#  need a lovely hack there to make it compile correctly.
-			gcc295="1"
-
-			# Disable warnings about unused variables when
-			# compiling with asserts disabled
-			if [ $enable_assert -eq 0 ]; then
-				CFLAGS="$CFLAGS -Wno-unused"
-			fi
-		fi
-
-		if [ $cc_version -ge 30 ]; then
-			CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wformat=2"
-			CFLAGS="$CFLAGS -Wredundant-decls"
-			# Do not warn about unused variables when building without asserts
-			if [ $enable_assert -eq 0 ]; then
-				CFLAGS="$CFLAGS -Wno-unused-variable"
-			fi
-		fi
-
-		if [ $cc_version -ge 34 ]; then
-			CC_CFLAGS="$CC_CFLAGS -Wdeclaration-after-statement -Wold-style-definition"
-		fi
+	make_compiler_cflags "$cc_build" "$CFLAGS_BUILD" "CFLAGS_BUILD"
+	make_compiler_cflags "$cc_host" "$CFLAGS" "CFLAGS"
 
+	if [ "`echo $1 | cut -c 1-3`" != "icc" ]; then
 		if [ "$os" = "CYGWIN" ]; then
-			CFLAGS="$CFLAGS -mwin32"
+			flags="$flags -mwin32"
 			LDFLAGS="$LDFLAGS -mwin32"
 		fi
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ]; then
-			CFLAGS="$CFLAGS -mno-cygwin"
+			flags="$flags -mno-cygwin"
 			LDFLAGS="$LDFLAGS -mno-cygwin"
 		fi
 
@@ -1122,22 +1142,6 @@ make_cflags_and_ldflags() {
 			LDFLAGS="$LDFLAGS -Wl,--subsystem,windows"
 			LIBS="$LIBS -lws2_32 -lwinmm -lgdi32 -ldxguid -lole32"
 		fi
-
-		# GCC 4.0+ complains about that we break strict-aliasing.
-		#  On most places we don't see how to fix it, and it doesn't
-		#  break anything. So disable strict-aliasing to make the
-		#  compiler all happy.
-		if [ $cc_version -ge 40 ]; then
-			CFLAGS="$CFLAGS -fno-strict-aliasing"
-		fi
-
-		# GCC 4.2+ automatically assumes that signed overflows do
-		# not occur in signed arithmetics, whereas we are not
-		# sure that they will not happen. It furthermore complains
-		# about it's own optimized code in some places.
-		if [ $cc_version -ge 42 ]; then
-			CFLAGS="$CFLAGS -fno-strict-overflow"
-		fi
 	fi
 
 	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
@@ -1206,7 +1210,7 @@ make_cflags_and_ldflags() {
 	if [ -n "$sdl_config" ]; then
 		CFLAGS="$CFLAGS -DWITH_SDL"
 		# SDL must not add _GNU_SOURCE as it breaks many platforms
-		CFLAGS="$CFLAGS `$sdl_config --cflags | sed 's~-D_GNU_SOURCE[^ ]*~~'`"
+		CFLAGS="$CFLAGS `$sdl_config --cflags | sed 's@-D_GNU_SOURCE[^ ]*@@'`"
 		if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ] && [ "$os" != "WINCE" ]; then
 			if [ "$enable_static" != "0" ]; then
 				LIBS="$LIBS `$sdl_config --static-libs`"
@@ -1268,7 +1272,7 @@ make_cflags_and_ldflags() {
 			if [ "$os" = "OSX" ]; then
 				# fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix
 				# Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps
-				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s~-lfontconfig~~`"
+				LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s@-lfontconfig@@`"
 			else
 				LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' '  '`"
 			fi
@@ -1378,7 +1382,7 @@ make_cflags_and_ldflags() {
 	fi
 
 	if [ "$enable_osx_g5" != "0" ]; then
-		CFLAGS="$CFLAGS -mtune=970 -mcpu=970 -mpowerpc-gpopt"
+		CFLAGS="$CFLAGS -mcpu=G5 -mpowerpc64 -mtune=970 -mcpu=970 -mpowerpc-gpopt"
 	fi
 
 	if [ -n "$personal_dir" ]; then
@@ -1391,7 +1395,7 @@ make_cflags_and_ldflags() {
 
 	CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""
 
-	log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
+	log 1 "using CFLAGS... $CFLAGS"
 	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
 
 	# Makedepend doesn't like something like: -isysroot /OSX/blabla
@@ -1400,8 +1404,10 @@ make_cflags_and_ldflags() {
 	# Lovely hackish, not?
 	# Btw, this almost always comes from outside the configure, so it is
 	#  not something we can control.
+	# Also make makedepend aware of compiler's built-in defines.
 	if [ "$with_makedepend" != "0" ]; then
-		cflags_makedep="` echo "$CFLAGS" | sed 's~ /~ -~g;s~-I[ ]*[^ ]*~~g'`"
+		cflags_makedep="`echo | $cxx_host -E -x c++ -dM - | sed 's@.define @-D@g;s@ .*@ @g;s@(.*)@@g' | tr -d '\r\n'`"
+		cflags_makedep="$cflags_makedep `echo "$CFLAGS" | sed 's@ /@ -@g;s@-I[ ]*[^ ]*@@g'`"
 	else
 		makedepend=""
 	fi
@@ -1580,7 +1586,7 @@ check_strip() {
 	elif [ "$os" = "OSX" ]; then
 		# Most targets have -V in strip, to see if they exists... OSX doesn't.. so execute something
 		echo "int main(int argc, char *argv[]) { }" > strip.test.c
-		$cc_host strip.test.c -o strip.test
+		$cxx_host strip.test.c -o strip.test
 		check_compiler "host strip" "strip" "$host" "$strip" "$STRIP" "strip" "strip" "3" "strip.test"
 		rm -f strip.test.c strip.test
 	else
@@ -1591,7 +1597,7 @@ check_strip() {
 check_lipo() {
 	if [ "$os" = "OSX" ] && [ "$enable_universal" != "0" ]; then
 		echo "int main(int argc, char *argv[]) { }" > lipo.test.c
-		$cc_host lipo.test.c -o lipo.test
+		$cxx_host lipo.test.c -o lipo.test
 		check_compiler "host lipo" "lipo" "$host" "$lipo" "$LIPO" "lipo" "lipo" "4" "-info lipo.test"
 		rm -f lipo.test.c lipo.test
 	fi
@@ -1617,6 +1623,28 @@ set_universal_binary_flags() {
 	fi
 }
 
+check_osx_sdk() {
+cat > tmp.osx.mm << EOF
+#include <Cocoa/Cocoa.h>
+int main() {
+	kCGBitmapByteOrder32Host;
+	return 0;
+}
+EOF
+	execute="$cxx_host $CFLAGS tmp.osx.mm -framework Cocoa -o tmp.osx 2>&1"
+	eval $execute > /dev/null
+	ret=$?
+	log 2 "executing $execute"
+	log 2 "  exit code $ret"
+	rm -f tmp.osx.mm tmp.osx
+	if [ "$ret" != "0" ]; then
+		log 1 "Your system SDK is probably too old"
+		log 1 "Please install/upgrade your Xcode to >= 2.5"
+
+		exit 1
+	fi
+}
+
 check_direct_music() {
 	echo "
 		#include <windows.h>
@@ -2501,7 +2529,8 @@ detect_cputype() {
 		log 1 "forcing cpu-type... $cpu_type bits"
 		return;
 	fi
-	echo "#include \"src/stdafx.h\"" > tmp.64bit.cpp
+	echo "#define _SQ64 1" > tmp.64bit.cpp
+	echo "#include \"src/stdafx.h\"" >> tmp.64bit.cpp
 	echo "assert_compile(sizeof(size_t) == 8);" >> tmp.64bit.cpp
 	echo "int main() { return 0; }" >> tmp.64bit.cpp
 	execute="$cxx_host $CFLAGS tmp.64bit.cpp -o tmp.64bit -DTESTING 2>&1"
@@ -2519,17 +2548,6 @@ make_sed() {
 	T_CFLAGS="$CFLAGS"
 	T_LDFLAGS="$LDFLAGS"
 
-	# We check here if we are PPC, because then we need to enable FOUR_BYTE_BOOL
-	#  We do this here, and not sooner, so universal builds also have this
-	#  automatically correct
-	# FOUR_BYTE_BOOL is needed, because C++ uses 4byte for a bool on PPC, where
-	#  we use 1 byte per bool normally in C part. So convert that last one to 4
-	#  bytes too, but only for PPC.
-	ppc=`$cc_host -dumpmachine | egrep "powerpc|ppc"`
-	if [ -n "$ppc" ]; then
-		T_CFLAGS="$T_CFLAGS -DFOUR_BYTE_BOOL"
-	fi
-
 	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
 
 	# All the data needed to compile a single target
@@ -2537,104 +2555,102 @@ make_sed() {
 	#  use multiple OBJS_DIR, because all in-between
 	#  binaries are stored in there, and nowhere else.
 	SRC_REPLACE="
-		s~!!CC_HOST!!~$cc_host~g;
-		s~!!CXX_HOST!!~$cxx_host~g;
-		s~!!CC_BUILD!!~$cc_build~g;
-		s~!!CXX_BUILD!!~$cxx_build~g;
-		s~!!WINDRES!!~$windres~g;
-		s~!!STRIP!!~$strip $strip_arg~g;
-		s~!!LIPO!!~$lipo~g;
-		s~!!CC_CFLAGS!!~$CC_CFLAGS~g;
-		s~!!CFLAGS!!~$T_CFLAGS~g;
-		s~!!CFLAGS_BUILD!!~$CFLAGS_BUILD~g;
-		s~!!STRGEN_FLAGS!!~$strgen_flags~g;
-		s~!!LIBS!!~$LIBS~g;
-		s~!!LDFLAGS!!~$T_LDFLAGS~g;
-		s~!!BIN_DIR!!~$BIN_DIR~g;
-		s~!!ROOT_DIR!!~$ROOT_DIR~g;
-		s~!!MEDIA_DIR!!~$MEDIA_DIR~g;
-		s~!!SOURCE_LIST!!~$SOURCE_LIST~g;
-		s~!!SRC_OBJS_DIR!!~$SRC_OBJS_DIR~g;
-		s~!!LANG_OBJS_DIR!!~$LANG_OBJS_DIR~g;
-		s~!!SRC_DIR!!~$SRC_DIR~g;
-		s~!!SCRIPT_SRC_DIR!!~$SCRIPT_SRC_DIR~g;
-		s~!!OSXAPP!!~$OSXAPP~g;
-		s~!!LANG_DIR!!~$LANG_DIR~g;
-		s~!!TTD!!~$TTD~g;
-		s~!!BINARY_DIR!!~$prefix_dir/$binary_dir~g;
-		s~!!DATA_DIR!!~$prefix_dir/$data_dir~g;
-		s~!!DOC_DIR!!~$prefix_dir/$doc_dir~g;
-		s~!!MAN_DIR!!~$prefix_dir/$man_dir~g;
-		s~!!ICON_DIR!!~$prefix_dir/$icon_dir~g;
-		s~!!ICON_THEME_DIR!!~$prefix_dir/$icon_theme_dir~g;
-		s~!!PERSONAL_DIR!!~$personal_dir~g;
-		s~!!SHARED_DIR!!~$shared_dir~g;
-		s~!!INSTALL_DIR!!~$install_dir~g;
-		s~!!BINARY_NAME!!~$binary_name~g;
-		s~!!STRGEN!!~$STRGEN~g;
-		s~!!ENDIAN_CHECK!!~$ENDIAN_CHECK~g;
-		s~!!ENDIAN_FORCE!!~$endian~g;
-		s~!!STAGE!!~$STAGE~g;
-		s~!!MAKEDEPEND!!~$makedepend~g;
-		s~!!CFLAGS_MAKEDEP!!~$cflags_makedep~g;
-		s~!!SORT!!~$sort~g;
-		s~!!CONFIG_CACHE_COMPILER!!~config.cache.compiler~g;
-		s~!!CONFIG_CACHE_LINKER!!~config.cache.linker~g;
-		s~!!CONFIG_CACHE_ENDIAN!!~config.cache.endian~g;
-		s~!!CONFIG_CACHE_SOURCE!!~config.cache.source~g;
-		s~!!CONFIG_CACHE_VERSION!!~config.cache.version~g;
-		s~!!CONFIG_CACHE_SOURCE_LIST!!~config.cache.source.list~g;
-		s~!!CONFIG_CACHE_PWD!!~config.cache.pwd~g;
-		s~!!LANG_SUPPRESS!!~$lang_suppress~g;
-		s~!!OBJS_C!!~$OBJS_C~g;
-		s~!!OBJS_CPP!!~$OBJS_CPP~g;
-		s~!!OBJS_MM!!~$OBJS_MM~g;
-		s~!!OBJS_RC!!~$OBJS_RC~g;
-		s~!!SRCS!!~$SRCS~g;
-		s~!!OS!!~$os~g;
-		s~!!CONFIGURE_FILES!!~$CONFIGURE_FILES~g;
-		s~!!REVISION!!~$revision~g;
-		s~!!AWK!!~$awk~g;
-		s~!!GCC295!!~$gcc295~g;
-		s~!!DISTCC!!~$distcc~g;
+		s@!!CC_HOST!!@$cc_host@g;
+		s@!!CXX_HOST!!@$cxx_host@g;
+		s@!!CC_BUILD!!@$cc_build@g;
+		s@!!CXX_BUILD!!@$cxx_build@g;
+		s@!!WINDRES!!@$windres@g;
+		s@!!STRIP!!@$strip $strip_arg@g;
+		s@!!LIPO!!@$lipo@g;
+		s@!!CFLAGS!!@$T_CFLAGS@g;
+		s@!!CFLAGS_BUILD!!@$CFLAGS_BUILD@g;
+		s@!!STRGEN_FLAGS!!@$strgen_flags@g;
+		s@!!LIBS!!@$LIBS@g;
+		s@!!LDFLAGS!!@$T_LDFLAGS@g;
+		s@!!BIN_DIR!!@$BIN_DIR@g;
+		s@!!ROOT_DIR!!@$ROOT_DIR@g;
+		s@!!MEDIA_DIR!!@$MEDIA_DIR@g;
+		s@!!SOURCE_LIST!!@$SOURCE_LIST@g;
+		s@!!SRC_OBJS_DIR!!@$SRC_OBJS_DIR@g;
+		s@!!LANG_OBJS_DIR!!@$LANG_OBJS_DIR@g;
+		s@!!SRC_DIR!!@$SRC_DIR@g;
+		s@!!SCRIPT_SRC_DIR!!@$SCRIPT_SRC_DIR@g;
+		s@!!OSXAPP!!@$OSXAPP@g;
+		s@!!LANG_DIR!!@$LANG_DIR@g;
+		s@!!TTD!!@$TTD@g;
+		s@!!BINARY_DIR!!@$prefix_dir/$binary_dir@g;
+		s@!!DATA_DIR!!@$prefix_dir/$data_dir@g;
+		s@!!DOC_DIR!!@$prefix_dir/$doc_dir@g;
+		s@!!MAN_DIR!!@$prefix_dir/$man_dir@g;
+		s@!!ICON_DIR!!@$prefix_dir/$icon_dir@g;
+		s@!!ICON_THEME_DIR!!@$prefix_dir/$icon_theme_dir@g;
+		s@!!PERSONAL_DIR!!@$personal_dir@g;
+		s@!!SHARED_DIR!!@$shared_dir@g;
+		s@!!INSTALL_DIR!!@$install_dir@g;
+		s@!!BINARY_NAME!!@$binary_name@g;
+		s@!!STRGEN!!@$STRGEN@g;
+		s@!!ENDIAN_CHECK!!@$ENDIAN_CHECK@g;
+		s@!!ENDIAN_FORCE!!@$endian@g;
+		s@!!STAGE!!@$STAGE@g;
+		s@!!MAKEDEPEND!!@$makedepend@g;
+		s@!!CFLAGS_MAKEDEP!!@$cflags_makedep@g;
+		s@!!SORT!!@$sort@g;
+		s@!!CONFIG_CACHE_COMPILER!!@config.cache.compiler@g;
+		s@!!CONFIG_CACHE_LINKER!!@config.cache.linker@g;
+		s@!!CONFIG_CACHE_ENDIAN!!@config.cache.endian@g;
+		s@!!CONFIG_CACHE_SOURCE!!@config.cache.source@g;
+		s@!!CONFIG_CACHE_VERSION!!@config.cache.version@g;
+		s@!!CONFIG_CACHE_SOURCE_LIST!!@config.cache.source.list@g;
+		s@!!CONFIG_CACHE_PWD!!@config.cache.pwd@g;
+		s@!!LANG_SUPPRESS!!@$lang_suppress@g;
+		s@!!OBJS_C!!@$OBJS_C@g;
+		s@!!OBJS_CPP!!@$OBJS_CPP@g;
+		s@!!OBJS_MM!!@$OBJS_MM@g;
+		s@!!OBJS_RC!!@$OBJS_RC@g;
+		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;
 	"
 
 	if [ "$icon_theme_dir" != "" ]; then
 		SRC_REPLACE="$SRC_REPLACE
-			s#!!ICON_THEME_DIR!!#$prefix_dir/$icon_theme_dir#g;
+			s@!!ICON_THEME_DIR!!@$prefix_dir/$icon_theme_dir@g;
 		"
 	else
 		SRC_REPLACE="$SRC_REPLACE
-			s#!!ICON_THEME_DIR!!##g;
+			s@!!ICON_THEME_DIR!!@@g;
 		"
 	fi
 
 	if [ "$man_dir" != "" ]; then
 		SRC_REPLACE="$SRC_REPLACE
-			s#!!MAN_DIR!!#$prefix_dir/$man_dir#g;
+			s@!!MAN_DIR!!@$prefix_dir/$man_dir@g;
 		"
 	else
 		SRC_REPLACE="$SRC_REPLACE
-			s#!!MAN_DIR!!##g;
+			s@!!MAN_DIR!!@@g;
 		"
 	fi
 
 	if [ "$menu_dir" != "" ]; then
 		SRC_REPLACE="$SRC_REPLACE
-			s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g;
+			s@!!MENU_DIR!!@$prefix_dir/$menu_dir@g;
 		"
 	else
 		SRC_REPLACE="$SRC_REPLACE
-			s#!!MENU_DIR!!##g;
+			s@!!MENU_DIR!!@@g;
 		"
 	fi
 }
 
 generate_menu_item() {
 	MENU_REPLACE="
-		s~!!TTD!!~$TTD~g;
-		s~!!MENU_GROUP!!~$menu_group~g;
-		s~!!MENU_NAME!!~$menu_name~g
+		s@!!TTD!!@$TTD@g;
+		s@!!MENU_GROUP!!@$menu_group@g;
+		s@!!MENU_NAME!!@$menu_name@g
 	"
 	log 1 "Generating menu item..."
 	mkdir -p media

configure

@@ -1,5 +1,13 @@
 #!/bin/sh
 
+check_path_characters() {
+	if [ -n "`echo $ROOT_DIR | grep '[^-_A-Za-z0-9\/\\\.:]'`" ]; then
+		echo "WARNING: The path contains a non-alphanumeric character that might cause"
+		echo "         failures in subsequent build stages. Any failures with the build"
+		echo "         will most likely be caused by this."
+	fi
+}
+
 CONFIGURE_EXECUTABLE="$_"
 # On *nix systems those two are equal when ./configure is done
 if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
@@ -14,9 +22,16 @@ if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
 fi
 # Find out where configure is (in what dir)
 ROOT_DIR="`dirname $0`"
-ROOT_DIR="`cd $ROOT_DIR && pwd`"
+# For MSYS/MinGW we want to know the FULL path. This as that path is generated
+# once you call an outside binary. Having the same path for the rest is needed
+# for dependency checking.
+# pwd -W returns said FULL path, but doesn't exist on others so fall back.
+ROOT_DIR="`cd $ROOT_DIR && (pwd -W 2>/dev/null || pwd 2>/dev/null)`"
 
-PWD="`pwd`"
+check_path_characters
+
+# Same here as for the ROOT_DIR above
+PWD="`pwd -W 2>/dev/null || pwd 2>/dev/null`"
 PREFIX="$PWD/bin"
 
 . $ROOT_DIR/config.lib
@@ -37,7 +52,7 @@ if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
 		exit 1
 	fi
 	# Make sure we don't lock config.cache
-	cat config.cache | sed 's~\\ ~\\\\ ~g' > cache.tmp
+	cat config.cache | sed 's@\\ @\\\\ @g' > cache.tmp
 	sh cache.tmp
 	rm -f cache.tmp
 	exit $?
@@ -59,7 +74,7 @@ STRGEN="strgen$EXE"
 ENDIAN_CHECK="endian_check$EXE"
 
 if [ -z "$sort" ]; then
-	PIPE_SORT="sed s~a~a~"
+	PIPE_SORT="sed s@a@a@"
 else
 	PIPE_SORT="$sort"
 fi
@@ -125,7 +140,7 @@ SRCS="`    echo \"$SRCS\" | $awk ' { ORS = " " } { print $0; }'`"
 
 # In makefiles, we always use -u for sort
 if [ -z "$sort" ]; then
-	sort="sed s~a~a~"
+	sort="sed s@a@a@"
 else
 	sort="$sort -u"
 fi
@@ -135,3 +150,5 @@ CONFIGURE_FILES="$ROOT_DIR/configure $ROOT_DIR/config.lib $ROOT_DIR/Makefile.in
 generate_main
 generate_lang
 generate_src
+
+check_path_characters

docs/HOWTO_compile_lang_files.txt

@@ -1,7 +1,7 @@
 STRGEN USAGE
 ------------
 This guide is only interesting for people who want to alter something
-themselves without access to WT2 (translator2.openttd.org). Please note that
+themselves without access to translator.openttd.org. Please note that
 your compiled language file will only be compatible with the OpenTTD version
 you have downloaded english.txt, the master language file, for. While this is
 not always true, namely when changes in the code have not touched language

findversion.sh

@@ -86,17 +86,17 @@ elif [ -d "$ROOT_DIR/.git" ]; then
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
 	REV="g`echo $HASH | cut -c1-8`"
-	BRANCH=`git branch|grep '[*]' | sed 's~\* ~~;s~^master$~~'`
-	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"`
+	BRANCH=`git branch|grep '[*]' | sed 's@\* @@;s@^master$@@'`
+	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
 	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3`
+	HASH=`LC_ALL=C hg parents --template="{node}"`
 	REV="h`echo $HASH | cut -c1-8`"
-	BRANCH=`hg branch | sed 's~^default$~~'`
-	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s~.*(svn r\([0-9]*\)).*~\1~"`
+	BRANCH=`hg branch | sed 's@^default$@@'`
+	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 else
 	# We don't know
 	MODIFIED="1"

known-bugs.txt

@@ -11,10 +11,13 @@ by the number below on http://bugs.openttd.org.
 If the bug report is closed, it has been fixed, which then can be verified
 in the latest SVN version of /trunk.
 
-Bugs for 0.7.1-RC1
+Bugs for 0.7.1
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org
 
+- 3040	Not all alternatives are always shown in the "Join station" list
+- 2955	With path signals depots are less likely to be visited
+- 2891	Ignore signal does not keep the train running when in path signalled block till the next signal
 - 2769	No offer for buying bankrupt AIs
 - 2737	Self-crossing trains ignore "forbid 90 degree turn" setting
 - 2616	Cloning creates vehicles with invalid subcargos

os/debian/changelog

@@ -1,3 +1,33 @@
+openttd (0.7.2~RC2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 21 Jul 2008 20:25:56 +0200
+
+openttd (0.7.2~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 15 Jul 2008 22:25:56 +0200
+
+openttd (0.7.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 09 Jun 2008 01:34:56 +0200
+
+openttd (0.7.1~RC3) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Jun 2008 15:34:56 +0200
+
+openttd (0.7.1~RC2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Mar 2008 14:34:56 +0200
+
 openttd (0.7.1~RC1) unstable; urgency=low
 
   * New upstream release.

os/rpm/openttd.spec

@@ -10,7 +10,7 @@
 #-------------------------------------------------------------------------------
 
 Name:          openttd
-Version:       0.7.0
+Version:       0.7.2-RC2
 Release:       1%{?dist}
 
 Group:         Amusements/Games

os/win32/installer/install.nsi

@@ -1,11 +1,11 @@
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.7.1-RC1"  ; Define application version
-!define APPVERSIONINTERNAL "0.7.1.0" ; Define application version in X.X.X.X
-!define INSTALLERVERSION 59 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPVERSION "0.7.2-RC2"  ; Define application version
+!define APPVERSIONINTERNAL "0.7.2.0" ; Define application version in X.X.X.X
+!define INSTALLERVERSION 64 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !include ${VERSION_INCLUDE}
 
 !define APPURLLINK "http://www.openttd.org"
-!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION_FULL}"
+!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
 
 !define MUI_ICON "..\..\..\media\openttd.ico"
 !define MUI_UNICON "..\..\..\media\openttd.ico"
@@ -112,13 +112,6 @@ Section "!OpenTTD" Section1
 	File ${PATH_ROOT}bin\data\*.grf
 	File ${PATH_ROOT}bin\data\*.obg
 	File ${PATH_ROOT}bin\data\opntitle.dat
-	; Copy scenario files (don't choke if they don't exist)
-	SetOutPath "$INSTDIR\scenario\"
-	File /nonfatal ${PATH_ROOT}bin\scenario\*.scn
-
-	; Copy heightmap files (don't choke if they don't exist)
-	SetOutPath "$INSTDIR\scenario\heightmap\"
-	File /nonfatal ${PATH_ROOT}bin\scenario\heightmap\*.*
 
 	; Copy the scripts
 	SetOutPath "$INSTDIR\scripts\"

projects/determineversion.vbs

@@ -16,10 +16,10 @@ End Sub
 
 Sub UpdateFile(modified, revision, version, cur_date, filename)
 	FSO.CopyFile filename & ".in", filename
-	FindReplaceInFile filename, "@@MODIFIED@@", modified
-	FindReplaceInFile filename, "@@REVISION@@", revision
-	FindReplaceInFile filename, "@@VERSION@@", version
-	FindReplaceInFile filename, "@@DATE@@", cur_date
+	FindReplaceInFile filename, "!!MODIFIED!!", modified
+	FindReplaceInFile filename, "!!REVISION!!", revision
+	FindReplaceInFile filename, "!!VERSION!!", version
+	FindReplaceInFile filename, "!!DATE!!", cur_date
 End Sub
 
 Sub UpdateFiles(version)
@@ -32,7 +32,7 @@ Sub UpdateFiles(version)
 		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
-		version = "0.7.1-RC1"
+		version = "0.7.2-RC2"
 		revision = 0
 		modified = 1
 	End If

projects/langs_vs80.vcproj

@@ -556,6 +556,21 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\serbian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating serbian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\serbian.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\simplified_chinese.txt"
 			>

projects/langs_vs90.vcproj

@@ -557,6 +557,21 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\lang\serbian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating serbian language file"
+					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="..\bin\lang\serbian.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\lang\simplified_chinese.txt"
 			>

projects/openttd_vs80.vcproj

@@ -103,6 +103,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="1"
@@ -201,6 +203,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -312,6 +316,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="17"
@@ -413,6 +419,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -947,6 +955,10 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\economy_base.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\economy_func.h"
 				>
@@ -2659,6 +2671,10 @@
 				RelativePath=".\..\src\ai\api\ai_sign.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_signlist.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.hpp"
 				>
@@ -2863,6 +2879,10 @@
 				RelativePath=".\..\src\ai\api\ai_sign.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_signlist.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.cpp"
 				>

projects/openttd_vs80.vcproj.in

@@ -103,6 +103,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="1"
@@ -201,6 +203,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -312,6 +316,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				OptimizeForWindows98="1"
 				TargetMachine="17"
@@ -413,6 +419,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool

projects/openttd_vs90.vcproj

@@ -104,6 +104,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -200,6 +202,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -310,6 +314,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				TargetMachine="17"
 			/>
@@ -410,6 +416,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -944,6 +952,10 @@
 				RelativePath=".\..\src\driver.h"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\economy_base.h"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\economy_func.h"
 				>
@@ -2656,6 +2668,10 @@
 				RelativePath=".\..\src\ai\api\ai_sign.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_signlist.hpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.hpp"
 				>
@@ -2860,6 +2876,10 @@
 				RelativePath=".\..\src\ai\api\ai_sign.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\..\src\ai\api\ai_signlist.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\..\src\ai\api\ai_station.cpp"
 				>

projects/openttd_vs90.vcproj.in

@@ -104,6 +104,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -200,6 +202,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
@@ -310,6 +314,8 @@
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				OptimizeReferences="2"
 				TargetMachine="17"
 			/>
@@ -410,6 +416,8 @@
 				IgnoreDefaultLibraryNames="LIBCMT.lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				StackReserveSize="1048576"
+				StackCommitSize="1048576"
 				TargetMachine="17"
 			/>
 			<Tool

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2009-04-01
-Release version: 0.7.0
+Last updated:    2009-06-09
+Release version: 0.7.1
 ------------------------------------------------------------------------
 
 
@@ -381,10 +381,8 @@ The following libraries are used by OpenTTD for:
 See http://www.openttd.org/development for up-to-date information.
 
 The use of the online Translator service, located at
-http://translator2.openttd.org/, is highly encouraged. For a username/password
-combo you should contact the development team, either by mail, IRC or the
-forums. The system is straightforward to use, and if you have any problems,
-read the online help located there.
+http://translator.openttd.org/, is highly encouraged. For getting an account
+simply follow the guidelines in the FAQ of the translator website.
 
 If for some reason the website is down for a longer period of time, the
 information below might be of help.

source.list

@@ -167,6 +167,7 @@ direction_func.h
 direction_type.h
 music/dmusic.h
 driver.h
+economy_base.h
 economy_func.h
 economy_type.h
 effectvehicle_base.h
@@ -620,6 +621,7 @@ ai/api/ai_rail.hpp
 ai/api/ai_railtypelist.hpp
 ai/api/ai_road.hpp
 ai/api/ai_sign.hpp
+ai/api/ai_signlist.hpp
 ai/api/ai_station.hpp
 ai/api/ai_stationlist.hpp
 ai/api/ai_subsidy.hpp
@@ -672,6 +674,7 @@ ai/api/ai_rail.cpp
 ai/api/ai_railtypelist.cpp
 ai/api/ai_road.cpp
 ai/api/ai_sign.cpp
+ai/api/ai_signlist.cpp
 ai/api/ai_station.cpp
 ai/api/ai_stationlist.cpp
 ai/api/ai_subsidy.cpp

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

@@ -275,6 +275,7 @@ typedef struct tagSQRegFunction{
 }SQRegFunction;
 
 /*vm*/
+SQUIRREL_API bool sq_can_suspend(HSQUIRRELVM v);
 SQUIRREL_API HSQUIRRELVM sq_open(SQInteger initialstacksize);
 SQUIRREL_API HSQUIRRELVM sq_newthread(HSQUIRRELVM friendvm, SQInteger initialstacksize);
 SQUIRREL_API void sq_seterrorhandler(HSQUIRRELVM v);

src/3rdparty/squirrel/squirrel/sqapi.cpp

@@ -90,6 +90,11 @@ SQInteger sq_getvmstate(HSQUIRRELVM v)
 	}
 }
 
+bool sq_can_suspend(HSQUIRRELVM v)
+{
+	return v->_nnativecalls <= 2;
+}
+
 void sq_seterrorhandler(HSQUIRRELVM v)
 {
 	SQObject o = stack_get(v, -1);

src/3rdparty/squirrel/squirrel/sqstate.cpp

@@ -189,8 +189,12 @@ SQSharedState::~SQSharedState()
 	SQCollectable *t = _gc_chain;
 	SQCollectable *nx = NULL;
 	while(t) {
-		t->UnMark();
 		t->_uiRef++;
+		t = t->_next;
+	}
+	t = _gc_chain;
+	while(t) {
+		t->UnMark();
 		t->Finalize();
 		nx = t->_next;
 		if(--t->_uiRef == 0)

src/3rdparty/squirrel/squirrel/sqvm.cpp

@@ -749,7 +749,16 @@ common_call:
 					case OT_NATIVECLOSURE: {
 						bool suspend;
 						_suspended_target = ct_target;
-						_GUARD(CallNative(_nativeclosure(clo), arg3, ct_stackbase, clo,suspend));
+						try {
+							_GUARD(CallNative(_nativeclosure(clo), arg3, ct_stackbase, clo,suspend));
+						} catch (...) {
+							_suspended = SQTrue;
+							_suspended_target = ct_target;
+							_suspended_root = ci->_root;
+							_suspended_traps = traps;
+							_suspend_varargs = ci->_vargs;
+							throw;
+						}
 						if(suspend){
 							_suspended = SQTrue;
 							_suspended_target = ct_target;
@@ -929,7 +938,7 @@ common_call:
 					traps -= ci->_etraps;
 					if(sarg1 != MAX_FUNC_STACKSIZE) STK(arg1) = temp_reg;
 				}
-				else { Raise_Error(_SC("trying to yield a '%s',only genenerator can be yielded"), GetTypeName(ci->_generator)); SQ_THROW();}
+				else { Raise_Error(_SC("trying to yield a '%s',only genenerator can be yielded"), GetTypeName(ci->_closure)); SQ_THROW();}
 				if(Return(arg0, arg1, temp_reg)){
 					assert(traps == 0);
 					outres = temp_reg;

src/ai/ai_gui.cpp

@@ -561,6 +561,7 @@ struct AIDebugWindow : public Window {
 	enum AIDebugWindowWidgets {
 		AID_WIDGET_CLOSEBOX = 0,
 		AID_WIDGET_CAPTION,
+		AID_WIDGET_STICKY,
 		AID_WIDGET_VIEW,
 		AID_WIDGET_NAME_TEXT,
 		AID_WIDGET_RELOAD_TOGGLE,
@@ -605,7 +606,7 @@ struct AIDebugWindow : public Window {
 	virtual void OnPaint()
 	{
 		/* Check if the currently selected company is still active. */
-		if (ai_debug_company == INVALID_COMPANY || !IsValidCompanyID(ai_debug_company)) {
+		if (ai_debug_company == INVALID_COMPANY || !IsValidCompanyID(ai_debug_company) || !GetCompany(ai_debug_company)->is_ai) {
 			if (ai_debug_company != INVALID_COMPANY) {
 				/* Raise and disable the widget for the previous selection. */
 				this->RaiseWidget(ai_debug_company + AID_WIDGET_COMPANY_BUTTON_START);
@@ -768,6 +769,7 @@ CompanyID AIDebugWindow::ai_debug_company = INVALID_COMPANY;
 static const Widget _ai_debug_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_00C5,                   STR_018B_CLOSE_WINDOW},                 // AID_WIDGET_CLOSEBOX
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   298,     0,    13, STR_AI_DEBUG,               STR_018C_WINDOW_TITLE_DRAG_THIS},       // AID_WIDGET_CAPTION
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   287,   298,     0,    13, 0x0,                        STR_STICKY_BUTTON },                    // AID_WIDGET_STICKY
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,     0,   298,    14,    40, 0x0,                        STR_NULL},                              // AID_WIDGET_VIEW
 
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,     0,   149,    41,    60, 0x0,                        STR_AI_DEBUG_NAME_TIP},                 // AID_WIDGET_NAME_TEXT
@@ -805,7 +807,7 @@ static const Widget _ai_debug_widgets[] = {
 static const WindowDesc _ai_debug_desc(
 	WDP_AUTO, WDP_AUTO, 299, 241, 299, 241,
 	WC_AI_DEBUG, WC_NONE,
-	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_ai_debug_widgets
 );
 

src/ai/ai_instance.cpp

@@ -60,6 +60,7 @@
 #include "api/ai_railtypelist.hpp.sq"
 #include "api/ai_road.hpp.sq"
 #include "api/ai_sign.hpp.sq"
+#include "api/ai_signlist.hpp.sq"
 #include "api/ai_station.hpp.sq"
 #include "api/ai_stationlist.hpp.sq"
 #include "api/ai_subsidy.hpp.sq"
@@ -99,6 +100,7 @@ AIInstance::AIInstance(AIInfo *info) :
 	instance(NULL),
 	is_started(false),
 	is_dead(false),
+	is_save_data_on_stack(false),
 	suspend(0),
 	callback(NULL)
 {
@@ -136,10 +138,6 @@ AIInstance::AIInstance(AIInfo *info) :
 
 	/* Register the API functions and classes */
 	this->RegisterAPI();
-
-	/* The topmost stack item is true if there is data from a savegame
-	 * and false otherwise. */
-	sq_pushbool(this->engine->vm, false);
 }
 
 AIInstance::~AIInstance()
@@ -212,6 +210,7 @@ void AIInstance::RegisterAPI()
 	SQAIRailTypeList_Register(this->engine);
 	SQAIRoad_Register(this->engine);
 	SQAISign_Register(this->engine);
+	SQAISignList_Register(this->engine);
 	SQAIStation_Register(this->engine);
 	SQAIStationList_Register(this->engine);
 	SQAIStationList_Vehicle_Register(this->engine);
@@ -284,6 +283,10 @@ void AIInstance::GameLoop()
 
 	/* If there is a callback to call, call that first */
 	if (this->callback != NULL) {
+		if (this->is_save_data_on_stack) {
+			sq_poptop(this->engine->GetVM());
+			this->is_save_data_on_stack = false;
+		}
 		try {
 			this->callback(this);
 		} catch (AI_VMSuspend e) {
@@ -302,9 +305,17 @@ void AIInstance::GameLoop()
 			AIObject::SetAllowDoCommand(false);
 			/* Run the constructor if it exists. Don't allow any DoCommands in it. */
 			if (this->engine->MethodExists(*this->instance, "constructor")) {
-				if (!this->engine->CallMethod(*this->instance, "constructor")) { this->Died(); return; }
+				if (!this->engine->CallMethod(*this->instance, "constructor", 100000) || this->engine->IsSuspended()) {
+					if (this->engine->IsSuspended()) AILog::Error("This AI took too long to initialize. AI is not started.");
+					this->Died();
+					return;
+				}
+			}
+			if (!this->CallLoad() || this->engine->IsSuspended()) {
+				if (this->engine->IsSuspended()) AILog::Error("This AI took too long in the Load function. AI is not started.");
+				this->Died();
+				return;
 			}
-			if (!this->CallLoad()) { this->Died(); return; }
 			AIObject::SetAllowDoCommand(true);
 			/* Start the AI by calling Start() */
 			if (!this->engine->CallMethod(*this->instance, "Start",  _settings_game.ai.ai_max_opcode_till_suspend) || !this->engine->IsSuspended()) this->Died();
@@ -316,6 +327,10 @@ void AIInstance::GameLoop()
 		this->is_started = true;
 		return;
 	}
+	if (this->is_save_data_on_stack) {
+		sq_poptop(this->engine->GetVM());
+		this->is_save_data_on_stack = false;
+	}
 
 	/* Continue the VM */
 	try {
@@ -534,20 +549,14 @@ void AIInstance::Save()
 	}
 
 	HSQUIRRELVM vm = this->engine->GetVM();
-	if (!this->is_started) {
-		SQBool res;
-		sq_getbool(vm, -1, &res);
-		if (!res) {
-			SaveEmpty();
-			return;
-		}
-		/* Push the loaded savegame data to the top of the stack. */
-		sq_push(vm, -2);
+	if (this->is_save_data_on_stack) {
 		_ai_sl_byte = 1;
 		SlObject(NULL, _ai_byte);
 		/* Save the data that was just loaded. */
 		SaveObject(vm, -1, AISAVE_MAX_DEPTH, false);
-		sq_poptop(vm);
+	} else if (!this->is_started) {
+		SaveEmpty();
+		return;
 	} else if (this->engine->MethodExists(*this->instance, "Save")) {
 		HSQOBJECT savedata;
 		/* We don't want to be interrupted during the save function. */
@@ -564,6 +573,7 @@ void AIInstance::Save()
 		if (!sq_istable(savedata)) {
 			AILog::Error("Save function should return a table.");
 			SaveEmpty();
+			this->engine->CrashOccurred();
 			return;
 		}
 		sq_pushobject(vm, savedata);
@@ -571,11 +581,11 @@ void AIInstance::Save()
 			_ai_sl_byte = 1;
 			SlObject(NULL, _ai_byte);
 			SaveObject(vm, -1, AISAVE_MAX_DEPTH, false);
+			this->is_save_data_on_stack = true;
 		} else {
-			_ai_sl_byte = 0;
-			SlObject(NULL, _ai_byte);
+			SaveEmpty();
+			this->engine->CrashOccurred();
 		}
-		sq_pop(vm, 1);
 	} else {
 		AILog::Warning("Save function is not implemented");
 		_ai_sl_byte = 0;
@@ -662,21 +672,18 @@ void AIInstance::Load(int version)
 	/* Check if there was anything saved at all. */
 	if (_ai_sl_byte == 0) return;
 
-	/* First remove the value "false" since we have data to load. */
-	sq_poptop(vm);
 	sq_pushinteger(vm, version);
 	LoadObjects(vm);
-	sq_pushbool(vm, true);
+	this->is_save_data_on_stack = true;
 }
 
 bool AIInstance::CallLoad()
 {
 	HSQUIRRELVM vm = this->engine->GetVM();
 	/* Is there save data that we should load? */
-	SQBool res;
-	sq_getbool(vm, -1, &res);
-	sq_poptop(vm);
-	if (!res) return true;
+	if (!this->is_save_data_on_stack) return true;
+	/* Whatever happens, after CallLoad the savegame data is removed from the stack. */
+	this->is_save_data_on_stack = false;
 
 	if (!this->engine->MethodExists(*this->instance, "Load")) {
 		AILog::Warning("Loading failed: there was data for the AI to load, but the AI does not have a Load() function.");
@@ -700,7 +707,7 @@ bool AIInstance::CallLoad()
 
 	/* Call the AI load function. sq_call removes the arguments (but not the
 	 * function pointer) from the stack. */
-	if (SQ_FAILED(sq_call(vm, 3, SQFalse, SQFalse))) return false;
+	if (SQ_FAILED(sq_call(vm, 3, SQFalse, SQFalse, 100000))) return false;
 
 	/* Pop 1) The version, 2) the savegame data, 3) the object instance, 4) the function pointer. */
 	sq_pop(vm, 4);

src/ai/ai_instance.hpp

@@ -30,6 +30,7 @@ private:
 
 class AIInstance {
 public:
+	friend class AIObject;
 	AIInstance(class AIInfo *info);
 	~AIInstance();
 
@@ -117,6 +118,7 @@ private:
 
 	bool is_started;
 	bool is_dead;
+	bool is_save_data_on_stack;
 	int suspend;
 	AISuspendCallbackProc *callback;
 

src/ai/ai_scanner.cpp

@@ -412,7 +412,7 @@ AIInfo *AIScanner::FindInfo(const char *nameParam, int versionParam)
 		snprintf(ai_name_compare, sizeof(ai_name_compare), "%s", (*it).second->GetName());
 		strtolower(ai_name_compare);
 
-		if (strcasecmp(ai_name, ai_name_compare) == 0 && (*it).second->CanLoadFromVersion(versionParam)) {
+		if (strcasecmp(ai_name, ai_name_compare) == 0 && (*it).second->CanLoadFromVersion(versionParam) && (version == -1 || (*it).second->GetVersion() > version)) {
 			version = (*it).second->GetVersion();
 			info = (*it).second;
 		}

src/ai/api/Doxyfile

@@ -31,7 +31,6 @@ SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 2

src/ai/api/ai_airport.hpp

@@ -129,7 +129,7 @@ public:
 	 * @exception AIError::ERR_FLAT_LAND_REQUIRED
 	 * @exception AIError::ERR_LOCAL_AUTHORITY_REFUSES
 	 * @exception AIStation::ERR_STATION_TOO_LARGE
-	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_OTHER_STATION
+	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_ANOTHER_STATION
 	 * @return Whether the airport has been/can be build or not.
 	 */
 	static bool BuildAirport(TileIndex tile, AirportType type, StationID station_id);

src/ai/api/ai_bridge.cpp

@@ -32,7 +32,6 @@
 static void _DoCommandReturnBuildBridge2(class AIInstance *instance)
 {
 	if (!AIBridge::_BuildBridgeRoad2()) {
-		AIObject::SetLastCommandRes(false);
 		AIInstance::DoCommandReturn(instance);
 		return;
 	}
@@ -45,7 +44,6 @@ static void _DoCommandReturnBuildBridge2(class AIInstance *instance)
 static void _DoCommandReturnBuildBridge1(class AIInstance *instance)
 {
 	if (!AIBridge::_BuildBridgeRoad1()) {
-		AIObject::SetLastCommandRes(false);
 		AIInstance::DoCommandReturn(instance);
 		return;
 	}
@@ -67,7 +65,7 @@ static void _DoCommandReturnBuildBridge1(class AIInstance *instance)
 	switch (vehicle_type) {
 		case AIVehicle::VT_ROAD:
 			type |= (TRANSPORT_ROAD << 15);
-			type |= (RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType()) << 8);
+			type |= (::RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType()) << 8);
 			break;
 		case AIVehicle::VT_RAIL:
 			type |= (TRANSPORT_RAIL << 15);
@@ -86,10 +84,7 @@ static void _DoCommandReturnBuildBridge1(class AIInstance *instance)
 
 	AIObject::SetCallbackVariable(0, start);
 	AIObject::SetCallbackVariable(1, end);
-	if (!AIObject::DoCommand(end, start, type | bridge_id, CMD_BUILD_BRIDGE, NULL, &_DoCommandReturnBuildBridge1)) return false;
-
-	/* In case of test-mode, test if we can build both road pieces */
-	return _BuildBridgeRoad1();
+	return AIObject::DoCommand(end, start, type | bridge_id, CMD_BUILD_BRIDGE, NULL, &_DoCommandReturnBuildBridge1);
 }
 
 /* static */ bool AIBridge::_BuildBridgeRoad1()
@@ -101,10 +96,7 @@ static void _DoCommandReturnBuildBridge1(class AIInstance *instance)
 	DiagDirection dir_1 = (DiagDirection)((::TileX(start) == ::TileX(end)) ? (::TileY(start) < ::TileY(end) ? DIAGDIR_NW : DIAGDIR_SE) : (::TileX(start) < ::TileX(end) ? DIAGDIR_NE : DIAGDIR_SW));
 	DiagDirection dir_2 = ::ReverseDiagDir(dir_1);
 
-	if (!AIObject::DoCommand(start + ::TileOffsByDiagDir(dir_1), ::DiagDirToRoadBits(dir_2) | (AIObject::GetRoadType() << 4), 0, CMD_BUILD_ROAD, NULL, &_DoCommandReturnBuildBridge2)) return false;
-
-	/* In case of test-mode, test the other road piece too */
-	return _BuildBridgeRoad2();
+	return AIObject::DoCommand(start + ::TileOffsByDiagDir(dir_1), ::DiagDirToRoadBits(dir_2) | (AIObject::GetRoadType() << 4), 0, CMD_BUILD_ROAD, NULL, &_DoCommandReturnBuildBridge2);
 }
 
 /* static */ bool AIBridge::_BuildBridgeRoad2()

src/ai/api/ai_depotlist.cpp

@@ -25,7 +25,7 @@ AIDepotList::AIDepotList(AITile::TransportType transport_type)
 				if (st->owner == ::_current_company) {
 					const AirportFTAClass *afc = st->Airport();
 					for (uint i = 0; i < afc->nof_depots; i++) {
-						this->AddItem(st->xy + ToTileIndexDiff(afc->airport_depots[i]));
+						this->AddItem(st->airport_tile + ToTileIndexDiff(afc->airport_depots[i]));
 					}
 				}
 			}

src/ai/api/ai_event_types.hpp

@@ -35,6 +35,7 @@ public:
 	/**
 	 * @param vehicle The vehicle that crashed.
 	 * @param crash_site Where the vehicle crashed.
+	 * @param crash_reason The reason why the vehicle crashed.
 	 */
 	AIEventVehicleCrashed(VehicleID vehicle, TileIndex crash_site, CrashReason crash_reason) :
 		AIEvent(AI_ET_VEHICLE_CRASHED),

src/ai/api/ai_marine.cpp

@@ -55,13 +55,13 @@
 	DiagDirection to_other_tile = (TileX(t1) == TileX(t2)) ? DIAGDIR_SE : DIAGDIR_SW;
 
 	/* Determine the reachable tracks from the shared edge */
-	TrackBits gtts2 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t2, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
-	if (gtts2 == TRACK_BIT_NONE) return false;
+	TrackBits gtts1 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t1, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
+	if (gtts1 == TRACK_BIT_NONE) return false;
 
 	to_other_tile = ReverseDiagDir(to_other_tile);
-	TrackBits gtts1 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t1, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
+	TrackBits gtts2 = ::TrackStatusToTrackBits(::GetTileTrackStatus(t2, TRANSPORT_WATER, 0, to_other_tile)) & ::DiagdirReachesTracks(to_other_tile);
 
-	return gtts1 != TRACK_BIT_NONE;
+	return gtts2 != TRACK_BIT_NONE;
 }
 
 /* static */ bool AIMarine::BuildWaterDepot(TileIndex tile, TileIndex front)

src/ai/api/ai_object.cpp

@@ -2,6 +2,11 @@
 
 /** @file ai_object.cpp Implementation of AIObject. */
 
+#include "../../stdafx.h"
+#include <squirrel.h>
+#include "../../script/squirrel.hpp"
+#include "../../company_base.h"
+
 #include "ai_log.hpp"
 #include "table/strings.h"
 #include "../ai.hpp"
@@ -157,7 +162,8 @@ void AIObject::SetAllowDoCommand(bool allow)
 
 bool AIObject::GetAllowDoCommand()
 {
-	return GetStorage()->allow_do_command;
+	Squirrel *squirrel = GetCompany(_current_company)->ai_instance->engine;
+	return GetStorage()->allow_do_command && squirrel->CanSuspend();
 }
 
 void *&AIObject::GetEventPointer()

src/ai/api/ai_object.hpp

@@ -143,9 +143,24 @@ protected:
 	 */
 	static void *&GetEventPointer();
 
+	/**
+	 * Set the cost of the last command.
+	 */
 	static void SetLastCost(Money last_cost);
+
+	/**
+	 * Get the cost of the last command.
+	 */
 	static Money GetLastCost();
+
+	/**
+	 * Set a variable that can be used by callback functions to pass information.
+	 */
 	static void SetCallbackVariable(int index, int value);
+
+	/**
+	 * Get the variable that is used by callback functions to pass information.
+	 */
 	static int GetCallbackVariable(int index);
 
 public:

src/ai/api/ai_order.hpp

@@ -288,8 +288,10 @@ public:
 	 * Sets the OrderCondition of the given order for the given vehicle.
 	 * @param vehicle_id The vehicle to set the condition type for.
 	 * @param order_position The order to set the condition type for.
+	 * @param condition The condition to compare on.
 	 * @pre IsValidVehicleOrder(vehicle_id, order_position).
 	 * @pre order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position).
+	 * @pre condition >= OC_LOAD_PERCENTAGE && condition <= OC_UNCONDITIONALLY.
 	 * @return Whether the order has been/can be changed.
 	 */
 	static bool SetOrderCondition(VehicleID vehicle_id, OrderPosition order_position, OrderCondition condition);
@@ -298,8 +300,10 @@ public:
 	 * Sets the CompareFunction of the given order for the given vehicle.
 	 * @param vehicle_id The vehicle to set the compare function for.
 	 * @param order_position The order to set the compare function for.
+	 * @param compare The new compare function of the order.
 	 * @pre IsValidVehicleOrder(vehicle_id, order_position).
 	 * @pre order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position).
+	 * @pre compare >= CF_EQUALS && compare <= CF_IS_FALSE.
 	 * @return Whether the order has been/can be changed.
 	 */
 	static bool SetOrderCompareFunction(VehicleID vehicle_id, OrderPosition order_position, CompareFunction compare);
@@ -308,6 +312,7 @@ public:
 	 * Sets the value to compare against of the given order for the given vehicle.
 	 * @param vehicle_id The vehicle to set the value for.
 	 * @param order_position The order to set the value for.
+	 * @param value The value to compare against.
 	 * @pre IsValidVehicleOrder(vehicle_id, order_position).
 	 * @pre order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position).
 	 * @pre value >= 0 && value < 2048.
@@ -323,7 +328,7 @@ public:
 	 * @pre AIVehicle::IsValidVehicle(vehicle_id).
 	 * @pre AreOrderFlagsValid(destination, order_flags).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @exception AIOrder::ERR_ORDER_TOO_FAR_AWAY_FROM_PREVIOUS_DESTINATION
 	 * @return True if and only if the order was appended.
 	 */
@@ -336,7 +341,7 @@ public:
 	 * @pre AIVehicle::IsValidVehicle(vehicle_id).
 	 * @pre IsValidVehicleOrder(vehicle_id, jump_to).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @return True if and only if the order was appended.
 	 */
 	static bool AppendConditionalOrder(VehicleID vehicle_id, OrderPosition jump_to);
@@ -350,7 +355,7 @@ public:
 	 * @pre IsValidVehicleOrder(vehicle_id, order_position).
 	 * @pre AreOrderFlagsValid(destination, order_flags).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @exception AIOrder::ERR_ORDER_TOO_FAR_AWAY_FROM_PREVIOUS_DESTINATION
 	 * @return True if and only if the order was inserted.
 	 */
@@ -364,7 +369,7 @@ public:
 	 * @pre IsValidVehicleOrder(vehicle_id, order_position).
 	 * @pre IsValidVehicleOrder(vehicle_id, jump_to).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @return True if and only if the order was inserted.
 	 */
 	static bool InsertConditionalOrder(VehicleID vehicle_id, OrderPosition order_position, OrderPosition jump_to);
@@ -437,7 +442,7 @@ public:
 	 * @pre AIVehicle::IsValidVehicle(vehicle_id).
 	 * @pre AIVehicle::IsValidVehicle(main_vehicle_id).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @return True if and only if the copying succeeded.
 	 */
 	static bool CopyOrders(VehicleID vehicle_id, VehicleID main_vehicle_id);

src/ai/api/ai_rail.cpp

@@ -110,7 +110,7 @@
 {
 	if (!IsRailStationTile(tile)) return RAILTRACK_INVALID;
 
-	return (RailTrack)::GetRailStationTrack(tile);
+	return (RailTrack)::GetRailStationTrackBits(tile);
 }
 
 /* static */ bool AIRail::BuildRailDepot(TileIndex tile, TileIndex front)
@@ -203,6 +203,7 @@
 	if (IsRailWaypointTile(tile)) return ::GetRailWaypointBits(tile);
 	if (IsRailStationTile(tile)) return ::TrackToTrackBits(::GetRailStationTrack(tile));
 	if (IsLevelCrossingTile(tile)) return ::GetCrossingRailBits(tile);
+	if (IsRailDepotTile(tile)) return ::TRACK_BIT_NONE;
 	return ::GetTrackBits(tile);
 }
 

src/ai/api/ai_rail.hpp

@@ -293,6 +293,7 @@ public:
 
 	/**
 	 * Get all RailTracks on the given tile.
+	 * @note A depot has no railtracks.
 	 * @param tile The tile to check.
 	 * @pre IsRailTile(tile).
 	 * @return A bitmask of RailTrack with all RailTracks on the tile.

src/ai/api/ai_road.hpp

@@ -349,7 +349,7 @@ public:
 	 * @exception AIError::ERR_FLAT_LAND_REQUIRED
 	 * @exception AIRoad::ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION
 	 * @exception AIRoad::ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD
-	 * @exception AIError:ERR_VEHICLE_IN_THE_WAY
+	 * @exception AIError::ERR_VEHICLE_IN_THE_WAY
 	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_ANOTHER_STATION
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS_IN_TOWN
@@ -372,7 +372,7 @@ public:
 	 * @exception AIError::ERR_FLAT_LAND_REQUIRED
 	 * @exception AIRoad::ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION
 	 * @exception AIRoad::ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD
-	 * @exception AIError:ERR_VEHICLE_IN_THE_WAY
+	 * @exception AIError::ERR_VEHICLE_IN_THE_WAY
 	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_ANOTHER_STATION
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS_IN_TOWN

src/ai/api/ai_sign.hpp

@@ -30,6 +30,7 @@ public:
 
 	/**
 	 * Gets the maximum sign index; there are no valid signs with a higher index.
+	 * @deprecated This function is deprecated and might be removed in future versions of the API. Use AISignList() instead.
 	 * @return The maximum sign index.
 	 * @post Return value is always non-negative.
 	 */

src/ai/api/ai_signlist.cpp

@@ -0,0 +1,15 @@
+/* $Id$ */
+
+/** @file ai_signlist.cpp Implementation of AISignList and friends. */
+
+#include "ai_signlist.hpp"
+#include "ai_sign.hpp"
+#include "../../signs_base.h"
+
+AISignList::AISignList()
+{
+	Sign *s;
+	FOR_ALL_SIGNS(s) {
+		if (AISign::IsValidSign(s->index)) this->AddItem(s->index);
+	}
+}

src/ai/api/ai_signlist.hpp

@@ -0,0 +1,20 @@
+/* $Id$ */
+
+/** @file ai_signlist.hpp List all the signs of your company. */
+
+#ifndef AI_SIGNLIST_HPP
+#define AI_SIGNLIST_HPP
+
+#include "ai_abstractlist.hpp"
+
+/**
+ * Create a list of signs your company has created.
+ * @ingroup AIList
+ */
+class AISignList : public AIAbstractList {
+public:
+	static const char *GetClassName() { return "AISignList"; }
+	AISignList();
+};
+
+#endif /* AI_SIGNLIST_HPP */

src/ai/api/ai_signlist.hpp.sq

@@ -0,0 +1,21 @@
+/* $Id$ */
+/* THIS FILE IS AUTO-GENERATED; PLEASE DO NOT ALTER MANUALLY */
+
+#include "ai_signlist.hpp"
+
+namespace SQConvert {
+	/* Allow AISignList to be used as Squirrel parameter */
+	template <> AISignList *GetParam(ForceType<AISignList *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AISignList *)instance; }
+	template <> AISignList &GetParam(ForceType<AISignList &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AISignList *)instance; }
+	template <> const AISignList *GetParam(ForceType<const AISignList *>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return  (AISignList *)instance; }
+	template <> const AISignList &GetParam(ForceType<const AISignList &>, HSQUIRRELVM vm, int index, SQAutoFreePointers *ptr) { SQUserPointer instance; sq_getinstanceup(vm, index, &instance, 0); return *(AISignList *)instance; }
+	template <> int Return<AISignList *>(HSQUIRRELVM vm, AISignList *res) { if (res == NULL) { sq_pushnull(vm); return 1; } res->AddRef(); Squirrel::CreateClassInstanceVM(vm, "AISignList", res, NULL, DefSQDestructorCallback<AISignList>); return 1; }
+}; // namespace SQConvert
+
+void SQAISignList_Register(Squirrel *engine) {
+	DefSQClass <AISignList> SQAISignList("AISignList");
+	SQAISignList.PreRegister(engine, "AIAbstractList");
+	SQAISignList.AddConstructor<void (AISignList::*)(), 1>(engine, "x");
+
+	SQAISignList.PostRegister(engine);
+}

src/ai/api/ai_station.cpp

@@ -17,7 +17,8 @@
 
 /* static */ bool AIStation::IsValidStation(StationID station_id)
 {
-	return ::IsValidStationID(station_id) && ::GetStation(station_id)->owner == _current_company;
+	const Station *st = ::IsValidStationID(station_id) ? GetStation(station_id) : NULL;
+	return st != NULL && (st->owner == _current_company || st->owner == OWNER_NONE);
 }
 
 /* static */ StationID AIStation::GetStationID(TileIndex tile)

src/ai/api/ai_station.hpp

@@ -49,6 +49,10 @@ public:
 		STATION_ANY        = 0x1F, //!< All station types
 	};
 
+	/**
+	 * Special station IDs for building adjacent/new stations when
+	 * the adjacent/distant join features are enabled.
+	 */
 	enum SpecialStationIDs {
 		STATION_NEW = 0xFFFD,           //!< Build a new station
 		STATION_JOIN_ADJACENT = 0xFFFE, //!< Join an neighbouring station if one exists

src/ai/api/ai_tile.cpp

@@ -175,21 +175,21 @@
 	return ::TrackStatusToTrackdirBits(::GetTileTrackStatus(tile, (::TransportType)transport_type, UINT32_MAX)) != TRACKDIR_BIT_NONE;
 }
 
-/* static */ int32 AITile::GetCargoAcceptance(TileIndex tile, CargoID cargo_type, uint width, uint height, uint radius)
+/* static */ int32 AITile::GetCargoAcceptance(TileIndex tile, CargoID cargo_type, int width, int height, int radius)
 {
-	if (!::IsValidTile(tile)) return false;
+	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0) return -1;
 
 	AcceptedCargo accepts;
-	::GetAcceptanceAroundTiles(accepts, tile, width, height, _settings_game.station.modified_catchment ? radius : (uint)CA_UNMODIFIED);
+	::GetAcceptanceAroundTiles(accepts, tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
 	return accepts[cargo_type];
 }
 
-/* static */ int32 AITile::GetCargoProduction(TileIndex tile, CargoID cargo_type, uint width, uint height, uint radius)
+/* static */ int32 AITile::GetCargoProduction(TileIndex tile, CargoID cargo_type, int width, int height, int radius)
 {
-	if (!::IsValidTile(tile)) return false;
+	if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0) return -1;
 
 	AcceptedCargo produced;
-	::GetProductionAroundTiles(produced, tile, width, height, _settings_game.station.modified_catchment ? radius : (uint)CA_UNMODIFIED);
+	::GetProductionAroundTiles(produced, tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
 	return produced[cargo_type];
 }
 

src/ai/api/ai_tile.hpp

@@ -303,9 +303,12 @@ public:
 	 * @param height The height of the station.
 	 * @param radius The radius of the station.
 	 * @pre AIMap::IsValidTile(tile).
+	 * @pre width > 0.
+	 * @pre height > 0.
+	 * @pre radius >= 0.
 	 * @return Value below 8 means no acceptance; the more the better.
 	 */
-	static int32 GetCargoAcceptance(TileIndex tile, CargoID cargo_type, uint width, uint height, uint radius);
+	static int32 GetCargoAcceptance(TileIndex tile, CargoID cargo_type, int width, int height, int radius);
 
 	/**
 	 * Checks how many tiles in the radius produces this cargo.
@@ -317,10 +320,13 @@ public:
 	 * @param height The height of the station.
 	 * @param radius The radius of the station.
 	 * @pre AIMap::IsValidTile(tile).
+	 * @pre width > 0.
+	 * @pre height > 0.
+	 * @pre radius >= 0.
 	 * @return The tiles that produce this cargo within radius of the tile.
 	 * @note Town(houses) are not included in the value.
 	 */
-	static int32 GetCargoProduction(TileIndex tile, CargoID cargo_type, uint width, uint height, uint radius);
+	static int32 GetCargoProduction(TileIndex tile, CargoID cargo_type, int width, int height, int radius);
 
 	/**
 	 * Get the manhattan distance from the tile to the tile.

src/ai/api/ai_tilelist.cpp

@@ -68,9 +68,9 @@ void AITileList::RemoveTile(TileIndex tile)
 	this->RemoveItem(tile);
 }
 
-AITileList_IndustryAccepting::AITileList_IndustryAccepting(IndustryID industry_id, uint radius)
+AITileList_IndustryAccepting::AITileList_IndustryAccepting(IndustryID industry_id, int radius)
 {
-	if (!AIIndustry::IsValidIndustry(industry_id)) return;
+	if (!AIIndustry::IsValidIndustry(industry_id) || radius <= 0) return;
 
 	const Industry *i = ::GetIndustry(industry_id);
 
@@ -106,9 +106,9 @@ AITileList_IndustryAccepting::AITileList_IndustryAccepting(IndustryID industry_i
 	} END_TILE_LOOP(cur_tile, i->width + radius * 2, i->height + radius * 2, i->xy - ::TileDiffXY(radius, radius))
 }
 
-AITileList_IndustryProducing::AITileList_IndustryProducing(IndustryID industry_id, uint radius)
+AITileList_IndustryProducing::AITileList_IndustryProducing(IndustryID industry_id, int radius)
 {
-	if (!AIIndustry::IsValidIndustry(industry_id)) return;
+	if (!AIIndustry::IsValidIndustry(industry_id) || radius <= 0) return;
 
 	const Industry *i = ::GetIndustry(industry_id);
 

src/ai/api/ai_tilelist.hpp

@@ -71,8 +71,10 @@ public:
 	/**
 	 * @param industry_id The industry to create the AITileList around.
 	 * @param radius The radius of the station you will be using.
+	 * @pre AIIndustry::IsValidIndustry(industry_id).
+	 * @pre radius > 0.
 	 */
-	AITileList_IndustryAccepting(IndustryID industry_id, uint radius);
+	AITileList_IndustryAccepting(IndustryID industry_id, int radius);
 };
 
 /**
@@ -87,8 +89,10 @@ public:
 	/**
 	 * @param industry_id The industry to create the AITileList around.
 	 * @param radius The radius of the station you will be using.
+	 * @pre AIIndustry::IsValidIndustry(industry_id).
+	 * @pre radius > 0.
 	 */
-	AITileList_IndustryProducing(IndustryID industry_id, uint radius);
+	AITileList_IndustryProducing(IndustryID industry_id, int radius);
 };
 
 /**

src/ai/api/ai_tilelist.hpp.sq

@@ -37,7 +37,7 @@ namespace SQConvert {
 void SQAITileList_IndustryAccepting_Register(Squirrel *engine) {
 	DefSQClass <AITileList_IndustryAccepting> SQAITileList_IndustryAccepting("AITileList_IndustryAccepting");
 	SQAITileList_IndustryAccepting.PreRegister(engine, "AITileList");
-	SQAITileList_IndustryAccepting.AddConstructor<void (AITileList_IndustryAccepting::*)(IndustryID industry_id, uint radius), 3>(engine, "xii");
+	SQAITileList_IndustryAccepting.AddConstructor<void (AITileList_IndustryAccepting::*)(IndustryID industry_id, int radius), 3>(engine, "xii");
 
 	SQAITileList_IndustryAccepting.PostRegister(engine);
 }
@@ -54,7 +54,7 @@ namespace SQConvert {
 void SQAITileList_IndustryProducing_Register(Squirrel *engine) {
 	DefSQClass <AITileList_IndustryProducing> SQAITileList_IndustryProducing("AITileList_IndustryProducing");
 	SQAITileList_IndustryProducing.PreRegister(engine, "AITileList");
-	SQAITileList_IndustryProducing.AddConstructor<void (AITileList_IndustryProducing::*)(IndustryID industry_id, uint radius), 3>(engine, "xii");
+	SQAITileList_IndustryProducing.AddConstructor<void (AITileList_IndustryProducing::*)(IndustryID industry_id, int radius), 3>(engine, "xii");
 
 	SQAITileList_IndustryProducing.PostRegister(engine);
 }

src/ai/api/ai_types.hpp

@@ -8,62 +8,62 @@
  * reused for other objects once they are released. So be careful, which IDs you store for which purpose and whether they stay valid all the time.
  *
  * <table>
- * <tr><th>type        </th><th> object                                            </th>
- *                          <th> acquired                                          </th>
- *                          <th> released                                          </th>
- *                          <th> reused                                            </th></tr>
- * <tr><td>#BridgeID   </td><td> bridge type                                       </td>
- *                          <td> introduction \ref newgrf_changes "(1)"            </td>
- *                          <td> never \ref newgrf_changes "(1)"                   </td>
- *                          <td> no \ref newgrf_changes "(1)"                      </td></tr>
- * <tr><td>#CargoID    </td><td> cargo type                                        </td>
- *                          <td> game start \ref newgrf_changes "(1)"              </td>
- *                          <td> never \ref newgrf_changes "(1)"                   </td>
- *                          <td> no \ref newgrf_changes "(1)"                      </td></tr>
- * <tr><td>#EngineID   </td><td> engine type                                       </td>
- *                          <td> introduction, preview \ref dynamic_engines "(2)"  </td>
- *                          <td> engines retires \ref dynamic_engines "(2)"        </td>
- *                          <td> no \ref dynamic_engines "(2)"                     </td></tr>
- * <tr><td>#GroupID    </td><td> vehicle group                                     </td>
- *                          <td> creation                                          </td>
- *                          <td> deletion                                          </td>
- *                          <td> yes                                               </td></tr>
- * <tr><td>#IndustyID  </td><td> industry                                          </td>
- *                          <td> construction                                      </td>
- *                          <td> closure                                           </td>
- *                          <td> yes                                               </td></tr>
- * <tr><td>#IndustyType</td><td> industry type                                     </td>
- *                          <td> game start \ref newgrf_changes "(1)"              </td>
- *                          <td> never \ref newgrf_changes "(1)"                   </td>
- *                          <td> no                                                </td></tr>
- * <tr><td>#SignID     </td><td> sign                                              </td>
- *                          <td> construction                                      </td>
- *                          <td> deletion                                          </td>
- *                          <td> yes                                               </td></tr>
- * <tr><td>#StationID  </td><td> station                                           </td>
- *                          <td> construction                                      </td>
- *                          <td> expiration of 'grey' station sign after deletion  </td>
- *                          <td> yes                                               </td></tr>
- * <tr><td>#SubsidyID  </td><td> subsidy                                           </td>
- *                          <td> offer announcement                                </td>
- *                          <td> (offer) expiration                                </td>
- *                          <td> yes                                               </td></tr>
- * <tr><td>#TileIndex  </td><td> tile on map                                       </td>
- *                          <td> game start                                        </td>
- *                          <td> never                                             </td>
- *                          <td> no                                                </td></tr>
- * <tr><td>#TownID     </td><td> town                                              </td>
- *                          <td> game start                                        </td>
- *                          <td> never                                             </td>
- *                          <td> no                                                </td></tr>
- * <tr><td>#VehicleID  </td><td> vehicle                                           </td>
- *                          <td> construction, autorenew, autoreplace              </td>
- *                          <td> destruction, autorenew, autoreplace               </td>
- *                          <td> yes                                               </td></tr>
- * <tr><td>#WaypointID </td><td> waypoint                                          </td>
- *                          <td> construction                                      </td>
- *                          <td> destruction                                       </td>
- *                          <td> yes                                               </td></tr>
+ * <tr><th>type         </th><th> object                                            </th>
+ *                           <th> acquired                                          </th>
+ *                           <th> released                                          </th>
+ *                           <th> reused                                            </th></tr>
+ * <tr><td>#BridgeID    </td><td> bridge type                                       </td>
+ *                           <td> introduction \ref newgrf_changes "(1)"            </td>
+ *                           <td> never \ref newgrf_changes "(1)"                   </td>
+ *                           <td> no \ref newgrf_changes "(1)"                      </td></tr>
+ * <tr><td>#CargoID     </td><td> cargo type                                        </td>
+ *                           <td> game start \ref newgrf_changes "(1)"              </td>
+ *                           <td> never \ref newgrf_changes "(1)"                   </td>
+ *                           <td> no \ref newgrf_changes "(1)"                      </td></tr>
+ * <tr><td>#EngineID    </td><td> engine type                                       </td>
+ *                           <td> introduction, preview \ref dynamic_engines "(2)"  </td>
+ *                           <td> engines retires \ref dynamic_engines "(2)"        </td>
+ *                           <td> no \ref dynamic_engines "(2)"                     </td></tr>
+ * <tr><td>#GroupID     </td><td> vehicle group                                     </td>
+ *                           <td> creation                                          </td>
+ *                           <td> deletion                                          </td>
+ *                           <td> yes                                               </td></tr>
+ * <tr><td>#IndustryID  </td><td> industry                                          </td>
+ *                           <td> construction                                      </td>
+ *                           <td> closure                                           </td>
+ *                           <td> yes                                               </td></tr>
+ * <tr><td>#IndustryType</td><td> industry type                                     </td>
+ *                           <td> game start \ref newgrf_changes "(1)"              </td>
+ *                           <td> never \ref newgrf_changes "(1)"                   </td>
+ *                           <td> no                                                </td></tr>
+ * <tr><td>#SignID      </td><td> sign                                              </td>
+ *                           <td> construction                                      </td>
+ *                           <td> deletion                                          </td>
+ *                           <td> yes                                               </td></tr>
+ * <tr><td>#StationID   </td><td> station                                           </td>
+ *                           <td> construction                                      </td>
+ *                           <td> expiration of 'grey' station sign after deletion  </td>
+ *                           <td> yes                                               </td></tr>
+ * <tr><td>#SubsidyID   </td><td> subsidy                                           </td>
+ *                           <td> offer announcement                                </td>
+ *                           <td> (offer) expiration                                </td>
+ *                           <td> yes                                               </td></tr>
+ * <tr><td>#TileIndex   </td><td> tile on map                                       </td>
+ *                           <td> game start                                        </td>
+ *                           <td> never                                             </td>
+ *                           <td> no                                                </td></tr>
+ * <tr><td>#TownID      </td><td> town                                              </td>
+ *                           <td> game start                                        </td>
+ *                           <td> never                                             </td>
+ *                           <td> no                                                </td></tr>
+ * <tr><td>#VehicleID   </td><td> vehicle                                           </td>
+ *                           <td> construction, autorenew, autoreplace              </td>
+ *                           <td> destruction, autorenew, autoreplace               </td>
+ *                           <td> yes                                               </td></tr>
+ * <tr><td>#WaypointID  </td><td> waypoint                                          </td>
+ *                           <td> construction                                      </td>
+ *                           <td> destruction                                       </td>
+ *                           <td> yes                                               </td></tr>
  * </table>
  *
  * @remarks

src/ai/api/ai_vehicle.cpp

@@ -425,3 +425,11 @@
 	Vehicle *v = ::GetVehicle(vehicle_id);
 	return v->orders.list != NULL && v->orders.list->GetNumVehicles() > 1;
 }
+
+/* static */ int AIVehicle::GetReliability(VehicleID vehicle_id)
+{
+	if (!IsValidVehicle(vehicle_id)) return -1;
+
+	const Vehicle *v = ::GetVehicle(vehicle_id);
+	return v->reliability * 100 >> 16;
+}

src/ai/api/ai_vehicle.hpp

@@ -43,7 +43,7 @@ public:
 		ERR_VEHICLE_CANNOT_START_STOP,          // [STR_883B_CAN_T_STOP_START_TRAIN, STR_9015_CAN_T_STOP_START_ROAD_VEHICLE, STR_9818_CAN_T_STOP_START_SHIP, STR_A016_CAN_T_STOP_START_AIRCRAFT]
 
 		/** Vehicle can't turn */
-		ERR_VEHICLE_CANNOT_TURN,                // [STR_8869_CAN_T_REVERSE_DIRECTION, STR_9033_CAN_T_MAKE_VEHICLE_TURN]
+		ERR_VEHICLE_CANNOT_TURN,                // [STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN, STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN, STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE, STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS]
 
 		/** Vehicle can't be refit */
 		ERR_VEHICLE_CANNOT_REFIT,               // [STR_RAIL_CAN_T_REFIT_VEHICLE, STR_REFIT_ROAD_VEHICLE_CAN_T, STR_9841_CAN_T_REFIT_SHIP, STR_A042_CAN_T_REFIT_AIRCRAFT]
@@ -58,7 +58,7 @@ public:
 		ERR_VEHICLE_IN_FLIGHT,                  // [STR_A017_AIRCRAFT_IS_IN_FLIGHT]
 
 		/** Vehicle is without power */
-		ERR_VEHCILE_NO_POWER,                   // [STR_TRAIN_START_NO_CATENARY]
+		ERR_VEHICLE_NO_POWER,                   // [STR_TRAIN_START_NO_CATENARY]
 
 	};
 
@@ -525,6 +525,14 @@ public:
 	 */
 	static bool HasSharedOrders(VehicleID vehicle_id);
 
+	/**
+	 * Get the current reliability of a vehicle.
+	 * @param vehicle_id The vehicle to check.
+	 * @pre IsValidVehicle(vehicle_id).
+	 * @return The current reliability (0-100%).
+	 */
+	static int GetReliability(VehicleID vehicle_id);
+
 private:
 	/**
 	 * Internal function used by SellWagon(Chain).

src/ai/api/ai_vehicle.hpp.sq

@@ -37,7 +37,7 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_IS_DESTROYED,         "ERR_VEHICLE_IS_DESTROYED");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT,         "ERR_VEHICLE_NOT_IN_DEPOT");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_IN_FLIGHT,            "ERR_VEHICLE_IN_FLIGHT");
-	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHCILE_NO_POWER,             "ERR_VEHCILE_NO_POWER");
+	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NO_POWER,             "ERR_VEHICLE_NO_POWER");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_RAIL,                          "VT_RAIL");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_ROAD,                          "VT_ROAD");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_WATER,                         "VT_WATER");
@@ -52,38 +52,40 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VS_CRASHED,                       "VS_CRASHED");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VS_INVALID,                       "VS_INVALID");
 
-	AIError::RegisterErrorMap(STR_00E1_TOO_MANY_VEHICLES_IN_GAME,     AIVehicle::ERR_VEHICLE_TOO_MANY);
-	AIError::RegisterErrorMap(STR_AIRCRAFT_NOT_AVAILABLE,             AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
-	AIError::RegisterErrorMap(STR_ROAD_VEHICLE_NOT_AVAILABLE,         AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
-	AIError::RegisterErrorMap(STR_SHIP_NOT_AVAILABLE,                 AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
-	AIError::RegisterErrorMap(STR_RAIL_VEHICLE_NOT_AVAILABLE,         AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
-	AIError::RegisterErrorMap(STR_A008_CAN_T_BUILD_AIRCRAFT,          AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
-	AIError::RegisterErrorMap(STR_980D_CAN_T_BUILD_SHIP,              AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
-	AIError::RegisterErrorMap(STR_9009_CAN_T_BUILD_ROAD_VEHICLE,      AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
-	AIError::RegisterErrorMap(STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE,  AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
-	AIError::RegisterErrorMap(STR_DEPOT_WRONG_DEPOT_TYPE,             AIVehicle::ERR_VEHICLE_WRONG_DEPOT);
-	AIError::RegisterErrorMap(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT,     AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
-	AIError::RegisterErrorMap(STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT,   AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
-	AIError::RegisterErrorMap(STR_9819_CAN_T_SEND_SHIP_TO_DEPOT,      AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
-	AIError::RegisterErrorMap(STR_A012_CAN_T_SEND_AIRCRAFT_TO,        AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
-	AIError::RegisterErrorMap(STR_883B_CAN_T_STOP_START_TRAIN,        AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
-	AIError::RegisterErrorMap(STR_9015_CAN_T_STOP_START_ROAD_VEHICLE, AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
-	AIError::RegisterErrorMap(STR_9818_CAN_T_STOP_START_SHIP,         AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
-	AIError::RegisterErrorMap(STR_A016_CAN_T_STOP_START_AIRCRAFT,     AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
-	AIError::RegisterErrorMap(STR_8869_CAN_T_REVERSE_DIRECTION,       AIVehicle::ERR_VEHICLE_CANNOT_TURN);
-	AIError::RegisterErrorMap(STR_9033_CAN_T_MAKE_VEHICLE_TURN,       AIVehicle::ERR_VEHICLE_CANNOT_TURN);
-	AIError::RegisterErrorMap(STR_RAIL_CAN_T_REFIT_VEHICLE,           AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
-	AIError::RegisterErrorMap(STR_REFIT_ROAD_VEHICLE_CAN_T,           AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
-	AIError::RegisterErrorMap(STR_9841_CAN_T_REFIT_SHIP,              AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
-	AIError::RegisterErrorMap(STR_A042_CAN_T_REFIT_AIRCRAFT,          AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
-	AIError::RegisterErrorMap(STR_CAN_T_REFIT_DESTROYED_VEHICLE,      AIVehicle::ERR_VEHICLE_IS_DESTROYED);
-	AIError::RegisterErrorMap(STR_CAN_T_SELL_DESTROYED_VEHICLE,       AIVehicle::ERR_VEHICLE_IS_DESTROYED);
-	AIError::RegisterErrorMap(STR_A01B_AIRCRAFT_MUST_BE_STOPPED,      AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
-	AIError::RegisterErrorMap(STR_9013_MUST_BE_STOPPED_INSIDE,        AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
-	AIError::RegisterErrorMap(STR_TRAIN_MUST_BE_STOPPED,              AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
-	AIError::RegisterErrorMap(STR_980B_SHIP_MUST_BE_STOPPED_IN,       AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
-	AIError::RegisterErrorMap(STR_A017_AIRCRAFT_IS_IN_FLIGHT,         AIVehicle::ERR_VEHICLE_IN_FLIGHT);
-	AIError::RegisterErrorMap(STR_TRAIN_START_NO_CATENARY,            AIVehicle::ERR_VEHCILE_NO_POWER);
+	AIError::RegisterErrorMap(STR_00E1_TOO_MANY_VEHICLES_IN_GAME,                            AIVehicle::ERR_VEHICLE_TOO_MANY);
+	AIError::RegisterErrorMap(STR_AIRCRAFT_NOT_AVAILABLE,                                    AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_ROAD_VEHICLE_NOT_AVAILABLE,                                AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_SHIP_NOT_AVAILABLE,                                        AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_RAIL_VEHICLE_NOT_AVAILABLE,                                AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_A008_CAN_T_BUILD_AIRCRAFT,                                 AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
+	AIError::RegisterErrorMap(STR_980D_CAN_T_BUILD_SHIP,                                     AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
+	AIError::RegisterErrorMap(STR_9009_CAN_T_BUILD_ROAD_VEHICLE,                             AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
+	AIError::RegisterErrorMap(STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE,                         AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
+	AIError::RegisterErrorMap(STR_DEPOT_WRONG_DEPOT_TYPE,                                    AIVehicle::ERR_VEHICLE_WRONG_DEPOT);
+	AIError::RegisterErrorMap(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT,                            AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
+	AIError::RegisterErrorMap(STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT,                          AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
+	AIError::RegisterErrorMap(STR_9819_CAN_T_SEND_SHIP_TO_DEPOT,                             AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
+	AIError::RegisterErrorMap(STR_A012_CAN_T_SEND_AIRCRAFT_TO,                               AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
+	AIError::RegisterErrorMap(STR_883B_CAN_T_STOP_START_TRAIN,                               AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
+	AIError::RegisterErrorMap(STR_9015_CAN_T_STOP_START_ROAD_VEHICLE,                        AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
+	AIError::RegisterErrorMap(STR_9818_CAN_T_STOP_START_SHIP,                                AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
+	AIError::RegisterErrorMap(STR_A016_CAN_T_STOP_START_AIRCRAFT,                            AIVehicle::ERR_VEHICLE_CANNOT_START_STOP);
+	AIError::RegisterErrorMap(STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN,                        AIVehicle::ERR_VEHICLE_CANNOT_TURN);
+	AIError::RegisterErrorMap(STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN,                       AIVehicle::ERR_VEHICLE_CANNOT_TURN);
+	AIError::RegisterErrorMap(STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE,                AIVehicle::ERR_VEHICLE_CANNOT_TURN);
+	AIError::RegisterErrorMap(STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS, AIVehicle::ERR_VEHICLE_CANNOT_TURN);
+	AIError::RegisterErrorMap(STR_RAIL_CAN_T_REFIT_VEHICLE,                                  AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
+	AIError::RegisterErrorMap(STR_REFIT_ROAD_VEHICLE_CAN_T,                                  AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
+	AIError::RegisterErrorMap(STR_9841_CAN_T_REFIT_SHIP,                                     AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
+	AIError::RegisterErrorMap(STR_A042_CAN_T_REFIT_AIRCRAFT,                                 AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
+	AIError::RegisterErrorMap(STR_CAN_T_REFIT_DESTROYED_VEHICLE,                             AIVehicle::ERR_VEHICLE_IS_DESTROYED);
+	AIError::RegisterErrorMap(STR_CAN_T_SELL_DESTROYED_VEHICLE,                              AIVehicle::ERR_VEHICLE_IS_DESTROYED);
+	AIError::RegisterErrorMap(STR_A01B_AIRCRAFT_MUST_BE_STOPPED,                             AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
+	AIError::RegisterErrorMap(STR_9013_MUST_BE_STOPPED_INSIDE,                               AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
+	AIError::RegisterErrorMap(STR_TRAIN_MUST_BE_STOPPED,                                     AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
+	AIError::RegisterErrorMap(STR_980B_SHIP_MUST_BE_STOPPED_IN,                              AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
+	AIError::RegisterErrorMap(STR_A017_AIRCRAFT_IS_IN_FLIGHT,                                AIVehicle::ERR_VEHICLE_IN_FLIGHT);
+	AIError::RegisterErrorMap(STR_TRAIN_START_NO_CATENARY,                                   AIVehicle::ERR_VEHICLE_NO_POWER);
 
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_MANY,             "ERR_VEHICLE_TOO_MANY");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_AVAILABLE,        "ERR_VEHICLE_NOT_AVAILABLE");
@@ -96,7 +98,7 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_IS_DESTROYED,         "ERR_VEHICLE_IS_DESTROYED");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT,         "ERR_VEHICLE_NOT_IN_DEPOT");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_IN_FLIGHT,            "ERR_VEHICLE_IN_FLIGHT");
-	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHCILE_NO_POWER,             "ERR_VEHCILE_NO_POWER");
+	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NO_POWER,             "ERR_VEHICLE_NO_POWER");
 
 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::IsValidVehicle,                 "IsValidVehicle",                 2, ".i");
 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetNumWagons,                   "GetNumWagons",                   2, ".i");
@@ -140,6 +142,7 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetGroupID,                     "GetGroupID",                     2, ".i");
 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::IsArticulated,                  "IsArticulated",                  2, ".i");
 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::HasSharedOrders,                "HasSharedOrders",                2, ".i");
+	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetReliability,                 "GetReliability",                 2, ".i");
 
 	SQAIVehicle.PostRegister(engine);
 }

src/ai/api/ai_vehiclelist.hpp

@@ -41,7 +41,7 @@ public:
 	static const char *GetClassName() { return "AIVehicleList_SharedOrders"; }
 
 	/**
-	 * @param station_id The vehicle that the rest shared orders with.
+	 * @param vehicle_id The vehicle that the rest shared orders with.
 	 */
 	AIVehicleList_SharedOrders(VehicleID vehicle_id);
 };

src/ai/api/ai_waypoint.hpp

@@ -15,6 +15,9 @@ class AIWaypoint : public AIObject {
 public:
 	static const char *GetClassName() { return "AIWaypoint"; }
 
+	/**
+	 * Special waypoint IDs signalling different kinds of waypoints.
+	 */
 	enum SpecialWaypointIDs {
 		WAYPOINT_INVALID = 0xFFFF, //!< An invalid WaypointID.
 	};

src/ai/api/squirrel_export.sh

@@ -2,6 +2,15 @@
 
 # $Id$
 
+# We really need gawk for this!
+AWK=gawk
+
+${AWK} --version > /dev/null 2> /dev/null
+if [ "$?" != "0" ]; then
+	echo "This script needs gawk to run properly"
+	exit 1
+fi
+
 # This must be called from within the src/ai/api directory.
 
 if [ -z "$1" ]; then
@@ -10,7 +19,7 @@ if [ -z "$1" ]; then
 			# these files should not be changed by this script
 			"ai_controller.hpp" | "ai_object.hpp" | "ai_types.hpp" ) continue;
 		esac
-		awk -f squirrel_export.awk ${f} > ${f}.tmp
+		${AWK} -f squirrel_export.awk ${f} > ${f}.tmp
 		if ! [ -f "${f}.sq" ] || [ -n "`diff -I '$Id' -b ${f}.tmp ${f}.sq 2> /dev/null || echo boo`" ]; then
 			mv ${f}.tmp ${f}.sq
 			echo "Updated: ${f}.sq"
@@ -22,7 +31,7 @@ if [ -z "$1" ]; then
 		fi
 	done
 else
-	awk -f squirrel_export.awk $1 > $1.tmp
+	${AWK} -f squirrel_export.awk $1 > $1.tmp
 	if ! [ -f "${f}.sq" ] || [ -n "`diff -I '$Id' -b $1.sq $1.tmp 2> /dev/null || echo boo`" ]; then
 		mv $1.tmp $1.sq
 		echo "Updated: $1.sq"
@@ -84,7 +93,7 @@ echo "
 { print \$0; }
 " > ${f}.awk
 
-awk -f ${f}.awk ${f} > ${f}.tmp
+${AWK} -f ${f}.awk ${f} > ${f}.tmp
 
 if ! [ -f "${f}" ] || [ -n "`diff -I '$Id' -b ${f} ${f}.tmp 2> /dev/null || echo boo`" ]; then
 	mv ${f}.tmp ${f}

src/aircraft_cmd.cpp

@@ -337,24 +337,6 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		u->subtype = AIR_SHADOW;
 		u->UpdateDeltaXY(INVALID_DIR);
 
-		if (v->cargo_type != CT_PASSENGERS) {
-			uint16 callback = CALLBACK_FAILED;
-
-			if (HasBit(EngInfo(p1)->callbackmask, CBM_VEHICLE_REFIT_CAPACITY)) {
-				callback = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v);
-			}
-
-			if (callback == CALLBACK_FAILED) {
-				/* Callback failed, or not executed; use the default cargo capacity */
-				v->cargo_cap = AircraftDefaultCargoCapacity(v->cargo_type, avi);
-			} else {
-				v->cargo_cap = callback;
-			}
-
-			/* Set the 'second compartent' capacity to none */
-			u->cargo_cap = 0;
-		}
-
 		v->reliability = e->reliability;
 		v->reliability_spd_dec = e->reliability_spd_dec;
 		v->max_age = e->lifelength * DAYS_IN_LEAP_YEAR;
@@ -395,6 +377,28 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		v->vehicle_flags = 0;
 		if (e->flags & ENGINE_EXCLUSIVE_PREVIEW) SetBit(v->vehicle_flags, VF_BUILT_AS_PROTOTYPE);
 
+		v->InvalidateNewGRFCacheOfChain();
+
+		if (v->cargo_type != CT_PASSENGERS) {
+			uint16 callback = CALLBACK_FAILED;
+
+			if (HasBit(EngInfo(p1)->callbackmask, CBM_VEHICLE_REFIT_CAPACITY)) {
+				callback = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v);
+			}
+
+			if (callback == CALLBACK_FAILED) {
+				/* Callback failed, or not executed; use the default cargo capacity */
+				v->cargo_cap = AircraftDefaultCargoCapacity(v->cargo_type, avi);
+			} else {
+				v->cargo_cap = callback;
+			}
+
+			/* Set the 'second compartent' capacity to none */
+			u->cargo_cap = 0;
+		}
+
+		v->InvalidateNewGRFCacheOfChain();
+
 		UpdateAircraftCache(v);
 
 		VehicleMove(v, false);
@@ -580,6 +584,7 @@ CommandCost CmdRefitAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		v->cargo_type = new_cid;
 		v->cargo_subtype = new_subtype;
 		v->colourmap = PAL_NONE; // invalidate vehicle colour map
+		v->InvalidateNewGRFCacheOfChain();
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
 		InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
 		InvalidateWindowClassesData(WC_AIRCRAFT_LIST, 0);

src/autoreplace_cmd.cpp

@@ -111,7 +111,7 @@ static void TransferCargo(Vehicle *old_veh, Vehicle *new_head, bool part_of_chai
 			uint amount = min(src->cargo.Count(), dest->cargo_cap - dest->cargo.Count());
 			if (amount <= 0) continue;
 
-			src->cargo.MoveTo(&dest->cargo, amount);
+			src->cargo.MoveTo(&dest->cargo, amount, CargoList::MTA_UNLOAD, NULL);
 		}
 	}
 

src/cargopacket.cpp

@@ -5,6 +5,7 @@
 #include "stdafx.h"
 #include "station_base.h"
 #include "oldpool_func.h"
+#include "economy_base.h"
 
 /* Initialize the cargopacket-pool */
 DEFINE_OLD_POOL_GENERIC(CargoPacket, CargoPacket)
@@ -27,7 +28,6 @@ CargoPacket::CargoPacket(StationID source, uint16 count)
 	this->count           = count;
 	this->days_in_transit = 0;
 	this->feeder_share    = 0;
-	this->paid_for        = false;
 }
 
 CargoPacket::~CargoPacket()
@@ -37,7 +37,7 @@ CargoPacket::~CargoPacket()
 
 bool CargoPacket::SameSource(const CargoPacket *cp) const
 {
-	return this->source_xy == cp->source_xy && this->days_in_transit == cp->days_in_transit && this->paid_for == cp->paid_for;
+	return this->source_xy == cp->source_xy && this->days_in_transit == cp->days_in_transit;
 }
 
 /*
@@ -81,11 +81,6 @@ uint CargoList::Count() const
 	return count;
 }
 
-bool CargoList::UnpaidCargo() const
-{
-	return unpaid_cargo;
-}
-
 Money CargoList::FeederShare() const
 {
 	return feeder_share;
@@ -146,9 +141,10 @@ void CargoList::Truncate(uint count)
 	InvalidateCache();
 }
 
-bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta, uint data)
+bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta, CargoPayment *payment, uint data)
 {
 	assert(mta == MTA_FINAL_DELIVERY || dest != NULL);
+	assert(mta == MTA_UNLOAD || mta == MTA_CARGO_LOAD || payment != NULL);
 	CargoList tmp;
 
 	while (!packets.empty() && count > 0) {
@@ -161,20 +157,25 @@ bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta,
 					if (cp->source == data) {
 						tmp.Append(cp);
 					} else {
+						payment->PayFinalDelivery(cp, cp->count);
 						count -= cp->count;
 						delete cp;
 					}
-					break;
+					continue; // of the loop
+
 				case MTA_CARGO_LOAD:
 					cp->loaded_at_xy = data;
-					/* When cargo is moved into another vehicle you have *always* paid for it */
-					cp->paid_for     = false;
-					/* FALL THROUGH */
-				case MTA_OTHER:
-					count -= cp->count;
-					dest->packets.push_back(cp);
+					break;
+
+				case MTA_TRANSFER:
+					payment->PayTransfer(cp, cp->count);
+					break;
+
+				case MTA_UNLOAD:
 					break;
 			}
+			count -= cp->count;
+			dest->packets.push_back(cp);
 		} else {
 			/* Can move only part of the packet, so split it into two pieces */
 			if (mta != MTA_FINAL_DELIVERY) {
@@ -189,11 +190,13 @@ bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta,
 
 				cp_new->days_in_transit = cp->days_in_transit;
 				cp_new->feeder_share    = fs;
-				/* When cargo is moved into another vehicle you have *always* paid for it */
-				cp_new->paid_for        = (mta == MTA_CARGO_LOAD) ? false : cp->paid_for;
 
 				cp_new->count = count;
 				dest->packets.push_back(cp_new);
+
+				if (mta == MTA_TRANSFER) payment->PayTransfer(cp_new, count);
+			} else {
+				payment->PayFinalDelivery(cp, count);
 			}
 			cp->count -= count;
 
@@ -205,7 +208,7 @@ bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta,
 
 	if (mta == MTA_FINAL_DELIVERY && !tmp.Empty()) {
 		/* There are some packets that could not be delivered at the station, put them back */
-		tmp.MoveTo(this, UINT_MAX);
+		tmp.MoveTo(this, UINT_MAX, MTA_UNLOAD, NULL);
 		tmp.packets.clear();
 	}
 
@@ -219,7 +222,6 @@ void CargoList::InvalidateCache()
 {
 	empty = packets.empty();
 	count = 0;
-	unpaid_cargo = false;
 	feeder_share = 0;
 	source = INVALID_STATION;
 	days_in_transit = 0;
@@ -229,7 +231,6 @@ void CargoList::InvalidateCache()
 	uint dit = 0;
 	for (List::const_iterator it = packets.begin(); it != packets.end(); it++) {
 		count        += (*it)->count;
-		unpaid_cargo |= !(*it)->paid_for;
 		dit          += (*it)->days_in_transit * (*it)->count;
 		feeder_share += (*it)->feeder_share;
 	}

src/cargopacket.h

@@ -29,7 +29,6 @@ struct CargoPacket : PoolItem<CargoPacket, CargoPacketID, &_CargoPacket_pool> {
 
 	uint16 count;           ///< The amount of cargo in this packet
 	byte days_in_transit;   ///< Amount of days this packet has been in transit
-	bool paid_for;          ///< Have we been paid for this cargo packet?
 
 	/**
 	 * Creates a new cargo packet
@@ -85,7 +84,8 @@ public:
 	enum MoveToAction {
 		MTA_FINAL_DELIVERY, ///< "Deliver" the packet to the final destination, i.e. destroy the packet
 		MTA_CARGO_LOAD,     ///< Load the packet onto a vehicle, i.e. set the last loaded station ID
-		MTA_OTHER           ///< "Just" move the packet to another cargo list
+		MTA_TRANSFER,       ///< The cargo is moved as part of a transfer
+		MTA_UNLOAD,         ///< The cargo is moved as part of a forced unload
 	};
 
 private:
@@ -93,7 +93,6 @@ private:
 
 	bool empty;           ///< Cache for whether this list is empty or not
 	uint count;           ///< Cache for the number of cargo entities
-	bool unpaid_cargo;    ///< Cache for the unpaid cargo
 	Money feeder_share;   ///< Cache for the feeder share
 	StationID source;     ///< Cache for the source of the packet
 	uint days_in_transit; ///< Cache for the number of days in transit
@@ -129,12 +128,6 @@ public:
 	 */
 	uint Count() const;
 
-	/**
-	 * Is there some cargo that has not been paid for?
-	 * @return true if and only if there is such a cargo
-	 */
-	bool UnpaidCargo() const;
-
 	/**
 	 * Returns total sum of the feeder share for all packets
 	 * @return the before mentioned number
@@ -175,18 +168,23 @@ public:
 	 * Depending on the value of mta the side effects of this function differ:
 	 *  - MTA_FINAL_DELIVERY: destroys the packets that do not originate from a specific station
 	 *  - MTA_CARGO_LOAD:     sets the loaded_at_xy value of the moved packets
-	 *  - MTA_OTHER:          just move without side effects
+	 *  - MTA_TRANSFER:       just move without side effects
+	 *  - MTA_UNLOAD:         just move without side effects
 	 * @param dest  the destination to move the cargo to
 	 * @param count the amount of cargo entities to move
 	 * @param mta   how to handle the moving (side effects)
 	 * @param data  Depending on mta the data of this variable differs:
 	 *              - MTA_FINAL_DELIVERY - station ID of packet's origin not to remove
 	 *              - MTA_CARGO_LOAD     - station's tile index of load
-	 *              - MTA_OTHER          - unused
-	 * @param mta == MTA_FINAL_DELIVERY || dest != NULL
+	 *              - MTA_TRANSFER       - unused
+	 *              - MTA_UNLOAD         - unused
+	 * @param payment The payment helper
+	 *
+	 * @pre mta == MTA_FINAL_DELIVERY || dest != NULL
+	 * @pre mta == MTA_UNLOAD || mta == MTA_CARGO_LOAD || payment != NULL
 	 * @return true if there are still packets that might be moved from this cargo list
 	 */
-	bool MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta = MTA_OTHER, uint data = 0);
+	bool MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta, CargoPayment *payment, uint data = 0);
 
 	/** Invalidates the cached data and rebuild it */
 	void InvalidateCache();

src/clear_cmd.cpp

@@ -123,11 +123,6 @@ static void GetAcceptedCargo_Clear(TileIndex tile, AcceptedCargo ac)
 	/* unused */
 }
 
-static void AnimateTile_Clear(TileIndex tile)
-{
-	/* unused */
-}
-
 void TileLoopClearHelper(TileIndex tile)
 {
 	byte self;
@@ -317,12 +312,6 @@ get_out:;
 	} while (--i);
 }
 
-static bool ClickTile_Clear(TileIndex tile)
-{
-	/* not used */
-	return false;
-}
-
 static TrackStatus GetTileTrackStatus_Clear(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side)
 {
 	return 0;
@@ -369,8 +358,8 @@ extern const TileTypeProcs _tile_type_clear_procs = {
 	GetAcceptedCargo_Clear,   ///< get_accepted_cargo_proc
 	GetTileDesc_Clear,        ///< get_tile_desc_proc
 	GetTileTrackStatus_Clear, ///< get_tile_track_status_proc
-	ClickTile_Clear,          ///< click_tile_proc
-	AnimateTile_Clear,        ///< animate_tile_proc
+	NULL,                     ///< click_tile_proc
+	NULL,                     ///< animate_tile_proc
 	TileLoop_Clear,           ///< tile_loop_clear
 	ChangeTileOwner_Clear,    ///< change_tile_owner_clear
 	NULL,                     ///< get_produced_cargo_proc

src/company_cmd.cpp

@@ -445,12 +445,11 @@ Company *DoStartupNewCompany(bool is_ai)
 	c->inaugurated_year = _cur_year;
 	RandomCompanyManagerFaceBits(c->face, (GenderEthnicity)Random(), false); // create a random company manager face
 
-	/* Engine renewal settings */
-	c->engine_renew_list = NULL;
-	c->renew_keep_length = false;
-	c->engine_renew = _settings_client.gui.autorenew;
-	c->engine_renew_months = _settings_client.gui.autorenew_months;
-	c->engine_renew_money = _settings_client.gui.autorenew_money;
+	/* Settings for non-ai companies are copied from the client settings later. */
+	if (is_ai) {
+		c->engine_renew_money = 100000;
+		c->engine_renew_months = 6;
+	}
 
 	GeneratePresidentName(c);
 
@@ -756,6 +755,9 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 
 			/* This is the client (or non-dedicated server) who wants a new company */
 			if (cid == _network_own_client_id) {
+				/* Create p1 and p2 here because SetLocalCompany resets the gui.autorenew* settings. */
+				uint32 p1 = (_settings_client.gui.autorenew << 15 ) | (_settings_client.gui.autorenew_months << 16) | 4;
+				uint32 p2 = _settings_client.gui.autorenew_money;
 				assert(_local_company == COMPANY_SPECTATOR);
 				SetLocalCompany(c->index);
 				if (!StrEmpty(_settings_client.network.default_company_pass)) {
@@ -767,13 +769,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 
 				/* Now that we have a new company, broadcast our autorenew settings to
 				 * all clients so everything is in sync */
-				NetworkSend_Command(0,
-					(_settings_client.gui.autorenew << 15 ) | (_settings_client.gui.autorenew_months << 16) | 4,
-					_settings_client.gui.autorenew_money,
-					CMD_SET_AUTOREPLACE,
-					NULL,
-					NULL
-				);
+				NetworkSend_Command(0, p1, p2, CMD_SET_AUTOREPLACE, NULL, NULL);
 
 				MarkWholeScreenDirty();
 			}

src/company_gui.cpp

@@ -462,7 +462,7 @@ public:
 		this->livery_class = LC_OTHER;
 		this->sel = 1;
 		this->LowerWidget(SCLW_WIDGET_CLASS_GENERAL);
-		this->OnInvalidateData(_loaded_newgrf_features.has_2CC);
+		this->OnInvalidateData();
 		this->FindWindowPlacementAndResize(desc);
 	}
 
@@ -595,14 +595,8 @@ public:
 
 	virtual void OnInvalidateData(int data = 0)
 	{
-		static bool has2cc = true;
-
-		if (has2cc == !!data) return;
-
-		has2cc = !!data;
-
-		int r = this->widget[has2cc ? SCLW_WIDGET_SEC_COL_DROPDOWN : SCLW_WIDGET_PRI_COL_DROPDOWN].right;
-		this->SetWidgetHiddenState(SCLW_WIDGET_SEC_COL_DROPDOWN, !has2cc);
+		int r = this->widget[_loaded_newgrf_features.has_2CC ? SCLW_WIDGET_SEC_COL_DROPDOWN : SCLW_WIDGET_PRI_COL_DROPDOWN].right;
+		this->SetWidgetHiddenState(SCLW_WIDGET_SEC_COL_DROPDOWN, !_loaded_newgrf_features.has_2CC);
 		this->widget[SCLW_WIDGET_CAPTION].right = r;
 		this->widget[SCLW_WIDGET_SPACER_CLASS].right = r;
 		this->widget[SCLW_WIDGET_MATRIX].right = r;

src/console_cmds.cpp

@@ -1518,6 +1518,8 @@ bool NetworkChangeCompanyPassword(byte argc, char *argv[])
 	return true;
 }
 
+/* Content downloading only is available with ZLIB */
+#if defined(WITH_ZLIB)
 #include "network/network_content.h"
 
 /** Resolve a string to a content type. */
@@ -1626,7 +1628,7 @@ DEF_CONSOLE_CMD(ConContent)
 
 	return false;
 }
-
+#endif /* defined(WITH_ZLIB) */
 #endif /* ENABLE_NETWORK */
 
 DEF_CONSOLE_CMD(ConSetting)
@@ -1773,7 +1775,11 @@ void IConsoleStdLibRegister()
 #ifdef ENABLE_NETWORK
 	/* Network hooks; only active in network */
 	IConsoleCmdHookAdd ("resetengines", ICONSOLE_HOOK_ACCESS, ConHookNoNetwork);
+
+/* Content downloading is only available with ZLIB */
+#if defined(WITH_ZLIB)
 	IConsoleCmdRegister("content",         ConContent);
+#endif /* defined(WITH_ZLIB) */
 
 	/*** Networking commands ***/
 	IConsoleCmdRegister("say",             ConSay);

src/core/bitmath_func.hpp

@@ -318,7 +318,7 @@ static FORCEINLINE T ROR(const T x, const uint8 n)
 	 */
 	static FORCEINLINE uint32 BSWAP32(uint32 x)
 	{
-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4)  && __GNUC_MINOR__ >= 3))
+#if !defined(__ICC) && defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4)  && __GNUC_MINOR__ >= 3))
 		/* GCC >= 4.3 provides a builtin, resulting in faster code */
 		return (uint32)__builtin_bswap32((int32)x);
 #else

src/debug.h

@@ -86,7 +86,7 @@ const char *GetDebugString();
 #define TOC(str, count)\
 	__sum__ += ottd_rdtsc() - _xxx_;\
 	if (++__i__ == count) {\
-		DEBUG(misc, 0, "[%s] %" OTTD_PRINTF64 "u [avg: %.1f]\n", str, __sum__, __sum__/(double)__i__);\
+		DEBUG(misc, 0, "[%s] " OTTD_PRINTF64 " [avg: %.1f]\n", str, __sum__, __sum__/(double)__i__);\
 		__i__ = 0;\
 		__sum__ = 0;\
 	}\

src/depot_gui.cpp

@@ -948,7 +948,7 @@ struct DepotWindow : Window {
 					if (this->GetVehicleFromDepotWndPt(pt.x, pt.y, &v, &gdvp) == MODE_DRAG_VEHICLE &&
 						sel != INVALID_VEHICLE) {
 						if (gdvp.wagon != NULL && gdvp.wagon->index == sel && _ctrl_pressed) {
-							DoCommandP(GetVehicle(sel)->tile, GetVehicle(sel)->index, true, CMD_REVERSE_TRAIN_DIRECTION | CMD_MSG(STR_9033_CAN_T_MAKE_VEHICLE_TURN));
+							DoCommandP(GetVehicle(sel)->tile, GetVehicle(sel)->index, true, CMD_REVERSE_TRAIN_DIRECTION | CMD_MSG(STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE));
 						} else if (gdvp.wagon == NULL || gdvp.wagon->index != sel) {
 							TrainDepotMoveVehicle(gdvp.wagon, sel, gdvp.head);
 						} else if (gdvp.head != NULL && IsFrontEngine(gdvp.head)) {

src/disaster_cmd.cpp

@@ -323,10 +323,7 @@ static void DisasterTick_Ufo(Vehicle *v)
 	} else {
 		/* Target a vehicle */
 		u = GetVehicle(v->dest_tile);
-		if (u->type != VEH_ROAD || !IsRoadVehFront(u)) {
-			delete v;
-			return;
-		}
+		assert(u->type == VEH_ROAD && IsRoadVehFront(u));
 
 		dist = Delta(v->x_pos, u->x_pos) + Delta(v->y_pos, u->y_pos);
 
@@ -1029,6 +1026,26 @@ void ReleaseDisastersTargetingIndustry(IndustryID i)
 	}
 }
 
+/** Notify disasters that we are about to delete a vehicle. So make them head elsewhere.
+ * @param vehicle deleted vehicle
+ */
+void ReleaseDisastersTargetingVehicle(VehicleID vehicle)
+{
+	Vehicle *v;
+	FOR_ALL_VEHICLES(v) {
+		/* primary disaster vehicles that have chosen target */
+		if (v->type == VEH_DISASTER && v->subtype == ST_SMALL_UFO) {
+			if (v->current_order.GetDestination() != 0 && v->dest_tile == vehicle) {
+				/* Revert to target-searching */
+				v->current_order.SetDestination(0);
+				v->dest_tile = RandomTile();
+				v->z_pos = 135;
+				v->age = 0;
+			}
+		}
+	}
+}
+
 void DisasterVehicle::UpdateDeltaXY(Direction direction)
 {
 	this->x_offs        = -1;

src/driver.cpp

@@ -61,8 +61,8 @@ const Driver *DriverFactoryBase::SelectDriver(const char *name, Driver::Type typ
 	if (GetDrivers().size() == 0) return NULL;
 
 	if (StrEmpty(name)) {
-		/* Probe for this driver */
-		for (int priority = 10; priority >= 0; priority--) {
+		/* Probe for this driver, but do not fall back to dedicated/null! */
+		for (int priority = 10; priority > 0; priority--) {
 			Drivers::iterator it = GetDrivers().begin();
 			for (; it != GetDrivers().end(); ++it) {
 				DriverFactoryBase *d = (*it).second;

src/dummy_land.cpp

@@ -43,22 +43,11 @@ static void GetTileDesc_Dummy(TileIndex tile, TileDesc *td)
 	td->owner[0] = OWNER_NONE;
 }
 
-static void AnimateTile_Dummy(TileIndex tile)
-{
-	/* not used */
-}
-
 static void TileLoop_Dummy(TileIndex tile)
 {
 	/* not used */
 }
 
-static bool ClickTile_Dummy(TileIndex tile)
-{
-	/* not used */
-	return false;
-}
-
 static void ChangeTileOwner_Dummy(TileIndex tile, Owner old_owner, Owner new_owner)
 {
 	/* not used */
@@ -81,8 +70,8 @@ extern const TileTypeProcs _tile_type_dummy_procs = {
 	GetAcceptedCargo_Dummy,   // get_accepted_cargo_proc
 	GetTileDesc_Dummy,        // get_tile_desc_proc
 	GetTileTrackStatus_Dummy, // get_tile_track_status_proc
-	ClickTile_Dummy,          // click_tile_proc
-	AnimateTile_Dummy,        // animate_tile_proc
+	NULL,                     // click_tile_proc
+	NULL,                     // animate_tile_proc
 	TileLoop_Dummy,           // tile_loop_clear
 	ChangeTileOwner_Dummy,    // change_tile_owner_clear
 	NULL,                     // get_produced_cargo_proc

src/economy.cpp

@@ -32,10 +32,16 @@
 #include "autoreplace_func.h"
 #include "company_gui.h"
 #include "signs_base.h"
+#include "economy_base.h"
+#include "oldpool_func.h"
 
 #include "table/strings.h"
 #include "table/sprites.h"
 
+
+/* Initialize the cargo payment-pool */
+DEFINE_OLD_POOL_GENERIC(CargoPayment, CargoPayment)
+
 /**
  * Multiply two integer values and shift the results to right.
  *
@@ -1220,15 +1226,17 @@ static bool FindIndustryToDeliver(TileIndex ind_tile, void *user_data)
 	return true;
 }
 
+/** The industries we've currently brought cargo to. */
+static SmallIndustryList _cargo_delivery_destinations;
+
 /**
  * Transfer goods from station to industry.
  * All cargo is delivered to the nearest (Manhattan) industry to the station sign, which is inside the acceptance rectangle and actually accepts the cargo.
  * @param st The station that accepted the cargo
  * @param cargo_type Type of cargo delivered
  * @param nun_pieces Amount of cargo delivered
- * @param industry_set The destination industry will be inserted into this set
  */
-static void DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, int num_pieces, SmallIndustryList *industry_set)
+static void DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, int num_pieces)
 {
 	if (st->rect.IsEmpty()) return;
 
@@ -1267,13 +1275,14 @@ static void DeliverGoodsToIndustry(const Station *st, CargoID cargo_type, int nu
 		assert(best != NULL);
 
 		/* Insert the industry into industry_set, if not yet contained */
-		if (industry_set != NULL) industry_set->Include(best);
+		_cargo_delivery_destinations.Include(best);
 
 		best->incoming_cargo_waiting[accepted_cargo_index] = min(num_pieces + best->incoming_cargo_waiting[accepted_cargo_index], 0xFFFF);
 	}
 }
 
-static bool CheckSubsidised(Station *from, Station *to, CargoID cargo_type)
+
+static bool CheckSubsidised(Station *from, Station *to, CargoID cargo_type, CompanyID company)
 {
 	Subsidy *s;
 	TileIndex xy;
@@ -1325,7 +1334,7 @@ static bool CheckSubsidised(Station *from, Station *to, CargoID cargo_type)
 			pair = SetupSubsidyDecodeParam(s, 0);
 			InjectDParam(1);
 
-			SetDParam(0, _current_company);
+			SetDParam(0, company);
 			AddNewsItem(
 				STR_2031_SERVICE_SUBSIDY_AWARDED + _settings_game.difficulty.subsidy_multiplier,
 				NS_SUBSIDIES,
@@ -1347,10 +1356,10 @@ static bool CheckSubsidised(Station *from, Station *to, CargoID cargo_type)
  * @param dest Station the cargo has been unloaded
  * @param source_tile The origin of the cargo for distance calculation
  * @param days_in_transit Travel time
- * @param industry_set The delivered industry will be inserted into this set, if not yet contained
+ * @param company The company delivering the cargo
  * The cargo is just added to the stockpile of the industry. It is due to the caller to trigger the industry's production machinery
  */
-static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID source, StationID dest, TileIndex source_tile, byte days_in_transit, SmallIndustryList *industry_set)
+static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID source, StationID dest, TileIndex source_tile, byte days_in_transit, Company *company)
 {
 	bool subsidised;
 	Station *s_from, *s_to;
@@ -1359,18 +1368,15 @@ static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID source,
 	assert(num_pieces > 0);
 
 	/* Update company statistics */
-	{
-		Company *c = GetCompany(_current_company);
-		c->cur_economy.delivered_cargo += num_pieces;
-		SetBit(c->cargo_types, cargo_type);
-	}
+	company->cur_economy.delivered_cargo += num_pieces;
+	SetBit(company->cargo_types, cargo_type);
 
 	/* Get station pointers. */
-	s_from = GetStation(source);
+	s_from = IsValidStationID(source) ? GetStation(source) : NULL;
 	s_to = GetStation(dest);
 
 	/* Check if a subsidy applies. */
-	subsidised = CheckSubsidised(s_from, s_to, cargo_type);
+	subsidised = s_from != NULL && CheckSubsidised(s_from, s_to, cargo_type, company->index);
 
 	/* Increase town's counter for some special goods types */
 	const CargoSpec *cs = GetCargo(cargo_type);
@@ -1378,7 +1384,7 @@ static Money DeliverGoods(int num_pieces, CargoID cargo_type, StationID source,
 	if (cs->town_effect == TE_WATER) s_to->town->new_act_water += num_pieces;
 
 	/* Give the goods to the industry. */
-	DeliverGoodsToIndustry(s_to, cargo_type, num_pieces, industry_set);
+	DeliverGoodsToIndustry(s_to, cargo_type, num_pieces);
 
 	/* Determine profit */
 	profit = GetTransportedGoodsIncome(num_pieces, DistanceManhattan(source_tile, s_to->xy), days_in_transit, cargo_type);
@@ -1432,109 +1438,107 @@ static void TriggerIndustryProduction(Industry *i)
 }
 
 /**
- * Performs the vehicle payment _and_ marks the vehicle to be unloaded.
+ * Makes us a new cargo payment helper.
+ * @param front The front of the train
+ * @param destinations List to add the destinations of 'our' cargo to
+ */
+CargoPayment::CargoPayment(Vehicle *front) :
+	front(front),
+	current_station(front->last_station_visited)
+{
+}
+
+CargoPayment::~CargoPayment()
+{
+	if (this->CleaningPool()) return;
+
+	this->front->cargo_payment = NULL;
+
+	if (this->visual_profit == 0) {
+		this->front = NULL;
+		return;
+	}
+
+	CompanyID old_company = _current_company;
+	_current_company = this->front->owner;
+
+	SubtractMoneyFromCompany(CommandCost(this->front->GetExpenseType(true), -this->route_profit));
+	this->front->profit_this_year += this->visual_profit << 8;
+
+	if (this->route_profit != 0) {
+		if (IsLocalCompany() && !PlayVehicleSound(this->front, VSE_LOAD_UNLOAD)) {
+			SndPlayVehicleFx(SND_14_CASHTILL, this->front);
+		}
+
+		ShowCostOrIncomeAnimation(this->front->x_pos, this->front->y_pos, this->front->z_pos, -this->visual_profit);
+	} else {
+		ShowFeederIncomeAnimation(this->front->x_pos, this->front->y_pos, this->front->z_pos, this->visual_profit);
+	}
+
+	_current_company = old_company;
+
+	this->front = NULL;
+}
+
+/**
+ * Handle payment for final delivery of the given cargo packet.
+ * @param cp The cargo packet to pay for.
+ * @param count The number of packets to pay for.
+ */
+void CargoPayment::PayFinalDelivery(CargoPacket *cp, uint count)
+{
+	if (this->owner == NULL) {
+		this->owner = GetCompany(this->front->owner);
+	}
+
+	/* Handle end of route payment */
+	Money profit = DeliverGoods(count, this->ct, cp->source, this->current_station, cp->source_xy, cp->days_in_transit, this->owner);
+	this->route_profit += profit;
+
+	/* The vehicle's profit is whatever route profit there is minus feeder shares. */
+	this->visual_profit += profit - cp->feeder_share;
+}
+
+/**
+ * Handle payment for transfer of the given cargo packet.
+ * @param cp The cargo packet to pay for.
+ * @param count The number of packets to pay for.
+ */
+void CargoPayment::PayTransfer(CargoPacket *cp, uint count)
+{
+	Money profit = GetTransportedGoodsIncome(
+		count,
+		/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */
+		DistanceManhattan(cp->loaded_at_xy, GetStation(this->current_station)->xy),
+		cp->days_in_transit,
+		this->ct);
+
+	this->visual_profit += profit; // accumulate transfer profits for whole vehicle
+	cp->feeder_share    += profit; // account for the (virtual) profit already made for the cargo packet
+}
+
+/**
+ * Prepare the vehicle to be unloaded.
  * @param front_v the vehicle to be unloaded
  */
-void VehiclePayment(Vehicle *front_v)
+void PrepareUnload(Vehicle *front_v)
 {
-	int result = 0;
-
-	Money vehicle_profit = 0; // Money paid to the train
-	Money route_profit   = 0; // The grand total amount for the route. A-D of transfer chain A-B-C-D
-	Money virtual_profit = 0; // The virtual profit for entire vehicle chain
-
-	StationID last_visited = front_v->last_station_visited;
-	Station *st = GetStation(last_visited);
-
-	/* The owner of the train wants to be paid */
-	CompanyID old_company = _current_company;
-	_current_company = front_v->owner;
-
 	/* At this moment loading cannot be finished */
 	ClrBit(front_v->vehicle_flags, VF_LOADING_FINISHED);
 
 	/* Start unloading in at the first possible moment */
 	front_v->load_unload_time_rem = 1;
 
-	/* Collect delivered industries */
-	static SmallIndustryList industry_set;
-	industry_set.Clear();
-
-	for (Vehicle *v = front_v; v != NULL; v = v->Next()) {
-		/* No cargo to unload */
-		if (v->cargo_cap == 0 || v->cargo.Empty() || front_v->current_order.GetUnloadType() & OUFB_NO_UNLOAD) continue;
-
-		/* All cargo has already been paid for, no need to pay again */
-		if (!v->cargo.UnpaidCargo()) {
-			SetBit(v->vehicle_flags, VF_CARGO_UNLOADING);
-			continue;
-		}
-
-		GoodsEntry *ge = &st->goods[v->cargo_type];
-		const CargoList::List *cargos = v->cargo.Packets();
-
-		for (CargoList::List::const_iterator it = cargos->begin(); it != cargos->end(); it++) {
-			CargoPacket *cp = *it;
-			if (!cp->paid_for &&
-					cp->source != last_visited &&
-					HasBit(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE) &&
-					(front_v->current_order.GetUnloadType() & OUFB_TRANSFER) == 0) {
-				/* Deliver goods to the station */
-				st->time_since_unload = 0;
-
-				/* handle end of route payment */
-				Money profit = DeliverGoods(cp->count, v->cargo_type, cp->source, last_visited, cp->source_xy, cp->days_in_transit, &industry_set);
-				cp->paid_for = true;
-				route_profit   += profit; // display amount paid for final route delivery, A-D of a chain A-B-C-D
-				vehicle_profit += profit - cp->feeder_share;                    // whole vehicle is not payed for transfers picked up earlier
-
-				result |= 1;
-
-				SetBit(v->vehicle_flags, VF_CARGO_UNLOADING);
-			} else if (front_v->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) {
-				if (!cp->paid_for && (front_v->current_order.GetUnloadType() & OUFB_TRANSFER) != 0) {
-					Money profit = GetTransportedGoodsIncome(
-						cp->count,
-						/* pay transfer vehicle for only the part of transfer it has done: ie. cargo_loaded_at_xy to here */
-						DistanceManhattan(cp->loaded_at_xy, GetStation(last_visited)->xy),
-						cp->days_in_transit,
-						v->cargo_type);
-
-					front_v->profit_this_year += profit << 8;
-					virtual_profit   += profit; // accumulate transfer profits for whole vehicle
-					cp->feeder_share += profit; // account for the (virtual) profit already made for the cargo packet
-					cp->paid_for      = true;   // record that the cargo has been paid for to eliminate double counting
-				}
-				result |= 2;
-
+	if ((front_v->current_order.GetUnloadType() & OUFB_NO_UNLOAD) == 0) {
+		for (Vehicle *v = front_v; v != NULL; v = v->Next()) {
+			if (v->cargo_cap > 0 && !v->cargo.Empty()) {
 				SetBit(v->vehicle_flags, VF_CARGO_UNLOADING);
 			}
 		}
-		v->cargo.InvalidateCache();
 	}
 
-	/* Call the production machinery of industries only once for every vehicle chain */
-	const Industry * const *isend = industry_set.End();
-	for (Industry **iid = industry_set.Begin(); iid != isend; iid++) {
-		TriggerIndustryProduction(*iid);
-	}
-
-	if (virtual_profit > 0) {
-		ShowFeederIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, virtual_profit);
-	}
-
-	if (route_profit != 0) {
-		front_v->profit_this_year += vehicle_profit << 8;
-		SubtractMoneyFromCompany(CommandCost(front_v->GetExpenseType(true), -route_profit));
-
-		if (IsLocalCompany() && !PlayVehicleSound(front_v, VSE_LOAD_UNLOAD)) {
-			SndPlayVehicleFx(SND_14_CASHTILL, front_v);
-		}
-
-		ShowCostOrIncomeAnimation(front_v->x_pos, front_v->y_pos, front_v->z_pos, -vehicle_profit);
-	}
-
-	_current_company = old_company;
+	assert(front_v->cargo_payment == NULL);
+	front_v->cargo_payment = new CargoPayment(front_v);
 }
 
 /**
@@ -1548,6 +1552,7 @@ void VehiclePayment(Vehicle *front_v)
 static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 {
 	assert(v->current_order.IsType(OT_LOADING));
+	assert(v->load_unload_time_rem != 0);
 
 	/* We have not waited enough time till the next round of loading/unloading */
 	if (--v->load_unload_time_rem != 0) {
@@ -1583,6 +1588,8 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 
 	v->cur_speed = 0;
 
+	CargoPayment *payment = v->cargo_payment;
+
 	for (; v != NULL; v = v->Next()) {
 		if (v->cargo_cap == 0) continue;
 
@@ -1604,9 +1611,11 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 			bool remaining = false; // Are there cargo entities in this vehicle that can still be unloaded here?
 			bool accepted  = false; // Is the cargo accepted by the station?
 
+			payment->SetCargo(v->cargo_type);
+
 			if (HasBit(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE) && !(u->current_order.GetUnloadType() & OUFB_TRANSFER)) {
 				/* The cargo has reached it's final destination, the packets may now be destroyed */
-				remaining = v->cargo.MoveTo(NULL, amount_unloaded, CargoList::MTA_FINAL_DELIVERY, last_visited);
+				remaining = v->cargo.MoveTo(NULL, amount_unloaded, CargoList::MTA_FINAL_DELIVERY, payment, last_visited);
 
 				result |= 1;
 				accepted = true;
@@ -1618,14 +1627,20 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 			 * station is still accepting the cargo in the vehicle. It doesn't
 			 * accept cargo that was loaded at the same station. */
 			if (u->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER) && (!accepted || v->cargo.Count() == cargo_count)) {
-				remaining = v->cargo.MoveTo(&ge->cargo, amount_unloaded);
+				remaining = v->cargo.MoveTo(&ge->cargo, amount_unloaded, u->current_order.GetUnloadType() & OUFB_TRANSFER ? CargoList::MTA_TRANSFER : CargoList::MTA_UNLOAD, payment);
 				SetBit(ge->acceptance_pickup, GoodsEntry::PICKUP);
 
 				result |= 2;
 			} else if (!accepted) {
 				/* The order changed while unloading (unset unload/transfer) or the
-				 * station does not accept goods anymore. */
+				 * station does not accept our goods. */
 				ClrBit(v->vehicle_flags, VF_CARGO_UNLOADING);
+
+				/* Say we loaded something, otherwise we'll think we didn't unload
+				 * something and we didn't load something, so we must be finished
+				 * at this station. Setting the unloaded means that we will get a
+				 * retry for loading in the next cycle. */
+				anything_unloaded = true;
 				continue;
 			}
 
@@ -1695,7 +1710,7 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 			completely_emptied = false;
 			anything_loaded = true;
 
-			ge->cargo.MoveTo(&v->cargo, cap, CargoList::MTA_CARGO_LOAD, st->xy);
+			ge->cargo.MoveTo(&v->cargo, cap, CargoList::MTA_CARGO_LOAD, NULL, st->xy);
 
 			st->time_since_load = 0;
 			st->last_vehicle_type = v->type;
@@ -1731,6 +1746,8 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 
 	v = u;
 
+	if (!anything_unloaded) delete payment;
+
 	if (anything_loaded || anything_unloaded) {
 		if (_settings_game.order.gradual_loading) {
 			/* The time it takes to load one 'slice' of cargo or passengers depends
@@ -1807,6 +1824,9 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
  */
 void LoadUnloadStation(Station *st)
 {
+	/* No vehicle is here... */
+	if (st->loading_vehicles.empty()) return;
+
 	int cargo_left[NUM_CARGO];
 
 	for (uint i = 0; i < NUM_CARGO; i++) cargo_left[i] = st->goods[i].cargo.Count();
@@ -1816,6 +1836,13 @@ void LoadUnloadStation(Station *st)
 		Vehicle *v = *iter;
 		if (!(v->vehstatus & (VS_STOPPED | VS_CRASHED))) LoadUnloadVehicle(v, cargo_left);
 	}
+
+	/* Call the production machinery of industries */
+	const Industry * const *isend = _cargo_delivery_destinations.End();
+	for (Industry **iid = _cargo_delivery_destinations.Begin(); iid != isend; iid++) {
+		TriggerIndustryProduction(*iid);
+	}
+	_cargo_delivery_destinations.Clear();
 }
 
 void CompaniesMonthlyLoop()

src/economy_base.h

@@ -0,0 +1,51 @@
+/* $Id$ */
+
+/** @file economy_base.h Base classes related to the economy. */
+
+#ifndef ECONOMY_BASE_H
+#define ECONOMY_BASE_H
+
+#include "cargopacket.h"
+
+DECLARE_OLD_POOL(CargoPayment, CargoPayment, 9, 125)
+
+/**
+ * Helper class to perform the cargo payment.
+ */
+struct CargoPayment : PoolItem<CargoPayment, CargoPaymentID, &_CargoPayment_pool> {
+	Vehicle *front;      ///< The front vehicle to do the payment of
+	Money route_profit;  ///< The amount of money to add/remove from the bank account
+	Money visual_profit; ///< The visual profit to show
+
+	/* Unsaved variables */
+	Company *owner;            ///< The owner of the vehicle
+	StationID current_station; ///< The current station
+	CargoID ct;                ///< The currently handled cargo type
+
+	/** Constructor for pool saveload */
+	CargoPayment() {}
+	CargoPayment(Vehicle *front);
+	~CargoPayment();
+
+	void PayTransfer(CargoPacket *cp, uint count);
+	void PayFinalDelivery(CargoPacket *cp, uint count);
+
+	/**
+	 * Sets the currently handled cargo type.
+	 * @param ct the cargo type to handle from now on.
+	 */
+	void SetCargo(CargoID ct) { this->ct = ct; }
+
+	inline bool IsValid() const { return this->front != NULL; }
+};
+
+#define FOR_ALL_CARGO_PAYMENTS_FROM(v, start) for (v = GetCargoPayment(start); v != NULL; v = (v->index + 1U < GetCargoPaymentPoolSize()) ? GetCargoPayment(v->index + 1) : NULL) if (v->IsValid())
+#define FOR_ALL_CARGO_PAYMENTS(var) FOR_ALL_CARGO_PAYMENTS_FROM(var, 0)
+
+/**
+ * Whether this savegame is a savegame with cargo payment or not.
+ * This is important to know when loading a savegame.
+ */
+extern bool _cargo_payment_savegame;
+
+#endif /* ECONOMY_BASE_H */

src/economy_func.h

@@ -39,7 +39,7 @@ void StartupIndustryDailyChanges(bool init_counter);
 Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type);
 uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount);
 
-void VehiclePayment(Vehicle *front_v);
+void PrepareUnload(Vehicle *front_v);
 void LoadUnloadStation(Station *st);
 
 Money GetPriceByIndex(uint8 index);

src/economy_type.h

@@ -136,4 +136,7 @@ enum {
 	LOAN_INTERVAL_OLD_AI = 50000,
 };
 
+struct CargoPayment;
+typedef uint32 CargoPaymentID;
+
 #endif /* ECONOMY_TYPE_H */

src/fileio.cpp

@@ -337,7 +337,7 @@ FILE *FioFOpenFileSp(const char *filename, const char *mode, Searchpath sp, Subd
 FILE *FioFOpenFileTar(TarFileListEntry *entry, size_t *filesize)
 {
 	FILE *f = fopen(entry->tar_filename, "rb");
-	assert(f != NULL);
+	if (f == NULL) return f;
 
 	fseek(f, entry->position, SEEK_SET);
 	if (filesize != NULL) *filesize = entry->size;

src/fontcache.cpp

@@ -715,7 +715,7 @@ const Sprite *GetGlyph(FontSize size, WChar key)
 	FT_Render_Glyph(face->glyph, aa ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO);
 
 	/* Despite requesting a normal glyph, FreeType may have returned a bitmap */
-	aa = (slot->bitmap.palette_mode == FT_PIXEL_MODE_GRAY);
+	aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
 
 	/* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */
 	width  = max(1, slot->bitmap.width + (size == FS_NORMAL));

src/gfxinit.cpp

@@ -445,7 +445,7 @@ public:
 bool OBGFileScanner::AddFile(const char *filename, size_t basepath_length)
 {
 	bool ret = false;
-	DEBUG(grf, 1, "Found %s as base graphics set", filename);
+	DEBUG(grf, 1, "Checking %s for base graphics set", filename);
 
 	GraphicsSet *graphics = new GraphicsSet();;
 	IniFile *ini = new IniFile();
@@ -460,12 +460,32 @@ bool OBGFileScanner::AddFile(const char *filename, size_t basepath_length)
 	}
 
 	if (FillGraphicsSetDetails(graphics, ini, path)) {
-		bool duplicate = false;
-		for (const GraphicsSet *c = _available_graphics_sets; !duplicate && c != NULL; c = c->next) {
-			duplicate = (strcmp(c->name, graphics->name) == 0 || c->shortname == graphics->shortname) && c->version == graphics->version;
+		GraphicsSet *duplicate = NULL;
+		for (GraphicsSet *c = _available_graphics_sets; c != NULL; c = c->next) {
+			if (strcmp(c->name, graphics->name) == 0 || c->shortname == graphics->shortname) {
+				duplicate = c;
+				break;
+			}
 		}
-		if (duplicate) {
-			delete graphics;
+		if (duplicate != NULL) {
+			/* The more complete graphics set takes precedence over the version number. */
+			if ((duplicate->found_grfs == graphics->found_grfs && duplicate->version >= graphics->version) ||
+					duplicate->found_grfs > graphics->found_grfs) {
+				DEBUG(grf, 1, "Not adding %s (%i) as base graphics set (duplicate)", graphics->name, graphics->version);
+				delete graphics;
+			} else {
+				GraphicsSet **prev = &_available_graphics_sets;
+				while (*prev != duplicate) prev = &(*prev)->next;
+
+				*prev = graphics;
+				graphics->next = duplicate->next;
+				/* don't allow recursive delete of all remaining items */
+				duplicate->next = NULL;
+
+				DEBUG(grf, 1, "Removing %s (%i) as base graphics set (duplicate)", duplicate->name, duplicate->version);
+				delete duplicate;
+				ret = true;
+			}
 		} else {
 			GraphicsSet **last = &_available_graphics_sets;
 			while (*last != NULL) last = &(*last)->next;
@@ -473,6 +493,9 @@ bool OBGFileScanner::AddFile(const char *filename, size_t basepath_length)
 			*last = graphics;
 			ret = true;
 		}
+		if (ret) {
+			DEBUG(grf, 1, "Adding %s (%i) as base graphics set", graphics->name, graphics->version);
+		}
 	} else {
 		delete graphics;
 	}

src/industry_cmd.cpp

@@ -142,6 +142,10 @@ Industry::~Industry()
 			if (GetIndustryIndex(tile_cur) == this->index) {
 				/* MakeWaterKeepingClass() can also handle 'land' */
 				MakeWaterKeepingClass(tile_cur, OWNER_NONE);
+
+				/* MakeWaterKeepingClass() doesn't remove animation if the tiles
+				 * become watery, but be on the safe side an always remote it. */
+				DeleteAnimatedTile(tile_cur);
 			}
 		} else if (IsTileType(tile_cur, MP_STATION) && IsOilRig(tile_cur)) {
 			DeleteOilRig(tile_cur);

src/landscape.cpp

@@ -22,6 +22,7 @@
 #include "effectvehicle_func.h"
 #include "landscape_type.h"
 #include "settings_type.h"
+#include "animated_tile_func.h"
 
 #include "table/sprites.h"
 
@@ -471,6 +472,9 @@ void DrawFoundation(TileInfo *ti, Foundation f)
 
 void DoClearSquare(TileIndex tile)
 {
+	/* If the tile can have animation and we clear it, delete it from the animated tile list. */
+	if (_tile_type_procs[GetTileType(tile)]->animate_tile_proc != NULL) DeleteAnimatedTile(tile);
+
 	MakeClear(tile, CLEAR_GRASS, _generating_world ? 3 : 0);
 	MarkTileDirtyByTile(tile);
 }
@@ -506,16 +510,6 @@ void GetAcceptedCargo(TileIndex tile, AcceptedCargo ac)
 	_tile_type_procs[GetTileType(tile)]->get_accepted_cargo_proc(tile, ac);
 }
 
-void AnimateTile(TileIndex tile)
-{
-	_tile_type_procs[GetTileType(tile)]->animate_tile_proc(tile);
-}
-
-bool ClickTile(TileIndex tile)
-{
-	return _tile_type_procs[GetTileType(tile)]->click_tile_proc(tile);
-}
-
 void GetTileDesc(TileIndex tile, TileDesc *td)
 {
 	_tile_type_procs[GetTileType(tile)]->get_tile_desc_proc(tile, td);

src/lang/afrikaans.txt

@@ -151,7 +151,7 @@ STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
 STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}KD
 STR_ABBREV_NONE                                                 :{TINYFONT}NS
-STR_ABBREV_ALL                                                  :{TINYFONT}ALLE
+STR_ABBREV_ALL                                                  :{TINYFONT}ALMAL
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kaart - {STRING}
@@ -170,7 +170,7 @@ STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Verlaat
 STR_00C8_YES                                                    :{BLACK}Ja
 STR_00C9_NO                                                     :{BLACK}Nee
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Is jy seker u wil OpenTTD verlaat en terug keer na {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Is u seker u wil OpenTTD verlaat en terug keer na {STRING}?
 STR_00CB_1                                                      :{BLACK}1
 STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
@@ -648,6 +648,10 @@ STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Kies dorp groote
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Dorp groote:
 
+STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Straat uitleg van dorp:
+STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Kies straat uitleg ingebruik vir dorp
+STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Oorspronklik
+STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Beter strate
 
 STR_02B6                                                        :{STRING}  -  {STRING}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Toon laaste boodskap of nuus verslag
@@ -655,7 +659,6 @@ STR_OFF                                                         :Af
 STR_SUMMARY                                                     :Opsomming
 STR_FULL                                                        :Vol
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Dorp gids
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -692,6 +695,7 @@ STR_02DE_MAP_OF_WORLD                                           :Kaart van wêre
 STR_EXTRA_VIEW_PORT                                             :Ekstra gesigswerf
 STR_SIGN_LIST                                                   :Teken lys
 STR_02DF_TOWN_DIRECTORY                                         :Dorp gids
+STR_02BB_TOWN_DIRECTORY                                         :Dorp gids
 STR_TOWN_POPULATION                                             :{BLACK}Wêreld populasie: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Gesigswerf {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopie na gesigswerf
@@ -718,6 +722,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Outostoo
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Kies interval tussen outomatiese store
 STR_02F7_OFF                                                    :Af
+STR_AUTOSAVE_1_MONTH                                            :Elke maand
 STR_02F8_EVERY_3_MONTHS                                         :Elke 3 maande
 STR_02F9_EVERY_6_MONTHS                                         :Elke 6 maande
 STR_02FA_EVERY_12_MONTHS                                        :Elke 12 maande
@@ -833,9 +838,10 @@ STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Skermsky
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Kies die skermskyf formaat om te gebruik
 
+STR_OPTIONS_BASE_GRF                                            :{BLACK}Basis grafiek stel
+STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Kies die Basiese grafiek stel om te gebruik
 
-STR_AUTOSAVE_1_MONTH                                            :Elke maand
-STR_AUTOSAVE_FAILED                                             :{WHITE}Outospaar misluk
+STR_AUTOSAVE_FAILED                                             :{WHITE}Outostoor het misluk
 
 STR_MONTH_JAN                                                   :Januarie
 STR_MONTH_FEB                                                   :Februarie
@@ -1402,7 +1408,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klient L
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nuwe Maatskapy
 
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Geen netwerk ontwerp gevind of voldoen sonder ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kan nie enige netwerk spele vind nie
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kan nie enige netwerk speletjies vind nie
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Die verskaffer het nie die versoek geantwoord nie
 STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kan nie konnekteer te danke aan newgrf mispas nie
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Netwerk-Spel sinchroniseering gedop
@@ -1442,6 +1448,8 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS                :Speletjie ongep
 STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Speletjie gepoos (konnekteer kliënt)
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} het by die spel aangesluit
+STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} het by besigheid  #{2:NUM} aangesluit
+STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} het aangesluit by die spektators
 STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} het die spel verlaat ({2:STRING})
 STR_NETWORK_NAME_CHANGE                                         :*** {STRING} het sy/haar naam verander na {STRING}
 STR_NETWORK_GIVE_MONEY                                          :*** {STRING} het jou besigheid {2:CURRENCY} gegee
@@ -1565,6 +1573,7 @@ STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Trainspoor met
 STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Trainspoor met kombineer- en een-rigting aanwysers
 STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Trainspoor met rigting- en een-rigting aanwysers
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Moet eers spoorweg stasie verwyder
+STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Sluit by stasie aan
 
 
 
@@ -1754,6 +1763,7 @@ STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Te naby
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Grens aan meer as een bestaande stasie/laai area
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Te veel stasies/laai areas in die stad
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Te veel stasies/laai areas
+STR_TOO_MANY_STATION_SPECS                                      :{WHITE}Te veel treinstasie deele
 STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Te veel bushalte
 STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Te veel vragmotor stasies
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Te naby aan 'n ander stasie/laai area
@@ -1862,6 +1872,7 @@ STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Gebreek spaarsp
 STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Spaarspeletjie is gemaak met nuwer uitgawe
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Lêer nie leesbare
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Lêer nie skryfbaar
+STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Data integriteit het misluk
 STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}Lys van skywe, gidse en spaar-speletjie lêers
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Huidige naam vir spaar-speletjie
 STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Vee uit die huidige verkieste spaar-speletjie
@@ -2757,7 +2768,7 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Benaam t
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Trein kan nie benaam word nie...
 STR_8867_NAME_TRAIN                                             :{BLACK}Benaam trein
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Trein Botsing!{}{COMMA} sterf in vuurbol na botsing
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan nie rigting van trein omkeer nie...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan nie rigting van trein omkeer nie...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Hernoem trein voertuig tipe
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Trein voertuig tipe kan nie hernoem word nie...
 STR_CLEAR_TIME                                                  :{BLACK}Reinig Tyd
@@ -2844,8 +2855,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste vrag trein arriveer by {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Pad Voertuig Botsing!{}Bestuurder sterf in vuurbol na botsing met trein
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Pad voertuig Botsing!{}{COMMA} sterf in vuurbol na botsing met trein
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan nie voertuig forseer om te omdraai nie...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Kan nie voertuie van veel deele draai nie
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan nie voertuie van veel deele draai nie
 STR_9034_RENAME                                                 :{BLACK}Hernoem
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem pad voertuig tipe
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernoem pad voertuig tipe
@@ -2951,6 +2961,7 @@ STR_HEADING_FOR_HANGAR                                          :{ORANGE}Op pad
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
 STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Diens by {STATION} Hangar
 STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Diens by {STATION} Hangar, {VELOCITY}
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}{VEHICLE} wag in die vliegtuig hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Vliegtuig in die pad
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan nie vliegtuig stop/aanskakel nie...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Vliegtuig is opvlug
@@ -3329,6 +3340,9 @@ STR_DATE_TINY                                                   :{STRING}-{STRIN
 STR_DATE_SHORT                                                  :{STRING} {NUM}
 STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
 
+STR_JUST_DATE_TINY                                              :{DATE_TINY}
+STR_JUST_DATE_LONG                                              :{DATE_LONG}
+STR_JUST_DATE_ISO                                               :{DATE_ISO}
 ########
 
 STR_FEEDER_CARGO_VALUE                                          :{BLACK}oordra Krediete: {LTBLUE}{CURRENCY}
@@ -3461,6 +3475,9 @@ STR_SIGNAL_SELECTION                                            :{WHITE}Sein sel
 STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan nie seine hier verander nie...
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Een-rigting pad sein (elektries){}'n Pad sein laat meer as een trein in 'n sein block op die selfde tyd, as die trein 'n pad kan vind na 'n veiligge stop punt. Een-rigting seine kan nie  van die agterkant verby gevat word nie.
 STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Sein verander{}Wanneer geselekteer is, 'n kliek askei op die sein sal die sein verander na die geselekteerde sein tiepe en waarde, CTRL-kliek sal die bestaande waarde tokkel.
+STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Sein sleep digtheid
+STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Verminder sein sleep digtheid
+STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Verhoog sein sleep digtheid
 ########
 
 ############ on screen keyboard
@@ -3469,8 +3486,29 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 ########
 
 ############ AI GUI
+STR_AI_SETTINGS_BUTTON                                          :{BLACK}AI Stellings
+STR_AI_SETTINGS_BUTTON_TIP                                      :{BLACK}Wys AI stellings
+STR_AI_DEBUG                                                    :{WHITE}AI ontfout
+STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Naam van die AI
+STR_AI_DEBUG_RELOAD                                             :{BLACK}Herlaai AI
+STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Maak die AI dood, herlaai die skrif en herlaai die AI
+STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Die AI ontfout venster is net beskikbaar vir die dienaar
+STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Konfigurasie
+STR_AI_CHANGE                                                   :{BLACK}Kies AI
+STR_AI_CONFIGURE                                                :{BLACK}Konfigureer
+STR_AI_CHANGE_TIP                                               :{BLACK}Laai nog 'n AI
+STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfigureer die parameters van AI
+STR_AI_LIST_TIP                                                 :{BLACK}Alle AIs wat in die volgende spel  gelaai gaan word
+STR_AI_LIST_CAPTION                                             :{WHITE}Beskikbare AIs
+STR_AI_AILIST_TIP                                               :{BLACK}Kliek om 'n AI te kies
 STR_AI_ACCEPT                                                   :{BLACK}Aanvaar
+STR_AI_ACCEPT_TIP                                               :{BLACK}Kies beligte AI
 STR_AI_CANCEL                                                   :{BLACK}Kanseleer
+STR_AI_CANCEL_TIP                                               :{BLACK}Moenie AI verander nie
+STR_AI_CLOSE                                                    :{BLACK}Maak toe
+STR_AI_HUMAN_PLAYER                                             :Mens Speler
+STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parameters
+STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Daar was n fout met een van die AIs. Rapporteer assblief aan die skrywer met n skermskoot van die AI ontfout venster.
 ########
 
 ############ town controlled noise level
@@ -3490,9 +3528,13 @@ STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Jy het
 STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Jy het dit geselekeer om af te laai
 STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Jy het hierdie reeds
 
-STR_JUST_DATE_TINY                                              :{DATE_TINY}
-STR_JUST_DATE_LONG                                              :{DATE_LONG}
-STR_JUST_DATE_ISO                                               :{DATE_ISO}
 
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... verbinding verloor
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... lêer nie skryfbaar nie
+STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kon nie die afgelaaide lêer dekompakteer
 
+STR_CONTENT_INTRO_BUTTON                                        :{BLACK}Kyk Na Aanlyn Inhoud
+STR_CONTENT_INTRO_BUTTON_TIP                                    :{BLACK}Kyk vir nuwe of bygewerkde inhoud om af te laai
+STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Vind vermisde inhoud aanlyn
+STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Kyk of die vermisde inhoud aanlyn kan gevind word
 ########

src/lang/arabic_egypt.txt

@@ -447,8 +447,8 @@ STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK} تكل
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}تكلفة الازالة :  {RED}{CURRENCY}
 STR_REVENUE_WHEN_CLEARED                                        :{BLACK} الدخل عند للتجديد:  {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :غير متاح
-STR_01A7_OWNER                                                  :{BLACK}المالك:  {LTBLUE}{STRING}
-STR_ROAD_OWNER                                                  :{BLACK}مالك الطريق:  {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}المالك: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}مالك الطريق: {LTBLUE}{STRING}
 STR_TRAM_OWNER                                                  :{BLACK}مالك طريق الترام: {LTBLUE}{STRING}
 STR_RAIL_OWNER                                                  :{BLACK}مالك سكة الحديد: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}السلطة المحلية: {LTBLUE}{STRING}
@@ -638,7 +638,7 @@ STR_0299_SAVE_SCENARIO                                          :{WHITE}حفظ
 STR_029A_PLAY_SCENARIO                                          :{BLACK}لعب خريطة
 STR_PLAY_HEIGHTMAP                                              :{BLACK}العب خريطة المرتفعات
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}ابدأ لعبة جديدة بواسطة خريطة المرتفعات
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}هل تريد الخروج من هذه الخريطة
+STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}هل تريد الخروج من انشاء الخريطة
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...يمكن بنائة في مدن يزيد سكانها عن 1200 نسمة
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}العودة بتاريخ البدأ سنة واحدة
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}تقديم تاريخ البدأ سنة واحدة لالأمام
@@ -666,7 +666,6 @@ STR_OFF                                                         :اغلاق
 STR_SUMMARY                                                     :ملخص
 STR_FULL                                                        :ممتلئ
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :دليل المدن
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -704,6 +703,7 @@ STR_02DE_MAP_OF_WORLD                                           :خريطة ال
 STR_EXTRA_VIEW_PORT                                             :شاشة عرض اضافية
 STR_SIGN_LIST                                                   :قائمة العلامات
 STR_02DF_TOWN_DIRECTORY                                         :دليل المدن
+STR_02BB_TOWN_DIRECTORY                                         :دليل المدن
 STR_TOWN_POPULATION                                             :{BLACK}سكان العالم: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}شاشة عرض{COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}انسخ لشاشة العرض
@@ -730,6 +730,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}حفظ
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}اختار مدة الحفظ الآلي
 STR_02F7_OFF                                                    :بدون
+STR_AUTOSAVE_1_MONTH                                            :كل شهر
 STR_02F8_EVERY_3_MONTHS                                         :كل 3 اشهر
 STR_02F9_EVERY_6_MONTHS                                         :كل 6 اشهر
 STR_02FA_EVERY_12_MONTHS                                        :كل سنة
@@ -850,7 +851,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK} الو
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK} اختر مجموعة الواجهة الرسومية
 
-STR_AUTOSAVE_1_MONTH                                            :كل شهر
 STR_AUTOSAVE_FAILED                                             :{WHITE}فشل الحفظ التلقائي
 
 STR_MONTH_JAN                                                   :يناير
@@ -911,7 +911,7 @@ STR_CONFIG_SETTING_CAPTION                                      :{WHITE}الاع
 STR_CONFIG_SETTING_OFF                                          :قفل
 STR_CONFIG_SETTING_ON                                           :فتح
 STR_CONFIG_SETTING_VEHICLESPEED                                 :{LTBLUE}عرض سرعة المركبه في شريط الحاله :{ORANGE}{STRING}
-STR_CONFIG_SETTING_BUILDONSLOPES                                :{LTBLUE}السماح بالبناء على المنحدرات و السواحل:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_BUILDONSLOPES                                :{LTBLUE}السماح بالبناء على المنحدرات و السواحل: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}السماح باعادة بناء التلال تحت المباني, الطرق, الخ .-الانحدار الذاتي- {ORANGE}{STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}السماح بحدود اكثر واقعية للمحطات بحسب الحجم: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}السماح بحذف اكثر من الطرق المملوكة للمدينة و الجسور و غيرها: {ORANGE}{STRING}
@@ -919,26 +919,26 @@ STR_CONFIG_SETTING_MAMMOTHTRAINS                                :{LTBLUE}الس
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE} موديل تسارع القطارات: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :الاصلي
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :واقعي
-STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}منع القطارات والسفن من الدوران بزاوية تسعين درجة :  {ORANGE}{STRING} {LTBLUE} (not with NTP)
-STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}ربط محطات القطار المبنيه بجوار بعض:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}منع القطارات والسفن من الدوران بزاوية تسعين درجة : {ORANGE}{STRING} {LTBLUE} (not with NTP)
+STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}ربط محطات القطار المبنيه بجوار بعض: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE} السماح بربط محطتين غير متجاورتين : {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}أستخدام خوارزمية التحميل المحسنه: {ORANGE}{STRING}
-STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}تحميل القطارات بالتدريج:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}تحميل القطارات بالتدريج: {ORANGE}{STRING}
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}التضخم: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}أوصل الحموله للمحطه إذا كان هناك حاجة فقط: {ORANGE}{STRING}
-STR_CONFIG_SETTING_LONGBRIDGES                                  :{LTBLUE}السمح ببناء جسور طويلة جداً:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_LONGBRIDGES                                  :{LTBLUE}السمح ببناء جسور طويلة جداً: {ORANGE}{STRING}
 STR_CONFIG_SETTING_GOTODEPOT                                    :{LTBLUE}السماح بأمر الذهاب للورشة: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}طريقة بناء المصانع الأولية يدوية : {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :بدون
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :ككل المصانع الأخرى
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :تنقيب
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}السماح بوجود اكثر من مصنع من نفس النوع في المدينة الواحدة: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}من الممكن بناء مصانع من نفس النوع بجوار بعض:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}من الممكن بناء مصانع من نفس النوع بجوار بعض: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}استخدام التاريخ الطويل في لوحة العرض دائما: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}اظهار الاشارات على جهة السائق: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}أعرض نافذة المالية في آخر السنه: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :{LTBLUE}الامر الجديد - بدون توقف - قياسيا: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ROADVEH_QUEUE                                :{LTBLUE}تسلسل عربات الطريق - بالتأثير الكمي :  {ORANGE}{STRING}
+STR_CONFIG_SETTING_ROADVEH_QUEUE                                :{LTBLUE}تسلسل عربات الطريق - بالتأثير الكمي : {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}حرك الشاشة عندما تكون المؤشر على الحافة: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}السماح برشوة السلطات االمحليه: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}السماح بشراء حقوق النقل الحصري: {ORANGE}{STRING}
@@ -959,7 +959,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW                                 :{LTBLUE}است
 STR_CONFIG_SETTING_ORDER_REVIEW_OFF                             :لا
 STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :نعم, بستثناء العربات المتوقفة
 STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :لكل العربات
-STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}  حذر عندما يكون الدخل سالبا : {ORANGE}{STRING}
+STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE} حذر عندما يكون الدخل سالبا :{ORANGE}{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}المركبات لا تنتهي صلاحيتها ابدا : {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}جدد العربات عندما تصبح قديمة : {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}التجديد التلقائي عندما تكون العربة {ORANGE}{STRING}{LTBLUE}شهر قبل / بعد العمر الافتراضي.
@@ -967,12 +967,12 @@ STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}الت
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}زمن عرض الرسالة: {ORANGE}{STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}أعرض عدد السكان مع الأسم على العلامه: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}مولد الأرض:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}مولد الأرض: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :الأصلي
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :مرتفعات منزلقة
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}المسافة القصزى لمحطات التكرير من الحافة: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :{LTBLUE}ارتفاع خط الثلج: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :{LTBLUE} خشونة التضاريس (سفر التكوين فقط ) :  ({ORANGE}{STRING}
+STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN                         :{LTBLUE} خشونة التضاريس (سفر التكوين فقط ) :({ORANGE}{STRING}
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :ناعم جدا
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_SMOOTH                  :ناعم
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH                   :خشن
@@ -989,7 +989,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} {RED}تحذير: الإعدادات العاليه تبطئ اللعبه
+STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}أكبر توسع للمحطه: {ORANGE}{STRING} {RED}تحذير: الإعدادات العاليه تبطئ اللعبه
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}صيانة الهيلوكبتر في مهبطها تلقائيا: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}اربط اداة التضاريس الى اداة السكة /الطرق / اموانئ / المطارات{ORANGE}{STRING}
 STR_CONFIG_SETTING_REVERSE_SCROLLING                            :{LTBLUE}عكس تحريك الشاشة : {ORANGE}{STRING}
@@ -999,7 +999,7 @@ STR_CONFIG_SETTING_LIVERIES                                     :{LTBLUE}عرض
 STR_CONFIG_SETTING_LIVERIES_NONE                                :بدون
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :شركتك الخاصة
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :كل الشركات
-STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}تفضيل الدردشة  <ENTER> : {ORANGE}{STRING}
+STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}تفضيل الدردشة <ENTER> : {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING                        :{LTBLUE}وظيفة عجلة التحريك: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM                             :تصغير تكبير الخريطة
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :تحريك الخريطة
@@ -1023,7 +1023,7 @@ STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}است
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF                   :بدون
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OWN                   :لشركتك
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_ALL                   :كل الشركات
-STR_CONFIG_SETTING_LOADING_INDICATORS                           :{LTBLUE}تفعيل مؤشر التحميل:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_LOADING_INDICATORS                           :{LTBLUE}تفعيل مؤشر التحميل: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LOADING_INDICATORS_OFF                       :بدون
 STR_CONFIG_SETTING_LOADING_INDICATORS_OWN                       :لشركتك
 STR_CONFIG_SETTING_LOADING_INDICATORS_ALL                       :كل الشركات
@@ -1067,14 +1067,14 @@ STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}فتر
 STR_CONFIG_SETTING_SERVINT_SHIPS_DISABLED                       :{LTBLUE}فترات الصيانة القياسية للسفن {ORANGE}غير مفعل
 STR_CONFIG_SETTING_NOSERVICE                                    :{LTBLUE}الغاء الصيانة عندما يكون التعطيل للمركبات غير مفعل: {ORANGE}{STRING}
 STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :{LTBLUE}السماح بتحديد سرعة العربات: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DISABLE_ELRAILS                              :{LTBLUE}تعطيل سكة القطار الكهربائي:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_DISABLE_ELRAILS                              :{LTBLUE}تعطيل سكة القطار الكهربائي: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :{LTBLUE}الاخبار الملونة تظهر في: {ORANGE}{STRING}
-STR_CONFIG_SETTING_STARTING_YEAR                                :{LTBLUE}سنة البدايه:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_STARTING_YEAR                                :{LTBLUE}سنة البدايه: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}السماح بأقتصاد ثابت )تغيرات صغيرة اكثر): {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}السماح بشراء حصص من الشركات المنافسة: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}عندما تسحب او توضع الاشارات كل: {ORANGE}{STRING} مربع
-STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}اتاحة  استخدام الأشارات بالأعلام قبل : {ORANGE}{STRING}
+STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}اتاحة استخدام الأشارات بالأعلام قبل :{ORANGE}{STRING}
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}السماح باستخدام اشارات واجهة المستخدم الرسومية: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}نوع الاشارة الذي يبنى قياسيا: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :اشارات التوقف
@@ -1092,17 +1092,17 @@ STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :شبكة 2*2
 STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :شبكة 3*3
 STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :عشوائي
 STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :{LTBLUE} السماح للمدن ببناء طرق: {ORANGE}{STRING}
-STR_CONFIG_SETTING_NOISE_LEVEL                                  :{LTBLUE}السماح للمدن بالتحكم في ضجيج المطارات: {ORANGE}{STRING}
+STR_CONFIG_SETTING_NOISE_LEVEL                                  :{LTBLUE}السماح للمدن بالتحكم بضجيج المطارات: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}موقع شريط الأدوات الرئيسي:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}موقع شريط الأدوات الرئيسي: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_LEFT                             :يسار
 STR_CONFIG_SETTING_TOOLBAR_POS_CENTER                           :متوسط
 STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT                            :يمين
 STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}قطر اللقطة للاطار: {ORANGE}{STRING} px
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}قطر اللقطة للاطار:  {ORANGE}غير مفعل
-STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE} حدود نعومة النوافذ - غير ملتصقة -  : {ORANGE}{STRING}
+STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE} حدود نعومة النوافذ - غير ملتصقة - :{ORANGE}{STRING}
 STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE} حدود نعومة النوافذ - غير ملتصقة - : {ORANGE} غير مفعل
-STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}سرعة نمو المدينه:  {ORANGE}{STRING}
+STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}سرعة نمو المدينه: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :بدون
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :بطيء
 STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :عادي
@@ -1131,7 +1131,7 @@ STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE} قطا
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE} مدن
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE} مصانع
 
-STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}موجد الطريق - قصاص الطريق -  للقطارات: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}موجد الطريق- قصاص الطريق - للقطارات:{ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(غير مفضل)
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF                    :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(مفضل)
@@ -1163,7 +1163,7 @@ STR_CHEATS_TIP                                                  :{BLACK}علام
 STR_CHEATS_WARNING                                              :{BLACK}تحذير! انت على وشك ان تخون منافسيك. هذا الخيانة ستبقى عار عليك الى الأبد.
 STR_CHEAT_MONEY                                                 :{LTBLUE}زيادة السيولة بـ {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}العب كشركة{ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}الجرافة السحرية - لازالة المصانع, الاشياء الغير متنقلة.  {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}الجرافة السحرية - لازالة المصانع, الاشياء الغير متنقلة.{ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}يمكن للانفاق ان تتقاطع: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}البناء خلال توقيف اللعبة: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}الطائرات النفاثة لن تتحطم كثيرا في المطارات الصغيرة {ORANGE} {STRING}
@@ -1302,14 +1302,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}سنين
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}عدد السنوات{}اللعبة قائمة
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}معلومات اللعبة
-STR_NETWORK_CLIENTS                                             :{SILVER}عملاء: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}اللغة:   {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}مجموعة المربعات: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}حجم الخريطة:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}نسخة الخادم:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}عملاء:{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}اللغة:{WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}مجموعة المربعات:{WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}حجم الخريطة: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}نسخة الخادم:{WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}عنوان الخادم:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}تاريخ البداية: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}التاريخ الحالي:   {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}تاريخ البداية:{WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}التاريخ الحالي:{WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}كلمت السر محمية!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}الخادم غير موجود
 STR_NETWORK_SERVER_FULL                                         :{SILVER}الخادم ممتلئ
@@ -1391,7 +1391,7 @@ STR_NETWORK_LANG_LATVIAN                                        :اللاتفي
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}ردهة تعدد اللاعبين
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}التحضير لالانضمام الى: {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}التحضير لالانضمام الى:{ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}قائمة بالشركات الموجودة باللعبة ، يمكنك الإنضمام لشركة أو تأسيس واحدة
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}شركة جديدة
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}أنشئ شركة جديدة
@@ -1404,16 +1404,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}حدث
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}معلومات الشركة
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}أسم الشركة:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}افتتاح: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}قيمة الشركة:   {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}الرصيد الحالي:   {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}دخل السنة الماضية:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}الأداء:   {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}أسم الشركة:{WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}افتتاح:{WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}قيمة الشركة:{WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}الرصيد الحالي:{WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}دخل السنة الماضية:{WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}الأداء:{WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}مركبة:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}محطات:   {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}لاعبين:   {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}مركبة:{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}محطات:{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}لاعبين:{WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}إتصال...
 
@@ -1440,7 +1440,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}قائم
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE} شاهد
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE} شركة جديدة
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} لايوجد أجهزة شبكة
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} لايوجد أجهزة شبكة او الشبكة معطلة
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} لايوجد ألعاب شبكة
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} الخادم لم يجب على الطلب
 STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} لم يتم الربط بسبب عدم توافق NewGFR
@@ -2801,12 +2801,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}مسح
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}عدل وقت التاخير للعداد حتى تصل المركبة في الوقت المحدد
 STR_SERVICE_HINT                                                :{BLACK}تجاوز هذا الامر الا اذا لم تكن الصيانة مطلوبة
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK} التكلفة: {CURRENCY} الوزن: {WEIGHT_S} {} السرعة: {VELOCITY}  الطاقة: {POWER}{} كلفة التشغيل: {CURRENCY} / سنة {} السعة: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED} متعطل
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}العمر: {LTBLUE}{STRING}{BLACK}      تكلفة التشغيل: {LTBLUE}{CURRENCY}/سنة
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK} الوزن: {LTBLUE}{WEIGHT_S}  {BLACK} الطاقة: {LTBLUE}{POWER}{BLACK} السرعة القصوى:  {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK} الوزن  {LTBLUE}{WEIGHT_S} {BLACK} القوة {LTBLUE}{POWER}{BLACK} السرعة القصوى {LTBLUE}{VELOCITY} {BLACK} قوة السحب القصوى {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK} الدخل هذه السنة: {LTBLUE}{CURRENCY}       (السنة السابقة{CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}الصلاحية: {LTBLUE}{COMMA}%  {BLACK} مرات التعطيل منذ الصيانة السابقة: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED} الاعطال
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}العمر: {LTBLUE}{STRING}{BLACK}      تكلفة التشغيل: {LTBLUE}{CURRENCY}/سنة
 STR_8861_STOPPED                                                :{RED} متوقف
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}لا يمكن السماح للقطار بالعبور من الاشارة في وضع الخطر
 STR_8863_CRASHED                                                :{RED}تحطم!
@@ -2815,7 +2815,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}اسم
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}لا يمكن تسمية القطار ...
 STR_8867_NAME_TRAIN                                             :{BLACK} اسم القطار
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}تحطم قطار! {}{COMMA} مات في حريق بعد الحادث
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}لا يمكن عكس اتجاة القطار...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}لا يمكن عكس اتجاة القطار...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE} لا يمكن تغيير اتجاة العربة ...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}لا يمكن انعطاف العربات المكونة من اكثر من وحدة.
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}اعادة تسمية عربات القطار
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}لا يمكن اعادة تسمية عربات القطار ...
 STR_CLEAR_TIME                                                  :{BLACK}مسح الوقت
@@ -2903,8 +2905,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}المواطنون يحتفلون . . . {}بوصول اول عربة ترام لمحطة  {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}العربة تحطمت !{}السائق توفي في شعلة الحريق بعد الاصطدام بقطار
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}العربة تحطمت !{}{COMMA} توفي في شعلة الحريق بعد الاصطدام بقطار
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}لايمكن للعربة أن تدور للخلف...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}لا يمكن انعطاف العربات المكونة من اكثر من وحدة.
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE} لا يمكن تغيير اتجاة المركبة الان
 STR_9034_RENAME                                                 :{BLACK}أعد التسمية
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK} اعادة تسمية العربة
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE} اعادة تسمية العربة

src/lang/brazilian_portuguese.txt

@@ -47,7 +47,7 @@ STR_0023_RUBBER                                                 :{G=f}Borracha
 STR_0024_SUGAR                                                  :{G=m}Açúcar
 STR_0025_TOYS                                                   :{G=m}Brinquedos
 STR_0026_CANDY                                                  :{G=m}Doces
-STR_0027_COLA                                                   :{G=f}Cola
+STR_0027_COLA                                                   :{G=m}Xarope
 STR_0028_COTTON_CANDY                                           :{G=m}Algodão Doce
 STR_0029_BUBBLES                                                :{G=f}Bolhas
 STR_002A_TOFFEE                                                 :{G=m}Caramelo
@@ -79,7 +79,7 @@ STR_0043_RUBBER                                                 :{G=f}Borracha
 STR_0044_SUGAR                                                  :{G=m}Açúcar
 STR_0045_TOY                                                    :{G=m}Brinquedos
 STR_0046_CANDY                                                  :{G=m}Doces
-STR_0047_COLA                                                   :{G=f}Cola
+STR_0047_COLA                                                   :{G=m}Xarope
 STR_0048_COTTON_CANDY                                           :{G=m}Algodão doce
 STR_0049_BUBBLE                                                 :{G=f}Bolhas
 STR_004A_TOFFEE                                                 :{G=m}Caramelo
@@ -102,7 +102,7 @@ STR_QUANTITY_COPPER_ORE                                         :{WEIGHT} de min
 STR_QUANTITY_MAIZE                                              :{WEIGHT} de milho
 STR_QUANTITY_FRUIT                                              :{WEIGHT} de fruta
 STR_QUANTITY_DIAMONDS                                           :{COMMA} saco{P "" s} de diamante
-STR_QUANTITY_FOOD                                               :{WEIGHT} de alimento
+STR_QUANTITY_FOOD                                               :{WEIGHT} de comida
 STR_QUANTITY_PAPER                                              :{WEIGHT} de papel
 STR_QUANTITY_GOLD                                               :{COMMA} saco{P "" s} de ouro
 STR_QUANTITY_WATER                                              :{VOLUME} de água
@@ -111,7 +111,7 @@ STR_QUANTITY_RUBBER                                             :{VOLUME} de bor
 STR_QUANTITY_SUGAR                                              :{WEIGHT} de açúcar
 STR_QUANTITY_TOYS                                               :{COMMA} brinquedo{P "" s}
 STR_QUANTITY_SWEETS                                             :{COMMA} saco{P "" s} de doce{P "" s}
-STR_QUANTITY_COLA                                               :{VOLUME} de cola
+STR_QUANTITY_COLA                                               :{VOLUME} de xarope
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} de algodão doce
 STR_QUANTITY_BUBBLES                                            :{COMMA} bolha{P "" s}
 STR_QUANTITY_TOFFEE                                             :{WEIGHT} de caramelo
@@ -622,7 +622,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Colocar
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Colocar farol
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Colocar transmissor
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Define área desértica.{} Pressione e segure CTRL para removê-la
-STR_CREATE_LAKE                                                 :{BLACK}Define área com água.{} Faz um canal, a menos se CTRL for pressionado ao nível do mar, neste caso inundará ao redor
+STR_CREATE_LAKE                                                 :{BLACK}Define área com água.{}Faz um canal, a menos se CTRL for pressionado ao nível do mar, neste caso inundará ao redor
 STR_CREATE_RIVER                                                :{BLACK}Criar Rios
 STR_0290_DELETE                                                 :{BLACK}Remover
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Remover esta cidade completamente
@@ -666,7 +666,6 @@ STR_OFF                                                         :Desligado
 STR_SUMMARY                                                     :Resumo
 STR_FULL                                                        :Completo
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Lista de cidades
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -704,6 +703,7 @@ STR_02DE_MAP_OF_WORLD                                           :Mapa mundi
 STR_EXTRA_VIEW_PORT                                             :Visualizador extra
 STR_SIGN_LIST                                                   :Lista de placas
 STR_02DF_TOWN_DIRECTORY                                         :Lista de cidades
+STR_02BB_TOWN_DIRECTORY                                         :Lista de cidades
 STR_TOWN_POPULATION                                             :{BLACK}População mundial: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Visualizador {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiar para o visualizador
@@ -730,6 +730,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Salvar a
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Selecionar o intervalo para salvar automaticamente
 STR_02F7_OFF                                                    :Desativado
+STR_AUTOSAVE_1_MONTH                                            :A cada mês
 STR_02F8_EVERY_3_MONTHS                                         :A cada 3 meses
 STR_02F9_EVERY_6_MONTHS                                         :A cada 6 meses
 STR_02FA_EVERY_12_MONTHS                                        :A cada 12 meses
@@ -850,7 +851,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Jogo de
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Selecione o jogo de gráficos a ser utilizado
 
-STR_AUTOSAVE_1_MONTH                                            :A cada mês
 STR_AUTOSAVE_FAILED                                             :{WHITE}Falha ao salvar automaticamente
 
 STR_MONTH_JAN                                                   :Janeiro
@@ -1302,14 +1302,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anos
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Número de anos{}decorridos no jogo
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DO JOGO
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do mapa:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Tileset: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do mapa: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}IP do servidor:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Data de inicio:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data atual:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Data de inicio: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data atual: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protegido por senha!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR DESLIGADO
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR CHEIO
@@ -1334,7 +1334,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :Rede Local / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (divulgar)
 STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Máximo de clientes:
+STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Máx de clientes:
 STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Escolha o número máximo de clientes. Não é necessário estarem todos preenchidos
 STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} empresa{P "" s}
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Máximo de empresas:
@@ -1391,7 +1391,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Letão
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Sala de espera do jogo
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparando para conectar em:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparando para conectar em: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista de todas as empresas ativas no jogo. Você pode juntar-se a uma delas ou iniciar uma nova empresa.
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova empresa
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Criar uma nova empresa
@@ -1404,15 +1404,15 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Atualiza
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMAÇÃO DA EMPRESA
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da empresa:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da empresa: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração: {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Valor da empresa: {WHITE}{CURRENCY}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanço atual: {WHITE}{CURRENCY}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Rendimento do último ano: {WHITE}{CURRENCY}
 STR_NETWORK_PERFORMANCE                                         :{SILVER}Desempenho: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veículos:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estações:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_VEHICLES                                            :{SILVER}Veículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Estações: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Jogadores: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Conectando...
@@ -1442,21 +1442,21 @@ STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Com
 
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Não foram encontradas interfaces de rede ou o jogo foi compilado sem ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Não foram encontrados jogos em rede
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} O servidor não respondeu ao pedido
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Não pode conectar  devido ao NewGRF errado
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} A sincronização do jogo falhou.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} A conexão do jogo foi perdida
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Não foi possível abrir o jogo.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Não foi possível iniciar o servidor
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Não foi possível estabelecer conexão
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tempo de espera esgotado na conexão #{NUM}.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Ocorreu um erro de protocolo e a conexão foi encerrada
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} A versão deste cliente não condiz com a versão do servidor
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Senha incorreta
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} O servidor está cheio
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Você foi banido deste servidor
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Você foi expulso do jogo
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Trapaceiros não são permitidos neste servidor
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}O servidor não respondeu ao pedido
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Não pode conectar devido ao NewGRF errado
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}A sincronização do jogo falhou.
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}A conexão do jogo foi perdida
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Não foi possível abrir o jogo.
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Não foi possível iniciar o servidor
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Não foi possível estabelecer conexão
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Tempo de espera esgotado na conexão #{NUM}
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Ocorreu um erro de protocolo e a conexão foi encerrada
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}A versão deste cliente não condiz com a versão do servidor
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Senha incorreta
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}O servidor está cheio
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Você foi banido deste servidor
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Você foi expulso do jogo
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Trapaceiros não são permitidos neste servidor
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :erro geral
@@ -1589,27 +1589,27 @@ STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Selecion
 STR_1021_RAILROAD_TRACK                                         :Ferrovia
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Depósito ferroviário
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...a área é propriedade de outra empresa
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Ferrovia com sinais normais
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Ferrovia com sinais de bloco
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Ferrovia com pré-sinais
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Ferrovia com sinais de saída
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Ferrovia com sinais combo
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Ferrovia com sinais avançados
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Ferrovia com sinais de mão única avançados
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Linha de trem com sinais normais e pré-sinais
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Linha de trem com sinais normais e de saída
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Ferrovia com sinais normais e combo
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Ferrovia com sinais normais e avançados
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Ferrovia com sinais normais e de mão única avançados
+STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Ferrovia com sinais de via
+STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Ferrovia com sinais de mão única de via
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Linha de trem com sinais de bloco e pré-sinais
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Linha de trem com sinais de bloco e de saída
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Ferrovia com sinais de bloco e combo
+STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Ferrovia com sinais de bloco e de via
+STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Ferrovia com sinais de bloco e de via de mão única
 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Linha de trem com pré-sinais e de saída
 STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Ferrovia com pré-sinais e combo
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Ferrovia com pré-sinais e sinais avançados
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Ferrovia com pré-sinais e sinais avançados de mão única
+STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Ferrovia com pré-sinais e sinais de via
+STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Ferrovia com pré-sinais e sinais de via de mão única
 STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Ferrovia com sinais combo e de saída
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Ferrovia com sinais de saída e avançados
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Ferrovia com sinais de saída e sinais avançados de mão única
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Ferrovia com sinais combo e avançados
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Ferrovia com sinais combo e sinais avançados de mão única
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Ferrovia com sinais avançados e de mão única
+STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Ferrovia com sinais de saída e de via
+STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Ferrovia com sinais de saída e sinais de via de mão única
+STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Ferrovia com sinais combo e de via
+STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Ferrovia com sinais combo e sinais de via de mão única
+STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Ferrovia com sinais de via e de via de mão única
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Deve remover a estação de trem antes
 STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construir uma estação separada
 STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Unir estações
@@ -1753,14 +1753,14 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Construir está
 STR_204B_FUND_NEW_BUILDINGS                                     :Financiar novos edifícios
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Comprar exclusividade da rede de transportes
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Subornar a autoridade local
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniciar uma campanha publicitária pequena, para atrair mais passageiros e cargas para sua empresa.{}  Custo: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Iniciar uma campanha publicitária média, para atrair mais passageiros e cargas para sua empresa.{}  Custo: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniciar uma campanha publicitária grande, para atrair mais passageiros e cargas para sua empresa.{}  Custo: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Financiar a reconstrução da malha rodoviária urbana. Causa engarrafamentos consideráveis ao tráfego por até 6 meses.{}  Custo: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniciar uma campanha publicitária pequena, para atrair mais passageiros e cargas para sua empresa.{}Custo: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Iniciar uma campanha publicitária média, para atrair mais passageiros e cargas para sua empresa.{}Custo: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniciar uma campanha publicitária grande, para atrair mais passageiros e cargas para sua empresa.{}Custo: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Financiar a reconstrução da malha rodoviária urbana. Causa engarrafamentos consideráveis ao tráfego por até 6 meses.{}Custo: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Construir uma estátua em honra para sua empresa.{} Custo: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financiar a construção de edifícios comerciais novos na cidade.{}  Custo: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financiar a construção de edifícios comerciais novos na cidade.{}Custo: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Comprar a exclusividade dos serviços durante 1 ano na cidade. A autoridade da cidade permitirá que os passageiros e cargas usem somente estações de sua empresa.{} Custo: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar a autoridade local para aumentar a sua avaliação, correndo o  risco de uma penalidade severa se apanhado.{}  Custo: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Subornar a autoridade local para aumentar a sua avaliação, correndo o risco de uma penalidade severa se apanhado.{}Custo: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{} Programa de reconstrução rodoviária financiado por {STRING} provoca 6 meses de miséria aos condutores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -1955,7 +1955,7 @@ STR_481B_LUMBER_MILL                                            :{G=f}Serraria
 STR_481C_COTTON_CANDY_FOREST                                    :{G=f}Floresta de Algodão Doce
 STR_481D_CANDY_FACTORY                                          :{G=f}Fábrica de Doces
 STR_481E_BATTERY_FARM                                           :{G=m}Campo de Pilhas
-STR_481F_COLA_WELLS                                             :{G=m}Poços de Cola
+STR_481F_COLA_WELLS                                             :{G=m}Poços de Xarope
 STR_4820_TOY_SHOP                                               :{G=f}Loja de Brinquedos
 STR_4821_TOY_FACTORY                                            :{G=f}Fábrica de Brinquedos
 STR_4822_PLASTIC_FOUNTAINS                                      :{G=f}Fontes de Plástico
@@ -2207,7 +2207,7 @@ STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Gráfico de Lucros Operacionais
 STR_7026_BANK_BALANCE                                           :{WHITE}Balanço Bancário
 STR_7027_LOAN                                                   :{WHITE}Empréstimo
-STR_MAX_LOAN                                                    :{WHITE}Empréstimo Máximo:  {BLACK}{CURRENCY}
+STR_MAX_LOAN                                                    :{WHITE}Empréstimo Máximo: {BLACK}{CURRENCY}
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Pedir {SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Pagar {SKIP}{SKIP}{CURRENCY}
@@ -2378,7 +2378,7 @@ STR_8022_WOOD_TRUCK                                             :Vagão de Madei
 STR_8023_IRON_ORE_HOPPER                                        :Vagão de Minério de Ferro
 STR_8024_STEEL_TRUCK                                            :Vagão de Aço
 STR_8025_ARMORED_VAN                                            :Vagão Blindado
-STR_8026_FOOD_VAN                                               :Vagão de Alimento
+STR_8026_FOOD_VAN                                               :Vagão de Comida
 STR_8027_PAPER_TRUCK                                            :Vagão de Papel
 STR_8028_COPPER_ORE_HOPPER                                      :Vagão de Minério de Cobre
 STR_8029_WATER_TANKER                                           :Tanque de Água
@@ -2388,7 +2388,7 @@ STR_802C_SUGAR_TRUCK                                            :Vagão de Açú
 STR_802D_COTTON_CANDY_HOPPER                                    :Vagão de Algodão Doce
 STR_802E_TOFFEE_HOPPER                                          :Vagão de Caramelo
 STR_802F_BUBBLE_VAN                                             :Vagão de Bolhas
-STR_8030_COLA_TANKER                                            :Tanque de Cola
+STR_8030_COLA_TANKER                                            :Tanque de Xarope
 STR_8031_CANDY_VAN                                              :Vagão de Doces
 STR_8032_TOY_VAN                                                :Vagão de Brinquedos
 STR_8033_BATTERY_TRUCK                                          :Vagão de Pilhas
@@ -2408,7 +2408,7 @@ STR_8040_WOOD_TRUCK                                             :Vagão de Madei
 STR_8041_IRON_ORE_HOPPER                                        :Vagão de Minério de Ferro
 STR_8042_STEEL_TRUCK                                            :Vagão de Aço
 STR_8043_ARMORED_VAN                                            :Vagão Blindado
-STR_8044_FOOD_VAN                                               :Vagão de Alimento
+STR_8044_FOOD_VAN                                               :Vagão de Comida
 STR_8045_PAPER_TRUCK                                            :Vagão de Papel
 STR_8046_COPPER_ORE_HOPPER                                      :Vagão de Minério de Cobre
 STR_8047_WATER_TANKER                                           :Tanque de Água
@@ -2418,7 +2418,7 @@ STR_804A_SUGAR_TRUCK                                            :Vagão de Açú
 STR_804B_COTTON_CANDY_HOPPER                                    :Vagão de Algodão Doce
 STR_804C_TOFFEE_HOPPER                                          :Vagão de Caramelo
 STR_804D_BUBBLE_VAN                                             :Vagão de Bolhas
-STR_804E_COLA_TANKER                                            :Tanque de Cola
+STR_804E_COLA_TANKER                                            :Tanque de Xarope
 STR_804F_CANDY_VAN                                              :Vagão de Doces
 STR_8050_TOY_VAN                                                :Vagão de Brinquedos
 STR_8051_BATTERY_TRUCK                                          :Vagão de Pilhas
@@ -2440,7 +2440,7 @@ STR_8060_WOOD_TRUCK                                             :Vagão de Madei
 STR_8061_IRON_ORE_HOPPER                                        :Vagão de Minério de Ferro
 STR_8062_STEEL_TRUCK                                            :Vagão de Aço
 STR_8063_ARMORED_VAN                                            :Vagão Blindado
-STR_8064_FOOD_VAN                                               :Vagão de Alimento
+STR_8064_FOOD_VAN                                               :Vagão de Comida
 STR_8065_PAPER_TRUCK                                            :Vagão de Papel
 STR_8066_COPPER_ORE_HOPPER                                      :Vagão de Minério de Cobre
 STR_8067_WATER_TANKER                                           :Tanque de Água
@@ -2450,7 +2450,7 @@ STR_806A_SUGAR_TRUCK                                            :Vagão de Açú
 STR_806B_COTTON_CANDY_HOPPER                                    :Vagão de Algodão Doce
 STR_806C_TOFFEE_HOPPER                                          :Vagão de Caramelo
 STR_806D_BUBBLE_VAN                                             :Vagão de Bolhas
-STR_806E_COLA_TANKER                                            :Tanque de Cola
+STR_806E_COLA_TANKER                                            :Tanque de Xarope
 STR_806F_CANDY_VAN                                              :Vagão de Doces
 STR_8070_TOY_VAN                                                :Vagão de Brinquedos
 STR_8071_BATTERY_TRUCK                                          :Vagão de Pilha
@@ -2496,9 +2496,9 @@ STR_8098_KELLING_STEEL_TRUCK                                    :Caminhão de A
 STR_8099_BALOGH_ARMORED_TRUCK                                   :Caminhão Blindado Balogh
 STR_809A_UHL_ARMORED_TRUCK                                      :Caminhão Blindado Uhl
 STR_809B_FOSTER_ARMORED_TRUCK                                   :Caminhão Blindado Foster
-STR_809C_FOSTER_FOOD_VAN                                        :Caminhão de Alimento Foster
-STR_809D_PERRY_FOOD_VAN                                         :Caminhão de Alimento Perry
-STR_809E_CHIPPY_FOOD_VAN                                        :Caminhão de Alimento Chippy
+STR_809C_FOSTER_FOOD_VAN                                        :Caminhão de Comida Foster
+STR_809D_PERRY_FOOD_VAN                                         :Caminhão de Comida Perry
+STR_809E_CHIPPY_FOOD_VAN                                        :Caminhão de Comida Chippy
 STR_809F_UHL_PAPER_TRUCK                                        :Caminhão de Papel Uhl
 STR_80A0_BALOGH_PAPER_TRUCK                                     :Caminhão de Papel Balogh
 STR_80A1_MPS_PAPER_TRUCK                                        :Caminhão de Papel MPS
@@ -2517,9 +2517,9 @@ STR_80AD_RMT_RUBBER_TRUCK                                       :Caminhão de Bo
 STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :Caminhão de Açúcar MightyMover
 STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Caminhão de Açúcar Powernaught
 STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Caminhão de Açúcar Wizzowow
-STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :Caminhão de Cola MightyMover
-STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Caminhão de Cola Powernaught
-STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Caminhão de Cola Wizzowow
+STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :Caminhão de Xarope MightyMover
+STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Caminhão de Xarope Powernaught
+STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Caminhão de Xarope Wizzowow
 STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :Caminhão de Algodão Doce MightyMover
 STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Caminhão de Algodão Doce Powernaught
 STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Caminhão de Algodão Doce Wizzowow
@@ -2801,12 +2801,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Reseta a
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reseta o contador de atraso, fazendo o veículo estar na hora
 STR_SERVICE_HINT                                                :{BLACK}Pular esta ordem a menos que necessite de manutenção
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Quebrado
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_S}  {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Velocidade Máx.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Força: {LTBLUE}{POWER}{BLACK} Velocidade Max: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Lucro anual: {LTBLUE}{CURRENCY}  (último ano: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Confiabilidade: {LTBLUE}{COMMA}%  {BLACK}Quebras desde a última manutenção: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Quebrado
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_8861_STOPPED                                                :{RED}Parado
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Impossível fazer o trem passar o sinal de perigo...
 STR_8863_CRASHED                                                :{RED}Acidentado!
@@ -2815,7 +2815,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Renomear
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Impossível renomear trem...
 STR_8867_NAME_TRAIN                                             :{BLACK}Renomear trem
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Acidente Ferroviário!{} {COMMA} mortos numa explosão após a colisão
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Impossível inverter a direção do trem...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Impossível inverter a direção do trem...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossível virar o veículo...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Impossível virar veículos formados por unidades múltiplas
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomear tipo de veículo ferroviário
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Impossível renomear tipo de veículo ferroviário...
 STR_CLEAR_TIME                                                  :{BLACK}Resetar horário
@@ -2903,8 +2905,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Cidadãos celebram . . .{}Primeiro bonde de carga chega a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Acidente Rodoviário!{} Condutor morre numa explosão após a colisão com um trem
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Acidente Rodoviário!{} {COMMA} mortos numa explosão após a colisão com um trem
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Impossível fazer o veículo dar a volta...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Impossível virar veículos formados por unidades múltiplas
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossível virar o veículo...
 STR_9034_RENAME                                                 :{BLACK}Renomear
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomear tipo do automóvel
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomear tipo do automóvel
@@ -3166,7 +3167,7 @@ STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Arquivo
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Carregado compativel com GRF(s)  por falta de arquivo
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}arquivo(s) GRF em falta foram desativados
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Arquivo(s) GRF faltantes
-STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Despausar pode travar OpenTTD. Não envie relatórios de erros sobre travas subseqüentes.{}Você realmente quer despausar?
+STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Despausar pode travar OpenTTD. Não envie relatórios de erros sobre travas subsequentes.{}Você realmente quer despausar?
 
 STR_NEWGRF_BROKEN                                               :{WHITE} '{0:STRING}' tem altas chances de causar desincronias e/ou travamentos.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Muda o tamanho de um veículo para '{1:ENGINE}' apesar de não estar em um depósito.
@@ -3284,14 +3285,14 @@ STR_MAGLEV_VEHICLES                                             :Trem-Bala
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK}   Potência: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK} Potência: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Manutenção: {GOLD}{CURRENCY}/ano
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Desenvolvida: {GOLD}{NUM}{BLACK} Vida: {GOLD}{COMMA} anos
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Confiabilidade Máx.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Custo: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{COMMA} passageiros, {COMMA} sacos de cartas
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_S}
@@ -3385,9 +3386,9 @@ STR_HELIDEPOT                                                   :{BLACK}Deposito
 STR_HELISTATION                                                 :{BLACK}Heli-estação
 
 STR_SMALL_AIRPORTS                                              :{BLACK}Aeroportos pequenos
-STR_LARGE_AIRPORTS                                              :{BLACK}Aeroportos Grandes
+STR_LARGE_AIRPORTS                                              :{BLACK}Aeroportos grandes
 STR_HUB_AIRPORTS                                                :{BLACK}Aeroportos modulares
-STR_HELIPORTS                                                   :{BLACK}Aeroportos de helicópteros
+STR_HELIPORTS                                                   :{BLACK}Heliportos
 
 ############ Tooltip measurment
 
@@ -3412,15 +3413,15 @@ STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...é um
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...rua na direção errada
 
 STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opções de Transparência
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Alternar transparência para sinais de estação
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Alternar transparência para árvores
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Alternar transparência para casas
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Alternar transparência para indústrias
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Alternar transparência para construções como estações, depósitos, pontos de controle e eletrificação da ferrovia
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Alternar transparência para pontes
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Alternar transparência para estruturas como faróis e antenas, talvez no futuro para efeitos visuais
+STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Alternar transparência para sinais de estação. Ctrl+Clique para travar.
+STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Alternar transparência para árvores. Ctrl+Clique para travar.
+STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Alternar transparência para casas. Ctrl+Clique para travar.
+STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Alternar transparência para indústrias. Ctrl+Clique para travar.
+STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Alternar transparência para construções como estações, depósitos, pontos de controle e eletrificação da ferrovia. Ctrl+Clique para travar.
+STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Alternar transparência para pontes. Ctrl+Clique para travar.
+STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Alternar transparência para estruturas como faróis e antenas. Ctrl+Clique para travar.
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Alternar transparência para catenária. CTRL+click para travar.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Altera transparência para os indicadores de carga
+STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Altera transparência para os indicadores de carga. Ctrl+Clique para travar.
 STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Definir objetivos como invisíveis ao invés de transparentes.
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3492,7 +3493,7 @@ STR_FACE_SIMPLE                                                 :{BLACK}Simples
 STR_FACE_SIMPLE_TIP                                             :{BLACK}Seleção de face simples.
 STR_FACE_LOAD                                                   :{BLACK}Carregar
 STR_FACE_LOAD_TIP                                               :{BLACK}Carregar face favorita
-STR_FACE_LOAD_DONE                                              :{WHITE}Sua face favorita foi carregada do arquivo de configuração do OpenTTD.
+STR_FACE_LOAD_DONE                                              :{WHITE}Seu rosto favorito foi carregado do arquivo de configuração do OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Número da face do jogador.
 STR_FACE_FACECODE_TIP                                           :{BLACK}Ver e/ou alterar número da face do jogador
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Ver e/ou alterar número da face do jogador
@@ -3500,7 +3501,7 @@ STR_FACE_FACECODE_SET                                           :{WHITE}Novo có
 STR_FACE_FACECODE_ERR                                           :{WHITE}Não pode alterar o número de face do jogador  precisa ser um número entre 0 e 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Salvar
 STR_FACE_SAVE_TIP                                               :{BLACK}Salvar face favorita
-STR_FACE_SAVE_DONE                                              :{WHITE}Esta face irá ser salva como sua face favorita no arquivo de configuração do OpenTTD.
+STR_FACE_SAVE_DONE                                              :{WHITE}Este rosto irá ser salvo como seu rosto favorito no arquivo de configuração do OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Europeu
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Selecione faces européias
 STR_FACE_AFRICAN                                                :{BLACK}Africano

src/lang/bulgarian.txt

@@ -666,7 +666,6 @@ STR_OFF                                                         :изключе
 STR_SUMMARY                                                     :Обобщение
 STR_FULL                                                        :Пълно
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Списък от градовете
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -704,6 +703,7 @@ STR_02DE_MAP_OF_WORLD                                           :Карта на
 STR_EXTRA_VIEW_PORT                                             :Допълнителна камера
 STR_SIGN_LIST                                                   :Списък с табели
 STR_02DF_TOWN_DIRECTORY                                         :Списък със селищата
+STR_02BB_TOWN_DIRECTORY                                         :Списък от градовете
 STR_TOWN_POPULATION                                             :{BLACK}Световна популация: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Камера {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Преместване на камерата
@@ -730,6 +730,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Авто
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Интервала между две автозаписваня
 STR_02F7_OFF                                                    :изключено
+STR_AUTOSAVE_1_MONTH                                            :всеки месец
 STR_02F8_EVERY_3_MONTHS                                         :всеки 3 месеца
 STR_02F9_EVERY_6_MONTHS                                         :всеки 6 месеца
 STR_02FA_EVERY_12_MONTHS                                        :всеки 12 месеца
@@ -849,7 +850,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Базо
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Изберете базов графичен набор
 
-STR_AUTOSAVE_1_MONTH                                            :всеки месец
 STR_AUTOSAVE_FAILED                                             :{WHITE}Автозапазването е неуспешно
 
 STR_MONTH_JAN                                                   :Януари
@@ -2793,7 +2793,7 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Име
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Не може да сложи име...
 STR_8867_NAME_TRAIN                                             :{BLACK}Име на влак
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Влакова катастрофа!{}{COMMA} умрели в огнената експлозия
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Не може да обърне посоката на влак...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Не може да обърне посоката на влак...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Преименуване на влак
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Не може да се преименува влак...
 STR_CLEAR_TIME                                                  :{BLACK}Изчисти времето
@@ -2881,8 +2881,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Гражданите празнуват . . .{}Първият товарен трамвай пристигна на {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}Шофьор загина на място при екплозия на МПС след сблъсък с влак
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Пътно-транспортно Произшествие!{}{COMMA} загинаха на място при екплозия на МПС след сблъсък с влак
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Не може да обърнеш МПС-то...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Не може да обърне превозно средство състоящо се от няколко елемента
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Не може да обърне превозно средство състоящо се от няколко елемента
 STR_9034_RENAME                                                 :{BLACK}Преименувай
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Преименувай МПС-то
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Преименувай МПС-то

src/lang/catalan.txt

@@ -665,7 +665,6 @@ STR_OFF                                                         :Fora
 STR_SUMMARY                                                     :Resum
 STR_FULL                                                        :Complet
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Directori de Poblacions
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -703,6 +702,7 @@ STR_02DE_MAP_OF_WORLD                                           :Mapa del món
 STR_EXTRA_VIEW_PORT                                             :Vista extra
 STR_SIGN_LIST                                                   :Llista de senyals
 STR_02DF_TOWN_DIRECTORY                                         :Directori de Poblacions
+STR_02BB_TOWN_DIRECTORY                                         :Directori de Poblacions
 STR_TOWN_POPULATION                                             :{BLACK}Població mundial: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vista {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copia a la vista
@@ -729,6 +729,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Desa aut
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Selecciona l'interval en que el joc es desa automàticament
 STR_02F7_OFF                                                    :Inactiu
+STR_AUTOSAVE_1_MONTH                                            :Cada mes
 STR_02F8_EVERY_3_MONTHS                                         :Cada 3 mesos
 STR_02F9_EVERY_6_MONTHS                                         :Cada 6 mesos
 STR_02FA_EVERY_12_MONTHS                                        :Cada 12 mesos
@@ -849,7 +850,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Conjunt
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Selecciona el conjunt de gràfics bàsics a utilitzar
 
-STR_AUTOSAVE_1_MONTH                                            :Cada mes
 STR_AUTOSAVE_FAILED                                             :{WHITE}Ha fallat el desat automàtic
 
 STR_MONTH_JAN                                                   :Gener
@@ -1288,7 +1288,7 @@ STR_NETWORK_ENTER_IP                                            :{BLACK}Entra l'
 
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en línia / clients màxim
+STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en línia / clients màxim{}Companyies en línia / companyies màxim
 
 STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
 STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Mida del Mapa
@@ -1301,14 +1301,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anys
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombre d'anys{}el joc està corrent
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓ DEL JOC
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Grup de cel·les:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Mida del mapa:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versió del servidor:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Grup de cel·les: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Mida del mapa: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versió del servidor: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adreça del servidor:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Data inicial:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Data inicial: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protegit per contrasenya!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR DESCONNECTAT
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR PLÉ
@@ -1390,7 +1390,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Letó
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Lobby de partida multijugador
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparant per connectar:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparant per connectar: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Una llista de totes les empreses actuals en aquest joc. Pots utilitzar-ne una o bé iniciar-ne una de nova si hi ha algun lloc lliure
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova Empresa
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Obre una nova Empresa
@@ -1403,16 +1403,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Actualit
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMACIÓ DE L'EMPRESA
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom companyia:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguració:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valor de la companyia:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanç actual:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingressos de l'últim any:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendiment:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom companyia: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguració: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Valor de la companyia: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanç actual: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingressos de l'últim any: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendiment: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estacions:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Jugadors:  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Estacions: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Jugadors: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connectant...
 
@@ -1439,23 +1439,23 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Llista d
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Espectador
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Companyia
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} No s'han trobat dispositius de xarxa o s'ha compilat sense l'opció ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} No es pot trobar cap joc a la xarxa
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} El servidor no ha contestat a la petició
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} No s'ha pogut connectar degut a una diferència de NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Ha fallat la sincronització del joc de xarxa.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} S'ha perdut la connexió al joc de xarxa.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} No es pot carregar un joc desat al servidor.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} No s'ha pogut iniciar el servidor.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} No es pot connectar.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La connexió #{NUM} ha esgotat el temps d'espera.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} S'ha obtingut un error de protocol i s'ha tancat la connexió.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La revisió d'aquest client no concorda amb la revisió del servidor.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Contrasenya incorrecta.
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} El servidor és ple
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Estàs exclòs d'aquest servidor
-STR_NETWORK_ERR_KICKED                                          :{WHITE} T'han fet fora del servidor
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} No es permet fer trampes en aquest servidor
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}No s'han trobat dispositius de xarxa o s'ha compilat sense l'opció ENABLE_NETWORK
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}No s'ha pogut trobar cap joc en xarxa
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}El servidor no ha contestat a la petició
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}No s'ha pogut connectar degut a una diferència de NewGRF
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}Ha fallat la sincronització del joc en xarxa.
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}S'ha perdut la connexió al joc en xarxa.
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}No s'ha pogut carregar el joc desat
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}No s'ha pogut iniciar el servidor
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}No s'ha pogut connectar
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}La connexió #{NUM} ha esgotat el temps d'espera
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}S'ha obtingut un error de protocol i s'ha tancat la connexió
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}La revisió d'aquest client no concorda amb la revisió del servidor
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Contrasenya incorrecta
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}El servidor està ple
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Estàs exclòs d'aquest servidor
+STR_NETWORK_ERR_KICKED                                          :{WHITE}T'han fet fora del joc
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}No es permet fer trampes en aquest servidor
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :error general
@@ -1468,7 +1468,7 @@ STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :no autoritzat
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :s'ha rebut un paquet estrany
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisió incorrecta
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nom ja utilitzat
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrasenya de joc incorrecta
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrasenya incorrecta
 STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :id-companyia erroni en DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :tret pel servidor
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :s'ha intentat utilitzar una trampa
@@ -1588,27 +1588,27 @@ STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Seleccio
 STR_1021_RAILROAD_TRACK                                         :Via de tren
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Cotxeres de tren
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...l'àrea és propietat d'una altra companyia
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Via de tren amb senyals normals
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Via de tren amb senyals tram
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Via de tren amb pre-senyals
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Via de tren amb senyals de sortida
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Via de tren amb senyals combinades
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Via de tren amb senyals avançades
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Via de tren amb senyals avançades d'un sentit
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Via de tren amb senyals normals i pre-senyals
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Via de tren amb senyals normals i senyals de sortida
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Via de tren amb senyals normals i senyals combinades
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Via de tren amb senyals normals i avançades
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Via de tren amb senyals normals i avançades d'un sentit
+STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Via de tren amb senyals de camí
+STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Via de tren amb senyals de camí d'un sentit
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Via de tren amb senyals tram i pre-senyals
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Via de tren amb senyals tram i senyals de sortida
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Via de tren amb senyals tram i senyals combinades
+STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Via de tren amb senyals tram i de camí
+STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Via de tren amb senyals tram i de camí d'un sentit
 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Via de tren amb pre-senyals i senyals de sortida
 STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Via de tren amb pre-senyals i senyals combinades
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Via de tren amb senyals pre- i avançades
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Via de tren amb senyals pre- i avançades d'un sentit
+STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Via de tren amb senyals pre- i de camí
+STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Via de tren amb senyals pre- i de camí d'un sentit
 STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Via de tren amb senyals de sortida i senyals combinades
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Via de tren amb senyals sortida- i avançades
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Via de tren amb senyals sortida- i avançades d'un sentit
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Via de tren amb senyals combo- i avançades
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Via de tren amb senyals combo- i avançades d'un sentit
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Via de tren amb senyals avançades i avançades d'un sentit
+STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Via de tren amb senyals sortida- i de camí
+STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Via de tren amb senyals sortida- i de camí d'un sentit
+STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Via de tren amb senyals combo- i de camí
+STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Via de tren amb senyals combo- i de camí d'un sentit
+STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Via de tren amb senyals de camí i de camí d'un sentit
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Primer has de treure la via de l'estació
 STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construir una estació separada
 STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Ajuntar estació
@@ -1752,14 +1752,14 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Construeix una
 STR_204B_FUND_NEW_BUILDINGS                                     :Financia nous edificis
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Compra els drets de transport en exclusiva
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Suborna les autoritats locals
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Inicia una petita campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}  Cost: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Inicia una mitjana campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}  Cost: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Inicia una gran campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}  Cost: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Financia la reconstrucció de la xarxa local de carrers. Dificulta notablement el trànsit durant 6 mesos.{}  Cost: {CURRENCY}
-STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Construeix una estàtua en honor a la teva companyia.{} Cost: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financia la construcció de nous edificis comercials a la població.{}  Cost: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compra per 1 any els drets exclusius de transport en la població. La autoritat local només permetrà utilitzar les instal·lacions de la teva companyia de transports als passatgers i les mercaderies.{} Cost: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Suborna les autoritats locals per incrementar el teu rati, a risc de greus penalitzacions si et pesquen!!.{}  Cost: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Inicia una petita campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}Cost: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW}Inicia una mitjana campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}Cost: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Inicia una gran campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}Cost: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW}Financia la reconstrucció de la xarxa local de carrers. Dificulta notablement el trànsit durant 6 mesos.{}Cost: {CURRENCY}
+STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW}Construeix una estàtua en honor a la teva companyia.{}Cost: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}Financia la construcció de nous edificis comercials a la població.{}Cost: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}Compra per 1 any els drets exclusius de transport en la població. La autoritat local només permetrà utilitzar les instal·lacions de la teva companyia de transports als passatgers i les mercaderies.{}Cost: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Suborna les autoritats locals per incrementar el teu rati, a risc de greus penalitzacions si et pesquen!!.{}Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Caos de trànsit en  {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {STRING} porta 6 mesos de misèria als motoristes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -2206,7 +2206,7 @@ STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Gràfic de Rendiment d'Operacions
 STR_7026_BANK_BALANCE                                           :{WHITE}Balanç del Banc
 STR_7027_LOAN                                                   :{WHITE}Préstec
-STR_MAX_LOAN                                                    :{WHITE}Préstec Màxim:  {BLACK}{CURRENCY}
+STR_MAX_LOAN                                                    :{WHITE}Préstec Màxim: {BLACK}{CURRENCY}
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Demana {SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Amortitza {SKIP}{SKIP}{CURRENCY}
@@ -2721,17 +2721,17 @@ STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Vehicles
 
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Construeix Vehicle
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clona Vehicle
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Fa una còpia del vehicle. Control-Clic compartirà les ordres
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Fa una còpia del vehicle. Prem aquest botó i després en un vehicle dins o fora cotxeres. Control-Clic compartirà les ordres
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Fa una còpia del vehicle. Control+Clic compartirà les ordres
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Fa una còpia del vehicle. Prem aquest botó i després en un vehicle dins o fora cotxeres. Control+Clic compartirà les ordres
 STR_CLONE_TRAIN                                                 :{BLACK}Clona Tren
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Fa una còpia del tren inclosos tots els vagons. Control-Clic compartirà les ordres
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Fa una còpia del tren inclosos tots els vagons. Prem aquest botó i després en un tren dins o fora cotxeres. Control-Clic compartirà les ordres
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Fa una còpia del tren inclosos tots els vagons. Control+Clic compartirà les ordres
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Fa una còpia del tren inclosos tots els vagons. Prem aquest botó i després en un tren dins o fora cotxeres. Control+Clic compartirà les ordres
 STR_8820_RENAME                                                 :{BLACK}Reanomena
 STR_8823_SKIP                                                   :{BLACK}Salta
 STR_8824_DELETE                                                 :{BLACK}Esborra
 STR_8826_GO_TO                                                  :{BLACK}Ves a
 STR_REFIT                                                       :{BLACK}Remodela
-STR_REFIT_TIP                                                   :{BLACK}Selecciona quin tipus de càrrega vols remodelar en aquesta ordre. Control + Clic per eliminar l'ordre de remodelar
+STR_REFIT_TIP                                                   :{BLACK}Selecciona quin tipus de càrrega vols remodelar en aquesta ordre. Control+Clic per eliminar l'ordre de remodelar
 STR_REFIT_ORDER                                                 :(Remodela a {STRING})
 STR_REFIT_STOP_ORDER                                            :(Remodela a {STRING} i para)
 STR_STOP_ORDER                                                  :(Para)
@@ -2800,12 +2800,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Esborra
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reseteja el comptador de retards, de manera que el vehicle serà puntual
 STR_SERVICE_HINT                                                :{BLACK}Saltar l'ordre a menys que es necessiti manteniment
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Pes: {WEIGHT_S}{}Velocitat: {VELOCITY}  Potència: {POWER}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Avariat
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Pes: {LTBLUE}{WEIGHT_S}  {BLACK}Potència: {LTBLUE}{POWER}{BLACK} Vel. Max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Pes: {LTBLUE}{WEIGHT_S} {BLACK}Potència: {LTBLUE}{POWER}{BLACK} Vel. Max: {LTBLUE}{VELOCITY} {BLACK}T.E. Max.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Avaries des de l'últim manteniment: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Avariat
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
 STR_8861_STOPPED                                                :{RED}Parat
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}No pots fer que un tren passi d'una senyal amb perill...
 STR_8863_CRASHED                                                :{RED}Accident!
@@ -2814,7 +2814,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Anomena
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}No es pot anomenar el tren...
 STR_8867_NAME_TRAIN                                             :{BLACK}Anomena tren
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident de Tren!{}{COMMA} moren en una bola de foc després de la col·lisió
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No es pot invertir la direcció del tren...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}No es pot invertir la direcció del tren...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}No s'ha pogut invertir el sentit del vehicle...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}No es poden girar vehicles que estan formats per múltiples unitats
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Reanomena el tipus d'element del tren
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}No es pot reanomenar el tipus d'element del tren...
 STR_CLEAR_TIME                                                  :{BLACK}Esborra Temps
@@ -2845,7 +2847,7 @@ STR_TIMETABLE_STATUS_EARLY                                      :Actualment aque
 STR_TIMETABLE_TOTAL_TIME                                        :L'horari tardarà {STRING} a complir-se
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :L'horari tardarà almenys {STRING} a complir-se (no tot està planificat)
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autoomple
-STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Omple automàticament l'horari amb valors del dia següent (CTRL-clic per intentar mantenir les hores)
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Omple automàticament l'horari amb valors del proper viatge (CTRL+clic per intentar mantenir els temps d'espera)
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automòbil en camí
@@ -2902,8 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Els ciutadans celebren . . .{}El primer tramvia de mercaderies arriba a {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident d'automòbil!{}El conductor mor en una bola de foc després de la col·lisió amb un tren
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident d'automòbil!{}{COMMA} moren en una bola de foc després d'una col·lisió amb un tren
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}No es pot fer que el vehicle torni...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}No es poden girar vehicles que estan formats per múltiples unitats
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}No s'ha pogut fer girar el vehicle...
 STR_9034_RENAME                                                 :{BLACK}Reanomena
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Reanomena tipus d'automòbil
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Reanomena tipus d'automòbil
@@ -2926,8 +2927,8 @@ STR_9805_SHIPS                                                  :{WHITE}{COMPANY
 STR_9808_NEW_SHIPS                                              :{WHITE}Nous Vaixells
 STR_9809_BUILD_SHIP                                             :{BLACK}Construeix Vaixell
 STR_CLONE_SHIP                                                  :{BLACK}Clona Vaixell
-STR_CLONE_SHIP_INFO                                             :{BLACK}Fa una còpia del vaixell. Control-Clic compartirà les ordres
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Fa una còpia del vaixell. Prem aquest botó i després en un vaixell dins o fora les drassanes. Control-Clic compartirà les ordres
+STR_CLONE_SHIP_INFO                                             :{BLACK}Fa una còpia del vaixell. Control+Clic compartirà les ordres
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Fa una còpia del vaixell. Prem aquest botó i després en un vaixell dins o fora les drassanes. Control+Clic compartirà les ordres
 STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}El vaixell s'ha de parar a la drassana
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}No es pot vendre el vaixell...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}No es pot construir el vaixell...
@@ -2992,8 +2993,8 @@ STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Aquí no
 STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION} Hangar d'Avions
 STR_A003_NEW_AIRCRAFT                                           :{BLACK}Nou Avió
 STR_CLONE_AIRCRAFT                                              :{BLACK}Clona Avió
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Fa una còpia de l'avió. Control-Clic compartirà les ordres
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Fa una còpia de l'avió. Prem aquest botó i després en un avió dins o fora l'hangar. Control-Clic compartirà les ordres
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Fa una còpia de l'avió. Control+Clic compartirà les ordres
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Fa una còpia de l'avió. Prem aquest botó i després en un avió dins o fora l'hangar. Control+Clic compartirà les ordres
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nou Avió
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construeix Avió
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}No es pot construir l'avió...
@@ -3283,14 +3284,14 @@ STR_MAGLEV_VEHICLES                                             :Trens Maglev
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Pes: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocitat: {GOLD}{VELOCITY}{BLACK}   Potència: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocitat: {GOLD}{VELOCITY}{BLACK} Potència: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Velocitat: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cost d'utilització: {GOLD}{CURRENCY}/any
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitat: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Dissenyat: {GOLD}{NUM}{BLACK} Vida: {GOLD}{COMMA} anys
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Rendiment: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pes: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pes: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Velocitat: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitat: {GOLD}{COMMA} passatgers, {COMMA} sacs de correu
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagons Automotrius: {GOLD}+{POWER}{BLACK} Pes: {GOLD}+{WEIGHT_S}
@@ -3411,15 +3412,15 @@ STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...aques
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...sentit de la carretera en la direcció incorrecta
 
 STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opcions de transparència
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Activa/Desactiva transparència dels rètols d'estació
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Activa/Desactiva transparència dels arbres
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Activa/Desactiva transparència de les cases
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Activa/Desactiva transparència de les indústries
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Activa/Desactiva transparència dels edificis com ara estacions, cotxeres, punts de trobada i catenàries
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Activa/Desactiva transparència dels ponts
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Activa/Desactiva transparència de les estructures com ara fars i antenes
+STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Commuta la transparència dels rètols d'estació. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Commuta la transparència dels arbres. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Commuta la transparència de les cases. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Commuta la transparència de les indústries. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Commuta la transparència dels edificis com ara estacions, cotxeres, punts de trobada i catenàries. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Commuta la transparència dels ponts. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Commuta la transparència de les estructures com ara fars i antenes. Ctrl+Clic per bloquejar.
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Commuta la transparència de la catenària. CTRL+clic per bloquejar.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Activa/Desactiva la transparència pels indicadors de carregament
+STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Commuta la transparència dels indicadors de càrrega. Ctrl+Clic per bloquejar.
 STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Mostra els objectes invisibles enlloc de transparents
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3535,19 +3536,19 @@ STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Canvia l
 ############ signal GUI
 STR_SIGNAL_SELECTION                                            :{WHITE}Selecció de senyals
 STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Aquí no es pot convertir les senyals...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Senyal estàndard (semàfor){}Les senyals són necessàries per impedir que els trens s'accidentin en xarxes de ferrocarrils amb més d'un tren.
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Senyal de tram (semàfor){}Aquest es el tipus més bàsic de senyal, permetent només un tren en el mateix tram a la vegada.
 STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Senyal d'entrada (semàfor){}En verd mentre hi hagi una o més senyals de sortida en verd en la secció següent de vies. En cas contrari està en vermell.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Senyal de Sortida (semàfor){}Es comporta com una senyal normal però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinada.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Senyal de Sortida (semàfor){}Es comporta com una senyal de tram però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinada.
 STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Senyal Combinada (semàfor){}La senyal combinada simplement actua com a senyal d'entrada i sortida. Això permet construir grans extensions de pre-senyals.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Senyal avançada (semàfor){}Una senyal avançada permet entrar dins d'un bloc de senyal a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals avançades poden ser passades des de darrera.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Senyal avançada d'un sentit (semàfor){}Una senyal avançada permet entrar dins d'un bloc de senyal a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals avançades d'un sentit poden ser passades des de darrera.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Senyal estàndard (elèctrica){}Les senyals són necessàries per impedir que els trens s'accidentin en xarxes de ferrocarrils amb més d'un tren.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Senyal de camí (semàfor){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí poden ser passades des de darrera.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Senyal de camí d'un sentit (semàfor){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí d'un sentit poden ser passades des de darrera.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Senyal de tram (elèctrica){}Aquest es el tipus més bàsic de senyal, permeten entrar a cada tram només un tren a la vegada.
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Senyal d'entrada (elèctrica){}En verd mentre hi hagi una o més senyals de sortida en verd en la secció següent de vies. En cas contrari està en vermell.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Senyal de Sortida (elèctrica){}Es comporta com una senyal normal però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinada.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Senyal de Sortida (elèctrica){}Es comporta com una senyal de tram però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinades.
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Senyal Combinada (elèctrica){}La senyal combinada simplement actua com a senyal d'entrada i sortida. Això permet construir grans extensions de pre-senyals.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Senyal Avançada (elèctrica){}Una senyal avançada permet entrar dins d'un bloc de senyal a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals avançades poden ser passades des de darrera.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Senyal avançada d'un sentit (elèctrica){}Una senyal avançada permet entrar dins d'un bloc de senyal a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals avançades d'un sentit poden ser passades des de darrera.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Conversió de senyals{}Quan esta seleccionat, clicant una senyal existent la converteix en el tipus de senyal seleccionada i variants, CTRL-clic commuta la variant existent.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Senyal de camí (elèctrica){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí estàndard poden ser passades des de darrera.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Senyal de camí d'un sentit (elèctrica){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí d'un sentit poden ser passades des de darrera.
+STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Conversió de senyals{}Quan esta seleccionat, clicant una senyal existent la converteix en el tipus de senyal seleccionada i variants, CTRL+Clic commuta la variant existent.
 STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Densitat de senyals en arrossegar
 STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Disminueix la densitat de senyals en arrossegar
 STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Incrementa la densitat de senyals en arrossegar

src/lang/croatian.txt

@@ -730,7 +730,6 @@ STR_OFF                                                         :Isključeno
 STR_SUMMARY                                                     :Sažetak
 STR_FULL                                                        :Puno
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Popis gradova
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -768,6 +767,7 @@ STR_02DE_MAP_OF_WORLD                                           :Karta svijeta
 STR_EXTRA_VIEW_PORT                                             :Dodatni pogled
 STR_SIGN_LIST                                                   :Popis znakova
 STR_02DF_TOWN_DIRECTORY                                         :Direktorij gradova
+STR_02BB_TOWN_DIRECTORY                                         :Popis gradova
 STR_TOWN_POPULATION                                             :{BLACK}Svjetsko stanovništvo: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Pogled {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopiraj u pogled
@@ -794,6 +794,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Automats
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Odaberi interval između automatskih spremanja igre
 STR_02F7_OFF                                                    :Isključeno
+STR_AUTOSAVE_1_MONTH                                            :Svaki mjesec
 STR_02F8_EVERY_3_MONTHS                                         :Svaka 3 mjeseca
 STR_02F9_EVERY_6_MONTHS                                         :Svakih 6 mjeseci
 STR_02FA_EVERY_12_MONTHS                                        :Svakih 12 mjeseci
@@ -914,7 +915,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Osnovni
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Odaberi osnovni grafički set za igru
 
-STR_AUTOSAVE_1_MONTH                                            :Svaki mjesec
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatsko spremanje neuspješno
 
 STR_MONTH_JAN                                                   :Siječanj
@@ -2879,7 +2879,7 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Imenuj v
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nije moguće imenovati vlak...
 STR_8867_NAME_TRAIN                                             :{BLACK}Imenuj vlak
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Vlak se sudario!{}{COMMA} poginu{P o la lih} u eksploziji nakon sudara
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nije moguće promijeniti smjer vlaka...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nije moguće promijeniti smjer vlaka...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Preimenuj vrstu vagona
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nije moguće preimenovati vrstu vagona...
 STR_CLEAR_TIME                                                  :{BLACK}Obriši vrijeme
@@ -2967,8 +2967,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Građani slave . . .{}Prvi teretni tramvaj je stigao na postaju {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}Vozač poginuo u eksploziji nakon sudara s vlakom
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}{COMMA} poginulih u eksploziji nakon sudara s vlakom
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nije moguće natjerati vozilo da se okrene...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Ne mogu okreniti vozila koja se sastoje od više jedinica
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne mogu okreniti vozila koja se sastoje od više jedinica
 STR_9034_RENAME                                                 :{BLACK}Preimenuj
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Preimenuj vrstu cestovnog vozila
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Preimenuj vrstu cestovnog vozila

src/lang/czech.txt

@@ -733,7 +733,6 @@ STR_OFF                                                         :Vypnuto
 STR_SUMMARY                                                     :Shrnutí
 STR_FULL                                                        :Plná
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Seznam měst
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -771,6 +770,7 @@ STR_02DE_MAP_OF_WORLD                                           :Mapa světa
 STR_EXTRA_VIEW_PORT                                             :Další pohled
 STR_SIGN_LIST                                                   :Seznam popisků
 STR_02DF_TOWN_DIRECTORY                                         :Seznam měst
+STR_02BB_TOWN_DIRECTORY                                         :Seznam měst
 STR_TOWN_POPULATION                                             :{BLACK}Populace světa: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Pohled {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Nastavit jako pohled
@@ -797,6 +797,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Automati
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Volba intervalu mezi automatickým ukládáním hry
 STR_02F7_OFF                                                    :Vypnuto
+STR_AUTOSAVE_1_MONTH                                            :Každý měsíc
 STR_02F8_EVERY_3_MONTHS                                         :Každé 3 měsíce
 STR_02F9_EVERY_6_MONTHS                                         :Každých 6 měsíců
 STR_02FA_EVERY_12_MONTHS                                        :Každých 12 měsíců
@@ -917,7 +918,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Základn
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Zvolte základní sadu grafiky
 
-STR_AUTOSAVE_1_MONTH                                            :Každý měsíc
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatické uložení selhalo
 
 STR_MONTH_JAN                                                   :Leden
@@ -2197,12 +2197,12 @@ STR_NUM_VERY_LOW                                                :velmi nízké
 STR_6816_LOW                                                    :nízké
 STR_6817_NORMAL                                                 :střední
 STR_6818_HIGH                                                   :vysoké
-STR_02BF_CUSTOM                                                 :Vlastní
+STR_02BF_CUSTOM                                                 :vlastní
 STR_6819                                                        :{BLACK}{SMALLLEFTARROW}
 STR_681A                                                        :{BLACK}{SMALLRIGHTARROW}
 STR_681B_VERY_SLOW                                              :velmi nízká
 STR_681C_SLOW                                                   :nízká
-STR_681D_MEDIUM                                                 :středně vysoká
+STR_681D_MEDIUM                                                 :střední
 STR_681E_FAST                                                   :vysoká
 STR_681F_VERY_FAST                                              :velmi vysoká
 STR_VERY_LOW                                                    :velmi nízká
@@ -2308,7 +2308,7 @@ STR_7049_SELECT_MALE_FACES                                      :{BLACK}Zvolit m
 STR_704A_SELECT_FEMALE_FACES                                    :{BLACK}Zvolit ženské obličeje
 STR_704B_GENERATE_RANDOM_NEW_FACE                               :{BLACK}Vytvořit náhodnou novou tvář
 STR_704C_KEY                                                    :{BLACK}Legenda
-STR_704D_SHOW_KEY_TO_GRAPHS                                     :{BLACK}Ukázat legendu ke grafům
+STR_704D_SHOW_KEY_TO_GRAPHS                                     :{BLACK}Zobrazit legendu ke grafům
 STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Zobrazit podrobné hodnocení výkonu
 STR_704E_KEY_TO_COMPANY_GRAPHS                                  :{WHITE}Legenda ke grafům společností
 STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY                           :{BLACK}Klepni zde pro přepnuti zobrazení společnosti na grafu
@@ -2874,12 +2874,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Zrušit
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Smazat zpoždění, takže vozidlo pojede na čas
 STR_SERVICE_HINT                                                :{BLACK}Přeskoč tento cíl, pokud není potřeba pravidelná údržba
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rychlost: {VELOCITY}  Výkon: {POWER}{}Cena provozu: {CURRENCY} ročně{}Kapacita: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Porucha
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Stáří: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} ročně
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_S}  {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_S} {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY} {BLACK}Max. tažná síla: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Příjem tento rok: {LTBLUE}{CURRENCY}  (minulý rok: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Porucha
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Stáří: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} ročně
 STR_8861_STOPPED                                                :{RED}Zastaveno
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Nemohu vlak nechat projet semafory v nebezpečí...
 STR_8863_CRASHED                                                :{RED}Nehoda!
@@ -2888,7 +2888,7 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Pojmenov
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Nelze pojmenovat vlak...
 STR_8867_NAME_TRAIN                                             :{BLACK}Pojmenovat vlak
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Železniční neštěstí!{}Při srážce {COMMA} {P člověk lidé lidí} přiš{P el li lo} o život v plamenech.
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nelze obrátit vlak...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nelze obrátit vlak...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Přejmenovat typ železničního vozidla
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nemohu přejmenovat typ železničního vozidla...
 STR_CLEAR_TIME                                                  :{BLACK}Smazat čas
@@ -2976,8 +2976,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První nákladní tramvaj přijíždí do {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Dopravní nehoda!{}Řidič zahynul v plamenech při srážce s vlakem
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Dopravní nehoda!{}{COMMA} {P člověk lidé lidí} zahynul{P "" i o} v plamenech při srážce s vlakem
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Nelze otočit vozidlo...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Nelze otáčet vozidla složená z více strojů
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nelze otáčet vozidla složená z více strojů
 STR_9034_RENAME                                                 :{BLACK}Přejmenovat
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Přejmenovat typ silničního vozidla
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Přejmenovat typ silničního vozidla

src/lang/danish.txt

@@ -621,7 +621,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Placér
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Placér fyrtårn
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Placér sender
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definer ørkenområde.{}Hold CTRL nede for at fjerne det
-STR_CREATE_LAKE                                                 :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten holdes ved havniveau, hvorved omgivelserne oversvømmes i stedet
+STR_CREATE_LAKE                                                 :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten bruges ved havniveau, da omgivelserne i stedet vil blive oversvømmet
 STR_CREATE_RIVER                                                :{BLACK}Placér floder.
 STR_0290_DELETE                                                 :{BLACK}Slet
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slet denne by fuldstændigt
@@ -665,7 +665,6 @@ STR_OFF                                                         :Fra
 STR_SUMMARY                                                     :Kortfattet
 STR_FULL                                                        :Fuld
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Byoversigt
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -703,6 +702,7 @@ STR_02DE_MAP_OF_WORLD                                           :Kort over verde
 STR_EXTRA_VIEW_PORT                                             :Nyt lokalitetsvindue
 STR_SIGN_LIST                                                   :Liste over skilte
 STR_02DF_TOWN_DIRECTORY                                         :Byoversigt
+STR_02BB_TOWN_DIRECTORY                                         :Byoversigt
 STR_TOWN_POPULATION                                             :{BLACK}Verdens befolkning: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Lokalitetsvindue {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Hent global
@@ -729,6 +729,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Automati
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Vælg interval imellem automatisk gemning
 STR_02F7_OFF                                                    :Fra
+STR_AUTOSAVE_1_MONTH                                            :Hver måned
 STR_02F8_EVERY_3_MONTHS                                         :Hver 3. måned
 STR_02F9_EVERY_6_MONTHS                                         :Hver 6. måned
 STR_02FA_EVERY_12_MONTHS                                        :Hver 12. måned
@@ -799,7 +800,7 @@ STR_TOWNNAME_CATALAN                                            :Catalanske
 ############ end of townname region
 
 STR_CURR_GBP                                                    :Pund (£)
-STR_CURR_USD                                                    :Dollar ($)
+STR_CURR_USD                                                    :Dollars ($)
 STR_CURR_EUR                                                    :Euro (€)
 STR_CURR_YEN                                                    :Yen (¥)
 STR_CURR_ATS                                                    :Østrisk Shilling (ATS)
@@ -849,7 +850,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Basis-gr
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Vælg det basis-grafiksæt der skal bruges
 
-STR_AUTOSAVE_1_MONTH                                            :Hver måned
 STR_AUTOSAVE_FAILED                                             :{WHITE}Fejl under autogem
 
 STR_MONTH_JAN                                                   :januar
@@ -886,7 +886,7 @@ STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delt ordreliste - -
 
 STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} kan ikke finde en rute at fortsætte ad.
-STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} er gået tabt.
+STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} er faret vild.
 STR_VEHICLE_IS_UNPROFITABLE                                     :{WHITE}{VEHICLE}s indtjening sidste år var {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europæisk fællesvaluta!{}{}Euroen er introduceret som eneste betalingsmiddel i dit land!
 
@@ -1301,14 +1301,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}År
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Antallet af år{}spillet varer
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPIL INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Klima:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Klima: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Start dato:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuværende dato:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Start dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuværende dato: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Beskyttet af kodeord!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVEREN ER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVEREN ER FULD
@@ -1390,7 +1390,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Lettisk
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Netværksspils lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Forbereder tilslutning:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Forbereder tilslutning: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}En liste over alle selskaber i spillet lige nu. Du kan enten tilslutte dig et eller starte et nyt, hvis der er plads til flere selskaber
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nyt selskab
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Opret et nyt selskab
@@ -1403,16 +1403,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Genopfri
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}SELSKABSINFO
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Selskabsnavn:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grundlagt:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Virksomhedens værdi:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuværende beholdning:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Sidste års indtægt:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Præstation:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Selskabsnavn: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grundlagt: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Virksomhedens værdi: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuværende beholdning: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Sidste års indtægt: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Præstation: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Køretøjer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spillere:  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Køretøjer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Spillere: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Tilslutter...
 
@@ -1440,22 +1440,22 @@ STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Tilslut
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nyt firma
 
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ingen netværksheder fundet eller kompilet uden ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kunne ikke finde nogen netværksspil
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Serveren besvarede ikke denne forspørgsel
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kunne ikke tilslutte grundet NewGRF ulighed
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Netværks synkroniseringsfejl
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Netværksforbindelse mistet
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kunne ikke hente gemt spil
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Kunne ikke starte serveren
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Kunne ikke forbinde
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Forbindelsen #{NUM} svarer ikke
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Der opstod en protokol-fejl og forbindelse blev lukket
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Revisionen af denne klient passer ikke sammen med serverens revision
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Forkert kodeord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Serveren er fuld
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Du har forbud mod at bruge denne server
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Du blev smidt ud af spillet
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Snyderi er ikke tilladt på denne server
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kunne ikke finde nogen netværksspil
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Serveren besvarede ikke denne forspørgsel
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Kunne ikke tilslutte grundet NewGRF ulighed
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}Netværks synkroniseringsfejl
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Netværksforbindelse mistet
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kunne ikke hente gemt spil
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Kunne ikke starte serveren
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Kunne ikke forbinde
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Forbindelsen #{NUM} svarer ikke
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Der opstod en protokol-fejl og forbindelse blev lukket
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Revisionen af denne klient passer ikke sammen med serverens revision
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Forkert kodeord
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Serveren er fuld
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Du har forbud mod at bruge denne server
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Du blev smidt ud af spillet
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Snyderi er ikke tilladt på denne server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :generel fejl
@@ -1468,7 +1468,7 @@ STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikke autorisere
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :modtog en underlig pakke
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :forkert revision
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :navnet er allerede i brug
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :forkert spil password
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :forkert spil kodeord
 STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :forkert firma-id i DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :smidt ud af serveren
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :prøvede at snyde
@@ -1521,7 +1521,7 @@ STR_NETWORK_SEND                                                :{BLACK}Send
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kan ikke hente billedet fra PNG...
+STR_PNGMAP_ERROR                                                :{WHITE}Kan ikke hente landskab fra PNG...
 STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...filen blev ikke fundet.
 STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan ikke konvertere billedtype. Der skal bruges 8 eller 24-bit PNG.
 STR_PNGMAP_ERR_MISC                                             :{WHITE}...noget gik galt. Undskyld (Måske en ødelagt fil)
@@ -1588,10 +1588,10 @@ STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Vælg or
 STR_1021_RAILROAD_TRACK                                         :Jernbaneskinner
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Remise
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...området ejes af et andet selskab
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Jernbane med almindelige signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Jernbane med blok signaler
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Jernbane med præ-signaler
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Jernbane med exit-signaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbaneskinne med kombi-signaler
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbane med kombi-signaler
 STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Jernbane med avancerede signaler
 STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Jernbane med ensrettede avancerede signaler
 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Jernbanespor med normale og præ-signaler
@@ -2245,7 +2245,7 @@ STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Vis deta
 STR_704E_KEY_TO_COMPANY_GRAPHS                                  :{WHITE}Nøgle til selskabsgraf
 STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY                           :{BLACK}Klik her for at vise/skjule selskabets graf
 STR_7050_UNITS_OF_CARGO_DELIVERED                               :{WHITE}Afleveret last
-STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Selskabets ydelsesrate (maksimal=1000)
+STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Selskabets præstationsrang (maksimal rang=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Selskabsværdier
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Selskabsoversigt
 STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
@@ -2731,7 +2731,7 @@ STR_8823_SKIP                                                   :{BLACK}Spring o
 STR_8824_DELETE                                                 :{BLACK}Slet
 STR_8826_GO_TO                                                  :{BLACK}Gå til
 STR_REFIT                                                       :{BLACK}Ombyg
-STR_REFIT_TIP                                                   :{BLACK}Vælg hvilken lasttype der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
+STR_REFIT_TIP                                                   :{BLACK}Vælg hvilken lasttype, der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
 STR_REFIT_ORDER                                                 :(Ombyg til {STRING})
 STR_REFIT_STOP_ORDER                                            :(Ombyg til {STRING} og stop)
 STR_STOP_ORDER                                                  :(Stop)
@@ -2800,12 +2800,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nulstil
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nulstil forsinkelses-tæller, så transportmidlet kommer til tiden
 STR_SERVICE_HINT                                                :{BLACK}Spring denne ordre over medmindre der er behov for service
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Pris: {CURRENCY} Vægt: {WEIGHT_S}{}Hastighed: {VELOCITY}  Styrke: {POWER}{}Driftsomkostninger: {CURRENCY}/år{}Kapacitet: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Gået i stykker
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftsomkostninger: {LTBLUE}{CURRENCY}/år
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Vægt: {LTBLUE}{WEIGHT_S}  {BLACK}Styrke: {LTBLUE}{POWER}{BLACK} Maks. hastighed: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Vægt: {LTBLUE}{WEIGHT_S} {BLACK}Effekt: {LTBLUE}{POWER}{BLACK} Maks. hast.: {LTBLUE}{VELOCITY} {BLACK}Maks. trækkraft: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Afkast i år: {LTBLUE}{CURRENCY}  (sidste år: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålidelighed {LTBLUE}{COMMA}%  {BLACK}nedbrud siden sidste service: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Gået i stykker
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftsomkostninger: {LTBLUE}{CURRENCY}/år
 STR_8861_STOPPED                                                :{RED}Stoppet
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan ikke få toget til at passere signalet...
 STR_8863_CRASHED                                                :{RED}Forulykket!
@@ -2814,7 +2814,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Giv toge
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan ikke give toget navn...
 STR_8867_NAME_TRAIN                                             :{BLACK}Giv toget et navn
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tog forulykket!{}{COMMA} døde i flammerne efter kollision
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan ikke vende retningen af toget...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikke vende retningen af toget...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan ikke vende køretøjet om...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Omdøb tog-/togvognstypen
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
 STR_CLEAR_TIME                                                  :{BLACK}Nulstil tid
@@ -2902,8 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fragt-sporvogn ankommer til {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Lastbil forulykket!{}Chauffør dør i flammerne efter sammenstød med tog
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan ikke få køretøjet til at vende...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Tillader ikke køretøjer at vende om...
 STR_9034_RENAME                                                 :{BLACK}Omdøb
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Omdøb køretøjstypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Omdøb køretøjstypen

src/lang/dutch.txt

@@ -292,7 +292,7 @@ STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} ton
 STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg
 
 STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}l
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA} m³
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³
 
 STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} liter{P "" s}
 STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
@@ -307,16 +307,16 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Prestatiegrafie
 STR_0158_COMPANY_VALUE_GRAPH                                    :Bedrijfswaardegrafiek
 STR_0159_CARGO_PAYMENT_RATES                                    :Ladingsprijzen
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Bedrijfscompetitietabel
-STR_PERFORMANCE_DETAIL_MENU                                     :Detail prestatiewaarde
+STR_PERFORMANCE_DETAIL_MENU                                     :Gedetaileerde prestatiewaarde
 ############ range for menu ends
 
 STR_015B_OPENTTD                                                :{WHITE}Over OpenTTD
 STR_015C_SAVE_GAME                                              :Spel opslaan
 STR_015D_LOAD_GAME                                              :Spel laden
-STR_015E_QUIT_GAME                                              :Spel stoppen
+STR_015E_QUIT_GAME                                              :Verlaat spel
 STR_015F_QUIT                                                   :Afsluiten
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Weet je zeker dat je dit spel wilt afsluiten?
-STR_0161_QUIT_GAME                                              :{WHITE}Spel stoppen
+STR_0161_QUIT_GAME                                              :{WHITE}Verlaat spel
 STR_SORT_ORDER_TIP                                              :{BLACK}Selecteer sorteerrichting (aflopend/oplopend)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecteer sorteringscriteria
 STR_SORT_BY                                                     :{BLACK}Sorteer op
@@ -339,7 +339,7 @@ STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Waarde
 STR_SORT_BY_LENGTH                                              :Lengte
 STR_SORT_BY_LIFE_TIME                                           :Resterende levensverwachting
-STR_SORT_BY_FACILITY                                            :Station type
+STR_SORT_BY_FACILITY                                            :Stationstype
 STR_SORT_BY_WAITING                                             :Waarde van wachtende vracht
 STR_SORT_BY_RATING_MAX                                          :Vracht waardering
 STR_ENGINE_SORT_ENGINE_ID                                       :Motor ID (klassieke soort)
@@ -665,7 +665,6 @@ STR_OFF                                                         :Uit
 STR_SUMMARY                                                     :Kort
 STR_FULL                                                        :Volledig
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Stedenlijst
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -703,6 +702,7 @@ STR_02DE_MAP_OF_WORLD                                           :Kaart
 STR_EXTRA_VIEW_PORT                                             :Extra kijkvenster
 STR_SIGN_LIST                                                   :Bordenlijst
 STR_02DF_TOWN_DIRECTORY                                         :Stedenlijst
+STR_02BB_TOWN_DIRECTORY                                         :Stedenlijst
 STR_TOWN_POPULATION                                             :{BLACK}Wereldbevolking: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Kijkvenster {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopieer naar kijkvenster
@@ -729,6 +729,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Automati
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Kies interval tussen autosaves
 STR_02F7_OFF                                                    :Uit
+STR_AUTOSAVE_1_MONTH                                            :Elke maand
 STR_02F8_EVERY_3_MONTHS                                         :Iedere 3 maanden
 STR_02F9_EVERY_6_MONTHS                                         :Iedere 6 maanden
 STR_02FA_EVERY_12_MONTHS                                        :Iedere 12 maanden
@@ -849,7 +850,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Basis gr
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Selecteer de te gebruiken basis graphics set
 
-STR_AUTOSAVE_1_MONTH                                            :Elke maand
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automatisch opslaan mislukt
 
 STR_MONTH_JAN                                                   :Januari
@@ -1076,12 +1076,12 @@ STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Bij sle
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Plaats automatisch semafoor seinen voor: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Activeer sein GUI: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Seintype die standaard moet worden gebouwd: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Normaal
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Geavanceerd
-STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Eenrichting geavanceerd
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Normale seinen
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Pbs seinen
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Eenrichting pbs seinen
 STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :{LTBLUE}Blader door seintypen: {ORANGE}{STRING}
 STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Alleen normaal
-STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Alleen geavanceerd
+STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Alleen pbs
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :Allemaal
 
 STR_CONFIG_SETTING_TOWN_LAYOUT                                  :{LTBLUE}Wegpatroon voor nieuwe steden: {ORANGE}{STRING}
@@ -1288,7 +1288,7 @@ STR_NETWORK_ENTER_IP                                            :{BLACK}IP adres
 
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Spelers
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Spelers online / spelers maximaal
+STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Spelers online / spelers maximaal{}Bedrijven online / bedrijven maximaal
 
 STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
 STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kaart grootte
@@ -1301,14 +1301,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jaren
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Aantal jaren{}het spel draait
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}SPEL INFORMATIE
-STR_NETWORK_CLIENTS                                             :{SILVER}Spelers:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Taal:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Klimaat:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgrootte:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server versie:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Spelers: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Taal: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Klimaat: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgrootte: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server versie: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adres:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Start datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Huidige datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Start datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Huidige datum: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Beveiligd met wachtwoord!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER VOL
@@ -1333,7 +1333,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (adverteren)
 STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} speler{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maximaal aantal spelers
+STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maximaal aantal spelers:
 STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Kies een maximaal aantal toegestane spelers. Niet alle posities hoeven gebruikt te worden.
 STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} bedr{P ijf ijven}
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max bedrijven:
@@ -1390,7 +1390,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Lets
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multiplayer lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Klaar om deel te nemen:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Klaar om deel te nemen: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Een lijst met alle bedrijven die momenteel in dit spel bestaan. Je kan meedoen met een bestaand bedrijf of een nieuw bedrijf beginnen.
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nieuw bedrijf
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Start een nieuw bedrijf
@@ -1403,16 +1403,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Ververs
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}BEDRIJFSINFORMATIE
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Bedrijfsnaam:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Begonnen in:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Bedrijfswaarde:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Huidige kas:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Inkomen vorig jaar:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestatie:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Bedrijfsnaam: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Begonnen in: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Bedrijfswaarde: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Huidige kas: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Inkomen vorig jaar: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestatie: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Voertuigen:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spelers:  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Voertuigen: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Spelers: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Verbinden...
 
@@ -1439,23 +1439,23 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Spelersl
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Kijk toe
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nieuw Bedrijf
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Geen netwerkapparaten gevonden of gecompileerd zonder ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kon geen enkel netwerkspel vinden
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} De server beantwoorde het verzoek niet
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kan geen verbinding maken, je hebt niet dezelfde NewGRF files als de server
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Netwerkspel synchronisatie mislukt.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Netwerkspel verbinding kwijt.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kon server-opgeslagen spel niet laden
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Kan server niet starten.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Kan geen verbinding maken.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Verbinding #{NUM} duurde te lang.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Er is een protocolfout gemaakt en onze verbinding is gesloten.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} De revisie van deze client komt niet overeen met de revisie van de server.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Ongeldig wachtwoord.
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} De server is vol
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Geen netwerkapparaten gevonden of gecompileerd zonder ENABLE_NETWORK
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kon geen enkel netwerkspel vinden
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}De server beantwoorde het verzoek niet
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Kan geen verbinding maken, je hebt niet dezelfde NewGRF files als de server
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}Netwerkspel synchronisatie mislukt.
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Netwerkspel verbinding kwijt
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kon server-opgeslagen spel niet laden
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Kan server niet starten
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Kan geen verbinding maken
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Verbinding #{NUM} duurde te lang
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Er is een protocolfout gemaakt en onze verbinding is gesloten
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}De revisie van deze client komt niet overeen met de revisie van de server
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Ongeldig wachtwoord
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}De server is vol
 STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Je bent verbannen van deze server
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Je bent van de server geschopt
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Vals spelen is niet toegestaan op deze server
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Je bent van de server geschopt
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Vals spelen is niet toegestaan op deze server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :algemene fout
@@ -1464,7 +1464,7 @@ STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kan kaart niet
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :verbinding verbroken
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protocol fout
 STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Niet gelijke NewGRF instelling
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :niet toegelaten
+STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :niet toegestaan
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :raar pakket ontvangen
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :foute revisie
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :naam al in gebruik
@@ -1484,7 +1484,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spel hervat (cl
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_LEAVING                                      :vertrekt
 STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} heeft zich bij het spel gevoegd
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} heeft zich gevoeg bij bedrijf #{2:NUM}
+STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} heeft zich gevoegd bij bedrijf #{2:NUM}
 STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} kijkt nu toe
 STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} heeft een nieuw bedrijf opgericht (#{2:NUM})
 STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} heeft het spel verlaten ({2:STRING})
@@ -1589,26 +1589,26 @@ STR_1021_RAILROAD_TRACK                                         :Spoor
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Treindepot
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...gebied is van ander bedrijf
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Spoor met normale seinen
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Spoor met voorseinen
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Spoor met begin-seinen
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Spoor met uitgangseinen
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Spoor met combinatieseinen
 STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Spoor met pbs-seinen
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Treinrails met eenrichtings geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Spoor met normale en pre-seinen
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Spoor met normale en uitgangs-signalen
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Spoor met normale en dubbele-signalen
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Treinrails met gewoon en geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Treinrails met gewoon en eenrichtings geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Spoor met pre- en uitgangs- signalen
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Spoor met pre- en dubbele- signalen
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Treinrails met vóór- en geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Treinrails met vóór- en eenrichtings geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Spoor met uitgangs- en dubbele- signalen
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Treinrails met exit- en geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Treinrails met exit- en eenrichtings geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Treinrails met combo- en geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Treinrails met combo- en eenrichtings geavanceerde seinen
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Treinrails met geavanceerde en eenrichtings geavanceerde seinen
+STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Spoor met eenrichtings-pbs seinen
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Spoor met normale en begin-seinen
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Spoor met nromale en uitgangs-signalen
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Spoor met normale en combinatie-signalen
+STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Treinrails met normale en pbs-seinen
+STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Treinrails met normale en eenrichtings pbs-seinen
+STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Spoor met begin- en uitgangs- signalen
+STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Spoor met begin- en combinatie- signalen
+STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Treinrails met begin- en pbs-seinen
+STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Treinrails met begin- en eenrichtings pbs- seinen
+STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Spoor met uitgangs- en combinatie- signalen
+STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Treinrails met uitgangs- en pbs-seinen
+STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Treinrails met begin- en eenrichtings pbs seinen
+STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Treinrails met combinatie- en pbs- seinen
+STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Treinrails met combinatie- en eenrichtings pbs seinen
+STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Treinrails met pbs en eenrichtings pbs seinen
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Treinstation moet eerst verwijderd worden
 STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Bouw een losstaand station
 STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Station samenvoegen
@@ -1752,14 +1752,14 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Bouw standbeeld
 STR_204B_FUND_NEW_BUILDINGS                                     :Betaal nieuwe gebouwen
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Koop exclusieve transportrechten
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Koop de gemeenteraad om
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Begin een kleine reclamecampagne, om meer passagiers en goederen naar jouw transportdiensten te trekken.{}  Kosten: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Begin een middelgrote advertentiecampagne, om meer passagiers en goederen naar jouw transportdiensten te trekken.{}  Kosten: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Begin een grote advertentiecampagne, om meer passagiers en goederen naar jouw transportdiensten te trekken.{}  Kosten: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Betaal een vernieuwing van het wegdek. Veroorzaakt merkbare verstoring van het wegverkeer tot 6 maanden.{}  Kosten: {CURRENCY}
-STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Bouw een standbeeld ter ere van jouw bedrijf.{} Kosten: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Betaal de bouw van nieuwe commerciële gebouwen in het dorp.{}  Kosten: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Koop 1 jaar exclusieve transportrechten in deze plaats. De gemeenteraad staat passagiers en goederen toe alleen jouw stations te gebruiken.{} Kosten: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Koop het plaatselijk gezag om om je rang te verhogen, met het gevaar van een strenge sanctie, wanneer gepakt.{}  Kosten: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Begin een kleine reclamecampagne, om meer passagiers en goederen naar jouw transportdiensten te trekken.{}Kosten: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW}Begin een middelgrote advertentiecampagne, om meer passagiers en goederen naar jouw transportdiensten te trekken.{}Kosten: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Begin een grote advertentiecampagne, om meer passagiers en goederen naar jouw transportdiensten te trekken.{}Kosten: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW}Betaal een vernieuwing van het wegdek. Veroorzaakt merkbare verstoring van het wegverkeer tot 6 maanden.{}Kosten: {CURRENCY}
+STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW}Bouw een standbeeld ter ere van jouw bedrijf.{}Kosten: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}Betaal de bouw van nieuwe commerciële gebouwen in het dorp.{}Kosten: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}Koop 1 jaar exclusieve transportrechten in deze plaats. De gemeenteraad staat passagiers en goederen toe alleen jouw stations te gebruiken.{}Kosten: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Koop het plaatselijk gezag om om je rang te verhogen, met het gevaar van een strenge sanctie, wanneer gepakt.{}Kosten: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkeerschaos in {TOWN}!{}{}Wegreparatie betaald door {STRING} zorgt voor 6 maanden van irritatie bij weggebruikers!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -2206,7 +2206,7 @@ STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Bedrijfswinst Grafiek
 STR_7026_BANK_BALANCE                                           :{WHITE}Banksaldo
 STR_7027_LOAN                                                   :{WHITE}Lening
-STR_MAX_LOAN                                                    :{WHITE}Max lening:  {BLACK}{CURRENCY}
+STR_MAX_LOAN                                                    :{WHITE}Max lening: {BLACK}{CURRENCY}
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Leen {SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Betaal {SKIP}{SKIP}{CURRENCY} terug
@@ -2800,12 +2800,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Verwijde
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset de teller zodat het voertuig toch op tijd is
 STR_SERVICE_HINT                                                :{BLACK}Sla deze order over tenzij een reparatie nodig is
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Prijs: {CURRENCY} Gewicht: {WEIGHT_S}{}Snelheid: {VELOCITY}  Kracht: {POWER}{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Kapot
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S}  {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY} {BLACK}Max. T.K.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Winst dit jaar: {LTBLUE}{CURRENCY}  (vorig jaar: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Pechgevallen sinds laatste reparatie: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Motorpech
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
 STR_8861_STOPPED                                                :{RED}Gestopt
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan trein niet het signaal laten passeren bij gevaar...
 STR_8863_CRASHED                                                :{RED}Gecrasht!
@@ -2814,7 +2814,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Hernoem
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan trein niet zo noemen...
 STR_8867_NAME_TRAIN                                             :{BLACK}Trein benaming
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Trein Ongeluk!{}{COMMA} gedood in een vuurbal na de botsing
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Kan de richting van de trein niet omdraaien...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan de richting van de trein niet omdraaien...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan de richting van het voertuig niet omdraaien...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan voertuigen bestaande uit meerdere eenheden niet omdraaien
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Hernoem trein voertuig type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan het trein voertuig type niet hernoemen...
 STR_CLEAR_TIME                                                  :{BLACK}Reset de tijd
@@ -2902,8 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Inwoners feesten . . .{}Eerste vracht tram arriveert in {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}Bestuurder verongelukt door treinbotsing
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Wegvoertuig gebotst!{}{COMMA} verongelukt door treinbotsing
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Kan voertuig niet omdraaien...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Kan voertuigen bestaande uit meerdere eenheden niet omdraaien
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Kan het voertuig hier niet laten omkeren...
 STR_9034_RENAME                                                 :{BLACK}Hernoem
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem wegvoertuigtype
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernoem wegvoertuigtype
@@ -3101,7 +3102,7 @@ STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Totaal a
 
 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF Instellingen
 STR_NEWGRF_SETTINGS_BUTTON_TIP                                  :{BLACK}Toon NewGRF instellingen
-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Newgrf instellingen
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF instellingen
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Wijzigingen doorvoeren
 STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Palet omzetten
 STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Verander het palet van het geselecteerd NewGRF bestand.{}Gebruik deze mogelijkheid wanneer de afbeeldingen er paars uit zien in het spel, van dit NewGRF bestand
@@ -3204,7 +3205,7 @@ STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Geef all
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben
 
 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Gedeelde orders van {COMMA} voertuig{P "" en}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Toon alle voertuigen met de zelfde orders
+STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Toon alle voertuigen met deze zelfde orders
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Je staat op het punt alle voertuigen in het depot te verkopen. Weet je het zeker?
@@ -3283,14 +3284,14 @@ STR_MAGLEV_VEHICLES                                             :Maglev Voertuig
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Gewicht: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Snelheid: {GOLD}{VELOCITY}{BLACK}   Kracht: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Snelheid: {GOLD}{VELOCITY}{BLACK} Kracht: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Snelheid: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Onderhoudskosten: {GOLD}{CURRENCY}/jr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capaciteit: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Ontworpen: {GOLD}{NUM}{BLACK} Levensduur: {GOLD}{COMMA} jaar
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Betrouwbaarheid: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Snelheid: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capaciteit: {GOLD}{COMMA} passagiers, {COMMA} zakken post
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Aangedreven wagons: {GOLD}+{POWER}{BLACK} Gewicht: {GOLD}+{WEIGHT_S}
@@ -3411,15 +3412,15 @@ STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...deze
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...weg is in de verkeerde richting
 
 STR_TRANSPARENCY_TOOLB                                          :{WHITE}Doorzichtigheidsopties
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Wissel doorzichtigheid voor stationsnamen
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Wissel doorzichtigheid voor bomen
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Wissel doorzichtigheid voor huizen
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Wissel doorzichtigheid voor industrieën
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Wissel doorzichtigheid voor gebouwen zoals stations, depots, controleposten en bovenleiding
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Wissel doorzichtigheid voor bruggen
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Wissel doorzichtigheid voor structuren zoals vuurtoren en antennes, in de toekomst misschien voor eyecandy
+STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Wissel doorzichtigheid voor stationsnamen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Wissel doorzichtigheid voor bomen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Wissel doorzichtigheid voor huizen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Wissel doorzichtigheid voor industrieën. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Wissel doorzichtigheid voor gebouwen zoals stations, depots en controleposten. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Wissel doorzichtigheid voor bruggen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Wissel doorzichtigheid voor structuren zoals vuurtoren en antennes. Ctrl+Klik om vast te zetten.
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Doorzichtigheid voor bovenleiding. Ctrl+klik voor onthouden.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Schakel tussen doorzichtigheid voor laad indicatoren
+STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Wissel doorzichtigheid voor laad indicatoren. Ctrl+Klik om vast te zetten.
 STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Zet object op onzichtbaar in plaats van doorzichtig
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3536,21 +3537,21 @@ STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Verander
 STR_SIGNAL_SELECTION                                            :{WHITE}Sein keuze
 STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan sein hier niet ombouwen...
 STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standaard sein (semafoor){}Seinen zijn nodig om te voorkomen dat treinen botsen bij een netwerk met meer dan een trein.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Ingangssein (semafoor){}Groen zolang als er een of meer groene exitseinen zijn volgend na dit sein. Anders is deze rood.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Exitsein (semafoor){}Gedraagt zich hetzelfde als een gewoon sein, maar is nodig om ingangs- en combo-voor-seinen te sturen.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Combo-Sein (semafoor){}Het combo sein gedraagt zicht als zowel Ingangs- als exit-sein. Zo kun je grote netwerken van voorseinen maken.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Geavanceerde seinen (semaphoor){}Een geavanceerd sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Geavanceerde seinen kunnen van achteren worden gepasseerd.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Eenrichtings geavanceerde seinen (semaphoor){}Een geavanceerd sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings geavanceerde seinen kunnen niet van achteren worden gepasseerd.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standaard sein (electric){}Seinen zijn nodig om te voorkomen dat treinen botsen bij netwerken met meer dan een trein.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Beginsein (semafoor){}Groen zolang als er een of meer groene uitgangsseinen zijn volgend na dit sein. Anders is deze rood.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Uitgangssein (semafoor){}Gedraagt zich hetzelfde als een gewoon sein, maar is nodig om ingangs- en combinatie-seinen te sturen.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Combinatiesein (semafoor){}Het combinatiesein gedraagt zicht als zowel Ingangs- als uitgangs-sein. Zo kun je grote netwerken van beginseinen maken.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Pbs seinen (semafoor){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Pbs seinen kunnen van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Eenrichtings pbs seinen (semafoor){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings pbs seinen kunnen niet van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standaard sein (elektrisch){}Seinen zijn nodig om te voorkomen dat treinen botsen bij netwerken met meer dan een trein.
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Ingangssein (electric){}Groen wanneer er meer dan een groen exit-sein is in het volgende traject. Anders is deze rood.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Exit-sein (electric){}Gedraagt zich hetzelfde als een standaard sein, maar is nodig om ingangs- & combo voorseinen aan te sturen.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combo-sein (electric){}Het combo sein gedraagt zicht als zowel ingangs- als exit-sein. Zo kun je grote netwerken van voorseinen maken.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Geavanceerde seinen (elektrisch){}Een geavanceerd sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Geavanceerde seinen kunnen van achteren worden gepasseerd.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Eenrichtings geavanceerde seinen (elektrisch){}Een geavanceerd sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings geavanceerde seinen kunnen niet van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Uitgangssein (elektrisch){}Gedraagt zich hetzelfde als een standaard sein, maar is nodig om ingangs- & combinatie-seinen aan te sturen.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combinatiesein (electric){}Het combinatiesein gedraagt zicht als zowel ingangs- als uitgangs-sein. Zo kun je grote netwerken van beginseinen maken.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Pbs seinen (elektrisch){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Pbs seinen kunnen van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Eenrichtings pbs seinen (elektrisch){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings pbs seinen kunnen niet van achteren worden gepasseerd.
 STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Sein ombouwen{}Wanneer geselecteerd, door te klikken op een bestaand seintype, zal het sein worden omgebouwd naar het geselecteerde seintype en varianten, Ctrl+klik schakelt tussen de bestaande varianten.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Sleep sein dichtheid
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Verklein gesleepte sein dichtheid
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Vergroot gesleepte sein dichtheid
+STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Sleep-sein dichtheid
+STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Verklein sleep-sein dichtheid
+STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Vergroot sleep-sein dichtheid
 ########
 
 ############ on screen keyboard
@@ -3602,7 +3603,7 @@ STR_CONTENT_TYPE_AI                                             :AI
 STR_CONTENT_TYPE_AI_LIBRARY                                     :AI bibliotheek
 STR_CONTENT_TYPE_SCENARIO                                       :Scenario
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Hoogtemap
-STR_CONTENT_TITLE                                               :{WHITE}Er worden gegevens gedownload
+STR_CONTENT_TITLE                                               :{WHITE}Download extra content
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
 STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Type van de gegevens
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Naam

src/lang/english.txt

@@ -637,7 +637,7 @@ STR_0299_SAVE_SCENARIO                                          :{WHITE}Save Sce
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Play Scenario
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Play Heightmap
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Start a new game, using a heightmap as landscape
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Are you sure you want to quit this scenario ?
+STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Are you sure you want to quit this scenario?
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...can only be built in towns with a population of at least 1200
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Move the starting date backward 1 year
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Move the starting date forward 1 year
@@ -760,7 +760,7 @@ STR_JUST_RAW_STRING                                             :{RAW_STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...can only be built in rainforest areas
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...can only be built in desert areas
-STR_0319_PAUSED                                                 :{YELLOW}* *  PAUSED  *  *
+STR_0319_PAUSED                                                 :{YELLOW}*  *  PAUSED  *  *
 
 STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot successfully saved as '{RAW_STRING}'
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Screenshot failed!
@@ -1301,14 +1301,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Years
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Number of years{}the game is running
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Language:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{RAW_STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address:  {WHITE}{RAW_STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Start date:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date:  {WHITE}{DATE_SHORT}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Language: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Tileset: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version: {WHITE}{RAW_STRING}
+STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address: {WHITE}{RAW_STRING} : {NUM}
+STR_NETWORK_START_DATE                                          :{SILVER}Start date: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Password protected!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER FULL
@@ -1390,7 +1390,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Latvian
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multiplayer game lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparing to join:   {ORANGE}{RAW_STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparing to join: {ORANGE}{RAW_STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}A list of all companies currently in this game. You can either join one or start a new one if there is a free company slot
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}New company
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Create a new company
@@ -1403,16 +1403,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Refresh
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}COMPANY INFO
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name:  {WHITE}{RAW_STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Company value:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name: {WHITE}{RAW_STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Company value: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Players:  {WHITE}{RAW_STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Players: {WHITE}{RAW_STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connecting...
 
@@ -1439,23 +1439,23 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Client L
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New Company
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} No network devices found or compiled without ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Could not find any network games
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} The server didn't answer the request
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Could not connect due to NewGRF mismatch
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Network-Game synchronisation failed
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Network-Game connection lost
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Could not load savegame
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Could not start the server
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Could not connect
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Connection #{NUM} timed out
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} A protocol-error was made and the connection was closed
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} The revision of this client does not match the server's revision
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Wrong password
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} The server is full
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} You are banned from this server
-STR_NETWORK_ERR_KICKED                                          :{WHITE} You were kicked out of the game
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Cheating is not allowed on this server
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}No network devices found or compiled without ENABLE_NETWORK
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Could not find any network games
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}The server didn't answer the request
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Could not connect due to NewGRF mismatch
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}Network-Game synchronisation failed
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Network-Game connection lost
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Could not load savegame
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Could not start the server
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Could not connect
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Connection #{NUM} timed out
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}A protocol-error was made and the connection was closed
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}The revision of this client does not match the server's revision
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Wrong password
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}The server is full
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}You are banned from this server
+STR_NETWORK_ERR_KICKED                                          :{WHITE}You were kicked out of the game
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Cheating is not allowed on this server
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :general error
@@ -1752,14 +1752,14 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Build statue of
 STR_204B_FUND_NEW_BUILDINGS                                     :Fund new buildings
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Buy exclusive transport rights
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Bribe the local authority
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Initiate a small local advertising campaign, to attract more passengers and cargo to your transport services.{}  Cost: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Initiate a medium local advertising campaign, to attract more passengers and cargo to your transport services.{}  Cost: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Initiate a large local advertising campaign, to attract more passengers and cargo to your transport services.{}  Cost: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Fund the reconstruction of the urban road network. Causes considerable disruption to road traffic for up to 6 months.{}  Cost: {CURRENCY}
-STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Build a statue in honour of your company.{} Cost: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Initiate a small local advertising campaign, to attract more passengers and cargo to your transport services.{}Cost: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW}Initiate a medium local advertising campaign, to attract more passengers and cargo to your transport services.{}Cost: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Initiate a large local advertising campaign, to attract more passengers and cargo to your transport services.{}Cost: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW}Fund the reconstruction of the urban road network. Causes considerable disruption to road traffic for up to 6 months.{}Cost: {CURRENCY}
+STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW}Build a statue in honour of your company.{}Cost: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}Fund the construction of new commercial buildings in the town.{}Cost: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{}Cost: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {RAW_STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -2206,7 +2206,7 @@ STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Operating Profit Graph
 STR_7026_BANK_BALANCE                                           :{WHITE}Bank Balance
 STR_7027_LOAN                                                   :{WHITE}Loan
-STR_MAX_LOAN                                                    :{WHITE}Max Loan:  {BLACK}{CURRENCY}
+STR_MAX_LOAN                                                    :{WHITE}Max Loan: {BLACK}{CURRENCY}
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Borrow {SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Repay {SKIP}{SKIP}{CURRENCY}
@@ -2814,7 +2814,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Name tra
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Can't name train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Name train
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA} die in fireball after collision
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Can't reverse direction of train...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Can't reverse direction of train...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Can't reverse direction of vehicle...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Can't reverse direction of vehicles consisting of multiple units...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rename train vehicle type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Can't rename train vehicle type...
 STR_CLEAR_TIME                                                  :{BLACK}Clear Time
@@ -2902,8 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight tram arrives at {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Can't make vehicle turn around...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Can't turn vehicles consisting of multiple units
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Can't make road vehicle turn around...
 STR_9034_RENAME                                                 :{BLACK}Rename
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Rename road vehicle type
@@ -3283,14 +3284,14 @@ STR_MAGLEV_VEHICLES                                             :Maglev Vehicles
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK}   Power: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK} Power: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Speed: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Running Cost: {GOLD}{CURRENCY}/yr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUM}{BLACK} Life: {GOLD}{COMMA} years
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Speed: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity: {GOLD}{COMMA} passengers, {COMMA} bags of mail
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_S}

src/lang/english_US.txt

@@ -665,7 +665,6 @@ STR_OFF                                                         :Off
 STR_SUMMARY                                                     :Summary
 STR_FULL                                                        :Full
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Town directory
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -703,6 +702,7 @@ STR_02DE_MAP_OF_WORLD                                           :Map of world
 STR_EXTRA_VIEW_PORT                                             :Extra viewport
 STR_SIGN_LIST                                                   :Sign list
 STR_02DF_TOWN_DIRECTORY                                         :Town directory
+STR_02BB_TOWN_DIRECTORY                                         :Town directory
 STR_TOWN_POPULATION                                             :{BLACK}World population: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Viewport {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copy to viewport
@@ -729,6 +729,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Autosave
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Select interval between automatic game saves
 STR_02F7_OFF                                                    :Off
+STR_AUTOSAVE_1_MONTH                                            :Every month
 STR_02F8_EVERY_3_MONTHS                                         :Every 3 months
 STR_02F9_EVERY_6_MONTHS                                         :Every 6 months
 STR_02FA_EVERY_12_MONTHS                                        :Every 12 months
@@ -849,7 +850,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Base gra
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Select the base graphics set to use
 
-STR_AUTOSAVE_1_MONTH                                            :Every month
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autosave failed
 
 STR_MONTH_JAN                                                   :January
@@ -2800,12 +2800,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Clear th
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY}  Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Broken down
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Weight: {LTBLUE}{WEIGHT_S}  {BLACK}Power: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Weight: {LTBLUE}{WEIGHT_S} {BLACK}Power: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit this year: {LTBLUE}{CURRENCY}  (last year: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Broken down
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_8861_STOPPED                                                :{RED}Stopped
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Can't make train pass signal at danger...
 STR_8863_CRASHED                                                :{RED}Crashed!
@@ -2814,7 +2814,7 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Name tra
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Can't name train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Name train
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Train Crash!{}{COMMA} die in fireball after collision
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Can't reverse direction of train...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Can't reverse direction of train...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Rename train vehicle type
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Can't rename train vehicle type...
 STR_CLEAR_TIME                                                  :{BLACK}Clear Time
@@ -2902,8 +2902,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Citizens celebrate . . .{}First freight streetcar arrives at {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Road Vehicle Crash!{}Driver dies in fireball after collision with train
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Road Vehicle Crash!{}{COMMA} die in fireball after collision with train
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Can't make vehicle turn around...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Can't turn vehicles consisting of multiple units
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Can't turn vehicles consisting of multiple units
 STR_9034_RENAME                                                 :{BLACK}Rename
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Rename road vehicle type
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Rename road vehicle type

src/lang/esperanto.txt

@@ -18,8 +18,10 @@ STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Necesas ebena lando
 STR_0008_WAITING                                                :{BLACK}Atendas: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
+STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO} survoje de {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Akceptiĝas: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Akceptiĝas: {GOLD}
+STR_SUPPLIES                                                    :{BLACK}Provizoj: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :Pasaĝeroj
 STR_0010_COAL                                                   :Karbo
@@ -337,6 +339,7 @@ STR_SORT_BY_MAX_SPEED                                           :Maksimuma rapid
 STR_SORT_BY_MODEL                                               :Tipo
 STR_SORT_BY_VALUE                                               :Valoro
 STR_SORT_BY_LENGTH                                              :Longo
+STR_SORT_BY_LIFE_TIME                                           :Restanta vivdaŭro
 STR_SORT_BY_FACILITY                                            :Stacidoma tipo
 STR_SORT_BY_WAITING                                             :Valoro de atendanta ŝarĝo
 STR_SORT_BY_RATING_MAX                                          :Takso de ŝarĝo
@@ -442,8 +445,12 @@ STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{VEHICLE
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Landregionaj informoj
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Forviŝkosto: {LTBLUE}ne eblas
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Forviŝkosto: {RED}{CURRENCY}
+STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Enspezo kaze de forigo: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
 STR_01A7_OWNER                                                  :{BLACK}Posedanto: {LTBLUE}{STRING}
+STR_ROAD_OWNER                                                  :{BLACK}Stratposedanto: {LTBLUE}{STRING}
+STR_TRAM_OWNER                                                  :{BLACK}Posedanto de tramreloj: {LTBLUE}{STRING}
+STR_RAIL_OWNER                                                  :{BLACK}Posedanto de fervojreloj: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Lokaj estroj: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Neniu
 STR_01AA_NAME                                                   :{BLACK}Nomo
@@ -547,6 +554,10 @@ STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Kompani
 STR_NEWS_INDUSTRY_OPEN                                          :{YELLOW}Malfermiĝo de industrioj
 STR_NEWS_INDUSTRY_CLOSE                                         :{YELLOW}Fermiĝo de industrioj
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Ekonomiaj ŝanĝoj
+STR_INDUSTRY_CHANGES_SERVED_BY_COMPANY                          :{YELLOW}Profuktadŝanĝiĝoj de industrioj servitaj de la kompanio
+STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Profuktadŝanĝiĝoj de industrioj servitaj de konkuranto(j)
+STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Aliaj industriaj produktadŝanĝiĝoj
+STR_020B_ADVICE_INFORMATION_ON_COMPANY                          :{YELLOW}Konsilo / informoj pri kompania veturilaro
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Novaj veturiloj
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Ŝarĝakceptado ŝanĝiĝas
 STR_020E_SUBSIDIES                                              :{YELLOW}Subvencioj
@@ -597,6 +608,7 @@ STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ne povas
 STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...spaco mankas sur la mapo
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Grandigu la urbon
 STR_023C_EXPAND                                                 :{BLACK}Vastigu
+STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}La urbo ne konstruos stratojn. Vi povas ebligi stratkonstruadon per Avancitaj Agordoj->Ekonomio->Urboj.
 STR_023D_RANDOM_TOWN                                            :{BLACK}Hazarda Urbo
 STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Konstruu urbon en hazarda loko
 STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Ne povas konstrui {STRING.n} ĉi tie...
@@ -610,7 +622,8 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Metu rok
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Metu lumturon
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Metu transmitilon
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Difinu dezertan regionon.{}Premu kaj tenu CTRL por forigi ĝin
-STR_CREATE_LAKE                                                 :{BLACK}Difinu akvoregionon.{}Faru kanalon, krom se CTRL estas tenata marnivele, kiukaze ĝi anstataŭe transfluas al la ĉirkaŭo
+STR_CREATE_LAKE                                                 :{BLACK}Difinu akvoregionon.{}Faru kanalon, krom se CTRL estas tenata ĉe marnivelo, kiukaze ĝi anstataŭe transfluas al la ĉirkaŭaĵo
+STR_CREATE_RIVER                                                :{BLACK}Loku riverojn.
 STR_0290_DELETE                                                 :{BLACK}Forigu
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Plene forigu ĉi tiun urbon
 STR_0292_SAVE_SCENARIO                                          :Konservu scenaron
@@ -635,9 +648,17 @@ STR_02A2_MEDIUM                                                 :{BLACK}Mezgrand
 STR_02A3_LARGE                                                  :{BLACK}Granda
 STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Arbitre
 STR_FOUND_TOWN_CITY                                             :{BLACK}Urbo
+STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Urbegoj kreskas pli rapide ol kutimaj urboj{}Depende de agordoj, ili pli grandas je fondiĝo
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Elektu urban grandecon
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Urba grandeco:
 
+STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Urba strataranĝo:
+STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selektu strataranĝon uzendan por ĉi tiu urbo
+STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Originalo
+STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Pli bonaj stratoj
+STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 krado
+STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 krado
+STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Hazarde
 
 STR_02B6                                                        :{STRING}  -  {STRING}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Montru lastan mesaĝon aŭ novaĵon
@@ -645,13 +666,13 @@ STR_OFF                                                         :Ne
 STR_SUMMARY                                                     :Resume
 STR_FULL                                                        :Plene
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Urbaro
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
 STR_02C4_GAME_OPTIONS                                           :Ludaj opcioj
 STR_02C6_DIFFICULTY_SETTINGS                                    :Malfacilec-agordoj
+STR_MENU_CONFIG_SETTINGS                                        :Avancitaj agordoj
 STR_NEWGRF_SETTINGS                                             :Agordoj de NewGRF
 STR_TRANSPARENCY_OPTIONS                                        :Ebloj por travidebleco
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Urbonomoj montriĝas
@@ -668,6 +689,7 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Travid
 STR_02D5_LAND_BLOCK_INFO                                        :Landkvadrataj informoj
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Ŝaltu Tekstmodon
+STR_AI_DEBUG_MENU                                               :Decimigo de ArtefaritaIntelekto
 STR_02D7_SCREENSHOT_CTRL_S                                      :Ekranfoto (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Giganta Ekranfoto (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Pri 'OpenTTD'
@@ -681,6 +703,7 @@ STR_02DE_MAP_OF_WORLD                                           :Mondomapo
 STR_EXTRA_VIEW_PORT                                             :Plia videjo
 STR_SIGN_LIST                                                   :Afiŝa listo
 STR_02DF_TOWN_DIRECTORY                                         :Urbaro
+STR_02BB_TOWN_DIRECTORY                                         :Urbaro
 STR_TOWN_POPULATION                                             :{BLACK}Monda enloĝantaro: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Videjo {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopiu al videjo
@@ -707,12 +730,14 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Aŭtomat
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Elektu intervalon inter aŭtomataj konservadoj de la ludo
 STR_02F7_OFF                                                    :Malaktiva
+STR_AUTOSAVE_1_MONTH                                            :Je ĉiu monato
 STR_02F8_EVERY_3_MONTHS                                         :Je ĉiuj 3 monatoj
 STR_02F9_EVERY_6_MONTHS                                         :Je ĉiuj 6 monatoj
 STR_02FA_EVERY_12_MONTHS                                        :Je ĉiuj 12 monatoj
 STR_02FB_START_A_NEW_GAME                                       :{BLACK}Startu novan ludon
 STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Ŝarĝu konservitan ludon
 STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Kreu mem ludmondon/scenaron
+STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Komencu ludon pluropan ludantoj
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Montru ludajn opciojn
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Montru malfacilec-opciojn
 STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Komencu novan ludon per propra scenaro
@@ -724,7 +749,7 @@ STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Elektu '
 STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Elektu 'sub-arktikan' landstilon
 STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Elektu 'sub-tropikan' landstilon
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Elektu 'ludlandan' landstilon
-STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Fondu konstruadon de nova industrio
+STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Pagu konstruadon de nova industrio aŭ listigu ĉiujn industriojn
 
 ############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industriaro
@@ -733,6 +758,8 @@ STR_0313_FUND_NEW_INDUSTRY                                      :Fondu novan ind
 
 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Fondu novan industrion
 STR_JUST_STRING                                                 :{STRING}
+STR_JUST_RAW_STRING                                             :{STRING}
+STR_JUST_INT                                                    :{NUM}
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...nur konstruebla en praarbaraj regionoj
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...nur konstruebla en dezertaj regionoj
 STR_0319_PAUSED                                                 :{YELLOW}* *  PAŬZO  *  *
@@ -810,6 +837,7 @@ STR_OPTIONS_LANG_TIP                                            :{BLACK}Elektu u
 
 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Plena ekrano
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Ŝaltu ĉi tiun kvadrateton por plenekrane ludi OpenTTD
+STR_FULLSCREEN_FAILED                                           :{WHITE}Plenekrana moduso fiaskis
 
 STR_OPTIONS_RES                                                 :{BLACK}Ekrana montrogrando
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -819,8 +847,10 @@ STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Ekranfot
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Elektu uzotan ekranfotan formaton
 
+STR_OPTIONS_BASE_GRF                                            :{BLACK}Baza grafikaro
+STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Selektu la uzendan bazgrafikaron
 
-STR_AUTOSAVE_1_MONTH                                            :Je ĉiu monato
 STR_AUTOSAVE_FAILED                                             :{WHITE}Fiaskis aŭtomate konservi
 
 STR_MONTH_JAN                                                   :Januaro
@@ -856,45 +886,72 @@ STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Ne povas
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Ne povas kopii ordenliston...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fino de Dividitaj Ordenoj - -
 
+STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} ne povas trovi padon por daŭrigi.
+STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} estas perdita.
+STR_VEHICLE_IS_UNPROFITABLE                                     :{WHITE}{VEHICLE} pasintjare gajnis {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Eŭropa Mona Unio!{}{}De nun uziĝos la Eŭro kiel monunuo por ĉiutagaj montransskriboj en via lando!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
+STR_VEHICLE_HAS_TOO_FEW_ORDERS                                  :{WHITE}{VEHICLE} ne havas sufiĉajn ordonojn en la itinero
+STR_VEHICLE_HAS_VOID_ORDER                                      :{WHITE}{VEHICLE} havas malplenan ordonon
+STR_VEHICLE_HAS_DUPLICATE_ENTRY                                 :{WHITE}{VEHICLE} havas duoblajn ordonojn
+STR_VEHICLE_HAS_INVALID_ENTRY                                   :{WHITE}Ordonoj de {VEHICLE} enhavas nevalidan stacion
 # end of order system
 
+STR_VEHICLE_AUTORENEW_FAILED                                    :{WHITE}Aŭtorenovigo fiaskis ĉe {VEHICLE}{}{STRING}
+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}{VEHICLE} tro longas post anstataŭado
+STR_AUTOREPLACE_NOTHING_TO_DO                                   :{WHITE}Neniuj aŭtoanstataŭo/renovigo-reguloj aplikitaj.
 STR_AUTOREPLACE_MONEY_LIMIT                                     :(monlimo)
 
+STR_CONFIG_SETTING                                              :{BLACK}Avancitaj agordoj
+STR_CONFIG_SETTING_TIP                                          :{BLACK}Montru avancitajn agordojn
+STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Avancitaj agordoj
 
 STR_CONFIG_SETTING_OFF                                          :Malaktiva
 STR_CONFIG_SETTING_ON                                           :Aktiva
 STR_CONFIG_SETTING_VEHICLESPEED                                 :{LTBLUE}Montru veturilrapidecon en statbreto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BUILDONSLOPES                                :{LTBLUE}Permesu konstrui sur kliniĝoj kaj bordoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}Permesu terecigon sub konstruaĵoj, trakoj, ktp. (aŭtodeklivo): {ORANGE}{STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Permesu pli realgrandaj kaptoregionoj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Permesu forigon de pli da urbaj vojoj, pontoj ktp: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAMMOTHTRAINS                                :{LTBLUE}Permesu konstrui tre longajn trajnojn: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Modelo de trajnakcelado: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Originala
+STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realisma
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Trajnoj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING} {LTBLUE} (bezonas NPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Ligu stacidomojn konstruatajn unu apud la alia: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Permesu ligi staciojn ne rekte najbarajn: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Uzu plibonigitan ŝarĝalgoritmon: {ORANGE}{STRING}
 STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}Laŭgrade ŝarĝu veturilojn: {ORANGE}{STRING}
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}Inflacio: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}Nur liveru ŝarĝon al stacio se estas peto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGBRIDGES                                  :{LTBLUE}Permesu konstruadon de tre longaj pontoj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_GOTODEPOT                                    :{LTBLUE}Permesu ordenojn por iri al deponejo: {ORANGE}{STRING}
+STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Permana ĉefa industri-konstrumaniero: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :nenio
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :kiel aliaj industrioj
+STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospektori
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Permesu pliajn similajn industriojn en la sama urbo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Samtipaj industrioj povas esti konstruataj proksime unu de la alia: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Ĉiam montru longan daton en la statbreto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Montru signalojn veturflanke: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Montru financan fenestron fine de la jaro: {ORANGE}{STRING}
+STR_CONFIG_SETTING_NONSTOP_BY_DEFAULT                           :{LTBLUE}Novaj ordonoj estas 'sen-halte' per defaŭlto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ROADVEH_QUEUE                                :{LTBLUE}Vojveturila vicigo (kun kvantum-efektoj): {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Ŝovu fenestron se la muso estas ĉe la rando: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Permesu subaĉeti la lokajn estrojn: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}Permesu aĉeti ekskluzivajn transportrajtojn: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :{LTBLUE}Permesu sendi monon al aliaj kompanioj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NONUNIFORM_STATIONS                          :{LTBLUE}Nekonformaj stacioj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :{LTBLUE}Pezpliigo pro ŝarĝo por imiti pezajn trajnojn: {ORANGE}{STRING}
-STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Permesu trairaj bushaltejoj sur vojoj urboposedataj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PLANE_SPEED                                  :{LTBLUE}Aviadil-rapidec-faktoro: {ORANGE}1 / {STRING}
+STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Permesu trairajn bushaltejojn sur vojoj urboposedataj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Permesu trairajn strathaltejojn sur stratoj posedataj de konkurantoj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Permesu konstrui staciojn apude: {ORANGE}{STRING}
 
+STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Ebligu multoblajn NewGRF-motorarojn: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Ne eblas ŝanĝi ĉi tiujn agordon dum veturiloj ĉeestas.
 STR_CONFIG_SETTING_SMALL_AIRPORTS                               :{LTBLUE}Ĉiam permesu malgrandajn flughavenojn: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_WARN_LOST_TRAIN                              :{LTBLUE}Avertu se trajno perdiĝas: {ORANGE}{STRING}
@@ -902,6 +959,7 @@ STR_CONFIG_SETTING_ORDER_REVIEW                                 :{LTBLUE}Atentu
 STR_CONFIG_SETTING_ORDER_REVIEW_OFF                             :ne
 STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :jes, escepte de haltigitaj veturiloj
 STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :de ĉiuj veturiloj
+STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}Avertu se gajno de veturilo negativas: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Veturiloj neniam eluziĝas: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Aŭtomate anstataŭu veturilon se malnoviĝas: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Anstataŭu {ORANGE}{STRING}{LTBLUE} monatojn antaŭ/post pleja veturilaĝo
@@ -927,12 +985,15 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Altecma
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Maldekstrume
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Dekstrume
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Kiom alta fariĝos scenara mapo: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Ebligu terecigon de la tegoloj ĉe la eĝoj de la mapo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}Unu ay pli da xeloj en norda parto ne malplenas
+STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}Almenaŭ unu tegolo ĉe unu de la eĝoj ne estas akvo
 
 STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Maksimuma stacivasteco: {ORANGE}{STRING} {RED}Atentu: Pli alte, malpli rapide
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Aŭtomate prizorgu helikopterojn sur helikopterejoj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Ligu landaspektan breton al konstruadaj bretoj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_REVERSE_SCROLLING                            :{LTBLUE}Inversigu skroldirekton: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :{LTBLUE}Glata rulumado de vidujo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :{LTBLUE}Montru mezuran konsilbalonon ĉe uzo de konstruiloj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LIVERIES                                     :{LTBLUE}Montru kompaniajn liverojn: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LIVERIES_NONE                                :Neniuj
@@ -945,15 +1006,43 @@ STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :Skroli mapon
 STR_CONFIG_SETTING_SCROLLWHEEL_OFF                              :Malaktiva
 STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :{LTBLUE}Mapskrolrada rapido: {ORANGE}{STRING}
 
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU                          :{LTBLUE}Imitado de dekstra klako: {ORANGE}{STRING}
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Komando+Klako
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl+Klako
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Ne
 
+STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Maldekstr-klak-rulumado: {ORANGE}{STRING}
 
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Uzu la {ORANGE}{STRING}{LTBLUE} datformon por nomoj de konservludoj.
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :longa (31st Dec 2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :mallonga (31-12-2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)
 
 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Aŭtomate paŭzu startante novan ludon: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}Uzu la avancitan veturilaron: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OFF                   :Ne
+STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_OWN                   :Propra kompanio
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS_ALL                   :Ĉiuj kompanioj
+STR_CONFIG_SETTING_LOADING_INDICATORS                           :{LTBLUE}Uzu ŝarg-indikilojn: {ORANGE}{STRING}
+STR_CONFIG_SETTING_LOADING_INDICATORS_OFF                       :Ne
+STR_CONFIG_SETTING_LOADING_INDICATORS_OWN                       :Propra kompanio
 STR_CONFIG_SETTING_LOADING_INDICATORS_ALL                       :Ĉiuj kompanioj
+STR_CONFIG_SETTING_TIMETABLE_ALLOW                              :{LTBLUE}Ebligu horarigon por veturiloj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_TIMETABLE_IN_TICKS                           :{LTBLUE}Montru horaron laŭ tikoj anstataŭ laŭ tagoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_QUICKGOTO                                    :{LTBLUE}Rapidkreo de veturilordonoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE                            :{LTBLUE}Defaŭlta reltipo (post novludo/ŝargludo): {ORANGE}{STRING}
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_RAIL                       :Kutima Relo
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_ELRAIL                     :Elektrizita Relo
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MONORAIL                   :Unurelo
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MAGLEV                     :Maglev
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST                      :Unue havebla
+STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST                       :Laste havebla
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :Pli uzata
+STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Montru rezervitajn trakojn: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}Lasu aktivaj la konstruilojn post uzado: {ORANGE}{STRING}
+STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Grupigu elspezojn en kompania financfenestro: {ORANGE}{STRING}
 
+STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Montru konstruilojn kiam ne haveblas taŭgaj veturiloj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Trajna maksimumo por ĉiu ludanto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_ROADVEH                                  :{LTBLUE}Vojveturila maksimumo por ĉiu ludanto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Aviadila maksimumo por ĉiu ludanto: {ORANGE}{STRING}
@@ -964,6 +1053,8 @@ STR_CONFIG_SETTING_AI_BUILDS_ROADVEH                            :{LTBLUE}Malebli
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Malebligu aviadilojn por la komputilo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Malebligu ŝipojn por la komputilo: {ORANGE}{STRING}
 
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Permesu ArtefaritajnIntelektojn en pluropaj ludoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodes antaŭ ArtefariteIntelekto estos prokrestita: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Prizorgintervala procentaĵo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Defaŭlta prizorgintervalo por trajnoj: {ORANGE}{STRING} tagoj/%
@@ -984,13 +1075,24 @@ STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}Aktivig
 STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}Permesu aĉetadon de dividaĵoj en aliaj kompanioj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Tirante metu signalojn je ĉiuj: {ORANGE}{STRING} kvadrado(j)
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Aŭtomate konstruu semaforojn antaŭ: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Ebligu la signal-GUI-on: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Signaltipo defaŭlte konstruenda: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Blok-signaloj
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Pad-signaloj
+STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBSOWAY                       :Unudirektaj pad-signaloj
+STR_CONFIG_SETTING_CYCLE_SIGNAL_TYPES                           :{LTBLUE}Iteraciu tra signaltipoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Blok-signaloj sole
+STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Pad-signaloj sole
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :ĉiom
 
+STR_CONFIG_SETTING_TOWN_LAYOUT                                  :{LTBLUE}Strataranĝo por novaj urboj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT                          :defaŭlte
 STR_CONFIG_SETTING_TOWN_LAYOUT_BETTER_ROADS                     :pli bonaj vojoj
 STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :kvadrataro de 2x2
 STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :kvadrataro de 3x3
 STR_CONFIG_SETTING_TOWN_LAYOUT_RANDOM                           :hazarda
+STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :{LTBLUE}Permesu ke urboj konstruu stratojn: {ORANGE}{STRING}
+STR_CONFIG_SETTING_NOISE_LEVEL                                  :{LTBLUE}Permesu urbe kontrolatan laŭtecon por flughavenoj: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}Loko de ĉefa ilbreto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOOLBAR_POS_LEFT                             :Maldekstre
@@ -998,6 +1100,8 @@ STR_CONFIG_SETTING_TOOLBAR_POS_CENTER                           :Centre
 STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT                            :Dekstre
 STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Fenestroliga distanco: {ORANGE}{STRING} px
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}Fenestroliga distanco: {ORANGE}malaktiva
+STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Fenestra mollimo (ne-glueca): {ORANGE}{STRING}
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Fenestra mollimo (ne-glueca): {ORANGE}malebligita
 STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}Urba kreskorapideco: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :Ne
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :Malrapide
@@ -1007,6 +1111,7 @@ STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :Tre rapide
 STR_CONFIG_SETTING_LARGER_TOWNS                                 :{LTBLUE}Grandeco de urboj kiuj duoble rapide kreskas: {ORANGE}1 en {STRING}
 STR_CONFIG_SETTING_LARGER_TOWNS_DISABLED                        :{LTBLUE}Grandeco de urboj kiuj duoble rapide kreskas: {ORANGE}Ne
 STR_CONFIG_SETTING_CITY_SIZE_MULTIPLIER                         :{LTBLUE}Komenca urbgrandeca multobligo: {ORANGE}{STRING}
+STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :{LTBLUE}Forigu sensensajn straterojn dum stratkonstruado: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_GUI                                          :{ORANGE}Interfaco
 STR_CONFIG_SETTING_CONSTRUCTION                                 :{ORANGE}Konstruado
@@ -1014,9 +1119,29 @@ STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Veturil
 STR_CONFIG_SETTING_STATIONS                                     :{ORANGE}Stacioj
 STR_CONFIG_SETTING_ECONOMY                                      :{ORANGE}Ekonomio
 STR_CONFIG_SETTING_AI                                           :{ORANGE}Konkurantoj
+STR_CONFIG_SETTING_DISPLAY_OPTIONS                              :{ORANGE}Montru opciojn
+STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Interago
+STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}Signaloj
+STR_CONFIG_SETTING_STATIONS_CARGOHANDLING                       :{ORANGE}Kargotraktado
+STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Komputil-ludantoj
+STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Aŭtorenovigo
+STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}Servado
+STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Navigado
+STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}Trajnoj
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}Urboj
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Industrioj
 
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Padtrovilo por trajnoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(Ne rekomendita)
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF                    :NPF
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Rekomendita)
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH                       :{LTBLUE}Padtrovilo por vojveturiloj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH_OPF                   :Originala {RED}(Ne rekomendita)
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(Rekomendita)
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Padtrovilo por ŝipoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF                     :Originala {BLUE}(Rekomendita)
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_NPF                     :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(malrekomenda)
 
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}X-grandeco de la mapo: {ORANGE}{STRING}
@@ -1037,6 +1162,7 @@ STR_CHEATS                                                      :{WHITE}Filudaĵ
 STR_CHEATS_TIP                                                  :{BLACK}La kvadratetoj indikas ĉu vi jam uzis la filudaĵon antaŭe.
 STR_CHEATS_WARNING                                              :{BLACK}Atentu! Vi perfidos viajn kunulajn konkurantojn. Memoru ke io tia rememoriĝos eterne.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Altigu monkvanton per {CURRENCY}
+STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Ludanta kiel kompanio: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magia forigilo (forviŝu industriojn, nemoveblaĵojn): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneloj rajtas kruciĝi unu kun la alia: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Konstruado eblas dum paŭzo: {ORANGE}{STRING}
@@ -1059,6 +1185,7 @@ STR_WAYPOINT                                                    :{WHITE}Trairejo
 STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Elektu trairejan tipon
 
 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
+STR_WAYPOINT_VIEWPORT_LIST                                      :{WHITE}{WAYPOINT} - {COMMA} Trajno{P "" s}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
 STR_WAYPOINT_RAW                                                :{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Ŝanĝu trairejan nomon
@@ -1071,6 +1198,7 @@ STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Ne povas
 STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Konstruu fervojojn per Aŭtomata relo
 
 STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...mankas urboj en ĉi tiu scenaro
+STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Mapkreado haltita...{}...mankas taŭgaj urbejoj
 
 STR_MANY_RANDOM_TOWNS                                           :{BLACK}Multaj hazardaj urboj
 STR_RANDOM_TOWNS_TIP                                            :{BLACK}Kovru la mapon per hazarde metitajn urbojn
@@ -1082,7 +1210,6 @@ STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}Malfermu
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landaspekto
 STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Ebenigu landon
 
-
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arboj de hazardaj tipoj
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Metu arbojn de hazardaj tipoj
 
@@ -1094,6 +1221,7 @@ STR_CANT_BUILD_LOCKS                                            :{WHITE}Ne povas
 STR_BUILD_LOCKS_TIP                                             :{BLACK}Konstruu kluzojn
 STR_LANDINFO_LOCK                                               :Kluzo
 
+STR_CANT_PLACE_RIVERS                                           :{WHITE}Ne povas meti riverojn ĉi tien...
 STR_LANDINFO_RIVER                                              :Rivero
 
 STR_BUOY_IS_IN_USE                                              :{WHITE}...buo estas uzata
@@ -1121,6 +1249,7 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportite)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportite)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
+STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrinomoj - klaku la nomon por centrigi la vidujon al la industrio
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...tro proksime al alia industrio
 
@@ -1137,6 +1266,7 @@ STR_NETWORK_MULTIPLAYER                                         :{WHITE}Pluraj l
 
 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Ludantnomo:
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ĉi tio estas la nomo per kiu la aliaj ekkonas vin
+STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Tajpu vian nomon
 STR_NETWORK_CONNECTION                                          :{BLACK}Konekto:
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Elektu inter interreta kaj lokareta ludo
 
@@ -1147,6 +1277,8 @@ STR_NETWORK_GAME_NAME                                           :{BLACK}Nomo
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nomo de la ludo
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Lingvo, servila versio ktp.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Alklaku ludon el la listo por elekti ĝin
+STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}La servilo kiun vi laste ensalutis:
+STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klaku por selekti la servilon kie vi ludis la lastan fojon
 
 STR_NETWORK_FIND_SERVER                                         :{BLACK}Trovu servilon
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Serĉu reton por servilo
@@ -1158,21 +1290,25 @@ STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientoj
 STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientoj surrete / maksimume{}Kompanioj surrete / maksimume
 
+STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Mapgrandeco
+STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Mapgrandeco de la ludo{}Klaku por ordigi laŭ areo
 
 STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dato
 STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Aktuala dato
 
 STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jaroj
+STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombro de jaroj{}la ludo jam rulas
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}LUDINFORMOJ
-STR_NETWORK_CLIENTS                                             :{SILVER}Klientoj:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Lingvo:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tegolaro:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Mapgrandeco:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Servila versio:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klientoj: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Lingvo: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Tegolaro: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Mapgrandeco: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versio de servilo: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Servila adreso:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Komenca dato:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuna dato:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Komenca dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuna dato: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protektata per pasvorto!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVILO NE SURRETAS
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVILO PLENAS
@@ -1186,6 +1322,7 @@ STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Komencu
 
 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Ludnomo:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}La ludnomo estos montrata al aliaj ludantoj en la ludelektejo por plurludantaj ludoj.
+STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Tajpu nomon por la retludo
 STR_NETWORK_SET_PASSWORD                                        :{BLACK}Agordu pasvorton
 STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protektu vian ludon per pasvorto por ne publike atingebligi ĝin
 STR_NETWORK_SELECT_MAP                                          :{BLACK}Elektu mapon:
@@ -1201,10 +1338,12 @@ STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Elektu k
 STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} kompanio{P "" j}
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Kompania maksimumo:
 STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limu la servilon al certa kvanto da kompanioj
+STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spektanto{P "" s}
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Spektanta maksimumo:
 STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limigu la servilon al certa kvanto da spektantoj
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Parolata lingvo:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Aliaj ludantoj scios kiu lingvo paroliĝas en la servilo
+STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_START_GAME                                          :{BLACK}Startu Ludon
 STR_NETWORK_START_GAME_TIP                                      :{BLACK}Komencu novan retan ludon de hazarda mapo, aŭ scenaro
 STR_NETWORK_LOAD_GAME                                           :{BLACK}Ŝarĝu Ludon
@@ -1251,7 +1390,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Latva
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Atendejo por plurludantaj ludoj
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparas por aliĝi:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparanta por aliĝi: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Listo da kompanioj haveblaj en ĉi tiu ludo. Vi povas aliĝi al unu aŭ komenci novan kompanion se restas loko
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova kompanio
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Kreu novan kompanion
@@ -1264,16 +1403,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Refreŝi
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}KOMPANIAJ INFORMOJ
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Kompaninomo:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaŭguro:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Kompanivaloro:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuna monstato:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Lastjara enspezo:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendimento:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Kompaninomo: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaŭguro: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Kompanivaloro: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuna monstato: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Lastjara enspezo: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendimento: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veturiloj:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stacioj:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Ludantoj:  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Veturiloj: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stacioj: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Ludantoj: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Konektante...
 
@@ -1293,27 +1432,30 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES}
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Malkonektu
 
+STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Tajpu kiom da mono vi volas doni
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servilo estas protektata. Enigu pasvorton
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanio estas protektata. Enigu pasvorton
 STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientlisto
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spekti
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Kompanio
 
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ne trovis retstirilojn aŭ kompiliĝis sen ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Ne troveblas ajna reta ludo
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Ne povis trovi ajnan retludon
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} La servilo ne respondis al la peto
 STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Ne povis konekti pro miso pri NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Retluda sinkronigado fiaskis
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Perdis konekton al Retludo
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Perdis konekton al retludo
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Ne povis ŝarĝi konservitan ludon
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Ne povis starti la servilon
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Ne povis eki la servilon
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Ne povis konekti
 STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Konekto #{NUM} ekstertempiĝis
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Protokoleraro fariĝis kaj la konekto fermiĝis
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Okazis protokoleraro kaj la konekto estis fermita
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La revidaĵo de la kliento ne kongruas kun la servila revidaĵo
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Malĝusta pasvorto
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} La servilo plenas
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Oni forbaris vin de la servilo
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Oni forbatis vin de la ludo
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Vi ne rajtas filudi en ĉi tiu servilo
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}La servilo plenas
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Oni forbaris vin de la servilo
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Oni forbatis vin el la ludo
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Vi ne rajtas filudi en ĉi tiu servilo
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :ĝenerala eraro
@@ -1327,12 +1469,28 @@ STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ricevis stranga
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :malĝusta revidaĵo
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nomo jam uziĝas
 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :malĝusta pasvorto
+STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :malĝusta kompani-ID en DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :forbatite de servilo
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :provis uzi filudaĵon
 STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servilo plenas
 ############ End of leave-in-this-order
+STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS                  :Ludo paŭzita (ne sufiĉaj ludantoj)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS                :Ludo malpaŭzita (sufiĉaj ludandoj)
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Ludo paŭzita (konektanta kliento)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Ludo malpaŭzita (kliento konektita)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Ludo malpaŭzita (konektado de kliento fiaskis)
 ############ End of leave-in-this-order
+STR_NETWORK_CLIENT_LEAVING                                      :forlasanta
+STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} ensalutis la ludon
+STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} iĝis ano de kompanio #{2:NUM}
+STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} iĝis spektanto
+STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} ekis novan kompanion (#{2:NUM})
+STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} ĉesis la ludon ({2:STRING})
+STR_NETWORK_NAME_CHANGE                                         :*** {STRING} ŝanĝis sian nomon al {STRING}
+STR_NETWORK_GIVE_MONEY                                          :*** {STRING} donis al via kompanio {2:CURRENCY}
+STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Vi donis {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Teamo] :
 STR_NETWORK_CHAT_COMPANY                                        :[Teamo] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Teamo] Al {STRING}: {WHITE}{STRING}
@@ -1341,7 +1499,8 @@ STR_NETWORK_CHAT_CLIENT                                         :[Private] {STRI
 STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] Al {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Ĉiuj] :
 STR_NETWORK_CHAT_ALL                                            :[Ĉiuj] {STRING}: {WHITE}{STRING}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} La servilo fermis la sesion
+STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Tajpu tekston por retbabilado
+STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} La servilo fermis la seancon
 STR_NETWORK_SERVER_REBOOT                                       :{WHITE} La servilo restartiĝas...{}Bonvolu atendi...
 
 STR_NETWORK_SERVER                                              :Servilo
@@ -1381,6 +1540,7 @@ STR_0805_ESTIMATED_COST                                         :{WHITE}Atendata
 STR_0807_ESTIMATED_INCOME                                       :{WHITE}Atendata enspezo: {CURRENCY}
 STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Ne povas altigi landon ĉi tie...
 STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Ne povas malaltigi landon ĉi tie...
+STR_CAN_T_LEVEL_LAND_HERE                                       :{WHITE}Ne povas ebenigi terenon ĉi tie...
 STR_080A_ROCKS                                                  :Rokoj
 STR_080B_ROUGH_LAND                                             :Malglata lando
 STR_080C_BARE_LAND                                              :Nuda lando
@@ -1395,9 +1555,11 @@ STR_1001_IMPOSSIBLE_TRACK_COMBINATION                           :{WHITE}Neebla t
 STR_1002_EXCAVATION_WOULD_DAMAGE                                :{WHITE}Elkavigo damaĝus tunelon
 STR_1003_ALREADY_AT_SEA_LEVEL                                   :{WHITE}Jam marnivele
 STR_1004_TOO_HIGH                                               :{WHITE}Tro alte
+STR_ALREADY_LEVELLED                                            :{WHITE}... jam plata
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Nekonvena fervojtrako
 STR_1007_ALREADY_BUILT                                          :{WHITE}...jam konstruite
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Antaŭe forigu relon
+STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Strato estas unudirekta aŭ blokita
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Konstruado de Reloj
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Konstruado de Elektraj Reloj
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Konstruado de Unurela Fervojo
@@ -1429,6 +1591,10 @@ STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...regio
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Reloj kun normalaj signaloj
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Reloj kun antaŭ-signaloj
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Reloj kun elir-signaloj
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Reloj kun kombin-signaloj
+STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Reloj kun pad-signaloj
+STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Reloj kun unudirektaj pad-signaloj
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Reloj kun blok- kaj antaŭ-signaloj
 
 
 
@@ -2472,7 +2638,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Nomu tra
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Ne povas nomi trajnon...
 STR_8867_NAME_TRAIN                                             :{BLACK}Nomu trajnon
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Trajna Kraŝo!{}{COMMA} mortis pro fajro post kolizio
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Ne povas inversigi direkton de trajno...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ne povas inversigi direkton de trajno...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Ne povas inversigi direkton de veturilo...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne povas turni veturilojn konsistantaj el pluraj unuoj
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renomu trajnan veturiltipon
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Ne povas renomi trajnan veturiltipon...
 
@@ -2541,8 +2709,7 @@ STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua ŝarĝaŭto alvenas en {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Vojveturila kraŝo!{}Veturanto mortas pro fajro post kolizio kun trajno
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Vojveturila Kraŝo!{}{COMMA} mortas pro fajro post kolizio kun trajno
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Ne povas ĉirkaŭturni veturilon...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Ne povas turni veturilojn konsistantaj el pluraj unuoj
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Ne povas turnigi vojveturilon...
 STR_9034_RENAME                                                 :{BLACK}Renomu
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomu vojveturilan tipon
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomu vojveturilan tipon
@@ -2806,7 +2973,7 @@ STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Montru
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Montru ĉiujn aviadilojn kun ĉi tiu stacio en la plano
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Montru ĉiujn ŝipojn kun ĉi tiu stacio en la plano
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Dividitaj ordenoj de {COMMA} Veturilo{P "" j}
+STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Kunhavaj ordonoj de {COMMA} Veturilo{P "" j}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Montru ĉiujn veturilojn kiuj dividas ĉi tiun planon
 
 ### depot strings
@@ -3047,8 +3214,13 @@ STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Konstruu
 
 ############ Face formatting
 STR_FACE_SIMPLE                                                 :{BLACK}Simpla
+STR_FACE_SAVE                                                   :{BLACK}Konservi
+STR_FACE_SAVE_TIP                                               :{BLACK}Konservi faman vizaĝon
+STR_FACE_SAVE_DONE                                              :{WHITE}Tiu ĉi vizaĝo estos konservita kiel via fama en agord-dosiero de OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Europa
+STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Elekti eŭropecajn vizaĝojn
 STR_FACE_AFRICAN                                                :{BLACK}Afrika
+STR_FACE_SELECT_AFRICAN                                         :{BLACK}Elekti afrikecajn vizaĝojn
 STR_FACE_YES                                                    :Jes
 STR_FACE_NO                                                     :Ne
 STR_FACE_HAIR                                                   :Hararo:
@@ -3057,6 +3229,7 @@ STR_FACE_EYECOLOUR                                              :Okula koloro:
 STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Ŝanĝu okulan koloron
 STR_FACE_GLASSES                                                :Okulvitroj:
 STR_FACE_NOSE                                                   :Nazo:
+STR_FACE_NOSE_TIP                                               :{BLACK}Ŝanĝi nazon
 STR_FACE_LIPS                                                   :Lipoj:
 STR_FACE_MOUSTACHE                                              :Liphararo:
 ########

src/lang/estonian.txt

@@ -214,8 +214,8 @@ STR_00B3_MESSAGE_FROM                                           :{YELLOW}{STRING
 STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Ettevaatust!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Seda ei saa teha....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Seda ala ei saa puhastada....
-STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Algupärane autorikaitse {COPYRIGHT} 1995 Chris Sawyer, kõik õigused kaitstud
-STR_00B7_VERSION                                                :{BLACK}OpenTTD versioon {REV}
+STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Algne autorikaitse {COPYRIGHT} 1995 Chris Sawyer, kõik õigused kaitstud
+STR_00B7_VERSION                                                :{BLACK}OpenTTD osa {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD meeskond
 
 STR_00C5                                                        :{BLACK}{CROSS}
@@ -223,7 +223,7 @@ STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Mängust väljumine
 STR_00C8_YES                                                    :{BLACK}Jah
 STR_00C9_NO                                                     :{BLACK}Ei
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Kas sa oled kindel, et sa soovid sellest mängust lahkuda ja minna tagasi süsteemi {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}?
 STR_00CB_1                                                      :{BLACK}1
 STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
@@ -310,7 +310,7 @@ STR_013B_OWNED_BY                                               :{WHITE}...omani
 STR_013C_CARGO                                                  :{BLACK}Laadung
 STR_013D_INFORMATION                                            :{BLACK}Andmed
 STR_013E_CAPACITIES                                             :{BLACK}Kandevõimed
-STR_TOTAL_CARGO                                                 :{BLACK}Laadungit kokku
+STR_TOTAL_CARGO                                                 :{BLACK}Veoseid kokku
 STR_013F_CAPACITY                                               :{BLACK}Kandevõime: {LTBLUE}{CARGO}{STRING}
 STR_CAPACITY_MULT                                               :{BLACK}Kandevõime: {LTBLUE}{CARGO}{STRING} (x{NUM})
 STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Selle rongi kandevõime:
@@ -369,8 +369,8 @@ STR_015C_SAVE_GAME                                              :Salvesta mäng
 STR_015D_LOAD_GAME                                              :Laadi mäng
 STR_015E_QUIT_GAME                                              :Lahku mängust
 STR_015F_QUIT                                                   :Välju
-STR_ABANDON_GAME_QUERY                                          :{YELLOW}Kas te soovite lõpetada selle mängu?
-STR_0161_QUIT_GAME                                              :{WHITE}Mängust lahkumine
+STR_ABANDON_GAME_QUERY                                          :{YELLOW}Kas te soovite selle mängu lõpetada?
+STR_0161_QUIT_GAME                                              :{WHITE}Mängu lõpetamine
 STR_SORT_ORDER_TIP                                              :{BLACK}Sorteerimise järjekorra valimine (kahanev/kasvav)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Sorteerimistingimuse valimine
 STR_SORT_BY                                                     :{BLACK}Sorteeri:
@@ -477,11 +477,11 @@ STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}Kerimisr
 STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}Näitab kaardil maastikku
 STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Näita kaardil veovahendeid
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Näita kaardil tööstuseid
-STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Näita kaardil teid ja raudteid
+STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Näita kaardil veoliine
 STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Näita kaardil taimestikku
 STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Näita kaardil maaomanikke
 STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Linnanimede sisse- ja välja lülitamine
-STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Kasum sellel aastal: {CURRENCY} (eelmisel aastal: {CURRENCY})
+STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Kasum sellel aastal: {CURRENCY} (eelneval: {CURRENCY})
 
 ############ range for service numbers starts
 STR_AGE                                                         :{COMMA} aasta{P "" t} ({COMMA})
@@ -492,9 +492,9 @@ STR_019F_TRAIN                                                  :Rong
 STR_019C_ROAD_VEHICLE                                           :Sõiduk
 STR_019E_SHIP                                                   :Laev
 STR_019D_AIRCRAFT                                               :Õhusõiduk
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{VEHICLE} hakkab jääma vanaks
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{VEHICLE} hakkab jääma väga vanaks
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{VEHICLE} hakkab jääma väga vanaks ning vajab kiiret väljavahetamist
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{VEHICLE} on vanaks saamas
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{VEHICLE} on väga vanaks saamas
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{VEHICLE} on väga vanaks saamas ja vajab kiiret väljavahetamist
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Maa-ala andmed
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Puhastustasu: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Puhastustasu: {RED}{CURRENCY}
@@ -599,16 +599,18 @@ STR_0201_MESSAGE_SETTINGS                                       :Teadete seadist
 STR_MESSAGE_HISTORY_MENU                                        :Teadete ajalugu
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Näita viimast teadet, kuva teadete valikud
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Teadete valikud
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Teate tüüp:
-STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Mängija jaama saabus esimene veovahend
-STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Konkurendi jaama saabus esimene veovahend
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Teateliigid:
+STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Esimese sõiduki saabumine mängija jaama
+STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Esimese sõiduki saabumine vastase jaama
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Õnnetused / katastroofid
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Ettevõtte teave
 STR_NEWS_INDUSTRY_OPEN                                          :{YELLOW}Tööstuste avamine
 STR_NEWS_INDUSTRY_CLOSE                                         :{YELLOW}Tööstuste sulgemine
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Muutused majanduses
+STR_INDUSTRY_CHANGES_SERVED_BY_COMPANY                          :{YELLOW}Ettevõtte poolt teenindavate tööstuste toodangumuutused
 STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Konkurentide poolt teenindavate tööstuste toodangumuutused
 STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Ülejäänud tööstuste toodangumuutused
+STR_020B_ADVICE_INFORMATION_ON_COMPANY                          :{YELLOW}Teave ja nõuanded ettevõtte sõidukite kohta
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Uus veerem
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Veoste vastuvõtutingimuste muutumine
 STR_020E_SUBSIDIES                                              :{YELLOW}Toetused
@@ -655,7 +657,7 @@ STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...liiga
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...liiga lähedal teisele linnale
 STR_0239_SITE_UNSUITABLE                                        :{WHITE}...ebasobiv koht
 STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...liiga palju linnu
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ühtegi linna ei saa ehitada...
+STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ei saa ühtegi linna ehitada...
 STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...pole enam ruumi kaardil
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Linna suuruse suurendamine
 STR_023C_EXPAND                                                 :{BLACK}Laienda
@@ -691,8 +693,8 @@ STR_PLAY_HEIGHTMAP                                              :{BLACK}Kõrgusk
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Alusta uut mängu kasutades kõrguskaarti maastikuna
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Kas sa oled kindel, et sa tahad kaardi tegemise lõpetada?
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...saab ainult ehitada linna, mille rahvastikuarv ületab 1200
-STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Liiguta algusaega aasta võrra tagasi
-STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Liiguta algusaega aaata võrra edasi
+STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Alguse liigutamine 1 aasta võrra tagasi
+STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Alguse liigutamine 1 aasta võrra edasi
 STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...mõlemad sillaotsad peavad olema maal
 STR_02A1_SMALL                                                  :{BLACK}Väike
 STR_02A2_MEDIUM                                                 :{BLACK}Keskmine
@@ -717,7 +719,6 @@ STR_OFF                                                         :Väljas
 STR_SUMMARY                                                     :Lühike
 STR_FULL                                                        :Täielik
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Linnanimistu
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -738,9 +739,10 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Läbin
 ############ range ends here
 
 ############ range for menu starts
-STR_02D5_LAND_BLOCK_INFO                                        :Maapinna andmed
+STR_02D5_LAND_BLOCK_INFO                                        :Maaala andmed
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Lülita konsool sisse/välja
+STR_AI_DEBUG_MENU                                               :Tehismõistuse debug
 STR_02D7_SCREENSHOT_CTRL_S                                      :Ekraanitõmmis (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Hiiglaslik ekraanitõmmis (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :'OpenTTD' kohta
@@ -754,6 +756,7 @@ STR_02DE_MAP_OF_WORLD                                           :Maailmakaart
 STR_EXTRA_VIEW_PORT                                             :Lisa vaateaken
 STR_SIGN_LIST                                                   :Siltide nimekiri
 STR_02DF_TOWN_DIRECTORY                                         :Linnade nimistu
+STR_02BB_TOWN_DIRECTORY                                         :Linnanimistu
 STR_TOWN_POPULATION                                             :{BLACK}Maailma rahvastik: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vaateaken {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopeeri vaateaknasse
@@ -764,7 +767,7 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Vaatealm
 STR_02E0_CURRENCY_UNITS                                         :{BLACK}Valuuta
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
 STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Valuuta valimine
-STR_MEASURING_UNITS                                             :{BLACK}Mõõtmisühikud
+STR_MEASURING_UNITS                                             :{BLACK}Mõõtühikud
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
 STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Mõõtmisühikute valik
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Sõidukid
@@ -780,12 +783,14 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Isesalve
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Vali automaatselt mängu salvestamise vahemik
 STR_02F7_OFF                                                    :Väljas
+STR_AUTOSAVE_1_MONTH                                            :Iga kuu
 STR_02F8_EVERY_3_MONTHS                                         :Iga 3 kuu tagant
 STR_02F9_EVERY_6_MONTHS                                         :Iga 6 kuu tagant
 STR_02FA_EVERY_12_MONTHS                                        :Iga 12 kuu tagant
 STR_02FB_START_A_NEW_GAME                                       :{BLACK}Alusta uut mängu
 STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Laadi salvestatud mäng
 STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Loo oma mängukaart
+STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Alusta võrgumängu
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Kuva mängu valikuid
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Kuva raskusastmete valikuid
 STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Alusta omatehtud stsenaariumit kasutades uut mängu
@@ -897,9 +902,8 @@ STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Vali kas
 
 STR_OPTIONS_BASE_GRF                                            :{BLACK}Põhigraafikakomplekt
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Valige kasutatav põhigraafikakomplekt
-STR_AUTOSAVE_1_MONTH                                            :Iga kuu
+
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automaatne salvestus nurjus
 
 STR_MONTH_JAN                                                   :Jaanuar
@@ -935,15 +939,23 @@ STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Sihtpunk
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Sihtpunktide nimekirja ei saa kopeerida...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Jagatud sihtpunktide lõpp - -
 
-STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} on kadunud.
+STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} ei leia jätkamiseks rada.
+STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} on eksinud.
+STR_VEHICLE_IS_UNPROFITABLE                                     :{WHITE}{VEHICLE} tulud eelmisel aastal olid {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Euroopa rahaliit!{}{}Nüüdsest on riigi igapäevaseks käiberahaks Euro!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
+STR_VEHICLE_HAS_TOO_FEW_ORDERS                                  :{WHITE}Sõidukil {VEHICLE} on plaanis liiga vähe käske
+STR_VEHICLE_HAS_VOID_ORDER                                      :{WHITE}Sõidukil {VEHICLE} on tühistatud käsk
+STR_VEHICLE_HAS_DUPLICATE_ENTRY                                 :{WHITE}Sõidukil {VEHICLE} on topeltkäske
+STR_VEHICLE_HAS_INVALID_ENTRY                                   :{WHITE}Sõiduki {VEHICLE} käskudes on väär jaam
 # end of order system
 
+STR_VEHICLE_AUTORENEW_FAILED                                    :{WHITE}{VEHICLE} uuendamine ebaõnnestus {}{STRING}
+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}{VEHICLE} on pärast asendamist liiga pikk
 STR_AUTOREPLACE_NOTHING_TO_DO                                   :{WHITE}Automaatse asendamise/uuendamise reegleid ei ole rakendatud
-STR_AUTOREPLACE_MONEY_LIMIT                                     :(rahapiirang)
+STR_AUTOREPLACE_MONEY_LIMIT                                     :(rahalimiit)
 
 STR_CONFIG_SETTING                                              :{BLACK}Täpsemad seaded
 STR_CONFIG_SETTING_TIP                                          :{BLACK}Näidata täpsemaid seadeid
@@ -962,7 +974,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Algupärane
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistlik
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Rongidel ja laevadel keelatakse 90 kraadised pöörded: {ORANGE}{STRING} {LTBLUE} (vajab NPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Kõrvuti ehitatud jaamade ühendamine: {ORANGE}{STRING}
-STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Eemalasetsevate jaamade liitmine: {ORANGE}{STRING}
+STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Mitte kõrvuti asetsevate jaamade liitmine: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Täiustatud laadimisalgoritm: {ORANGE}{STRING}
 STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}Veovahendite järkjärguline laadimine: {ORANGE}{STRING}
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}Inflatsioon: {ORANGE}{STRING}
@@ -1002,9 +1014,9 @@ STR_CONFIG_SETTING_ORDER_REVIEW_EXDEPOT                         :jah, kuid jäta
 STR_CONFIG_SETTING_ORDER_REVIEW_ON                              :kõikidest veovahenditest
 STR_CONFIG_SETTING_WARN_INCOME_LESS                             :{LTBLUE}Hoiata kui rongi sissetulek on negatiivne: {ORANGE}{STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Sõidukid ei aegu: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Vananenud sõidukite moderniseerimine: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTORENEW_VEHICLE                            :{LTBLUE}Vananenud sõidukite uuendamine: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTORENEW_MONTHS                             :{LTBLUE}Piirvanuse saavutanud veovahendit uuendatakse {ORANGE}{STRING}{LTBLUE} kuu piires
-STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Nõutud rahasumma moderniseerimiseks: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AUTORENEW_MONEY                              :{LTBLUE}Nõutud rahasumma uuendamiseks: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Veateadete kestus: {ORANGE}{STRING}
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}Rahvaarv alevike nimesiltidel: {ORANGE}{STRING}
 
@@ -1079,40 +1091,44 @@ STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MAGLEV                     :Magnethõljukro
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_FIRST                      :Esimene saadaval
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST                       :Viimane saadaval
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :Enim kasutatud
-STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Näidatakse varundatud radu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Varundatud radade näitamine: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}Ehitustööriistad pärast kasutamist tegusad: {ORANGE}{STRING}
+STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Kulutuste rühmitamine ettevõtte finantsaknas: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Ehitustööriistade näitamine ka sobivate sõidukite puudumisel: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Ehitustööriistade näitamine ka vastavate sõidukite puudumisel: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Enim ronge mängija kohta: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_ROADVEH                                  :{LTBLUE}Enim mootorsõidukeid mängija kohta: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Enim õhusõidukeid mängija kohta: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_SHIPS                                    :{LTBLUE}Enim laevu mängija kohta: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :{LTBLUE}Arvuti ei tohi ronge kasutada: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_ROADVEH                            :{LTBLUE}Keela arvutile sõidukid: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Keela arvutile õhusõidukid: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Arvuti ei tohi laevasid kasutada: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :{LTBLUE}Rongikeeld arvutile: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_ROADVEH                            :{LTBLUE}Sõidukikeeld arvutile: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Õhusõidukikeeld arvutile: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Laevakeeld arvutile: {ORANGE}{STRING}
 
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Tehismõistus võrgumängudes: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodes enne tehismõistuse peatamist: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Hooldusvahemikud on protsentides: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Vaikimisi hooldusintervall rongidele: {ORANGE}{STRING} päeva
+STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Protsentides hooldusvahemikud: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Vaikimisi hooldusvahemik rongidele: {ORANGE}{STRING} päeva
 STR_CONFIG_SETTING_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Rongide hooldusvahemik vaikimisi: {ORANGE}väljas
-STR_CONFIG_SETTING_SERVINT_ROADVEH                              :{LTBLUE}Vaikimisi valitud mootorsõidukite hooldusvahemik: {ORANGE}{STRING} päeva
+STR_CONFIG_SETTING_SERVINT_ROADVEH                              :{LTBLUE}Vaikimisi hooldusvahemik mootorsõidukitele: {ORANGE}{STRING} päeva
 STR_CONFIG_SETTING_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Mootorsõidukite hooldusvahemik vaikimisi: {ORANGE}välja lülitatud
-STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Vaikimisi valitud õhusõidukite hooldusvahemik: {ORANGE}{STRING} päeva
+STR_CONFIG_SETTING_SERVINT_AIRCRAFT                             :{LTBLUE}Vaikimisi hooldusvahemik õhusõidukitele: {ORANGE}{STRING} päeva
 STR_CONFIG_SETTING_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Õhusõidukite hooldusvahemik vaikimisi: {ORANGE}väljas
-STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Vaikimisi hooldusintervall laevadele: {ORANGE}{STRING} päeva
+STR_CONFIG_SETTING_SERVINT_SHIPS                                :{LTBLUE}Vaikimisi hooldusvahemik laevadele: {ORANGE}{STRING} päeva
 STR_CONFIG_SETTING_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Laevade hooldusvahemik vaikimisi: {ORANGE}väljas
-STR_CONFIG_SETTING_NOSERVICE                                    :{LTBLUE}Lülitades rikki minemise välja, keelatakse ka hooldamine: {ORANGE}{STRING}
-STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :{LTBLUE}Luba vagunite kiiruspiirangud: {ORANGE}{STRING}
+STR_CONFIG_SETTING_NOSERVICE                                    :{LTBLUE}Hoolduse keelamine rikete väljalülitamisel: {ORANGE}{STRING}
+STR_CONFIG_SETTING_WAGONSPEEDLIMITS                             :{LTBLUE}Vagunite kiiruspiirangud: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISABLE_ELRAILS                              :{LTBLUE}Elektrirongide keeld: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_COLOURED_NEWS_YEAR                           :{LTBLUE}Värvilised uudised ilmuvad aastast {ORANGE}{STRING}
 STR_CONFIG_SETTING_STARTING_YEAR                                :{LTBLUE}Alustamise aeg: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}Luba sujuv majandus (väiksemad muutused): {ORANGE}{STRING}
-STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}Luba teiste ettevõtete aktsiate ostmine: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SMOOTH_ECONOMY                               :{LTBLUE}Sujuv majandus (rohkem, väiksemad muutused): {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALLOW_SHARES                                 :{LTBLUE}Aktsiatehingud teiste ettevõtetega: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Venitades rajatavate signaalide paigaldustihedus: {ORANGE}{STRING} ühik(ut)
 STR_CONFIG_SETTING_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Semafore ehitatakse enne: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Signaalide liides sisse: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ENABLE_SIGNAL_GUI                            :{LTBLUE}Signaalide paigutamise graafiline kasutajaliides: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_TYPE                          :{LTBLUE}Vaikimisi ehitatav signaalide liik: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_NORMAL                        :Tavaline
 STR_CONFIG_SETTING_DEFAULT_SIGNAL_PBS                           :Täiustatud
@@ -1161,23 +1177,23 @@ STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Suhtlem
 STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}Signaalid
 STR_CONFIG_SETTING_STATIONS_CARGOHANDLING                       :{ORANGE}Kauba käsitlemine
 STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Arvutimängijad
-STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Moderniseerimine
+STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Uuendamine
 STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}Hooldamine
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Marsruutimine
 STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}Rongid
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}Linnad
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Tööstused
 
-STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Rongide marsruuter: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Rongide marsruudileidja: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(ebasoovitatav)
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(soovitatav)
-STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH                       :{LTBLUE}Maanteesõidukite marsruuter: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(soovitatud)
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH                       :{LTBLUE}Maanteesõidukite marsruudileidja: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH_OPF                   :Algne {RED}(ebasoovitatav)
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
-STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(soovitatav)
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Laevade marsruuter: {ORANGE}{STRING}
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF                     :Algne {BLUE}(soovitatav)
+STR_CONFIG_SETTING_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(soovitatud)
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Laevade marsruudileidja: {ORANGE}{STRING}
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF                     :Algne {BLUE}(soovitatud)
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_NPF                     :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(ebasoovitatav)
 
@@ -1203,10 +1219,10 @@ STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Mängim
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Maagiline buldooser (eemaldamatute rajatiste lammutamine): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnelid võivad üksteist läbida: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Seisatuse ajal ehitamine: {ORANGE}{STRING}
-STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Reaktiivlennukid ei kuku (tihti) alla väikestel lennuväljadel: {ORANGE} {STRING}
+STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Reaktiivlennukid ei kuku (tihti) väikestel lennuväljadel alla: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Vaheta kliimat: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Muuda kuupäeva: {ORANGE} {DATE_SHORT}
-STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Muutuvad tootmisväärtused: {ORANGE}{STRING}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Tootmisväärtuste muutmine: {ORANGE}{STRING}
 
 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Suudub meldepunkti: {WAYPOINT}
 STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Suundub {WAYPOINT}, {VELOCITY}
@@ -1232,7 +1248,7 @@ STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}Muuda r
 STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Meldepunkti ei saa siia rajada...
 STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Meldepunkti ei saa siit eemaldada...
 
-STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Rööbaste ehitamine kasutades "venitamist"
+STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Rööbaste ehitamine kasutades "lohistamist"
 
 STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...kaardil puudub linn
 STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kaarditekitamine katkes...{}...linnadele pole sobilike kohti
@@ -1293,7 +1309,7 @@ STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liiga
 
 STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Rongi seadistamine mõne teise laadungi vedamiseks
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Seadista ümber
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali laadung, mida rong peaks kandma
+STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali rongi veetav veoseliik
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Rongi ümberseadistamine valitud laadungi vedamiseks
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Ei ole võimalik ümber seadistada...
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootlikuse muutmine
@@ -1303,17 +1319,17 @@ STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootliku
 STR_NETWORK_MULTIPLAYER                                         :{WHITE}Võrgumäng
 
 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Mängija nimi:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Selle nime järgi tunnevad sind teised mängijad ära
+STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Teised mängijad tunnevad sind selle nime järgi
 STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Sisesta enda nimi
 STR_NETWORK_CONNECTION                                          :{BLACK}Ühendus:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Valik internetis ja kohalikus võrgus (LAN) toimuba mängu vahel
+STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Valimine interneti- või kohtvõrkmängu vahel
 
 STR_NETWORK_START_SERVER                                        :{BLACK}Alusta serverit
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Isikliku serveri alustamine
+STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Oma serveri alustamine
 
 STR_NETWORK_GAME_NAME                                           :{BLACK}Nimi
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Mängu nimi
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Suhtluskeel, serveri versioon, jne.
+STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Suhtluskeel, serveri osa, jne.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Mäng valimiseks vajuta nimekirjas olevale nimele
 STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server, kus sa viimati mängisid:
 STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klõpsa, et valida server, kus sa viimati mängisid
@@ -1339,14 +1355,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Kestnud
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Mitu aastat{}on mäng kestnud
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}MÄNGU ANDMED
-STR_NETWORK_CLIENTS                                             :{SILVER}Kliendid:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Keel:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Ruudustik:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaardi suurus:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serveri versioon:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Kliendid: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Keel: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Ruudustik: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaardi suurus: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Osa serveris:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveri aadress:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Aeg alguses:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aeg hetkel:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Aeg alguses: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aeg hetkel: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Parooliga kaitstud!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER ON MAAS
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER ON TÄIS
@@ -1428,7 +1444,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Läti
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Võrgumängu jututuba
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Ühinemiseks valmistumine:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Liitumiseks valmistumine: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Nimekiri mängus oelvatest ettevõtetest. Saad liituda ühega või alustada uut, kui on vabu kohti
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Uus ettevõte
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Uue ettevõtte loomine
@@ -1441,16 +1457,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Serveri
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}ETTEVÕTTE ANDMED
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Ettevõtte nimi:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Avamine:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Firmaväärtus:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Rahaline seis:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Eelmise aasta tulud:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Suutlikus:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Ettevõtte nimi: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Avamine: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Firmaväärtus: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Rahaline seis: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Eelmise aasta tulud: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Suutlikus: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Sõidukid:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Jaamad:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Mängijad:  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Sõidukid: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Jaamad: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Mängijad: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Ühendumine...
 
@@ -1477,23 +1493,23 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientid
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Jälgi
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uus Ettevõte
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Võrgukaarti ei leitud või kompileeritud ilma võtmeta ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Ei leidnud ühtegi võrgumängu
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Server ei vastanud päringule
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Ühendus nurjus NewGRF-i kokkusobimatuse tõttu
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Võrgumäng läks sünkroonist välja
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Võrgumängu ühendus katkes
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Mängu laadimine nurjus
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Ei saa uut serverit alustada
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Ei õnneust ühendada
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Ühendusel #{NUM} sai aeg otsa
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Tekkis protokolliviga ja ühendus katkes
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Kliendi versioon ei vasta serveri versiooniga
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Vale parool
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Server on täis
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Sinu sisenemine siia serverisse on keelatud
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Sind visati mängust välja
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Selles serveris on petmine keelatud
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Võrgukaarti ei leitud või kompileeritud ilma võtmeta ENABLE_NETWORK
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Ei leidnud ühtegi võrgumängu
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Server ei vastanud päringule
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Ühendus ebaõnnestus NewGRF-i sobimatuse tõttu
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}Võrgumängu sünkroonimine ebaõnnestus
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Võrgumängu ühendus katkes
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Salvestatud mängu laadimine ebaõnnestus
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Ei saa uut serverit alustada
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Ei õnnestu ühendada
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}#{NUM}. ühendus aegus
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Tekkis protokolliviga ja ühendus katkes
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Kliendi osa ei vasta serveri osaga
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Vale parool
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Server on täis
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Sinu sisenemine siia serverisse on keelatud
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Sind visati mängust välja
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Selles serveris on petmine keelatud
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :üldine viga
@@ -1502,11 +1518,11 @@ STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :ei saa kaarti l
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :ühendus katkes
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokolli viga
 STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF-i kokkusobimatus
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :Keelatud
+STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :keelatud
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :kahtlane pakett vastu võetud
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :vale versioon
+STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :vale osa
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nimi on juba kasutusel
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :vale mängu parool
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :vale parool
 STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :vale ettevõtte id DoCommand-is
 STR_NETWORK_ERR_CLIENT_KICKED                                   :server viskas välja
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :üritas pettust kasutada
@@ -1514,10 +1530,15 @@ STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server on täis
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS                  :Mäng seisab (pole piisavalt mängijaid)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS                :Mäng jätkub (piisavalt mängijaid)
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Mäng seisab (ühenduv klient)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Mäng jätkub (klient ühendunud)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Mäng jätkub (klient ei ühendunud)
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_LEAVING                                      :lahkub
 STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} liitus mänguga
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} liitus ettevõtte #{2:NUM}ga
+STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} liitus {2:NUM}. ettevõttega
 STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} liitus vaatajatega
 STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} alustas uue ettevõtte (#{2:NUM})
 STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} lahkus mängust ({2:STRING})
@@ -1554,12 +1575,12 @@ STR_NETWORK_SEND                                                :{BLACK}Saada
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Ei saa maapinda PNG failist laadida...
+STR_PNGMAP_ERROR                                                :{WHITE}Ei suuda laadida maastiku PNG failist...
 STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...faili ei leitud.
 STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ei suutnud pilditüüpi teisendada. Vaja läheb 8 või 24-bitist PNG pilti.
 STR_PNGMAP_ERR_MISC                                             :{WHITE}...midagi läks just valesti. Vabandust. (tõenäoliselt rikutud fail)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Ei suuda laadida maad BMP failist...
+STR_BMPMAP_ERROR                                                :{WHITE}Ei suuda laadida maastikku BMP failist...
 STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ei suutnud muuta pildi tüüpi.
 
 ##id 0x0800
@@ -1579,7 +1600,7 @@ STR_080B_ROUGH_LAND                                             :Konarlik maa
 STR_080C_BARE_LAND                                              :Lage maa
 STR_080D_GRASS                                                  :Rohi
 STR_080E_FIELDS                                                 :Põllud
-STR_080F_SNOW_COVERED_LAND                                      :Lumekattega maa
+STR_080F_SNOW_COVERED_LAND                                      :Lumine maa
 STR_0810_DESERT                                                 :Kõrb
 
 ##id 0x1000
@@ -1837,6 +1858,7 @@ STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Teisele
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Mitme olemasoleva jaama ühendamine
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Selles linnas on juba liiga palju jaamasid
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liiga palju jaamu
+STR_TOO_MANY_STATION_SPECS                                      :{WHITE}Liiga palju raudteejaama osasid
 STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Liiga palju bussipeatusi
 STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Liiga palju laadimisplatvorme
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Mõnele teisele jaamale liiga lähedal
@@ -1854,12 +1876,12 @@ STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Kohaliku
 ############ range for rating starts
 STR_3035_APPALLING                                              :Kohutav
 STR_3036_VERY_POOR                                              :Väga halb
-STR_3037_POOR                                                   :Kehv
+STR_3037_POOR                                                   :Vilets
 STR_3038_MEDIOCRE                                               :Keskpärane
 STR_3039_GOOD                                                   :Hea
 STR_303A_VERY_GOOD                                              :Väga hea
 STR_303B_EXCELLENT                                              :Suurepärane
-STR_303C_OUTSTANDING                                            :Eesrindlik
+STR_303C_OUTSTANDING                                            :Suurepärane
 ############ range for rating ends
 
 STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
@@ -1924,7 +1946,7 @@ STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Laevarem
 STR_3804_WATER                                                  :Vesi
 STR_3805_COAST_OR_RIVERBANK                                     :Kallas
 STR_3806_SHIP_DEPOT                                             :Laevaremonditehas
-STR_AQUEDUCT                                                    :Veejuhe
+STR_AQUEDUCT                                                    :Akvedukt
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...vette ei saa ehitada
 STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanal tuleb enne lammutada
 
@@ -2058,15 +2080,15 @@ STR_501C_STEEL_GIRDER_RAIL_BRIDGE                               :Terasest võres
 STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE                           :Terasest ulgtoestikuga raudteesild
 STR_501E_REINFORCED_CONCRETE_SUSPENSION                         :Raudbetoonist raudteerippsild
 STR_501F_WOODEN_RAIL_BRIDGE                                     :Puitraudteesild
-STR_5020_CONCRETE_RAIL_BRIDGE                                   :Betoonraudteesild
-STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE                           :Terasest raudteerippsild
-STR_5022_STEEL_GIRDER_ROAD_BRIDGE                               :Terasraamistikuga sõiduteesild
-STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE                           :Terasest ulgtoestikuga sõiduteesild
-STR_5024_REINFORCED_CONCRETE_SUSPENSION                         :Raudbetoonist sõidutee rippsild
-STR_5025_WOODEN_ROAD_BRIDGE                                     :Puidust sõiduteesild
-STR_5026_CONCRETE_ROAD_BRIDGE                                   :Betoonist sõiduteesild
+STR_5020_CONCRETE_RAIL_BRIDGE                                   :Betoonist raudteesild
+STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE                           :Terasest autoteerippsild
+STR_5022_STEEL_GIRDER_ROAD_BRIDGE                               :Terasraamistikuga autoteesild
+STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE                           :Terasest ulgtoestikuga autoteesild
+STR_5024_REINFORCED_CONCRETE_SUSPENSION                         :Raudbetoonist autotee rippsild
+STR_5025_WOODEN_ROAD_BRIDGE                                     :Puidust autoteesild
+STR_5026_CONCRETE_ROAD_BRIDGE                                   :Betoonist autoteesild
 STR_5027_TUBULAR_RAIL_BRIDGE                                    :Torujas raudteesild
-STR_5028_TUBULAR_ROAD_BRIDGE                                    :Torujas sõiduteesild
+STR_5028_TUBULAR_ROAD_BRIDGE                                    :Torujas autoteesild
 
 ##id 0x5800
 STR_5800_OBJECT_IN_THE_WAY                                      :{WHITE}Mingi objekt on ees
@@ -2138,16 +2160,16 @@ STR_6804_CUSTOM                                                 :{BLACK}Iseseadi
 ############ range for difficulty levels ends
 
 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Suurim konkurentide arv: {ORANGE}{COMMA}
+STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Vastaste piirmäär: {ORANGE}{COMMA}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Linnade sagedus: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Tööstuste arv: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Suurim alustuslaen: {ORANGE}{CURRENCY}
 STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Intress alguses: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Sõidukite käituskulud: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Konkurentide ehitustempo: {ORANGE}{STRING}
-STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Sõidukite rikkiminemine: {ORANGE}{STRING}
+STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Sõidukirikked: {ORANGE}{STRING}
 STR_680F_SUBSIDY_MULTIPLIER                                     :{LTBLUE}Toetuse suurus: {ORANGE}{STRING}
-STR_6810_COST_OF_CONSTRUCTION                                   :{LTBLUE}Ehitamise hind: {ORANGE}{STRING}
+STR_6810_COST_OF_CONSTRUCTION                                   :{LTBLUE}Ehitushinnad: {ORANGE}{STRING}
 STR_6811_TERRAIN_TYPE                                           :{LTBLUE}Maastiku tüüp: {ORANGE}{STRING}
 STR_6812_QUANTITY_OF_SEA_LAKES                                  :{LTBLUE}Merede/järvede kogus: {ORANGE}{STRING}
 STR_6813_ECONOMY                                                :{LTBLUE}Majandus: {ORANGE}{STRING}
@@ -2196,7 +2218,7 @@ STR_6836_OFF                                                    :Väljas
 STR_6837_ON                                                     :Sees
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Näita mängijate edetabelit
 STR_PERMISSIVE                                                  :Soodustav
-STR_TOLERANT                                                    :Tolerantne
+STR_TOLERANT                                                    :Salliv
 STR_HOSTILE                                                     :Vaenulik
 
 ##id 0x7000
@@ -2227,7 +2249,7 @@ STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Mootorsõ
 STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Õhusõidukite tulud
 STR_701B_SHIP_INCOME                                            :{GOLD}Laevade tulud
 STR_701C_LOAN_INTEREST                                          :{GOLD}Laenuintress
-STR_701D_OTHER                                                  :{GOLD}Kõik muu
+STR_701D_OTHER                                                  :{GOLD}Muud
 STR_701E                                                        :{BLACK}-{CURRENCY}
 STR_701F                                                        :{BLACK}+{CURRENCY}
 STR_7020_TOTAL                                                  :{WHITE}Kokku:
@@ -2238,10 +2260,10 @@ STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Opereerimiskasumi graafik
 STR_7026_BANK_BALANCE                                           :{WHITE}Kontojääk
 STR_7027_LOAN                                                   :{WHITE}Laen
-STR_MAX_LOAN                                                    :{WHITE}Suurim laen:  {BLACK}{CURRENCY}
+STR_MAX_LOAN                                                    :{WHITE}Laenupiir:  {BLACK}{CURRENCY}
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Laena {SKIP}{SKIP}{CURRENCY}
-STR_702A_REPAY                                                  :{BLACK}Maksa tagasi {SKIP}{SKIP}{CURRENCY}
+STR_702A_REPAY                                                  :{BLACK}Tagasta {SKIP}{SKIP}{CURRENCY}
 STR_702B_MAXIMUM_PERMITTED_LOAN                                 :{WHITE}...suurim lubatud laen on {CURRENCY}
 STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Rohkem raha ei saa laenata...
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...pole laenu, mida tagasi maksta
@@ -2301,7 +2323,7 @@ STR_7065                                                        :{BLACK}{TINYFON
 STR_7066_ENGINEER                                               :Insener
 STR_7067_TRAFFIC_MANAGER                                        :Liiklusmänedžer
 STR_7068_TRANSPORT_COORDINATOR                                  :Transpordi koordineerija
-STR_7069_ROUTE_SUPERVISOR                                       :Marsruudi inspektor
+STR_7069_ROUTE_SUPERVISOR                                       :Liiniinspektor
 STR_706A_DIRECTOR                                               :Direktor
 STR_706B_CHIEF_EXECUTIVE                                        :Tegevjuht
 STR_706C_CHAIRMAN                                               :Esimees
@@ -2738,6 +2760,7 @@ STR_UNKNOWN_STATION                                             :tundmatu jaam
 STR_8812_EMPTY                                                  :{LTBLUE}Tühi
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} jaamast {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} jaamast {STATION} (x{NUM})
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}{VEHICLE} ootab depoos
 STR_8815_NEW_VEHICLES                                           :{BLACK}Uus rong
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Rong on liiga pikk
@@ -2745,12 +2768,12 @@ STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Ainult d
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} rong{P "" i}
 
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Uued rööbassõidukid
-STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Uus elektriraudteeveerem
-STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Uus monorelssveerem
-STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Uus magnethõljukveerem
+STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Uus elektriraudteesõiduk
+STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Uus monorelsssõiduk
+STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Uus magnethõljuksõiduk
 STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Rööbassõidukid
 
-STR_881F_BUILD_VEHICLE                                          :{BLACK}Ehita veovahend
+STR_881F_BUILD_VEHICLE                                          :{BLACK}Ehita sõiduk
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonimine
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}See paljundab mootorsõidukit. CTRL-klõps jagab sihtpunkte
 STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}See paljundab mootorsõidukit. Klõpsa seda nuppu, ning seejärel mootorsõidukil depoos või sellest väljas. CTRL-klõps jagab sihtpunkte
@@ -2789,6 +2812,9 @@ STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Ei saa m
 STR_CAN_T_MOVE_THIS_ORDER                                       :{WHITE}Seda sihtpunkti ei saa ümber asetada...
 STR_CAN_T_SKIP_ORDER                                            :{WHITE}Praegust järjestust ei ole võimalik vahele jätta...
 STR_CAN_T_SKIP_TO_ORDER                                         :{WHITE}Valitud järjestust ei ole võimalik vahele jätta...
+STR_CAN_T_COPY_SHARE_ORDER                                      :{WHITE}sõiduk ei saa igasse jaama minna
+STR_CAN_T_ADD_ORDER                                             :{WHITE}sõiduk ei saa antud jaama minna
+STR_CAN_T_ADD_ORDER_SHARED                                      :{WHITE}seda käsku jagav sõiduk ei saa sinna jaama minna
 STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Transpordivahendit ei saa liigutada...
 STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}Tagumine vedur järgneb alati eesmisele
 STR_8838_N_A                                                    :N/A{SKIP}
@@ -2804,7 +2830,7 @@ STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE                             :{BLACK}Tiri ron
 STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Keskenda põhivaade rongidepoo kohale
 STR_8843_TRAIN_VEHICLE_SELECTION                                :{BLACK}Nimekiri raudteesõidukitest - andmete saamiseks klõpsa raudteesõidukile
 STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Ehita valitud raudteesõiduk
-STR_8845_RENAME_TRAIN_VEHICLE_TYPE                              :{BLACK}Vaheta raudteesõiduki tüübinime
+STR_8845_RENAME_TRAIN_VEHICLE_TYPE                              :{BLACK}Muuda raudteesõiduki tüübinime
 STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Praegune rongi tegevus - vajuta siia et peatada/käivitada rong
 STR_8847_SHOW_TRAIN_S_ORDERS                                    :{BLACK}Näita rongi sihtpunkte
 STR_8848_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Vaate viimine rongi asukohale
@@ -2817,7 +2843,7 @@ STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Vähenda
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Näita täpsustusi viidud kauba kohta
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Näita täpsutusi rongivagunite kohta
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Näita iga rongivaguni kandevõimet
-STR_SHOW_TOTAL_CARGO                                            :{BLACK}Näita kogu rongi mahtu, jagatud kauba tüübi järgi
+STR_SHOW_TOTAL_CARGO                                            :{BLACK}Näita kogu rongi mahtu, jagatud veoseliigi järgi
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Sihtpunktide nimekiri. Valimiseks klõpsa sihtpunktil. CTRL + klikk keskendab vaateakna jaama peale.
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Jäta praegune järjestus vahele ja alusta järgmisega. CTRL + klõps jätab vahele kuni valitud järjestuseni
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Kustuta valitud käsk
@@ -2828,12 +2854,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Tühista
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Tühista hilinemisloendur, et sõiduk ei jääks hiljaks
 STR_SERVICE_HINT                                                :{BLACK}Jäta see käsk vahele, kui hooldust ei vajata
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Hind: {CURRENCY} Tühimass: {WEIGHT_S}{}Tippkiirus: {VELOCITY}  Võimsus: {POWER}{}Käituskulud: {CURRENCY}/aastas{}Kandevõime: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Rikkis
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK}   Käituskulud: {LTBLUE}{CURRENCY}/aastas
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Mass: {LTBLUE}{WEIGHT_S}  {BLACK}Võimsus: {LTBLUE}{POWER}{BLACK} Tippkiirus: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Tühimass: {LTBLUE}{WEIGHT_S} {BLACK}Võimsus: {LTBLUE}{POWER}{BLACK} Tippkiirus: {LTBLUE}{VELOCITY} {BLACK}Veojõud: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY}  (eelmisel aastal: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tehnoseisund: {LTBLUE}{COMMA}%  {BLACK}Rikkeid eelmisest hooldusest: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Rike
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK}   Käituskulud: {LTBLUE}{CURRENCY}/aastas
 STR_8861_STOPPED                                                :{RED}Peatatud
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Rongi ei saa ohu korral sundida signaale eirama...
 STR_8863_CRASHED                                                :{RED}Kokkupõrge!
@@ -2842,7 +2868,7 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Anna ron
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Ei saa nimetada rongi...
 STR_8867_NAME_TRAIN                                             :{BLACK}Rongi nimi
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}RONGIKOKKUPÕRGE!{}{COMMA} surid tules peale kokkusõitmist
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Ei saa rongi ümber pöörata.
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ei saa rongi ümber pöörata.
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Vaheta rongivaguni tüübinime
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Raudteesõiduki tüübinime ei saa vahetada...
 STR_CLEAR_TIME                                                  :{BLACK}Tühista aeg
@@ -2873,8 +2899,8 @@ STR_TIMETABLE_STATUS_EARLY                                      :See sõiduk on
 STR_TIMETABLE_TOTAL_TIME                                        :Selle sõiduplaani täitmine võtab {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :Selle sõiduplaani täitmine võtab vähemalt {STRING} (kõik ei ole planeeritud)
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Täida ise
-
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täida liiniplaan järgmise sõidu andmetega (Ctrl+klõps säilitamaks ooteaegu)
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Mootorsõiduk takistab teed
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} mootorsõiduk{P "" it}
@@ -2912,7 +2938,7 @@ STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Veovahen
 STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Ehita uus mootorsõiduk
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Et müüa, tiri sõiduk siia
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Vii vaade garaaþi asukohale
-STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Mootorsõiduki valimisnimekiri - andmete saamiseks klõpsa sõidukile
+STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Mootorsõidukite nimekiri - andmete saamiseks klõpsa sõidukile
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Ehita valitud mootorsõiduk
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Hind: {CURRENCY}{}Tippkiirus: {VELOCITY}{}Käituskulud: {CURRENCY}/aastas{}Kandevõime: {CARGO}
 STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kandevõime: {LTBLUE}
@@ -2930,10 +2956,9 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Kodanikud tähistavad . . .{}Esimene kaubatramm saabus trammijaama {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Rongikokkupõrge!{}Juht suri peale õnnetust tules
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Mootorsõiduki kokkupõrge rongiga!{}{COMMA} inimest suri õnnetuses
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Transpordivahendit ei saa ümber pöörata...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Mitmest osast koosnevaid veovahendeid ei saa ümber pöörata
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Mitmest osast koosnevaid veovahendeid ei saa ümber pöörata
 STR_9034_RENAME                                                 :{BLACK}Nimevahetus
-STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Vaheta mootorsõiduki tüübinime
+STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Muuda mootorsõiduki tüübinime
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Vaheta mootorsõiduki tüübinime
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Mootorsõiduki tüübinime ei saa vahetada...
 
@@ -2941,11 +2966,11 @@ STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Seadista
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Muuda mootorsõiduki seadistust
 STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Seadista mootorsõidukit kandma valitud veotüüpi
 STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Mootorsõiduki seadistust ei saa ümber muuta
-
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali maanteesõiduki veetav veoseliik
+
 ##id 0x9800
-STR_9800_WATERWAYS_CONSTRUCTION                                 :Veeteede ehitus
-STR_9801_WATERWAYS_CONSTRUCTION                                 :{WHITE}Veeteede ehitus
+STR_9800_WATERWAYS_CONSTRUCTION                                 :Veeteede ehitamine
+STR_9801_WATERWAYS_CONSTRUCTION                                 :{WHITE}Veeteede ehitamine
 STR_9801_WATERWAYS_CONSTRUCTION_SE                              :{WHITE}Veeteed
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Dokki ei saa siia ehitada...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Laevaremonditehas
@@ -2975,6 +3000,7 @@ STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suundub
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse, {VELOCITY}
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases.
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases, {VELOCITY}
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}{VEHICLE} ootab depoos
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Ehita laevadokk
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Ehita laevaremonditehas (laevade ehitamiseks ja hoolduseks)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Laevad - info saamiseks klõpsa laevale
@@ -3000,15 +3026,15 @@ STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Poid ei
 STR_BUILD_AQUEDUCT                                              :{BLACK}Ehita veejuhe
 STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Siia ei saa veejuhet ehitada...
 STR_9836_RENAME                                                 :{BLACK}Nimevahetus
-STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Laeva tüübinime vahetamine
+STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Laeva tüübinime muutmine
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Laeva tüübinime vahetamine
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Laeva tüübinime ei saa vahetada...
-STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Seadista laev ümber teise kaubatüübi jaoks
+STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Seadista kaubalaev teisele veosele
 STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Seadista ümber)
 STR_983C_REFIT_SHIP                                             :{BLACK}Seadista laev ümber
-STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali kauba tüüp, mida laev hakkab kandma
+STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali kaubalaeva veetav veoseliik
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Seadista laev ümber valitud kaubatüübi jaoks
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vali kaubatüüp, mida vedada:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vali veetav veoseliik:
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uus kandevõime: {GOLD}{CARGO}{}{BLACK}Laeva ümberseadistamise hind: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Ei saa laeva ümber seadistada...
 STR_9842_REFITTABLE                                             :(ümberseadistatav)
@@ -3037,6 +3063,7 @@ STR_HEADING_FOR_HANGAR                                          :{ORANGE}Suundub
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Suundub {STATION} angaari, {VELOCITY}
 STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Hooldus linna {STATION} angaaris
 STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Hooldus linna {STATION} angaaris, {VELOCITY}
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}{VEHICLE} ootab lennukiangaaris
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Lennuk on teel
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Ei saa lennukit peatada/käivitada...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Lennuk on õhus
@@ -3051,7 +3078,7 @@ STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Lennuk -
 STR_A022_BUILD_NEW_AIRCRAFT                                     :{BLACK}Ehita uus lennuk
 STR_A023_DRAG_AIRCRAFT_TO_HERE_TO                               :{BLACK}Müümiseks tiri lennuk siia
 STR_A024_CENTER_MAIN_VIEW_ON_HANGAR                             :{BLACK}Vii vaade angaarile
-STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Lennuki valikute nimekiri - info saamiseks vajuta lennukile
+STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Lennukite nimekiri - info saamiseks vajuta lennukile
 STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Ehita valitud lennuk
 STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Praegune lennuki tegevus - vajuta siia et käivitada või peatada lennukit
 STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Näita lennuki sihtpunke
@@ -3068,12 +3095,12 @@ STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lennuõnnetus!{}Lennukil lõppes kütus, {COMMA} surid tules!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Nimevahetus
-STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Lennuki tüübinime vahetamine
+STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Lennuki tüübinime muutmine
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Lennuki tüübinime vahetamine
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Lennuki tüübinime ei saa vahetada...
 STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Seadista lennuk teistsuguse kauba kandmiseks ümber
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Seadista lennuk ümber
-STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali kauba tüüp, mida lennuk hakkab kandma
+STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali lennuki veetav veoseliik
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Seadista lennuk ümber, et kanda valitud kaubatüüpi
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Ei saa lennukit ümber seadistada...
 
@@ -3082,7 +3109,7 @@ STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE
 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}Tsepeliini õnnetus {STATION}s!
 STR_B001_ROAD_VEHICLE_DESTROYED                                 :{BLACK}{BIGFONT}Mootorsõiduk plahvatas kokkupõrkes 'UFO-ga'!
-STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT}Naftapuhastusjaama plahvatus {TOWN} lähedal!
+STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT}Naftatöötlustehase plahvatus {TOWN} lähedal!
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Tehas purunes teadmata põhjustel {TOWN} lähedal!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' maandus {TOWN} lähedal!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Söekaevanduse vajumine jättis endast linna {TOWN} lähedal purustused!
@@ -3109,7 +3136,7 @@ STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Vähim k
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Vähim tulu:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Suurim tulu:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Kohale toimetatud:
-STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Kaupu:
+STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Veoseid:
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Raha:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Laen:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Kokku:
@@ -3120,12 +3147,13 @@ STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Kõige v
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Väikseim kuukasum viimase 12 kvartali jooksul
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Suurim kuukasum viimase 12 kvartali jooksul
 STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Viimasel neljal kvartalil kohale toimetatud kaubaühikute koguarv
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Viimasel kvartalil kohale toimetatud kaubaliikide koguarv
+STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Viimasel kvartalil kohale toimetatud veoseliikide koguarv
 STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Rahakogus sellel firmal pangas
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Selle ettevõtte kogulaen
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Kokku punkte võimalikest punktidest
 
 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF seadistused
+STR_NEWGRF_SETTINGS_BUTTON_TIP                                  :{BLACK}Näita NewGRF-seadeid
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Uue graafika sätted
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Rakenda muudatused
 STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Vaheta paletti
@@ -3562,15 +3590,15 @@ STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Siin ei
 STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Läbisõidusignaal (semafor){}Signaale läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
 STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sissesõidusignaal (semafor){}Roheline, kuni vähemalt üks väljasõidusignaal on roheline. Muudel juhtudel näitab punast.
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Väljasõidusignaal (semafor){}Käitub samamoodi, nagu läbisõidusignaal, kuid läheb vaja et sissesõidu- ja mitmik-hoiatussignaalid näitaksid õiget värvi.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Mitmiksignaal (semafor){}Mitmiksignaal toimib nii sissesõidu-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid hoiatussignaalide harusid.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Täiustatud signaal (semafor){}Kui rong saab ohutuks peatumiseks piisavalt vahemaad varuda, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Ühesuunaline täiustatud signaal (semafor){}Kui rong saab ohutuks peatumiseks piisavalt vahemaad varuda, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombineeritud signaal (semafor){}Kombineeritud signaal toimib nii sissesõidu-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid hoiatussignaalide harusid.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Täiustatud signaal (semafor){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Ühesuunaline täiustatud signaal (semafor){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
 STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Läbisõidusignaal (elektriline){}Signaale läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sissesõidusignaal (elektriline){}Roheline, kuni vähemalt üks väljasõidusignaal on roheline. Muudel juhtudel näitab punast.
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Väljasõidusignaal (elektriline){}Käitub samamoodi, nagu läbisõidusignaal, kuid läheb vaja et sissesõidu- ja mitmik-hoiatussignaalid näitaksid õiget värvi.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Mitmiksignaal (elektriline){}Mitmiksignaal toimib nii sisse-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid sissesõidusignaalide harusid.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Täiustatud signaal (elektriline){}Kui rong saab ohutuks peatumiseks piisavalt vahemaad varuda, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Ühesuunaline täiustatud signaal (elektriline){}Kui rong saab ohutuks peatumiseks piisavalt vahemaad varuda, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombineeritud signaal (elektriline){}Kombineeritud signaal toimib nii sisse-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid sissesõidusignaalide harusid.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Täiustatud signaal (elektriline){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Ühesuunaline täiustatud signaal (elektriline){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
 STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signaalide teisendamine{}Kui see on valitud, siis olemasoleval signaalil klõpsates teisendatakse see määratud signaalitüübiks ja -variandiks. Samal ajal CTRL klahvi all hoides lülitutakse olemasoleva variandi vahel.
 STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Signaalide paigaldustihedus
 STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Kahanda signaalide paigaldustihedust
@@ -3583,13 +3611,33 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 ########
 
 ############ AI GUI
+STR_AI_SETTINGS_BUTTON                                          :{BLACK}Tehismõistuse seaded
+STR_AI_SETTINGS_BUTTON_TIP                                      :{BLACK}Näita tehismõistuse seadeid
+STR_AI_DEBUG                                                    :{WHITE}Tehismõistuse debug
+STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Tehismõistuse nimi
+STR_AI_DEBUG_RELOAD                                             :{BLACK}Laadi tehismõistus uuesti
+STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Sulge tehismõistus, laadi skript uuesti ning taaskäivita tehismõistus
+STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Tehismõistuse debugi akent saab vaadata ainult server
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Tehismõistuse seadistus
+STR_AI_CHANGE                                                   :{BLACK}Vali tehismõistus
+STR_AI_CONFIGURE                                                :{BLACK}Seadista
+STR_AI_CHANGE_TIP                                               :{BLACK}Laadi teine tehismõistus
+STR_AI_CONFIGURE_TIP                                            :{BLACK}Muuda tehismõistuse parameetreid
+STR_AI_LIST_TIP                                                 :{BLACK}Kõik järgmises mängus laaditavad tehismõistused
+STR_AI_LIST_CAPTION                                             :{WHITE}Saadaval tehismõistused
+STR_AI_AILIST_TIP                                               :{BLACK}Klõpsa tehismõistuse valimiseks
 STR_AI_ACCEPT                                                   :{BLACK}Nõustu
+STR_AI_ACCEPT_TIP                                               :{BLACK}Vali esiletõstetud tehismõistus
 STR_AI_CANCEL                                                   :{BLACK}Loobu
+STR_AI_CANCEL_TIP                                               :{BLACK}Ära muuda tehismõistust
 STR_AI_CLOSE                                                    :{BLACK}Sulge
 STR_AI_RESET                                                    :{BLACK}Nulli
-STR_AI_HUMAN_PLAYER                                             :Inimmängija
+STR_AI_HUMAN_PLAYER                                             :Inimene
+STR_AI_RANDOM_AI                                                :Suvaline tehismõistus
+STR_AI_SETTINGS_CAPTION                                         :{WHITE}Tehismõistuse parameetrid
 STR_AI_AUTHOR                                                   :Autor:
 STR_AI_VERSION                                                  :Versioon:
+STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Tõrge ühe töötava tehismõistusega. Palun teavitage sellest tehismõistuse autorit koos ekraanitõmmisega tehismõistuse tõrkeotsingu aknast.
 ########
 
 ############ town controlled noise level
@@ -3598,17 +3646,63 @@ STR_STATION_NOISE                                               :{BLACK}Tekitatu
 ########
 
 ############ Downloading of content from the central server
+STR_CONTENT_NO_ZLIB                                             :{WHITE}OpenTTD on kompileeritud ilma "zlib" toeta...
+STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}... sisu allalaadimine pole võimalik!
+STR_CONTENT_TYPE_BASE_GRAPHICS                                  :Põhigraafika
+STR_CONTENT_TYPE_NEWGRF                                         :NewGRF
+STR_CONTENT_TYPE_AI                                             :Tehismõistus
+STR_CONTENT_TYPE_AI_LIBRARY                                     :Tehismõistuse teek
+STR_CONTENT_TYPE_SCENARIO                                       :Stsenaarium
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Kõrguskaart
+STR_CONTENT_TITLE                                               :{WHITE}Sisu allalaadimine
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tüüp
+STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Sisu liik
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nimi
+STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Sisu nimi
+STR_CONTENT_MATRIX_TIP                                          :{BLACK}Reale klõpsates näidatakse täpsustust{}Märkeruudule klõpsates märgitakse allalaaditavaks
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Vali kõik
+STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Märgi kõik sisu allalaaditavaks
+STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Märgi uuendused
+STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Tähista allalaaditavaks kõik olemasoleva sisu uuendused
+STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Eemalda märgistus kõigilt
+STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Eemaldatakse allalaadimise märgistus
+STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Sisesta filterkirjend
+STR_CONTENT_FILTER_TIP                                          :{BLACK}Sisesta märksõna mida loendist otsida
+STR_CONTENT_FILTER_TITLE                                        :{BLACK}Sildi- ja nimefilter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Lae alla
+STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Alusta valitud sisu allalaadimist
+STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Allalaadimiste kogusuurus: {WHITE}{BYTES}
+STR_CONTENT_DETAIL_TITLE                                        :{SILVER}SISU TEAVE
+STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Sa pole seda allalaaditavaks märkinud
+STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Te olete valinud selle allalaadimiseks
+STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED                        :{SILVER}See sõltuvus on valitud allalaadimiseks
+STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Sul on juba see
+STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}Selline sisu on tundmatu ja seda ei saa OpenTTD-se laadida
+STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}See on asendus olemasolevale {STRING}
 STR_CONTENT_DETAIL_NAME                                         :{SILVER}Nimi: {WHITE}{STRING}
-STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Versioon: {WHITE}{STRING}
+STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Osa: {WHITE}{STRING}
 STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}Kirjeldus: {WHITE}{STRING}
 STR_CONTENT_DETAIL_URL                                          :{SILVER}Aadress: {WHITE}{STRING}
 STR_CONTENT_DETAIL_TYPE                                         :{SILVER}Tüüp: {WHITE}{STRING}
+STR_CONTENT_DETAIL_FILESIZE                                     :{SILVER}Allalaadimise suurus: {WHITE}{BYTES}
+STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF                          :{SILVER}Valitud kuna: {WHITE}{STRING}
+STR_CONTENT_DETAIL_DEPENDENCIES                                 :{SILVER}Sõltuvused: {WHITE}{STRING}
+STR_CONTENT_DETAIL_TAGS                                         :{SILVER}Sildid: {WHITE}{STRING}
 
+STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}Sisu allalaadimine...
+STR_CONTENT_DOWNLOAD_INITIALISE                                 :{WHITE}Küsin faile...
+STR_CONTENT_DOWNLOAD_FILE                                       :{WHITE}Hetkel laaditakse alla {STRING} ({NUM}/{NUM})
+STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Allalaadimine valmis
+STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES}/{BYTES} baiti allalaaditud ({NUM} %)
 
+STR_CONTENT_ERROR_COULD_NOT_CONNECT                             :{WHITE}Sisuserveriga ei õnnestu ühenduda...
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD                            :{WHITE}Allalaadimine ebaõnnestus...
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... ühendus katkes
+STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... fail pole kirjutatav
+STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Alla laaditud faili ei saa lahti pakkida
 
+STR_CONTENT_INTRO_BUTTON                                        :{BLACK}Internetisisu kontrollimine
+STR_CONTENT_INTRO_BUTTON_TIP                                    :{BLACK}Otsi allalaadimiseks uut ja uuendatud sisu
+STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Otsi internetist puuduvat sisu
+STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Otsi kas puuduvat sisu leidub internetis
 ########

src/lang/finnish.txt

@@ -154,7 +154,7 @@ STR_ABBREV_ALL                                                  :{TINYFONT}KAIKK
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Kartta - {STRING}
-STR_00B1_GAME_OPTIONS                                           :{WHITE}Pelin asetukset
+STR_00B1_GAME_OPTIONS                                           :{WHITE}Pelin Asetukset
 STR_00B2_MESSAGE                                                :{YELLOW}Viesti
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Viesti: {STRING}
 STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varoitus!
@@ -245,7 +245,7 @@ STR_0130_RENAME                                                 :{BLACK}Nimeä u
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
 STR_OSNAME_UNIX                                                 :Unix
-STR_OSNAME_OSX                                                  :OS{NBSP}X{NBSP}
+STR_OSNAME_OSX                                                  :OS X
 STR_OSNAME_BEOS                                                 :BeOS
 STR_OSNAME_MORPHOS                                              :MorphOS
 STR_OSNAME_AMIGAOS                                              :AmigaOS
@@ -269,7 +269,7 @@ STR_SCENARIO_EDITOR                                             :{BLACK}Maisemae
 
 STR_MAPSIZE                                                     :{BLACK}Kartan koko:
 STR_BY                                                          :{BLACK}×
-STR_0148_GAME_OPTIONS                                           :{BLACK}Pelin asetukset
+STR_0148_GAME_OPTIONS                                           :{BLACK}Pelin Asetukset
 
 STR_0150_SOMEONE                                                :joku{SKIP}{SKIP}
 
@@ -310,7 +310,7 @@ STR_015A_COMPANY_LEAGUE_TABLE                                   :Yhtiökilpataul
 STR_PERFORMANCE_DETAIL_MENU                                     :Suoritearviointi
 ############ range for menu ends
 
-STR_015B_OPENTTD                                                :{WHITE}Tietoa OpenTTD:stä
+STR_015B_OPENTTD                                                :{WHITE}Tietoja OpenTTD:stä
 STR_015C_SAVE_GAME                                              :Tallenna peli
 STR_015D_LOAD_GAME                                              :Lataa peli
 STR_015E_QUIT_GAME                                              :Lopeta peli
@@ -342,7 +342,7 @@ STR_SORT_BY_LIFE_TIME                                           :Jäljelläoleva
 STR_SORT_BY_FACILITY                                            :Asematyyppi
 STR_SORT_BY_WAITING                                             :Odottavan lastin arvo
 STR_SORT_BY_RATING_MAX                                          :Rahtauksen arvosana
-STR_ENGINE_SORT_ENGINE_ID                                       :VeturiD (perinteinen lajittelu)
+STR_ENGINE_SORT_ENGINE_ID                                       :VeturiID (perinteinen lajittelu)
 STR_ENGINE_SORT_COST                                            :Hinta
 STR_ENGINE_SORT_POWER                                           :Teho
 STR_ENGINE_SORT_INTRO_DATE                                      :Julkaisupäivä
@@ -352,19 +352,19 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Rahtikapasiteet
 STR_NO_WAITING_CARGO                                            :{BLACK}Minkäänlaista lastia ei ole odottamassa
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Valitse kaikki laitteet
 STR_SELECT_ALL_TYPES                                            :{BLACK}Valitse kaikki lastityypit (myös odottava lasti)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Käytettävissä olevat junat
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Käytettävissä olevat ajoneuvot
-STR_AVAILABLE_SHIPS                                             :{BLACK}Käytettävissä olevat laivat
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Käytettävissä olevat ilma-alukset
+STR_AVAILABLE_TRAINS                                            :{BLACK}Käytett. Junat
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Käytett. Ajoneuvot
+STR_AVAILABLE_SHIPS                                             :{BLACK}Käytett. Laivat
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Käytett. Ilma-alukset
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Näytä lista saatavilla olevista moottorityypeistä tälle ajoneuvotyypille.
 STR_MANAGE_LIST                                                 :{BLACK}Muokkaa listaa
 STR_MANAGE_LIST_TIP                                             :{BLACK}Ohjaa kaikkia listan ajoneuvoja
-STR_REPLACE_VEHICLES                                            :Korvaa liikennevälineitä
+STR_REPLACE_VEHICLES                                            :Korvaa liikenneväl.
 STR_SEND_TRAIN_TO_DEPOT                                         :Lähetä varikolle
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Lähetä varikolle
 STR_SEND_SHIP_TO_DEPOT                                          :Lähetä varikolle
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Lähetä varikolle
-STR_SEND_FOR_SERVICING                                          :Lähetä huollettavaksi
+STR_SEND_FOR_SERVICING                                          :Lähetä huoltoon
 
 ############ range for months starts
 STR_0162_JAN                                                    :01.
@@ -412,7 +412,7 @@ STR_0189                                                        :{BLACK}{SMALLDO
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Huoltoväliä ei voi muuttaa.
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Sulje ikkuna
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Ikkunan otsake - vedä tästä siirtääksesi ikkunaa
-STR_STICKY_BUTTON                                               :{BLACK}Merkitse ikkuna tahmeaksi; 'Sulje kaikki ikkunat'-nappi ei vaikuta tahmeisiin ikkunoihin.
+STR_STICKY_BUTTON                                               :{BLACK}'Sulje Kaikki Ikkunat'-nappi ei vaikuta tähän ikkunaan.
 STR_RESIZE_BUTTON                                               :{BLACK}Napsauta ja vedä muuttaaksesi tämän ikkunan kokoa.
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Siirry tallennusten oletuskansioon napsauttamalla tätä
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Tuhoa ruudulla olevat rakennukset, puut, jne.
@@ -621,7 +621,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Sijoita
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Sijoita majakka.
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Sijoita lähetin.
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Määrittele aavikon alue.{}Paina ja pidä pohjassa CTRL-nappia poistaaksesi aavikkoa.
-STR_CREATE_LAKE                                                 :{BLACK}Määrittele vesialue.{}Tee kanava, paitsi jos CTRL on alaspainettuna merenpinnalla. Tällöin meri laajenee ympäristöön.
+STR_CREATE_LAKE                                                 :{BLACK}Määrittele vesialue.{}Tee kanava, paitsi jos Ctrl on alaspainettuna merenpinnalla. Tällöin meri laajenee ympäristöön.
 STR_CREATE_RIVER                                                :{BLACK}Sijoita jokia.
 STR_0290_DELETE                                                 :{BLACK}Poista
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Poista tämä kaupunki kokonaan.
@@ -665,7 +665,6 @@ STR_OFF                                                         :Pois
 STR_SUMMARY                                                     :Tiivistelmä
 STR_FULL                                                        :Täysi
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Kaupunkihakemisto
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -673,7 +672,7 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 STR_02C4_GAME_OPTIONS                                           :Pelin asetukset
 STR_02C6_DIFFICULTY_SETTINGS                                    :Vaikeusasetukset
 STR_MENU_CONFIG_SETTINGS                                        :Lisäasetukset
-STR_NEWGRF_SETTINGS                                             :Newgrf-asetukset
+STR_NEWGRF_SETTINGS                                             :NewGRF-asetukset
 STR_TRANSPARENCY_OPTIONS                                        :Läpinäkyvyysvalinnat
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Kaupunkien nimet näkyvissä
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Asemien nimet näkyvissä
@@ -703,6 +702,7 @@ STR_02DE_MAP_OF_WORLD                                           :Maailmankartta
 STR_EXTRA_VIEW_PORT                                             :Lisänäkymä
 STR_SIGN_LIST                                                   :Kylttilista
 STR_02DF_TOWN_DIRECTORY                                         :Kaupunkihakemisto
+STR_02BB_TOWN_DIRECTORY                                         :Kaupunkihakemisto
 STR_TOWN_POPULATION                                             :{BLACK}Maailman asukasluku: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Näkymä {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopioi näkymään
@@ -729,6 +729,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Automaat
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Valitse aikaväli automaattisille pelitallennuksille.
 STR_02F7_OFF                                                    :Pois
+STR_AUTOSAVE_1_MONTH                                            :Kuukausittain
 STR_02F8_EVERY_3_MONTHS                                         :Joka 3. kuukausi
 STR_02F9_EVERY_6_MONTHS                                         :Joka 6. kuukausi
 STR_02FA_EVERY_12_MONTHS                                        :Kerran vuodessa
@@ -743,10 +744,10 @@ STR_0304_QUIT                                                   :{BLACK}Sulje
 STR_0305_QUIT_OPENTTD                                           :{BLACK}Sulje OpenTTD.
 STR_0307_OPENTTD                                                :{WHITE}OpenTTD {REV}
 STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...voidaan rakentaa vain kaupunkeihin.
-STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Valitse 'lauhkea' ilmasto.
-STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Valitse 'pohjoinen' ilmasto.
-STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Valitse 'subtrooppinen' ilmasto.
-STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Valitse 'lelumaan' ilmasto.
+STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Valitse 'lauhkea' maastotyyppi.
+STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Valitse 'pohjoinen' maastotyyppi.
+STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Valitse 'subtrooppinen' maastotyyppi.
+STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Valitse 'lelumaan' maastotyyppi.
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Rahoita uuden teollisuuden rakentamista.
 
 ############ range for menu starts
@@ -760,7 +761,7 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...voidaan rakentaa vain sademetsäalueisiin.
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...voidaan rakentaa vain aavikkoalueisiin.
-STR_0319_PAUSED                                                 :{YELLOW}* *  TAUKO  *  *
+STR_0319_PAUSED                                                 :{YELLOW}*  *  TAUKO  *  *
 
 STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Kuvakaappaus tallennettu nimellä '{STRING}'.
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Kuvakaappaus epäonnistui!
@@ -834,7 +835,7 @@ STR_OPTIONS_LANG_CBO                                            :{BLACK}{SKIP}{S
 STR_OPTIONS_LANG_TIP                                            :{BLACK}Valitse käyttöliittymän kieli.
 
 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Koko näyttö
-STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Laita rasti ruutuun pelataksesi kokoruututilassa.
+STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Valitse tämä pelataksesi kokoruututilassa.
 STR_FULLSCREEN_FAILED                                           :{WHITE}Täyskuvatila ei toimi
 
 STR_OPTIONS_RES                                                 :{BLACK}Ruudun erottelukyky
@@ -849,7 +850,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Perusgra
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Valitse käytettävät perusgrafiikat
 
-STR_AUTOSAVE_1_MONTH                                            :Kuukausittain
 STR_AUTOSAVE_FAILED                                             :{WHITE}Automaattitallennus epäonnistui.
 
 STR_MONTH_JAN                                                   :Tammikuu
@@ -887,15 +887,15 @@ STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - ja
 
 STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} ei löydä reittiä päämäärään.
 STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} on eksynyt.
-STR_VEHICLE_IS_UNPROFITABLE                                     :Kulkuneuvon {WHITE}{VEHICLE} tulos viime vuonna oli {CURRENCY}
+STR_VEHICLE_IS_UNPROFITABLE                                     :{WHITE}Kulkuneuvon {VEHICLE} tulos viime vuonna oli {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Euroopan unionin talous- ja rahaliitto!{}{}Euro otetaan käyttöön maan ainoaksi valuutaksi päivittäisiin liiketapahtumiin!
 
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_VEHICLE_HAS_TOO_FEW_ORDERS                                  :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on liian vähän käskyjä
-STR_VEHICLE_HAS_VOID_ORDER                                      :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on epäkelpo käsky
+STR_VEHICLE_HAS_TOO_FEW_ORDERS                                  :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on liian vähän käskyjä
+STR_VEHICLE_HAS_VOID_ORDER                                      :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on epäkelpo käsky
 STR_VEHICLE_HAS_DUPLICATE_ENTRY                                 :{WHITE}Ajoneuvolla {VEHICLE} on toistuvia määräyksiä
-STR_VEHICLE_HAS_INVALID_ENTRY                                   :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on virheellinen asema
+STR_VEHICLE_HAS_INVALID_ENTRY                                   :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on virheellinen asema
 # end of order system
 
 STR_VEHICLE_AUTORENEW_FAILED                                    :{WHITE}Automaattinen korvaus epäonnistui ajoneuvolle {VEHICLE}{}{STRING}
@@ -918,7 +918,7 @@ STR_CONFIG_SETTING_MAMMOTHTRAINS                                :{LTBLUE}Erittä
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Junien kiihdytysmalli: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Alkuperäinen
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistinen
-STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Junat ja laivat: ei 90-asteen käännöksiä: {ORANGE}{STRING} {LTBLUE} (vaatii: NPF)
+STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Junat ja laivat: ei 90-asteen käännöksiä: {ORANGE}{STRING} {LTBLUE} (ei NTP:n kanssa)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Yhdistä vierekkäiset rautatieasemat: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Salli ei-vierekkäisten asemien yhdistäminen: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Käytä kehittyneempää lastausalgoritmia: {ORANGE}{STRING}
@@ -998,7 +998,7 @@ STR_CONFIG_SETTING_LIVERIES                                     :{LTBLUE}Näytä
 STR_CONFIG_SETTING_LIVERIES_NONE                                :Ei yhtään
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :Oma yritys
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :Kaikki yritykset
-STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}Suosi ryhmäkeskustelua <ENTER> {ORANGE}{STRING} kanssa
+STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}Suosi ryhmäkeskustelua <ENTER> näppäimellä: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING                        :{LTBLUE}Hiiren rullan toiminta: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM                             :Zoomaa karttaa
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :Vieritä karttaa
@@ -1041,7 +1041,7 @@ STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Näytä
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}Pidä rakennustyökalut aktiivisina käytön jälkeen: {ORANGE}{STRING}
 STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Ryhmitä kulut yhtiön rahoitusikkunassa: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Näytä rakennustyökalut, kun sopivaa ajoneuvoa ei ole: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Näytä rakennustyökalut, vaikka sopivaa ajoneuvoa ei ole: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Junia/pelaaja: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_ROADVEH                                  :{LTBLUE}Ajoneuvoja/pelaaja: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_AIRCRAFT                                 :{LTBLUE}Lentokoneita/pelaaja: {ORANGE}{STRING}
@@ -1052,7 +1052,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROADVEH                            :{LTBLUE}Tietoko
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Tietokoneella ei ole lentokoneita: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Tietokoneella ei ole laivoja: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Salli tekoälyt moninpeleissä: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Salli tekoälyt moninpelissä: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodet ennen tekoälyn pysäyttämistä: {ORANGE}{STRING}
 
 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Huoltovälit ovat prosentteina: {ORANGE}{STRING}
@@ -1162,7 +1162,7 @@ STR_CHEATS_TIP                                                  :{BLACK}Valintar
 STR_CHEATS_WARNING                                              :{BLACK}Varoitus! Olet juuri pettämässä kanssakilpailijoitasi. Pidä mielessä, että tällainen häväistys pidetään mielessä ikuisuuden ajan.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Anna lisää rahaa: {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Hallinnassa oleva yritys: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Taikapuskutraktori (siirrä teollisuutta yms.): {ORANGE}{STRING}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Taikapuskutraktori (poista teollisuutta yms.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnelit voivat mennä ristiin: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Rakenna tauon aikana: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Suihkukoneet eivät syöksy (usein) pienille lentokentille: {ORANGE} {STRING}
@@ -1234,7 +1234,7 @@ STR_CONVERT_RAIL_TIP                                            :{BLACK}Muunna/p
 
 STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Vedä junan veturi tähän myydäksesi koko junan.
 
-STR_DRAG_DROP                                                   :{BLACK}Vedä&pudota
+STR_DRAG_DROP                                                   :{BLACK}Vedä & Pudota
 STR_STATION_DRAG_DROP                                           :{BLACK}Rakenna asema vetämällä ja pudottamalla.
 STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Valitse asemaluokka
 STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Valitse asematyyppi
@@ -1246,7 +1246,7 @@ STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Kaikki p
 STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Kaikki päälle
 
 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Teollisuusala
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}{NBSP}% kuljetettu)
+STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% kuljetettu)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% kuljetettu)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
 STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Teollisuusmuotojen nimet - paina nimeä kohdistaaksesi kuvakulman teollisuuslaitokseen
@@ -1268,7 +1268,7 @@ STR_NETWORK_PLAYER_NAME                                         :{BLACK}Pelaajan
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Pelaajat tunnistetaan ja erotetaan toisistaan nimien avulla.
 STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Kirjoita nimesi
 STR_NETWORK_CONNECTION                                          :{BLACK}Yhteys:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Valitse Internet-peli tai paikallisverkkopeli
+STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Valitse internet-peli tai paikallisverkkopeli (LAN)
 
 STR_NETWORK_START_SERVER                                        :{BLACK}Käynnistä palvelin
 STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Käynnistä oma palvelin.
@@ -1288,7 +1288,7 @@ STR_NETWORK_ENTER_IP                                            :{BLACK}Syötä
 
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Pelaajia
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Pelaajia pelissä/enintään.
+STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Pelaajia online / pelaajia maks.{}Yhtiöitä online / yhtiöitä maks.
 
 STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
 STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kartan koko
@@ -1301,19 +1301,19 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Vuosia
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Pelin kesto{}vuosina
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}PELITIEDOT
-STR_NETWORK_CLIENTS                                             :{SILVER}Pelaajat:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Kieli:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Ruudusto:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartan koko:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Palvelimen versio:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Pelaajat: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Kieli: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Ruudusto: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartan koko: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Palvelimen versio: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Palvelimen osoite:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Aloitusvuosi:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Päivämäärä:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Aloitusvuosi: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Päivämäärä: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Salasanasuojattu!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}PALVELIN KIINNI
 STR_NETWORK_SERVER_FULL                                         :{SILVER}PALVELIN TÄYNNÄ
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIO EI TÄSMÄÄ
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF ei täsmää
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF EI TÄSMÄÄ
 
 STR_NETWORK_JOIN_GAME                                           :{BLACK}Liity peliin
 
@@ -1330,7 +1330,7 @@ STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Mitä ka
 STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
 STR_NETWORK_LAN                                                 :Lähiverkko
 STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :Lähiverkko/Internet
+STR_NETWORK_LAN_INTERNET                                        :Lähiverkko / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (mainosta)
 STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} asiakas{P "" ta}
 STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Pelaajien enimmäismäärä:
@@ -1390,7 +1390,7 @@ STR_NETWORK_LANG_LATVIAN                                        :latvia
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Moninpeliaula
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Valmistaudu yhdistämään:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Valmistautuu yhdistämään: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista pelissä olevista yhtiöistä. Voit joko liittyä yhteen tai perustaa omasi.
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Uusi yhtiö
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Perusta uusi yhtiö.
@@ -1403,16 +1403,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Päivit
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}YHTIÖN TIEDOT
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Yhtiön nimi:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Perustettu:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Yhtiön arvo:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nykyinen kate:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Viime vuoden tulot:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Suorite:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Yhtiön nimi: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Perustettu: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Yhtiön arvo: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nykyinen kate: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Viime vuoden tulot: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Suorite: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Liikenneväl.:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Asemat:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Pelaajat:  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Liikenneväl.: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Asemat: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Pelaajat: {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Yhdistetään...
 
@@ -1421,7 +1421,7 @@ STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Yh
 STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Valtuutetaan..
 STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Odotetaan..
 STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Ladataan karttaa..
-STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Muokataan dataa..
+STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Prosessoidaan dataa..
 STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Rekisteröidään..
 
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Haetaan pelitiedot..
@@ -1439,23 +1439,23 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Asiakasl
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Katsele
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uusi Yhtiö
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Verkkolaitteita ei löytynyt tai käännetty ilman ENABLE_NETWORK-valintaa.
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Verkkopelejä ei löytynyt.
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Palvelin ei vastannut pyyntöön.
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Yhteyden muodostaminen epäonnistui NewGRF-virheen vuoksi
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Verkkopelin tahdistus epäonnistui.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Verkkopeliyhteys katkesi.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Palvelimen pelitallennetta ei voi ladata.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Palvelinta ei voitu käynnistää.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Yhdistäminen ei onnistunut.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Yhteys #{NUM} aikakatkaistiin.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Teimme protokollavirheen ja yhteys katkesi.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Tämän asiakkaan revisio ei vastaa palvelimen revisiota.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Väärä salasana.
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Palvelin on täynnä.
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Sinut on suljettu pois palvelimelta.
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Sinut potkittiin pihalle palvelimelta.
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Huijaaminen ei ole sallittua tällä palvelimella.
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Verkkolaitteita ei löytynyt tai käännetty ilman ENABLE_NETWORK-valintaa
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Verkkopelejä ei löytynyt
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Palvelin ei vastannut pyyntöön
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Yhteyden muodostaminen epäonnistui NewGRF-virheen vuoksi
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}Verkkopelin tahdistus epäonnistui
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Verkkopeliyhteys katkesi
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Palvelimen pelitallennetta ei voi ladata
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Palvelinta ei voitu käynnistää
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Yhdistäminen ei onnistunut
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Yhteys #{NUM} aikakatkaistiin
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Protokollavirhe tapahtui ja yhteys suljettiin
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Tämän asiakkaan versio ei vastaa palvelimen versiota
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Väärä salasana
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Palvelin on täynnä
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Sinut on kielletty palvelimelta
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Sinut potkittiin pihalle palvelimelta
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Huijaaminen ei ole sallittua tällä palvelimella
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :yleinen virhe
@@ -1468,8 +1468,8 @@ STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ei valtuutettu
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :vastaanotettiin omituinen paketti
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :väärä revisio
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nimi on jo käytössä
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :väärä pelisalasana
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :väärä yritys-id DoCommandissa
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :väärä salasana
+STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :väärä company-id DoCommandissa
 STR_NETWORK_ERR_CLIENT_KICKED                                   :palvelin potki pihalle
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :yritti käyttää huijausta
 STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :palvelin täynnä
@@ -1526,7 +1526,7 @@ STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...tiedo
 STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kuvan tyyppiä ei voida muuttaa. Tarvitaan 8- tai 24-bittinen PNG-kuva.
 STR_PNGMAP_ERR_MISC                                             :{WHITE}...tapahtui tunnistamaton virhe. (todennäköisesti viallinen tiedosto)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Maastoa ei voida ladata BMP:stä...
+STR_BMPMAP_ERROR                                                :{WHITE}Maastoa ei voida ladata BMP-tiedostosta...
 STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kuvan tyyppiä ei voida muuntaa.
 
 ##id 0x0800
@@ -1588,15 +1588,15 @@ STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Valitse
 STR_1021_RAILROAD_TRACK                                         :Rautatie
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Veturitalli
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...alueen omistaa toinen yhtiö.
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Rautatie tavallisin opastimin
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Rautatie blokkiopasteilla
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Rautatie esiopastimin
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Rautatie poistumisopastimin
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Rautatie yhdistelmäopastein
 STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Rautatiekiskot reittiopastimilla
 STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Rautatiekiskot yksisuuntaisilla reittiopastimilla
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Rautatie esisignaaleilla
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Rautatie poistumis-signaaleilla
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Rautatie normaali- ja yhdistelmäopastein
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Rautatie blokki- ja sisääntulo-opasteilla
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Rautatie blokki- ja poistumisopasteilla
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Rautatie blokki- ja yhdistelmäopasteilla
 STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Rautatieraiteet blokki- ja reittiopastimilla
 STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Rautatieraiteet blokki- ja yksisuuntaisilla reittiopastimilla
 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Rautatie esi- ja poistumissignaaleilla
@@ -1716,7 +1716,7 @@ STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tarjotut
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} välille {STRING}-{STRING}
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Ei mitään
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Käytetyt tuet-
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Käytetyt tuet:
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} välille {STATION}-{STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, {DATE_SHORT} asti)
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tuki päättynyt:{}{}{STRING} väli {STRING} - {STRING} ei ole enää tuettu.
@@ -1726,7 +1726,7 @@ STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT
 STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa tuplaten seuraavan vuoden ajan!
 STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa kolminkertaisesti seuraavan vuoden ajan!
 STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa nelinkertaisesti seuraavan vuoden ajan!
-STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}: paikallisviranomaiset eivät salli toisen lentokentän rakentamista tähän kaupunkiin.
+STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} paikallisviranomaiset eivät salli toisen lentokentän rakentamista tähän kaupunkiin.
 STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} paikallisviranomaiset kieltävät lentokentän rakennuksen äänekkyyden takia
 STR_2036_COTTAGES                                               :Mökkejä
 STR_2037_HOUSES                                                 :Taloja
@@ -1752,14 +1752,14 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Rakenna patsas
 STR_204B_FUND_NEW_BUILDINGS                                     :Rahoita uusia rakennuksia
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Osta yksinoikeudet kuljetuksiin
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Lahjo viranomaisia
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Käynnistä pieni mainoskampanja hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Käynnistä keskikokoinen mainoskampanja houkutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Käynnistä suuri mainoskampanja hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Rahoita kaupungin tieverkon rakentamista. Aiheuttaa huomattavaa häiriötä tieliikenteessä kuuden kuukauden ajan.{}  Kustannus: {CURRENCY}
-STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Rakenna patsas yhtiösi kunniaksi.{} Kustannus: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Rahoita uusien kaupparakennusten rakentamista kaupungissa.{}  Kustannus: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Osta vuoden yksinoikeudet kaupungin liikennöintiin. Paikallisviranomaiset eivät salli muiden yhtiöiden kuljettaa matkustajia ja rahtia.{} Kustannus: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Lahjo viranomaisia lisätäksesi arviotasi; rangaistus voi olla kuitenkin suuri, jos jäät kiinni.{}  Kulu: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Käynnistä pieni mainoskampanja hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}Kustannus: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW}Käynnistä keskikokoinen mainoskampanja houkutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}Kustannus: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Käynnistä suuri mainoskampanja hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}Kustannus: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW}Rahoita kaupungin tieverkon rakentamista. Aiheuttaa huomattavaa häiriötä tieliikenteessä kuuden kuukauden ajan.{}Kustannus: {CURRENCY}
+STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW}Rakenna patsas yhtiösi kunniaksi.{}Kustannus: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}Rahoita uusien kaupparakennusten rakentamista kaupungissa.{}Kustannus: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}Osta vuoden yksinoikeudet kaupungin liikennöintiin. Paikallisviranomaiset eivät salli muiden yhtiöiden kuljettaa matkustajia ja rahtia.{}Kustannus: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Lahjo viranomaisia lisätäksesi arviotasi; rangaistus voi olla kuitenkin suuri, jos jäät kiinni.{}Kulu: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}{TOWN}: liikenne on kaaoksessa!{}{}{STRING} rahoittaa katujen kunnostuksen; autoilijoille odotettavissa kuusi kuukautta kurjuutta!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -1878,7 +1878,7 @@ STR_3069_BUOY                                                   :Poiju
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...poiju on tiellä.
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...asema liian levittäytynyt.
 STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...epäsymmetriset asemat poissa käytöstä.
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Pidä CTRL painettuna valitaksesi useamman kuin yhden vaihtoehdon
+STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Pidä Ctrl painettuna valitaksesi useamman kuin yhden vaihtoehdon
 
 STR_UNDEFINED                                                   :(määrittelemätön merkkijono)
 STR_STAT_CLASS_DFLT                                             :Oletusasema
@@ -2007,7 +2007,7 @@ STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Ei voi a
 STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Sillan päät eivät ole samalla korkeudella
 STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Silta on liian matalalla maastoa varten
 STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}Alku- ja päätepisteen pitää olla linjassa.
-STR_500B_SITE_UNSUITABLE_FOR_TUNNEL                             :{WHITE}Tontti on sopimaton tunnelinsuulle.
+STR_500B_SITE_UNSUITABLE_FOR_TUNNEL                             :{WHITE}Alue on sopimaton tunnelinsuulle.
 STR_500D                                                        :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_500E_SUSPENSION_STEEL                                       :Riippusilta, terästä
 STR_500F_GIRDER_STEEL                                           :Palkki, terästä
@@ -2206,7 +2206,7 @@ STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Käyttökatekuvaaja
 STR_7026_BANK_BALANCE                                           :{WHITE}Tilin saldo
 STR_7027_LOAN                                                   :{WHITE}Laina
-STR_MAX_LOAN                                                    :{WHITE}Laina enimmillään:  {BLACK}{CURRENCY}
+STR_MAX_LOAN                                                    :{WHITE}Laina enimmillään: {BLACK}{CURRENCY}
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Lainaa {SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Lyhennä lainaa {SKIP}{SKIP}{CURRENCY}
@@ -2224,7 +2224,7 @@ STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Ota lis
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Lyhennä lainaa.
 STR_7037_PRESIDENT                                              :{WHITE}{PRESIDENTNAME}{}{GOLD}(pääjohtaja)
 STR_7038_INAUGURATED                                            :{GOLD}Avattu: {WHITE}{NUM}
-STR_7039_VEHICLES                                               :{GOLD}Liikennevälineet:
+STR_7039_VEHICLES                                               :{GOLD}Liikenneväl.:
 STR_TRAINS                                                      :{WHITE}{COMMA} juna{P "" a}
 STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} ajoneuvo{P "" a}
 STR_AIRCRAFT                                                    :{WHITE}{COMMA} lentokone{P "" tta}
@@ -2336,7 +2336,7 @@ STR_LIVERY_SHIP_TIP                                             :{BLACK}Näytä
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Näytä lentokoneiden väriteemat
 STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Valitse valitulle teemalle ensisijainen väri
 STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Valitse valitulle teemalle toissijainen väri
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Valitse muutettava väriteema, tai valitse useita CTRL pohjassa. Paina valintalaatikkoa valitaksesi teeman
+STR_LIVERY_PANEL_TIP                                            :{BLACK}Valitse muutettava väriteema, tai valitse useita Ctrl pohjassa. Paina valintalaatikkoa valitaksesi teeman
 
 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (höyry)
@@ -2606,7 +2606,7 @@ STR_8107_MAGLEV_LOCOMOTIVE                                      :maglev-veturin
 
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN}: veturitalli
-STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen juna saapuu asemalle ({STATION})!
+STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen juna saapuu asemalle {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (yksityiskohdat)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Juna on tiellä.
 STR_8804                                                        :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
@@ -2721,17 +2721,17 @@ STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Ratakulk
 
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Rakenna yksikkö
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonaa ajoneuvo
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tämä rakentaa kopion ajoneuvosta. Control-click jakaa komennot
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tämä rakentaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Control-click jakaa komennot
+STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tämä tekee kopion ajoneuvosta. Klikkaaminen Ctrl painettuna jakaa komennot
+STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tämä rakentaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Klikkaus Ctrl painettuna jakaa komennot
 STR_CLONE_TRAIN                                                 :{BLACK}Kloonaa juna
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Control-click jakaa komennot
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Control-click jakaa komennot
+STR_CLONE_TRAIN_INFO                                            :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Klikkaus Ctrl painettuna jakaa komennot
+STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Klikkaus Ctrl painettuna jakaa komennot
 STR_8820_RENAME                                                 :{BLACK}Nimeä
 STR_8823_SKIP                                                   :{BLACK}Ohita
 STR_8824_DELETE                                                 :{BLACK}Poista
 STR_8826_GO_TO                                                  :{BLACK}Mene
 STR_REFIT                                                       :{BLACK}Sovita
-STR_REFIT_TIP                                                   :{BLACK}Valitse rahdin tyyppi jolla tämä käsky uudistetaan. CTRL+klikkaus poistaa uudistuksen
+STR_REFIT_TIP                                                   :{BLACK}Valitse mihin rahtityyppiin tämä käsky sovittaa. Ctrl+Click poistaa sovituskäskyn
 STR_REFIT_ORDER                                                 :(Sovita {STRING})
 STR_REFIT_STOP_ORDER                                            :(Sovita rahtityypiksi {STRING} ja pysähdy)
 STR_STOP_ORDER                                                  :(Pysähdy)
@@ -2800,12 +2800,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nollaa t
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nollaa myöhästymislaskuri, jotta vaunu olisi taas aikataulussa
 STR_SERVICE_HINT                                                :{BLACK}Ohita tämä määräys, ellei palvelua tarvita.
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kulu: {CURRENCY} Paino: {WEIGHT_S}{}Nopeus: {VELOCITY}  Teho: {POWER}{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Rikki
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Paino: {LTBLUE}{WEIGHT_S}  {BLACK}Teho: {LTBLUE}{POWER}{BLACK} Huippunopeus: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Paino: {LTBLUE}{WEIGHT_S} {BLACK}Teho: {LTBLUE}{POWER}{BLACK} Maks. nopeus: {LTBLUE}{VELOCITY} {BLACK}Maks. T.E.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Tuotto tänä vuonna: {LTBLUE}{CURRENCY}  (viime vuonna: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Luotettavuus: {LTBLUE}{COMMA}%  {BLACK}Hajoamisia viime huollon jälkeen: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Hajonnut
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
 STR_8861_STOPPED                                                :{RED}Pysäytetty
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Junaa ei voi pakottaa jatkamaan opastimen ohi vaaratilanteessa...
 STR_8863_CRASHED                                                :{RED}Kolaroitu!
@@ -2814,7 +2814,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Nimeä j
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Junaa ei voi nimetä...
 STR_8867_NAME_TRAIN                                             :{BLACK}Nimeä juna
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Junakolari!{}{COMMA} kuolee törmäyksen jälkeisessä tulipallossa.
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Junan suuntaa ei voi kääntää...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Junan suuntaa ei voi kääntää...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kulkuneuvoa ei voida kääntää...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ei voi kääntää moniosaista ajoneuvoa
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Nimeä juna(vaunu)n tyyppi uudelleen.
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Juna(vaunu)n tyyppiä ei voi uudelleennimetä...
 STR_CLEAR_TIME                                                  :{BLACK}Nollaa aika
@@ -2845,7 +2847,7 @@ STR_TIMETABLE_STATUS_EARLY                                      :Ajoneuvo on {ST
 STR_TIMETABLE_TOTAL_TIME                                        :Aikataulun kesto on {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :Aikataulun kesto on vähintään {STRING}
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Automaattinen
-STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (CTRL-click: yritä säilyttää odotusajat)
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+Click: yritä säilyttää odotusajat)
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Ajoneuvo tiellä.
@@ -2902,8 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Kaupunkilaiset juhlivat . . .{}Ensimmäinen rahtiraitiovaunu saapuu asemalle {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Ajoneuvokolari!{}Kuljettaja kuolee junaan törmäyksen jälkeisessä tulipallossa
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Ajoneuvokolari!{}{COMMA} kuolee junaan törmäyksen jälkeisessä tulipallossa
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Ajoneuvoa ei voi pakottaa kääntymään ympäri...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Ei voi kääntää moniosaista ajoneuvoa
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Ajoneuvoa ei voida kääntää...
 STR_9034_RENAME                                                 :{BLACK}Nimeä
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Nimeä ajoneuvon tyyppi uudelleen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Nimeä ajoneuvon tyyppi uudelleen
@@ -2926,8 +2927,8 @@ STR_9805_SHIPS                                                  :{WHITE}{COMPANY
 STR_9808_NEW_SHIPS                                              :{WHITE}Uusia laivoja
 STR_9809_BUILD_SHIP                                             :{BLACK}Rakenna laiva
 STR_CLONE_SHIP                                                  :{BLACK}Kloonaa laiva
-STR_CLONE_SHIP_INFO                                             :{BLACK}Tämä rakentaa kopion laivasta. Control-click jakaa komennot
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tämä rakentaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Control-click jakaa komennot##
+STR_CLONE_SHIP_INFO                                             :{BLACK}Tämä rakentaa kopion laivasta. Ctrl+Click jakaa komennot
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tämä rakentaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
 STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Laivan pitää olla pysähdyksissä telakalla.
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Laivaa ei voi myydä...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Laivaa ei voi rakentaa...
@@ -2945,7 +2946,7 @@ STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Laivaa e
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Paikallista telakkaa ei löydy
 STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suuntana telakka, {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suuntana telakka, {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Huolto{TOWN} Telakka
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Huolto {TOWN} Telakka
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Huolto {TOWN} Telakka, {VELOCITY}
 STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}{VEHICLE} odottaa varikolla
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Rakenna satama
@@ -2992,8 +2993,8 @@ STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Lentoken
 STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}Lentokonehalli, {STATION}
 STR_A003_NEW_AIRCRAFT                                           :{BLACK}Uusi lentokone
 STR_CLONE_AIRCRAFT                                              :{BLACK}Kloonaa lentokone
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tämä rakentaa kopion lentokoneesta. Control-klikkaus jakaa komennot
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tämä rakentaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Control-click jakaa komennot ##
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tämä rakentaa kopion lentokoneesta. Ctrl+Click jakaa komennot
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tämä rakentaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Uusi lentokone
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Rakenna lentokone
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi rakentaa...
@@ -3077,9 +3078,9 @@ STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
 STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
-STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Liikennevälineitä:
+STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Liikenneväl.:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Asemia:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Vähimmäistuotto:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Väh. tuotto:
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Vähimmäistulo:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Enimmäistulo:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Kuljetettu:
@@ -3101,7 +3102,7 @@ STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Summa ka
 
 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF-asetukset
 STR_NEWGRF_SETTINGS_BUTTON_TIP                                  :{BLACK}Näytä NewGRF-asetukset
-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Newgrf-asetukset
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF-asetukset
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Ota käyttöön
 STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Käytä eri palettia
 STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Käytä valitun NewGRF:n kanssa eri palettia.{}Tee näin, jos tämän NewGRF:n grafiikat näkyvät pelissä vaaleanpunaisina.
@@ -3121,7 +3122,7 @@ STR_NEWGRF_ERROR_DOS_OR_WINDOWS                                 :{SKIP}{STRING}
 STR_NEWGRF_ERROR_UNSET_SWITCH                                   :{SKIP}{STRING} ja {STRING} on suunniteltu toimimaan yhdessä
 STR_NEWGRF_ERROR_INVALID_PARAMETER                              :{SKIP}Virheellinen parametri: {STRING}: {STRING} ({NUM})
 STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{SKIP}{STRING} tulee ladata ennen kuin {STRING}.
-STR_NEWGRF_ERROR_LOAD_AFTER                                     :{SKIP}{STRING} tulee ladata vasta kun {STRING} on ladattu.
+STR_NEWGRF_ERROR_LOAD_AFTER                                     :{SKIP}{STRING} tulee ladata {STRING} jälkeen.
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{SKIP}{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.
@@ -3231,8 +3232,8 @@ STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} ilma-alus{P "" ta}
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Korvaa {STRING}
-STR_REPLACE_VEHICLES_START                                      :{BLACK}Aloita ajoneuvojen korvaaminen
-STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lopeta ajoneuvojen korvaaminen
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Aloita ajoneuvojen korv.
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lopeta ajoneuvojen korv.
 STR_NOT_REPLACING                                               :{BLACK}Ei korvata
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ei liikennevälinettä valittuna
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Valitse korvattava veturityyppi.
@@ -3283,14 +3284,14 @@ STR_MAGLEV_VEHICLES                                             :Maglev-junat
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Paino: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Nopeus: {GOLD}{VELOCITY}{BLACK}   Teho: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Nopeus: {GOLD}{VELOCITY}{BLACK} Teho: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Nopeus: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Käyttökukustannus: {GOLD}{CURRENCY}/vuosi
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasiteetti: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Suunniteltu: {GOLD}{NUM}{BLACK} Elinikä: {GOLD}{COMMA} vuotta
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Enimmäisluotettavuus: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kulu: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Paino: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Paino: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Nopeus: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasiteetti: {GOLD}{COMMA} matkustajaa, {COMMA} säkkiä postia
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moottoroidut vaunut: {GOLD}+{POWER}{BLACK} Paino: {GOLD}+{WEIGHT_S}
@@ -3386,7 +3387,7 @@ STR_HELISTATION                                                 :{BLACK}Helikopt
 STR_SMALL_AIRPORTS                                              :{BLACK}Pienet lentokentät
 STR_LARGE_AIRPORTS                                              :{BLACK}Isot lentokentät
 STR_HUB_AIRPORTS                                                :{BLACK}Keskuslentokenttä
-STR_HELIPORTS                                                   :{BLACK}Helikopteri lentokenttä
+STR_HELIPORTS                                                   :{BLACK}Helikopterikentät
 
 ############ Tooltip measurment
 
@@ -3411,15 +3412,15 @@ STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...kaupu
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...tie on väärin päin
 
 STR_TRANSPARENCY_TOOLB                                          :{WHITE}Läpinäkyvyysvalinnat
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Muuta kylttien läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Muuta puiden läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Muuta talojen läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Muuta siltojen läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Muuta ajolinjojen läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Lukitse klikkaamalla CTRL pohjassa.
+STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Muuta asemakylttien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Muuta ajolinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
 STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Tee kohteista läpinäkyvyyden sijaan näkymättömiä
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3457,7 +3458,7 @@ STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Ryhmän
 STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Ei voi lisätä ajoneuvoa ryhmään.
 STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Ei voi lisätä jaettuja ajoneuvoja ryhmään.
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Ryhmät - Valitse ryhmä
+STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Ryhmät - klikkaa ryhmää nähdäksesi kaikki kulkuneuvot tässä ryhmässä
 STR_GROUP_CREATE_TIP                                            :{BLACK}Luo ryhmä
 STR_GROUP_DELETE_TIP                                            :{BLACK}Poista valittu ryhmä
 STR_GROUP_RENAME_TIP                                            :{BLACK}Nimeä valittu ryhmä
@@ -3547,7 +3548,7 @@ STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Poistumi
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Yhdistelmäopastin (sähköistetty){}Yhdistelmäopastin toimii yhtä aikaa sisääntulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita".
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Reittiopastin (sähköistetty){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Tavalliset reittiopastimet voi ohittaa takakautta.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Yksisuuntainen reittiopastin (sähköistetty){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Yksisuuntaisia opastimia ei voi ohittaa takakautta.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen klikkaaminen muuntaa siitä valituntyyppisen ja -muotoisen. Klikkaaminen CTRL pohjassa vaihtaa nykyistä opastimen muotoa.
+STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen klikkaaminen muuntaa siitä valituntyyppisen ja -muotoisen. Ctrl+Click vaihtaa nykyistä opastimen muotoa.
 STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Opastimien tiheys vetämällä lisättäessä
 STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Pienennä opastimien tiheyttä vetämällä lisättäessä
 STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Suurenna opastimien tiheyttä vetämällä lisättäessä
@@ -3585,7 +3586,7 @@ STR_AI_RANDOM_AI                                                :Sattumanvaraine
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Tekoälyn parametrit
 STR_AI_AUTHOR                                                   :Tekijä:
 STR_AI_VERSION                                                  :Versio:
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Yksi käynnissä olevista tekoälyistä kaatui. Ole hyvä ja kerro tästä tekoälyn tekijälle, sekä ota kuvankaappaus Tekoalyn Virheenkorjaus ikkunasta.
+STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Yksi käynnissä olevista tekoälyistä kaatui. Ole hyvä ilmoita tästä tekoälyn kehittäjälle, sekä ota kuvankaappaus Tekoälyn Virheenkorjaus ikkunasta.
 ########
 
 ############ town controlled noise level
@@ -3611,7 +3612,7 @@ STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klikkaa
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Valitse kaikki
 STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Merkitse kaikki sisältö ladattavaksi
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Valitse päivitykset
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Valitse kaikki sisältö, joka on päivitys nykyiseen sisältöön ladattavaksi
+STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Valitse kaikki sisältö, joka on päivitys nykyiseen sisältöön, ladattavaksi
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Poista valinnat
 STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Poista kaikesta sisällöstä valinta ladattavaksi
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Syötä suodatin teksti
@@ -3649,7 +3650,7 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... yhte
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... tiedostoa ei voitu kirjoittaa
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Ei voitu purkaa ladattua tiedostoa
 
-STR_CONTENT_INTRO_BUTTON                                        :{BLACK}Tarkista online-sisältö
+STR_CONTENT_INTRO_BUTTON                                        :{BLACK}Tarkista Online-Sisältö
 STR_CONTENT_INTRO_BUTTON_TIP                                    :{BLACK}Tarkista uutta ja päivitettyä sisältöä ladattavaksi
 STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Etsi puuttuvaa sisältöä online-palvelusta
 STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Tarkista löytyykö puuttuvaa sisältöä online-palvelusta

src/lang/french.txt

@@ -666,7 +666,6 @@ STR_OFF                                                         :Aucun
 STR_SUMMARY                                                     :Sommaire
 STR_FULL                                                        :Complet
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
-STR_02BB_TOWN_DIRECTORY                                         :Annuaire des villes
 STR_02BD                                                        :{BLACK}{STRING}
 
 STR_CHECKMARK                                                   :{CHECKMARK}
@@ -704,6 +703,7 @@ STR_02DE_MAP_OF_WORLD                                           :Carte du monde
 STR_EXTRA_VIEW_PORT                                             :Vue supplémentaire
 STR_SIGN_LIST                                                   :Liste des panneaux
 STR_02DF_TOWN_DIRECTORY                                         :Annuaire des villes
+STR_02BB_TOWN_DIRECTORY                                         :Annuaire des villes
 STR_TOWN_POPULATION                                             :{BLACK}Population mondiale : {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vue {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copier vers la vue
@@ -730,6 +730,7 @@ STR_02F4_AUTOSAVE                                               :{BLACK}Sauvegar
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Sélectionner l'intervalle de temps entre les sauvegardes automatiques
 STR_02F7_OFF                                                    :Désactivé
+STR_AUTOSAVE_1_MONTH                                            :Tous les mois
 STR_02F8_EVERY_3_MONTHS                                         :Tous les 3 mois
 STR_02F9_EVERY_6_MONTHS                                         :Tous les 6 mois
 STR_02FA_EVERY_12_MONTHS                                        :Tous les 12 mois
@@ -761,7 +762,7 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...peut seulement être construit en forêt tropicale
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...peut seulement être construit dans les endroits désertiques
-STR_0319_PAUSED                                                 :{YELLOW}* *  SUSPENDU  * *
+STR_0319_PAUSED                                                 :{YELLOW}*  *  SUSPENDU  *  *
 
 STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Copie d'écran enregistrée avec succès sous '{STRING}'
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Copie d'écran a échoué!
@@ -850,7 +851,6 @@ STR_OPTIONS_BASE_GRF                                            :{BLACK}Graphiqu
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Sélectionner les graphiques de base à utiliser
 
-STR_AUTOSAVE_1_MONTH                                            :Tous les mois
 STR_AUTOSAVE_FAILED                                             :{WHITE}Enregistrement automatique échoué
 
 STR_MONTH_JAN                                                   :Janvier
@@ -1289,7 +1289,7 @@ STR_NETWORK_ENTER_IP                                            :{BLACK}Saisir l
 
 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en ligne / clients max
+STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en ligne / clients max{}Compagnies en ligne / compagnies max
 
 STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
 STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Taille
@@ -1302,14 +1302,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Années
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombre d'années{}écoulées dans le jeu
 
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFOS SUR LE SERVEUR
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Langue:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Terrain:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Taille de la carte :  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Version du serveur :  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Langue: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Terrain: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Taille de la carte : {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Version du serveur : {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresse du serveur :  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Date de début :  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Date courante :  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Date de début : {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Date courante : {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Protégée par mot de passe !
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVEUR HORS-LIGNE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVEUR PLEIN
@@ -1391,7 +1391,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Letton
 
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Préparation de la partie
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Se prépare à rejoindre :   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Se prépare à rejoindre : {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Liste des compagnies présentes dans le jeu.  Vous pouvez soit en rejoindre une, soit en créer une.
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nouvelle compagnie
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Crée une nouvelle compagnie
@@ -1404,16 +1404,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Actualis
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFOS SUR LA COMPAGNIE
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom de la compagnie :  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration :  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valeur de la compagnie :  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Argent courant :  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Revenus de l'année dernière :  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance :  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom de la compagnie : {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration : {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Valeur de la compagnie : {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Argent courant : {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Revenus de l'année dernière : {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance : {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Véhicules :  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations :  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Joueurs :  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Véhicules : {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stations : {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Joueurs : {WHITE}{STRING}
 
 STR_NETWORK_CONNECTING                                          :{WHITE}Connexion en cours...
 
@@ -1440,23 +1440,23 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste de
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectateur
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nouvelle compagnie
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Aucun périphérique réseau trouvé ou programme compilé sans ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Aucune partie réseau n'a été trouvée
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Le serveur n'a pas répondu à la requête
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Echec de la connexion : NewGRF requis
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} La synchronisation de la partie réseau a échouée.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} La connection de la partie réseau a été perdue.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} La sauvegarde serveur n'a pas pu être chargée.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Le serveur n'a pas pu être démarré.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Connexion échouée.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La connection #{NUM} a dépassé le temps d'attente.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Il y a eu une erreur de protocole et la connection est donc fermée.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La révision de ce client ne correspond pas à celle du serveur.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Mot de passe incorrect.
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Le serveur est complet
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Vous êtes bannis de ce serveur
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Vous avez été exclu de la partie
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Tricher n'est pas autorisé sur ce serveur
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Aucun périphérique réseau trouvé ou programme compilé sans ENABLE_NETWORK
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Aucune partie réseau n'a été trouvée
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Le serveur n'a pas répondu à la requête
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Échec de la connexion : NewGRF requis
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}La synchronisation de la partie réseau a échouée.
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}La connection de la partie réseau a été perdue
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}La sauvegarde serveur n'a pas pu être chargée
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Le serveur n'a pas pu être démarré
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Connexion échouée
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}La connection #{NUM} a dépassé le temps d'attente
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Il y a eu une erreur de protocole et la connection a été fermée
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}La révision de ce client ne correspond pas à celle du serveur
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Mot de passe incorrect
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Le serveur est complet
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Vous êtes bannis de ce serveur
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Vous avez été exclu de la partie
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Tricher n'est pas autorisé sur ce serveur
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :erreur générale
@@ -1753,14 +1753,14 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Construire une
 STR_204B_FUND_NEW_BUILDINGS                                     :Financer de nouveaux bâtiments
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Acheter les droits de transports exclusifs
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Corrompre la municipalité
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Lancer une petite campagne de publicité, pour attirer plus de voyageurs et de marchandises sur vos lignes.{}  Coût: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Lancer une campagne de publicité moyenne, pour attirer plus de voyageurs et de marchandises sur vos lignes.{}  Coût: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Lancer une grande campagne de publicité, pour attirer plus de voyageurs et de marchandises sur vos lignes.{}  Coût: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Financer la reconstruction du réseau routier local. Provoque de nombreux problèmes de traffic routier pendant 6 mois.{}  Coût: {CURRENCY}
-STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Construire une statue en l'honneur de votre compagnie.{} Coût: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financer la construction de nouveaux immeubles commerciaux.{}  Coût: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Acheter les droits de transports exclusifs dans cette ville pour 1 an. Seules vos ligness seront autorisées dans la ville.{} Coût: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Corrompre la municipalité pour améliorer votre réputation. Risque de pénalisation si le pot-de-vin est dévoilé.{}  Coût: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Lancer une petite campagne de publicité, pour attirer plus de voyageurs et de marchandises sur vos lignes.{}Coût: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW}Lancer une campagne de publicité moyenne, pour attirer plus de voyageurs et de marchandises sur vos lignes.{}Coût: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Lancer une grande campagne de publicité, pour attirer plus de voyageurs et de marchandises sur vos lignes.{}Coût: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW}Financer la reconstruction du réseau routier local. Provoque de nombreux problèmes de traffic routier pendant 6 mois.{}Coût: {CURRENCY}
+STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW}Construire une statue en l'honneur de votre compagnie.{}Coût: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}Financer la construction de nouveaux immeubles commerciaux.{}Coût: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}Acheter les droits de transports exclusifs dans cette ville pour 1 an. Seules vos lignes seront autorisées dans la ville.{}Coût: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Corrompre la municipalité pour améliorer votre réputation. Risque de pénalisation si le pot-de-vin est dévoilé.{}Coût: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Problèmes de traffic à {TOWN}!{}{}La reconstruction des routes financée par {STRING} provoque 6 mois de problèmes aux automobilistes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -2207,7 +2207,7 @@ STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graphique du profit d'opération
 STR_7026_BANK_BALANCE                                           :{WHITE}Equilibre bancaire
 STR_7027_LOAN                                                   :{WHITE}Emprunt
-STR_MAX_LOAN                                                    :{WHITE}Emprunt maximum :  {BLACK}{CURRENCY}
+STR_MAX_LOAN                                                    :{WHITE}Emprunt maximum : {BLACK}{CURRENCY}
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Emprunter {SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Rembourser {SKIP}{SKIP}{CURRENCY}
@@ -2801,12 +2801,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Annuler
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Remet à zéro le compteur de retard, le véhicule sera donc à l'heure
 STR_SERVICE_HINT                                                :{BLACK}Sauter cet ordre tant qu'aucun entretien n'est requis
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Prix: {CURRENCY} Poids: {WEIGHT_S}{}Vitesse: {VELOCITY}  Puissance: {POWER}{}Coût d'entretien: {CURRENCY}/an{}Capacité: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}En panne
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Poids: {LTBLUE}{WEIGHT_S}  {BLACK}Puissance: {LTBLUE}{POWER}{BLACK} Vitesse max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Poids: {LTBLUE}{WEIGHT_S} {BLACK}Puissance: {LTBLUE}{POWER}{BLACK} Vitesse max.: {LTBLUE}{VELOCITY} {BLACK}E.T. max.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profit cette année: {LTBLUE}{CURRENCY}  (année précédente: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fiabilité: {LTBLUE}{COMMA}%  {BLACK}Pannes depuis le dernier entretien: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}En Panne
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
 STR_8861_STOPPED                                                :{RED}Stoppé
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Impossible de forcer le train à avancer sous le danger...
 STR_8863_CRASHED                                                :{RED}Crashé!
@@ -2815,7 +2815,9 @@ STR_8865_NAME_TRAIN                                             :{WHITE}Renommer
 STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Impossible de renommer le train...
 STR_8867_NAME_TRAIN                                             :{BLACK}Renommer le train
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident ferroviaire!{}{COMMA} mort{P "" s} brûlé{P "" s} vif{P "" s} dans la collision
-STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Impossible de faire faire demi-tour...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Impossible de faire faire demi-tour...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossible de changer la direction du véhicule...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Impossible de faire faire demi-tour aux unités multiples
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Renommer le type de train
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Impossible de renommer le type de train...
 STR_CLEAR_TIME                                                  :{BLACK}Annuler durée
@@ -2846,7 +2848,7 @@ STR_TIMETABLE_STATUS_EARLY                                      :Ce véhicule es
 STR_TIMETABLE_TOTAL_TIME                                        :Cet horaire prendra {STRING} pour s'achever
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :Cet horaire prendra au moins {STRING} pour s'achever (horaire incomplet)
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autoremplir
-STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Remplit·l'horaire·automatiquement·avec·les·valeurs·du·prochain·trajet (Ctrl-clic pour essayer de préserver les temps d'attente)
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Remplit l'horaire automatiquement avec les valeurs du prochain trajet (Ctrl-clic pour essayer de préserver les temps d'attente)
 
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Véhicule Routier présent
@@ -2903,8 +2905,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Les habitants célèbrent . . .{}Le premier tramway arrive à {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident routier!{}Un automobiliste meurt brûlé vif lors d'une collision avec un train
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident routier!{}{COMMA} mort{P "" s} lors d'une collision avec un train
-STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Impossible de faire faire demi-tour au véhicule...
-STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Impossible de faire faire demi-tour aux unités multiples
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossible de faire rebrousser chemin au véhicule routier...
 STR_9034_RENAME                                                 :{BLACK}Renommer
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renommer type de véhicule routier
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renommer type de véhicule routier
@@ -3284,14 +3285,14 @@ STR_MAGLEV_VEHICLES                                             :Véhicules sur
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Prix: {GOLD}{CURRENCY}{BLACK} Poids: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Vitesse: {GOLD}{VELOCITY}{BLACK}   Puissance: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Vitesse: {GOLD}{VELOCITY}{BLACK} Puissance: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Vitesse: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Coût d'entretien: {GOLD}{CURRENCY}/an
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacité: {GOLD}{CARGO} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concu en: {GOLD}{NUM}{BLACK}Durée de vie: {GOLD}{COMMA} ans
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilité Max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Prix: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Poids: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Poids: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Prix: {GOLD}{CURRENCY}{BLACK} Vitesse: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacité: {GOLD}{COMMA} passagers, {COMMA} sacs de courrier
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Wagons Motorisés: {GOLD}+{POWER}{BLACK} Poids: {GOLD}+{WEIGHT_S}