(svn r13918) -Release: 0.6.2.

2025-08-24 15:09:10 +00:00 · 2008-08-01 23:52:22 +00:00
157 changed files with 2453 additions and 4498 deletions
--- a/2
+++ b/2
@@ -158,7 +158,7 @@ RTF_EXTENSIONS_FILE    =
 #---------------------------------------------------------------------------
 # configuration options related to the man page output
 #---------------------------------------------------------------------------
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -1,173 +0,0 @@
-#
-# Creation of bundles
-#
-
-# The revision is needed for the bundle name and creating an OSX application bundle.
-ifdef REVISION
-REV := $(REVISION)
-else
-# Detect the revision
-VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1)
-endif
-
-# Make sure we have something in REV
-ifeq ($(REV),)
-REV := norev000
-endif
-
-ifndef BUNDLE_NAME
-BUNDLE_NAME = OTTD-$(OS)-custom-$(REV)
-endif
-
-# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
-ifdef OSXAPP
-DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
-LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
-else
-DATA_DIR = $(BUNDLE_DIR)/data
-LANG_DIR = $(BUNDLE_DIR)/lang
-TTD_DIR  = $(BUNDLE_DIR)
-endif
-
-bundle: all
-	@echo '[BUNDLE] Constructing bundle'
-	$(Q)rm -rf   "${BUNDLE_DIR}"
-	$(Q)mkdir -p "${BUNDLE_DIR}"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
-	$(Q)mkdir -p "$(TTD_DIR)"
-	$(Q)mkdir -p "$(DATA_DIR)"
-	$(Q)mkdir -p "$(LANG_DIR)"
-ifdef OSXAPP
-	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
-	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
-	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
-	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "${BUNDLE_DIR}/$(OSXAPP)" "$(REV)"
-	$(Q)cp    "$(ROOT_DIR)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
-	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
-endif
-	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
-	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
-ifdef MAN_DIR
-	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
-	$(Q)cp "$(ROOT_DIR)/docs/openttd.6"       "$(BUNDLE_DIR)/man/"
-	$(Q)gzip "$(BUNDLE_DIR)/man/openttd.6"
-endif
-	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
-	$(Q)cp "$(ROOT_DIR)/media/openttd."*.png  "$(BUNDLE_DIR)/media/"
-ifdef MENU_DIR
-	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-endif
-ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
-	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
-endif
-ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/null`"; then echo 1; fi), 1)
-	$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
-endif
-ifeq ($(TTD), openttd.exe)
-	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
-endif
-
-### Packing the current bundle into several compressed file formats ###
-#
-# Zips & dmgs do not contain a root folder, i.e. they have files in the root of the zip/dmg.
-# gzip, bzip2 and lha archives have a root folder, with the same name as the bundle.
-#
-# One can supply a custom name by adding BUNDLE_NAME:=<name> to the make command.
-#
-bundle_zip: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).zip'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
-
-bundle_gzip: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.gzip" && tar -zc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.gz" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.gzip"
-
-bundle_bzip2: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.bz2'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
-
-bundle_lha: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
-	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)/"
-	$(Q)cd "$(BUNDLES_DIR)/.lha" && lha ao6 "$(BUNDLES_DIR)/$(BUNDLE_NAME).lha" "$(BUNDLE_NAME)"
-	$(Q)rm -rf   "$(BUNDLES_DIR)/.lha"
-
-bundle_dmg: bundle
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
-	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(REV)"
-	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(REV)"
-	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
-	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)"
-
-bundle_exe: all
-	@echo '[BUNDLE] Creating $(BUNDLE_NAME).exe'
-	$(Q)mkdir -p "$(BUNDLES_DIR)"
-	$(Q)unix2dos "$(ROOT_DIR)/docs/"* "$(ROOT_DIR)/readme.txt" "$(ROOT_DIR)/COPYING" "$(ROOT_DIR)/changelog.txt" "$(ROOT_DIR)/known-bugs.txt"
-	$(Q)cd $(ROOT_DIR)/os/win32/installer && makensis.exe //DVERSION_INCLUDE=version_$(PLATFORM).txt install.nsi
-	$(Q)mv $(ROOT_DIR)/os/win32/installer/*$(PLATFORM).exe "$(BUNDLES_DIR)/$(BUNDLE_NAME).exe"
-
-ifdef OSXAPP
-install:
-	@echo '[INSTALL] Cannot install the OSX Application Bundle'
-else
-install: bundle
-	@echo '[INSTALL] Installing OpenTTD'
-	$(Q)install -d "$(INSTALL_BINARY_DIR)"
-	$(Q)install -d "$(INSTALL_ICON_DIR)"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -d "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)"
-ifdef ICON_THEME_DIR
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.16.png" "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.png" "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.48.png" "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.128.png" "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
-	$(Q)install -d "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.256.png" "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
-else
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
-endif
-ifdef MAN_DIR
-	$(Q)install -d "$(INSTALL_MAN_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)"
-endif
-ifdef MENU_DIR
-	$(Q)install -d "$(INSTALL_MENU_DIR)"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.desktop" "$(INSTALL_MENU_DIR)"
-endif
-	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
-endif # OSXAPP
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,5 @@
+# Auto-generated file -- DO NOT EDIT
+
 # Check if we want to show what we are doing
 ifdef VERBOSE
 	Q =
@@ -9,25 +11,17 @@ include Makefile.am

 SOURCE_LIST = !!SOURCE_LIST!!
 CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!!
-CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!!
 CONFIGURE_FILES = !!CONFIGURE_FILES!!
 LIPO = !!LIPO!!
 BIN_DIR = !!BIN_DIR!!
-ICON_THEME_DIR = !!ICON_THEME_DIR!!
-MAN_DIR = !!MAN_DIR!!
-MENU_DIR = !!MENU_DIR!!
 SRC_DIR = !!SRC_DIR!!
 ROOT_DIR = !!ROOT_DIR!!
 BUNDLE_DIR = "$(ROOT_DIR)/bundle"
 BUNDLES_DIR = "$(ROOT_DIR)/bundles"
 INSTALL_DIR = !!INSTALL_DIR!!
 INSTALL_BINARY_DIR = "$(INSTALL_DIR)/"!!BINARY_DIR!!
-INSTALL_MAN_DIR = "$(INSTALL_DIR)/$(MAN_DIR)"
-INSTALL_MENU_DIR = "$(INSTALL_DIR)/$(MENU_DIR)"
 INSTALL_ICON_DIR = "$(INSTALL_DIR)/"!!ICON_DIR!!
-INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
 INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
-INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
 TTD = !!TTD!!
 TTDS = $(SRC_DIRS:%=%/$(TTD))
 OS = !!OS!!
@@ -36,10 +30,9 @@ REVISION = !!REVISION!!
 AWK = !!AWK!!
 DISTCC = !!DISTCC!!

-RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi )
-RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST) 2>/dev/null`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
+RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )

-all: config.pwd config.cache
+all: config.cache
 ifdef DISTCC
 	@if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi
 endif
@@ -78,13 +71,7 @@ help:
 	@echo "  bundle_lha    create the lha installation bundle"
 	@echo "  bundle_dmg    create the dmg installation bundle"

-config.pwd: $(CONFIG_CACHE_PWD)
-	$(MAKE) reconfigure
-
 config.cache: $(CONFIG_CACHE_SOURCE_LIST) $(CONFIGURE_FILES)
-	$(MAKE) reconfigure
-
-reconfigure:
 ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
 	@echo "----------------"
 	@echo "The system detected that source.list or any configure file is altered."
@@ -93,7 +80,7 @@ ifeq ($(shell if test -f config.cache; then echo 1; fi), 1)
 # Make sure we don't lock config.cache
 	@$(shell cat config.cache | sed 's/\\ /\\\\ /g') || exit 1
 	@echo "----------------"
-	@echo "Reconfig done. Please re-execute make."
+	@echo "Reconfig done. Now compiling..."
 	@echo "----------------"
 else
 	@echo "----------------"
@@ -119,9 +106,8 @@ mrproper:
 		rm -f $$dir/Makefile; \
 	done
 	$(Q)rm -rf objs
-	$(Q)rm -f Makefile Makefile.am Makefile.bundle
-	$(Q)rm -f media/openttd.desktop
-	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.pwd config.log $(CONFIG_CACHE_PWD)
+	$(Q)rm -f Makefile Makefile.am
+	$(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log
 	$(Q)rm -rf $(BUNDLE_DIR)
 	$(Q)rm -rf $(BUNDLES_DIR)

@@ -149,4 +135,140 @@ run-prof: all
 		$(MAKE) -C $$dir $@; \
 	done

-include Makefile.bundle
+#
+# Creation of bundles
+#
+
+# The revision is needed for the bundle name and creating an OSX application bundle.
+ifdef REVISION
+REV := $(REVISION)
+else
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+endif
+endif
+# Make sure we have something in REV
+ifeq ($(REV),)
+REV := norev000
+endif
+
+ifndef BUNDLE_NAME
+BUNDLE_NAME = OTTD-$(OS)-custom-$(REV)
+endif
+
+# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
+ifdef OSXAPP
+DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
+LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
+TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+else
+DATA_DIR = $(BUNDLE_DIR)/data
+LANG_DIR = $(BUNDLE_DIR)/lang
+TTD_DIR  = $(BUNDLE_DIR)
+endif
+
+bundle: all
+	@echo '[BUNDLE] Constructing bundle'
+	$(Q)rm -rf   "${BUNDLE_DIR}"
+	$(Q)mkdir -p "${BUNDLE_DIR}"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
+	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
+	$(Q)mkdir -p "$(TTD_DIR)"
+	$(Q)mkdir -p "$(DATA_DIR)"
+	$(Q)mkdir -p "$(LANG_DIR)"
+ifdef OSXAPP
+	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
+	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
+	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "${BUNDLE_DIR}/$(OSXAPP)" "$(REV)"
+	$(Q)cp    "$(ROOT_DIR)/docs/OSX_install_instructions.txt"      "$(BUNDLE_DIR)/docs/"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
+endif
+	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.64.png" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.xpm" "$(BUNDLE_DIR)/media/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BUNDLE_DIR)/media/"
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
+endif
+ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/null`"; then echo 1; fi), 1)
+	$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
+endif
+ifeq ($(TTD), openttd.exe)
+	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING"
+endif
+
+### Packing the current bundle into several compressed file formats ###
+#
+# Zips & dmgs do not contain a root folder, i.e. they have files in the root of the zip/dmg.
+# gzip, bzip2 and lha archives have a root folder, with the same name as the bundle.
+#
+# One can supply a custom name by adding BUNDLE_NAME:=<name> to the make command.
+#
+bundle_zip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).zip'
+	$(Q)mkdir -p "$(BUNDLES_DIR)"
+	$(Q)cd "$(BUNDLE_DIR)" && zip -r $(shell if test -z "$(VERBOSE)"; then echo '-q'; fi) "$(BUNDLES_DIR)/$(BUNDLE_NAME).zip" .
+
+bundle_gzip: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.gz'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.gzip/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.gzip" && tar -zc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.gz" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.gzip"
+
+bundle_bzip2: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).tar.bz2'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.bzip2/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.bzip2" && tar -jc$(shell if test -n "$(VERBOSE)"; then echo 'v'; fi)f "$(BUNDLES_DIR)/$(BUNDLE_NAME).tar.bz2" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.bzip2"
+
+bundle_lha: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).lha'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)"
+	$(Q)cp -R    "$(BUNDLE_DIR)/"* "$(BUNDLES_DIR)/.lha/$(BUNDLE_NAME)/"
+	$(Q)cd "$(BUNDLES_DIR)/.lha" && lha ao6 "$(BUNDLES_DIR)/$(BUNDLE_NAME).lha" "$(BUNDLE_NAME)"
+	$(Q)rm -rf   "$(BUNDLES_DIR)/.lha"
+
+bundle_dmg: bundle
+	@echo '[BUNDLE] Creating $(BUNDLE_NAME).dmg'
+	$(Q)mkdir -p "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)cp -R "$(BUNDLE_DIR)/" "$(BUNDLES_DIR)/OpenTTD $(REV)"
+	$(Q)hdiutil create -ov -format UDZO -srcfolder "$(BUNDLES_DIR)/OpenTTD $(REV)" "$(BUNDLES_DIR)/$(BUNDLE_NAME).dmg"
+	$(Q)rm -fr "$(BUNDLES_DIR)/OpenTTD $(REV)"
+
+ifdef OSXAPP
+install:
+	@echo '[INSTALL] Cannot install the OSX Application Bundle'
+else
+install: bundle
+	@echo '[INSTALL] Installing OpenTTD'
+	$(Q)install -d "$(INSTALL_BINARY_DIR)"
+	$(Q)install -d "$(INSTALL_ICON_DIR)"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DATA_DIR)/docs"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/media/"* "$(INSTALL_ICON_DIR)"
+	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
+endif # OSXAPP
--- a/Makefile.lang.in
+++ b/Makefile.lang.in
@@ -1,3 +1,5 @@
+# Auto-generated file -- DO NOT EDIT
+
 STRGEN       = !!STRGEN!!
 ENDIAN_CHECK = !!ENDIAN_CHECK!!
 SRC_DIR      = !!SRC_DIR!!
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -1,28 +0,0 @@
-#
-# Makefile for creating bundles of MSVC's binaries in the same way as we make
-# the zip bundles for ALL other OSes.
-#
-# Usage: make -f Makefile.msvc PLATFORM=[Win32|x64] BUNDLE_NAME=openttd-<version>-win[32|64]
-#   or   make -f Makefile.msvc PLATFORM=[Win32|x64] BUNDLE_NAME=OTTD-win[32|64]-nightly-<revision>
-#
-
-# Check if we want to show what we are doing
-ifdef VERBOSE
-	Q =
-else
-	Q = @
-endif
-
-AWK = "awk"
-ROOT_DIR := $(shell pwd)
-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/")
-
-all:
-	$(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD)
-
-include Makefile.bundle.in
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -1,3 +1,5 @@
+# Auto-generated file -- DO NOT EDIT
+
 CC_HOST      = !!CC_HOST!!
 CXX_HOST     = !!CXX_HOST!!
 CC_BUILD     = !!CC_BUILD!!
@@ -9,7 +11,6 @@ CFLAGS       = !!CFLAGS!!
 CFLAGS_BUILD = !!CFLAGS_BUILD!!
 LIBS         = !!LIBS!!
 LDFLAGS      = !!LDFLAGS!!
-ROOT_DIR     = !!ROOT_DIR!!
 BIN_DIR      = !!BIN_DIR!!
 LANG_DIR     = !!LANG_DIR!!
 SRC_OBJS_DIR = !!SRC_OBJS_DIR!!
@@ -88,26 +89,38 @@ $(LANG_OBJS_DIR)/$(STRGEN):
 $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STRGEN)
 	$(MAKE) -C $(LANG_OBJS_DIR) table/strings.h

-# Always run version detection, so we always have an accurate modified
-# flag
-VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
-MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3)
-
+# Make the revision number
 ifdef REVISION
-# Use specified revision (which should be of the form "r000").
 REV := $(REVISION)
 REV_NR := $(shell echo $(REVISION) | sed "s/[^0-9]//g")
 else
-# Use autodetected revisions
-REV      := $(shell echo "$(VERSIONS)" | cut -f 1)
-REV_NR   := $(shell echo "$(VERSIONS)" | cut -f 2)
+# Are we a SVN dir?
+ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1)
+# Find if the local source if modified
+REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' )
+# Find the revision like: rXXXX-branch
+REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branch/ { split($$2, a, "/"); BRANCH="-"a[5] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
+REV_NR := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^Last Changed Rev:/ { print $$4 }')
+else
+# Are we a git dir?
+ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1)
+# Find the revision like: gXXXXM-branch
+REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(shell if cd "$(SRC_DIR)/.." && git diff-index HEAD src | read dummy; then echo M; fi)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//')
+REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" )
+else
+# Are we a hg (Mercurial) dir?
+ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1)
+# Find the revision like: hXXXXM-branch
+REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -c19-26; fi)$(shell if hg status $(SRC_DIR) | grep -v '^?' | read dummy; then echo M; fi)$(shell hg branch | sed 's/^/-/;s/^-default$$//')
+REV_NR := $(shell LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" $(SRC_DIR) | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" )
+endif
+endif
+endif
 endif

-# Make sure we have something in REV and REV_NR
+# Make sure we have something in REV
 ifeq ($(REV),)
 REV := norev000
-endif
-ifeq ($(REV_NR),)
 REV_NR := 0
 endif

@@ -119,7 +132,7 @@ RES := $(shell if [ "`cat $(CONFIG_CACHE_ENDIAN) 2>/dev/null`" != "$(ENDIAN_FORC
 # If there is a change in the source-file-list, make sure we recheck the deps
 RES := $(shell if [ "`cat $(CONFIG_CACHE_SOURCE) 2>/dev/null`" != "$(SRCS)" ]; then echo "$(SRCS)" > $(CONFIG_CACHE_SOURCE); fi )
 # If there is a change in the revision, make sure we recompile rev.cpp
-RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV) $(MODIFIED)" ]; then echo "$(REV) $(MODIFIED)" > $(CONFIG_CACHE_VERSION); fi )
+RES := $(shell if [ "`cat $(CONFIG_CACHE_VERSION) 2>/dev/null`" != "$(REV)" ]; then echo "$(REV)" > $(CONFIG_CACHE_VERSION); fi )

 ifndef MAKEDEPEND
 # The slow, but always correct, dep-check
@@ -274,7 +287,7 @@ $(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#@@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
--- a/bin/data/generictrams_v0.4.grf
+++ b/bin/data/generictrams_v0.4.grf
--- a/bin/scenario/Greenistan.scn
+++ b/bin/scenario/Greenistan.scn
--- a/bin/scenario/Polopolis.scn
+++ b/bin/scenario/Polopolis.scn
--- a/bin/scenario/Skadi
+++ b/bin/scenario/Skadi
--- a/bin/scenario/Terra
+++ b/bin/scenario/Terra
--- a/bin/scenario/Wales
+++ b/bin/scenario/Wales
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,69 +1,3 @@
-0.6.3 (2008-10-01)
------------------------------------------------------------------------
- Fix: NewGRF VarAction 2 variable 43 for industries saw MP_VOID tiles as land tiles and was inefficient (r14417, r14416, r14415)
- Fix: Possible buffer overrun/wrong parameter type passed to printf (r14414, r14397)
- Fix: Generation seed set using -G was always overwritten by -g (r14408)
- Fix: Do not allow extending signals by dragging in any direction other than the track direction [FS#2202] (r14013)
-
-
-0.6.3-RC1 (2008-09-22)
------------------------------------------------------------------------
- Fix: Invalid v->u.air.targetairport could cause crashes at several places [FS#2300] (r14383, r14344, r14343)
- Fix: Moving the first vehicle of a train elsewhere might require a new unitnumber for the remaining chain which might not be available (r14384)
- Fix: Trams jumping when reversing on a single trambit (like caused during road construction reworks) or when (manually) reversing in a corner [FS#1852] (r14371)
- Fix: Multiheaded parts in free wagon chains weren't connected (could cause desyncs) (r14366, r14362)
- Fix: [Win32] Some keypress combinations could be handled twice [FS#2206] (r14363)
- Fix: The ownership of roadtiles was not properly set for very old savegames (including TTD's) making it impossible to remove some pieces of road [FS#2311] (r14359)
- Fix: Desync due to randomly ordered vehicle hash by flooding and road vehicle overtake/following (r14356, r14258)
- Fix: Signs were not updated on company bankrupcy/sell, and thus could have the colour of invalid player (r14348)
- Fix: Delete the RenameSignWindow when 'its' sign is deleted (r14345)
- Fix: Signs from old savegames were lost (causing little memory leaks) (r14340)
- Fix: When a company was renamed and then manager was renamed before building anything, company name changed (r14328)
- Fix: When you rename a town before building something and build something near that town your company would be called "<old townname> Transport" [FS#2251] (r14327)
- Fix: Free any blocks that a helicopter may have on an oilrig when the helicopter gets forcefully removed (bankruptcy). For other airports this isn't needed as they can't be used by multiple companies [FS#2241] (r14324)
- Fix: Possible assert when renaming removed waypoint (r14322)
- Fix: Properly delete orders so the pool doesn't fill up (r14319)
- Fix: Do not allow building road over level crossings and drive-through road stops in the wrong direction; do not allow adding roadtypes to non-drive through road stops; pay for all added road bits [FS#2268] (r14316, r14315, r14314, r14308)
- Fix: Aircraft frozen above oil rig when the next order is invalid [FS#2244] (r14309)
- Fix: [YAPF] Only reserve road slots for multistop when they are really reachable [FS#2294] (r14305)
- Fix: One could be trying to get the station name of a station that is outside of the pool (r14297)
- Fix: Default for sound effects and music volume should be in the valid range for that setting [FS#2286] (r14289)
- Fix: Make small UFO aware of articulated RVs so they crash the complete vehicle instead of a small part of it (r14270)
- Fix: Desyncs after deleting a waypoint because of explicit destructor call instead of using operator delete (r14265)
- Fix: Merge keycode for "normal" 0-9 keys and keypad 0-9 keys so people do not get confused that the keypad does not work as expected [FS#2277] (r14260)
- Fix: Clicking on the smallmap didn't break the "follow vehicle in main viewport" [FS#2269] (r14243)
- Fix: The engine-purchase-list-sorter doubled running-cost and halfed capacity of double-headed engines [FS#2267] (r14239)
- Fix: Feeder share was computed wrong when splitting cargo packet (r14234)
- Fix: Signs (town name, station name, ...) could be too long for 8bit width in pixels (r14221)
- Fix: 10 days != 6*2.5 days, effectively causing the payment graph to show the wrong data (r14219)
- Fix: When determining length of a string with limited size, first check if we are not out of bounds already (r14204)
- Fix: Properly update the current timetable's travel/wait times instead of only doing it for one vehicle in the shared order chain and only when some bit has not been set [FS#2236] (r14192)
- Fix: Sprite payload skipping would not skip enough bytes in a very small subset of compressed sprites (r14191)
- Fix: After applying NewGRF settings, all rail and road types were available as the engine availability check was performed too early (r14182)
- Fix: Close all related vehicle lists when closing a station window (and not only the train list) (r14180)
- Fix: RemoveOrderFromAllVehicles() did not mark enough windows dirty (r14179)
- Fix: Incorrect cargo weights (r14144)
- Fix: GetSlopeZ() gets a virtual coordinate, not a tile (r14139)
- Fix: Close the 'manage vehicles' dropdown once the number of vehicles in the list reaches 0 [FS#2249] (r14133)
- Fix: [strgen] Changing order of parameters {X:...} did not work for strings including some {StringY} (r14111)
- Fix: Desync due to bubbles in toyland (r14110)
- Fix: Make NewGRF action 0x06's changes persistent over the several loading stages [FS#1986] (r14102)
- Fix: Make the 'Transfer Credit' display aware of the entire consist, not only the first vehicle (r14098)
- Fix: Do not flood a NewGRF industry when it implicitly tells that it wants to be build on water (land shape flags bit 5) [FS#2230] (r14093)
- Fix: The vehicle window of articulated road vehicles would show the clone/refit button when the vehicle was not completely stopped in the depot (r14090)
- Fix: Flawed parsing of words (as in 2 bytes) in GRF strings due to sign extension [FS#2228] (r14087)
- Fix: Division by 0 in NewAI [FS#2226] (r14062)
- Fix: NewGRF callback 23 did not use the NewGRF compatible text stack [FS#2224] (r14058)
- Fix: NewGRF text stack's "push word" didn't move the data around properly (r14057)
- Fix: Long strings in the edit box would cause OpenTTD to stop drawing the string. This is especially noticable with low resolutions and the chat input box (r14054)
- Fix: [OSX] changed the condition for selecting 8 or 32 bpp blitter by default. Now we will pick 32 bpp if no 8 bpp fullscreen resolutions are available on the main display (the one with the dock) (r14032)
- Fix: Crash when the AI tries to find the depot of an airport that doesn't have a depot [FS#2190] (r13999)
- Fix: MSVC cannot handle changed files in the prebuild event, so make the version determination a separate subproject [FS#2004] (r13998)
- Fix: The dedicated console removed any character that was not a printable ASCII character instead. Now it allows UTF8 formated strings too [FS#2189] (r13992)
- Fix: Resetting construction stage counter reset more than it should (r13981)
- Fix: Wrong tooltip for the industry directory's list [FS#2178] (r13917)
-
-
 0.6.2 (2008-08-01)
 ------------------------------------------------------------------------
 - Fix: Custom vehicle names from TTD(Patch) games were lost (r13884)
--- a/config.lib
+++ b/config.lib
@@ -5,7 +5,7 @@ log() {
 }

 set_default() {
-	released_version="0.6.3"
+	released_version="0.6.2"

 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -28,15 +28,10 @@ set_default() {
 	prefix_dir="/usr/local"
 	binary_dir="games"
 	data_dir="share/games/openttd"
-	doc_dir="1"
 	icon_dir="share/pixmaps"
-	icon_theme_dir="1"
 	personal_dir="1"
 	shared_dir="1"
 	install_dir="/"
-	man_dir="1"
-	menu_dir="1"
-	menu_group="Game;"
 	enable_debug="0"
 	enable_desync_debug="0"
 	enable_profiling="0"
@@ -53,7 +48,6 @@ set_default() {
 	enable_cocoa_quickdraw="1"
 	with_osx_sysroot="1"
 	with_application_bundle="1"
-	with_menu_entry="1"
 	with_sdl="1"
 	with_cocoa="1"
 	with_zlib="1"
@@ -91,15 +85,10 @@ set_default() {
 		prefix_dir
 		binary_dir
 		data_dir
-		doc_dir
 		icon_dir
-		icon_theme_dir
-		man_dir
-		menu_dir
 		personal_dir
 		shared_dir
 		install_dir
-		menu_group
 		enable_debug
 		enable_desync_debug
 		enable_profiling
@@ -199,23 +188,9 @@ detect_params() {
 			--data-dir)                   prevp_p="data-dir";;
 			--data-dir=*)                 data_dir="$optarg";;

-			--doc-dir)                    prevp_p="doc-dir";;
-			--doc-dir=*)                  doc_dir="$optarg";;
-
 			--icon-dir)                   prevp_p="icon-dir";;
 			--icon-dir=*)                 icon_dir="$optarg";;

-			--icon-theme-dir)             prevp_p="icon-theme-dir";;
-			--icon-theme-dir=*)           icon_theme_dir="$optarg";;
-			--without-icon-theme)         icon_theme_dir="";;
-
-			--menu-dir)                   prevp_p="menu_dir";;
-			--menu-dir=*)                 menu_dir="$optarg";;
-			--without-menu-entry)         menu_dir="";;
-
-			--man-dir)                    prevp_p="man_dir";;
-			--man-dir=*)                  man_dir="$optarg";;
-
 			--personal-dir)               prevp_p="personal-dir";;
 			--personal-dir=*)             personal_dir="$optarg";;
 			--without-personal-dir)       personal_dir="";;
@@ -229,11 +204,6 @@ detect_params() {



-			--menu-group)                 prevp_p="menu_group";;
-			--menu-group=*)               menu_group="$optarg";;
-
-
-
 			--enable-debug)               enable_debug="1";;
 			--enable-debug=*)             enable_debug="$optarg";;
 			--enable-desync-debug)        enable_desync_debug="1";;
@@ -422,9 +392,9 @@ check_params() {
 		exit 1
 	fi
 	# OS only allows DETECT, UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
-	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then
+	if [ -z "`echo $os | egrep '^(DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP)$'`" ]; then
 		echo "configure: error: invalid option --os=$os"
-		echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|NETBSD|HPUX|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]"
+		echo " Available options are: --os=[DETECT|UNIX|OSX|FREEBSD|OPENBSD|MORPHOS|BEOS|SUNOS|CYGWIN|MINGW|OS2|WINCE|PSP]"
 		exit 1
 	fi
 	# cpu_type can be either 32 or 64
@@ -766,7 +736,7 @@ check_params() {
 			# First, are we a real OSX system, else we can't detect it
 			native=`LC_ALL=C uname | tr '[A-Z]' '[a-z]' | grep darwin`
 			# If $host doesn't match $build , we are cross-compiling
-			if [ -n "$native" ] && [ "$build" = "$host" ]; then
+			if [ -n "$native" ] && [ "$build" == "$host" ]; then
 				$cxx_build $SRC_DIR/os/macosx/G5_detector.cpp -o G5_detector
 				res=`./G5_detector`
 				rm -f G5_detector
@@ -839,22 +809,6 @@ check_params() {
 		fi
 	fi

-	if [ "$doc_dir" = "1" ]; then
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
-			doc_dir="share/doc/openttd"
-		else
-			doc_dir="$data_dir/docs"
-		fi
-	fi
-
-	if [ "$icon_theme_dir" = "1" ]; then
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
-			icon_theme_dir="share/icons/hicolor"
-		else
-			icon_theme_dir=""
-		fi
-	fi
-
 	if [ "$personal_dir" = "1" ]; then
 		if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then
 			personal_dir="OpenTTD"
@@ -874,24 +828,6 @@ check_params() {
 		fi
 	fi

-	if [ "$man_dir" = "1" ]; then
-		# add manpage on UNIX systems
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then
-			man_dir="share/man/man6"
-		else
-			man_dir=""
-		fi
-	fi
-
-	if [ "$menu_dir" = "1" ]; then
-		# add a freedesktop menu item only for some UNIX systems
-		if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then
-			menu_dir="share/applications"
-		else
-			menu_dir=""
-		fi
-	fi
-
 	# "set_universal_binary_flags" needs to be before "detect_iconv"
 	set_universal_binary_flags
 	detect_iconv
@@ -916,27 +852,6 @@ check_params() {
 	else
 		log 1 "installation directory... none"
 	fi
-
-	if [ -n "$icon_theme_dir" ]
-	then
-		log 1 "icon theme directory... $icon_theme_dir"
-	else
-		log 1 "icon theme directory... none"
-	fi
-
-	if [ -n "$man_dir" ]
-	then
-		log 1 "manual page directory... $man_dir"
-	else
-		log 1 "manual page directory... none"
-	fi
-
-	if [ -n "$menu_dir" ]
-	then
-		log 1 "menu item directory... $menu_dir"
-	else
-		log 1 "menu item directory... none"
-	fi
 }

 make_cflags_and_ldflags() {
@@ -968,7 +883,7 @@ make_cflags_and_ldflags() {
 	else
 		OBJS_SUBDIR="debug"

-		# Each debug level reduces the optimization by a bit
+		# Each debug level reduces the optimalization by a bit
 		if [ $enable_debug -ge 1 ]; then
 			CFLAGS="$CFLAGS -g -D_DEBUG"
 			if [ "$os" = "PSP" ]; then
@@ -1019,20 +934,10 @@ make_cflags_and_ldflags() {
 			# 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"
-			# 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
@@ -1072,6 +977,7 @@ make_cflags_and_ldflags() {

 	if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
 		LIBS="$LIBS -lpthread"
+		LIBS="$LIBS -lrt"
 	fi

 	if [ "$os" != "CYGWIN" ] && [ "$os" != "MINGW" ] && [ "$os" != "WINCE" ]; then
@@ -1113,7 +1019,7 @@ make_cflags_and_ldflags() {
 	fi

 	# Most targets act like UNIX, just with some additions
-	if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
+	if [ "$os" = "BEOS" ] || [ "$os" = "OSX" ] || [ "$os" = "MORPHOS" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OS2" ]; then
 		CFLAGS="$CFLAGS -DUNIX"
 	fi
 	# And others like Windows
@@ -1636,7 +1542,7 @@ detect_awk() {

 detect_os() {
 	if [ "$os" = "DETECT" ]; then
-		# Detect UNIX, OSX, FREEBSD, OPENBSD, NETBSD, HPUX, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP
+		# Detect UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP

 		# Try first via dumpmachine, then via uname
 		os=`echo "$host" | tr '[A-Z]' '[a-z]' | $awk '
@@ -1644,8 +1550,6 @@ detect_os() {
 					/darwin/       { print "OSX";     exit}
 					/freebsd/      { print "FREEBSD"; exit}
 					/openbsd/      { print "OPENBSD"; exit}
-					/netbsd/       { print "NETBSD";  exit}
-					/hp-ux/        { print "HPUX";    exit}
 					/morphos/      { print "MORPHOS"; exit}
 					/beos/         { print "BEOS";    exit}
 					/sunos/        { print "SUNOS";   exit}
@@ -1663,8 +1567,6 @@ detect_os() {
 					/darwin/       { print "OSX";     exit}
 					/freebsd/      { print "FREEBSD"; exit}
 					/openbsd/      { print "OPENBSD"; exit}
-					/netbsd/       { print "NETBSD";  exit}
-					/hp-ux/        { print "HPUX";    exit}
 					/morphos/      { print "MORPHOS"; exit}
 					/beos/         { print "BEOS";    exit}
 					/sunos/        { print "SUNOS";   exit}
@@ -1677,7 +1579,7 @@ detect_os() {
 		if [ -z "$os" ]; then
 			log 1 "detecting OS... none detected"
 			log 1 "I couldn't detect your OS. Please use --os=OS to force one"
-			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, NETBSD, MORPHOS, HPUX, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP"
+			log 1 "Allowed values are: UNIX, OSX, FREEBSD, OPENBSD, MORPHOS, BEOS, SUNOS, CYGWIN, MINGW, OS2, WINCE, and PSP"
 			exit 1
 		fi

@@ -2291,10 +2193,7 @@ make_sed() {
 		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;
@@ -2311,7 +2210,6 @@ make_sed() {
 		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;
@@ -2325,45 +2223,6 @@ make_sed() {
 		s#!!GCC295!!#$gcc295#g;
 		s#!!DISTCC!!#$distcc#g;
 	"
-
-	if [ "$icon_theme_dir" != "" ]; then
-		SRC_REPLACE="$SRC_REPLACE
-			s#!!ICON_THEME_DIR!!#$prefix_dir/$icon_theme_dir#g;
-		"
-	else
-		SRC_REPLACE="$SRC_REPLACE
-			s#!!ICON_THEME_DIR!!##g;
-		"
-	fi
-
-	if [ "$man_dir" != "" ]; then
-		SRC_REPLACE="$SRC_REPLACE
-			s#!!MAN_DIR!!#$prefix_dir/$man_dir#g;
-		"
-	else
-		SRC_REPLACE="$SRC_REPLACE
-			s#!!MAN_DIR!!##g;
-		"
-	fi
-
-	if [ "$menu_dir" != "" ]; then
-		SRC_REPLACE="$SRC_REPLACE
-			s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g;
-		"
-	else
-		SRC_REPLACE="$SRC_REPLACE
-			s#!!MENU_DIR!!##g;
-		"
-	fi
-}
-
-generate_menu_item() {
-	MENU_REPLACE="
-		s#!!TTD!!#$TTD#g;
-		s#!!MENU_GROUP!!#$menu_group#g
-	"
-	echo "Generating menu item..."
-	< $ROOT_DIR/media/openttd.desktop.in sed "$MENU_REPLACE" > media/openttd.desktop
 }

 generate_main() {
@@ -2373,22 +2232,13 @@ generate_main() {

 	# Create the main Makefile
 	echo "Generating Makefile..."
-	echo "# Auto-generated file from 'Makefile.in' -- DO NOT EDIT" > Makefile
-	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" >> Makefile
-	cp $ROOT_DIR/Makefile.bundle.in Makefile.bundle
+	< $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile
 	echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am
 	echo >> Makefile.am
 	# Make the copy of the source-list, so we don't trigger an unwanted recompile
 	cp $SOURCE_LIST config.cache.source.list
-	# Add the current directory, so we don't trigger an unwanted recompile
-	echo "`pwd`" > config.cache.pwd
 	# Make sure config.cache is OLDER then config.cache.source.list
 	touch config.cache
-	touch config.pwd
-
-	if [ "$menu_dir" != "" ]; then
-		generate_menu_item
-	fi
 }

 generate_lang() {
@@ -2400,8 +2250,7 @@ generate_lang() {
 	mkdir -p $LANG_OBJS_DIR

 	echo "Generating lang/Makefile..."
-	echo "# Auto-generated file from 'Makefile.lang.in' -- DO NOT EDIT" > $LANG_OBJS_DIR/Makefile
-	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" >> $LANG_OBJS_DIR/Makefile
+	< $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile
 	echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am
 	echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am
 }
@@ -2415,8 +2264,7 @@ generate_src_normal() {
 	mkdir -p $SRC_OBJS_DIR

 	echo "Generating $2/Makefile..."
-	echo "# Auto-generated file from 'Makefile.src.in' -- DO NOT EDIT" > $SRC_OBJS_DIR/Makefile
-	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" >> $SRC_OBJS_DIR/Makefile
+	< $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile
 	echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am
 	echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am
 }
@@ -2471,53 +2319,40 @@ showhelp() {
 	echo "  --strip=STRIP                  the strip to use [HOST-strip]"
 	echo "  --awk=AWK                      the awk to use in configure [awk]"
 	echo "  --lipo=LIPO                    the lipo to use (OSX ONLY) [HOST-lipo]"
-	echo "  --os=OS                        the OS we are compiling for [$os]"
-	echo "                                 DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/"
-	echo "                                 MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
-	echo "                                 WINCE/PSP"
+	echo "  --os=OS                        the OS we are compiling for [DETECT]"
+	echo "                                 DETECT/UNIX/OSX/FREEBSD/OPENBSD/MORPHOS/"
+	echo "                                 BEOS/SUNOS/CYGWIN/MINGW/OS2/WINCE/PSP"
 	echo "  --endian=ENDIAN                set the endian of the HOST (AUTO/LE/BE)"
 	echo "  --revision=rXXXX               overwrite the revision detection."
 	echo "                                 Use with care!"
 	echo ""
 	echo "Paths:"
 	echo "  --prefix-dir=dir               specifies the prefix for all installed"
-	echo "                                 files [$prefix_dir]"
+	echo "                                 files [/usr/local]"
 	echo "  --binary-dir=dir               location of the binary. Will be prefixed"
-	echo "                                 with the prefix-dir [$binary_dir]"
+	echo "                                 with the prefix-dir [games]"
 	echo "  --data-dir=dir                 location of data files (lang, data, gm)."
 	echo "                                 Will be prefixed with the prefix-dir"
-	echo "                                 [$data_dir]"
-	echo "  --doc-dir=dir                  location of the doc files"
-	echo "                                 Will be prefixed with the prefix-dir"
-	echo "                                 [$doc_dir]"
+	echo "                                 [share/games/openttd]"
 	echo "  --icon-dir=dir                 location of icons. Will be prefixed"
-	echo "                                 with the prefix-dir [$icon_dir]"
-	echo "  --icon-theme-dir=dir           location of icon theme."
-	echo "                                 Will be prefixed with the prefix-dir"
-	echo "                                 and postfixed with size-dirs [$icon_theme_dir]"
-	echo "  --man-dir=dir                  location of the manual page (UNIX only)"
-	echo "                                 Will be prefixed with the prefix-dir"
-	echo "                                 [$man_dir]"
-	echo "  --menu-dir=dir                 location of the menu item. (UNIX only, except OSX)"
-	echo "                                 Will be prefixed with the prefix-dir"
-	echo "                                 [$menu_dir]"
+	echo "                                 with the prefix-dir [share/pixmaps]"
 	echo "  --personal-dir=dir             location of the personal directory"
-	echo "                                 [$personal_dir]"
+	echo "                                 [os-dependent default]"
 	echo "  --shared-dir=dir               location of shared data files"
-	echo "                                 [$shared_dir]"
+	echo "                                 [os-dependent default]"
 	echo "  --install-dir=dir              specifies the root to install to."
-	echo "                                 Useful to install into jails [$install_dir]"
+	echo "                                 Useful to install into jails [/]"
 	echo ""
 	echo "Features and packages:"
 	echo "  --enable-debug[=LVL]           enable debug-mode (LVL=[0123], 0 is release)"
-	echo "  --enable-desync-debug=[LVL]    enable desync debug options (LVL=[012], 0 is none"
+	echo "  --enable_desync_debug=[LVL]    enable desync debug options (LVL=[012], 0 is none"
 	echo "  --enable-profiling             enables profiling"
 	echo "  --enable-dedicated             compile a dedicated server (without video)"
 	echo "  --enable-static                enable static compile (doesn't work for"
 	echo "                                 all HOSTs)"
 	echo "  --enable-translator            enable extra output for translators"
 	echo "  --enable-universal             enable universal builds (OSX ONLY)"
-	echo "  --enable-osx-g5                enables optimizations for G5 (OSX ONLY)"
+	echo "  --enable-osx-g5                enables optimalizations for G5 (OSX ONLY)"
 	echo "  --disable-cocoa-quartz         disable the quartz window mode driver for Cocoa (OSX ONLY)"
 	echo "  --disable-cocoa-quickdraw      disable the quickdraw window mode driver for Cocoa (OSX ONLY)"
 	echo "  --disable-unicode              disable unicode support to build win9x"
@@ -2529,8 +2364,6 @@ showhelp() {
 	echo "                                 (OSX ONLY)"
 	echo "  --without-application-bundle   disable generation of application bundle"
 	echo "                                 (OSX ONLY)"
-	echo "  --without-menu-entry           Don't generate a menu item (Freedesktop based only)"
-	echo "  --menu-group=group             Category in which the menu item will be placed (Freedesktop based only)"
 	echo "  --with-direct-music            enable direct music support (Win32 ONLY)"
 	echo "  --with-sort=sort               define a non-default location for sort"
 	echo "  --with-midi=midi               define which midi-player to use"
--- a/6
+++ b/6
@@ -17,7 +17,7 @@ ROOT_DIR="`dirname $0`"
 ROOT_DIR="`cd $ROOT_DIR && pwd`"

 PWD="`pwd`"
-PREFIX="$PWD/bin"
+PREFIX="`pwd`/bin"

 . $ROOT_DIR/config.lib

@@ -32,7 +32,7 @@ MEDIA_DIR="$ROOT_DIR/media"
 SOURCE_LIST="$ROOT_DIR/source.list"

 if [ "$1" = "--reconfig" ] || [ "$1" = "--reconfigure" ]; then
-	if [ ! -f "config.cache" ]; then
+	if ! [ -f "config.cache" ]; then
 		echo "can't reconfigure, because never configured before"
 		exit 1
 	fi
@@ -64,7 +64,7 @@ else
 	PIPE_SORT="$sort"
 fi

-if [ ! -f "$LANG_DIR/english.txt" ]; then
+if ! [ -f "$LANG_DIR/english.txt" ]; then
 	echo "Languages not found in $LANG_DIR. Can't continue without it."
 	echo "Please make sure the dir exists and contains at least english.txt"
 fi
--- a/findversion.sh
+++ b/findversion.sh
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Arguments given? Show help text.
-if [ "$#" != "0" ]; then
-	cat <<EOF
-Usage: ./findversion.sh
-Finds the current revision and if the code is modified.
-
-Output: <REV>\t<REV_NR>\t<MODIFIED>\t<CLEAN_REV>
-REV
-    a string describing what version of the code the current checkout is
-    based on. The exact format of this string depends on the version
-    control system in use, but it tries to identify the revision used as
-    close as possible (using the svn revision number or hg/git hash).
-    This also includes an indication of whether the checkout was
-    modified and which branch was checked out. This value is not
-    guaranteed to be sortable, but is mainly meant for identifying the
-    revision and user display.
-
-    If no revision identifier could be found, this is left empty.
-REV_NR
-    the revision number of the svn revision this checkout is based on.
-    This can be used to determine which functionality is present in this
-    checkout. For trunk svn checkouts and hg/git branches based upon it,
-    this number should be accurate. For svn branch checkouts, this
-    number is mostly meaningless, at least when comparing with the
-    REV_NR from other branches or trunk.
-
-    This number should be sortable. Within a given branch or trunk, a
-    higher number means a newer version. However, when using git or hg,
-    this number will not increase on new commits.
-
-    If no revision number could be found, this is left empty.
-MODIFIED
-    Whether (the src directory of) this checkout is modified or not. A
-    value of 0 means not modified, a value of 2 means it was modified.
-    Modification is determined in relation to the commit identified by
-    REV, so not in relation to the svn revision identified by REV_NR.
-
-    A value of 1 means that the modified status is unknown, because this
-    is not an svn/git/hg checkout for example.
-
-CLEAN_REV
-    the same as REV but without branch name
-
-By setting the AWK environment variable, a caller can determine which
-version of "awk" is used. If nothing is set, this script defaults to
-"awk".
-EOF
-exit 1;
-fi
-
-# Allow awk to be provided by the caller.
-if [ -z "$AWK" ]; then
-	AWK=awk
-fi
-
-# Find out some dirs
-cd `dirname "$0"`
-ROOT_DIR=`pwd`
-SRC_DIR=src
-
-# Determine if we are using a modified version
-# Assume the dir is not modified
-MODIFIED="0"
-if [ -d "$ROOT_DIR/.svn" ]; then
-	# We are an svn checkout
-	if [ -n "`svnversion \"$SRC_DIR\" | grep 'M'`" ]; then
-		MODIFIED="2"
-	fi
-	# Find the revision like: rXXXXM-branch
-	BRANCH=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*branches/ { split($2, a, "/"); for(i in a) if (a[i]=="branches") { print a[i+1]; break } }'`
-	TAG=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*tags/ { split($2, a, "/"); for(i in a) if (a[i]=="tags") { print a[i+1]; break } }'`
-	REV_NR=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^Last Changed Rev:/ { print $4 }'`
-	if [ -n "$TAG" ]; then
-		REV=$TAG
-	else
-		REV="r$REV_NR"
-	fi
-elif [ -d "$ROOT_DIR/.git" ]; then
-	# We are a git checkout
-	if [ -n "`git diff-index HEAD \"$SRC_DIR\"`" ]; then
-		MODIFIED="2"
-	fi
-	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null | cut -c1-8`
-	REV="g$HASH"
-	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 | cut -c1-8`
-	REV="h$HASH"
-	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"
-	BRANCH=""
-	REV=""
-	REV_NR=""
-fi
-
-if [ "$MODIFIED" -eq "2" ]; then
-	REV="${REV}M"
-fi
-
-CLEAN_REV=${REV}
-
-if [ -n "$BRANCH" ]; then
-	REV="${REV}-$BRANCH"
-fi
-
-echo "$REV	$REV_NR	$MODIFIED	$CLEAN_REV"
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -11,13 +11,10 @@ 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.6.3
+Bugs for 0.6.2
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org

- 2176	Towns unconditionally flatten all land
- 2138	Unexpected cargo appears
- 2132	Station vehicle/service window closes even when pinned
 - 2129	Strings from message boxes could sometimes change (e.g. the screenshot filename)
 - 2085	Vehicle list of shared vehicles without orders not possible
 - 1944	Road vehicles not picking empty drivethrough platform
@@ -25,6 +22,7 @@ URL: http://bugs.openttd.org
 - 1890	Airplanes copy helipcopters goto heliport order
 - 1885	Almost all unserved industries die in big maps
 - 1858	Industry legend in small map overwrites buttons
+- 1852	Minor tram reversing glitches
 - 1802	Path with space in configure fails
 - 1793	Inconsistent travel time for fast trains
 - 1762	Strange Autoreplace behaviour
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -1,13 +0,0 @@
-# $Id$
-# http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.1.html
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Version=1.1
-Name=OpenTTD
-GenericName=A clone of Transport Tycoon Deluxe
-Comment=A business simulation game
-Icon=openttd
-Exec=!!TTD!!
-Terminal=false
-Categories=!!MENU_GROUP!!
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -15,7 +15,7 @@ You should copy the data files from the original TTD into the data directory
 	For in game music (optional), you should copy all files in the gm/
 	subdir of your ttd installation to /usr/share/games/openttd/gm.  You
 	should also install timidity and a soundfont (freepats is packaged in
-	Debian and works out of the box).
+	debian and works out of the box).

 	Don't forget to use -m extmidi if you want music, and if you have
 	problems, remember that not all audio devices support multiple
@@ -23,9 +23,12 @@ You should copy the data files from the original TTD into the data directory
 	mixing. My VIA AC97 device cannot do hardware mixing, for example.

 -Scenarios
-	There are no scenarios included in this release. Scenarios can be
-	downloaded separately from the OpenTTD website and all over the
-	internet. Place scenarios in your ~/.openttd/scenario directory to
-	use them.
+	There are a few scenarios included in this release. When you start
+	openttd it will look for scenarios in ~/.openttd/scenario, while the
+	premade scenarios are in /usr/share/games/openttd/data/scenario. You
+	have two options to use the scenarios.
+	* Navigate to /usr/share/games/openttd/data/scenario within openttd.
+	* Copy scenarios from /usr/share/games/openttd/data/scenario to
+	  ~/.openttd/scenario. We are looking into a better solution for this.

- -- Matthijs Kooijman <matthijs@stdin.nl>, Tue, 25 Jan 2004 14:11:01 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Tue, 25 Jan 2004 14:11:01 +0200
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,138 +1,146 @@
-openttd (0.6.3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Remko Bijker <rubidium@openttd.org>  Wed, 01 Oct 2008 18:48:05 +0200
-
-openttd (0.6.3~rc1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Remko Bijker <rubidium@openttd.org>  Mon, 22 Sep 2008 22:17:05 +0200
-
 openttd (0.6.2-1) unstable; urgency=low

  * New upstream release.
-    - Fixes remote crash vulnerability CVE-2008-3547. Closes: #493714

- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 08 Aug 2008 11:07:05 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 01 Aug 2008 21:25:00 +0200

-openttd (0.6.2~rc2-1) experimental; urgency=low
+openttd (0.6.2~RC2-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
  * New upstream release.

-  [ Jordi Mallach ]
-  * Fix typo in README.Debian (lintian).
-  * Remove dpatch build-dep and the empty debian/patches dir.
-  * Don't ignore possible "make distclean" errors.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 25 Jul 2008 22:00:00 +0200

- -- Jordi Mallach <jordi@debian.org>  Sat, 26 Jul 2008 01:35:30 +0200
+openttd (0.6.2~RC1-1) unstable; urgency=low

-openttd (0.6.2~rc1-1) experimental; urgency=low
-
-  [ Matthijs Kooijman ]
  * New upstream release.

- -- Jordi Mallach <jordi@debian.org>  Thu, 24 Jul 2008 16:09:57 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 16 Jul 2008 19:45:00 +0200

 openttd (0.6.1-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
  * New upstream release.
-  * Remove no_install_personal.dpatch, it is included upstream now.

- -- Jordi Mallach <jordi@debian.org>  Thu, 05 Jun 2008 00:47:36 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 01 Jun 2008 15:35:00 +0200

-openttd (0.6.0-2) unstable; urgency=low
+openttd (0.6.1~RC2-1) unstable; urgency=low

-  [ Jordi Mallach ]
-  * Rename XS-Vcs-* to the official Vcs-* fields.
+  * New upstream release.

-  [ Matthijs Kooijman ]
-  * Don't install anything into ~ during make install, this prevented
-    successful builds on some architectures. Fix imported from upstream.
-  * Put the homepage in it's own Homepage field instead of in the description.
-  * Bump Standards-Version to 3.7.3
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 21 May 2008 00:05:00 +0200

- -- Jordi Mallach <jordi@debian.org>  Thu, 03 Apr 2008 00:07:10 +0200
+openttd (0.6.1~RC1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat, 26 Apr 2008 22:55:00 +0200

 openttd (0.6.0-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
-  * New upstream release:
-    - Adds note about font-configuration for non-latin languages.
-      Closes: #462604
-  * Add .desktop file, provided by Andrea Colangelo.
-    Closes: #460073
-  * Add Finnish Debconf translation, provided by Esko Arajärvi.
-    Closes: #456956
+  * New upstream release.

-  [ Jordi Mallach ]
-  * Fixes and improvements for the .desktop file according to the spec.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 01 Apr 2008 13:33:37 +0100

- -- Jordi Mallach <jordi@debian.org>  Wed, 02 Apr 2008 14:04:40 +0200
+openttd (0.6.0~RC1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 26 Mar 2008 15:51:40 +0100
+
+openttd (0.6.0~beta5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 04 Mar 2008 18:06:31 +0100
+
+openttd (0.6.0~beta4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 18 Feb 2008 20:09:29 +0100
+
+openttd (0.6.0~beta3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 16 Jan 2008 21:40:07 +0100
+
+openttd (0.6.0~beta2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 09 Dec 2007 22:05:05 +0100
+
+openttd (0.6.0~beta1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sun, 18 Nov 2007 16:05:05 +0100

 openttd (0.5.3-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
-  * New upstream release
+  * New upstream release.

- -- Jordi Mallach <jordi@debian.org>  Tue, 18 Sep 2007 12:05:28 +0200
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat, 15 Sep 2007 13:30:00 +0100
+
+openttd (0.5.3~rc3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 30 Aug 2007 23:30:00 +0100
+
+openttd (0.5.3~rc2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat,  7 Jul 2007 20:05:00 +0100
+
+openttd (0.5.3~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 28 Jun 2007 18:00:00 +0100

 openttd (0.5.2-1) unstable; urgency=low

-  [ Jordi Mallach ]
  * New upstream release.
-  * Debconf translation updates:
-    - Catalan.

-  [ Christian Perrier ]
-  * Debconf templates and debian/control reviewed by the debian-l10n-
-    english team as part of the Smith review project.
-    Closes: #422183, #419096.
-  * Debconf translation updates:
-    - Swedish. Closes: #422780
-    - Basque. Closes: #422786
-    - Czech. Closes: #422809
-    - Galician. Closes: #422831
-    - German. Closes: #422908
-    - Tamil. Closes: #423079
-    - Russian. Closes: #423224
-    - Portuguese. Closes: #423413
-    - French. Closes: #424436
-    - Brazilian Portuguese. Closes: #425585
-    - Dutch. Closes: #425707
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 29 May 2007 20:00:00 +0100

- -- Jordi Mallach <jordi@debian.org>  Sat, 02 Jun 2007 06:24:34 +0200
+openttd (0.5.2~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 16 May 2007 23:35:39 +0100

 openttd (0.5.1-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
-  * New upstream release
-  * Add German and Swedish translations (Closes: #420258, #419097)
-  * Remove bogus fuzzy mark from the Catalan translation
+  * New upstream release.

-  [ Jordi Mallach ]
-  * debian/control: add XS-Vcs-Svn and XS-Vcs-Browser fields.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 20 Apr 2007 21:45:32 +0100

- -- Jordi Mallach <jordi@debian.org>  Mon, 23 Apr 2007 21:03:06 +0200
+openttd (0.5.1~rc3-1) unstable; urgency=low

-openttd (0.5.0-2) unstable; urgency=low
+  * New upstream release.

-  * Upload to Debian.
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 17 Apr 2007 22:00:46 +0100

- -- Jordi Mallach <jordi@debian.org>  Sun, 11 Mar 2007 14:12:37 +0100
+openttd (0.5.1~rc2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 23 Mar 2007 23:45:46 +0100
+
+openttd (0.5.1~rc1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 20 Mar 2007 22:03:46 +0100

 openttd (0.5.0-1) unstable; urgency=low

-  [ Matthijs Kooijman ]
  * New upstream release

-  [ Jordi Mallach ]
-  * Depend on ${misc:Depends}, not debconf directly.
-
- -- Jordi Mallach <jordi@debian.org>  Thu,  8 Mar 2007 15:34:54 +0100
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 26 Feb 2007 21:07:05 +0100

 openttd (0.5.0~rc5-1) unstable; urgency=low

@@ -235,13 +243,13 @@ openttd (0.4.0.1-1) unstable; urgency=low

  * New upstream release

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 23 May 2005 13:04:24 +0200
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 23 May 2005 13:04:24 +0200

 openttd (0.4.0-1) unstable; urgency=low

  * New upstream release

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 16 May 2005 00:16:17 +0200
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 16 May 2005 00:16:17 +0200

 openttd (0.3.6-1) unstable; urgency=low

@@ -249,18 +257,18 @@ openttd (0.3.6-1) unstable; urgency=low
  * Modifed Makefile to install xpm icon and scenarios in /usr/share/games/openttd/
  * Added openttd.32.xpm, openttd.64.xpm was too big

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 25 Jan 2005 19:21:08 +0100
+ -- root <root@katherina.student.utwente.nl>  Tue, 25 Jan 2005 19:21:08 +0100

 openttd (0.3.5-2) unstable; urgency=low

  * Fixed some lintian warnings.
  * Added openttd.64.xpm (icon for menu).

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Mon, 27 Dec 2004 01:51:36 +0100
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Mon, 27 Dec 2004 01:51:36 +0100

 openttd (0.3.5-1) unstable; urgency=low

  * Initial Release.

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100
+ -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl>  Fri, 24 Dec 2004 02:58:47 +0100

--- a/os/debian/config
+++ b/os/debian/config
@@ -6,16 +6,16 @@
 FILES="trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf sample.cat"
 DATADIR=/usr/share/games/openttd/data

-MISSING="No"
+MISSING="No";
 for FILE in $FILES; do
 	# Check if all the files needed are here.
 	if [ ! -e $DATADIR/$FILE ]; then
-		MISSING="Yes"
-		break
-	fi;
-done
+		MISSING="Yes";
+		break;
+  fi;
+done;

 if [ $MISSING = "Yes" ]; then
 	db_input high openttd/datafiles || true
 	db_go
-fi
+fi;
--- a/os/debian/control
+++ b/os/debian/control
@@ -1,21 +1,20 @@
 Source: openttd
 Section: contrib/games
 Priority: optional
-Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
+Maintainer: Matthijs Kooijman <m.kooijman@student.utwente.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
-Standards-Version: 3.7.3
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
-Homepage: http://www.openttd.org/
+Build-Depends: debhelper (>= 4.0.0), dpatch, libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev
+Standards-Version: 3.7.2

 Package: openttd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, debconf
 Suggests: timidity, freepats
 Description: reimplementation of Transport Tycoon Deluxe with enhancements
- OpenTTD is a reimplementation of the Microprose game "Transport
- Tycoon Deluxe" with lots of new features and enhancements. The data
- files of the original Transport Tycoon Deluxe for Windows are
- mandatory to play the game. They must be manually copied to the game
- data directory (see README.Debian for details).
+ A reimplementation of the Microprose game "Transport Tycoon Deluxe" with lots
+ of new features and enhancements.
+ You require the data files of the original Transport Tycoon Deluxe
+ for Windows to play the game. You have to MANUALLY copy them to the
+ game data directory! (see README.Debian for details)
+ .
+ Homepage: http://www.openttd.org/
--- a/os/debian/patches/00list
+++ b/os/debian/patches/00list
--- a/os/debian/po/ca.po
+++ b/os/debian/po/ca.po
@@ -1,40 +1,35 @@
 # Catalan translation of openttd's Debconf templates.
-# Copyright © 2007 Software in the Public Interest, Inc.
+# Copyright <EFBFBD> 2007 Software in the Public Interest
 # This file is distributed under the same license as the openttd package.
 # Jordi Mallach <jordi@debian.org>, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openttd 0.5.2-1\n"
+"Project-Id-Version: openttd 0.5.0-1\n"
 "Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-06-01 00:45+0200\n"
+"POT-Creation-Date: 2007-02-01 12:25+0100\n"
+"PO-Revision-Date: 2007-02-01 12:16+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: error
+#. Type: note
 #. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Es necessiten els fitxers de dades"
+#: ../templates:1001
+msgid "You need to install data files"
+msgstr "Heu d'instal<61>lar els fitxers de dades"

-#. Type: error
+#. Type: note
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
+"OpenTTD needs the data files from the original TTD game to run. You should "
+"install these data files before you can play the game. See README.Debian for "
+"more details on which files need to be copied where."
 msgstr ""
-"Per a funcionar, OpenTTD necessita els fitxers de dades del joc "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr "Vegeu el fitxer /usr/share/doc/openttd/README.Debian per a obtenir-ne més detalls sobre els fitxers necessaris i la seua ubicació."
+"OpenTTD necessita els fitxers de dades del joc TTD original per a funcionar. "
+"Haureu d'instal<61>lar aquests fitxers de dades abans de poder jugar al joc. "
+"Llegiu el document README.Debian per a obtindre m<>s detalls sobre quins "
+"fitxers s'han de copiar i a quina ubicaci<63>."
--- a/os/debian/po/cs.po
+++ b/os/debian/po/cs.po
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 10:52+0200\n"
-"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Vyžadovány datové soubory"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pro svůj běh vyžaduje OpenTTD datové soubory z původní hry Transport Tycoon "
-"Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Podrobnosti o vyžadovaných souborech a jejich umístění naleznete v souboru /"
-"usr/share/doc/openttd/README.Debian."
--- a/os/debian/po/de.po
+++ b/os/debian/po/de.po
@@ -1,55 +0,0 @@
-# Translation of openttd debconf templates to German
-# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
-# This file is distributed under the same license as the openttd package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 21:21+0200\n"
-"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Ben<65>tigte Datendateien"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Zum Betrieb ben<65>tigt OpenTTD Datendateien aus dem Originalspiel Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Lesen Sie die Datei /usr/share/doc/openttd/README.Debian f<>r weitere Details "
-"<22>ber die ben<65>tigten Dateien und ihren Ort."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Sie m<>ssen Daten-Dateien installieren"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD ben<65>tigt zur Ausf<73>hrung Daten-Dateien aus dem Originalspiel "
-#~ "<22>Transport Tycoon Deluxe<78>. Sie sollten diese Daten-Dateien installieren, "
-#~ "bevor Sie das Spiel spielen k<>nnen. Lesen Sie README.Debian f<>r weitere "
-#~ "Details dar<61>ber, welche Dateien wohin kopiert werden m<>ssen."
--- a/os/debian/po/eu.po
+++ b/os/debian/po/eu.po
@@ -1,42 +0,0 @@
-# OpenTTD debconf template basque translation
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Piarres eobide <pi@beobide.net>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenTTD Debconf\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:55+0200\n"
-"Last-Translator: Piarres eobide <pi@beobide.net>\n"
-"Language-Team: Euskara <Librezale@librezale.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datu fitxategiak behar dira"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Funtziona dezan, OpenTTD-ek jatorrizko 'Transport Tycoon Deluxe' jokoaren "
-"datu fitxategiak behar ditu."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"/usr/share/doc/openttd/README.Debian fitxategia begiratu beharrezko "
-"fitategien eta bere kokapenari buruz xehetasun gehiago ikusteko."
--- a/os/debian/po/fi.po
+++ b/os/debian/po/fi.po
@@ -1,32 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd_0.5.3-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-19 04:33+0200\n"
-"PO-Revision-Date: 2007-12-18 20:01+0200\n"
-"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
-"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-Country: Finland\n"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "Data files needed"
-msgstr "Datatiedostoja puuttuu"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "For its operation, OpenTTD needs the data files from the original Transport Tycoon Deluxe game."
-msgstr "OpenTTD tarvitsee toimiakseen datatiedostoja alkuperäisestä Transport Tycoon Deluxe -pelistä."
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "See the /usr/share/doc/openttd/README.Debian file for more details about the needed files and their location."
-msgstr "Tiedostossa /usr/share/doc/openttd/README.Debian on (englanniksi) lisätietoja tarvittavista tiedostoista ja niiden sijainnista."
-
--- a/os/debian/po/fr.po
+++ b/os/debian/po/fr.po
@@ -1,42 +0,0 @@
-# debian-l10n-french translation of 0.5.1-1.
-# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Ivan Buresi <err747@free.fr>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:41+0200\n"
-"Last-Translator: Ivan Buresi <err747@free.fr>\n"
-"Language-Team: debian-l10n-french <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Fichiers de données indispensables"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pour fonctionner correctement, OpenTTD a besoin des fichiers de données du "
-"jeu « Transport Tycoon Deluxe » original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veuillez lire le fichier /usr/share/doc/openttd/README.Debian pour plus "
-"d'informations sur les fichiers requis et leur emplacement."
--- a/os/debian/po/gl.po
+++ b/os/debian/po/gl.po
@@ -1,41 +0,0 @@
-# Galician translation of openttd's debconf templates
-# This file is distributed under the same license as the openttd package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 13:12+0200\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Precísase de ficheiros de datos"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para o seu funcionamento, OpenTTD precisa dos ficheiros de datos do xogo "
-"Transport Tycoon Deluxe orixinal."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Consulte o ficheiro /usr/share/doc/openttd/README.Debian para máis "
-"información sobre os ficheiros necesarios e as súas ubicacións."
--- a/os/debian/po/nl.po
+++ b/os/debian/po/nl.po
@@ -1,43 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-16 19:25+0100\n"
-"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
-"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Dutch\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Databestanden zijn vereist"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Om te werken heeft OpenTTD de databestanden van het oorspronkelijkee "
-"'Transport Tycoon Deluxe'-spel nodig."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Meer informatie over de vereiste bestanden en hun locatie vindt u in /usr/"
-"share/doc/openttd/README.Debian . "
--- a/os/debian/po/pt.po
+++ b/os/debian/po/pt.po
@@ -1,42 +0,0 @@
-# Portuguese translation of openttd's debconf messages.
-# Copyright (C) 2007
-# This file is distributed under the same license as the openttd package.
-# Ricardo Silva <ardoric@gmail.com>, 2007
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-09 09:37+0100\n"
-"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "São necessários ficheiros de dados"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para esta operação o OpenTTD precisa dos ficheiros de dados do jogo original "
-"Transport Tycool Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o ficheiro /usr/share/doc/openttd/README.Debian para mais detalhes "
-"sobre os ficheiros que são necessários e a sua localização."
--- a/os/debian/po/pt_BR.po
+++ b/os/debian/po/pt_BR.po
@@ -1,43 +0,0 @@
-# openttd Brazilian Portuguese translation
-# Copyright (C) 2007, Eder L. Marques
-# This file is distributed under the same license as the openttd package.
-# Eder L. Marques <frolic@debian-ce.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:00-0300\n"
-"Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
-"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"pt_BR utf-8\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Arquivos de dados necessários"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para sua operação, o OpenTTD necessita dos arquivos de dados do jogo "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o arquivo /usr/share/doc/openttd/README.Debian para maiores detalhes "
-"sobre os arquivos necessários e suas localizações."
--- a/os/debian/po/ru.po
+++ b/os/debian/po/ru.po
@@ -1,45 +0,0 @@
-# translation of openttd_debconf_ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-10 21:45+0400\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Необходимы файлы данных"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Для работы OpenTTD требуются файлы данных от оригинальной игры Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"В файле /usr/share/doc/openttd/README.Debian приведена информация о том, "
-"какие файлы нужны и где они лежат."
--- a/os/debian/po/sv.po
+++ b/os/debian/po/sv.po
@@ -1,56 +0,0 @@
-# Swedish translation for openttd debconf template.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the openttd package.
-# Daniel Nylander <po@danielnylander.se>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:47+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datafiler behövs"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"För att fungera behöva OpenTTD datafilerna från det ursprungliga spelet "
-"Transport Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Se filen /usr/share/doc/openttd/README.Debian för mer information om de "
-"nödvändiga filera och var de finns någonstans."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Du behöver installera datafilerna"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD behöver datafilerna från det ursprungliga spelet Transport Tycoon "
-#~ "Deluxe för att kunna köras. Du måste installera dessa datafiler innan du "
-#~ "kan spela spelet. Se README.Debian för fler detaljer om vilka filer som "
-#~ "behöver kopieras."
--- a/os/debian/po/ta.po
+++ b/os/debian/po/ta.po
@@ -1,43 +0,0 @@
-# translation of openttd.po to TAMIL
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 15:04+0530\n"
-"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
-"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "தேவையான தரவு கோப்புகள்"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"இயங்குவதற்கு ஓபன் டிடிடி(OpenTTD) க்கு ட்ரான்ஸ்போர்ட் டைகூன் டீலக்ஸ் விளையாட்டிலிருந்து "
-"தரவு கோப்புகள் தேவை."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"தேவையான கோப்புகள் அவற்றின் இடம்  ஆகியவற்றை அறிய /usr/share/doc/openttd/README "
-"டெபியன் கோப்பை பார்க்கவும்."
--- a/os/debian/po/templates.pot
+++ b/os/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
+"POT-Creation-Date: 2007-02-01 12:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,24 +16,17 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. Type: error
+#. Type: note
 #. Description
-#: ../templates:2001
-msgid "Data files needed"
+#: ../templates:1001
+msgid "You need to install data files"
 msgstr ""

-#. Type: error
+#. Type: note
 #. Description
-#: ../templates:2001
+#: ../templates:1001
 msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
+"OpenTTD needs the data files from the original TTD game to run. You should "
+"install these data files before you can play the game. See README.Debian for "
+"more details on which files need to be copied where."
 msgstr ""
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -6,7 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1

-configure: configure-stamp
+include /usr/share/dpatch/dpatch.make
+
+configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
@@ -27,16 +29,13 @@ build-stamp:

 	touch build-stamp

-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp

 	# Add here commands to clean up after the build process.
-	# We check for Makefile presence, because clean is called at the
-	# start of the build process (before configure) where we don't
-	# have a Makefile yet.
-	[ ! -f Makefile ] || $(MAKE) distclean
+	-$(MAKE) clean

 	dh_clean

@@ -85,4 +84,4 @@ binary-arch: build install
 	dh_builddeb

 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure patch
--- a/os/debian/templates
+++ b/os/debian/templates
@@ -1,16 +1,6 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english@lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
 Template: openttd/datafiles
-Type: error
-_Description: Data files needed
- For its operation, OpenTTD needs the data files from the original
- Transport Tycoon Deluxe game.
- .
- See the /usr/share/doc/openttd/README.Debian file for more details
- about the needed files and their location.
+Type: note
+_Description: You need to install data files
+ OpenTTD needs the data files from the original TTD game to run. You should
+ install these data files before you can play the game. See README.Debian
+ for more details on which files need to be copied where.
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,7 +1,6 @@
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.6.3"  ; Define application version
-!define INSTALLERVERSION 53 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
-!include ${VERSION_INCLUDE}
+!define APPVERSION "0.6.2"  ; Define application version
+!define INSTALLERVERSION 51 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!

 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
@@ -19,20 +18,21 @@ SetCompressor LZMA
 ; Version Info
 Var AddWinPrePopulate
 VIProductVersion "${APPVERSIONINTERNAL}"
-VIAddVersionKey "ProductName" "OpenTTD Installer ${APPBITS} bits version ${EXTRA_VERSION}"
+VIAddVersionKey "ProductName" "OpenTTD Installer"
 VIAddVersionKey "Comments" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "CompanyName" "OpenTTD Developers"
 VIAddVersionKey "FileDescription" "Installs ${APPNAMEANDVERSION}"
 VIAddVersionKey "ProductVersion" "${APPVERSION}"
-VIAddVersionKey "InternalName" "InstOpenTTD-${APPARCH}"
-VIAddVersionKey "FileVersion" "${APPVERSION}-${APPARCH}"
+VIAddVersionKey "InternalName" "InstOpenTTD"
+VIAddVersionKey "FileVersion" "${APPVERSION}"
 VIAddVersionKey "LegalCopyright" " "
 ; Main Install settings
-Name "${APPNAMEANDVERSION} ${APPBITS} bits version ${EXTRA_VERSION}"
+Name "${APPNAMEANDVERSION}"

 ; NOTE: Keep trailing backslash!
+InstallDir "$PROGRAMFILES\OpenTTD\"
 InstallDirRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "Install Folder"
-OutFile "openttd-${APPVERSION}-${APPARCH}.exe"
+OutFile "openttd-${APPVERSION}-win32.exe"
 CRCCheck force

 ShowInstDetails show
@@ -45,7 +45,7 @@ Var CDDRIVE
 !include "MUI.nsh"

 !define MUI_ABORTWARNING
-!define MUI_WELCOMEPAGE_TITLE_3LINES
+
 !insertmacro MUI_PAGE_WELCOME

 !define MUI_LICENSEPAGE_RADIOBUTTONS
@@ -75,8 +75,6 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 ; New custom page to show UNICODE and MSLU information
 Page custom ShowWarningsPage

-!define MUI_FINISHPAGE_TITLE_3LINES
-!define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
 !define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for latest news, FAQs and downloads"
 !define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
@@ -86,7 +84,6 @@ Page custom ShowWarningsPage
 !define MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT DisableBack

 !insertmacro MUI_PAGE_FINISH
-!define MUI_PAGE_HEADER_TEXT "Uninstall ${APPNAMEANDVERSION}"
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES

@@ -106,6 +103,7 @@ Section "!OpenTTD" Section1
 	; Copy language files
 	SetOutPath "$INSTDIR\lang\"
 	File ${PATH_ROOT}bin\lang\*.lng
+	File ${PATH_ROOT}src\lang\english.txt

 	; Copy data files
 	SetOutPath "$INSTDIR\data\"
@@ -129,7 +127,8 @@ Section "!OpenTTD" Section1
 	File ${PATH_ROOT}known-bugs.txt

 	; Copy executable
-	File /oname=openttd.exe ${BINARY_DIR}\openttd.exe
+	File /oname=openttd.exe ${PATH_ROOT}objs\Win32\Release\openttd.exe
+	File ${PATH_ROOT}objs\strgen\strgen.exe


 	; Delete old files from the main dir. they are now placed in data/ and lang/
@@ -246,10 +245,10 @@ Section "Uninstall"
 	Delete "$INSTDIR\readme.txt"
 	Delete "$INSTDIR\known-bugs.txt"
 	Delete "$INSTDIR\openttd.exe"
+	Delete "$INSTDIR\strgen.exe"
 	Delete "$INSTDIR\COPYING"
 	Delete "$INSTDIR\INSTALL.LOG"
 	Delete "$INSTDIR\crash.log"
-	Delete "$INSTDIR\crash.dmp"
 	Delete "$INSTDIR\openttd.cfg"
 	Delete "$INSTDIR\hs.dat"
 	Delete "$INSTDIR\cached_sprites.*"
@@ -268,8 +267,6 @@ Section "Uninstall"
 	Delete "$INSTDIR\data\openttd.grf"
 	Delete "$INSTDIR\data\roadstops.grf"
 	Delete "$INSTDIR\data\trkfoundw.grf"
-	Delete "$INSTDIR\data\openttdd.grf"
-	Delete "$INSTDIR\data\openttdw.grf"

 	Delete "$INSTDIR\data\sample.cat"
 	; Windows Data files
@@ -290,6 +287,7 @@ Section "Uninstall"

 	; Language files
 	Delete "$INSTDIR\lang\*.lng"
+	Delete "$INSTDIR\lang\english.txt"

 	; Remove remaining directories
 	RMDir "$SMPROGRAMS\$SHORTCUTS\Extras\"
@@ -390,55 +388,14 @@ Function GetWindowsVersion
 	ClearErrors
 	StrCpy $R0 "winnt"

-	GetVersion::WindowsPlatformId
-	Pop $R0
-	IntCmp $R0 2 WinNT 0
+	ReadRegStr $R1 HKLM "SOFTWARE\MICROSOFT\WINDOWS NT\CurrentVersion" CurrentVersion
+	IfErrors 0 WinNT
 	StrCpy $R0 "win9x"
 WinNT:
 	ClearErrors
 	Push $R0
 FunctionEnd

-;-------------------------------------------------------------------------------
-; Check whether we're not running an installer for 64 bits on 32 bits and vice versa
-Function CheckProcessorArchitecture
-	GetVersion::WindowsPlatformArchitecture
-	Pop $R0
-	IntCmp $R0 64 Win64 0
-	ClearErrors
-	IntCmp ${APPBITS} 64 0 Done
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You want to install the 64 bits OpenTTD on a 32 bits Operating System. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
-	GoTo Done
-Win64:
-	ClearErrors
-	IntCmp ${APPBITS} 64 Done 0
-	MessageBox MB_OKCANCEL|MB_ICONINFORMATION "You want to install the 32 bits OpenTTD on a 64 bits Operating System. This is not adviced, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
-	GoTo Done
-Abort:
-	Quit
-Done:
-FunctionEnd
-
-
-;-------------------------------------------------------------------------------
-; Check whether we're not running an installer for NT on 9x and vice versa
-Function CheckWindowsVersion
-	Call GetWindowsVersion
-	Pop $R0
-	StrCmp $R0 "win9x" 0 WinNT
-	ClearErrors
-	StrCmp ${APPARCH} "win9x" Done 0
-	MessageBox MB_OKCANCEL|MB_ICONSTOP "You want to install the Windows 2000, XP and Vista version on Windows 95, 98 or ME. This is will not work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
-	GoTo Done
-WinNT:
-	ClearErrors
-	StrCmp ${APPARCH} "win9x" 0 Done
-	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "You want to install the Windows 95, 98 and ME version on Windows 2000, XP or Vista. This is not adviced, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
-Abort:
-	Quit
-Done:
-FunctionEnd
-
 Var OLDVERSION
 Var UninstallString

@@ -489,8 +446,6 @@ InstallerIsOlder:

 FinishCallback:
 	ClearErrors
-	Call CheckProcessorArchitecture
-	Call CheckWindowsVersion
 FunctionEnd
 ; eof

--- a/os/win32/installer/version_win32.txt
+++ b/os/win32/installer/version_win32.txt
@@ -1,5 +0,0 @@
-!define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows 2000, XP and Vista"
-!define APPARCH "win32"     ; Define the application architecture
-!define BINARY_DIR "${PATH_ROOT}objs\win32\Release"
-InstallDir "$PROGRAMFILES32\OpenTTD\"
--- a/os/win32/installer/version_win64.txt
+++ b/os/win32/installer/version_win64.txt
@@ -1,5 +0,0 @@
-!define APPBITS 64          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows XP and Vista"
-!define APPARCH "win64"     ; Define the application architecture
-!define BINARY_DIR "${PATH_ROOT}objs\x64\Release"
-InstallDir "$PROGRAMFILES64\OpenTTD\"
--- a/os/win32/installer/version_win9x.txt
+++ b/os/win32/installer/version_win9x.txt
@@ -1,5 +0,0 @@
-!define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "for Windows 95, 98 and ME"
-!define APPARCH "win9x"     ; Define the application architecture
-!define BINARY_DIR "${PATH_ROOT}bin"
-InstallDir "$PROGRAMFILES32\OpenTTD\"
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -9,39 +9,34 @@ Sub FindReplaceInFile(filename, to_find, replacement)
 	data = file.ReadAll
 	file.Close
 	data = Replace(data, to_find, replacement)
-	Set file = FSO.CreateTextFile(filename, -1, 0)
+	Set file = FSO.CreateTextFile(FileName, -1, 0)
 	file.Write data
 	file.Close
 End Sub

-Sub UpdateFile(modified, revision, version, cur_date, filename)
+Sub UpdateFile(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
 End Sub

 Sub UpdateFiles(version)
-	Dim WshShell, cur_date, modified, revision, oExec
+	Dim WshShell, cur_date, revision, oExec
 	Set WshShell = CreateObject("WScript.Shell")
 	cur_date = DatePart("D", Date) & "." & DatePart("M", Date) & "." & DatePart("YYYY", Date)
 	revision = 0
-	modified = 1
 	Select Case Mid(version, 1, 1)
 		Case "r" ' svn
 			revision = Mid(version, 2)
 			If InStr(revision, "M") Then
 				revision = Mid(revision, 1, InStr(revision, "M") - 1)
-				modified = 2
-			Else
-				modified = 0
 			End If
 			If InStr(revision, "-") Then
 				revision = Mid(revision, 1, InStr(revision, "-") - 1)
 			End If
 		Case "h" ' mercurial (hg)
-			Set oExec = WshShell.Exec("hg log -r " & Mid(version, 2, 8) & ":0 -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src")
+			Set oExec = WshShell.Exec("hg log -k " & Chr(34) & "svn" & Chr(34) & " -l 1 --template " & Chr(34) & "{desc}\n" & Chr(34) & " ../src")
 			If Err.Number = 0 Then
 				revision = Mid(OExec.StdOut.ReadLine(), 7)
 				revision = Mid(revision, 1, InStr(revision, ")") - 1)
@@ -54,8 +49,8 @@ Sub UpdateFiles(version)
 			End If
 	End Select

-	UpdateFile modified, revision, version, cur_date, "../src/rev.cpp"
-	UpdateFile modified, revision, version, cur_date, "../src/ottdres.rc"
+	UpdateFile revision, version, cur_date, "../src/rev.cpp"
+	UpdateFile revision, version, cur_date, "../src/ottdres.rc"
 End Sub

 Function ReadRegistryKey(shive, subkey, valuename, architecture)
@@ -141,11 +136,6 @@ Function DetermineSVNVersion()
 		' Do we have subversion installed? Check immediatelly whether we've got a modified WC.
 		Set oExec = WshShell.Exec("svnversion ../src")
 		If Err.Number = 0 Then
-			' Wait till the application is finished ...
-			Do While oExec.Status = 0
-			Loop
-		End If
-		If Err.Number = 0 And oExec.ExitCode = 0 Then
 			Dim modified
 			If InStr(OExec.StdOut.ReadLine(), "M") Then
 				modified = "M"
@@ -183,11 +173,6 @@ Function DetermineSVNVersion()
 		Err.Clear
 		Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
 		If Err.Number = 0 Then
-			' Wait till the application is finished ...
-			Do While oExec.Status = 0
-			Loop
-		End If
-		If Err.Number = 0 And oExec.ExitCode = 0 Then
 			version = "g" & oExec.StdOut.ReadLine()
 			Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
 			Do While oExec.Status = 0 And Err.Number = 0
@@ -199,7 +184,7 @@ Function DetermineSVNVersion()
 			Set oExec = WshShell.Exec("git symbolic-ref HEAD")
 			If Err.Number = 0 Then
 				line = oExec.StdOut.ReadLine()
-				line = Mid(line, InStrRev(line, "/") + 1)
+				line = Mid(line, InStrRev(line, "/")+1)
 				If line <> "master" Then
 					version = version & "-" & line
 				End If
@@ -207,20 +192,14 @@ Function DetermineSVNVersion()
 		Else
 			' try mercurial (hg)
 			Err.Clear
-			Set oExec = WshShell.Exec("hg parents")
+			Set oExec = WshShell.Exec("hg tip")
 			If Err.Number = 0 Then
-				' Wait till the application is finished ...
-				Do While oExec.Status = 0
-				Loop
-			End If
-			If Err.Number = 0 And oExec.ExitCode = 0 Then
-				line = OExec.StdOut.ReadLine()
-				version = "h" & Mid(line, InStrRev(line, ":") + 1, 8)
+				version = "h" & Mid(OExec.StdOut.ReadLine(), 19, 8)
 				Set oExec = WshShell.Exec("hg status ../src")
 				If Err.Number = 0 Then
 					Do
 						line = OExec.StdOut.ReadLine()
-						If Len(line) > 0 And Mid(line, 1, 1) <> "?" Then
+						If Mid(line, 1, 1) <> "?" Then
 							version = version & "M"
 							Exit Do
 						End If
@@ -260,7 +239,7 @@ Function IsCachedVersion(version)
 End Function

 Dim version
-version = "0.6.3"
+version = "0.6.2"
 If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then
 	UpdateFiles version
 End If
--- a/projects/openttd_vs80.sln
+++ b/projects/openttd_vs80.sln
@@ -4,7 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs80.vcp
 	ProjectSection(ProjectDependencies) = postProject
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs80.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
@@ -14,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs80.vcproj"
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs80.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -48,14 +45,6 @@ Global
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -33,6 +33,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -143,6 +145,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -239,6 +243,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -350,6 +356,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -33,6 +33,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -143,6 +145,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -239,6 +243,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -350,6 +356,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
--- a/projects/openttd_vs90.sln
+++ b/projects/openttd_vs90.sln
@@ -4,7 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd_vs90.vcp
 	ProjectSection(ProjectDependencies) = postProject
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC} = {1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen_vs90.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
@@ -14,8 +13,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs_vs90.vcproj"
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "version_vs90.vcproj", "{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -48,14 +45,6 @@ Global
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|Win32.Build.0 = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.ActiveCfg = Debug|Win32
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Debug|x64.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|Win32.Build.0 = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.ActiveCfg = Debug|Win32
-		{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}.Release|x64.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -34,6 +34,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -142,6 +144,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -237,6 +241,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -347,6 +353,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -34,6 +34,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -142,6 +144,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -237,6 +241,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -347,6 +353,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="Determining version number"
+				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
--- a/projects/version_vs80.vcproj
+++ b/projects/version_vs80.vcproj
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="version"
-	ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-	RootNamespace="version"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Determining version number"
-				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\src\rev.cpp.in"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/projects/version_vs90.vcproj
+++ b/projects/version_vs90.vcproj
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="version"
-	ProjectGUID="{1A2B3C5E-1C23-41A5-9C9B-ACBA2AA75FEC}"
-	RootNamespace="version"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				Description="Determining version number"
-				CommandLine="&quot;$(InputDir)/determineversion.vbs&quot;"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\src\rev.cpp.in"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2008-10-01
-Release version: 0.6.3
+Last updated:    2008-08-01
+Release version: 0.6.2
 ------------------------------------------------------------------------


--- a/src/ai/default/default.cpp
+++ b/src/ai/default/default.cpp
@@ -3599,7 +3599,6 @@ static void AiStateBuildAircraftVehicles(Player *p)

 	veh = AiChooseAircraftToBuild(p->player_money, forbidden);
 	if (veh == INVALID_ENGINE) return;
-	if (GetStationByTile(tile)->Airport()->nof_depots == 0) return;

 	/* XXX - Have the AI pick the hangar terminal in an airport. Eg get airport-type
 	 * and offset to the FIRST depot because the AI picks the st->xy tile */
--- a/src/ai/trolly/trolly.cpp
+++ b/src/ai/trolly/trolly.cpp
@@ -881,7 +881,6 @@ static int AiNew_HowManyVehicles(Player *p)
 		length = _players_ainew[p->index].path_info.route_length;
 		// Calculating tiles a day a vehicle moves is not easy.. this is how it must be done!
 		tiles_a_day = RoadVehInfo(i)->max_speed * DAY_TICKS / 256 / 16;
-		if (tiles_a_day == 0) tiles_a_day = 1;
 		// We want a vehicle in a station once a month at least, so, calculate it!
 		// (the * 2 is because we have 2 stations ;))
 		amount = length * 2 * 2 / tiles_a_day / 30;
@@ -898,7 +897,6 @@ static int AiNew_HowManyVehicles(Player *p)
 		length = _players_ainew[p->index].path_info.route_length;
 		// Calculating tiles a day a vehicle moves is not easy.. this is how it must be done!
 		tiles_a_day = RoadVehInfo(i)->max_speed * DAY_TICKS / 256 / 16;
-		if (tiles_a_day == 0) tiles_a_day = 1;
 		if (_players_ainew[p->index].from_deliver) {
 			max_cargo = GetIndustry(_players_ainew[p->index].from_ic)->last_month_production[0];
 		} else {
--- a/src/aircraft.h
+++ b/src/aircraft.h
@@ -127,6 +127,4 @@ struct Aircraft : public Vehicle {
 	void OnNewDay();
 };

-Station *GetTargetAirportIfValid(const Vehicle *v);
-
 #endif /* AIRCRAFT_H */
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -595,9 +595,9 @@ CommandCost CmdSendAircraftToHangar(TileIndex tile, uint32 flags, uint32 p1, uin
 	} else {
 		bool next_airport_has_hangar = true;
 		StationID next_airport_index = v->u.air.targetairport;
-		const Station *st = GetTargetAirportIfValid(v);
+		const Station *st = GetStation(next_airport_index);
 		/* If the station is not a valid airport or if it has no hangars */
-		if (st == NULL || st->Airport()->nof_depots == 0) {
+		if (!st->IsValid() || st->airport_tile == 0 || st->Airport()->nof_depots == 0) {
 			/* the aircraft has to search for a hangar on its own */
 			StationID station = FindNearestHangar(v);

@@ -1023,16 +1023,9 @@ static byte AircraftGetEntryPoint(const Vehicle *v, const AirportFTAClass *apc)
 	assert(v != NULL);
 	assert(apc != NULL);

-	/* In the case the station doesn't exit anymore, set target tile 0.
-	 * It doesn't hurt much, aircraft will go to next order, nearest hangar
-	 * or it will simply crash in next tick */
-	TileIndex tile = 0;
-
-	if (IsValidStationID(v->u.air.targetairport)) {
-		const Station *st = GetStation(v->u.air.targetairport);
-		/* Make sure we don't go to 0,0 if the airport has been removed. */
-		tile = (st->airport_tile != 0) ? st->airport_tile : st->xy;
-	}
+	const Station *st = GetStation(v->u.air.targetairport);
+	/* Make sure we don't go to 0,0 if the airport has been removed. */
+	TileIndex tile = (st->airport_tile != 0) ? st->airport_tile : st->xy;

 	int delta_x = v->x_pos - TileX(tile) * TILE_SIZE;
 	int delta_y = v->y_pos - TileY(tile) * TILE_SIZE;
@@ -1058,20 +1051,15 @@ static byte AircraftGetEntryPoint(const Vehicle *v, const AirportFTAClass *apc)
 static bool AircraftController(Vehicle *v)
 {
 	int count;
-
-	/* NULL if station is invalid */
-	const Station *st = IsValidStationID(v->u.air.targetairport) ? GetStation(v->u.air.targetairport) : NULL;
-	/* 0 if there is no station */
-	TileIndex tile = 0;
-	if (st != NULL) {
-		tile = st->airport_tile;
-		if (tile == 0) tile = st->xy;
-	}
-	/* DUMMY if there is no station or no airport */
-	const AirportFTAClass *afc = tile == 0 ? GetAirport(AT_DUMMY) : st->Airport();
+	const Station *st = GetStation(v->u.air.targetairport);
+	const AirportFTAClass *afc = st->Airport();
+	const AirportMovingData *amd;

 	/* prevent going to 0,0 if airport is deleted. */
-	if (st == NULL || st->airport_tile == 0) {
+	TileIndex tile = st->airport_tile;
+	if (tile == 0) {
+		tile = st->xy;
+
 		/* Jump into our "holding pattern" state machine if possible */
 		if (v->u.air.pos >= afc->nofelements) {
 			v->u.air.pos = v->u.air.previous_pos = AircraftGetEntryPoint(v, afc);
@@ -1087,7 +1075,7 @@ static bool AircraftController(Vehicle *v)
 	}

 	/*  get airport moving data */
-	const AirportMovingData *amd = afc->MovingData(v->u.air.pos);
+	amd = afc->MovingData(v->u.air.pos);

 	int x = TileX(tile) * TILE_SIZE;
 	int y = TileY(tile) * TILE_SIZE;
@@ -1119,7 +1107,7 @@ static bool AircraftController(Vehicle *v)

 	/* Helicopter landing. */
 	if (amd->flag & AMED_HELI_LOWER) {
-		if (st == NULL) {
+		if (st->airport_tile == 0) {
 			/* FIXME - AircraftController -> if station no longer exists, do not land
 			 * helicopter will circle until sign disappears, then go to next order
 			 * what to do when it is the only order left, right now it just stays in 1 place */
@@ -1130,7 +1118,7 @@ static bool AircraftController(Vehicle *v)
 		}

 		/* Vehicle is now at the airport. */
-		v->tile = tile;
+		v->tile = st->airport_tile;

 		/* Find altitude of landing position. */
 		int z = GetSlopeZ(x, y) + 1 + afc->delta_z;
@@ -1284,10 +1272,10 @@ static void HandleCrashedAircraft(Vehicle *v)
 {
 	v->u.air.crashed_counter++;

-	Station *st = GetTargetAirportIfValid(v);
+	Station *st = GetStation(v->u.air.targetairport);

 	/* make aircraft crash down to the ground */
-	if (v->u.air.crashed_counter < 500 && st == NULL && ((v->u.air.crashed_counter % 3) == 0) ) {
+	if (v->u.air.crashed_counter < 500 && st->airport_tile==0 && ((v->u.air.crashed_counter % 3) == 0) ) {
 		uint z = GetSlopeZ(v->x_pos, v->y_pos);
 		v->z_pos -= 1;
 		if (v->z_pos == z) {
@@ -1318,11 +1306,9 @@ static void HandleCrashedAircraft(Vehicle *v)
 		/* clear runway-in on all airports, set by crashing plane
 		 * small airports use AIRPORT_BUSY, city airports use RUNWAY_IN_OUT_block, etc.
 		 * but they all share the same number */
-		if (st != NULL) {
-			CLRBITS(st->airport_flags, RUNWAY_IN_block);
-			CLRBITS(st->airport_flags, RUNWAY_IN_OUT_block); // commuter airport
-			CLRBITS(st->airport_flags, RUNWAY_IN2_block);    // intercontinental
-		}
+		CLRBITS(st->airport_flags, RUNWAY_IN_block);
+		CLRBITS(st->airport_flags, RUNWAY_IN_OUT_block); // commuter airport
+		CLRBITS(st->airport_flags, RUNWAY_IN2_block);    // intercontinental

 		MarkSingleVehicleDirty(v);

@@ -1415,8 +1401,8 @@ static void ProcessAircraftOrder(Vehicle *v)
 		 *    go to a depot, we have to keep that order so the aircraft
 		 *    actually stops.
 		 */
-		const Station *st = GetTargetAirportIfValid(v);
-		if (st == NULL) {
+		const Station *st = GetStation(v->u.air.targetairport);
+		if (!st->IsValid() || st->airport_tile == 0) {
 			CommandCost ret;
 			PlayerID old_player = _current_player;

@@ -1470,15 +1456,16 @@ static void CrashAirplane(Vehicle *v)

 	v->cargo.Truncate(0);
 	v->Next()->cargo.Truncate(0);
-	const Station *st = GetTargetAirportIfValid(v);
+	const Station *st = GetStation(v->u.air.targetairport);
 	StringID newsitem;
-	if (st == NULL) {
+	if (st->airport_tile == 0) {
 		newsitem = STR_PLANE_CRASH_OUT_OF_FUEL;
 	} else {
 		SetDParam(1, st->index);
 		newsitem = STR_A034_PLANE_CRASH_DIE_IN_FIREBALL;
 	}

+	SetDParam(1, st->index);
 	AddNewsItem(newsitem,
 		NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_VEHICLE, NT_ACCIDENT, 0),
 		v->index,
@@ -1554,8 +1541,7 @@ static void AircraftNextAirportPos_and_Order(Vehicle *v)
 			v->current_order.type == OT_GOTO_DEPOT)
 		v->u.air.targetairport = v->current_order.dest;

-	const Station *st = GetTargetAirportIfValid(v);
-	const AirportFTAClass *apc = st == NULL ? GetAirport(AT_DUMMY) : st->Airport();
+	const AirportFTAClass *apc = GetStation(v->u.air.targetairport)->Airport();
 	v->u.air.pos = v->u.air.previous_pos = AircraftGetEntryPoint(v, apc);
 }

@@ -1706,23 +1692,21 @@ static void AircraftEventHandler_AtTerminal(Vehicle *v, const AirportFTAClass *a
 	/* airport-road is free. We either have to go to another airport, or to the hangar
 	 * ---> start moving */

-	bool go_to_hangar = false;
 	switch (v->current_order.type) {
 		case OT_GOTO_STATION: // ready to fly to another airport
+			/* airplane goto state takeoff, helicopter to helitakeoff */
+			v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF;
 			break;
 		case OT_GOTO_DEPOT:   // visit hangar for serivicing, sale, etc.
-			go_to_hangar = v->current_order.dest == v->u.air.targetairport;
+			if (v->current_order.dest == v->u.air.targetairport) {
+				v->u.air.state = HANGAR;
+			} else {
+				v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF;
+			}
 			break;
 		default:  // orders have been deleted (no orders), goto depot and don't bother us
 			v->current_order.Free();
-			go_to_hangar = GetStation(v->u.air.targetairport)->Airport()->nof_depots != 0;
-	}
-
-	if (go_to_hangar) {
-		v->u.air.state = HANGAR;
-	} else {
-		/* airplane goto state takeoff, helicopter to helitakeoff */
-		v->u.air.state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF;
+			v->u.air.state = HANGAR;
 	}
 	AirportMove(v, apc);
 }
@@ -2199,24 +2183,6 @@ void Aircraft::Tick()
 }


-/** Returns aircraft's target station if v->u.air.target_airport
- * is a valid station with airport.
- * @param v vehicle to get target airport for
- * @return pointer to target station, NULL if invalid
- */
-Station *GetTargetAirportIfValid(const Vehicle *v)
-{
-	assert(v->type == VEH_AIRCRAFT);
-
-	StationID sid = v->u.air.targetairport;
-
-	if (!IsValidStationID(sid)) return NULL;
-
-	Station *st = GetStation(sid);
-
-	return st->airport_tile == 0 ? NULL : st;
-}
-
 /** need to be called to load aircraft from old version */
 void UpdateOldAircraft()
 {
--- a/src/aircraft_gui.cpp
+++ b/src/aircraft_gui.cpp
@@ -28,7 +28,6 @@
 void DrawAircraftDetails(const Vehicle *v, int x, int y)
 {
 	int y_offset = (v->Next()->cargo_cap != 0) ? -11 : 0;
-	Money feeder_share = 0;

 	for (const Vehicle *u = v ; u != NULL ; u = u->Next()) {
 		if (IsNormalAircraft(u)) {
@@ -54,12 +53,11 @@ void DrawAircraftDetails(const Vehicle *v, int x, int y)
 				SetDParam(1, cargo_count);
 				SetDParam(2, u->cargo.Source());
 				DrawString(x, y + 21 + y_offset, STR_8813_FROM, TC_FROMSTRING);
-				feeder_share += u->cargo.FeederShare();
 			}
 		}
 	}

-	SetDParam(0, feeder_share);
+	SetDParam(0, v->cargo.FeederShare());
 	DrawString(x, y + 33 + y_offset, STR_FEEDER_CARGO_VALUE, TC_FROMSTRING);
 }

--- a/src/blitter/factory.hpp
+++ b/src/blitter/factory.hpp
@@ -9,10 +9,6 @@
 #include <string>
 #include <map>

-#if defined(WITH_COCOA)
-bool QZ_CanDisplay8bpp();
-#endif /* defined(WITH_COCOA) */
-
 /**
 * The base factory, keeping track of all blitters.
 */
@@ -69,15 +65,13 @@ public:
 	{
 		const char *default_blitter = "8bpp-optimized";

-#if defined(WITH_COCOA)
-		/* Some people reported lack of fullscreen support in 8 bpp mode.
-		 * While we prefer 8 bpp since it's faster, we will still have to test for support. */
-		if (!QZ_CanDisplay8bpp()) {
-			/* The main display can't go to 8 bpp fullscreen mode.
-			 * We will have to switch to 32 bpp by default. */
+#if defined(__APPLE__)
+		/* MacOS X 10.5 removed 8bpp fullscreen support.
+		 * Because of this we will pick 32bpp by default */
+		if (MacOSVersionIsAtLeast(10, 5, 0)) {
 			default_blitter = "32bpp-anim";
 		}
-#endif /* defined(WITH_COCOA) */
+#endif /* defined(__APPLE__) */
 		if (GetBlitters().size() == 0) return NULL;
 		const char *bname = (StrEmpty(name)) ? default_blitter : name;

--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -230,8 +230,8 @@ static int CDECL TrainEngineRunningCostSorter(const void *a, const void *b)
 	const RailVehicleInfo *rvi_a = RailVehInfo(*(const EngineID*)a);
 	const RailVehicleInfo *rvi_b = RailVehInfo(*(const EngineID*)b);

-	Money va = rvi_a->running_cost * GetPriceByIndex(rvi_a->running_cost_class);
-	Money vb = rvi_b->running_cost * GetPriceByIndex(rvi_b->running_cost_class);
+	Money va = rvi_a->running_cost * GetPriceByIndex(rvi_a->running_cost_class) * (rvi_a->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1);
+	Money vb = rvi_b->running_cost * GetPriceByIndex(rvi_b->running_cost_class) * (rvi_b->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1);
 	int r = ClampToI32(va - vb);

 	return _internal_sort_order ? -r : r;
@@ -266,11 +266,8 @@ static int CDECL TrainEngineNumberSorter(const void *a, const void *b)

 static int CDECL TrainEngineCapacitySorter(const void *a, const void *b)
 {
-	const RailVehicleInfo *rvi_a = RailVehInfo(*(const EngineID*)a);
-	const RailVehicleInfo *rvi_b = RailVehInfo(*(const EngineID*)b);
-
-	int va = rvi_a->capacity * (rvi_a->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1);
-	int vb = rvi_b->capacity * (rvi_b->railveh_type == RAILVEH_MULTIHEAD ? 2 : 1);
+	int va = RailVehInfo(*(const EngineID*)a)->capacity;
+	int vb = RailVehInfo(*(const EngineID*)b)->capacity;
 	int r = va - vb;

 	if (r == 0) {
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@@ -217,21 +217,19 @@ bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta,
 			/* Can move only part of the packet, so split it into two pieces */
 			if (mta != MTA_FINAL_DELIVERY) {
 				CargoPacket *cp_new = new CargoPacket();
-
-				Money fs = cp->feeder_share * count / static_cast<uint>(cp->count);
-				cp->feeder_share -= fs;
-
 				cp_new->source          = cp->source;
 				cp_new->source_xy       = cp->source_xy;
 				cp_new->loaded_at_xy    = (mta == MTA_CARGO_LOAD) ? data : cp->loaded_at_xy;

 				cp_new->days_in_transit = cp->days_in_transit;
-				cp_new->feeder_share    = fs;
+				cp_new->feeder_share    = cp->feeder_share / count;
 				/* 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);
+
+				cp->feeder_share /= cp->count - count;
 			}
 			cp->count -= count;

--- a/src/console.cpp
+++ b/src/console.cpp
@@ -697,7 +697,7 @@ IConsoleAlias *IConsoleAliasGet(const char *name)
 static inline int IConsoleCopyInParams(char *dst, const char *src, uint bufpos)
 {
 	int len = min(ICON_MAX_STREAMSIZE - bufpos, (uint)strlen(src));
-	strecpy(dst, src, dst + len - 1);
+	strncpy(dst, src, len);

 	return len;
 }
--- a/src/disaster_cmd.cpp
+++ b/src/disaster_cmd.cpp
@@ -39,7 +39,6 @@
 #include "vehicle_func.h"
 #include "vehicle_base.h"
 #include "sound_func.h"
-#include "roadveh.h"

 #include "table/strings.h"
 #include "table/sprites.h"
@@ -330,7 +329,7 @@ static void DisasterTick_Ufo(Vehicle *v)
 		v->current_order.dest = 1;

 		FOR_ALL_VEHICLES(u) {
-			if (u->type == VEH_ROAD && IsRoadVehFront(u) && IsHumanPlayer(u->owner)) {
+			if (u->type == VEH_ROAD && IsHumanPlayer(u->owner)) {
 				v->dest_tile = u->index;
 				v->age = 0;
 				return;
@@ -341,7 +340,7 @@ static void DisasterTick_Ufo(Vehicle *v)
 	} else {
 		/* Target a vehicle */
 		u = GetVehicle(v->dest_tile);
-		if (u->type != VEH_ROAD || !IsRoadVehFront(u)) {
+		if (u->type != VEH_ROAD) {
 			DeleteDisasterVeh(v);
 			return;
 		}
@@ -364,16 +363,12 @@ static void DisasterTick_Ufo(Vehicle *v)
 			v->age++;
 			if (u->u.road.crashed_ctr == 0) {
 				u->u.road.crashed_ctr++;
+				u->vehstatus |= VS_CRASHED;

 				AddNewsItem(STR_B001_ROAD_VEHICLE_DESTROYED,
 					NEWS_FLAGS(NM_THIN, NF_VIEWPORT | NF_VEHICLE, NT_ACCIDENT, 0),
 					u->index,
 					0);
-
-				for (Vehicle *w = u; w != NULL; w = w->Next()) {
-					w->vehstatus |= VS_CRASHED;
-					MarkSingleVehicleDirty(w);
-				}
 			}
 		}

--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -46,7 +46,6 @@
 #include "signal_func.h"
 #include "gfx_func.h"
 #include "autoreplace_func.h"
-#include "signs.h"

 #include "table/strings.h"
 #include "table/sprites.h"
@@ -470,11 +469,6 @@ void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player)
 		}
 	}

-	Sign *si;
-	FOR_ALL_SIGNS(si) {
-		if (si->owner == old_player) si->owner = new_player == PLAYER_SPECTATOR ? OWNER_NONE : new_player;
-	}
-
 	/* Change color of existing windows */
 	if (new_player != PLAYER_SPECTATOR) ChangeWindowOwner(old_player, new_player);

--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -173,13 +173,6 @@ void StartupEngines()
 			e->player_avail = 0;
 		}
 	}
-
-	/* Update the bitmasks for the vehicle lists */
-	Player *p;
-	FOR_ALL_PLAYERS(p) {
-		p->avail_railtypes = GetPlayerRailtypes(p->index);
-		p->avail_roadtypes = GetPlayerRoadtypes(p->index);
-	}
 }

 static void AcceptEnginePreview(EngineID eid, PlayerID player)
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -568,8 +568,8 @@ Dimension GetStringBoundingBox(const char *str)

 /** Draw a string at the given coordinates with the given colour
 * @param string the string to draw
- * @param x offset from left side of the screen
- * @param y offset from top side of the screen
+ * @param x offset from left side of the screen, if negative offset from the right side
+ * @param y offset from top side of the screen, if negative offset from the bottom
 * @param real_color colour of the string, see _string_colormap in
 * table/palettes.h or docs/ottd-colourtext-palette.png or the enum TextColour in gfx_type.h
 * @return the x-coordinates where the drawing has finished. If nothing is drawn
@@ -585,7 +585,11 @@ int DoDrawString(const char *string, int x, int y, uint16 real_color)
 	byte previous_color = color;

 	if (color != 0xFE) {
-		if (x >= dpi->left + dpi->width || y >= dpi->top + dpi->height) return x;
+		if (x >= dpi->left + dpi->width ||
+				x + _screen.width * 2 <= dpi->left ||
+				y >= dpi->top + dpi->height ||
+				y + _screen.height <= dpi->top)
+					return x;

 		if (color != 0xFF) {
 switch_color:;
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -72,6 +72,16 @@ enum WindowKeyCodes {
 	 * a-z are mapped to 97-122 */

 	/* Numerical keyboard */
+	WKC_NUM_0       = 128,
+	WKC_NUM_1       = 129,
+	WKC_NUM_2       = 130,
+	WKC_NUM_3       = 131,
+	WKC_NUM_4       = 132,
+	WKC_NUM_5       = 133,
+	WKC_NUM_6       = 134,
+	WKC_NUM_7       = 135,
+	WKC_NUM_8       = 136,
+	WKC_NUM_9       = 137,
 	WKC_NUM_DIV     = 138,
 	WKC_NUM_MUL     = 139,
 	WKC_NUM_MINUS   = 140,
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -765,7 +765,7 @@ static void CargoPaymentRatesWndProc(Window *w, WindowEvent *e)

 				gd.colors[i] = cs->legend_colour;
 				for (uint j = 0; j != 20; j++) {
-					gd.cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 4 + 4, c);
+					gd.cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 6 + 6, c);
 				}

 				i++;
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -407,9 +407,7 @@ static CommandCost ClearTile_Industry(TileIndex tile, byte flags)
 	if ((_current_player != OWNER_WATER && _game_mode != GM_EDITOR &&
 			!_cheats.magic_bulldozer.value) ||
 			((flags & DC_AUTO) != 0) ||
-			(_current_player == OWNER_WATER &&
-				((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) ||
-				HasBit(GetIndustryTileSpec(GetIndustryGfx(tile))->slopes_refused, 5)))) {
+			(_current_player == OWNER_WATER && (indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER))) {
 		SetDParam(0, indspec->name);
 		return_cmd_error(STR_4800_IN_THE_WAY);
 	}
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -705,7 +705,7 @@ static const Widget _industry_directory_widgets[] = {
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    13,   201,   300,    14,    25, STR_SORT_BY_PRODUCTION,  STR_SORT_ORDER_TIP},                // IDW_SORTBYPROD
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    13,   301,   400,    14,    25, STR_SORT_BY_TRANSPORTED, STR_SORT_ORDER_TIP},                // IDW_SORTBYTRANSPORT
 {      WWT_PANEL,   RESIZE_NONE,    13,   401,   495,    14,    25, 0x0,                     STR_NULL},                          // IDW_SPACER
-{      WWT_PANEL, RESIZE_BOTTOM,    13,     0,   495,    26,   189, 0x0,                     STR_INDUSTRYDIR_LIST_CAPTION},      // IDW_INDUSRTY_LIST
+{      WWT_PANEL, RESIZE_BOTTOM,    13,     0,   495,    26,   189, 0x0,                     STR_200A_TOWN_NAMES_CLICK_ON_NAME}, // IDW_INDUSRTY_LIST
 {  WWT_SCROLLBAR, RESIZE_BOTTOM,    13,   496,   507,    14,   177, 0x0,                     STR_0190_SCROLL_BAR_SCROLLS_LIST},  // IDW_SCROLLBAR
 {  WWT_RESIZEBOX,     RESIZE_TB,    13,   496,   507,   178,   189, 0x0,                     STR_RESIZE_BUTTON},                 // IDW_RESIZE
 {   WIDGETS_END},
--- a/src/industry_map.h
+++ b/src/industry_map.h
@@ -206,8 +206,7 @@ static inline void SetIndustryConstructionCounter(TileIndex tile, byte value)
 static inline void ResetIndustryConstructionStage(TileIndex tile)
 {
 	assert(IsTileType(tile, MP_INDUSTRY));
-	SB(_m[tile].m1, 0, 4, 0);
-	SB(_m[tile].m1, 7, 1, 0);
+	_m[tile].m1 = 0;
 }

 /**
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -586,9 +586,6 @@ STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Ongeluk
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Maatskappy informasie
 STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Oop / sluiting van nywerhede
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Ekonomie veranderings
-STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER                           :{YELLOW}Produksie veranderings van nywerhede wat by die speler bedien word
-STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Produksie veranderings van nywerhede wat deur mededingers bedien word
-STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Ander nywerheid produksie veranderings
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Raad / informasie op speler se voertuie
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nuwe voertuie
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Veranderings na vrag aanvarde
@@ -933,7 +930,6 @@ STR_OPTIONS_LANG_TIP                                            :{BLACK}Kies die

 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Volskerm
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Kies die blokkie om OpenTTD in volleskerm te speel
-STR_FULLSCREEN_FAILED                                           :{WHITE}Volskerm metode gedop

 STR_OPTIONS_RES                                                 :{BLACK}Skerm resolusie
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1161,7 +1157,6 @@ STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Ontsper
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Laattoe deele aankoop van ander maatskappye
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Wanneer sleep, plaas seine elke: {ORANGE}{STRING} teel(e)
 STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Outomaties bou semaphores voor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}Stel in staak die sein GUI: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_TOWN_LAYOUT_INVALID                          :{WHITE}Die dorp uitleg "niks meer paaie" is nie geldig in die draaiboek redigeerder
 STR_CONFIG_PATCHES_TOWN_LAYOUT                                  :{LTBLUE}Kies dorp-pad uitleg: {ORANGE}{STRING}
@@ -1694,7 +1689,6 @@ STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
 STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
 STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
 STR_2002                                                        :{TINYFONT}{BLACK}{SIGN}
-STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Gebou moet eers afgebreek word
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Populasie: {ORANGE}{COMMA}{BLACK}  Huise: {ORANGE}{COMMA}
@@ -2299,9 +2293,6 @@ STR_RELOCATE_HQ                                                 :{BLACK}Beweeg H
 STR_COMPANY_PASSWORD                                            :{BLACK}Wagwoord
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Wagwoord-beskerm jou maatskappy om onmagtig gebruikers te belet van verbinding
 STR_SET_COMPANY_PASSWORD                                        :{BLACK}Stel maatskappy wagwoord
-STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Moenie die ingesleutelde wagwoord bewaar nie
-STR_COMPANY_PASSWORD_OK                                         :{BLACK}Gee die maatskappy die nuwe wagwoord
-STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Maatskappy wagwoord
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}W<>eld Insinking!{}{}Finansieel eksperte vrees ergste as ekonomie inmekaar sak!
 STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Insinking Oor!{}{}Oplewing in sake gee vertroue na nywerhede as ekonomie versterk!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Tokkel groot/klein venster groote
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -1333,7 +1333,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústr
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes das indústrias - clique no nome para localizar a indústria

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria

--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -1331,7 +1331,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústr
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nom de les indústries - clica al nom per centrar la vista a la indústria

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...massa a prop d'altres indústries

@@ -3131,9 +3130,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Arxius G
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Falten arxiu(s) GRF
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Treure la pausa pot provocar fallades d'OpenTTD. No informis d'errors a causa de fallades subseqüents.{}Estàs segur de voler treure la pausa?

-STR_NEWGRF_BROKEN                                               :{WHITE}El comportament dels NewGRF '{0:STRING}' probablement causarà desincronitzacions i/o penjades.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Canvia la llargada del vehicle pel '{1:ENGINE}' quan no sigui dins del dipòsit.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}El tren '{VEHICLE}' pertanyent a la '{COMPANY}' té una llargada invàlida. Això està causat probablement per problemes amb els NewGRFs. El joc podria desincronitzar-se i/o penjar-se.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El joc s'ha desat en una versió sense suport de tramvies. Tots els tramvies s'han eliminat.
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalitzada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Canvi de moneda: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -17,7 +17,6 @@ STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Potrebna ravna površina
 STR_0008_WAITING                                                :{BLACK}Čekanje: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
-STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO}dolazi iz {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Prihvaća: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Prihvaća: {GOLD}
 STR_000E                                                        :
@@ -727,7 +726,6 @@ STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Postavi
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Postavi odašiljač
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Odredi pustinjsko područje.{}Pritisni i drži CTRL za uklanjanje
 STR_CREATE_LAKE                                                 :{BLACK}Odredi vodeno područje.{}Napravi kanal, osim ako CTRL nije pritisnut na morskom nivou, kada će umjesto toga potopiti okolna područja
-STR_CREATE_RIVER                                                :{BLACK}Postavi rijeke.
 STR_0290_DELETE                                                 :{BLACK}Obriši
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Obriši ovaj grad u cjelosti
 STR_0292_SAVE_SCENARIO                                          :Spremi scenarij
@@ -1052,7 +1050,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE                              :{LTBLUE}Dopusti
 STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY                             :{LTBLUE}Dopusti slanje novca drugim tvrtkama: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Neujednačene stanice: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Težinski množitelj za teret za simulaciju teških vlakova: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Faktor brzine zrakoplova: {ORANGE}1/{STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Dopusti prolazne stanice na cestama u vlasti grada: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Dopusti izgradnju pridruženih stanica: {ORANGE}{STRING}

@@ -1610,7 +1607,6 @@ STR_1004_TOO_HIGH                                               :{WHITE}Previsok
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Nije prikladno za želježnicku prugu
 STR_1007_ALREADY_BUILT                                          :{WHITE}...već izgrađeno
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Najprije moraš ukloniti željezničku prugu
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Cesta je jednosmjerna ili je blokirana
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Izgradnja željeznice
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Izgradnja elektrificirane željeznice
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Izgradnja jednotračne željeznice
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -496,11 +496,11 @@ STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zobrazit
 STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zobrazit seznam letadel spolecnosti
 STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Přiblížit pohled
 STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Oddálit pohled
-STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Budovat železnici
-STR_0182_BUILD_ROADS                                            :{BLACK}Budovat silniční síť
-STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Budovat vodní cesty
+STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Stavět koleje
+STR_0182_BUILD_ROADS                                            :{BLACK}Stavět silnice
+STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Stavět doky
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}Stavět letiště
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Vysadit stromy
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Zasadit stromy, umístit cedule, atd..
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Informace o zemi
 STR_0187_OPTIONS                                                :{BLACK}Možnosti
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
@@ -521,7 +521,7 @@ STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Zobrazit
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Zobrazit na mapě průmysl
 STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Zobrazit na mapě dopravní cesty
 STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Zobrazit na mapě vegetaci
-STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Zobrazit na mapě vlastníky pozemků
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Zobrazit na mapě vlastníky půdy
 STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Zobrazovat na mapě jména měst
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Zisk tento rok: {CURRENCY} (minulý rok: {CURRENCY})

@@ -618,13 +618,13 @@ STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLAC
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Vymazat
 STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Uložit
-STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Současný program skladeb
+STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Momentální program skladeb
 STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Zvolit program 'všechny skladby'
 STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Zvolit program 'staré skladby'
 STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Zvolit program 'nové skladby'
 STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Zvolit program 'Volba 1' (uživatelsky nastavený)
 STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Zvolit program 'Volba 2' (uživatelsky nastavený)
-STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Vyprázdnit současný program (jen u Voleb 1 a 2)
+STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Vymaž aktuální program (jen u Volby 1 a 2)
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Uložit nastavení hudby
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Skladba se přidá do zvoleného programu (Volba 1 nebo 2) klepnutím na její název
 STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Hudební stopu odstraníš ze současného programu (pouze u vlastního) kliknutím na ni
@@ -633,22 +633,22 @@ STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Ukaž sk
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Klepni na dotaci pro zobrazení města/průmyslu
 STR_01FE_DIFFICULTY                                             :{BLACK}Obtížnost ({STRING})
 STR_01FF                                                        :{TINYFONT}{BLACK}{DATE_LONG}
-STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Poslední zpráva nebo článek
+STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Poslední zpráva / článek
 STR_0201_MESSAGE_SETTINGS                                       :Nastavení zpráv
 STR_MESSAGE_HISTORY_MENU                                        :Historie zpráv
-STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Ukázat poslední zprávu nebo článek, možnosti zpráv
+STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Ukázat poslední zprávu / článek, možnosti zpráv
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Možnosti zpráv
 STR_0205_MESSAGE_TYPES                                          :{BLACK}Typy zpráv:
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Příjezd prvního vozidla do hráčovy stanice
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Příjezd prvního vozidla do konkurenční stanice
-STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Nehody a katastrofy
+STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Nehody / katastrofy
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informace o společnosti
 STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Otevření / zavření továren
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Změny v ekonomice
 STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER                           :{YELLOW}Změny produkce průmyslu obsluhovaného hráčem
 STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Změny produkce průmyslu obsluhovaného konkurencí
 STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Jiné změny produkce průmyslu
-STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Rady a informace k hráčovým vozidlům
+STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Rady / informace o hráčových vozidlech
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nový dopravní prostředek
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Změny příjmu zboží
 STR_020E_SUBSIDIES                                              :{YELLOW}Dotace
@@ -686,7 +686,7 @@ STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Opravdu
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generování krajiny
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generování měst
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generování průmyslu
-STR_0231_ROAD_CONSTRUCTION                                      :{BLACK}Výstavba silniční sítě
+STR_0231_ROAD_CONSTRUCTION                                      :{BLACK}Výstavba silnic
 STR_0233_TOWN_GENERATION                                        :{WHITE}Generování měst
 STR_0234_NEW_TOWN                                               :{BLACK}Nové město
 STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Vytvoř nové město
@@ -797,7 +797,7 @@ STR_0298_LOAD_SCENARIO                                          :{WHITE}Otevří
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Uložit mapu
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Hrát mapu
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Hrát z výškové mapy
-STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Začít novou hru s krajinou vytvořenou z výškové mapy
+STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Začne novou hru s použitím výškové mapy k vytvoření krajiny
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Určite chceš opustit toto mapu?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Ukončit editor
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}... může být budováno jen ve městech s populací 1200 lidí a více
@@ -821,7 +821,7 @@ STR_02BB_TOWN_DIRECTORY                                         :Seznam měst
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Názvy dopravních prostředků
 STR_02BD                                                        :{BLACK}{STRING}
 STR_02BE_DEFAULT                                                :Základní
-STR_02BF_CUSTOM                                                 :Vlastní
+STR_02BF_CUSTOM                                                 :Uživatelské
 STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Uložit vlastní jména
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Výběr názvů dopravních prostředků
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Uložit uživatelské názvy dopravních prostředků na disk
@@ -831,13 +831,13 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 STR_02C4_GAME_OPTIONS                                           :Možnosti hry
 STR_02C6_DIFFICULTY_SETTINGS                                    :Nastavení obtížnosti
 STR_MENU_CONFIG_PATCHES                                         :Nastavení patchů
-STR_NEWGRF_SETTINGS                                             :Nastavení grafik
+STR_NEWGRF_SETTINGS                                             :Nastavení newgrf
 STR_TRANSPARENCY_OPTIONS                                        :Nastavení průhlednosti
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Zobrazení jmen měst
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Zobrazení jmen stanic
 STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Zobrazení popisku
-STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Zobrazení směrování
+STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Zobrazení kontrolních bodů
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Plné animace
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Plné detaily
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Průhledné budovy
@@ -847,7 +847,7 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Průhl
 ############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informace o zemi
 STR_02D6                                                        :
-STR_CONSOLE_SETTING                                             :Zobrazit nebo skrýt konzoli
+STR_CONSOLE_SETTING                                             :Zobrazit / skrýt konzoli
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Obrovský screenshot (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :O 'OpenTTD'
@@ -868,10 +868,10 @@ STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Nastavit
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Přejít na pohled
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Nastavit pohled do zorného pole

-STR_02E0_CURRENCY_UNITS                                         :{BLACK}Měna
+STR_02E0_CURRENCY_UNITS                                         :{BLACK}Jednotky měny
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
 STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Výběr jednotek měny
-STR_MEASURING_UNITS                                             :{BLACK}Jednotka vzdálenosti
+STR_MEASURING_UNITS                                             :{BLACK}Jednotky vzdálenosti
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
 STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Výběr jednotek vzdálenosti
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Silniční vozidla jezdí
@@ -890,14 +890,14 @@ STR_02F7_OFF                                                    :Vypnuto
 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ů
-STR_02FB_START_A_NEW_GAME                                       :{BLACK}Hrát novou hru
+STR_02FB_START_A_NEW_GAME                                       :{BLACK}Založit novou hru
 STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Nahrát hru
 STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Vytvořit vlastní mapu - scénář
 STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Vybrat hru pro jednoho hráče
-STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Hrát ve 2-8 hráčích
+STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Vyberte hru pro 2-8 hráčů
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Zobrazit možnosti hry
-STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Nastavit obtížnost
-STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Hrát novou hru ze scénáře
+STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Zobrazit nastavení obtížnosti
+STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Založit novou hru, použít scénář
 STR_0304_QUIT                                                   :{BLACK}Ukončit
 STR_0305_QUIT_OPENTTD                                           :{BLACK}Ukončit 'OpenTTD'
 STR_0307_OPENTTD                                                :{WHITE}OpenTTD {REV}
@@ -918,13 +918,13 @@ STR_JUST_STRING                                                 :{STRING}
 STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}... může být budováno jen ve městech
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}... může být budováno jen v pralesech
-STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}... může být budováno jen v poušti
+STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}... může být budováno jen na pouštích
 STR_0319_PAUSED                                                 :{YELLOW}* *  PAUZA  *  *

 STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot úspěšně uložen jako '{STRING}'
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Screenshot neuložen!

-STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Zakoupit pozemek pro budoucí užití
+STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Zakoupit zemi pro budoucí užití
 STR_032F_AUTOSAVE                                               :{RED}Automatické ukládání
 STR_SAVING_GAME                                                 :{RED}*  *  UKLÁDÁ SE HRA  *  *
 STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ukládání ještě běží,{}počkej prosím, než doběhne!
@@ -1085,7 +1085,7 @@ STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Zapnout
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakázat vlakům a lodím otáčení o 90 stupňů: {ORANGE}{STRING} {LTBLUE} (vyžaduje NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Spojovat stanice postavené vedle sebe: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Odjet, když je plně naložen jakýkoli náklad při 'naložit': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Použít vylepšený algoritmus nakládání: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Použij vylepšený algoritmus nakládání: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Nakládat vozidla postupně: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflace: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Dodávat zboží do stanice jen když je poptávka: {ORANGE}{STRING}
@@ -1122,7 +1122,7 @@ STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :ano, u všech v
 STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Varovat, pokud vlak prodělává: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Vozidlům se nikdy nezastaví výroba ('nezastarají'): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Automaticky nahradit dopravní prostředek, když zestárne
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Obnovit vozidlo {ORANGE}{STRING}{LTBLUE} měsíců před nebo po dosažení nejvyššího stáří
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Obnovit vozidlo {ORANGE}{STRING}{LTBLUE} měsíců před / po dosažení maximálního stáří
 STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimální částka pro automatické obnovení: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Doba zobrazení chybové zprávy: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zobrazovat populaci města v jeho popisku: {ORANGE}{STRING}
@@ -1220,9 +1220,9 @@ STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Počát
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Ukončit hru v roce: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Plynulé změny ekonomiky (více menších změn)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Povolit kupování podílu z ostatních společností
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Při tažení umisťovat návěstidla každých(é): {ORANGE}{STRING} dilků(y)
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Při tažení umisťovat signály každých(é): {ORANGE}{STRING} dilků(y)
 STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Semafory automaticky stavět do roku: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}Okno pro stavbu návěstidel: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}Okno pro stavbu signálů: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_TOWN_LAYOUT_INVALID                          :{WHITE}Vzor "žádné silnice" se neuplatňuje v editoru scénářů
 STR_CONFIG_PATCHES_TOWN_LAYOUT                                  :{LTBLUE}Vzor městských silnic: {ORANGE}{STRING}
@@ -1300,22 +1300,22 @@ STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Míří
 STR_GO_TO_WAYPOINT                                              :Jet přes {WAYPOINT}
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Jet bez zastávky přes {WAYPOINT}

-STR_WAYPOINTNAME_CITY                                           :Směrování {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Směrování {TOWN} č. {COMMA}
-STR_LANDINFO_WAYPOINT                                           :Směrování
+STR_WAYPOINTNAME_CITY                                           :Kontrolní bod {TOWN}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolní bod {TOWN} #{COMMA}
+STR_LANDINFO_WAYPOINT                                           :Kontrolní bod

-STR_WAYPOINT                                                    :{WHITE}Směrování
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vyber typ směrování
+STR_WAYPOINT                                                    :{WHITE}Kontrolní bod
+STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vyber typ kontrolního bodu

 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
 STR_WAYPOINT_RAW                                                :{WAYPOINT}
-STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Přejmenovat směrování
+STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Změnit jméno kontrolního bodu

-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nemohu přejmenovat směrování...
-STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}Postavit na trati směrování
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Zde nelze postavit směrování...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Zde nelze zbourat směrování...
+STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nemohu změnit jméno kontrolního bodu...
+STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}Změnit koleje v kontrolní bod
+STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Nemohu zde vybudovat kontrolní bod...
+STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nemohu zde zrušit kontrolní bod...

 STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Budovat koleje použitím režimu Autokoleje

@@ -1328,7 +1328,7 @@ STR_MANY_RANDOM_INDUSTRIES                                      :Hodně náhodn
 STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Pokryje krajinu náhodným průmyslem
 STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nemůžu generovat průmysl...

-STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}Otevřít nástrojovou lištu na úpravu terénu, výsadbu stromů, atd.
+STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}Otevřít nástrojovou lištu na snížení / zvýšení terénu, výsadbu stromů, atd.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Úpravy krajiny
 STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Srovnat terén

@@ -1350,7 +1350,7 @@ STR_LANDINFO_COORDS                                             :{BLACK}Souřadn

 STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nemůžu odstranit část stanice...
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Zde nemohu změnit typ kolejí...
-STR_CONVERT_RAIL_TIP                                            :{BLACK}Změnit nebo vylepšit druh kolejí (na tento)
+STR_CONVERT_RAIL_TIP                                            :{BLACK}Změnit / vylepšit typ kolejí

 STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Celý vlak prodáš lokomotivy na toto místo

@@ -1389,7 +1389,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Průmysl
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA} % přepraveno)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA} %/{COMMA} % přepraveno)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Názvy průmyslu - na průmysl se podíváš kliknutím na jeho jméno

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... příliš blízko k jinému průmyslu

@@ -1415,7 +1414,7 @@ STR_NETWORK_CONNECTION                                          :{BLACK}Připoje
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Vyber si mezi hrou na internetu nebo v místní síti

 STR_NETWORK_START_SERVER                                        :{BLACK}Spustit server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Spustit vlastní server
+STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Spustí tvůj vlastní server

 STR_NETWORK_GAME_NAME                                           :{BLACK}Název
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Název hry
@@ -1430,7 +1429,7 @@ STR_NETWORK_ENTER_IP                                            :{BLACK}Vlož IP

 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Hráčů
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Hráčů on-line / nejvíce{}Společností on-line / nejvíce
+STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Hráčů online / maximálně
 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HŘE
 STR_ORANGE                                                      :{ORANGE}{STRING}
 STR_NETWORK_CLIENTS                                             :{SILVER}Klientů:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
@@ -1440,7 +1439,7 @@ STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikos
 STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verze hry na serveru:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serveru:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Počáteční datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Současné datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Momentální datum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Chráněno heslem!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER JE OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER JE PLNÝ
@@ -1453,19 +1452,19 @@ STR_NETWORK_JOIN_GAME                                           :{BLACK}Přidat
 STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Začít novou hru

 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Jméno hry:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Jméno hry se zobrazí ostatním hráčům v nabídce síťové hry
+STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Jméno hry se zobrazí ostatním hráčům v menu, kde si vybírají sitovou hru
 STR_NETWORK_SET_PASSWORD                                        :{BLACK}Nastavit heslo
 STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Svoji hru si můžeš ochránit heslem, když nechceš, aby se ti do ni hlásili jiní lidé
 STR_NETWORK_SELECT_MAP                                          :{BLACK}Vyber mapu:
 STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Ve které mapě si chceš zahrát?
 STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
 STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :internet (zveřejnit)
+STR_NETWORK_INTERNET                                            :Internet
+STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
+STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (oznámit)
 STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" i ů}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Nejvyšší počet hráčů:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Zvol nejvyšší počet hráčů. Může se jich připojit i méně.
+STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maximální počet hráčů:
+STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Zvol maximální počet hráčů. Může se jich připojit i méně.
 STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} společnost{P "" i í}
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maximální počet společností:
 STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Omezit serverem počet společností
@@ -1512,7 +1511,7 @@ STR_NETWORK_LANG_TURKISH                                        :turečtina
 STR_NETWORK_LANG_UKRAINIAN                                      :ukrajinština
 ############ End of leave-in-this-order

-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Vstupní místnost do hry více hráčů
+STR_NETWORK_GAME_LOBBY                                          :{WHITE}Vstupní místnost do multiplayerové hry

 STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Připravuji se na vstoupení:   {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Současný seznam všech společností v této hře. Buď můžeš do jedné vstoupit, nebo můžeš založit novou.
@@ -1564,7 +1563,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Seznam h
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Žádná síťová zařízení nebyla nalezena (nebo je hra zkompilována bez ENABLE_NETWORK)
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nenalezena žádná síťová hra
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Server neodpověděl na požadavek
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Není možno se připojit kvůli rozdílným grafikám
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Nelze se připojit kvůli rozdílným GRF souborům
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Síť - synchronizace hry selhala
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Síť - spojení ztraceno
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nemohu nahrát uloženou hru ze serveru
@@ -1700,16 +1699,16 @@ STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Zvolit o
 STR_1021_RAILROAD_TRACK                                         :Koleje
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Železniční depo
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}... území vlastní jiná společnost
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Koleje s obyčejným návěstidlem
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Koleje s vjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Koleje s odjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Koleje s cestovým (kombinovaným) návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Koleje s normálním a vjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Koleje s obyčejným a odjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Koleje s obyčejným a cestovým (kombinovaným) návěstidlem
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Koleje s vjezdovým a odjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Koleje s vjezdovým a cestovým návěstidlem
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Koleje s odjezdovým a cestovým návěstidlem
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Železniční trať s normálními signály
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Železniční trať s presignály
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Železniční trať s výstupními signály
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Železniční trať s kombinovanými signály
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Koleje s normálním a vjezdovým návěstím (pre-signal)
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Koleje s normálním a výjezdovým návěstím (exit-signal)
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Koleje s normálním a cestovým návěstím (combo-signal)
+STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Koleje s vjezdovým (pre-signal) a výjezdovým návěstím (exit-signal)
+STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Koleje s vjezdovým (pre-signal) a cestovým návěstím (combo-signal)
+STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Koleje s výjezdovým (exit-signal) a cestovým návěstím (combo-signal)
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Je nejprve nutno odstranit stanici


@@ -1749,8 +1748,8 @@ STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Postavit
 STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}Postavit tramvajový most
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Postavit silniční tunel
 STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}Postavit tramvajový tunel
-STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Stavět nebo nestavět jednosměrné silnice
-STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Stavět nebo bourat silnici nebo zastávku
+STR_TOGGLE_ONE_WAY_ROAD                                         :{BLACK}Stavět / nestavět jednosměrné silnice
+STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Přepnout stavba / odstranění silnice
 STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS                            :{BLACK}Přepínání mezi výstavbou a bouráním tramvajové tratě
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Výběr orientace garáže
 STR_SELECT_TRAM_VEHICLE_DEPOT                                   :{BLACK}Zvol směr tramvajového depa
@@ -1952,7 +1951,7 @@ STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Vycentro
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Ukázat hodnocení společností
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Změnit jméno stanice
 STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Ukázat seznam přijímaného nákladu
-STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Jména stanic - kliknutím na jméno stanice se na ni přesune pohled
+STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Jména stanic - pro nahlédnutí na stanici klepni na její jméno
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Zvol velikost a typ letiště
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
@@ -1974,7 +1973,7 @@ STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Podržen

 STR_UNDEFINED                                                   :(nedefinovaný řetězec)
 STR_STAT_CLASS_DFLT                                             :Původní stanice
-STR_STAT_CLASS_WAYP                                             :Směrování
+STR_STAT_CLASS_WAYP                                             :Kontrolní body

 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientace lodního depa
@@ -1998,7 +1997,7 @@ STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Nemohu
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Uložení hry selhalo{}{STRING}
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Nemohu smazat soubor
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}Nemohu otevřít hru{}{STRING}
-STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Vnitřní chyba: {STRING}
+STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Interní chyba: {STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Poškozená hra - {STRING}
 STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Uložená hra je z novější verze
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Soubor je nečitelný
@@ -2006,7 +2005,7 @@ STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Do souboru nelz
 STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}Seznam jednotek, adresářů a uložených her
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Zvolené jméno uložené hry
 STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Smazat označenou uloženou hru
-STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Uložit současnou hru se zvoleným jménem
+STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Uložit aktuální hru se zvoleným jménem
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Zvolit nový typ hry
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Zvolit scénář (zelená), přednastavenou hru (modrá), nebo novou náhodnou hru
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Vytvořit novou náhodnou hru
@@ -2075,7 +2074,7 @@ STR_482F_COST                                                   :{BLACK}Cena: {Y
 STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Tento druh průmyslu zde nemohu postavit...
 STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}... lesy lze vysadit jen nad sněhovou čáru
 STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{STRING} ohlašuje okamžité uzavření!
-STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Zásobovací problémy způsobily uzavření {STRING.gen}!
+STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Zásobovací problémy způsobily uzavření {STRING}!
 STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Nedostatek stromů způsobil uzavření {STRING}!
 STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} zvyšuje produkci!
 STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}Nové ložisko uhlí nalezené v {INDUSTRY}!{}Zdvojnásobí se produkce!
@@ -2161,10 +2160,10 @@ STR_SV_STNAME_HEIGHTS                                           :{STRING} výši
 STR_SV_STNAME_WOODS                                             :{STRING} polesí
 STR_SV_STNAME_LAKESIDE                                          :{STRING} jezero
 STR_SV_STNAME_EXCHANGE                                          :{STRING} centrála
-STR_SV_STNAME_AIRPORT                                           :Letiště {STRING}
-STR_SV_STNAME_OILFIELD                                          :Ropná plošina {STRING}
+STR_SV_STNAME_AIRPORT                                           :{STRING} letiště
+STR_SV_STNAME_OILFIELD                                          :{STRING} ropná plošina
 STR_SV_STNAME_MINES                                             :{STRING} doly
-STR_SV_STNAME_DOCKS                                             :Přístav {STRING}
+STR_SV_STNAME_DOCKS                                             :{STRING} přístav
 STR_SV_STNAME_BUOY_1                                            :{STRING} bójka 1
 STR_SV_STNAME_BUOY_2                                            :{STRING} bójka 2
 STR_SV_STNAME_BUOY_3                                            :{STRING} bójka 3
@@ -2177,11 +2176,11 @@ STR_SV_STNAME_BUOY_9                                            :{STRING} bójka
 STR_SV_STNAME_ANNEXE                                            :{STRING} přípojné
 STR_SV_STNAME_SIDINGS                                           :{STRING} odstavné
 STR_SV_STNAME_BRANCH                                            :{STRING} odbočka
-STR_SV_STNAME_UPPER                                             :Horní {STRING}
-STR_SV_STNAME_LOWER                                             :Dolní {STRING}
-STR_SV_STNAME_HELIPORT                                          :Heliport {STRING}
+STR_SV_STNAME_UPPER                                             :horní {STRING}
+STR_SV_STNAME_LOWER                                             :dolní {STRING}
+STR_SV_STNAME_HELIPORT                                          :{STRING} heliport
 STR_SV_STNAME_FOREST                                            :{STRING} les
-STR_SV_STNAME_FALLBACK                                          :{STRING} Stanice č. {NUM}
+STR_SV_STNAME_FALLBACK                                          :{STRING} Stanice #{NUM}

 ############ end of savegame specific region!

@@ -2193,7 +2192,7 @@ STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Uložit
 STR_6801_EASY                                                   :{BLACK}Lehká
 STR_6802_MEDIUM                                                 :{BLACK}Střední
 STR_6803_HARD                                                   :{BLACK}Těžká
-STR_6804_CUSTOM                                                 :{BLACK}Vlastní
+STR_6804_CUSTOM                                                 :{BLACK}Uživatelská
 ############ range for difficulty levels ends

 ############ range for difficulty settings starts
@@ -2203,7 +2202,7 @@ STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Množst
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Množství průmyslu: {ORANGE}{STRING}
 STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maximální počáteční dluh: {ORANGE}{CURRENCY}
 STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Počáteční úroková sazba: {ORANGE}{COMMA}%
-STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Náklady na provoz vozidel: {ORANGE}{STRING}
+STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Cena provozu vozidel: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Rychlost výstavby protivníků: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Inteligence protivníků: {ORANGE}{STRING}
 STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Poruchy vozidel: {ORANGE}{STRING}
@@ -2273,8 +2272,8 @@ STR_700A_COMPANY_NAME                                           :Jméno společn
 STR_700B_PRESIDENT_S_NAME                                       :Jméno prezidenta
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Nemohu změnit jméno společnosti.
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Nemohu změnit jméno prezidenta.
-STR_700E_FINANCES                                               :{WHITE}Finance - {COMPANY} {BLACK}{COMPANYNUM}
-STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Příjmy a výdaje
+STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finance {BLACK}{COMPANYNUM}
+STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Příjmy / výdaje
 STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Výstavba
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nové dopravní prostředky
@@ -2303,7 +2302,7 @@ STR_MAX_LOAN                                                    :{WHITE}Max. pů
 STR_7028                                                        :{BLACK}{CURRENCY}
 STR_7029_BORROW                                                 :{BLACK}Půjčit {SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Vrátit {SKIP}{SKIP}{CURRENCY}
-STR_702B_MAXIMUM_PERMITTED_LOAN                                 :{WHITE}... nejvyšší možná výše půjčky je {CURRENCY}.
+STR_702B_MAXIMUM_PERMITTED_LOAN                                 :{WHITE}... maximální dovolená výše půjčky je {CURRENCY}.
 STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Nemohu půjčit více peněz...
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}... žádný dluh ke splacení
 STR_702E_REQUIRED                                               :{WHITE}... je potřeba {CURRENCY}
@@ -2338,7 +2337,7 @@ STR_704D_SHOW_KEY_TO_GRAPHS                                     :{BLACK}Ukázat
 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
 STR_7050_UNITS_OF_CARGO_DELIVERED                               :{WHITE}Doručeno jednotek zboží
-STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Hodnocení společností (nejvyšší hodnocení je 1000)
+STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Hodnocení společností (nejvyšší hodnocení=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Hodnota společností
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Tabulka pořadí společností
 STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{COMPANYNUM} '{STRING}'
@@ -2357,7 +2356,7 @@ STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nemohu k
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Ceny za přepravu nákladu
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Doba přepravy ve dnech
 STR_7063_PAYMENT_FOR_DELIVERING                                 :{BLACK}{TINYFONT}Platba za doručeni 10 jednotek (nebo 10 000 litru) nákladu do vzdálenosti 20 čtverecků
-STR_7064_TOGGLE_GRAPH_FOR_CARGO                                 :{BLACK}Zobrazit nebo skrýt graf pro určitý druh nákladu
+STR_7064_TOGGLE_GRAPH_FOR_CARGO                                 :{BLACK}Zobrazit / skrýt graf pro určitý druh nákladu
 STR_7065                                                        :{BLACK}{TINYFONT}{STRING}
 STR_7066_ENGINEER                                               :Strojvůdce
 STR_7067_TRAFFIC_MANAGER                                        :Manažer dopravy
@@ -2369,7 +2368,7 @@ STR_706C_CHAIRMAN                                               :Předseda
 STR_706D_PRESIDENT                                              :Prezident
 STR_706E_TYCOON                                                 :Magnát
 STR_706F_BUILD_HQ                                               :{BLACK}Ředitelství
-STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Vybudovat ředitelství společnosti nebo ho ukázat
+STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Vybudovat ředitelství společnosti / ukázat ředitelství společnosti
 STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Sídlo společnosti můžeš vystavit jinde za 1 % její hodnoty
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Nemohu postavit ředitelství společnosti
 STR_7072_VIEW_HQ                                                :{BLACK}Ředitelství
@@ -2783,7 +2782,7 @@ STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nemohu k
 STR_882C_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}   Koupeno: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
-STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Nakládá nebo vykládá
+STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Nakládání / vykládání
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak musí stát v depu
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nelze poslat vlak do depa...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Nedostatek prostoru na příkazy
@@ -2811,7 +2810,7 @@ STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Nastav p
 STR_8843_TRAIN_VEHICLE_SELECTION                                :{BLACK}Seznam vlaků - stiskni na vlaku pro informace
 STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Kup označený vagon/lokomotivu
 STR_8845_RENAME_TRAIN_VEHICLE_TYPE                              :{BLACK}Přejmenovat typ vlaku
-STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Současná činnost vlaku - vlak se zastaví nebo rozjede, když sem klikneš
+STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Momentální akce vlaku - stiskni pro zastavení/rozjetí vlaku
 STR_8847_SHOW_TRAIN_S_ORDERS                                    :{BLACK}Ukaž příkazy vlaku
 STR_8848_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Nastav pohled na vlak
 STR_8849_SEND_TRAIN_TO_DEPOT                                    :{BLACK}Pošli vlak do depa
@@ -2912,7 +2911,7 @@ STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Nemohu p
 STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Nemohu najít místní garáž
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Silniční vozidla - stiskni vozidlo pro informace
 STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Koupit nová silniční vozidla (vyžaduje garáže)
-STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Současná činnost silničního vozidla - vozidlo se zastaví nebo rozjede, když sem klikneš
+STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Momentální činnost silničního vozidla - stiskni pro zastavení/rozjetí vozidla
 STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Ukaž příkazy vozidla
 STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Nastav pohled na vozidlo
 STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Pošli vozidlo do garáže
@@ -3005,7 +3004,7 @@ STR_982F_NAME_SHIP                                              :{BLACK}Přejmen
 STR_9831_NAME_SHIP                                              :{WHITE}Přejemnovat loď
 STR_9832_CAN_T_NAME_SHIP                                        :{WHITE}Nelze přejmenovat loď...
 STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Obyvatelé oslavují...{}První loď přistála v {STATION}!
-STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Umístit bójku, kterou lze použít jako směrování
+STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Umístit bójku, kterou lze použít jako navigační bod
 STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Zde nelze umístit bójku...
 STR_9836_RENAME                                                 :{BLACK}Přejmenovat
 STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Přejmenovat typ lodi
@@ -3161,42 +3160,39 @@ STR_NEWGRF_ERROR_INVALID_PARAMETER                              :Neplatný param
 STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{STRING} musí být nahráván před {STRING}.
 STR_NEWGRF_ERROR_LOAD_AFTER                                     :{STRING} musí být nahráván po {STRING}.
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{STRING} potřebuje verzi OpenTTD {STRING} nebo vyšší.
-STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :grafika, která se měla přeložit
+STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF soubor, který se měl přeložit
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Je nahráno příliš mnoho grafik.

 STR_NEWGRF_ADD                                                  :{BLACK}Přidat
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Přidat grafiku do seznamu
+STR_NEWGRF_ADD_TIP                                              :{BLACK}Přidat NewGRF soubor do seznamu
 STR_NEWGRF_REMOVE                                               :{BLACK}Odebrat
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstranit označenou grafiku ze seznamu
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstranit označený NewGRF soubor ze seznamu
 STR_NEWGRF_MOVEUP                                               :{BLACK}Nahoru
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Posunout označenou grafiku nahoru
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Posunout označený NewGRF soubor nahoru
 STR_NEWGRF_MOVEDOWN                                             :{BLACK}Dolů
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Posunout označenou grafiku dolů
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Seznam grafik, které jsou nainstalovány. Kliknutím na jméno souboru můžeš nastavit parametry.
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Posunout označený NewGRF soubor dolů
+STR_NEWGRF_FILE_TIP                                             :{BLACK}Seznam NewGRF souborů, které jsou nainstalovány. Parametry souboru můžeš změnit kliknutím na něj.
 STR_NEWGRF_PARAMETER                                            :{BLACK}Parametry: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Zadej parametry grafiky
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Zadej parametry NewGRF souboru
 STR_NEWGRF_NO_INFO                                              :{BLACK}Není dostupná žádná informace

-STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupné grafiky
+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupné NewGRF soubory
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Přidat do výběru
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Přidat vybranou grafiku do tvého seznamu
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Přidat vybraný NewGRF soubor do tvého nastavení
 STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Načíst soubory
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Znovu vytvořit seznam dostupných grafik
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Aktualizovat seznam dostupných NewGRF souborů
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nelze přidat soubor: duplicitní GRF ID

 STR_NEWGRF_NOT_FOUND                                            :{RED}Nenalezen odpovídající soubor
 STR_NEWGRF_DISABLED                                             :{RED}Vypnuto
-STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Odpovídající soubor nebyl nalezen (načetl se kompatibilní GRF)
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Odpovídající soubor nenalezen (načten kompatibilní GRF)

-STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilní GRF se načetly místo chybějících
-STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Chybějící grafiky byly vypnuty
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilní GRF načteny místo chybějících
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Chybějící soubory GRF byly vyřazeny
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Pro načtení hry chybí GRF soubory
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Chybějící grafické soubory
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Spuštění hry může shodit OpenTTD. Nehlaš chybu kvůli pádům způsobeným touto akcí.{}Opravdu chceš rozjet hru?

-STR_NEWGRF_BROKEN                                               :{WHITE}Chování grafiky '{0:STRING}' by mohlo způsobit desynchronizaci a/nebo pád hry.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Mění délku vozidla '{1:ENGINE}', které není v depu.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Vlak '{VEHICLE}' patřící '{COMPANY}' nemá platnou délku. Pravděpodobně to způsobila nějaká grafika. Hra se může desynchronizovat nebo spadnout.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Hra byla uložena ve verzi bez podpory tramvají. Všechny tramvaje se odstraní.
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastní měna
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz měny: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -3422,7 +3418,7 @@ STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Změna p
 STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Změna průhlednosti stromů. Nastavení se zamkne CTRL+kliknutím.
 STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Změna průhlednosti domů. Nastavení se zamkne CTRL+kliknutím.
 STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Změna průhlednosti továren. Nastavení se zamkne CTRL+kliknutím.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Změna průhlednosti postavitelných objektů, jako stanic, dep a směrování. Nastavení se zamkne kliknutím s CTRL.
+STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Změna průhlednosti postavitelných objektů, jako stanic, dep a kontrolních bodů. Nastavení se zamkne CTRL+kliknutím.
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Změna průhlednosti mostů. Nastavení se zamkne CTRL+kliknutím.
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Změna průhlednosti staveb jako majáků, vysílačů a doplňků (v budoucnosti). Nastavení se zamkne CTRL+kliknutím.
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Změna průhlednosti elektrifikace. Nastavení se zamkne CTRL+kliknutím.
@@ -3480,8 +3476,8 @@ STR_VEHICLE_NAME                                                :{VEHICLE}
 STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Jméno musí být unikátní

 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Na další návěstidlo
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Na předešlé návěstidlo
+STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Na další signál
+STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Na předešlý signál

 ########

@@ -3539,18 +3535,18 @@ STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Změnit
 ########

 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Výběr návěstidel
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Zde nelze změnit návěstidla...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Obyčejné návěstidlo (semafor){}Návěstidla jsou nutná, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Vjezdové návěstidlo (semafor){}Svítí zeleně do té doby, kdy v následujícím úseku trati je alespoň jedno další svítící zeleně. Jinak svítí červeně.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Výjezdové návěstidlo (semafor){}Chová se stejně jako obyčejné, ale musí se aktivovat vjezdové a cestové návěstidlo.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Cestové návěstidlo (semafor){}Cestové (kombinované) slouží zároveň jako vjezdové a odjezdové. Tím je možné postavit velké "řetězce" presignálů.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Obyčejné návěstidlo (elektrické){}Návěstidla jsou nutná, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Vjezdové návěstidlo (elektrické){}Svítí zeleně do té doby, kdy v následujícím úseku trati je alespoň jedno další svítící zeleně. Jinak svítí červeně.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Výjezdové návěstidlo (elektrické){}Chová se stejně jako obyčejné, ale musí se aktivovat vjezdové a cestové návěstidlo.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Cestové návěstidlo (elektrické){}Cestové (kombinované) návěstidlo slouží zároveň jako vjezdové a odjezdové. Tím je možné postavit velké "řetězce" návěstidel.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Přeměna návěstidel{}Když je přeměna zapnuta, návěstidlo se změní kliknutím. Kliknutím s CTRL se přepne mezi variantami návěstidla.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Rozestup při stavbě návěstidel tažením
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Snížit rozestup mezi návěstidly
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Zvýšit rozestup mezi návěstidly
+STR_SIGNAL_SELECTION                                            :{WHITE}Výběr signálů
+STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Zde nelze změnit signály...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standardní signál (semafor){}Signály jsou nutné, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Vjezdový signál (semafor){}Svítí zeleně do té doby, kdy v dalším úseku trati je alespoň jeden zeleně svítící výjezdový signál. Jinak svítí červeně.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Výjezdový signál (semafor){}Chová se stejně jako normální signál, ale musí se aktivovat správné světlo na vjezdovém a kombinovaném presignálu.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinovaný signál (semafor){}Kombinovaný signál jednoduše slouží jako zároveň vjezdový a výjezdový signál. Tím je možné postavit velké "řetězce" presignálů.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standardní signál (elektrický){}Signály jsou nutné, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Vjezdový signál (elektrický){}Svítí zeleně do té doby, kdy v dalším úseku trati je alespoň jeden zeleně svítící výjezdový signál. Jinak svítí červeně.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Výjezdový signál (elektrický){}Chová se stejně jako normální signál, ale musí se aktivovat správné světlo na vjezdovém a kombinovaném presignálu.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinovaný signál (elektrický){}Kombinovaný signál jednoduše slouží jako zároveň vjezdový a výjezdový signál. Tím je možné postavit velké "řetězce" presignálů.
+STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Změna signálů{}Pokud je vybrána, signál se změní kliknutím na něj. Při kliknutí s CTRL se bude přepínat mezi variantami existujícího signálu.
+STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Rozestup při stavbě signálů tažením
+STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Snížit rozestup mezi signály
+STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Zvýšit rozestup mezi signály
 ########
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -347,7 +347,7 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Graf over præs
 STR_0158_COMPANY_VALUE_GRAPH                                    :Graf over selskabsværdi
 STR_0159_CARGO_PAYMENT_RATES                                    :Graf over lastudbetalingsrater
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Selskabsoversigt
-STR_PERFORMANCE_DETAIL_MENU                                     :Detaljeret præstationsoversigt
+STR_PERFORMANCE_DETAIL_MENU                                     :Præstations oversigt
 ############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Om OpenTTD
@@ -387,7 +387,7 @@ STR_ENGINE_SORT_INTRO_DATE                                      :Introduktionsda
 STR_ENGINE_SORT_RUNNING_COST                                    :Driftsomkostning
 STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Drivmiddel/omkostninger
 STR_ENGINE_SORT_CARGO_CAPACITY                                  :Lasteevne
-STR_NO_WAITING_CARGO                                            :{BLACK}Der venter ingen fragt af nogen type
+STR_NO_WAITING_CARGO                                            :{BLACK}Der er ingen fragt af nogen type, der venter
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vælg alle faciliteter
 STR_SELECT_ALL_TYPES                                            :{BLACK}Vælg alle lasttyper (inklusiv fragttyper, der ikke venter)
 STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgængelige tog
@@ -422,9 +422,9 @@ STR_016D_DEC                                                    :dec
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
-STR_0171_PAUSE_GAME                                             :{BLACK}Sæt spillet på pause
+STR_0171_PAUSE_GAME                                             :{BLACK}Pause spillet
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Gem spillet, forlad spillet, afslut
-STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Vis liste over selskabets stationer
+STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Vis en liste over selskabets stationer
 STR_0174_DISPLAY_MAP                                            :{BLACK}Vis kortet
 STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Vis kortet, byoversigt
 STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Vis byoversigten
@@ -479,7 +479,7 @@ STR_019F_TRAIN                                                  :Tog
 STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} er ved at være for gammel
 STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} er alt for gammel
 STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} er alt for gammel og bør udskiftes straks
-STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Landområde-information
+STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Landområde information
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Pris for at rydde: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Pris for at rydde: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
@@ -530,7 +530,7 @@ STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Accepter
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
 STR_01D3_SOUND_MUSIC                                            :Lyd/Musik
-STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Vis lyd-/musikvindue
+STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Vis lyd/musik vindue
 STR_01D5_ALL                                                    :{TINYFONT}Alle
 STR_01D6_OLD_STYLE                                              :{TINYFONT}Old Style
 STR_01D7_NEW_STYLE                                              :{TINYFONT}New Style
@@ -560,7 +560,7 @@ STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLAC
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Ryd
 STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Gem
-STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Nuværende musikprogram
+STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Nuværende musikprogram valg
 STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Vælg 'Alle numre' programmet
 STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Vælg 'Old style musik' programmet
 STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Vælg 'New style musik' programmet
@@ -578,7 +578,7 @@ STR_01FF                                                        :{TINYFONT}{BLAC
 STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Seneste besked/nyhedsrapport
 STR_0201_MESSAGE_SETTINGS                                       :Beskedindstillinger
 STR_MESSAGE_HISTORY_MENU                                        :Tidligere beskeder
-STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Vis seneste besked/nyhedsrapport, vis beskedvalg
+STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Vis sidste besked/nyhedsrapport, vis beskedvalg
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Beskedvalg
 STR_0205_MESSAGE_TYPES                                          :{BLACK}Beskedtyper:
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomst af første køretøj til spillerens station
@@ -592,7 +592,7 @@ STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Produkt
 STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Andre produktionsændringer for industri
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Rådgivning / information om spillerens køretøjer
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nye køretøjer
-STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Ændring i accepteret gods
+STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Ændring i accepteret last
 STR_020E_SUBSIDIES                                              :{YELLOW}Tilskudsordninger
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Generel information
 STR_MESSAGES_ALL                                                :{YELLOW}Sæt alle beskedtyper til: Fra / Kortfattet / Fuld
@@ -615,7 +615,7 @@ STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT
 STR_021F                                                        :{BLUE}{COMMA}
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarieeditor
-STR_0223_LAND_GENERATION                                        :{WHITE}Land-generering
+STR_0223_LAND_GENERATION                                        :{WHITE}Land generering
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Forstør landområdet der skal sænkes/hæves
@@ -939,11 +939,11 @@ STR_FULLSCREEN_FAILED                                           :{WHITE}Fuldskæ

 STR_OPTIONS_RES                                                 :{BLACK}Skærmopløsning
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_RES_TIP                                             :{BLACK}Vælg ønsket skærmopløsning
+STR_OPTIONS_RES_TIP                                             :{BLACK}Vælg ønskede skærmopløsning

-STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Skærmbillede-format
+STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Skærmbillede format
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Vælg skærmbillede-format
+STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Vælg skærmbillede format

 STR_AUTOSAVE_1_MONTH                                            :Hver måned
 STR_AUTOSAVE_FAILED                                             :{WHITE}Fejl under autogem
@@ -1331,7 +1331,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transporteret)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transporteret)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrinavne - klik på navn for at centrere visningen over en industri

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for tæt på en anden industribygning

@@ -1911,7 +1910,7 @@ STR_3068_DOCK                                                   :{WHITE}Havn
 STR_3069_BUOY                                                   :Bøje
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...der er en bøje i vejen
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stationen er for spredt
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ikke-uniforme stationer er slået fra
+STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ikke uniforme stationer er slået fra
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold CTRL nede for at vælge mere end en ting

 STR_UNDEFINED                                                   :(udefineret tekststring)
@@ -2687,7 +2686,7 @@ STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tog kan
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Tog

 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nye jernbanekøretøjer
-STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nyt elektrisk lokomotiv
+STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nyt Elektrisk lokomotiv
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nye monorailkøretøjer
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye magnetskinnekøretøjer
 STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Jernbanekøretøjer
@@ -2874,7 +2873,7 @@ STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT
 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_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Kan ikke vende et køretøg, der består af flere enheder
 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
@@ -3046,7 +3045,7 @@ STR_BRIBE_FAILED                                                :{WHITE}Dit fors
 STR_BRIBE_FAILED_2                                              :{WHITE}opdaget af en inspektør.
 STR_BUILD_DATE                                                  :{BLACK}Produceret: {LTBLUE}{DATE_LONG}

-STR_PERFORMANCE_DETAIL                                          :{WHITE}Præstationsoversigt
+STR_PERFORMANCE_DETAIL                                          :{WHITE}Præstations oversigt
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalje
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
@@ -3067,12 +3066,12 @@ STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Antal af køretøjer; dette inkludere vejkøretøjer, tog, skibe og fly
 STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Antallet af stationer. Alle dele af en station (f.eks. banegård, rutebilstation, lufthavn) tæller med, selvom de er sammensat som én station
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Afkast for køretøjet med laveste indkomst (af alle køretøjer ældre end 2 år)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Indkomst i måneden med det laveste afkast i de sidste 12 kvartaler
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Indtægt i måneden med den laveste indtægt i de sidste 12 kvartaler
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Indkomst i måneden med det højeste afkast i de sidste 12 kvartaler
 STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Antal enheder fragtet i de sidste 4 kvartaler
 STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Antallet af lasttyper fragtet i sidste kvartal
 STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Kapital denne virksomhed har i banken
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Mængden af penge dette firma har lånt
+STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Har du et stort lån?
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Samlet point ud af mulige points

 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF indstillinger
@@ -3130,9 +3129,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Mangler
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Manglende GRF-fil(er)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}OpenTTD kan gå ned, når spillet sættes i gang igen. Undlad at indsende fejlrapporter for efterfølgende nedbrud.{}Vil du virkelig sætte spillet i gang igen?

-STR_NEWGRF_BROKEN                                               :{WHITE}Denne NewGRFs opførsel '{0:STRING}' vil sandsynligvis forårsage at spillet går ned.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Den ændrer toglængden for '{1:ENGINE}' mens den ikke er i depot.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Toget '{VEHICLE}' fra firmaet '{COMPANY}' har ugyldig længde. Det skyldes sandsynligvis at problem med en NewGRF. Spillet går muligvis ned.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spillet er gemt i en version uden sporveje. Alle sporveje er blevet fjernet.
 STR_CURRENCY_WINDOW                                             :{WHITE}Brugerdefineret møntfod
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurs: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -3172,7 +3168,7 @@ STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Sælg al
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sælg alle skibe i dokken
 STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sælg alle fly i hangaren

-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Vis en liste over alle tog med denne remise i ordrelisten
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Vis en liste over alle toge med denne remise i ordrelisten
 STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP                        :{BLACK}Vis liste over alle køretøjer med dette værksted i ordrelisten
 STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Vis liste over alle skibe med denne skibsdok i ordrelisten
 STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Vis liste over alle fly med en hangar ved denne lufthavn i ordrelisten
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -1331,7 +1331,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% vervoerd)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% vervoerd)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrie namen - klik op naam om scherm te centreren op industrie

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te dicht bij een andere industrie

--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1331,7 +1331,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industry names - click on name to centre view on industry

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry

@@ -1894,7 +1893,7 @@ STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centre m
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Show station ratings
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Change name of station
 STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Show list of accepted cargo
-STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Station names - click on name to centre view on station
+STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Station names - click on name to centre main view on station
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Select size/type of airport
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -15,7 +15,6 @@ STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Flat land required
 STR_0008_WAITING                                                :{BLACK}Waiting: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
-STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO} en-route from {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Accepts: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Accepts: {GOLD}
 STR_000E                                                        :
@@ -725,7 +724,6 @@ STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Place li
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Place transmitter
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Define desert area.{}Press and hold CTRL to remove it
 STR_CREATE_LAKE                                                 :{BLACK}Define water area.{}Make a canal, unless CTRL is held down at sea level, when it will flood the surroundings instead
-STR_CREATE_RIVER                                                :{BLACK}Place rivers.
 STR_0290_DELETE                                                 :{BLACK}Delete
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Delete this town completely
 STR_0292_SAVE_SCENARIO                                          :Save scenario
@@ -935,7 +933,6 @@ STR_OPTIONS_LANG_TIP                                            :{BLACK}Select t

 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Fullscreen
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Check this box to play OpenTTD fullscreen mode
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fullscreen mode failed

 STR_OPTIONS_RES                                                 :{BLACK}Screen resolution
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1050,7 +1047,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE                              :{LTBLUE}Allow b
 STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY                             :{LTBLUE}Allow sending money to other companies: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Weight multiplier for freight to simulate heavy trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Plane speed factor: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Allow drive-through road stops on town owned roads: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Allow building adjacent stations: {ORANGE}{STRING}

@@ -1205,18 +1201,6 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Change setting value
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Some or all of the default service interval(s) below are incompatible with chosen setting! 5-90% and 30-800 days are valid

-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Pathfinder for trains: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(Not recommended)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Recommended)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH                       :{LTBLUE}Pathfinder for road vehicles: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF                   :Original {RED}(Not recommended)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(Recommended)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Pathfinder for ships: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF                     :Original {BLUE}(Recommended)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Not recommended)
 STR_TEMPERATE_LANDSCAPE                                         :Temperate landscape
 STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-arctic landscape
 STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropical landscape
@@ -1330,7 +1314,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transported)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industry names - click on name to center view on industry

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry

@@ -1612,7 +1595,6 @@ STR_1004_TOO_HIGH                                               :{WHITE}Too high
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}No suitable railroad track
 STR_1007_ALREADY_BUILT                                          :{WHITE}...already built
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Must remove railroad track first
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Road is one way or blocked
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Railroad Construction
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Electrified Railroad Construction
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Monorail Construction
@@ -1715,7 +1697,6 @@ STR_2002                                                        :{TINYFONT}{BLAC
 STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Building must be demolished first
 STR_2005                                                        :{WHITE}{TOWN}
-STR_CITY                                                        :{WHITE}{TOWN} (City)
 STR_2006_POPULATION                                             :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Houses: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Rename Town
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Can't rename town...
@@ -2348,8 +2329,6 @@ STR_LIVERY_EMU                                                  :EMU
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passenger/Mail Car (Steam)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passenger/Mail Car (Diesel)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passenger/Mail Car (Electric)
-STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Passenger Car (Monorail)
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Passenger Car (Maglev)
 STR_LIVERY_FREIGHT_WAGON                                        :Freight Car
 STR_LIVERY_BUS                                                  :Bus
 STR_LIVERY_TRUCK                                                :Truck
@@ -2805,7 +2784,6 @@ STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT
 STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}New {STRING} now available!  -  {ENGINE}

 STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Can't sell destroyed vehicle...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Can't refit destroyed vehicle...

 STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Can't timetable vehicle...
 STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vehicles can only wait at stations.
@@ -3126,13 +3104,7 @@ STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Matchin
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Compatible GRF(s) loaded for missing files
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missing GRF file(s) have been disabled
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Missing GRF file(s) to be able to load game
-STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Missing GRF file(s)
-STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Unpausing can crash OpenTTD. Do not file bug reports for subsequent crashes.{}Do you really want to unpause?

-STR_NEWGRF_BROKEN                                               :{WHITE}Behaviour of NewGRF '{STRING}' is likely to cause desyncs and/or crashes.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It changes vehicle length for '{1:ENGINE}' when not inside a depot.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Train '{VEHICLE}' belonging to '{COMPANY}' has invalid length. It is probably caused by problems with NewGRFs. Game may desync or crash.
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Game was saved in version without streetcar support. All streetcars have been removed.
 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator:
@@ -3256,9 +3228,6 @@ STR_PURCHASE_INFO_ALL_TYPES                                     :All cargo types
 STR_PURCHASE_INFO_ALL_BUT                                       :All but {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. Tractive Effort: {GOLD}{FORCE}

-STR_NUM_1                                                       :{BLACK}{SKIP}{NUM}
-STR_NUM_2                                                       :{BLACK}{SKIP}{SKIP}{NUM}
-STR_NUM_3                                                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
 ########### String for New Landscape Generator

 STR_GENERATE                                                    :{WHITE}Generate
@@ -3357,7 +3326,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Toggle t
 STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Toggle transparency for buildables like stations, depots, waypoints and catenary
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Toggle transparency for bridges
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Toggle transparency for structures like lighthouses and antennas, maybe in future for eyecandy
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Toggle transparency for catenary. CTRL+click to lock.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Toggle transparency for loading indicators

 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -256,8 +256,8 @@ STR_00E9_VEGETATION                                             :taimestik
 STR_00EA_OWNERS                                                 :omanikud
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Sõiduteed
 STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Rööbasteed
-STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Jaamad/lennuväljad/dokid
-STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Hooned/tööstused
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Jaamad/lennuväljad/sadamad
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Ehitised/tööstused
 STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Sõidukid
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100 m
 STR_00F1_200M                                                   :{BLACK}{TINYFONT}200 m
@@ -306,7 +306,7 @@ STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFON
 STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Veoautode laadimisplats
 STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Bussijaam
 STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Lennuväli/kopteriväljak
-STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Dokk
+STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Sadam
 STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Konarlik maa
 STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Rohuväli
 STR_0122_BARE_LAND                                              :{BLACK}{TINYFONT}Lage maa
@@ -321,7 +321,7 @@ STR_012A_DESERT                                                 :{BLACK}{TINYFON
 STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Lumi
 STR_012C_MESSAGE                                                :{WHITE}Teade
 STR_012D                                                        :{WHITE}{STRING}
-STR_012E_CANCEL                                                 :{BLACK}Tühista
+STR_012E_CANCEL                                                 :{BLACK}Loobu
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Nimevahetus
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Liiga palju määratletud nimesid
@@ -401,7 +401,7 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Tegevustulemust
 STR_0158_COMPANY_VALUE_GRAPH                                    :Firmaväärtuse graafik
 STR_0159_CARGO_PAYMENT_RATES                                    :Veotasude määrad
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Ettevõtete edetabel
-STR_PERFORMANCE_DETAIL_MENU                                     :Täpsustatud tulemushinnang
+STR_PERFORMANCE_DETAIL_MENU                                     :Üksikasjalik tulemushinnang
 ############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD lisainfo
@@ -476,7 +476,7 @@ STR_016D_DEC                                                    :dets
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
-STR_0171_PAUSE_GAME                                             :{BLACK}Seisata mäng
+STR_0171_PAUSE_GAME                                             :{BLACK}Peata mäng
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Mängu salvestamine/laadimine, mängust lahkumine, väljumine
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Kuvab ettevõtte jaamade nimistu
 STR_0174_DISPLAY_MAP                                            :{BLACK}Kuva kaart
@@ -494,20 +494,20 @@ STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Suurenda
 STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Vähenda vaadet
 STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Ehita rööbasteed
 STR_0182_BUILD_ROADS                                            :{BLACK}Ehita maanteid
-STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Ehita laevadokke
+STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Ehita laevasadamat
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}Ehita lennuvälju
 STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Puude istutamine, siltide paigaldamine jne.
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Maa-ala andmed
 STR_0187_OPTIONS                                                :{BLACK}Valikud
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
 STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
-STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Hooldusvahemiku ei saa muuta...
+STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Hooldusperioodi ei saa muuta...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Sulge aken
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Akna pealkiri. Liigutamiseks lohista seda hiirega.
 STR_STICKY_BUTTON                                               :{BLACK}Keela selle akna sulgemine 'Sulge kõik aknad' nupu klõpsamisel
 STR_RESIZE_BUTTON                                               :{BLACK}Kliki ja venita, et akna suurust muuta
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Vajuta siia, et minna praegusesse vaikimisi valitud salvestamise/laadimise kausta
-STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Ruudul asuvate hoonete jms. lammutamine
+STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Rajatiste lammutamine
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Maapinna madaldamine
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Maapinna kõrgendamine
 STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Kerimisriba - kerib nimistut üles/alla
@@ -591,14 +591,14 @@ STR_01D7_NEW_STYLE                                              :{TINYFONT}Uus s
 STR_01D8_EZY_STREET                                             :{TINYFONT}Ezy Street
 STR_01D9_CUSTOM_1                                               :{TINYFONT}Omatehtud 1
 STR_01DA_CUSTOM_2                                               :{TINYFONT}Omatehtud 2
-STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Muusika helitugevus
-STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Efektide helitugevus
+STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Muusika valjus
+STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Effektide valjus
 STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}Vähim  '  '  ' '  '  '  Suurim
 STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Eelmine lugu
 STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Järgmine lugu
 STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Lõpeta muusika mängimine
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Alusta muusika mängimist
-STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Muusika ja efektide helitugevuse muutmiseks liiguta liugurit
+STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Muusika ja efektide valjuse muutmiseks liiguta liugurit
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
@@ -835,7 +835,7 @@ STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Näida
 STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Näidatavad sildid
 STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Näidatavad meldepunktid
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Täielik animeerimine
-STR_02D2_FULL_DETAIL                                            :{SETX 12}Kõik täpsustused
+STR_02D2_FULL_DETAIL                                            :{SETX 12}Kõik üksikasjad
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Läbipaistvad hooned
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Läbinähtavad jaama nimesildid
 ############ range ends here
@@ -881,7 +881,7 @@ STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Vali lin

 STR_02F4_AUTOSAVE                                               :{BLACK}Isesalvestus
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Vali automaatselt mängu salvestamise vahemik
+STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Vali intervall, mille järel isesalvestus toimub
 STR_02F7_OFF                                                    :Väljas
 STR_02F8_EVERY_3_MONTHS                                         :Iga 3 kuu tagant
 STR_02F9_EVERY_6_MONTHS                                         :Iga 6 kuu tagant
@@ -915,7 +915,7 @@ STR_JUST_INT                                                    :{NUM}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...saab ehitada ainult linnadesse
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...saab ehitada ainult vihmametsadesse
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...saab ehitada ainult kõrbesse
-STR_0319_PAUSED                                                 :{YELLOW}* *  SEISATUS  *  *
+STR_0319_PAUSED                                                 :{YELLOW}* *  PEATUS  *  *

 STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Ekraanitõmmis edukalt salvestatud nimega '{STRING}'
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Ekraanitõmmise võtmine nurjus!
@@ -1015,8 +1015,8 @@ STR_MONTH_OCT                                                   :Oktoober
 STR_MONTH_NOV                                                   :November
 STR_MONTH_DEC                                                   :Detsember

-STR_HEADING_FOR_STATION                                         :{LTBLUE}Siht: {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Siht: {STATION}, {VELOCITY}
+STR_HEADING_FOR_STATION                                         :{LTBLUE}Sihtpunkt: {STATION}
+STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Sihtpunkt: {STATION}, {VELOCITY}
 STR_NO_ORDERS                                                   :{LTBLUE}Sihtpunkt puudub
 STR_NO_ORDERS_VEL                                               :{LTBLUE}Sihtpunkt puudub, {VELOCITY}

@@ -1063,7 +1063,7 @@ STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Rongi {C
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Mootorsõiduki {COMMA} automaatne uuendamine nurjus (rahapiirang)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Laeva {COMMA} automaatne uuendamine nurjus (rahapiirang)
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Õhusõiduki iseuuendamine nurjus{COMMA} (rahapiirang)
-STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Rong {COMMA} on pärast asendust liiga pikk
+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Rong {COMMA} on peale asendust liiga pikk

 STR_CONFIG_PATCHES                                              :{BLACK}Paikade seadistamine
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Paikade seadistamine
@@ -1076,7 +1076,7 @@ STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Luba eh
 STR_CONFIG_PATCHES_AUTOSLOPE                                    :{LTBLUE}Võimalda maastikujunduse teostust majade, rööbaste jms. all (autoslope): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Võimalda reaalsemaid veekogu alasid: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Luba linnateede, -sildade, -tunnelite jne lammutamine: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Lubatakse väga pikkasid ronge ehitatada: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Luba väga pikkade rongide ehitamine: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Aktiveeri realistlik rongide kiirendamine: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Keela rongidel ja laevadel 90 kraadised pöörded: {ORANGE}{STRING} {LTBLUE} (vajab NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Ühenda üksteise vastu ehitatud jaamad kokku: {ORANGE}{STRING}
@@ -1085,8 +1085,8 @@ STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Kasuta
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Laadi veovahendeid järkjärguliselt: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflatsioon: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Vii kaup jaama ainult siis, kui seal on nõudlus: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Lubatakse väga pikkasid sildu ehitada: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Lubatakse depoosse minemise käsud: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Luba väga pikkade sildade ehitus: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Luba 'mine depoosse' käsud: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Põhiline tööstuse rajamise viis: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :pole
 STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :nagu muud tööstused
@@ -1097,7 +1097,7 @@ STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Olekuri
 STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Paiguta signaalid rööbasteele sõidusuunda arvestades: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Aasta lõpus näidatakse rahavoogude aruannet: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatchiga ühilduv 'mittepeatumine': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Mootorsõidukite järjekorrad (koos mahuefektidega): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Mootorsõidukite järjekorrad (koos mahueffektidega): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Kursoriga ekraaniserva puudutamisel keritakse vaadet: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Luba kohalikule omavalitsusele altkäemaksu maksmine: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE                              :{LTBLUE}Luba eksklusiivseid veoõiguseid osta: {ORANGE}{STRING}
@@ -1110,14 +1110,14 @@ STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Luba ja

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Luba väikesed lennuväljad kuni mängu lõpuni: {ORANGE}{STRING}

-STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Hoiatatakse eksinud rongidest: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Hoiata, kui rong on eksinud: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Sõidukite sihtpunktide ülevaade: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :ei
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :jah, kuid jäta välja seisatud veovahendid
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :kõikidest veovahenditest
-STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Hoiatatakse kahjumlikest rongidest: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Hoiata, kui rong tekitab kahjumit: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Sõidukid ei aegu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Vananenud sõidukite automaatne uuendamine
+STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Uuenda vananemisel veovahendeid ise
 STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Uuenda {ORANGE}{STRING}{LTBLUE} kuud enne/pärast veovahendi suurimat vanust
 STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Iseuuendusele kuluv väikseim summa: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Veateate kuvamise kestus: {ORANGE}{STRING}
@@ -1144,15 +1144,15 @@ STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :Päevapidi
 STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Kõrguse level kui kõrgele lapik kaart läheb: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Suurim jaama ala: {ORANGE}{STRING} {RED}Hoiatus: kõrged seadistused aeglustavad mängu
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Maandumisplatsidel hooldatakse automaatselt helikoptereid: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Hoolda maandumisplatsidel ise helikoptereid: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Liida maastikuriba raudtee/tee/vee/lennujaamade tööriistaribaga: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Vaadet keritakse vastassuunas: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_SCROLLING                             :{LTBLUE}Vaatevälja liigutatakse sujuvalt: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Mitmete ehitusvahendite kasutamisel näidatakse mõõtmise kohtspikrit: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Ettevõtte värve näidatakse: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LIVERIES_NONE                                :Mitte ühelgi
-STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Enda ettevõtel
-STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Kõikidel ettevõttetel
+STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Näita firma livree: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES_NONE                                :Mitte ükski
+STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Enda ettevõte
+STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Kõik ettevõtted
 STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Vajutades <ENTER> eelistatakse meeskonna jututuba: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLLING                        :{LTBLUE}Kerimisrulliku otstarve: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SCROLLWHEEL_ZOOM                             :Suurenda kaarti
@@ -1165,7 +1165,7 @@ STR_CONFIG_PATCHES_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Command+klikk
 STR_CONFIG_PATCHES_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl+klikk
 STR_CONFIG_PATCHES_RIGHT_MOUSE_BTN_EMU_OFF                      :Väljas

-STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME                            :{LTBLUE}Uut mängu alustades seisatatakse automaatselt: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME                            :{LTBLUE}Mängu isepeatamine uue mängu alustamisel: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}Kasuta laiendatud sõidukinimekirja: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_OFF                   :Väljas
 STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_OWN                   :Oma ettevõte
@@ -1175,7 +1175,7 @@ STR_CONFIG_PATCHES_LOADING_INDICATORS_OFF                       :Väljas
 STR_CONFIG_PATCHES_LOADING_INDICATORS_OWN                       :Oma ettevõte
 STR_CONFIG_PATCHES_LOADING_INDICATORS_ALL                       :Kõik ettevõtted
 STR_CONFIG_PATCHES_TIMETABLE_ALLOW                              :{LTBLUE}Luba sõiduplaanide määramine: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS                           :{LTBLUE}Sõiduplaanis kasutatakse päevade asemel tiksumist: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS                           :{LTBLUE}Kasuta sõiduplaanis päevade asemel tikse: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}Algne rööbastee liik (mängu alustamisel/laadimisel): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL                       :Tavaline rööbastee
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL                     :Elektrifitseeritud rööbastee
@@ -1185,7 +1185,7 @@ STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST                      :Esimene saadava
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST                       :Viimane saadaval
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED                  :Enim kasutatud

-STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Ehitustööriistade näitamine ka sobivate sõidukite puudumisel: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Näita ehitustööriistu isegi siis, kui sobivaid sõidukeid veel pole: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Enim ronge mängija kohta: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Enim mootorsõidukeid mängija kohta: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Enim õhusõidukeid mängija kohta: {ORANGE}{STRING}
@@ -1200,25 +1200,25 @@ STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Lülita
 STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Luba TI (AI) võrgumängus (TESTIMISEL!): {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Vaikimisi hooldusintervall rongidele: {ORANGE}{STRING} päeva
-STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Rongide hooldusvahemik vaikimisi: {ORANGE}väljas
+STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Vaikimisi hooldusperiood rongidele: {ORANGE}väljas
 STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Vaikimisi valitud mootorsõidukite hooldusvahemik: {ORANGE}{STRING} päeva
-STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Mootorsõidukite hooldusvahemik vaikimisi: {ORANGE}välja lülitatud
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Vaikimisi valitud õhusõidukite hooldusvahemik: {ORANGE}{STRING} päeva
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Õhusõidukite hooldusvahemik vaikimisi: {ORANGE}väljas
+STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Vaikimisi valitud mootorsõidukite hooldusvahemik: {ORANGE}välja lülitatud
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Vaikimisi valitud õhusõidukite hooldusperiood: {ORANGE}{STRING} päeva
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Vaikimisi valitud õhusõidukite hooldusperiood: {ORANGE}väljas
 STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Vaikimisi hooldusintervall laevadele: {ORANGE}{STRING} päeva
-STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Laevade hooldusvahemik vaikimisi: {ORANGE}väljas
-STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Lülitades rikki minemise välja, keelatakse ka hooldamine: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Vaikimisi hooldusperiood laevadele: {ORANGE}väljas
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Keela hooldus, kui rikkiminemine on välja lülitatud: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Luba vagunite kiiruspiirangud: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Elektrirongide keeld: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Keela elektrirongid: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Värvilised uudised ilmuvad aastast {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Alustamise aeg: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Mäng lõppeb aastal: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Luba sujuv majandus (väiksemad muutused)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Luba teiste ettevõtete aktsiate ostmine
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Venitades rajatavate signaalide paigaldustihedus: {ORANGE}{STRING} ühik(ut)
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Venitades rajatavate signaalide paigutustihedus: {ORANGE}{STRING} ühik(ut)
 STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Semafore ehitatakse enne: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}Signaalide liides sisse: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}Näita signalisatsiooni GUI-d: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_TOWN_LAYOUT_INVALID                          :{WHITE}Stsenaariumiredaktor ei tunnista "ilma teedeta" linnaplaneeringut
 STR_CONFIG_PATCHES_TOWN_LAYOUT                                  :{LTBLUE}Vali linnale teedeplaneering: {ORANGE}{STRING}
@@ -1241,7 +1241,7 @@ STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL                           :Normaalne
 STR_CONFIG_PATCHES_TOWN_GROWTH_FAST                             :Kiire
 STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST                        :Väga Kiire
 STR_CONFIG_PATCHES_LARGER_TOWNS                                 :{LTBLUE}Topeltkiirusel kasvavaid linnu: {ORANGE}1 iga {STRING} linna kohta
-STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED                        :{LTBLUE}Linnadeks kasvavate asulate suhtarv: {ORANGE}Pole
+STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED                        :{LTBLUE}Topeltkiirusel kasvavaid linnu: {ORANGE}puudub
 STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER                         :{LTBLUE}Algne linna suuruse kordaja: {ORANGE}{STRING}
 STR_CONFIG_MODIFIED_ROAD_REBUILD                                :{LTBLUE}Eemalda teedeehituse ajal esinevad tarbetud elemendid

@@ -1252,12 +1252,12 @@ STR_CONFIG_PATCHES_STATIONS                                     :{BLACK}Jaamad
 STR_CONFIG_PATCHES_ECONOMY                                      :{BLACK}Majandus
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Konkurendid

-STR_CONFIG_PATCHES_DISABLED                                     :väljas
+STR_CONFIG_PATCHES_DISABLED                                     :Välja lülitatud
 STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}

 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Muuda seadete väärtusi
-STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Mõni või kõik vaikimisi hooldusvahemikud on kõlbmatud! Lubatud on 5-90% või 30-800 päeva
+STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Mõni või kõik vaikimisi hooldusperioodid on kõlbmatud! Lubatud on 5-90% või 30-800 päeva

 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Rongide rajaleidja: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(ebasoovitatav)
@@ -1284,7 +1284,7 @@ STR_CHEAT_MONEY                                                 :{LTBLUE}Suurend
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Mängi, kui mängija: {ORANGE}{COMMA}
 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_BUILD_IN_PAUSE                                        :{LTBLUE}Pausi ajal ehitamine: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Reaktiivlennukid ei kuku (tihti) alla väikestel lennuväljadel: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Vaheta kliimat: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Muuda kuupäeva: {ORANGE} {DATE_SHORT}
@@ -1358,8 +1358,8 @@ STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vali ehi
 STR_FAST_FORWARD                                                :{BLACK}Mängu aja kiirendamine
 STR_MESSAGE_HISTORY                                             :{WHITE}Sõnumite ajalugu
 STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Nimekiri hiljutistest uudistest
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Kõik välja
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Kõik sisse
+STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Lülita kõik välja
+STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Luba kõik

 STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Kivisöekaevanduse ehitamine
 STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Metsa istutamine
@@ -1385,7 +1385,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Tööstu
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% veetud)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% veetud)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Tööstuste nimed - klõpsates keskendatakse vaade tööstusele

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liiga lähedal mõnele teisele tööstusele

@@ -1394,7 +1393,7 @@ STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Seadista
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali laadung, mida rong peaks kandma
 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_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Hooldusvahemikud on protsentides: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Hooldusperioodid on protsentides: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootlikuse muutmine

 TEMP_AI_IN_PROGRESS                                             :{WHITE}Tervitused uuele TI'le(AI). Töö selle kallal veel käib. Peaksite eeldama, et esineb probleeme. Kui juhtud tegema kuvatõmmise, siis postita see ka foorumisse. Edu!
@@ -1521,7 +1520,7 @@ STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Aita sed
 STR_NETWORK_REFRESH                                             :{BLACK}Värskenda servereid
 STR_NETWORK_REFRESH_TIP                                         :{BLACK}Serveri info värskendamine

-STR_NETWORK_COMPANY_INFO                                        :{SILVER}ETTEVÕTTE ANDMED
+STR_NETWORK_COMPANY_INFO                                        :{SILVER}ETTEVÕTE ANDMED

 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Ettevõtte nimi:  {WHITE}{STRING}
 STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Avamine:  {WHITE}{NUM}
@@ -1534,10 +1533,10 @@ STR_NETWORK_VEHICLES                                            :{SILVER}Sõiduk
 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...
+STR_NETWORK_CONNECTING                                          :{WHITE}Ühendan...

 ############ Leave those lines in this order!!
-STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Ühendumine...
+STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Ühendan...
 STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Kontrollin õigusi...
 STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Ootel...
 STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) kaardi allalaadimine...
@@ -1548,7 +1547,7 @@ STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Hangin m
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hangin ettevõtte infot...
 ############ End of leave-in-this-order
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" i} sinu ees
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}Senini laaditud alla {NUM} / {NUM} kbaiti
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbaiti tõmmatud

 STR_NETWORK_DISCONNECT                                          :{BLACK}Katkesta

@@ -1687,7 +1686,7 @@ STR_1017_MAGLEV_CONSTRUCTION                                    :Magnethõljukte
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Ehita rööbasteed
 STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}Ehita rongidepoo (rongide ehitamiseks ja hoolduseks)
 STR_101A_BUILD_RAILROAD_STATION                                 :{BLACK}Ehita raudteejaam
-STR_101B_BUILD_RAILROAD_SIGNALS                                 :{BLACK}Ehita rööbastee signaale
+STR_101B_BUILD_RAILROAD_SIGNALS                                 :{BLACK}Ehita rööbasteesignaale
 STR_101C_BUILD_RAILROAD_BRIDGE                                  :{BLACK}Ehita raudteesild
 STR_101D_BUILD_RAILROAD_TUNNEL                                  :{BLACK}Ehita rongitunnel
 STR_101E_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Lülitu rööbastee ja signaalide ehitamise ja lammutamise vahel
@@ -1696,16 +1695,16 @@ STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Depoole
 STR_1021_RAILROAD_TRACK                                         :Rööbastee
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Rongidepoo
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...ala kuulub teisele ettevõttele
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Läbisõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Hoiatussignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Väljasõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Mitmiksignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Läbisõidu- ja hoiatussignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Läbisõidu- ja väljasõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Läbisõidu- ja mitmiksignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Hoiatus- ja väljasõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Hoiatus- ja mitmiksignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Väljasõidu- ja mitmiksignaalidega rööbastee osa
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Rööbastee läbisõidusignaalidega
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Rööbastee sissesõidusignaalidega
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Rööbastee väljasõidusignaalidega
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Raudtee mitmiksignaalidega
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Rööbastee läbisõidu- ja hoiatussignaalidega
+STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Rööbastee läbisõidu- ja väljasõidusignaalidega
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Raudtee tava- ja mitmiksignaalidega
+STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Rööbastee hoiatus- ja väljasõidusignaalidega
+STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Raudtee eel- ja mitmiksignaalidega
+STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Raudtee väljumis- ja mitmiksignaalidega
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Raudteejaama peab eelnevalt lammutama


@@ -1768,7 +1767,7 @@ STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLAC
 STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
 STR_2002                                                        :{TINYFONT}{BLACK}{SIGN}
 STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
-STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Hoone tuleb enne lammutada
+STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Ehitis tuleb eelnevalt hävitada
 STR_2005                                                        :{WHITE}{TOWN}
 STR_CITY                                                        :{WHITE}{TOWN} (Linn)
 STR_2006_POPULATION                                             :{BLACK}Rahvaarv: {ORANGE}{COMMA}{BLACK}  Ehitisi: {ORANGE}{COMMA}
@@ -1842,7 +1841,7 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Ehita ettevõtt
 STR_204B_FUND_NEW_BUILDINGS                                     :Rahasta uute hoonete ehitust
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Osta monopoolsed veoõigused
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Paku kohalikule omavalitsusele altkäemaksu
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Pisikese kohaliku reklaamikampaania korraldamine meelitab rohkem reisijaid ja kaupu sinu veoteenuseid kasutama.{}  Hind: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Väikese reklaamikampaania korraldamine rohkemate reisijate ja kaupade meelitamiseks kasutama sinu teenuseid.{}  Hind: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Keskmise reklaamikampaania korraldamine, et meelitada rohkem reisijaid ja kaupu sinu teenuste juurede.{}  Hind: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Suure reklaamikampaania korraldamine, et meelitada rohkem reisijaid ja kaupu sinu teenuste juurede.{}  Hind: {CURRENCY}
 STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Teehoiutööde rahastamine. Põhjustab linnatänavatel tõsiseid liiklusprobleeme kuni 6 kuuks.{}  Hind: {CURRENCY}
@@ -1897,9 +1896,9 @@ STR_TOO_MANY_BUS_STOPS                                          :{WHITE}Liiga pa
 STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}Liiga palju laadimisplatvorme
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Mõnele teisele jaamale liiga lähedal
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
-STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Raudteejaam tuleb enne lammutada
+STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Raudteejaam tuleb eelnevalt lammutada
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Liiga lähedal teisele lennuväljale
-STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Lennuväli tuleb enne lammutada
+STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Lennuväli tuleb eelnevalt lammutada

 STR_3030_RENAME_STATION_LOADING                                 :Jaama nime vahetamine
 STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Jaama nime ei saa vahetada...
@@ -1927,16 +1926,16 @@ STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Bussijaa
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Laadimisplatsi suund
 STR_PASSENGER_TRAM_STATION_ORIENTATION                          :{WHITE}Reisitrammi suund
 STR_CARGO_TRAM_STATION_ORIENT                                   :{WHITE}Kaubatrammi suund
-STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Bussijaam tuleb enne lammutada
-STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Laadimisplats tuleb enne lammutada
-STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Reisitrammijaam tuleb enne lammutada
-STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Kaubatrammijaam tuleb enne lammutada
+STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Bussijaam tuleb enne hävitada
+STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Enne pead laadimisplatsi hävitama
+STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION                        :{WHITE}Reisitrammijaam tuleb eelnevalt lammutada
+STR_MUST_DEMOLISH_CARGO_TRAM_STATION                            :{WHITE}Kaubatrammijaam tuleb eelnevalt lammutada
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} jaam{P "" a}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Puudub -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...ebasobiv koht
-STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Liiga lähedal teisele dokile
-STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Dokk tuleb enne lammutada
+STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Liiga lähedal teisele sadamale
+STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Enne pead sadama hävitama
 STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Raudteejaamale suuna valimine
 STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Vali raudteejaama perroonide arv
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Vali raudteejaama pikkus
@@ -1957,11 +1956,11 @@ STR_305F_AIRCRAFT_HANGAR                                        :Angaar
 STR_3060_AIRPORT                                                :Lennuväli
 STR_3061_TRUCK_LOADING_AREA                                     :Laadimisplats
 STR_3062_BUS_STATION                                            :Bussijaam
-STR_3063_SHIP_DOCK                                              :Laevadokk
+STR_3063_SHIP_DOCK                                              :Laevasadam
 STR_3064_HIGHLIGHT_COVERAGE_AREA                                :{BLACK}Lülita sisse jaama mõjupiirkonna näitamine
 STR_3065_DON_T_HIGHLIGHT_COVERAGE                               :{BLACK}Lülita välja jaama mõjupiirkonna näitamine
 STR_3066_COVERAGE_AREA_HIGHLIGHT                                :{BLACK}Mõjupiirkonna näitamine
-STR_3068_DOCK                                                   :{WHITE}Dokk
+STR_3068_DOCK                                                   :{WHITE}Sadam
 STR_3069_BUOY                                                   :Poi
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...poi on ees
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...jaam on liiga laiaks venitatud
@@ -1973,15 +1972,15 @@ STR_STAT_CLASS_DFLT                                             :Vaikimisi valit
 STR_STAT_CLASS_WAYP                                             :Meldepunktid

 ##id 0x3800
-STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Laevaremonditehase suund
+STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Laevaangaari suund
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...peab ehitama vette
-STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Laevaremonditehast ei saa siia ehitada...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Laevaremonditehase suuna valimine
+STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Siia ei saa laevaangaari ehitada...
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Laevaangaarile suuna valimine
 STR_3804_WATER                                                  :Vesi
 STR_3805_COAST_OR_RIVERBANK                                     :Kallas
-STR_3806_SHIP_DEPOT                                             :Laevaremonditehas
+STR_3806_SHIP_DEPOT                                             :Laevaangaar
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...vette ei saa ehitada
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanal tuleb enne lammutada
+STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanali peab eelnevalt lammutama

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Salvesta mäng
@@ -2088,8 +2087,8 @@ STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Rong tun
 STR_5001_ROAD_VEHICLE_IN_TUNNEL                                 :{WHITE}Sõiduk tunnelis
 STR_5003_ANOTHER_TUNNEL_IN_THE_WAY                              :{WHITE}Teine tunnel on ees
 STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}Ei saa tunneli teise otsa jaoks maad parajaks kaevata
-STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Tunnel tuleb enne lammutada
-STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Sild tuleb enne lammutada
+STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Enne tuleb tunnel hävitada
+STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Enne tuleb sild hävitada
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Ei saa alata ja lõppeda samas kohas
 STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Sillaotsad pole samal kõrgusel
 STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Sild on maastiku suhtes liiga madal
@@ -2160,7 +2159,7 @@ STR_SV_STNAME_EXCHANGE                                          :{STRING} vahetu
 STR_SV_STNAME_AIRPORT                                           :{STRING} lennuväli
 STR_SV_STNAME_OILFIELD                                          :{STRING} naftaväli
 STR_SV_STNAME_MINES                                             :{STRING} kaevandused
-STR_SV_STNAME_DOCKS                                             :{STRING} dokid
+STR_SV_STNAME_DOCKS                                             :{STRING} sadam
 STR_SV_STNAME_BUOY_1                                            :{STRING} poi #1
 STR_SV_STNAME_BUOY_2                                            :{STRING} poi #2
 STR_SV_STNAME_BUOY_3                                            :{STRING} poi #3
@@ -2324,7 +2323,7 @@ STR_7043_FACE_SELECTION                                         :{WHITE}Näo val
 STR_7044_MALE                                                   :{BLACK}Mees
 STR_7045_FEMALE                                                 :{BLACK}Naine
 STR_7046_NEW_FACE                                               :{BLACK}Uus nägu
-STR_7047_CANCEL_NEW_FACE_SELECTION                              :{BLACK}Tühista uue näo valimine
+STR_7047_CANCEL_NEW_FACE_SELECTION                              :{BLACK}Katkesta uue näo valimine
 STR_7048_ACCEPT_NEW_FACE_SELECTION                              :{BLACK}Uue näo valimine
 STR_7049_SELECT_MALE_FACES                                      :{BLACK}Vali mehe nägu
 STR_704A_SELECT_FEMALE_FACES                                    :{BLACK}Vali naise nägu
@@ -2379,7 +2378,7 @@ STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Ettevõt
 STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Vaikimisi määratud ettevõtte salasõna
 STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Kasuta selle ettevõtte salasõna uute ettevõtete vaikimisi määratud salasõnana
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}Majanduslik tagasilöök!{}{}Finantseksperdid ennustavad suurt majanduslangust!
-STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Madalseis on läbi!{}{}Kõrgenenud äritegevusega kaasnev tugevnev majandus julgustab tööstuseid!
+STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Madalseis on läbi!{}{}Suurem kauplemine julgustab majanduse tugevnemisega ettevõtteid!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Lülita aken suureks/väikseks
 STR_7076_COMPANY_VALUE                                          :{GOLD}Firmaväärtus: {WHITE}{CURRENCY}
 STR_7077_BUY_25_SHARE_IN_COMPANY                                :{BLACK}Osta 25% ettevõtte aktsiatest
@@ -2550,8 +2549,8 @@ STR_8078_PLODDYPHUT_MKI_BUS                                     :Ploddyphut MkI
 STR_8079_PLODDYPHUT_MKII_BUS                                    :Ploddyphut MkII buss
 STR_807A_PLODDYPHUT_MKIII_BUS                                   :Ploddyphut MkIII buss
 STR_807B_BALOGH_COAL_TRUCK                                      :Balogh kivisöeveok
-STR_807C_UHL_COAL_TRUCK                                         :Uhl kivisöeveok
-STR_807D_DW_COAL_TRUCK                                          :DW kivisöeveok
+STR_807C_UHL_COAL_TRUCK                                         :Uhl kivisõeveok
+STR_807D_DW_COAL_TRUCK                                          :DW kivisõeveok
 STR_807E_MPS_MAIL_TRUCK                                         :MPS postiauto
 STR_807F_REYNARD_MAIL_TRUCK                                     :Reynard postiauto
 STR_8080_PERRY_MAIL_TRUCK                                       :Perry postiauto
@@ -2694,7 +2693,7 @@ STR_8107_MAGLEV_LOCOMOTIVE                                      :magnethõljukve
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}Linna {TOWN} rongidepoo
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Rahvas rõõmustab. . .{}{STATION} jaama saabus esimene rong!
-STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (täpsustused)
+STR_8802_DETAILS                                                :{WHITE}{VEHICLE} (üksikasjad)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Rong on ees
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
@@ -2790,8 +2789,8 @@ STR_8838_N_A                                                    :N/A{SKIP}
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Rööbassõidukit ei saa müüa...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Ei leia teed kohalikku depoosse
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Ei saa peatada/startida rongi...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA} päeva{BLACK}  Viimati hooldatud: {LTBLUE}{DATE_LONG}
-STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA}%{BLACK}   Viimati hooldatud: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Hooldusperiood: {LTBLUE}{COMMA} päeva{BLACK}  Viimati hooldatud: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Hooldusperiood: {LTBLUE}{COMMA}%{BLACK}   Viimati hooldatud: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Rongid - vajuta rongile info jaoks
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Ehita uued rongid (vajab rongidepood)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Rongid - et andmeid saada, vajuta rongile; liiguta vagunit, et seda rongile lisada või sellelt eemaldada
@@ -2807,11 +2806,11 @@ STR_8848_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Vaate vi
 STR_8849_SEND_TRAIN_TO_DEPOT                                    :{BLACK}Saada rong depoosse
 STR_884A_FORCE_TRAIN_TO_PROCEED                                 :{BLACK}Sunni rongi signaale eirama
 STR_884B_REVERSE_DIRECTION_OF_TRAIN                             :{BLACK}Pööra rong ümber
-STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Näita rongi täpsustusi
-STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Suurenda hooldusvahemiku
-STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Vähenda hooldusvahemiku
-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_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Näita rongi detaile
+STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Suurenda hooldusperioodi
+STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Vähenda hooldusperioodi
+STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Näita detaile viidud kauba kohta
+STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Näita täpsemat infot 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_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Sihtpunktide nimekiri. Valimiseks klõpsa sihtpunktil. CTRL + klikk keskendab vaateakna jaama peale.
@@ -2827,14 +2826,14 @@ 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_885C_BROKEN_DOWN                                            :{RED}Lagunes
 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}Mass: {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_8861_STOPPED                                                :{RED}Peatatud
-STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Rongi ei saa ohu korral sundida signaale eirama...
+STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Ohu korral ei ole võimalik sundida rongi signaale eirama
 STR_8863_CRASHED                                                :{RED}Kokkupõrge!

 STR_8865_NAME_TRAIN                                             :{WHITE}Anna rongile nimi
@@ -2883,7 +2882,7 @@ STR_9004_NEW_VEHICLES                                           :{BLACK}Ostmine
 STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Uued mootorsõidukid
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Ehita veovahend
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Mootorsõidukit ei saa ehitada...
-STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (täpsustused)
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (üksikasjad)
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK}   Käituskulud: {LTBLUE}{CURRENCY}/aastas
 STR_900E_MAX_SPEED                                              :{BLACK}Tippkiirus: {LTBLUE}{VELOCITY}
 STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY}  (eelmisel aastal: {CURRENCY})
@@ -2907,7 +2906,7 @@ STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Näita v
 STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Keskenda vaade veovahendile
 STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Saada sõiduk garaaži. CTRL+klõps, et ainult teenindada.
 STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Sunni veovahendit ümber pöörama
-STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Näita mootorsõiduki täpsustusi
+STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Näita mootorsõiduki üksikasju
 STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Veovahendid - andmete saamiseks klõpsa veovahendile
 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
@@ -2940,26 +2939,26 @@ 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 kaubaliik
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali, millist tüüpi laadungit veovahend veab

 ##id 0x9800
 STR_9800_DOCK_CONSTRUCTION                                      :Sadamate ehitamine
 STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}Sadama ehitus
-STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Dokki ei saa siia ehitada...
-STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Laevaremonditehas
+STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Siia ei saa sadamat ehitada
+STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Laevaangaar
 STR_9804_NEW_SHIPS                                              :{BLACK}Uus laev
 STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} laev{P "" a}
 STR_9808_NEW_SHIPS                                              :{WHITE}Uued laevad
 STR_9809_BUILD_SHIP                                             :{BLACK}Ehita laev
 STR_CLONE_SHIP                                                  :{BLACK}Klooni laev
 STR_CLONE_SHIP_INFO                                             :{BLACK}See ehitab koopia laevast. CTRL-klikk jagab sihtpunkte
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}See ehitab koopia laevast. Vajuta sellele nuppule, ning seejärel laevale laevaremonditehase sees või väljas. Sihtpunkte jagab CTRL-klikk.
+STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}See ehitab koopia laevast. Vajuta sellele nuppule, ning seejärel laevale paadikuuri sees või väljas. CTRL-klikk jagab sihtpunkte
 STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Laev peab olema sadamas peatatud
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Ei saa laeva müüa
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Ei saa laeva ehitada...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Laev on ees
 STR_980F                                                        :{WHITE}{VEHICLE}
-STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (täpsustused)
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (üksikasjad)
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK}   Käituskulud: {LTBLUE}{CURRENCY}/aastas
 STR_9813_MAX_SPEED                                              :{BLACK}Tippkiirus: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY}  (viimasel: {CURRENCY})
@@ -2969,13 +2968,13 @@ STR_9817_CAPACITY                                               :{BLACK}Kandevõ
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Ei saa peatada/käivitada laeva...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Ei saa laeva angaari saata...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Ei leia kohalikku laevaangaari
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse.
-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_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suundub {TOWN}a paadikuuri
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suundub {TOWN}a paadikuuri, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Hooldus linna {TOWN} sadamas
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Hooldus linna {TOWN} sadamas, {VELOCITY}
 STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Laev {COMMA} ootab sadamas
-STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Ehita laevadokk
-STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Ehita laevaremonditehas (laevade ehitamiseks ja hoolduseks)
+STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Ehita laevakuur
+STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Ehita laevaangaar (laevade ehitamiseks ja hoolduseks)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Laevad - info saamiseks klõpsa laevale
 STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Ehita uus laev
 STR_9821_DRAG_SHIP_TO_HERE_TO_SELL                              :{BLACK}Müügiks tiri laev siia
@@ -2988,7 +2987,7 @@ STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Praegune
 STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Näita laeva sihtpunkte
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Vii vaade laeva asukohale
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Saada laev angaari. CTRL+klikk ainult teenindab.
-STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Näita laeva täpsustusi
+STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Näita laeva detaile
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Hind: {CURRENCY} Tippkiirus: {VELOCITY}{}Kandevõime: {CARGO}{}Käituskulud: {CURRENCY}/aastas
 STR_982F_NAME_SHIP                                              :{BLACK}Anna laevale nimi

@@ -3027,7 +3026,7 @@ STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Ei saa e
 STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} lennuk{P "" it}
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (sihtpunktid)
-STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (täpsustused)
+STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (üksikasjad)
 STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK}   Käituskulud: {LTBLUE}{CURRENCY}/aastas
 STR_A00E_MAX_SPEED                                              :{BLACK}Tippkiirus: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Selle aasta kasum: {LTBLUE}{CURRENCY}  (eelmisel aastal: {CURRENCY})
@@ -3060,7 +3059,7 @@ STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Praegune
 STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Näita lennuki sihtpunke
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Vii peavaade lennukile
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Saada lennuk angaari
-STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Näita lennuki täpsustusi
+STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Näita lennuki detaile
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Hind: {CURRENCY} Tippkiirus: {VELOCITY}{}Kandevõime: {COMMA} reisijat, {COMMA} kotti kirju{}Käituskulud: {CURRENCY}/aastas

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Anna lennukile nimi
@@ -3100,8 +3099,8 @@ STR_BRIBE_FAILED                                                :{WHITE}Sinu alt
 STR_BRIBE_FAILED_2                                              :{WHITE}kohalike uurijate poolt avastatud
 STR_BUILD_DATE                                                  :{BLACK}Ehitatud: {LTBLUE}{DATE_LONG}

-STR_PERFORMANCE_DETAIL                                          :{WHITE}Täpsustatud tulemushinnang
-STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Täpsustatud
+STR_PERFORMANCE_DETAIL                                          :{WHITE}Üksikasjalik tulemushinnang
+STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Üksikasjalik
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
@@ -3112,20 +3111,20 @@ STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Jaamu:
 STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Vähim kasum:
 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_DELIVERED                                :{BLACK}Veetud:
 STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Kaupu:
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Raha:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Laen:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Kokku:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Veeremit kokku; sisaldab sõidutee-, rööbastee- ja õhusõidukeid, ning laevu
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Jaamaosade arv. Iga osa jaamast (nt. raudteejaam, bussipeatus, lennujaam) loetakse eraldi, isegi kui need on ühendatud üheks jaamaks
+STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Jaamablokkide arv. Iga osa jaamast (nt. raudteejaam, bussipeatus, lennujaam) loetakse eraldi, isegi kui naad on ühendatud üheks jaamaks
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Kõige väiksema tuluga sõiduki kasum (kõikidest vähemalt 2 aastastest veovahenditest)
 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_MONEY_TIP                                :{BLACK}Rahakogus sellel firmal pangas
+STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Kauba arv, mis on veatud viimase 4 kvartali jooksul
+STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Kauba arv, mis on veatud viimasel kvartalil
+STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Raha arv, mis on sellel firmal pangas
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Selle ettevõtte kogulaen
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Kokku punkte võimalikest punktidest

@@ -3182,7 +3181,7 @@ STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Puuduvat
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Puuduvad GRF failid on välja lülitatud
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Mängu laadimiseks puudu olevad GRF failid
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Puuduolevad GRF failid
-STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Seisatuse lõpetamine võib põhjustada OpenTTD krahhi. Ära teavita järgnevatest krahhidest.{}Oled sa tõepoolest veendunud, et sa soovid seisatuse lõpetada?
+STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Pausi lõpetamine võib põhjustada OpenTTD krahhi. Ära teavita järgnevatest krahhidest.{}Oled sa tõepoolest veendunud, et sa soovid pausi lõpetada?

 STR_NEWGRF_BROKEN                                               :{WHITE}NewGRF '{STRING}' käitumine põhjustab tõenäoliselt sünkrooni katkemisi ja/või mängu kokkujooksmiseid.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Depoost väljas asudes muudab sõiduki '{1:ENGINE}' pikkust.
@@ -3247,16 +3246,16 @@ STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lõpeta
 STR_NOT_REPLACING                                               :{BLACK}Ei asenda praegu
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ühtegi veovahendit pole valitud
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vali asendatav veduritüüp
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vali uus vedur, millega sa soovid vasakult valitud vedurit asendada.
-STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Vajuta lõpetamaks vasakult valitud veduri asendust
-STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Vajuta vasakul asuva veduri asendamiseks paremal valitud veduriga
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vali uus vedur, millega sa soovid vasakult valitud vedurit välja vahetada.
+STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Vajuta lõpetamaks vasakult valitud veduri väljavahetust
+STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Vajuta vasakul asuva veduri väljavahetust paremal valitud veduriga
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vali rööbasteetüüp mille vedureid sa soovid asendada
-STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Näitab mis veduriga soovitakse vasakult valitud vedurit asendada, kui üldse
-STR_REPLACE_HELP                                                :{BLACK}See lubab sul asendada ühe veduritüübi teisega, kui esimest tüüpi rongid sisenevad depoosse
+STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Näitab mis veduriga soovitakse vasakult valitud vedurit vahetada, kui üldse
+STR_REPLACE_HELP                                                :{BLACK}See lubab sul vahetada ühe veduritüübi teisega, kui esimest tüüpi rongid sisenevad depoosse
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagunite eemaldus: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Sunni automaatset asendust hoidma rongi pikkust selleks (eest alustades) veeremit eemaldades, juhul kui uus vagun muudaks rongi pikemaks.
-STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Asendamisel: {ORANGE}{SKIP}{SKIP}{STRING}
-STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} TESTIMISEL! {}Vaheta aken mootori ja vaguni asendamise aknate vahel.{}Vaguni vahetus tehakse ainult siis kui uus vagun suudetakse muuta kandmaks sama tüüpi kaupa kui vana vagun. See valitakse igale vagunile kui tegelik vahetus käib
+STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Sunni isevahetust hoidma rongi pikkust selleks (eest alustades) veeremit eemaldades, juhul kui uus vagun muudaks rongi pikemaks.
+STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Vahetamisel: {ORANGE}{SKIP}{SKIP}{STRING}
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} TESTIMISEL! {}Vaheta aken mootori ja vaguni vahetamise aknate vahel.{}Vaguni vahetus tehakse ainult siis kui uus vagun suudetakse muuta kandmaks sama tüüpi kaupa kui vana vagun. See valitakse igale vagunile kui tegelik vahetus käib
 STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Sõiduk pole saadaval
 STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Sõiduk pole saadaval
 STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Laev pole saadaval
@@ -3412,7 +3411,7 @@ STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Vaheta j
 STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Vaheta puude läbipaistvust
 STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Vaheta majade läbipaistvust
 STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Vaheta tööstusehitiste läbipaistvust
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Vaheta läbipaistvust hoonetel nagu jaamad, depood, vahepunktid ja elektriliinid. CTRL+klõps lukustab.
+STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Vaheta läbipaistvust ehitistel nagu: jaamad, depood, vahepunktid ja elektriliinid
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Vaheta sildade läbipaistvust
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Vaheta läbipaistvust rajatistel, nagu: majakad, antennid ja võimalik, et tulevikus ka silmailu
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Õhuliinide läbipaistvuse vahetamine. CTRL-klahvi toel klõpsamine lukustab.
@@ -3426,16 +3425,16 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}

 ##### Mass Order
-STR_GROUP_NAME_FORMAT                                           :Rühm {COMMA}
+STR_GROUP_NAME_FORMAT                                           :Üksus {COMMA}
 STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Kõik raudteeveerem
 STR_GROUP_ALL_ROADS                                             :Kõik mootorsõidukid
 STR_GROUP_ALL_SHIPS                                             :Kõik laevad
 STR_GROUP_ALL_AIRCRAFTS                                         :Kõik lennukid
-STR_GROUP_DEFAULT_TRAINS                                        :Rühmitamata rongid
-STR_GROUP_DEFAULT_ROADS                                         :Rühmitamata sõidukid
-STR_GROUP_DEFAULT_SHIPS                                         :Rühmitamata laevad
-STR_GROUP_DEFAULT_AIRCRAFTS                                     :Rühmitamata õhusõidukid
+STR_GROUP_DEFAULT_TRAINS                                        :Liigitamata rongid
+STR_GROUP_DEFAULT_ROADS                                         :Liigitamata sõidukid
+STR_GROUP_DEFAULT_SHIPS                                         :Liigitamata laevad
+STR_GROUP_DEFAULT_AIRCRAFTS                                     :Liigitamata õhusõidukid
 STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Kõik jagatud sõidukid
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Eemalda kõik sõidukid
@@ -3444,21 +3443,21 @@ STR_GROUP_TRAINS_CAPTION                                        :{WHITE}{GROUP}
 STR_GROUP_ROADVEH_CAPTION                                       :{WHITE}{GROUP} - {COMMA} Mootorsõiduk{P "" id}
 STR_GROUP_SHIPS_CAPTION                                         :{WHITE}{GROUP} - {COMMA} Laev{P "" ad}
 STR_GROUP_AIRCRAFTS_CAPTION                                     :{WHITE}{GROUP} - {COMMA} Lennuk{P "" id}
-STR_GROUP_RENAME_CAPTION                                        :{BLACK}Rühma nime vahetamine
-STR_GROUP_REPLACE_CAPTION                                       :{WHITE}Asenda kõik rühma "{GROUP}" sõidukid
+STR_GROUP_RENAME_CAPTION                                        :{BLACK}Grupi nime vahetamine
+STR_GROUP_REPLACE_CAPTION                                       :{WHITE}Vaheta kõik grupi "{GROUP}" sõidukid

-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Ei saa rühma luua...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Seda rühma ei saa eemaldada...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Rühma nime ei saa vahetada...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Ei saa kõiki sõidukeid sellest rühmast eemaldada...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Antud sõidukit ei saa sellesse rühma lisada...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Jagatud sõidukeid ei saa rühma lisada...
+STR_GROUP_CAN_T_CREATE                                          :{WHITE}Ei saa üksust luua...
+STR_GROUP_CAN_T_DELETE                                          :{WHITE}Ei saa seda üksust eemaldada...
+STR_GROUP_CAN_T_RENAME                                          :{WHITE}Grupi nime ei saa vahetada...
+STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Ei saa kõiki sõidukeid sellest grupist eemaldada...
+STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Ei saa sõidukit siia üksusesse lisada...
+STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Ei saa jagatud sõidukeid siia üksusesse lisada...

-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Rühm - Klõpsa rühmal, et kõiki seal olevaid sõidukeid järjestada
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klõpsa rühma loomiseks
-STR_GROUP_DELETE_TIP                                            :{BLACK}Eemalda valitud rühm
-STR_GROUP_RENAME_TIP                                            :{BLACK}Valitud rühma nime vahetamine
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klõpsa, et seda rühma üldise automaatse asenduse eest kaitsta
+STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupid - Klõpsa grupil et kõiki seal olevaid sõidukeid järjestada
+STR_GROUP_CREATE_TIP                                            :{BLACK}Klõpsa grupi loomiseks
+STR_GROUP_DELETE_TIP                                            :{BLACK}Eemalda valitud üksus
+STR_GROUP_RENAME_TIP                                            :{BLACK}Valitud grupi nime vahetamine
+STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klõpsa, et seda üksust üldise iseväljavahetuse eest kaitsta

 STR_COMPANY_NAME                                                :{COMPANY}
 STR_ENGINE_NAME                                                 :{ENGINE}
@@ -3487,7 +3486,7 @@ STR_FACE_SIMPLE                                                 :{BLACK}Lihtne
 STR_FACE_SIMPLE_TIP                                             :{BLACK}Lihtne näo valik.
 STR_FACE_LOAD                                                   :{BLACK}Lae
 STR_FACE_LOAD_TIP                                               :{BLACK}Lae lemmik nägu
-STR_FACE_LOAD_DONE                                              :{WHITE}Sinu lemmiknägu on OpenTTD seadistusfailist laaditud.
+STR_FACE_LOAD_DONE                                              :{WHITE}Sinu lemmik nägu on laetud OpenTTD konfiguratsiooni failist.
 STR_FACE_FACECODE                                               :{BLACK}Mängja nägu no.
 STR_FACE_FACECODE_TIP                                           :{BLACK}Vaata või säti näonumbrit
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Vaata või säti näonumbrit
@@ -3529,18 +3528,18 @@ STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Vaheta k
 ########

 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Signaali valik
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Siin ei saa signaale teisendada...
-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_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_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
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Suurenda signaalide paigaldustihedust
+STR_SIGNAL_SELECTION                                            :{WHITE}Signalisatsiooni valimine
+STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Siin ei saa signalisatsiooni teisendada...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Läbisõidusignalisatsioon (semafor){}Signalisatsiooni läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sissesõidusignalisatsioon (semafor){}Roheline, kuni vähemalt üks väljasõidusignalisatsioon on roheline. Muudel juhtudel näitab punast.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Väljasõidusignalisatsioon (semafor){}Käitub samamoodi, nagu tavapärane signalsatsioon, kuid läheb vaja et sissesõidu- ja mitmikeelsignaalid näitaksid õiget värvi.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Mitmiksignalisatsioon (semafor){}Mitmiksignalisatsioon toimib nii sissesõidu-, kui ka läbisõidusignalisatsioonina. See võimaldab ehitada laialiulatuvaid sissesõidusignalisatsioonide
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Läbisõidusignalisatsioon (elektriline){}Signalisatsiooni läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sissesõidusignalisatsioon (elektriline){}Roheline, kuni vähemalt üks väljasõidusignalisatsioon on roheline. Muudel juhtudel näitab punast.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Väljasõidusignalisatsioon (elektriline){}Käitub samamoodi, nagu tavapärane signalsatsioon, kuid läheb vaja et sissesõidu- ja mitmikeelsignaalid näitaksid õiget värvi.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Mitmiksignalisatsioon (elektriline){}Mitmiksignalisatsioon toimib nii sissesõidu-, kui ka läbisõidusignalisatsioonina. See võimaldab ehitada laialiulatuvaid sissesõidusignalisatsioonide harusid.
+STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signalisatsiooni teisendamine{}Kui see on valitud, siis olemasolevad signalisatsioonil klõpsates teisendatakse see määratud signalisatsioonitüübiks ja -variandiks. Samal ajal CTRL klahvi all hoides lülitutakse olemasoleva variandi vahel.
+STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Signalisatsioonide sagedus lohistades
+STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Vähenda signalisatsioonide sagedust lohistades
+STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Suurenda signalisatsioonide sagedust lohistades
 ########
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -586,7 +586,6 @@ STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Vahingo
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Yhtiön tiedot
 STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Avaa / tehtaiden sulkemiset
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Talouden muutokset
-STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Muita muutoksia tuotannossa
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Neuvoja/tietoja pelaajan ajoneuvoista
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Uudet ajoneuvot
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Rahdin vastaanottamisen muutokset
@@ -722,7 +721,6 @@ STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Sijoita
 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_RIVER                                                :{BLACK}Sijoita jokia.
 STR_0290_DELETE                                                 :{BLACK}Poista
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Poista tämä kaupunki kokonaan.
 STR_0292_SAVE_SCENARIO                                          :Tallenna skenaario
@@ -932,7 +930,6 @@ STR_OPTIONS_LANG_TIP                                            :{BLACK}Valitse

 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Koko näyttö
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Laita rasti ruutuun pelataksesi kokoruututilassa.
-STR_FULLSCREEN_FAILED                                           :{WHITE}Täyskuvatila ei toimi

 STR_OPTIONS_RES                                                 :{BLACK}Ruudun erottelukyky
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1042,11 +1039,8 @@ STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatc
 STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Ajoneuvojonotus (kvanttitehostein): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Vieritä ikkunaa, kun hiiri osuu reunaan: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Salli viranomaisten lahjominen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE                              :{LTBLUE}Salli kuljetusyksinoikeuksien ostaminen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY                             :{LTBLUE}Salli rahan lähettäminen muille yhtiöille: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Epäyhtenäiset asemat: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Kerroin rahdin painolle raskaiden junien simuilointiin: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Lentokoneen nopeuskerroin: {ORANGE}1/{STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Läpiajettavat pysäkit kaupungin teille: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Vierekkäiset asemat: {ORANGE}{STRING}

@@ -1199,11 +1193,6 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Muuta asetusarvo
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Osa allaolevista oletushuoltoväleistä ei ole yhteensopivia valitun asetuksen kanssa! 5-90{NBSP}% ja 30-800 päivää ovat oikein.

-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Suositeltu)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF                   :Alkuperäinen {RED}(Ei suositeltu)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Ei suositeltu)
 STR_TEMPERATE_LANDSCAPE                                         :lauhkea maasto
 STR_SUB_ARCTIC_LANDSCAPE                                        :pohjoinen maasto
 STR_SUB_TROPICAL_LANDSCAPE                                      :subtrooppinen maasto
@@ -2298,8 +2287,6 @@ STR_RELOCATE_HQ                                                 :{BLACK}Sijoita
 STR_COMPANY_PASSWORD                                            :{BLACK}Salasana
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Salasanalla voit suojata yhtiösi, jotta kukaan vieras ei pääse liittymään.
 STR_SET_COMPANY_PASSWORD                                        :{BLACK}Aseta yhtiön salasana
-STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Yhtiön salasana
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Yhtiön oletussalasana
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}Maailmanlaajuinen laskukausi!{}{}Rahoitusasiantuntijat pelkäävät pahinta talouden laskiessa!
 STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Laskukausi ohi!{}{}Kaupankäynnin käänne parempaan lisää luottamusta teollisuuteen talouden vahvistuessa!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Suuri/pieni ikkunan koko
@@ -2325,8 +2312,6 @@ STR_LIVERY_EMU                                                  :EMU
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Matkustajavaunu (höyry)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Matkustajavaunu (diesel)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Matkustajavaunu (sähkö)
-STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Matkustajavaunu (Yksiraiteinen)
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Matkustajavaunu (Maglev)
 STR_LIVERY_FREIGHT_WAGON                                        :Rahtivaunu
 STR_LIVERY_BUS                                                  :Linja-auto
 STR_LIVERY_TRUCK                                                :Kuorma-auto
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -780,7 +780,7 @@ STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Afficher le nom des villes
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Afficher le nom des stations
 STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Afficher les panneaux
-STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Afficher les points de contrôle
+STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Afficher les pts de contrôle
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Animation complète
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Détails maximums
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Édifices transparents
@@ -790,7 +790,7 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Nom de
 ############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Outil d'Inspection
 STR_02D6                                                        :
-STR_CONSOLE_SETTING                                             :Afficher/cacher la console
+STR_CONSOLE_SETTING                                             :Afficher la console
 STR_02D7_SCREENSHOT_CTRL_S                                      :Copie d'écran (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Copie géante d'écran (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :À Propos de 'OpenTTD'
@@ -1332,7 +1332,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transporté)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transporté)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Noms des industries - Cliquer sur un nom pour centrer la vue

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...trop proche d'une autre industrie

@@ -1821,10 +1820,10 @@ STR_2804_SITE_UNSUITABLE                                        :{WHITE}...l'end
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Plantation impossible...
 STR_2806                                                        :{WHITE}{SIGN}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...trop de panneaux
-STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Impossible de placer un panneau ici...
+STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Place du panneau impossible...
 STR_280A_SIGN                                                   :Panneau
 STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Editer le texte du panneau
-STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Impossible d'éditer le texte du panneau...
+STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Impossible d'éditer le texte...
 STR_280D_SELECT_TREE_TYPE_TO_PLANT                              :{BLACK}Choix du type d'arbre
 STR_280E_TREES                                                  :Arbres
 STR_280F_RAINFOREST                                             :Forêt tropicale
@@ -1917,7 +1916,7 @@ STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Cliquer

 STR_UNDEFINED                                                   :(chaîne non définie)
 STR_STAT_CLASS_DFLT                                             :Station par défaut
-STR_STAT_CLASS_WAYP                                             :Points de contrôle
+STR_STAT_CLASS_WAYP                                             :Points de passage

 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientation du dépôt
@@ -2754,7 +2753,7 @@ STR_8848_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Centrer
 STR_8849_SEND_TRAIN_TO_DEPOT                                    :{BLACK}Envoyer le train au dépôt. Ctrl-clic pour entretien seul
 STR_884A_FORCE_TRAIN_TO_PROCEED                                 :{BLACK}Forcer le train à continuer sans tenir compte des feux
 STR_884B_REVERSE_DIRECTION_OF_TRAIN                             :{BLACK}Faire faire demi-tour au train
-STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Afficher les détails du train
+STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Afficher les détails
 STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Augmenter l'intervalle d'entretien
 STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Diminuer l'intervalle d'entretien
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Afficher des informations sur les marchandises transportées
@@ -2850,11 +2849,11 @@ STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Impossib
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Véhicules - Cliquer sur un véhicule pour obtenir des informations
 STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Construire de nouveaux véhicules (nécessite un dépôt routier)
 STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Comportement courant du véhicule - cliquer pour le démarrer/l'arrêter
-STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Afficher les ordres du véhicule routier
+STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Afficher les ordres
 STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Centre la vue sur le véhicule
 STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Envoie le véhicule au dépôt. Ctrl-clic pour entretien seul
 STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Force le véhicule à faire demi-tour
-STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Affiche les détails du véhicule routier
+STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Affiche les détails
 STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Véhicules - cliquer pour obtenir des informations
 STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Construire un nouveau véhicule
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Glisser un véhicule jusqu'ici pour le vendre
@@ -2935,7 +2934,7 @@ STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Action c
 STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Afficher les ordres du navire
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrer la vue sur l'emplacement du navire
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Envoyer le navire au dépôt. Ctrl-clic pour entretien seul
-STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afficher les détails du navire
+STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afficher détails du navire
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prix: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {CARGO}{}Coût d'entretien: {CURRENCY}/an
 STR_982F_NAME_SHIP                                              :{BLACK}Nommer navire

@@ -3007,7 +3006,7 @@ STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Action c
 STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Afficher les ordres de l'aéronef
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrer la vue principale sur l'emplacement de l'aéronef
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Envoyer l'aéronef au hangar. Ctrl-clic pour entretien seul
-STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afficher les détails de l'aéronef
+STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afficher détails de l'aéronef
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prix: {CURRENCY}    Vitesse max.: {VELOCITY}{}Capacité: {COMMA} passagers, {COMMA} sacs de courrier{}Coût d'entretien: {CURRENCY}/an

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nommer l'aéronef
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -2,7 +2,7 @@
 ##ownname Deutsch
 ##isocode de_DE
 ##plural 0
-##gender m w n p
+##gender m w n

 #

@@ -10,7 +10,7 @@
 STR_NULL                                                        :
 STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Zu weit vom Spielfeldrand entfernt
 STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Zu nahe am Spielfeldrand
-STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Nicht genug Geld - benötigt {CURRENCY}
+STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Nicht genug Geld - {CURRENCY} erforderlich
 STR_0004                                                        :{WHITE}{CURRENCY}
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Ebenes Land erforderlich
@@ -168,7 +168,7 @@ STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Verlassen
 STR_00C8_YES                                                    :{BLACK}Ja
 STR_00C9_NO                                                     :{BLACK}Nein
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Das Spiel wirklich abbrechen und zu {STRING} zurückkehren?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Sind Sie sicher, dass Sie das Spiel abbrechen und zu {STRING} zurückkehren wollen?
 STR_00CB_1                                                      :{BLACK}1
 STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
@@ -197,7 +197,7 @@ STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Standort
 STR_00E5_CONTOURS                                               :Umrisse
 STR_00E6_VEHICLES                                               :Fahrzeuge
-STR_00E7_INDUSTRIES                                             :Industrien
+STR_00E7_INDUSTRIES                                             :Industrie
 STR_00E8_ROUTES                                                 :Strecken
 STR_00E9_VEGETATION                                             :Vegetation
 STR_00EA_OWNERS                                                 :Eigentümer
@@ -250,7 +250,7 @@ STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFON
 STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Karamellgrube
 STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}Zuckerbergwerk
 STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Bahnhof
-STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}LKW-Ladestation
+STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Lkw-Ladestation
 STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Busbahnhof
 STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Flughafen / Heliport
 STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Hafen
@@ -360,7 +360,7 @@ STR_ABANDON_GAME_QUERY                                          :{YELLOW}Sind Si
 STR_0161_QUIT_GAME                                              :{WHITE}Spiel beenden
 STR_SORT_ORDER_TIP                                              :{BLACK}Sortierreihenfolge auswählen (absteigend/aufsteigend)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Sortierkriterium auswählen
-STR_SORT_BY                                                     :{BLACK}Sortieren
+STR_SORT_BY                                                     :{BLACK}Sortieren nach

 STR_SORT_BY_POPULATION                                          :{BLACK}Bevölkerung
 STR_SORT_BY_PRODUCTION                                          :{BLACK}Produktion
@@ -433,17 +433,17 @@ STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Firmenfi
 STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Allgemeine Firmeninformationen anzeigen
 STR_0179_DISPLAY_GRAPHS                                         :{BLACK}Diagramm anzeigen
 STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Firmentabelle anzeigen
-STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zuglisten der Firmen anzeigen
-STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Fahrzeuglisten der Firmen anzeigen
-STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Schiffslisten der Firmen anzeigen
-STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Flugzeuglisten der Firmen anzeigen
+STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Zuglisten der Firmen
+STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Fahrzeuglisten der Firmen
+STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Schiffslisten der Firmen
+STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Flugzeuglisten der Firmen
 STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Ansicht vergrößern (hereinzoomen)
 STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Ansicht verkleinern (herauszoomen)
 STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Gleise legen
 STR_0182_BUILD_ROADS                                            :{BLACK}Straßen bauen
 STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Hafen bauen
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}Flughafen bauen
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Bäume pflanzen
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Bäume pflanzen, Schilder aufstellen usw.
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Gebietsinformation
 STR_0187_OPTIONS                                                :{BLACK}Einstellungen
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
@@ -473,7 +473,7 @@ STR_AGE                                                         :{COMMA} Jahr{P
 STR_AGE_RED                                                     :{RED}{COMMA} Jahr{P "" e} ({COMMA})
 ############ range for service numbers ends

-STR_019C_ROAD_VEHICLE                                           :Straßenfahrzeug
+STR_019C_ROAD_VEHICLE                                           :Fahrzeug
 STR_019D_AIRCRAFT                                               :Flugzeug
 STR_019E_SHIP                                                   :Schiff
 STR_019F_TRAIN                                                  :Zug
@@ -531,13 +531,13 @@ STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Akzeptie
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Musikbox
 STR_01D3_SOUND_MUSIC                                            :Sound / Musik
-STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Sound- / Musikfenster anzeigen
+STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Zeige Sound- / Musikfenster
 STR_01D5_ALL                                                    :{TINYFONT}Alle
 STR_01D6_OLD_STYLE                                              :{TINYFONT}Traditionell
 STR_01D7_NEW_STYLE                                              :{TINYFONT}Modern
 STR_01D8_EZY_STREET                                             :{TINYFONT}Ezy Street
-STR_01D9_CUSTOM_1                                               :{TINYFONT}Benutzerdef. 1
-STR_01DA_CUSTOM_2                                               :{TINYFONT}Benutzerdef. 2
+STR_01D9_CUSTOM_1                                               :{TINYFONT}Benutzerdefiniert 1
+STR_01DA_CUSTOM_2                                               :{TINYFONT}Benutzerdefiniert 2
 STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Musiklautstärke
 STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Soundlautstärke
 STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}MIN  '  '  ' '  '  '  MAX
@@ -571,7 +571,7 @@ STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Lösche
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Musikeinstellungen speichern
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Klicke auf den Musiktitel, um ihn in das laufende Programm zu übernehmen (nur für Benutzerdefiniert 1 und 2)
 STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Klicke auf einen Musiktitel, um ihn aus der aktuellen Liste zu entfernen(Custom1 or Custom2 only)
-STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Zufällige Wiedergabe an/aus
+STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Schalte Programmauswahl an/aus
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Zeige Musiktitelauswahl
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Klick auf Dienstleistung scrollt Hauptansicht zur Industrie/Stadt
 STR_01FE_DIFFICULTY                                             :{BLACK}Schwierigkeit ({STRING})
@@ -582,14 +582,14 @@ STR_MESSAGE_HISTORY_MENU                                        :Vergangene Nach
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Zeige letzte Mitteilung / Nachricht, Nachrichtenoptionen anzeigen
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Nachrichtenoptionen
 STR_0205_MESSAGE_TYPES                                          :{BLACK}Nachrichtenart:
-STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs an Station des Spielers
-STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs an Station eines Gegners
+STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs in einer Station des Spielers
+STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs in einer Station eines Gegners
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Unfälle / Katastrophen
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Firmendaten
 STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Öffnen und Schließen von Industrien
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Änderungen der Wirtschaftslage
 STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER                           :{YELLOW}Produktionsänderungen bei vom Spieler belieferten Industriebetrieben
-STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Produktionsänderung von Industrien, die ein Gegner bedient
+STR_INDUSTRY_CHANGES_SERVED_BY_OTHER                            :{YELLOW}Produktionsänderungen bei von Wettbewerbern belieferten Industriebetrieben
 STR_OTHER_INDUSTRY_PRODUCTION_CHANGES                           :{YELLOW}Andere Produktionsänderungen
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Rat / Informationen zu Fahrzeugen des Spielers
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Neue Fahrzeuge
@@ -615,7 +615,7 @@ STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} von {COMPANY} erreicht '{STRING}' Status!
 STR_021F                                                        :{BLUE}{COMMA}
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
-STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Szenario Editor
+STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Szenario bearbeiten
 STR_0223_LAND_GENERATION                                        :{WHITE}Land erstellen
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
@@ -724,8 +724,8 @@ STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}Bäume z
 STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Felsige Gebiete in der Landschaft platzieren
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Leuchtturm errichten
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Sender errichten
-STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Wüstengebiet anlegen{}Zum Entfernen Strg-Taste drücken
-STR_CREATE_LAKE                                                 :{BLACK}Wasser erzeugen.{}Baut einen Kanal. Bei gedrückter Strg-Taste wird ein Wasserfeld erzeugt, das umliegendes Land flutet.
+STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Lege Wüstengebiet an.{}STRG drücken zum entfernen
+STR_CREATE_LAKE                                                 :{BLACK}Wasser erzeugen.{}Baut einen Kanal; Bei gedrückter Strg.-Taste wird ein Wasserfeld erzeugt, das umliegendes Land flutet.
 STR_CREATE_RIVER                                                :{BLACK}Flüsse platzieren.
 STR_0290_DELETE                                                 :{BLACK}Löschen
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Diese Stadt vollständig löschen
@@ -1010,7 +1010,7 @@ STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Zug {COM
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Fahrzeug {COMMA} kann nicht erneuert werden (Geld fehlt)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Schiff {COMMA} kann nicht erneuert werden (Geld fehlt)
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Flugzeug {COMMA} kann nicht erneuert werden (Geld fehlt)
-STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Zug {COMMA} nach Ersetzung zu lang
+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Zug {COMMA} nach Erneuerung zu lang

 STR_CONFIG_PATCHES                                              :{BLACK}Einstellungen der Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Einstellungen der Patches
@@ -1018,11 +1018,11 @@ STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Einstell

 STR_CONFIG_PATCHES_OFF                                          :Aus
 STR_CONFIG_PATCHES_ON                                           :An
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Fahrzeuggeschwindigkeit in der Statusleiste anzeigen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Zeige Fahrzeuggeschwindigkeit in der Statusleiste: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Erlaube das Bauen an Hängen und Küsten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSLOPE                                    :{LTBLUE}Landschaftsbau unter Gebäuden, Schienen, usw. erlauben: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSLOPE                                    :{LTBLUE}Erlaube Landschaftsbau unter Gebäuden, Schienen, usw. (autoslope): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Aktiviere realistische Einzugsgebiete: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Entfernung von weiteren Straßen, Brücken, usw. erlauben: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Erlaube die Entfernung von Industrien, weiteren Straßen usw.: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Erlaube das Bauen von sehr langen Zügen: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistische Zugbeschleunigung aktivieren: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Verbiete Zügen und Schiffen 90 Grad Kurven: {ORANGE}{STRING} {LTBLUE} (erfordert NWF)
@@ -1031,17 +1031,17 @@ STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Verlass
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Verbessertes Beladeverfahren nutzen: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Fahrzeuge schrittweise beladen: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Industrien beliefern nur Stationen mit passendem Transport: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Liefere Fracht nur, wenn die Station diese annimmt: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Erlaube das Bauen von sehr langen Brücken: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Erlaube "Gehe zum Depot"-Aufträge im Fahrplan: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Manueller Bau von Rohstoffindustrien: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :nicht erlaubt
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Methode zum manuellen Bau von Primärindustrien: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :keine
 STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :wie andere Industrien
-STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :durch Prospektion
+STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :mit Prospektion
 STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Erlaube mehrere gleichartige Industrien pro Stadt: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Gleiche Industrien können nahe beieinander gebaut werden: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Lange Datumsanzeige in der Statusleiste (links unten): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Signale auf der Seite der Straßenverkehrsrichtung anzeigen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Zeige Signale auf der selben Seite wie den Straßenverkehr: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Zeige Firmenfinanzen am Ende des Jahres: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch kompatibles "Nonstop"-Verhalten: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Fahrzeugwarteschlange (mit Überlagerung): {ORANGE}{STRING}
@@ -1077,8 +1077,8 @@ STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
 STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Maximaler Abstand der Ölraffinerien vom Spielfeldrand: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Schneegrenze auf: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Rauheit (nur TerraGenesis): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Sehr eben
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Eben
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Sehr sanft
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Sanft
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH                   :Rauh
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Sehr rauh
 STR_CONFIG_PATCHES_TREE_PLACER                                  :{LTBLUE}Baumplatzierungsalgorithmus: {ORANGE}{STRING}
@@ -1090,12 +1090,12 @@ STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :links
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :rechts
 STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Höhenstufe des Spielfeldes in einem flachen Szenario: {ORANGE}{STRING}

-STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximale Stationsgröße: {ORANGE}{STRING} {RED}(Hoher Wert verlangsamt das Spiel)
+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximale Stationsgröße: {ORANGE}{STRING} {RED}Achtung: Große Werte verlangsamen das Spiel
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Hubschrauber auf Helipads automatisch warten: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Landschaftsbau-Toolbar an die Bauwerkzeuge binden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Bei Rechtsklick Ansicht in die Gegenrichtung verschieben: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Landschaftsbau-Toolbar an Eisenbahn/Straßen/Hafen/Flughafen-Toolbar binden: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Beim Verschieben mit der Maus die Ansicht in die Gegenrichtung verschieben: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_SCROLLING                             :{LTBLUE}Optimierten Bildlauf in den Ansichten verwenden: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Beim Bauen Tooltip mit Abmessungen anzeigen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Zeige Tooltip mit Abmessungen bei verschiedenen Bauwerkzeugen: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Anzeigen der Firmenlackierungen: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Keine
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Eigene Firma
@@ -1123,7 +1123,7 @@ STR_CONFIG_PATCHES_LOADING_INDICATORS_OWN                       :Eigene Firma
 STR_CONFIG_PATCHES_LOADING_INDICATORS_ALL                       :Alle Firmen
 STR_CONFIG_PATCHES_TIMETABLE_ALLOW                              :{LTBLUE}Fahrpläne für Fahrzeuge aktivieren: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS                           :{LTBLUE}Zeitpläne in Ticks anstatt in Tagen anzeigen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}Gleistyp bei Spielbeginn/geladenem Spiel: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}Standard-Gleistyp (bei Spielbeginn/geladenem Spiel): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL                       :normales Gleis
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL                     :elektrifiziertes Gleis
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL                   :Einschienenbahn
@@ -1132,7 +1132,7 @@ STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST                      :erster verfügb
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST                       :letzter verfügbarer
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED                  :meistbenutzer

-STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Bauwerkzeuge immer anzeigen: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Bauwerkzeuge auch anzeigen, wenn keine passenden Fahrzeuge verfügbar sind: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximale Anzahl der Züge pro Spieler: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximale Anzahl der Straßenfahrzeuge pro Spieler: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Maximale Anzahl der Flugzeuge pro Spieler: {ORANGE}{STRING}
@@ -1146,14 +1146,14 @@ STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Schiffe
 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Aktiviere neue KI (alpha): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Erlaube KI im Mehrspielermodus (experimentell): {ORANGE}{STRING}

-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Vorgegebenes Wartungsintervall für Züge: {ORANGE}{STRING} Tage/%
-STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Vorgegebenes Wartungsintervall für Züge: {ORANGE}abgeschaltet
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Vorgegebenes Wartungsintervall für Fahrzeuge: {ORANGE}{STRING} Tage/%
-STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Vorgegebenes Wartungsintervall für Fahrzeuge: {ORANGE}abgeschaltet
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Vorgegebenes Wartungsintervall für Flugzeuge: {ORANGE}{STRING} Tage/%
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Vorgegebenes Wartungsintervall für Flugzeuge: {ORANGE}abgeschaltet
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Vorgegebenes Wartungsintervall für Schiffe: {ORANGE}{STRING} Tage/%
-STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Vorgegebenes Wartungsintervall für Schiffe: {ORANGE}abgeschaltet
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Vorgegebener Wartungsintervall für Züge: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Vorgegebener Wartungsintervall für Züge: {ORANGE}abgeschaltet
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Vorgegebener Wartungsintervall für Straßenfahrzeuge: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Vorgegebener Wartungsintervall für Fahrzeuge: {ORANGE}abgeschaltet
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Vorgegebener Wartungsintervall für Flugzeuge: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Vorgegebener Wartungsintervall für Flugzeuge: {ORANGE}abgeschaltet
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Vorgegebener Wartungsintervall für Schiffe: {ORANGE}{STRING} Tage
+STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Vorgegebener Wartungsintervall für Schiffe: {ORANGE}abgeschaltet
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Wartung deaktivieren, wenn Pannen abgeschaltet: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Berücksichtige Waggonhöchstgeschwindigkeit: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Deaktiviere elektrifizierte Strecken: {ORANGE}{STRING}
@@ -1280,7 +1280,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Zufälli
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Zufällige Baumart pflanzen

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kanal kann hier nicht gebaut werden...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Kanäle bauen.
+STR_BUILD_CANALS_TIP                                            :{BLACK}Kanalbau.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Schleuse kann hier nicht gebaut werden...
@@ -1332,7 +1332,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transportiert)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transportiert)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrienamen - Klick auf den Namen scrollt Hauptansicht zur Industrie

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zu nah an einer anderen Industrie

@@ -1398,7 +1397,7 @@ STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Neues Sp
 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spielname:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Der Name des Spieles wird anderen Spielern im Mehrspielerdialog angezeigt
 STR_NETWORK_SET_PASSWORD                                        :{BLACK}Passwort setzen
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Ein Passwort verhindert, dass unbefugte Leute beitreten.
+STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Vergebe ein Passwort, um zu verhindern, dass unbefugte Leute beitreten können
 STR_NETWORK_SELECT_MAP                                          :{BLACK}Spielfeld auswählen:
 STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Welches Spielfeld soll verwendet werden?
 STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
@@ -1627,7 +1626,7 @@ STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Gleise k
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Gleise können nicht abgerissen werden...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Signale können hier nicht entfernt werden...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Zugdepotausrichtung
-STR_1015_RAILROAD_CONSTRUCTION                                  :Gleisbau
+STR_1015_RAILROAD_CONSTRUCTION                                  :Eisenbahnbau
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Bau elektrifizierter Strecken
 STR_1016_MONORAIL_CONSTRUCTION                                  :Einschienenbahnbau
 STR_1017_MAGLEV_CONSTRUCTION                                    :Magnetschwebebahnbau
@@ -1646,13 +1645,13 @@ STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...Gelä
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Gleis mit normalen Signalen
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Gleis mit Vorsignalen
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Gleis mit Ausfahrsignalen
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Gleis mit Kombinationssignalen
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Gleise mit Kombinationssignalen
 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Gleis mit Vor- und Hauptsignalen
 STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Gleis mit Haupt- und Ausfahrsignalen
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Gleis mit normalen und Kombinationssignalen
+STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Gleise mit normalen und Kombinationssignalen
 STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Gleis mit Vor- und Ausfahrsignalen
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Gleis mit Vor- und Kombinationssignalen
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Gleis mit Ausfahr- und Kombinationssignalen
+STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Gleise mit Vor-  und Kombinationssignalen
+STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Gleise mit Ausfahr- und Kombinationssignalen
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Bahnhof muss erst abgerissen werden


@@ -1717,7 +1716,6 @@ STR_2002                                                        :{TINYFONT}{BLAC
 STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Gebäude muss erst abgerissen werden
 STR_2005                                                        :{WHITE}{TOWN}
-STR_CITY                                                        :{WHITE}{TOWN} (Stadt)
 STR_2006_POPULATION                                             :{BLACK}Bevölkerung: {ORANGE}{COMMA}{BLACK}  Häuser: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Stadt umbenennen
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Die Stadt kann nicht umbenannt werden...
@@ -1850,9 +1848,9 @@ STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Flughafe

 STR_3030_RENAME_STATION_LOADING                                 :Station/Ladeplatz umbenennen
 STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Station kann nicht umbenannt werden...
-STR_3032_RATINGS                                                :{BLACK}Bewertung
+STR_3032_RATINGS                                                :{BLACK}Einschätzung
 STR_3033_ACCEPTS                                                :{BLACK}Akzeptiert
-STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Örtliche Bewertung der Dienstleistungen:
+STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Örtliche Bewertung der Transportunternehmen:

 ############ range for rating starts
 STR_3035_APPALLING                                              :Furchtbar
@@ -1913,7 +1911,7 @@ STR_3069_BUOY                                                   :Boje
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...Boje ist im Weg
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...Bahnhof ist zu groß
 STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ungleichförmige Stationen deaktiviert
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Strg gedrückt halten, um mehrere Einträge auszuwählen
+STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}STRG gedrückt halten um mehrere Einträge auszuwählen

 STR_UNDEFINED                                                   :(nicht definierter Wert)
 STR_STAT_CLASS_DFLT                                             :Standardstation
@@ -1969,7 +1967,7 @@ STR_4809_PRINTING_WORKS                                         :{G=w}Druckerei
 STR_480A_STEEL_MILL                                             :{G=n}Stahlwalzwerk
 STR_480B_FARM                                                   :{G=m}Bauernhof
 STR_480C_COPPER_ORE_MINE                                        :{G=n}Kupfererzbergwerk
-STR_480D_OIL_WELLS                                              :{G=p}Ölquellen
+STR_480D_OIL_WELLS                                              :{G=w}Ölquellen
 STR_480E_BANK                                                   :{G=w}Bank
 STR_480F_FOOD_PROCESSING_PLANT                                  :{G=w}Nahrungsmittelfabrik
 STR_4810_PAPER_MILL                                             :{G=w}Papiermühle
@@ -2012,8 +2010,8 @@ STR_4828_PRODUCES                                               :{BLACK}Produzie
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion im letzten Monat:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% befördert)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Hauptansicht zum Industriegebiet scrollen
-STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Neue{G r "" s ""} {STRING} {G 0 wird wird wird werden} nahe {TOWN} gebaut!
-STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Neue{G r "" s ""} {STRING} {G 0 wird wird wird werden} nahe {TOWN} aufgeforstet!
+STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Neue{G r "" s} {STRING} wird nahe {TOWN} gebaut!
+STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Neue{G r "" s} {STRING} wird nahe {TOWN} aufgeforstet!
 STR_482F_COST                                                   :{BLACK}Kosten: {YELLOW}{CURRENCY}
 STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Industrie kann hier nicht gebaut werden...
 STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...Wald kann nur oberhalb der Schneegrenze gepflanzt werden
@@ -2136,7 +2134,7 @@ STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Speicher
 STR_6801_EASY                                                   :{BLACK}Leicht
 STR_6802_MEDIUM                                                 :{BLACK}Normal
 STR_6803_HARD                                                   :{BLACK}Schwer
-STR_6804_CUSTOM                                                 :{BLACK}Individuell
+STR_6804_CUSTOM                                                 :{BLACK}Benutzerdefiniert
 ############ range for difficulty levels ends

 ############ range for difficulty settings starts
@@ -2315,8 +2313,8 @@ STR_706F_BUILD_HQ                                               :{BLACK}Firmensi
 STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Firmensitz bauen / anzeigen
 STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Errichte Firmensitz für 1% des Firmenwertes an anderer Stelle neu.
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Firmensitz kann nicht gebaut werden ...
-STR_7072_VIEW_HQ                                                :{BLACK}Firmensitz
-STR_RELOCATE_HQ                                                 :{BLACK}verlegen
+STR_7072_VIEW_HQ                                                :{BLACK}Firmensitz anzeigen
+STR_RELOCATE_HQ                                                 :{BLACK}Firmensitz verlegen
 STR_COMPANY_PASSWORD                                            :{BLACK}Passwort
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Sie können Ihre Firma mit einem Passwort schützen, sodass nur ausgewählte Spieler beitreten können.
 STR_SET_COMPANY_PASSWORD                                        :{BLACK}Firmenpasswort setzen
@@ -2349,9 +2347,9 @@ STR_LIVERY_DMU                                                  :VT
 STR_LIVERY_EMU                                                  :ET
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passagierwagen (Dampf)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passagierwagen (Diesel)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passagierwagen (elektr.)
-STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Passagierwagen (Einsch.)
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Passagierwagen (Magnet.)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passagierwagen (elektrisch)
+STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Reisezugwagen (Einschienenbahn)
+STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Reisezugwagen (Magnetschwebebahn)
 STR_LIVERY_FREIGHT_WAGON                                        :Güterwaggon
 STR_LIVERY_BUS                                                  :Bus
 STR_LIVERY_TRUCK                                                :Lastwagen
@@ -2370,7 +2368,7 @@ STR_LIVERY_SHIP_TIP                                             :{BLACK}Schiffsf
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Flugzeugfarbschema anzeigen
 STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Wähle die Hauptfarbe für das gewählte Schema aus.
 STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Wähle die Nebenfarbe für das ausgewählte Schema.
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Wähle ein Farbschema oder mehrere Farbschemen(mit Strg+Klick) aus, um diese zu ändern. Klicke in das Kästchen um ein Schema zu aktivieren.
+STR_LIVERY_PANEL_TIP                                            :{BLACK}Wähle ein Farbschema oder mehrere Farbschemen(mit STRG+Klick) aus, um diese zu ändern. Klicke in das Kästchen um ein Schema zu aktivieren.

 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (Dampf)
@@ -2630,7 +2628,7 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Tricario Hubsch
 STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2 Hubschrauber
 STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut Hubschrauber
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Nachricht vom Fahrzeughersteller
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Wir haben {G "einen" "eine" "ein" ""} neue{G n "" s ""} {0:STRING} entwickelt. {}Sind Sie daran interessiert, {G 0 den die das die} {0:STRING} ein Jahr lang exklusiv zu nutzen, so dass wir die Funktionen testen können, bevor {G 0 er sie es sie} allgemein zur Verfügung gestellt {G 0 wird wird wird werden}?
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Wir haben ein{G en e ""} neue{G n "" s} {STRING} entwickelt. {}Sind Sie daran interessiert, das Fahrzeug ein Jahr lang exklusiv zu nutzen, so dass wir die Funktionen testen können, bevor es allgemein zur Verfügung gestellt wird?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :{G=w}Lokomotive
 STR_8103_ROAD_VEHICLE                                           :{G=n}Fahrzeug
 STR_8104_AIRCRAFT                                               :{G=n}Flugzeug
@@ -2694,17 +2692,17 @@ STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Neue Mag
 STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Eisenbahnfahrzeuge

 STR_881F_BUILD_VEHICLE                                          :{BLACK}Fahrzeug bauen
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Fahrzeug kopieren
+STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Fahrzeug duplizieren
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Baut eine Kopie des Fahrzeuges. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Baut eine Kopie des Fahrzeuges. Klicke diese Schaltfläche und dann auf ein Fahrzeug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_TRAIN                                                 :{BLACK}Zug kopieren
+STR_CLONE_TRAIN                                                 :{BLACK}Zug duplizieren
 STR_CLONE_TRAIN_INFO                                            :{BLACK}Baut eine Kopie des Zuges mit allen Waggons. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Baut eine Kopie des Zuges mit allen Waggons. Klicke diese Schaltfläche und dann auf einen Zug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_8820_RENAME                                                 :{BLACK}Umbenennen
 STR_8823_SKIP                                                   :{BLACK}Überspringen
 STR_8824_DELETE                                                 :{BLACK}Löschen
 STR_8825_NON_STOP                                               :{BLACK}ohne Halt
-STR_8826_GO_TO                                                  :{BLACK}Gehe zu
+STR_8826_GO_TO                                                  :{BLACK}Nach
 STR_8827_FULL_LOAD                                              :{BLACK}Beladen
 STR_8828_UNLOAD                                                 :{BLACK}Entladen
 STR_REFIT                                                       :{BLACK}Umrüsten
@@ -2776,8 +2774,8 @@ STR_SERVICE_HINT                                                :{BLACK}Überspr
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kosten: {CURRENCY}   Gewicht: {WEIGHT_S}{}Geschwindigk.: {VELOCITY} Leistung: {POWER}{}Betriebskosten: {CURRENCY} pro Jahr{}Kapazität: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Panne
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY} pro Jahr
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S}  {BLACK}Leistung: {LTBLUE}{POWER}{BLACK}  Höchstgeschwindigkeit: {LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S}  {BLACK}Leistung: {LTBLUE}{POWER}{BLACK}  Geschw.: {LTBLUE}{VELOCITY}  {BLACK}Zugkraft: {LTBLUE}{FORCE}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S}  {BLACK}Leistung: {LTBLUE}{POWER}{BLACK}  Höchstgeschwindigk.: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Leistung: {LTBLUE}{POWER}{BLACK} Höchstgeschw.: {LTBLUE}{VELOCITY} {BLACK}Max. Zugkraft: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Gewinn lfd. Jahr: {LTBLUE}{CURRENCY}  (vergangenes Jahr: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Zuverlässigkeit: {LTBLUE}{COMMA}% {BLACK}Ausfälle seit letzter Wartung: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Angehalten
@@ -2794,7 +2792,7 @@ STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Zugtyp k
 STR_MAKE_THE_HIGHLIGHTED_ORDER                                  :{BLACK}Beim markierten Eintrag wird die Ladung in den Bahnhof entladen (für späteren Weitertransport)
 STR_TRANSFER                                                    :{BLACK}Umladen
 STR_CLEAR_TIME                                                  :{BLACK}Zeit löschen
-STR_RESET_LATENESS                                              :{BLACK}Verspätung löschen
+STR_RESET_LATENESS                                              :{BLACK}Verspätungszähler zurücksetzen

 STR_TRAIN_STOPPING                                              :{RED}Halte an
 STR_TRAIN_STOPPING_VEL                                          :{RED}Halte an, {VELOCITY}
@@ -2802,9 +2800,9 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :inkompatible Gl
 STR_TRAIN_NO_POWER                                              :{RED}Keine Energie
 STR_TRAIN_START_NO_CATENARY                                     :Wegen fehlender Oberleitung kann der Zug nicht starten.

-STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Neue{G r "" s ""} {STRING} jetzt erhältlich!
+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Neue{G r "" s} {STRING} jetzt erhältlich!
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{ENGINE}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Neue{G r "" s ""} {STRING} jetzt erhältlich!  -  {ENGINE}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Neue{G r "" s} {STRING} jetzt erhältlich!  -  {ENGINE}

 STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kann dieses Schrottfahrzeug nicht mehr verkaufen ...
 STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kann zerstörtes Fahrzeug nicht nachrüsten...
@@ -2818,7 +2816,7 @@ STR_TIMETABLE_STATUS_LATE                                       :Dieses Fahrzeug
 STR_TIMETABLE_STATUS_EARLY                                      :Dieses Fahrzeug ist {STRING} zu früh
 STR_TIMETABLE_TOTAL_TIME                                        :Dieser Fahrplan benötigt {STRING}
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :Dieser Fahrplan benötigt mindestens {STRING} (nicht alle geplant)
-STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autom.
+STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autom. ausfüllen
 STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fahrplan automatisch mit den Ergebnissen der ersten Fahrt ergänzen

 ##id 0x9000
@@ -2898,7 +2896,7 @@ STR_9804_NEW_SHIPS                                              :{BLACK}Neue Sch
 STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Schiff{P "" e}
 STR_9808_NEW_SHIPS                                              :{WHITE}Neue Schiffe
 STR_9809_BUILD_SHIP                                             :{BLACK}Schiff bauen
-STR_CLONE_SHIP                                                  :{BLACK}Schiff kopieren
+STR_CLONE_SHIP                                                  :{BLACK}Schiff duplizieren
 STR_CLONE_SHIP_INFO                                             :{BLACK}Baut eine Kopie des Schiffes. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Baut eine Kopie des Schiffes. Klicke diese Schaltfläche und dann auf eine Schiff innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Schiff muss in der Werft angehalten werden
@@ -2965,7 +2963,7 @@ STR_A000_AIRPORTS                                               :{WHITE}Flughäf
 STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Flughafen kann hier nicht gebaut werden...
 STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION} Flugzeughangar
 STR_A003_NEW_AIRCRAFT                                           :{BLACK}Neue Flugzeuge
-STR_CLONE_AIRCRAFT                                              :{BLACK}Flugzeug kopieren
+STR_CLONE_AIRCRAFT                                              :{BLACK}Flugzeug duplizieren
 STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Baut eine Kopie des Flugzeuges. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Baut eine Kopie des Flugzeuges. Klicke auf diese Schaltfläche und dann auf ein Flugzeug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Neue Flugzeuge
@@ -3078,7 +3076,7 @@ STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Erreicht

 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF-Einstellungen
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF-Einstellungen
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Übernehmen
+STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Änderungen anwenden
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Parameter setzen
 STR_NEWGRF_TIP                                                  :{BLACK}Eine Liste aller NewGRF-Sets, die installiert sind. Per Klick auswählen.
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Keine NewGRF-Dateien installiert. Bitte Installationsanleitung im Handbuch nachschlagen.
@@ -3131,10 +3129,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Es fehle
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}GRF-Datei(en) fehlen
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Das beenden der PAuse kann OpenTTD zum Abstürzen bringen. Bitte sende keine Fehlerberichte bei auftretenden Fehlern. {}Willst du die Pause wirklich beenden?

-STR_NEWGRF_BROKEN                                               :{WHITE}Verhalten des NewGRFs '{STRING}' wird voraussichtlich zu Synchronisationsfehlern und/oder Absturz des Spiels führen.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Verändert die Fahrzeuglänge von '{1:ENGINE}' außerhalb eines Depots.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Zug '{VEHICLE}' der Firma '{COMPANY}' hat eine ungültige Länge. Vermutlich ein NewGRF Problem. Spiel kann desynchronisieren oder abstürzen.
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spiel wurde in einer Version ohne Straßenbahnunterstützung gespeichert. Alle Straßenbahnen wurden entfernt.
 STR_CURRENCY_WINDOW                                             :{WHITE}Eigene Währung
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wechselkurs: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Trennsymbol:
@@ -3189,8 +3183,8 @@ STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} Flugzeug

 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING} ersetzen
-STR_REPLACE_VEHICLES_START                                      :{BLACK}Fahrzeugersetzung an
-STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Fahrzeugersetzung aus
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Fahrzeugersetzung aktivieren
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Fahrzeugersetzung deaktivieren
 STR_NOT_REPLACING                                               :{BLACK}Keine Ersetzung
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Kein Fahrzeug gewählt
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Zu ersetzenden Loktyp auswählen
@@ -3242,15 +3236,15 @@ STR_MAGLEV_VEHICLES                                             :Magnetschwebeba
 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}Geschw.: {GOLD}{VELOCITY}{BLACK}  Leistung: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Geschwindigk.: {GOLD}{VELOCITY}{BLACK}   Leistung: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Geschwindigkeit: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Betriebskosten: {GOLD}{CURRENCY} pro Jahr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapazität: {GOLD}{CARGO} {STRING}
-STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Entwurf: {GOLD}{NUM}{BLACK} Betriebsdauer: {GOLD}{COMMA} Jahre
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Entwurf: {GOLD}{NUM}{BLACK} Lebensdauer: {GOLD}{COMMA} Jahre
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Zuverlässigkeit: {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_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Geschw.: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY}{BLACK} Geschwindigk.: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapazität: {GOLD}{COMMA} Passagiere, {COMMA} Postsäcke
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Angetriebene Waggons: {GOLD}+{POWER}{BLACK} Gewicht: {GOLD}+{WEIGHT_S}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Umrüstbar auf: {GOLD}
@@ -3278,7 +3272,7 @@ STR_HEIGHTMAP_ROTATION                                          :{BLACK}Reliefka
 STR_TERRAIN_TYPE                                                :{BLACK}Landschaftstyp:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Gewässermenge:
 STR_SMOOTHNESS                                                  :{BLACK}Weichheit:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Schneegrenze:
+STR_SNOW_LINE_HEIGHT                                            :{BLACK}Schneegrenze
 STR_DATE                                                        :{BLACK}Datum:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}Städteanzahl:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Industriedichte:
@@ -3362,7 +3356,7 @@ STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Transpar
 STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Transparenz für Gebäude wie Bahnhöfe, Depots, Wegpunkte und Oberleitung einstellen
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Transparenz für Brücken einstellen
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Transparenz für Bauten wie Leuchttürme und Antennen, evtl. in der Zukunft auch für Sehenswürdigkeiten, einstellen
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Transparente Oberleitungen. Strg+Klick zum feststellen.
+STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Transparente Oberleitungen. Strg.+klick zum feststellen.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Transparenz für Ladestandsanzeige einstellen

 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3435,7 +3429,7 @@ STR_FACE_SIMPLE_TIP                                             :{BLACK}Einfache
 STR_FACE_LOAD                                                   :{BLACK}Laden
 STR_FACE_LOAD_TIP                                               :{BLACK}Lade bevorzugtes Gesicht
 STR_FACE_LOAD_DONE                                              :{WHITE}Dein bevorzugtes Gesicht wurde aus der OpenTTD-Konfigurationsdatei geladen.
-STR_FACE_FACECODE                                               :{BLACK}Gesichtsnummer
+STR_FACE_FACECODE                                               :{BLACK}Nummer des Gesichts
 STR_FACE_FACECODE_TIP                                           :{BLACK}Betrachte / Setze Nummer des Gesichts
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Betrachte / Setze Nummer des Gesichts
 STR_FACE_FACECODE_SET                                           :{WHITE}Neue Nummer wurde für das Gesicht registriert.
@@ -3451,7 +3445,7 @@ STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nein
 STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Erlaube Schnauzbart oder Ohrring
 STR_FACE_HAIR                                                   :Frisur:
-STR_FACE_HAIR_TIP                                               :{BLACK}Frisur ändern
+STR_FACE_HAIR_TIP                                               :{BLACK}Frisur
 STR_FACE_EYEBROWS                                               :Augenbrauen:
 STR_FACE_EYEBROWS_TIP                                           :{BLACK}Augenbrauen ändern
 STR_FACE_EYECOLOUR                                              :Augenfarbe:
@@ -3486,7 +3480,7 @@ STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standard
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Einfahrsignal (Lichtsignal){}Zeigt grün, wenn im folgenden Block mindestens Ausfahrsignal grün zeigt. Andernfalls zeigt es rot.
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Ausfahrsignal (Lichtsignal){}Verhält sich wie ein normales Signal, gibt jedoch das Signal an Einfahr- und Combosignale im vorherliegenden Block weiter.
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combosignal (Lichtsignal){}Das Combosignal ist gleichzeitig Ausfahr- und Einfahrsignal. Somit werden umfangreiche Signalverschaltungen möglich.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signalumbau{}Wenn ausgewählt, werden bestehende Signale durch Anklicken zum ausgewählten Signaltyp umgebaut. Strg+Klicken ändert die bestehende Bauform.
+STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signalumbau{}Wenn ausgewählt, werden bestehende Signale durch Anklicken zum ausgewählten Signaltyp umgebaut. Strg.+Klicken ändert die bestehende Bauform.
 STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Abstand der Signale
 STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Signalabstand verringern
 STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Signalabstand erhöhen
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -1083,8 +1083,8 @@ STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Foltok b
 STR_CONFIG_PATCHES_OFF                                          :Ki
 STR_CONFIG_PATCHES_ON                                           :Be
 STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Járművek sebességének kijelzése: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Lejtőre és partokra építés: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSLOPE                                    :{LTBLUE}Épületek, sínek alatti tereprendezés engedélyezése (autoslope): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Lejtőre es partokra építés: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSLOPE                                    :{LTBLUE}Épületek, sinek alatti tereprendezés engedélyezése (autoslope): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Élethűbben méretezett befogadókörzetek bekapcsolása: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Engedélyezi az ipari létesítmények és utak rombolását, stb: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Óriásvonatok engedélyezése: {ORANGE}{STRING}
@@ -1190,7 +1190,7 @@ STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS                           :{LTBLUE}Menetre
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE                            :{LTBLUE}Alapértelmezett síntipus (játéktöltés/új játék után): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL                       :Normál sín
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL                     :Elektromos sín
-STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL                   :Egysínű
+STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL                   :Egysín
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV                     :Maglev
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST                      :Első elérhető
 STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST                       :Utolsó elérhető
@@ -1396,7 +1396,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Gazdasá
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% elszállítva)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% elszállítva)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Gazdasági épületek listája - a névre kattintva a fő nézetet a választott objektumra irányíthatod

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...túl közel egy másik gazdasági épülethez

@@ -1427,7 +1426,7 @@ STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Saját s
 STR_NETWORK_GAME_NAME                                           :{BLACK}Név
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Játék neve
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Nyelv, szerver verzió, stb.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Kattints a listában a játékra hogy kiválaszd
+STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Kattints a listában a jatékra hogy kiválaszd

 STR_NETWORK_FIND_SERVER                                         :{BLACK}Szerver keresése
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Szerver keresése a hálózaton
@@ -1492,8 +1491,8 @@ STR_NETWORK_LANG_ANY                                            :Bármilyen
 STR_NETWORK_LANG_ENGLISH                                        :Angol
 STR_NETWORK_LANG_GERMAN                                         :Német
 STR_NETWORK_LANG_FRENCH                                         :Francia
-STR_NETWORK_LANG_BRAZILIAN                                      :Brazil
-STR_NETWORK_LANG_BULGARIAN                                      :Bolgár
+STR_NETWORK_LANG_BRAZILIAN                                      :Brazíl
+STR_NETWORK_LANG_BULGARIAN                                      :Bulgár
 STR_NETWORK_LANG_CHINESE                                        :Kínai
 STR_NETWORK_LANG_CZECH                                          :Cseh
 STR_NETWORK_LANG_DANISH                                         :Dán
@@ -1526,7 +1525,7 @@ STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Egy list
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Új vállalat
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Új vállalatot nyit
 STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Játék megvizsgálása
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Megtekinted a játékot mint megfigyelő
+STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Megtekinted a játékot mint vizsgálóbiztos
 STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Belépés a cégbe
 STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Segítesz valakinek egy cégénél (többen 1 céget)
 STR_NETWORK_REFRESH                                             :{BLACK}Szerver frissítése
@@ -2225,7 +2224,7 @@ STR_SV_STNAME_UPPER                                             :{STRING}-felső
 STR_SV_STNAME_LOWER                                             :{STRING}-alsó
 STR_SV_STNAME_HELIPORT                                          :{STRING}i helikopter-leszálló
 STR_SV_STNAME_FOREST                                            :{STRING}i erdőség
-STR_SV_STNAME_FALLBACK                                          :{STRING} {NUM}. állomás
+STR_SV_STNAME_FALLBACK                                          :{STRING}{NUM}. állomás

 ############ end of savegame specific region!

--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -1333,7 +1333,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% trasportato)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% trasportato)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomi delle industrie - fare clic su un nome per centrare la visuale sull'industria

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...troppo vicina ad un'altra industria

@@ -1896,7 +1895,7 @@ STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centra l
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Mostra la valutazione della stazione
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Cambia il nome della stazione
 STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Mostra la lista delle merci accettate
-STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Nomi delle stazioni - fare clic su un nome per centrare la visuale sulla stazione
+STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Nomi delle stazioni - fare clic su un nome per centrare la visuale principale sulla stazione
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Seleziona dimensione/tipo di aeroporto
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
@@ -2681,7 +2680,7 @@ STR_UNKNOWN_DESTINATION                                         :destinazione sc
 STR_8812_EMPTY                                                  :{LTBLUE}Vuoto
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} da {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} da {STATION} (x{NUM})
-STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Il Treno {COMMA} ha raggiunto il deposito
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Il Treno {COMMA} sta aspettando nel deposito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nuovi veicoli
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Treno troppo lungo
@@ -2841,7 +2840,7 @@ STR_9012_CAPACITY                                               :{BLACK}Capacit
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...deve essere fermo nel deposito automezzi
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Impossibile vendere l'automezzo...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Impossibile fermare/avviare l'automezzo...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}L'Automezzo {COMMA} ha raggiunto il deposito
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}L'Automezzo {COMMA} sta aspettando nel deposito
 STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Diretto al Deposito di {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Manutenzione al Deposito di {TOWN}
@@ -2921,7 +2920,7 @@ STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Diretto
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Manutenzione al Deposito di {TOWN}
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
-STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}La Nave {COMMA} ha raggiunto il deposito
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}La Nave {COMMA} sta aspettano nel deposito
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Costruisce un molo per le navi
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Costruisce un deposito navale (per costruire e manutenere le navi)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Navi - fare clic su una nave per informazioni
@@ -2986,7 +2985,7 @@ STR_HEADING_FOR_HANGAR                                          :{ORANGE}Diretto
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Diretto all'Hangar di {STATION}, {VELOCITY}
 STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Manutenzione all'Hangar di {STATION}
 STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Manutenzione all'Hangar di {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}L'Aeromobile {COMMA} ha raggiunto l'hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}L'Aeromobile {COMMA} sta aspettano nell'hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeromobile di mezzo
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Impossibile fermare/avviare l'aeromobile...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}L'aeromobile è in volo
@@ -3079,7 +3078,7 @@ STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Punteggi

 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Impostazioni NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Impostazioni NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Applica modifiche
+STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Applica cambiamenti
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Imposta parametri
 STR_NEWGRF_TIP                                                  :{BLACK}Elenco di tutti i pacchetti NewGRF installati. Fare clic su uno di essi per cambiarne le impostazioni
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Attualmente non ci sono file NewGRF installati! Fare riferimento al manuale per istruzioni sull'installazione di grafica aggiuntiva
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -731,7 +731,7 @@ STR_0290_DELETE                                                 :{BLACK}삭제
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}이 도시를 완전히 삭제
 STR_0292_SAVE_SCENARIO                                          :시나리오 저장
 STR_0293_LOAD_SCENARIO                                          :시나리오 불러오기
-STR_MENU_LOAD_HEIGHTMAP                                         :Heightmap 불러오기
+STR_MENU_LOAD_HEIGHTMAP                                         :DEM지형 불러오기
 STR_0294_QUIT_EDITOR                                            :에디터 종료
 STR_0295                                                        :
 STR_0296_QUIT                                                   :게임 종료
@@ -739,8 +739,8 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}시나
 STR_0298_LOAD_SCENARIO                                          :{WHITE}시나리오 불러오기
 STR_0299_SAVE_SCENARIO                                          :{WHITE}시나리오 저장하기
 STR_029A_PLAY_SCENARIO                                          :{BLACK}시나리오 플레이
-STR_PLAY_HEIGHTMAP                                              :{BLACK}Heightmap 플레이
-STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Heightmap을 풍경으로 하여 게임을 시작합니다.
+STR_PLAY_HEIGHTMAP                                              :{BLACK}DEM지형 플레이
+STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}DEM지형을 풍경으로 하여 게임을 시작합니다.
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}정말 이 시나리오를 종료하시겠습니까?
 STR_029C_QUIT_EDITOR                                            :{WHITE}에디터 종료
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...1200명 이상의 도시에만 건설할 수 있습니다!
@@ -784,7 +784,7 @@ STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}웨이
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}완전한 애니메이션
 STR_02D2_FULL_DETAIL                                            :{SETX 12}아주 상세하게
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}건물 안보이기
-STR_TRANSPARENT_SIGNS                                           :{SETX 12}역이름 팻말 투명
+STR_TRANSPARENT_SIGNS                                           :{SETX 12}역이름 팻말 안보이기
 ############ range ends here

 ############ range for menu starts
@@ -964,8 +964,8 @@ STR_MONTH_DEC                                                   :12월

 STR_HEADING_FOR_STATION                                         :{LTBLUE}{STATION}(으)로 향하는 중
 STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}{STATION}(으)로 향하는 중 ({VELOCITY})
-STR_NO_ORDERS                                                   :{LTBLUE}경로 없음
-STR_NO_ORDERS_VEL                                               :{LTBLUE}경로 없음 ({VELOCITY})
+STR_NO_ORDERS                                                   :{LTBLUE}멋대로 다니는 중
+STR_NO_ORDERS_VEL                                               :{LTBLUE}멋대로 다니는 중 ({VELOCITY})

 STR_PASSENGERS                                                  :승객
 STR_BAGS                                                        :자루
@@ -1085,7 +1085,7 @@ STR_CONFIG_PATCHES_TREE_PLACER                                  :{LTBLUE}나무
 STR_CONFIG_PATCHES_TREE_PLACER_NONE                             :없음
 STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL                         :오리지널
 STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED                         :향상됨
-STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION                           :{LTBLUE}Heightmap 회전: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION                           :{LTBLUE}DEM 회전: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :반시계방향
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :시계방향
 STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}평지 시나리오 맵이 받는 높이: {ORANGE}{STRING}
@@ -1277,7 +1277,7 @@ STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}땅을


 STR_TREES_RANDOM_TYPE                                           :{BLACK}무작위 나무
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}나무를 무작위로 심습니다.
+STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}모든 종류의 나무를 무작위로 심습니다.

 STR_CANT_BUILD_CANALS                                           :{WHITE}여기에 운하를 건설할 수 없습니다...
 STR_BUILD_CANALS_TIP                                            :{BLACK}운하 만들기
@@ -1332,7 +1332,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}산업
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}%가 운반됨)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}%가 각각 운반됨)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}산업시설 이름 - 산업시설을 가운데로 보려면 클릭하세요

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...다른 산업시설과 너무 가깝습니다.

@@ -1344,9 +1343,9 @@ STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}열차
 STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}백분율에 의한 점검 주기: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}생산량 변경

-TEMP_AI_IN_PROGRESS                                             :{WHITE}개발중인 새로운 인공지능(AI)에 오신 것을 환영합니다. 문제가 발생하면 스크린샷을 찍어 TTD포럼에 올려주십시오.
+TEMP_AI_IN_PROGRESS                                             :{WHITE}새로운 인공지능(AI) 개발에 오신 것을 환영합니다. 문제가 발생하면 스크린샷을 찍어 TTD포럼에 올려주십시오.
 TEMP_AI_ACTIVATED                                               :{WHITE}경고: 이 새로운 인공지능은 실험적입니다! 오직 버스와 트럭에만 적용될 것입니다.
-TEMP_AI_MULTIPLAYER                                             :{WHITE}경고: 아직 실험적인 기능입니다.
+TEMP_AI_MULTIPLAYER                                             :{WHITE}경고: 아직 실험적인 기능입니다. truelight@openttd.org 으로 문제를 알려주십시오.

 ############ network gui strings

@@ -1384,7 +1383,7 @@ STR_NETWORK_SERVER_VERSION                                      :{SILVER}서버
 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_PASSWORD                                            :{SILVER}암호가 걸려있습니다!
+STR_NETWORK_PASSWORD                                            :{SILVER}접근 암호를 입력하세요!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}서버 오프라인
 STR_NETWORK_SERVER_FULL                                         :{SILVER}서버가 꽉 참
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}버전 다름
@@ -1398,9 +1397,9 @@ STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}새로
 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}게임 제목:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}멀티플레이 게임 선택 메뉴에서 보여질 게임 제목입니다.
 STR_NETWORK_SET_PASSWORD                                        :{BLACK}암호 설정
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}자유로운 접근을 막고 싶을 때 암호를 설정할 수 있습니다
+STR_NETWORK_PASSWORD_TIP                                        :{BLACK}자유로운 접근을 막고 싶을 때 게임 접근시 암호를 설정할 수 있습니다
 STR_NETWORK_SELECT_MAP                                          :{BLACK}맵 선택:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}어떤 맵을 선택하시겠습니까?
+STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}플레이할 맵을 선택합니다.
 STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
 STR_NETWORK_LAN                                                 :LAN
 STR_NETWORK_INTERNET                                            :인터넷
@@ -1421,7 +1420,7 @@ STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{S
 STR_NETWORK_START_GAME                                          :{BLACK}서버 열기
 STR_NETWORK_START_GAME_TIP                                      :{BLACK}무작위 맵이나 시나리오로 새로운 네트워크 게임을 시작합니다.
 STR_NETWORK_LOAD_GAME                                           :{BLACK}맵 불러오기
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}이미 저장된 멀티플레이 게임을 불러옵니다 (올바른 플레이어로 연결하시기 바랍니다)
+STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}이미 저장된 멀티플레이 게임을 불러옵니다

 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :모든 언어
@@ -1457,10 +1456,10 @@ STR_NETWORK_LANG_UKRAINIAN                                      :우크라이나

 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}새로운 회사를 설립합니다.
+STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}새로운 회사를 설립하여 그 회사로 플레이합니다.
 STR_NETWORK_SPECTATE_GAME                                       :{BLACK}게임 관전
 STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}게임에 참여하지 않고 보기만 합니다.
 STR_NETWORK_JOIN_COMPANY                                        :{BLACK}회사 참여
@@ -1494,7 +1493,7 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6)
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}게임 정보 가져오는 중..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}회사 정보 가져오는 중..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM}명의 접속자가 앞에서 대기중입니다.
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM}명의 접속자가 먼저 대기중입니다.
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} Kb 다운로드

 STR_NETWORK_DISCONNECT                                          :{BLACK}접속 끊기
@@ -1513,7 +1512,7 @@ STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} 네트
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} 세이브 게임을 불러올 수 없습니다
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} 서버를 시작할 수 없습니다
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} 접속할 수 없습니다
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} 연결 #{NUM}가 시간초과되었습니다.
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} 연결 #{NUM}의 시간이 너무 오래 걸렸습니다
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} 프로토콜 오류가 발생되어 연결이 끊어졌습니다
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} 이 접속자의 교정내용이 서버의 것과 일치하지 않습니다.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} 잘못된 암호입니다
@@ -1532,13 +1531,13 @@ STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :프로토콜
 STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF 안맞음
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :권한 없음
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :이상 패킷 수신
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :잘못된 버전
+STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :잘못된 교정
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :이미 사용중인 이름
 STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :잘못된 암호
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :잘못된 플레이어 아이디
 STR_NETWORK_ERR_CLIENT_KICKED                                   :강제추방
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :치트 사용 시도
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :서버 꽉참
+STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :서버 만원
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :님이 게임에 참여하셨습니다!
 STR_NETWORK_GIVE_MONEY                                          :님이 ({CURRENCY})의 자금을 송금해주셨습니다.
@@ -1792,7 +1791,7 @@ STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :지역 당국
 STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} 더 많은 승객과 화물을 유치하기 위해 소규모의 광고 캠페인을 시작합니다.{}  가격: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} 더 많은 승객과 화물을 유치하기 위해 중간 규모의 광고 캠페인을 시작합니다.{}  가격: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} 더 많은 승객과 화물을 유치하기 위해 대규모의 광고 캠페인을 시작합니다.{}  가격: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} 도시 도로 네트워크망의 재공사에 투자합니다. 앞으로 6개월간 도로 혼잡을 야기시킬 수 있습니다.{}  가격: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} 도시 도로 네트워크망의 재공사에 투자합니다. 앞으로 6개월간의 도로 혼잡을 야기시킬 수 있습니다.{}  가격: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} 당신 회사의 명예의 동상을 건설합니다.{}  가격: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} 도시 상업 건물의 건설에 투자합니다.{}  가격: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} 1년간의 수송 권한 독점권을 구입합니다. 도시 당국은 오직 당신 회사의 역에만 승객과 화물을 허용할 것입니다.{}  가격: {CURRENCY}
@@ -1953,7 +1952,7 @@ STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}선택
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}새로운 게임 종류를 선택
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}시나리오(녹색), 프리셋 게임(파랑), 무작위 게임 선택
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :신규 무작위 게임 생성
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Heightmap 로드
+STR_LOAD_HEIGHTMAP                                              :{WHITE}DEM지형 로드

 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}중간에 {STRING}이/가 있습니다
@@ -2365,12 +2364,12 @@ STR_LIVERY_FREIGHT_TRAM                                         :화물 전차

 STR_LIVERY_GENERAL_TIP                                          :{BLACK}일반 색상 선택
 STR_LIVERY_TRAIN_TIP                                            :{BLACK}열차 색상 선택
-STR_LIVERY_ROADVEH_TIP                                          :{BLACK}자동차 색상 선택
+STR_LIVERY_ROADVEH_TIP                                          :{BLACK}자동사 색상 선택
 STR_LIVERY_SHIP_TIP                                             :{BLACK}선박 색상 선택
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}항공기 색상 선택
 STR_LIVERY_PRIMARY_TIP                                          :{BLACK}선택한 색상을 1차 색상으로 선택
 STR_LIVERY_SECONDARY_TIP                                        :{BLACK}선택한 색상을 2차 색상으로 선택
-STR_LIVERY_PANEL_TIP                                            :{BLACK}색상 스키마 변경을 원하시면 선택하세요. (2개 이상 선택시 CTRL+클릭). 박스를 클릭하여 스키마를 전환합니다.
+STR_LIVERY_PANEL_TIP                                            :{BLACK}변경을 원하시면 선택하세요. (2개 이상 선택시 CTRL+클릭)

 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (증기)
@@ -2721,7 +2720,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{ENGINE
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   가격: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}싣는중 / 내리는중
-STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}차량기지 안에 정지해있어야 합니다!
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}차량기지 안에서 정지해있어야 합니다!
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}기차를 기지로 보낼 수 없습니다...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}더이상 경로를 지정할 공간이 없습니다
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}경로가 너무 많습니다!
@@ -2810,7 +2809,7 @@ STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}폭발
 STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}파괴된 차량은 개조할 수 없습니다...

 STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}차량의 시간표를 정할 수 없습니다...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}차량은 정거장에서만 기다릴 수 있습니다.
+STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}정거장에서만 기다릴 수 있습니다.
 STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}이 차량은 이 정거장에 서지 않습니다.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}시간 변경
 STR_TIMETABLE_STATUS_ON_TIME                                    :이 차량은 현재 제시간에 운행하고 있습니다
@@ -3081,11 +3080,11 @@ STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}변경사항 적용
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}파라미터 설정
 STR_NEWGRF_TIP                                                  :{BLACK}당신이 설치한 NewGRF의 모든 목록입니다. 설정을 변경하려면 클릭하세요
-STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}NewGRF 파일이 설치되어 있지 않습니다! NewGRF 설치 방법에 대한 매뉴얼을 참고해주십시오
+STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}없는 NewGRF 파일이 있습니다! NewGRF 설치 방법에 대한 매뉴얼을 참고해주십시오
 STR_NEWGRF_FILENAME                                             :{BLACK}파일명: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
-STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}게임 진행중에 설정을 변경하면 게임이 충돌할 수도 있습니다.{}정말로 설정을 변경하시겠습니까?
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}게임이 진행중인데 설정을 변경하려고 하면 게임과 충돌할 수도 있습니다.{}정말로 설정을 변경하시겠습니까?

 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}경고: {SILVER}{STRING}
@@ -3110,7 +3109,7 @@ STR_NEWGRF_MOVEUP                                               :{BLACK}위로
 STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}선택한 NewGRF 파일을 위로 올림
 STR_NEWGRF_MOVEDOWN                                             :{BLACK}아래로
 STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}선택한 NewGRF 파일을 아래로 내림
-STR_NEWGRF_FILE_TIP                                             :{BLACK}설치된 NewGRF의 목록입니다. 파라미터를 변경하려면 클릭하세요.
+STR_NEWGRF_FILE_TIP                                             :{BLACK}당신이 설치한 NewGRF의 모든 목록입니다. 파라미터를 변경하려면 클릭하세요.
 STR_NEWGRF_PARAMETER                                            :{BLACK}파라미터: {SILVER}{STRING}
 STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}NewGRF 파라미터 입력
 STR_NEWGRF_NO_INFO                                              :{BLACK}사용가능한 정보 없음
@@ -3124,13 +3123,13 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}파일

 STR_NEWGRF_NOT_FOUND                                            :{RED}일치하는 파일을 찾을 수 없습니다
 STR_NEWGRF_DISABLED                                             :{RED}사용안함
-STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}매치되는 파일을 찾을 수 없음 (호환되는 GRF 로드됨)
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}매치되는 파일을 찾을 수 없음 (그래픽 로드 충돌)

-STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}없는 파일 대신에 호환되는 GRF가 로드되었습니다
-STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}사라진 GRF 파일은 사용이 불가능합니다
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}사라진 파일의 자리에 알맞은 GRF가 로드되었습니다
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}사라진 GRF 파일은 사용불가능합니다
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}사라진 GRF 파일이 게임 로드에 사용될 수 있습니다
-STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}GRF 파일 없음
-STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}일시정지를 해제하면 오류가 발생할 수도 있습니다. 차후에 나오는 오류에 대해서 버그 리포트를 제출하지 마십시오.{}정말로 일시정지를 해제하시겠습니까?
+STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}GRF 파일 손실
+STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}일시정지를 해제하면 오류가 발생할 수도 있습니다. 차후에 나오는 오류를 위해 버그 리포트를 보관하지 마십시오.{}일시정지를 해제하시겠습니까?

 STR_NEWGRF_BROKEN                                               :{WHITE}NewGRF '{STRING}'는 비동기화 혹은 충돌을 일으킬 수 있습니다.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}'{1:ENGINE}'이/가 차고 안에 있지 않으면 차량 길이가 바뀝니다.
@@ -3162,8 +3161,8 @@ STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}이 역
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}이 역을 거쳐가는 모든 항공기를 표시합니다
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}이 역을 거쳐가는 모든 선박을 표시합니다

-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} 차량의 공유된 경로 목록
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}이 경로를 공유하고 있는 모든 차량을 표시합니다.
+STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} 차량의 공유된 목록
+STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}이 스케쥴을 공유한 모든 차량을 표시합니다.

 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}이 안에 있는 모든 차량을 판매하려고 합니다. 정말 판매하시겠습니까?
@@ -3235,7 +3234,7 @@ STR_ORDER_REFIT_FAILED                                          :{WHITE}경로

 STR_RAIL_VEHICLES                                               :철도
 STR_ELRAIL_VEHICLES                                             :전기 철도
-STR_MONORAIL_VEHICLES                                           :모노레일 차량
+STR_MONORAIL_VEHICLES                                           :모노레일
 STR_MAGLEV_VEHICLES                                             :자기부상

 ############ End of list of rail types
@@ -3275,7 +3274,7 @@ STR_RANDOM_SEED                                                 :{BLACK}무작
 STR_RANDOM_SEED_HELP                                            :{BLACK}무작위수치를 입력하세요
 STR_LAND_GENERATOR                                              :{BLACK}지형 생성:
 STR_TREE_PLACER                                                 :{BLACK}나무 알고리즘:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Heightmap 방향:
+STR_HEIGHTMAP_ROTATION                                          :{BLACK}DEM지형 방향:
 STR_TERRAIN_TYPE                                                :{BLACK}지형 종류:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}해수면:
 STR_SMOOTHNESS                                                  :{BLACK}부드러움:
@@ -3291,13 +3290,13 @@ STR_START_DATE_QUERY_CAPT                                       :{WHITE}시작
 STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}맵 크기에 대한 경고
 STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}맵 자원의 크기를 너무 키우는 것은 좋지 않습니다. 생성을 계속하시겠습니까?
 STR_TOWN_LAYOUT_WARNING_CAPTION                                 :{WHITE}도시 설계 경고
-STR_TOWN_LAYOUT_WARNING_MESSAGE                                 :{YELLOW}도시 설계 "도로건설 안함"은 추천하지 않습니다. 생성을 계속하시겠습니까?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Heightmap 이름:
+STR_TOWN_LAYOUT_WARNING_MESSAGE                                 :{YELLOW}도시 설계 "도로건설 안함"은 추천하지 않습니다. 생성을 계속 하시겠습니까?
+STR_HEIGHTMAP_NAME                                              :{BLACK}DEM지형 이름:
 STR_HEIGHTMAP_SIZE                                              :{BLACK}크기: {ORANGE}{NUM} x {NUM}
-STR_GENERATION_WORLD                                            :{WHITE}세계 생성중..
+STR_GENERATION_WORLD                                            :{WHITE}나는야 신이라네~ 천지창조중...
 STR_GENERATION_ABORT                                            :{BLACK}중지
-STR_GENERATION_ABORT_CAPTION                                    :{WHITE}세계 생성 중단
-STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}세계 생성을 중단하시겠습니까?
+STR_GENERATION_ABORT_CAPTION                                    :{WHITE}천지 창조 중단?
+STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}신이시여, 세상의 창조를 중단하시겠습니까?
 STR_PROGRESS                                                    :{WHITE}{NUM}% 완료
 STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
 STR_WORLD_GENERATION                                            :{BLACK}지형 생성중
@@ -3356,15 +3355,15 @@ STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...여
 STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...도로가 잘못된 방향을 향하고 있습니다

 STR_TRANSPARENCY_TOOLB                                          :{WHITE}투명 옵션
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}역이름 팻말 투명 전환. 고정하려면 CTRL+클릭하세요.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}나무 투명 전환. 고정하려면 CTRL+클릭하세요.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}집 투명 전환. 고정하려면 CTRL+클릭하세요.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}산업시설 투명 전환. 고정하려면 CTRL+클릭하세요.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}정거장, 차량기지, 웨이포인트와 같은 건설 가능한 것들에 대한 투명 전환. 고정하려면 CTRL+클릭하세요.
+STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}역이름 팻말 투명 전환
+STR_TRANSPARENT_TREES_DESC                                      :{BLACK}나무 투명 전환
+STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}집 투명 전환
+STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}산업시설 투명 전환
+STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}정거장, 차량기지, 웨이포인트, 연결고리와 같은 건설 가능한 것들에 대한 투명 전환
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}다리 투명 전환
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}등대와 안테나와 같은 구조물 투명 전환. 고정하려면 CTRL+클릭하세요.
+STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}등대와 안테나와 같은 구조물 투명 전환
 STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}케이블 보이기/숨기기. 고정하려면 CTRL+클릭하세요.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}적재 정도 투명 전환. 고정하려면 CTRL+클릭하세요.
+STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}적재 정도 투명 전환

 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3385,7 +3384,7 @@ STR_GROUP_DEFAULT_ROADS                                         :그룹에 속
 STR_GROUP_DEFAULT_SHIPS                                         :그룹에 속하지 않은 선박
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :그룹에 속하지 않은 항공기
 STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
-STR_GROUP_ADD_SHARED_VEHICLE                                    :공유된 차량 추가
+STR_GROUP_ADD_SHARED_VEHICLE                                    :모든 공유된 차량
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :모든 차량 제거

 STR_GROUP_TRAINS_CAPTION                                        :{WHITE}{GROUP} - {COMMA} 기차
@@ -3396,13 +3395,13 @@ STR_GROUP_RENAME_CAPTION                                        :{BLACK}그룹
 STR_GROUP_REPLACE_CAPTION                                       :{WHITE}"{GROUP}"의 차량 교체

 STR_GROUP_CAN_T_CREATE                                          :{WHITE}그룹을 만들 수 없습니다...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}이 그룹을 지울 수 없습니다...
+STR_GROUP_CAN_T_DELETE                                          :{WHITE}이 그룹을 지울 수 없습니다.
 STR_GROUP_CAN_T_RENAME                                          :{WHITE}그룹의 이름을 바꿀 수 없습니다.
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}이 그룹의 모든 차량을 제거할 수 없습니다.
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}이 그룹에 차량을 추가할 수 없습니다...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}이 그룹에 공유된 차량을 추가할 수 없습니다...
+STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}이 구릅의 모든 차량을 제거할 수 없습니다.
+STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}이 그룹에 차량을 추가할 수 없습니다.
+STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}이 구릅에 공유된 차량을 추가할 수 없습니다.

-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}그룹 - 클릭한 그룹에 속한 차량을 모두 나열합니다
+STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}그룹 - 클릭하신 그룹에 속한 차량을 모두 나열합니다
 STR_GROUP_CREATE_TIP                                            :{BLACK}그룹 만들기
 STR_GROUP_DELETE_TIP                                            :{BLACK}선택한 그룹 삭제
 STR_GROUP_RENAME_TIP                                            :{BLACK}선택한 그룹 이름 바꾸기
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -16,7 +16,6 @@ STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Flatt land er nødvendig
 STR_0008_WAITING                                                :{BLACK}Venter: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
-STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO} i-rute fra {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Godtar: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Godtar: {GOLD}
 STR_000E                                                        :
@@ -726,7 +725,6 @@ STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Plasser
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plasser radiosender
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definer ørkenområde.{}Trykk og hold inne CTRL for å fjerne den
 STR_CREATE_LAKE                                                 :{BLACK}Definer vannområde.{}Lag en kanal, untatt hvis CTRL holdes nede på havnivå, hvor områdene vil fylles istedenfor
-STR_CREATE_RIVER                                                :{BLACK}Plasser elver.
 STR_0290_DELETE                                                 :{BLACK}Slett
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slett denne byen fullstendig
 STR_0292_SAVE_SCENARIO                                          :Lagre scenario
@@ -744,8 +742,8 @@ STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Start et
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Er du sikker på du vil forlate dette scenariet?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Avslutt redigeringsprogrammet
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kan kun bygges i byer med mer en 1200 innbyggere
-STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytt startdatoen tilbake et år
-STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytt startdatoen frem et år
+STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytt startdatoen tilbake ett år
+STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytt startdatoen frem ett år
 STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...broens ender må være på land
 STR_02A1_SMALL                                                  :{BLACK}Liten
 STR_02A2_MEDIUM                                                 :{BLACK}Middels
@@ -1051,7 +1049,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE                              :{LTBLUE}Tillat
 STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY                             :{LTBLUE}Tillat pengeoverføring til andre firmaer: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Uensartede stasjoner: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Vektmultiplikator for frakt til å simulere tunge tog: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PLANE_SPEED                                  :{LTBLUE}Fly hastighet faktor: {ORANGE}1 / {STRING}
 STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD                            :{LTBLUE}Tillat gjennomkjøring av stoppesteder på veier som er eid av byene: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADJACENT_STATIONS                            :{LTBLUE}Tillat bygging av nærliggende stasjoner: {ORANGE}{STRING}

@@ -1206,18 +1203,6 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Endre innstillingsverdi
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Noen eller alle av standard vedlikeholdsintervall(ene) under er inkompatible med valgte instillinger! 5-90{NBSP}% og 30-800 dager er gyldige

-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Linjefinner for tog: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(Ikke anbefalt)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Anbefalt)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH                       :{LTBLUE}Linjefinner for kjøretøy: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF                   :Orginal {RED}(Ikke anbefalt)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(Anbefalt)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Linjefinner for skip: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF                     :Orginal {BLUE}(Anbefalt)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Ikke anbefalt)
 STR_TEMPERATE_LANDSCAPE                                         :Temperert landskap
 STR_SUB_ARCTIC_LANDSCAPE                                        :subarktisk landskap
 STR_SUB_TROPICAL_LANDSCAPE                                      :subtropisk landskap
@@ -1331,7 +1316,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}{NBSP}% transportert)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}{NBSP}%/{COMMA}{NBSP}% transportert)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri navn - klikk på navn for å sentrere sikt over industri

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for nært en annen industri

@@ -1343,7 +1327,7 @@ STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ikke
 STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Vedlikeholdsintervaller i prosent: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Endre produksjon

-TEMP_AI_IN_PROGRESS                                             :{WHITE}Velkommen til denne nye AI, under konstruksjon. Du kan vente deg problemer. Når du finner et problem, lag et skjermbilde av det og post det i forumet.
+TEMP_AI_IN_PROGRESS                                             :{WHITE}Velkommen til denne nye AI, under konstruksjon. Du kan vente deg problemer. Når du finner ett problem, lag ett skjermbilde av det og post det i forumet. Mor deg!
 TEMP_AI_ACTIVATED                                               :{WHITE}Advarsel: denne nye AI er fremdeles alfa! Akkurat nå virker kun lastebiler og busser!
 TEMP_AI_MULTIPLAYER                                             :{WHITE}Advarsel: dette er fortsatt eksperimentelt. Vennligst rapporter problemer til truelight@openttd.org.

@@ -1457,7 +1441,7 @@ STR_NETWORK_LANG_UKRAINIAN                                      :Ukrainsk
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Flerspillere spill lobby

 STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Prøver å koble til:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}En liste over firma i spillet. Du kan enten bli med i et eller starte et nytt.
+STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}En liste over firma i spillet. Du kan enten bli med i ett eller starte et nytt.
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nytt firma
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Start et nytt firma
 STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Se på spill
@@ -1613,7 +1597,6 @@ STR_1004_TOO_HIGH                                               :{WHITE}For høy
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Upassende jernbanespor
 STR_1007_ALREADY_BUILT                                          :{WHITE}...allerede bygget
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Må fjerne jernbanespor først
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Vei er enveis eller blokkert
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Bygg jernbane
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Elektrisk jernbane-konstruksjon
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Bygg Monorail
@@ -1716,7 +1699,6 @@ STR_2002                                                        :{TINYFONT}{BLAC
 STR_2002_WHITE                                                  :{TINYFONT}{WHITE}{SIGN}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Bygningen må rives først
 STR_2005                                                        :{WHITE}{TOWN}
-STR_CITY                                                        :{WHITE}{TOWN} (By)
 STR_2006_POPULATION                                             :{BLACK}Innbyggertall: {ORANGE}{COMMA}{BLACK}  Antall hus: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Bytt navn
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kan ikke bytte navn på byen...
@@ -1759,9 +1741,9 @@ STR_202D_UNTIL                                                  :{YELLOW}, innti
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsidietilbud har gått ut:{}{}{STRING} fra {STRING} til {STRING} vil ikke lenger gi subsidier.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidie trukket tilbake:{}{}Frakt av {STRING} fra {STATION} til {STATION} subsidieres ikke lenger.
 STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsidietilbud:{}{}Første frakt av {STRING} fra {STRING} til {STRING} vil subsidieres i et år av bystyret!
-STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil gi 50{NBSP}% mer inntekt i løpet av et år!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil gi 50{NBSP}% mer inntekt i løpet av ett år!
 STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil gi dobbelt så mye inntekt i løpet av et år!
-STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie gitt til {COMPANY}!{}{}Frakt av {STRING} fra {STATION} til {STATION} vil gi trippel betaling i løpet i et år fra nå!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie gitt til {COMPANY}!{}{}Frakt av {STRING} fra {STATION} til {STATION} vil gi trippel betaling i løpet i ett år fra nå!
 STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsidie gitt til {COMPANY}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil gi fire ganger så mye inntekt i løpet av et år!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}s bystyre tillater ikke flere flyplasser i denne byen
 STR_2036_COTTAGES                                               :Hytter
@@ -1794,7 +1776,7 @@ STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}
 STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Finansier ombygging av det lokale veinettet. Fører til veiproblemer i seks måneder.{}  Koster: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Bygg en statue for å ære firmaet.{} Cost: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finasier byggingen av nye forretningsbygninger i byen .{}  Koster: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kjøp et års ekslusive transportrettigheter i byen. Bystyret vil kun tillate passasjerer og varer å bruke dine transporttjenester.{} Koster: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kjøp ett års ekslusive transportrettigheter i byen. Bystyret vil kun tillate passasjerer og varer å bruke dine transporttjenester.{} Koster: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestikk bystyret til å forbedre vurderingen av firmaet, men du riskerer å bli bøtlagt hvis du blir oppdaget.{}  Koster: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffkkaos i {TOWN}!{}{}Ombygging av veien, finasiert av {COMPANY}, fører med seg seks måneders veiproblemer.
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
@@ -2349,8 +2331,6 @@ STR_LIVERY_EMU                                                  :EMU
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passasjervogn (damp)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passasjervogn (diesel)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passasjervogn (elektrisk)
-STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :Passasjer Vogn (Monorail)
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :Passasjer Vogn (Maglev)
 STR_LIVERY_FREIGHT_WAGON                                        :Fraktvogn
 STR_LIVERY_BUS                                                  :Buss
 STR_LIVERY_TRUCK                                                :Lastebil
@@ -2629,7 +2609,7 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Tricario-heliko
 STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2-helikopter
 STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut-helikopter
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Melding fra kjøretøysprodusent
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Vi har nettopp designet et nytt {STRING} - er du interessert i et års ekslusivt bruk av dette, slik vi kan se hvordan det virker før det blir allment tilgjengelig?
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Vi har nettopp designet et nytt {STRING} - er du interessert i ett års ekslusivt bruk av dette, slik vi kan se hvordan det virker før det blir allment tilgjengelig?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :lokomotiv
 STR_8103_ROAD_VEHICLE                                           :kjøretøy
 STR_8104_AIRCRAFT                                               :fly
@@ -3130,10 +3110,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Mangler
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Mangler GRF-fil(er)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Å slå av pause kan gjøre at OpenTTD krasjer. Ikke rapporter feil for etterfølgende krasje.{}Ønsker du virkelig å slå av pause?

-STR_NEWGRF_BROKEN                                               :{WHITE}Oppførselen av ny graffikk '{STRING}' er sansynlig til å skape forstyrrelse og/eller kollisjoner.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Det endrer kjøretøyets lengde for '{1:ENGINE}' når ikke i ett depo.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Tog '{VEHICLE}' tilhører '{COMPANY}' har ugyldig lengde. Det er sannsynligvis forårsaket av problemer med ny grafikk. Spillet kan desynkronisere eller kollidere.
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spillet ble lagret i versjon uten trikk støtte. Alle trikker har blitt fjernet.
 STR_CURRENCY_WINDOW                                             :{WHITE}Vanlig valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Valutakurs: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Deler:
@@ -3257,9 +3233,6 @@ STR_PURCHASE_INFO_ALL_TYPES                                     :Alle varetyper
 STR_PURCHASE_INFO_ALL_BUT                                       :Alt utenom {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Maks. trekkraft: {GOLD}{FORCE}

-STR_NUM_1                                                       :{BLACK}{SKIP}{NUM}
-STR_NUM_2                                                       :{BLACK}{SKIP}{SKIP}{NUM}
-STR_NUM_3                                                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
 ########### String for New Landscape Generator

 STR_GENERATE                                                    :{WHITE}Generer
@@ -3358,7 +3331,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Skru på
 STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Skru på gjennomsiktighet for stasjoner, depoter, lokalstasjoner og skinner
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Skru på gjennomsiktighet for broer
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Skru på gjennomsiktighet for fyrtårn og antenner
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Skjul/vis gjennomsiktighet for kjettingkurve. CTRL+klikk til å låse.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Velg gjennomsiktighet for lastingsindikatorer

 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}{NBSP}%{UPARROW}
@@ -3478,8 +3450,8 @@ STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standard
 STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Grønt så lenge det er mer enn ett grønt utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Utgangssignal (semafor){}Oppfører seg på samme måte som et vanlig signal ville gjort, men er nødvendig for å riktig farge på inngangs- og kombinasjonspresignaler.
 STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinasjonssignal (semafor){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge «trær» av presignaler.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Vanlig signal (elektrisk){}Signaler trengs for å forhindre togkrasj på jernbanenettverk med mer enn et tog.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Inngangssignal (elektrisk){}Grønt så lenge det er mer enn et grønt utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Vanlig signal (elektrisk){}Signaler trengs for å forhindre togkrasj på jernbanenettverk med mer enn ett tog.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Inngangssignal (elektrisk){}Grønt så lenge det er mer enn ett grønt utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Utgangssignal (elektrisk){}Oppfører seg på samme måte som et vanlig signal ville gjort, men er nødvendig for å riktig farge på inngangs- og kombinasjonspresignaler.
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinasjonssignal (elektrisk){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge «trær» av presignaler.
 STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signalkonvertering{}Konverterer signaler til den valgte signaltypen; Ctrl-klikk vil endre eksisterende variant.
--- a/src/lang/piglatin.txt
+++ b/src/lang/piglatin.txt
@@ -1177,7 +1177,6 @@ STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST                        :Eryvay astfay
 STR_CONFIG_PATCHES_LARGER_TOWNS                                 :{LTBLUE}Oportionpray ofway ownstay atthay illway ecomebay itiescay: {ORANGE}1 inway {STRING}
 STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED                        :{LTBLUE}Oportionpray ofway ownstay atthay illway ecomebay itiescay: {ORANGE}Onenay
 STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER                         :{LTBLUE}Initialway itycay izesay ultipliermay: {ORANGE}{STRING}
-STR_CONFIG_MODIFIED_ROAD_REBUILD                                :{LTBLUE}Emoveray absurdway oadray-elementsway uringday hetay oadray onstructioncay

 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interfaceway
 STR_CONFIG_PATCHES_CONSTRUCTION                                 :{BLACK}Onstructioncay
@@ -1193,15 +1192,6 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Angechay ettingsay aluevay
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Omesay orway allway ofway ethay efaultday ervicesay intervalway(say) elowbay areway incompatibleway ithway ethay osenchay ettingsay! 5-90% andway 30-800 aysday areway alidvay

-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(Otnay Ecommendedray)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Ecommendedray)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF                   :Originalway {RED}(Otnay Ecommendedray)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(Ecommendedray)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF                     :Originalway {BLUE}(Ecommendedray)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Otnay Ecommendedray)
 STR_TEMPERATE_LANDSCAPE                                         :Emperatetay andscapelay
 STR_SUB_ARCTIC_LANDSCAPE                                        :Ubsay-arcticway andscapelay
 STR_SUB_TROPICAL_LANDSCAPE                                      :Ubsay-opicaltray andscapelay
@@ -1315,7 +1305,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% ansportedtray)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% ansportedtray)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industryway amesnay - lickcay onway amenay otay entrecay iewvay onway industryway

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...ootay oseclay otay anotherway industryway

--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -17,7 +17,6 @@ STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Wymagany płaski teren
 STR_0008_WAITING                                                :{BLACK}Czeka: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
-STR_EN_ROUTE_FROM                                               :{YELLOW}({SHORTCARGO} skierowany z {STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Akceptuje: {WHITE}
 STR_000D_ACCEPTS                                                :{BLACK}Akceptuje: {GOLD}
 STR_000E                                                        :
@@ -812,7 +811,6 @@ STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Umieść
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Umieść nadajnik
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definiuj obszar pustyni.{}Wciśnij i trzymaj CTRL by usunąć
 STR_CREATE_LAKE                                                 :{BLACK}Stwórz akwen wodny.{}Tworzy kanał, chyba że przyrzymany jest CTRL na poziomie morza, wtedy pobliski teren zostanie zatopiony
-STR_CREATE_RIVER                                                :{BLACK}Umieszczanie rzek.
 STR_0290_DELETE                                                 :{BLACK}Skasuj
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Skasuj to miasto
 STR_0292_SAVE_SCENARIO                                          :Zapisz scenariusz
@@ -1290,15 +1288,6 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Zmiana wartości
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Niektóre lub wszystkie domyślne okresy między serwisowania są sprzeczne z wybranymi! 5-90% i 30-800 dni są poprawne

-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Wyszukiwanie tras dla pociagow: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(Not recommended)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Recommended)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF                   :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF                  :YAPF {BLUE}(Rekomendowane)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF                     :Orginalne {BLUE}(Rekomendowane)
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF                     :NPF
-STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Nie rekomendowane)
 STR_TEMPERATE_LANDSCAPE                                         :Krajobraz umiarkowany
 STR_SUB_ARCTIC_LANDSCAPE                                        :Krajobraz arktyczny
 STR_SUB_TROPICAL_LANDSCAPE                                      :Krajobraz tropikalny
@@ -2824,9 +2813,9 @@ STR_8825_NON_STOP                                               :{BLACK}Non-Stop
 STR_8826_GO_TO                                                  :{BLACK}Idź do
 STR_8827_FULL_LOAD                                              :{BLACK}Załadunek
 STR_8828_UNLOAD                                                 :{BLACK}Wyładunek
-STR_REFIT                                                       :{BLACK}Przeksztalc
-STR_REFIT_TIP                                                   :{BLACK}Wybierz typ ladunku do przeksztalcenia. Klikniecie z CTRL usuwa zmiane
-STR_REFIT_ORDER                                                 :(Przeksztalc na {STRING})
+STR_REFIT                                                       :{BLACK}Przebuduj
+STR_REFIT_TIP                                                   :{BLACK}Wybierz do przewozu jakiego ładunku przebudować pojazd w tym zadaniu. CTRL+klik usuwa polecenie przebudowy
+STR_REFIT_ORDER                                                 :(Przebuduj na {STRING})
 STR_TIMETABLE_VIEW                                              :{BLACK}Rozkład
 STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Otwórz widok rozkładu jazdy
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Polecenia)
@@ -2915,7 +2904,7 @@ STR_RESET_LATENESS                                              :{BLACK}Wyzeruj

 STR_TRAIN_STOPPING                                              :{RED}Hamowanie
 STR_TRAIN_STOPPING_VEL                                          :{RED}Hamowanie, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Niezgodne typy torów
+STR_INCOMPATIBLE_RAIL_TYPES                                     :Niezgodne typy szyn
 STR_TRAIN_NO_POWER                                              :{RED}Brak zasilania
 STR_TRAIN_START_NO_CATENARY                                     :Ta trasa nie jest zelektryfikowana, wiec pociąg nie wystartuje

--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -1330,7 +1330,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Numele industriilor - clic pe nume pentru focalizarea pe industrie

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prea aproape de altă industrie

@@ -3129,9 +3128,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Fisierel
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Fisier(e) GRF lipsa
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Reluarea jocului poate bloca OpenTTD. Nu raportati raporturi cu probleme pentru blocari succesive.{}Sigur doresti sa reiei jocul?

-STR_NEWGRF_BROKEN                                               :{WHITE}Comportamentul NewGRF '{0:STRING}' poate cauza desincronizari sau opriri.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Modifica lungimea vehicolului pentru '{1:ENGINE}' cand nu este in depou.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Trenul '{VEHICLE}', apartinand '{COMPANY}' nu are o lungima valida. Crobabila este o problema cu fisierele NewGRF. Jocul s-ar putea desincroniza sau prabusi.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Jocul a fost salvat într-o versiune fără suport pentru tramvaie. Toate tramvaiele au fost eliminate.
 STR_CURRENCY_WINDOW                                             :{WHITE}Monedă proprie
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Curs de schimb: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -3357,7 +3353,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Comuta t
 STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Comuta transparenta pentru construibile, precum statii, depouri, indicatoare si linii electrificate
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Comuta transparenta pentru poduri
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Comuta transparenta pentru structuri ca farurile si antenele - poate in viitor, pentru efect
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Comuta transparenta pentru catenar. CTRL+clic pentru blocare.
 STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Comuta transparenta pentru indicatorii de incarcare

 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -1333,7 +1333,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Пром
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% перевезено)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% перевезено)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Название производства, нажмите для центровки

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...слишком близко к другому предприятию

@@ -3144,9 +3143,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Не н
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Пропущенные GRF файлы
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Снятие с паузы может привести к ошибке OpenTTD.{}Вы хотите запустить игру?

-STR_NEWGRF_BROKEN                                               :{WHITE}Поведение строки '{STRING}' файла NewGRF может привести к потере синхронизации и вылету игры.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Меняется длина транспорта '{1:ENGINE}' находящегося вне депо.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Поезд '{VEHICLE}' принадлежащий '{COMPANY}' имеет неправильную длину. Вероятно, это вызвано проблемами в файле новой графики. Игра может рассинхронизироваться или вылететь.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Игра была сохранена в игре без поддержки трамваев. Все трамваи были отключены.
 STR_CURRENCY_WINDOW                                             :{WHITE}Своя валюта
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Обменный курс: {ORANGE}{CURRENCY} = £{COMMA}
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -807,7 +807,7 @@ STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}视点 {
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}复制到视点
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}将屏幕中心复制到额外视点中
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}从视点复制
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}将屏幕中心移动到额外视点的位置
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}将屏幕中心移动到额外试点的位置

 STR_02E0_CURRENCY_UNITS                                         :{BLACK}货币单位
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
@@ -1104,7 +1104,6 @@ STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL                           :滚动地图
 STR_CONFIG_PATCHES_SCROLLWHEEL_OFF                              :关闭
 STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER                       :{LTBLUE}地图滚动速度：{ORANGE}{STRING}

-STR_CONFIG_PATCHES_RIGHT_MOUSE_BTN_EMU                          :{LTBLUE}右键模拟: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_RIGHT_MOUSE_BTN_EMU_OFF                      :关闭
 STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME                            :{LTBLUE}开始新游戏时自动暂停: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}使用高级车辆列表: {ORANGE}{STRING}
@@ -1160,12 +1159,7 @@ STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}当拖
 STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}在 {ORANGE}{STRING} 前自动设置旗帜信号
 STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI                            :{LTBLUE}使用信号GUI： {ORANGE}{STRING}

-STR_CONFIG_PATCHES_TOWN_LAYOUT                                  :{LTBLUE}选择城镇自动扩展布局: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOWN_LAYOUT_NO_ROADS                         :无道路
 STR_CONFIG_PATCHES_TOWN_LAYOUT_DEFAULT                          :默认
-STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS                     :改良道路
-STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID                         :2x2格
-STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID                         :3x3格

 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}主工具栏位置：{ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :左侧
@@ -1197,7 +1191,6 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}改变设置值
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}下面一个或多个保养周期的值设置不对，应当在 0%-90% 或 30-800 天之内。

-STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS                        :{LTBLUE}火车寻路: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP                    :NTP {RED}(不推荐)
 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF                    :NPF
 STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(推荐)
@@ -1322,7 +1315,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}工业
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% 已运输)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% 已运输)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}工业设施名 - 点击其名以将视野中心移动到它上面

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}距离另一工业设施过近……

@@ -1396,13 +1388,10 @@ STR_NETWORK_LAN                                                 :局域网
 STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :局域网 / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertise)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} 客户端
 STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}玩家数目：
 STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}选择可以参加的玩家上限（达不到此数量仍然可以开始游戏）
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} 公司
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}公司数量：
 STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}限制服务器上可以创建的公司数量
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} 观众
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}旁观数量：
 STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}限制服务器上旁观者的数量
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}语言选项：
@@ -1604,7 +1593,7 @@ STR_1004_TOO_HIGH                                               :{WHITE}太高
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}没有合适的铁轨
 STR_1007_ALREADY_BUILT                                          :{WHITE}已经建好了……
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}必须先拆除铁轨
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}这是单行道或这条路被堵死了
+STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}这是单行道或堵死了
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}铁路建设
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}电气化铁路建设
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}单轨铁路建设
@@ -1638,12 +1627,6 @@ STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :带有入口信
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :带有出口信号的铁路
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :双向信号灯的铁路
 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :单信号灯的铁路
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :带有普通出口信号灯的铁轨
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :带有普通组合信号灯的铁轨
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :带有提前和出口信号灯的铁轨
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :带有提前和组合信号灯的铁轨
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :带有提前和组合信号灯的铁轨
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}请先移除火车站



@@ -1651,33 +1634,20 @@ STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}请先
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}必须先拆除公路
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}正在进行道路工程
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}道路建设
-STR_WHITE_TRAMWAY_CONSTRUCTION                                  :{WHITE}电车建设
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}选择公路桥梁
-STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                        :{WHITE}... 单行道无法连接路口
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}不能在这里修筑公路……
-STR_CAN_T_BUILD_TRAMWAY_HERE                                    :{WHITE}此处无法建造电车道...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}不能拆除这里的公路……
-STR_CAN_T_REMOVE_TRAMWAY_FROM                                   :{WHITE}无法移除此处的电车道...
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}汽车车库的方向……
-STR_TRAM_DEPOT_ORIENTATION                                      :{WHITE}建设电车车库
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}不能在这里修建汽车车库……
-STR_CAN_T_BUILD_TRAM_VEHICLE                                    :{WHITE}此处无法建造电车车库....
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}不能建设公共汽车站
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}不能建设汽车货场
-STR_CAN_T_BUILD_PASSENGER_TRAM_STATION                          :{WHITE}此处无法建设客运电车站...
-STR_CAN_T_BUILD_CARGO_TRAM_STATION                              :{WHITE}此处无法建设货运电车站...
 STR_180A_ROAD_CONSTRUCTION                                      :道路建设
-STR_TRAMWAY_CONSTRUCTION                                        :电车建设
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}建设道路
-STR_BUILD_AUTOROAD_TIP                                          :{BLACK}使用多向车道建设工具
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}建设汽车车库 (可以购买或维护车辆)
-STR_BUILD_TRAM_VEHICLE_DEPOT                                    :{BLACK}建造电车车库(发车与车辆维修)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}建设公共汽车站
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}建设汽车货场
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}建设公路桥梁
-STR_BUILD_TRAMWAY_BRIDGE                                        :{BLACK}建设电车大桥
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}建设公路隧道
-STR_BUILD_TRAMWAY_TUNNEL                                        :{BLACK}建设电车隧道
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}建设/拆除公路
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}选择汽车车库方向
 STR_1814_ROAD                                                   :公路
@@ -1913,8 +1883,6 @@ STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}不能
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}保存游戏失败{}{STRING}
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}不能删除文件
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}游戏存档读取失败{}{STRING}
-STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :文件无法读取
-STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :文件无法写入
 STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}驱动器、目录和游戏存档列表
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}保存当前游戏用的存档名字
 STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}删除选定的游戏存档
@@ -1971,7 +1939,6 @@ STR_4828_REQUIRES                                               :{BLACK}需要
 STR_4829_REQUIRES                                               :{BLACK}需要：{YELLOW}{STRING}, {STRING}, {STRING}
 ############ range for requires ends

-STR_INDUSTRY_WINDOW_WAITING_FOR_PROCESSING                      :{BLACK}等待的货物:
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}上月产量：
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% 已运输)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}将屏幕中心移动到工厂所在的位置
@@ -2001,8 +1968,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}隧道
 STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}必须先拆除隧道
 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}必须先拆除桥梁
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}起止点不能相同
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}桥梁起止点不在同一水平高度
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}桥梁对于地形太低了
 STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}起止两端必须在一条线上
 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL                             :{WHITE}此处不适合作为隧道入口
 STR_500D                                                        :{GOLD}{STRING}，{} {VELOCITY} {WHITE}{CURRENCY}
@@ -2087,7 +2052,6 @@ STR_SV_STNAME_UPPER                                             :前 {STRING}
 STR_SV_STNAME_LOWER                                             :后 {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} 停机楼
 STR_SV_STNAME_FOREST                                            :{STRING} 林场
-STR_SV_STNAME_FALLBACK                                          :{STRING} 车站 #{NUM}

 ############ end of savegame specific region!

@@ -2124,7 +2088,6 @@ STR_CITY_APPROVAL                                               :{LTBLUE}市政
 ############ range for difficulty settings ends

 STR_NONE                                                        :没有
-STR_NUM_VERY_LOW                                                :很低
 STR_6816_LOW                                                    :低
 STR_6817_NORMAL                                                 :一般
 STR_6818_HIGH                                                   :高
@@ -2283,11 +2246,6 @@ STR_RELOCATE_HQ                                                 :{BLACK}重置
 STR_COMPANY_PASSWORD                                            :{BLACK}密码
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}设置密码可以防止未经授权的用户随意加入。
 STR_SET_COMPANY_PASSWORD                                        :{BLACK}设置公司密码
-STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}不保存所输入的密码
-STR_COMPANY_PASSWORD_OK                                         :{BLACK}为公司设置新密码
-STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}公司密码
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}默认公司密码
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}将此公司密码作为新公司的默认密码
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}大萧条！{}{}金融专家预测世界经济将全面倒退！
 STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}大萧条结束！{}{}贸易复苏带动经济全面启动！
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}切换窗口大小
@@ -2313,8 +2271,6 @@ STR_LIVERY_EMU                                                  :EMU
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :载客车头 (蒸汽)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :载客车头 (内燃机)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :载客车头 (电力)
-STR_LIVERY_PASSENGER_WAGON_MONORAIL                             :客车车厢（单轨）
-STR_LIVERY_PASSENGER_WAGON_MAGLEV                               :客车车厢（磁悬）
 STR_LIVERY_FREIGHT_WAGON                                        :平板车厢
 STR_LIVERY_BUS                                                  :巴士
 STR_LIVERY_TRUCK                                                :卡车
@@ -2323,8 +2279,6 @@ STR_LIVERY_FREIGHT_SHIP                                         :平板货船
 STR_LIVERY_HELICOPTER                                           :直升机
 STR_LIVERY_SMALL_PLANE                                          :小型飞机
 STR_LIVERY_LARGE_PLANE                                          :大型飞机
-STR_LIVERY_PASSENGER_TRAM                                       :电车客车
-STR_LIVERY_FREIGHT_TRAM                                         :电车货车

 STR_LIVERY_GENERAL_TIP                                          :{BLACK}显示总体配色方案
 STR_LIVERY_TRAIN_TIP                                            :{BLACK}显示列车配色方案
@@ -2769,8 +2723,6 @@ STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{ENGINE}
 STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}新 {STRING} 上市了！  -  {ENGINE}

-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}无法出售毁坏的列车……
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}无法调整毁坏的列车
 STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}不能给车辆编制时间表…
 STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}车辆只能在站内等候。
 STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}此车辆将不在本站停靠。
@@ -2825,16 +2777,13 @@ STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}汽车
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}购买高亮的汽车
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}价格：{CURRENCY}{}速度：{VELOCITY}{}运行成本：{CURRENCY}/年{}装载能力：{CARGO}
 STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}运力： {LTBLUE}
-STR_BARE_CARGO                                                  :{CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}命名汽车
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}不能命名汽车……
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}命名汽车
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一辆巴士抵达 {STATION}！
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}市民举行庆祝仪式……{}第一辆货车抵达 {STATION}！
-STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT}市民欢庆~. . .{}首辆客运电车抵达 {STATION}!
-STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}市民欢庆~. . .{}首辆货运电车抵达 {STATION}!
-STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}汽车事故！{}汽车与火车相撞，司机在火球中丧生！
+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}不能命令多节的汽车掉头
@@ -2994,7 +2943,6 @@ STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}不能
 STR_GO_TO_AIRPORT_HANGAR                                        :前往 {STATION} 机库
 SERVICE_AT_AIRPORT_HANGAR                                       :在 {STATION} 机库保养

-STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (时间表)

 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}齐柏林飞艇在 {STATION} 失事！
@@ -3060,7 +3008,6 @@ STR_NEWGRF_ERROR_INVALID_PARAMETER                              :{STRING} 参数
 STR_NEWGRF_ERROR_LOAD_BEFORE                                    :{STRING} 必须在 {STRING} 前加载。
 STR_NEWGRF_ERROR_LOAD_AFTER                                     :{STRING} 必须在 {STRING} 后加载。
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF 被设计为可平移
-STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :加载的NewGRF太多

 STR_NEWGRF_ADD                                                  :{BLACK}增加
 STR_NEWGRF_ADD_TIP                                              :{BLACK}向列表中增加一个 NewGRF 文件
@@ -3089,7 +3036,6 @@ STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}未找
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}已为缺失的文件载入兼容的 GRF
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}缺失的 GRF 文件已经被禁用
 STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}缺少使游戏运行所必需的 GRF 文件
-STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}无法找到GRF文件

 STR_CURRENCY_WINDOW                                             :{WHITE}自定义货币
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}兑换汇率： {ORANGE}{CURRENCY} = ￡ {COMMA}
@@ -3122,7 +3068,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}显示

 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}你将要出售车库中的所有车辆，确定吗？
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :车库类型错误

 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}出售车库中的所有列车
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}出售车库中的所有汽车
@@ -3214,9 +3159,6 @@ STR_PURCHASE_INFO_ALL_TYPES                                     :所有类型
 STR_PURCHASE_INFO_ALL_BUT                                       :除了 {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}最大牵引力：{GOLD}{FORCE}

-STR_NUM_1                                                       :{BLACK}{SKIP}{NUM}
-STR_NUM_2                                                       :{BLACK}{SKIP}{SKIP}{NUM}
-STR_NUM_3                                                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
 ########### String for New Landscape Generator

 STR_GENERATE                                                    :{WHITE}生成
@@ -3242,8 +3184,6 @@ STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}改变
 STR_START_DATE_QUERY_CAPT                                       :{WHITE}改变游戏开始的日期
 STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}缩放警告
 STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}不推荐将源图片过度放缩，是否继续生成？
-STR_TOWN_LAYOUT_WARNING_CAPTION                                 :{WHITE}城镇扩张警告
-STR_TOWN_LAYOUT_WARNING_MESSAGE                                 :{YELLOW}城镇扩张选项使用“无道路”方式进行是不推荐的.继续么?
 STR_HEIGHTMAP_NAME                                              :{BLACK}高度图名称：
 STR_HEIGHTMAP_SIZE                                              :{BLACK}大小： {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}正在生成地图……
@@ -3271,7 +3211,6 @@ STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}改变
 STR_FLAT_WORLD_HEIGHT                                           :{BLACK}地面高度：

 STR_SMALLMAP_CENTER                                             :{BLACK}设置小地图的中心位置
-STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})

 ########### String for new airports
 STR_SMALL_AIRPORT                                               :{BLACK}小型机场
@@ -3316,108 +3255,15 @@ STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}调节
 STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}调节桥梁的透明度
 STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}调节灯塔及信号发射塔的透明度

-STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
-STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
-STR_PERCENT_DOWN_SMALL                                          :{TINYFONT}{WHITE}{NUM}%{DOWNARROW}
-STR_PERCENT_DOWN                                                :{WHITE}{NUM}%{DOWNARROW}
-STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHITE}{NUM}%{UPARROW}{DOWNARROW}
-STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}

 ##### Mass Order
-STR_GROUP_NAME_FORMAT                                           :组 {COMMA}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_GROUP_ALL_TRAINS                                            :全部火车
-STR_GROUP_ALL_ROADS                                             :全部汽车
-STR_GROUP_ALL_SHIPS                                             :全部船只
-STR_GROUP_ALL_AIRCRAFTS                                         :全部飞机
-STR_GROUP_DEFAULT_TRAINS                                        :未分组火车
-STR_GROUP_DEFAULT_ROADS                                         :未分组汽车
-STR_GROUP_DEFAULT_SHIPS                                         :未分组船只
-STR_GROUP_DEFAULT_AIRCRAFTS                                     :未分组飞机
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
-STR_GROUP_ADD_SHARED_VEHICLE                                    :添加共享车辆
-STR_GROUP_REMOVE_ALL_VEHICLES                                   :移除所有车辆

-STR_GROUP_TRAINS_CAPTION                                        :{WHITE}{GROUP} - {COMMA} 列车
-STR_GROUP_ROADVEH_CAPTION                                       :{WHITE}{GROUP} - {COMMA} 公路车辆
-STR_GROUP_SHIPS_CAPTION                                         :{WHITE}{GROUP} - {COMMA} 船只
-STR_GROUP_AIRCRAFTS_CAPTION                                     :{WHITE}{GROUP} - {COMMA} 飞机
-STR_GROUP_RENAME_CAPTION                                        :{BLACK}移除分组
-STR_GROUP_REPLACE_CAPTION                                       :{WHITE}替换"{GROUP}"组的车辆

-STR_GROUP_CAN_T_CREATE                                          :{WHITE}无法新建分组……
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}无法删除分组……
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}无法重命名分组……
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}无法从该组移除所有交通工具
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}无法添加交通工具到该组
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}无法添加共享交通工具到该组...

-STR_GROUP_CREATE_TIP                                            :{BLACK}创建分组
-STR_GROUP_DELETE_TIP                                            :{BLACK}删除分组
-STR_GROUP_RENAME_TIP                                            :{BLACK}重命名该分组

-STR_COMPANY_NAME                                                :{COMPANY}
-STR_ENGINE_NAME                                                 :{ENGINE}
-STR_GROUP_NAME                                                  :{GROUP}
-STR_PLAYER_NAME                                                 :{PLAYERNAME}
-STR_SIGN_NAME                                                   :{SIGN}
-STR_VEHICLE_NAME                                                :{VEHICLE}

-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}名称重复!请重新命名.


 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}前往下个标记
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}前往上个标记

 ########
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}建设
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}勘探
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}建设
-STR_FACE_ADVANCED                                               :{BLACK}高级
-STR_FACE_ADVANCED_TIP                                           :{BLACK}高级头像选项
-STR_FACE_SIMPLE                                                 :{BLACK}简易
-STR_FACE_SIMPLE_TIP                                             :{BLACK}简易头像选项
-STR_FACE_LOAD                                                   :{BLACK}装载
-STR_FACE_LOAD_TIP                                               :{BLACK}载入保存的肖像
-STR_FACE_LOAD_DONE                                              :{WHITE}您保存的肖像已经从配置文件中读入。
-STR_FACE_FACECODE                                               :{BLACK}头像种子
-STR_FACE_FACECODE_TIP                                           :{BLACK}查看与设置肖像编号
-STR_FACE_FACECODE_CAPTION                                       :{WHITE}查看与设置肖像编号
-STR_FACE_FACECODE_SET                                           :{WHITE}新编号已经启用
-STR_FACE_FACECODE_ERR                                           :{WHITE}编号必须在 0 ~ 4,294,967,295 范围内!
-STR_FACE_SAVE                                                   :{BLACK}保存
-STR_FACE_SAVE_TIP                                               :{BLACK}保存此肖像
-STR_FACE_SAVE_DONE                                              :{WHITE}该肖像将被保存至配置文件中
-STR_FACE_EUROPEAN                                               :{BLACK}欧洲人种肖像
-STR_FACE_SELECT_EUROPEAN                                        :{BLACK}使用欧洲人种肖像
-STR_FACE_AFRICAN                                                :{BLACK}非洲人种肖像
-STR_FACE_SELECT_AFRICAN                                         :{BLACK}使用非洲人种肖像
-STR_FACE_YES                                                    :是
-STR_FACE_NO                                                     :否
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}改胡子或耳环
-STR_FACE_HAIR                                                   :发型
-STR_FACE_HAIR_TIP                                               :{BLACK}换发型
-STR_FACE_EYEBROWS                                               :眉毛
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}换眉毛
-STR_FACE_EYECOLOUR                                              :颜珠颜色
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}换瞳孔色泽
-STR_FACE_GLASSES                                                :眼镜
-STR_FACE_GLASSES_TIP                                            :{BLACK}使用眼镜
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}换眼镜
-STR_FACE_NOSE                                                   :鼻子
-STR_FACE_NOSE_TIP                                               :{BLACK}改鼻子
-STR_FACE_LIPS                                                   :嘴唇
-STR_FACE_MOUSTACHE                                              :胡子
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}换嘴唇或是胡子
-STR_FACE_CHIN                                                   :下巴
-STR_FACE_CHIN_TIP                                               :{BLACK}换下巴
-STR_FACE_JACKET                                                 :衣着
-STR_FACE_JACKET_TIP                                             :{BLACK}换衬衫
-STR_FACE_COLLAR                                                 :领子
-STR_FACE_COLLAR_TIP                                             :{BLACK}换领子
-STR_FACE_TIE                                                    :领带
-STR_FACE_EARRING                                                :耳环
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}换领带或是耳环
-STR_SIGNAL_SELECTION                                            :{WHITE}单项信号
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}无法转换此处的信号灯…
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -1373,7 +1373,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% prepeljano)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% prepeljano)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena industrij - klikni na ime za pogled na industrijo

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...preblizu drugi industriji

@@ -3211,9 +3210,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Manjkajo
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Manjkajoče GRF datoteke
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Izklop pavze lahko sesuje OpenTTD. Ne poročaj o napaki zaradi takih problemov.{}Zagotovo želiš izklopiti pavzo?

-STR_NEWGRF_BROKEN                                               :{WHITE}Ozadje NewGRFa '{0:STRING}' lahko povzroči desinhronizacijo in sesutje igre.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Spremeni dolžino vozila za '{1:ENGINE}' ko ni v garaži.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Vlak '{VEHICLE}' , ki pripada družbi '{COMPANY}', ima neveljavno dolžino. Najbrž vsebuje probleme povezane z NewGRF. Igra se lahko sesuje.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Igra je bila shranjena brez podpore za tramvaj. Vsi tramvaji so bili odstranjeni.
 STR_CURRENCY_WINDOW                                             :{WHITE}Valuta po meri
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Menjalni tečaj: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -1332,7 +1332,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transportado)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nombre de industrias - pulse en el nombre para centrar la vista en él

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cercano a otra industria

@@ -2829,7 +2828,7 @@ STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} D
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nuevos vehículos
 STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Nuevos vehículos
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construir vehículo
-STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}No se puede construir vehículo...
+STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}CNo se puede construir vehículo...
 STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalles)
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
 STR_900E_MAX_SPEED                                              :{BLACK}Velocidad Máx.: {LTBLUE}{VELOCITY}
@@ -3132,7 +3131,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Fichero(
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Fichero(s) GRF que faltan
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Quitar la pausa puede hacer que se cierre OpenTTD. No notifique este error.{}¿Desea realmente quitar la pausa?

-STR_NEWGRF_BROKEN                                               :{WHITE}Problema con el NewGRF '{STRING}' puede causar desincronización o cuelgues
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Cambia la longitud del vehículo para '{1:ENGINE}' cuando no está dentro de un depósito
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Tren '{VEHICLE}' perteneciente a '{COMPANY}' tiene una longitud incorrecta. Puede ser debido a problemas con los NewGRF. El juego puede fallar.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El juego ha sido grabado en una versión sin soporte de tranvía. Todos los tranvías serán eliminados.
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -1331,7 +1331,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transporterat)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% transporterat)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrinamn - klicka på namnet för att centrera vyn över industrin

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... för nära en annan industri

@@ -3131,9 +3130,6 @@ STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Saknas G
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Saknad(e) GRF-fil(er)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Avpausning kan krascha OpenTTD. Skicka ej igen bugg-rapport för möjlig krasch.{}Är du säker att du vill avpausa?

-STR_NEWGRF_BROKEN                                               :{WHITE}'Beteendet hos '{STRING}' kommer troligen orsaka desynkronisering och/eller krascher.
-STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Byter fordonlängd för  '{1:ENGINE}' utanför en depå.
-STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Tåg '{VEHICLE}' som tillhör '{COMPANY}' har ogiltig länd. Detta orsakas förmodligen av problem med en NewGRF. Spelet kan desynkroniseras eller krascha
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spelet sparades i en version som ej stöder spårvagn. Alla spårvagnar har tagits bort
 STR_CURRENCY_WINDOW                                             :{WHITE}Egen valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1456,7 +1456,6 @@ STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Пром
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% перевезено)
 STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% перевезено)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Назви підприємств - клікніть на назві, щоб показати підприємство у центрі

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...дуже близько до іншої промисловості

--- a/src/lang/unfinished/latvian.txt
+++ b/src/lang/unfinished/latvian.txt
@@ -1156,9 +1156,9 @@ STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Būvē d
 STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...šajā scenārijā nav pilsētu

 STR_GENERATE_RANDOM_LANDSCAPE                                   :{WHITE}Vai jūs esat pārliecināts, ka vēlaties izveidot nejauši izvēlētu ainavu?
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Daudz nejauši izveidotu pilsētu
+STR_MANY_RANDOM_TOWNS                                           :Daudz nejauši izveidotu pilsētu
 STR_RANDOM_TOWNS_TIP                                            :{BLACK}Pāklāt karti ar nejauši izvietotām pilsētām
-STR_MANY_RANDOM_INDUSTRIES                                      :Daudz nejauši izveidotu rūpniecību
+STR_MANY_RANDOM_INDUSTRIES                                      :{BLACK}Daudz nejauši izveidotu rūpniecību
 STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Pāklāt karti ar nejauši izvietotām rūpniecībām
 STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nevar izveidot rūpniecības...

--- a/Show More
+++ b/Show More