Update: Changelog for 1.9.0-beta3 and prepare for release.

Change: [AzurePipelines] Use a minimum OSX version of 10.9 during building.
OpenTTD sources are still written in a way to work down to OSX 10.4 or so, as long as you can obtain a C++11 capable compiler. 10.9 is the minimal useful C++11 target using only Apple stuff out-of-the-box.
2019-02-24 23:30:28 +01:00 · 2019-02-24 22:18:10 +01:00 · 2019-02-24 19:45:43 +01:00 · 2019-02-24 17:54:59 +01:00 · 2019-02-24 17:54:59 +01:00 · 2019-02-24 16:27:44 +00:00
144 changed files with 2388 additions and 1323 deletions
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -91,6 +91,7 @@ MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3 -d'	')
 VERSION  := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
 ISODATE  := $(shell echo "$(VERSIONS)" | cut -f 2 -d'	')
 GITHASH  := $(shell echo "$(VERSIONS)" | cut -f 4 -d'	')
+ISTAG    := $(shell echo "$(VERSIONS)" | cut -f 5 -d'	')

 # Make sure we have something in VERSION and ISODATE
 ifeq ($(VERSION),)
@@ -276,10 +277,10 @@ endif
 # Revision files

 $(SRC_DIR)/rev.cpp: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/rev.cpp.in
-	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g" > $(SRC_DIR)/rev.cpp
+	$(Q)cat $(SRC_DIR)/rev.cpp.in      | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!MODIFIED!!@$(MODIFIED)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g" > $(SRC_DIR)/rev.cpp

 $(SRC_DIR)/os/windows/ottdres.rc: $(CONFIG_CACHE_VERSION) $(SRC_DIR)/os/windows/ottdres.rc.in
-	$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g" > $(SRC_DIR)/os/windows/ottdres.rc
+	$(Q)cat $(SRC_DIR)/os/windows/ottdres.rc.in | sed "s@\!\!ISODATE\!\!@$(ISODATE)@g;s@!!VERSION!!@$(VERSION)@g;s@!!DATE!!@`date +%d.%m.%y`@g;s@!!GITHASH!!@$(GITHASH)@g;s@!!ISTAG!!@$(ISTAG)@g" > $(SRC_DIR)/os/windows/ottdres.rc

 FORCE:

--- a/README.md
+++ b/README.md
@@ -476,6 +476,12 @@ The following is an explanation of the different statistics:
 - *World ticks* - Time spent on other world/landscape processing. This
  includes towns growing, building animations, updates of farmland and trees,
  and station rating updates.
+- *GS/AI total*, *Game script*, and *AI players* - Time spent running logic
+  for game scripts and AI players. The total may show as less than the current
+  sum of the individual scripts, this is because AI players at lower
+  difficulty settings do not run every game tick, and hence contribute less
+  to the average across all ticks. Keep in mind that the "Current" figure is
+  also an average, just only over short term.
 - *Link graph delay* - Time overruns of the cargo distribution link graph
  update thread. Usually the link graph is updated in a background thread,
  but these updates need to synchronise with the main game loop occasionally,
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -55,6 +55,9 @@ jobs:
  pool:
    vmImage: 'macOS-10.13'

+  variables:
+    MACOSX_DEPLOYMENT_TARGET: 10.9
+
  steps:
  - template: azure-pipelines/templates/ci-git-rebase.yml
  - template: azure-pipelines/templates/osx-dependencies.yml
--- a/azure-pipelines/changelog.sh
+++ b/azure-pipelines/changelog.sh
@@ -2,13 +2,9 @@

 tag=$(git describe --tags 2>/dev/null)

-# If we are a tag, show the part of the changelog that matches the tag.
-# In case of a stable, also show all betas and RCs.
+# If we are a tag, show the part of the changelog till (but excluding) the last stable
 if [ -n "$tag" ]; then
-    grep="."
-    if [ "$(echo $tag | grep '-')" = "" ]; then
-            grep='^[0-9]\.[0-9]\.[0-9][^-]'
-    fi
+    grep='^[0-9]\.[0-9]\.[0-9][^-]'
    next=$(cat changelog.txt | grep '^[0-9]' | awk 'BEGIN { show="false" } // { if (show=="true") print $0; if ($1=="'$tag'") show="true"} ' | grep "$grep" | head -n1 | sed 's/ .*//')
    cat changelog.txt | awk 'BEGIN { show="false" } /^[0-9].[0-9].[0-9]/ { if ($1=="'$next'") show="false"; if ($1=="'$tag'") show="true";} // { if (show=="true") print $0 }'
    exit 0
--- a/azure-pipelines/templates/release.yml
+++ b/azure-pipelines/templates/release.yml
@@ -135,6 +135,9 @@ jobs:
    vmImage: 'macOS-10.13'
  dependsOn: source

+  variables:
+    MACOSX_DEPLOYMENT_TARGET: 10.9
+
  steps:
  - template: release-fetch-source.yml
  - template: osx-dependencies.yml
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,8 +1,34 @@
-1.9.0-beta2 (2018-02-09)
+1.9.0-beta3 (2019-02-24)
+------------------------------------------------------------------------
+- Feature: Option to adjust font size separately from GUI size (#7003)
+- Feature: Increase maximum number of orders from 64000 to ~16.7m (#7220)
+- Add: Show performance of AI and GS in framerate window
+- Add: News menu entry and shortcut for deleting all messages (#7240)
+- Change: [OSX] Improved scrolling behaviour when using touchpads
+- Change: Add scrollbar to cargo legend in cargo payment rates window
+- Change: Owner of vehicle with exclusive transport rights may now load cargo from neutral stations (#7256)
+- Change: Improved UI behaviour when dragging sound volume sliders with the mouse (#7227)
+- Change: Use selected vehicle group as parent when creating a new group (#7224)
+- Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating (#7219)
+- Change: Skip reliability decay if servicing is disabled
+- Fix: Remove desert around lakes upon generation
+- Fix: Re-sorting file list did not update filtered rows
+- Fix #7159: Waiting time at red one-way signals was too short
+- Fix #7189: Fluidsynth volume gain too high
+- Fix #7004: Cargo flow legend was not properly refreshed after zooming (#7265)
+- Fix: Possibility to modify wrong AI/GS settings when switching AI/GS scripts around (#7090, #7091)
+- Fix: Use more descriptive "spectator" strings for story book and goal dropdown menus
+- Fix #6599: Disable build and rename button in build vehicle window when no vehicle is selected
+- Fix: Do not mangle tagged revision strings for network revision strings
+- Fix #7151: AI start date deviation was still applied when not set to a random AI (#7223)
+- Fix #7197: Invalidate depot buttons when necessary (#7212)
+- Doc: [AI] UnshareOrders empties the orders list of the vehicle
+
+1.9.0-beta2 (2019-02-09)
 ------------------------------------------------------------------------
 - Fix: Non-Windows builds did not get correct git hash

-1.9.0-beta1 (2018-02-09)
+1.9.0-beta1 (2019-02-09)
 ------------------------------------------------------------------------
 Note: OpenTTD was migrated to GitHub for 1.9, so SVN revision and FlySpray numbers have been replaced with Pull Requests and Issue numbers
 - Feature: Group liveries, and livery window usability enhancements (#7108)
--- a/findversion.sh
+++ b/findversion.sh
@@ -82,8 +82,10 @@ if [ -d "$ROOT_DIR/.git" ]; then

 	if [ -n "$TAG" ]; then
 		VERSION="${TAG}"
+		ISTAG="1"
 	else
 		VERSION="${ISODATE}-${BRANCH}${hashprefix}${SHORTHASH}"
+		ISTAG="0"
 	fi

 elif [ -f "$ROOT_DIR/.ottdrev" ]; then
@@ -99,6 +101,7 @@ else
 	ISODATE=""
 	TAG=""
 	VERSION=""
+	ISTAG="0"
 fi

-echo "$VERSION	$ISODATE	$MODIFIED	$HASH"
+echo "$VERSION	$ISODATE	$MODIFIED	$HASH	$ISTAG"
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2019-02-09
-Release version: 1.9.0-beta2
+Last updated:    2019-02-24
+Release version: 1.9.0-beta3
 ------------------------------------------------------------------------


--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,9 @@
+openttd (1.9.0~beta3-0) unstable; urgency=low
+
+  * New upstream release 1.9.0-beta3
+
+ -- OpenTTD <info@openttd.org>  Sun, 24 Feb 2019 23:00:00 +0000
+
 openttd (1.9.0~beta2-0) unstable; urgency=low

  * New upstream release 1.9.0-beta2
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -17,9 +17,9 @@
 #

 Name:           openttd
-Version:        1.9.beta2
+Version:        1.9.beta3
 Release:        0
-%define srcver  1.9.0-beta2
+%define srcver  1.9.0-beta3
 Summary:        An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
 License:        GPL-2.0
 Group:          Amusements/Games/Strategy/Other
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 9
 !define APPV_MAINT 0
-!define APPV_BUILD 1
-!define APPV_EXTRA "-beta2"
+!define APPV_BUILD 2
+!define APPV_EXTRA "-beta3"

 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -21,34 +21,40 @@ Sub FindReplaceInFile(filename, to_find, replacement)
 	file.Close
 End Sub

-Sub UpdateFile(modified, isodate, version, cur_date, githash, filename)
+Sub UpdateFile(modified, isodate, version, cur_date, githash, istag, filename)
 	FSO.CopyFile filename & ".in", filename
 	FindReplaceInFile filename, "!!MODIFIED!!", modified
 	FindReplaceInFile filename, "!!ISODATE!!", isodate
 	FindReplaceInFile filename, "!!VERSION!!", version
 	FindReplaceInFile filename, "!!DATE!!", cur_date
 	FindReplaceInFile filename, "!!GITHASH!!", githash
+	FindReplaceInFile filename, "!!ISTAG!!", istag
 End Sub

 Sub UpdateFiles(version)
-	Dim modified, isodate, cur_date, githash
+	Dim modified, isodate, cur_date, githash, istag
 	cur_date = DatePart("D", Date) & "." & DatePart("M", Date) & "." & DatePart("YYYY", Date)

 	If InStr(version, Chr(9)) Then
+		' Split string into field with tails
 		isodate  = Mid(version, InStr(version, Chr(9)) + 1)
 		modified = Mid(isodate, InStr(isodate, Chr(9)) + 1)
 		githash  = Mid(modified, InStr(modified, Chr(9)) + 1)
+		istag    = Mid(githash, InStr(githash, Chr(9)) + 1)
+		' Remove tails from fields
+		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 		isodate  = Mid(isodate, 1, InStr(isodate, Chr(9)) - 1)
 		modified = Mid(modified, 1, InStr(modified, Chr(9)) - 1)
-		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
+		githash  = Mid(githash, 1, InStr(githash, Chr(9)) - 1)
 	Else
 		isodate = 0
 		modified = 1
 		githash = ""
+		istag = 0
 	End If

-	UpdateFile modified, isodate, version, cur_date, githash, "../src/rev.cpp"
-	UpdateFile modified, isodate, version, cur_date, githash, "../src/os/windows/ottdres.rc"
+	UpdateFile modified, isodate, version, cur_date, githash, istag, "../src/rev.cpp"
+	UpdateFile modified, isodate, version, cur_date, githash, istag, "../src/os/windows/ottdres.rc"
 End Sub

 Function DetermineVersion()
@@ -137,7 +143,7 @@ Function DetermineVersion()
 		DetermineVersion = "norev000"
 		modified = 1
 	Else
-		Dim version, hashprefix
+		Dim version, hashprefix, istag
 		If modified = 0 Then
 			hashprefix = "-g"
 		ElseIf modified = 2 Then
@@ -148,11 +154,13 @@ Function DetermineVersion()

 		If tag <> "" Then
 			version = tag
+			istag = 1
 		Else
 			version = isodate & "-" & branch & hashprefix & shorthash
+			istag = 0
 		End If

-		DetermineVersion = version & Chr(9) & isodate & Chr(9) & modified & Chr(9) & hash
+		DetermineVersion = version & Chr(9) & isodate & Chr(9) & modified & Chr(9) & hash & Chr(9) & istag
 	End If
 End Function

--- a/projects/generate
+++ b/projects/generate
@@ -10,6 +10,19 @@
 # This file generates all project files based on sources.list, so everyone who
 #  can start a bash process, can update the project files.

+# Set neutral locale so sort behaves the same everywhere
+LC_ALL=C
+export LC_ALL
+
+# We really need gawk for this!
+AWK=gawk
+
+${AWK} --version > /dev/null 2> /dev/null
+if [ "$?" != "0" ]; then
+	echo "This script needs gawk to run properly"
+	exit 1
+fi
+
 ROOT_DIR="`pwd`/.."
 if ! [ -e "$ROOT_DIR/source.list" ]
 then
@@ -66,7 +79,7 @@ with_cocoa="0"
 enable_directmusic="1"
 enable_fluidsynth="0"
 with_threads="1"
-file_prefix="..\\\\src\\\\"
+file_prefix="..\\\\\\\\src\\\\\\\\"

 safety_check() {
 	li=""
@@ -97,7 +110,8 @@ rm tmp.headers.*

 load_main_data() {
 	# Read the source.list and process it
-	RES="`cat $1 | tr '\r' '\n' | awk '
+	RES="`cat $1 | ${AWK} -v BINMODE=1 '
+		{ gsub("\\r", "", $0); }
 		/^(	*)#end/  { if (deep == skip) { skip -= 1; } deep -= 1; next; }
 		/^(	*)#else/ { if (deep == skip) { skip -= 1; } else if (deep - 1 == skip) { skip += 1; } next; }
 		/^(	*)#if/   {
@@ -149,7 +163,7 @@ load_main_data() {
 		{
 			if (deep == skip) {
 				gsub("	", "", $0);
-				gsub("/", "\\\\", $0);
+				gsub("/", "\\\\\\\\", $0);
 				split($0, file, ".");
 				cltype = "ClInclude"
 				if (file[2] == "cpp") cltype = "ClCompile";
@@ -177,13 +191,13 @@ load_lang_data() {
 			continue
 		fi
 		RES="$RES
-#2    <CustomBuild Include=\"..\\src\\lang\\"$i".txt\">
+#2    <CustomBuild Include=\"..\\\\src\\\\lang\\\\"$i".txt\">
 #2      <Message Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">Generating "$i" language file</Message>
-#2      <Command Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\objs\\strgen\\strgen.exe -s ..\\src\\lang -d ..\\bin\\lang \"%(FullPath)\"</Command>
-#2      <AdditionalInputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\src\\lang\\english.txt;..\\objs\\strgen\\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
-#2      <Outputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\bin\\lang\\"$i".lng;%(Outputs)</Outputs>
+#2      <Command Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\\\objs\\\\strgen\\\\strgen.exe -s ..\\\\src\\\\lang -d ..\\\\bin\\\\lang \"%(FullPath)\"</Command>
+#2      <AdditionalInputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\\\src\\\\lang\\\\english.txt;..\\\\objs\\\\strgen\\\\strgen.exe;%(AdditionalInputs)</AdditionalInputs>
+#2      <Outputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\\\bin\\\\lang\\\\"$i".lng;%(Outputs)</Outputs>
 #2    </CustomBuild>
-#3    <CustomBuild Include=\"..\\src\\lang\\"$i".txt\">
+#3    <CustomBuild Include=\"..\\\\src\\\\lang\\\\"$i".txt\">
 #3      <Filter>Translations</Filter>
 #3    </CustomBuild>"
 	done
@@ -194,16 +208,16 @@ load_lang_data() {
 load_settings_data() {
 	RES=""
 	RES2="
-#3..\\objs\\settings\\settings_gen.exe -o ..\\objs\\settings\\table\\settings.h -b ..\\src\\table\\settings.h.preamble -a ..\\src\\table\\settings.h.postamble"
+#3..\\\\objs\\\\settings\\\\settings_gen.exe -o ..\\\\objs\\\\settings\\\\table\\\\settings.h -b ..\\\\src\\\\table\\\\settings.h.preamble -a ..\\\\src\\\\table\\\\settings.h.postamble"
 	for i in `ls $1`
 	do
 		i=`basename $i`
 		RES="$RES
-#2    <None Include=\"..\\src\\table\\"$i"\" />
-#4    <None Include=\"..\\src\\table\\"$i"\">
+#2    <None Include=\"..\\\\src\\\\table\\\\"$i"\" />
+#4    <None Include=\"..\\\\src\\\\table\\\\"$i"\">
 #4      <Filter>INI</Filter>
 #4    </None>"
-		RES2="$RES2 ..\\src\\table\\"$i
+		RES2="$RES2 ..\\\\src\\\\table\\\\"$i
 	done

 	eval "$2=\"\$RES\$RES2\""
@@ -224,7 +238,7 @@ load_baseset_data() {
 			FIRST=1
 		fi
 		i=`basename $i`
-		RES2="$RES2..\\src\\lang\\$i.txt"
+		RES2="$RES2..\\\\src\\\\lang\\\\$i.txt"
 	done
 	RES2="$RES2</Langs>"
 	# Windows Folder sort and Linux Folder sort are slightly different.
@@ -233,13 +247,13 @@ load_baseset_data() {
 	do
 		i=`basename $i`
 		RES="$RES
-#2    <CustomBuild Include=\"..\\media\\baseset\\"$i"\">
+#2    <CustomBuild Include=\"..\\\\media\\\\baseset\\\\"$i"\">
 #2      <Message Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">Generating "$i" baseset metadata file</Message>
-#2      <Command Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">cscript //nologo ..\\media\\baseset\\translations.vbs \"%(FullPath)\" \"\$(OutputPath)$i\" ..\\src\\lang ..\\bin\\baseset\\orig_extra.grf</Command>
-#2      <AdditionalInputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">\$(Langs);..\\bin\\baseset\\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs>
-#2      <Outputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\bin\\baseset\\"$i";%(Outputs)</Outputs>
+#2      <Command Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">cscript //nologo ..\\\\media\\\\baseset\\\\translations.vbs \"%(FullPath)\" \"\$(OutputPath)$i\" ..\\\\src\\\\lang ..\\\\bin\\\\baseset\\\\orig_extra.grf</Command>
+#2      <AdditionalInputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">\$(Langs);..\\\\bin\\\\baseset\\\\orig_extra.grf;%(AdditionalInputs)</AdditionalInputs>
+#2      <Outputs Condition=\"'\$(Configuration)|\$(Platform)'=='Debug|Win32'\">..\\\\bin\\\\baseset\\\\"$i";%(Outputs)</Outputs>
 #2    </CustomBuild>
-#3    <CustomBuild Include=\"..\\media\\baseset\\"$i"\">
+#3    <CustomBuild Include=\"..\\\\media\\\\baseset\\\\"$i"\">
 #3      <Filter>Baseset Metadata</Filter>
 #3    </CustomBuild>"
 	done
@@ -249,52 +263,28 @@ load_baseset_data() {

 generate() {
 	echo "Generating $2..."
-	if [ $# -eq 3 ]; then
-		# Everything above the !!FILTERS!! marker
-		cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk '
-			/^$/ { next }
-			/!!FILTERS!!/ { stop = 1; }
-			{
-				if (stop == 0) { print $0 }
-			}
-		' > "$ROOT_DIR/projects/$2"
-
-		echo "$3" >> "$ROOT_DIR/projects/$2"
-
-		# Everything below the !!FILTERS!! marker and above the !!FILES!! marker
-		cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk '
-			BEGIN { stop = 1; }
-			/^$/ { next }
-			/!!FILTERS!!/ { stop = 2; }
-			/!!FILES!!/ { stop = 1; }
-			{
-				if (stop == 0) { print $0 }
-				if (stop == 2) { stop = 0 }
-			}
-		' >> "$ROOT_DIR/projects/$2"
-	else
-		# Everything above the !!FILES!! marker
-		cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk '
-			/^$/ { next }
-			/!!FILES!!/ { stop = 1; }
-			{
-				if (stop == 0) { print $0 }
-			}
-		' > "$ROOT_DIR/projects/$2"
-	fi
-
-	echo "$1" >> "$ROOT_DIR/projects/$2"
-
-	# Everything below the !!FILES!! marker
-	cat "$ROOT_DIR/projects/$2".in | tr '\r' '\n' | awk '
-		BEGIN { stop = 1; }
+	# Everything above the !!FILTERS!! marker
+	cat "$ROOT_DIR/projects/$2".in | ${AWK} -v BINMODE=1 -v FILTERS="$3" -v FILES="$1" '
+		{ CR = (match($0, "\\r$") > 0 ? "\r" : "") }
 		/^$/ { next }
-		/!!FILES!!/ { stop = 2; }
-		{
-			if (stop == 0) { print $0 }
-			if (stop == 2) { stop = 0 }
+		/!!FILTERS!!/ {
+			split(FILTERS, filters, "\n");
+			for (i = 1; filters[i] != ""; i++) {
+				print filters[i] CR;
+			}
+			next;
 		}
-	' >> "$ROOT_DIR/projects/$2"
+		/!!FILES!!/ {
+			split(FILES, files, "\n");
+			for (i = 1; files[i] != ""; i++) {
+				print files[i] CR;
+			}
+			next;
+		}
+		{
+			print $0;
+		}
+	' > "$ROOT_DIR/projects/$2"
 }

 safety_check "$ROOT_DIR/source.list"
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@@ -405,5 +405,5 @@ generate basesetvcxproj, ROOT_DIR & "/projects/basesets_vs140.vcxproj", basesetl
 generate basesetfiles, ROOT_DIR & "/projects/basesets_vs140.vcxproj.filters", Null
 generate basesetvcxproj, ROOT_DIR & "/projects/basesets_vs141.vcxproj", basesetlangs
 generate basesetfiles, ROOT_DIR & "/projects/basesets_vs141.vcxproj.filters", Null
-generate settingsvcxproj, ROOT_DIR & "/projects/basesets_vs142.vcxproj", settingscommand
-generate settingsfiles, ROOT_DIR & "/projects/basesets_vs142.vcxproj.filters", Null
+generate basesetvcxproj, ROOT_DIR & "/projects/basesets_vs142.vcxproj", basesetlangs
+generate basesetfiles, ROOT_DIR & "/projects/basesets_vs142.vcxproj.filters", Null
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -35,6 +35,15 @@ ScriptConfigItem _start_date_config = {
 	false
 };

+AIConfig::AIConfig(const AIConfig *config) : ScriptConfig(config)
+{
+	/* Override start_date as per AIConfig::AddRandomDeviation().
+	 * This is necessary because the ScriptConfig constructor will instead call
+	 * ScriptConfig::AddRandomDeviation(). */
+	int start_date = config->GetSetting("start_date");
+	this->SetSetting("start_date", start_date != 0 ? max(1, this->GetSetting("start_date")) : 0);
+}
+
 /* static */ AIConfig *AIConfig::GetConfig(CompanyID company, ScriptSettingSource source)
 {
 	AIConfig **config;
--- a/src/ai/ai_config.hpp
+++ b/src/ai/ai_config.hpp
@@ -26,9 +26,7 @@ public:
 		ScriptConfig()
 	{}

-	AIConfig(const AIConfig *config) :
-		ScriptConfig(config)
-	{}
+	AIConfig(const AIConfig *config);

 	class AIInfo *GetInfo() const;

--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -16,6 +16,7 @@
 #include "../company_func.h"
 #include "../network/network.h"
 #include "../window_func.h"
+#include "../framerate_type.h"
 #include "ai_scanner.hpp"
 #include "ai_instance.hpp"
 #include "ai_config.hpp"
@@ -79,8 +80,11 @@
 	const Company *c;
 	FOR_ALL_COMPANIES(c) {
 		if (c->is_ai) {
+			PerformanceMeasurer framerate((PerformanceElement)(PFE_AI0 + c->index));
 			cur_company.Change(c->index);
 			c->ai_instance->GameLoop();
+		} else {
+			PerformanceMeasurer::SetInactive((PerformanceElement)(PFE_AI0 + c->index));
 		}
 	}
 	cur_company.Restore();
@@ -101,6 +105,7 @@
 /* static */ void AI::Stop(CompanyID company)
 {
 	if (_networking && !_network_server) return;
+	PerformanceMeasurer::SetInactive((PerformanceElement)(PFE_AI0 + company));

 	Backup<CompanyByte> cur_company(_current_company, company, FILE_LINE);
 	Company *c = Company::Get(company);
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -585,6 +585,8 @@ struct AISettingsWindow : public Window {
 	virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
 	{
 		this->RebuildVisibleSettings();
+		HideDropDownMenu(this);
+		DeleteChildWindows(WC_QUERY_STRING);
 	}

 private:
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -1438,7 +1438,7 @@ struct BuildVehicleWindow : Window {
 		this->GenerateBuildList();
 		this->vscroll->SetCount(this->eng_list.Length());

-		this->SetWidgetDisabledState(WID_BV_SHOW_HIDE, this->sel_engine == INVALID_ENGINE);
+		this->SetWidgetsDisabledState(this->sel_engine == INVALID_ENGINE, WID_BV_SHOW_HIDE, WID_BV_BUILD, WID_BV_RENAME, WIDGET_LIST_END);

 		this->DrawWidgets();

--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -816,7 +816,9 @@ void CompanyAdminRemove(CompanyID company_id, CompanyRemoveReason reason)
 * @param p1 various functionality
 * - bits 0..15: CompanyCtrlAction
 * - bits 16..24: CompanyID
- * @param p2 ClientID
+ * @param p2 various depending on CompanyCtrlAction
+ * - bits 0..31: ClientID (with CCA_NEW)
+ * - bits 0..1: CompanyRemoveReason (with CCA_DELETE)
 * @param text unused
 * @return the cost of this operation or an error
 */
@@ -824,9 +826,6 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 {
 	InvalidateWindowData(WC_COMPANY_LEAGUE, 0, 0);
 	CompanyID company_id = (CompanyID)GB(p1, 16, 8);
-#ifdef ENABLE_NETWORK
-	ClientID client_id = (ClientID)p2;
-#endif /* ENABLE_NETWORK */

 	switch ((CompanyCtrlAction)GB(p1, 0, 16)) {
 		case CCA_NEW: { // Create a new company
@@ -836,6 +835,8 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 #ifdef ENABLE_NETWORK
 			/* Has the network client a correct ClientIndex? */
 			if (!(flags & DC_EXEC)) return CommandCost();
+
+			ClientID client_id = (ClientID)p2;
 			NetworkClientInfo *ci = NetworkClientInfo::GetByClientID(client_id);
 #ifndef DEBUG_DUMP_COMMANDS
 			/* When replaying the client ID is not a valid client; there
--- a/src/core/pool_func.hpp
+++ b/src/core/pool_func.hpp
@@ -152,18 +152,20 @@ DEFINE_POOL_METHOD(void *)::GetNew(size_t size)
 * @param size size of item
 * @param index index of item
 * @return pointer to allocated item
- * @note usererror() on failure! (index out of range or already used)
+ * @note SlErrorCorruptFmt() on failure! (index out of range or already used)
 */
 DEFINE_POOL_METHOD(void *)::GetNew(size_t size, size_t index)
 {
+	extern void NORETURN SlErrorCorruptFmt(const char *format, ...);
+
 	if (index >= Tmax_size) {
-		usererror("failed loading savegame: %s index " PRINTF_SIZE " out of range (" PRINTF_SIZE ")", this->name, index, Tmax_size);
+		SlErrorCorruptFmt("%s index " PRINTF_SIZE " out of range (" PRINTF_SIZE ")", this->name, index, Tmax_size);
 	}

 	if (index >= this->size) this->ResizeFor(index);

 	if (this->data[index] != NULL) {
-		usererror("failed loading savegame: %s index " PRINTF_SIZE " already in use", this->name, index);
+		SlErrorCorruptFmt("%s index " PRINTF_SIZE " already in use", this->name, index);
 	}

 	return this->AllocateItem(size, index);
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1518,6 +1518,17 @@ static void HandleStationRefit(Vehicle *v, CargoArray &consist_capleft, Station
 	cur_company.Restore();
 }

+/**
+ * Test whether a vehicle can load cargo at a station even if exclusive transport rights are present.
+ * @param st Station with cargo waiting to be loaded.
+ * @param v Vehicle loading the cargo.
+ * @return true when a vehicle can load the cargo.
+ */
+static bool MayLoadUnderExclusiveRights(const Station *st, const Vehicle *v)
+{
+	return st->owner != OWNER_NONE || st->town->exclusive_counter == 0 || st->town->exclusivity == v->owner;
+}
+
 struct ReserveCargoAction {
 	Station *st;
 	StationIDStack *next_station;
@@ -1527,7 +1538,7 @@ struct ReserveCargoAction {

 	bool operator()(Vehicle *v)
 	{
-		if (v->cargo_cap > v->cargo.RemainingCount()) {
+		if (v->cargo_cap > v->cargo.RemainingCount() && MayLoadUnderExclusiveRights(st, v)) {
 			st->goods[v->cargo_type].cargo.Reserve(v->cargo_cap - v->cargo.RemainingCount(),
 					&v->cargo, st->xy, *next_station);
 		}
@@ -1751,7 +1762,7 @@ static void LoadUnloadVehicle(Vehicle *front)
 		/* If there's goods waiting at the station, and the vehicle
 		 * has capacity for it, load it on the vehicle. */
 		uint cap_left = v->cargo_cap - v->cargo.StoredCount();
-		if (cap_left > 0 && (v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0 || ge->cargo.AvailableCount() > 0)) {
+		if (cap_left > 0 && (v->cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0 || ge->cargo.AvailableCount() > 0) && MayLoadUnderExclusiveRights(st, v)) {
 			if (v->cargo.StoredCount() == 0) TriggerVehicle(v, VEHICLE_TRIGGER_NEW_CARGO);
 			if (_settings_game.order.gradual_loading) cap_left = min(cap_left, GetLoadAmount(v));

--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -577,6 +577,7 @@ public:
 		if (_savegame_sort_dirty) {
 			_savegame_sort_dirty = false;
 			SortSaveGameList(this->fios_items);
+			this->OnInvalidateData(SLIWD_FILTER_CHANGES);
 		}

 		this->DrawWidgets();
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -184,12 +184,12 @@ uint SpriteFontCache::GetGlyphWidth(GlyphID key)
 {
 	SpriteID sprite = this->GetUnicodeGlyph(key);
 	if (sprite == 0) sprite = this->GetUnicodeGlyph('?');
-	return SpriteExists(sprite) ? GetSprite(sprite, ST_FONT)->width + ScaleGUITrad(this->fs != FS_NORMAL ? 1 : 0) : 0;
+	return SpriteExists(sprite) ? GetSprite(sprite, ST_FONT)->width + ScaleFontTrad(this->fs != FS_NORMAL ? 1 : 0) : 0;
 }

 int SpriteFontCache::GetHeight() const
 {
-	return ScaleGUITrad(this->height);
+	return ScaleFontTrad(this->height);
 }

 bool SpriteFontCache::GetDrawGlyphShadow()
@@ -282,16 +282,18 @@ void FreeTypeFontCache::SetFontSize(FontSize fs, FT_Face face, int pixels)
 {
 	if (pixels == 0) {
 		/* Try to determine a good height based on the minimal height recommended by the font. */
-		int scaled_height = ScaleGUITrad(_default_font_height[this->fs]);
+		int scaled_height = ScaleFontTrad(_default_font_height[this->fs]);
 		pixels = scaled_height;

 		TT_Header *head = (TT_Header *)FT_Get_Sfnt_Table(this->face, ft_sfnt_head);
 		if (head != NULL) {
 			/* Font height is minimum height plus the difference between the default
 			 * height for this font size and the small size. */
-			int diff = scaled_height - ScaleGUITrad(_default_font_height[FS_SMALL]);
+			int diff = scaled_height - ScaleFontTrad(_default_font_height[FS_SMALL]);
 			pixels = Clamp(min(head->Lowest_Rec_PPEM, 20) + diff, scaled_height, MAX_FONT_SIZE);
 		}
+	} else {
+		pixels = ScaleFontTrad(pixels);
 	}
 	this->used_size = pixels;

@@ -419,6 +421,9 @@ FreeTypeFontCache::~FreeTypeFontCache()
 */
 void FreeTypeFontCache::ClearFontCache()
 {
+	/* Font scaling might have changed, determine font size anew if it was automatically selected. */
+	if (this->face != NULL) this->SetFontSize(this->fs, this->face, this->req_size);
+
 	if (this->glyph_to_sprite == NULL) return;

 	for (int i = 0; i < 256; i++) {
@@ -436,9 +441,6 @@ void FreeTypeFontCache::ClearFontCache()
 	this->glyph_to_sprite = NULL;

 	Layouter::ResetFontCache(this->fs);
-
-	/* GUI scaling might have changed, determine font size anew if it was automatically selected. */
-	if (this->face != NULL && this->req_size == 0) this->SetFontSize(this->fs, this->face, this->req_size);
 }

 FreeTypeFontCache::GlyphEntry *FreeTypeFontCache::GetGlyphPtr(GlyphID key)
--- a/src/framerate_gui.cpp
+++ b/src/framerate_gui.cpp
@@ -13,13 +13,18 @@
 #include <chrono>
 #include "gfx_func.h"
 #include "window_gui.h"
+#include "window_func.h"
 #include "table/sprites.h"
+#include "string_func.h"
 #include "strings_func.h"
 #include "console_func.h"
 #include "console_type.h"
 #include "guitimer_func.h"
+#include "company_base.h"
+#include "ai/ai_info.hpp"

 #include "widgets/framerate_widget.h"
+#include "safeguards.h"


 /**
@@ -183,6 +188,23 @@ namespace {
 		PerformanceData(1),                     // PFE_ACC_DRAWWORLD
 		PerformanceData(60.0),                  // PFE_VIDEO
 		PerformanceData(1000.0 * 8192 / 44100), // PFE_SOUND
+		PerformanceData(1),                     // PFE_ALLSCRIPTS
+		PerformanceData(1),                     // PFE_GAMESCRIPT
+		PerformanceData(1),                     // PFE_AI0 ...
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),
+		PerformanceData(1),                     // PFE_AI14
 	};

 }
@@ -215,6 +237,15 @@ PerformanceMeasurer::PerformanceMeasurer(PerformanceElement elem)
 /** Finish a cycle of a measured element and store the measurement taken. */
 PerformanceMeasurer::~PerformanceMeasurer()
 {
+	if (this->elem == PFE_ALLSCRIPTS) {
+		/* Hack to not record scripts total when no scripts are active */
+		bool any_active = _pf_data[PFE_GAMESCRIPT].num_valid > 0;
+		for (uint e = PFE_AI0; e < PFE_MAX; e++) any_active |= _pf_data[e].num_valid > 0;
+		if (!any_active) {
+			PerformanceMeasurer::SetInactive(PFE_ALLSCRIPTS);
+			return;
+		}
+	}
 	_pf_data[this->elem].Add(this->start_time, GetPerformanceTimer());
 }

@@ -224,11 +255,19 @@ void PerformanceMeasurer::SetExpectedRate(double rate)
 	_pf_data[this->elem].expected_rate = rate;
 }

+/** Mark a performance element as not currently in use. */
+/* static */ void PerformanceMeasurer::SetInactive(PerformanceElement elem)
+{
+	_pf_data[elem].num_valid = 0;
+	_pf_data[elem].next_index = 0;
+	_pf_data[elem].prev_index = 0;
+}
+
 /**
 * Indicate that a cycle of "pause" where no processing occurs.
 * @param elem The element not currently being processed
 */
-void PerformanceMeasurer::Paused(PerformanceElement elem)
+/* static */ void PerformanceMeasurer::Paused(PerformanceElement elem)
 {
 	_pf_data[elem].AddPause(GetPerformanceTimer());
 }
@@ -266,6 +305,44 @@ void PerformanceAccumulator::Reset(PerformanceElement elem)
 void ShowFrametimeGraphWindow(PerformanceElement elem);


+static const PerformanceElement DISPLAY_ORDER_PFE[PFE_MAX] = {
+	PFE_GAMELOOP,
+	PFE_GL_ECONOMY,
+	PFE_GL_TRAINS,
+	PFE_GL_ROADVEHS,
+	PFE_GL_SHIPS,
+	PFE_GL_AIRCRAFT,
+	PFE_GL_LANDSCAPE,
+	PFE_ALLSCRIPTS,
+	PFE_GAMESCRIPT,
+	PFE_AI0,
+	PFE_AI1,
+	PFE_AI2,
+	PFE_AI3,
+	PFE_AI4,
+	PFE_AI5,
+	PFE_AI6,
+	PFE_AI7,
+	PFE_AI8,
+	PFE_AI9,
+	PFE_AI10,
+	PFE_AI11,
+	PFE_AI12,
+	PFE_AI13,
+	PFE_AI14,
+	PFE_GL_LINKGRAPH,
+	PFE_DRAWING,
+	PFE_DRAWWORLD,
+	PFE_VIDEO,
+	PFE_SOUND,
+};
+
+static const char * GetAIName(int ai_index)
+{
+	if (!Company::IsValidAiID(ai_index)) return "";
+	return Company::Get(ai_index)->ai_info->GetName();
+}
+
 /** @hideinitializer */
 static const NWidgetPart _framerate_window_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
@@ -281,14 +358,20 @@ static const NWidgetPart _framerate_window_widgets[] = {
 			NWidget(WWT_TEXT, COLOUR_GREY, WID_FRW_RATE_FACTOR),   SetDataTip(STR_FRAMERATE_SPEED_FACTOR,  STR_FRAMERATE_SPEED_FACTOR_TOOLTIP),
 		EndContainer(),
 	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_GREY),
-		NWidget(NWID_VERTICAL), SetPadding(6), SetPIP(0, 3, 0),
-			NWidget(NWID_HORIZONTAL), SetPIP(0, 6, 0),
-				NWidget(WWT_EMPTY, COLOUR_GREY, WID_FRW_TIMES_NAMES),
-				NWidget(WWT_EMPTY, COLOUR_GREY, WID_FRW_TIMES_CURRENT),
-				NWidget(WWT_EMPTY, COLOUR_GREY, WID_FRW_TIMES_AVERAGE),
+	NWidget(NWID_HORIZONTAL),
+		NWidget(WWT_PANEL, COLOUR_GREY),
+			NWidget(NWID_VERTICAL), SetPadding(6), SetPIP(0, 3, 0),
+				NWidget(NWID_HORIZONTAL), SetPIP(0, 6, 0),
+					NWidget(WWT_EMPTY, COLOUR_GREY, WID_FRW_TIMES_NAMES), SetScrollbar(WID_FRW_SCROLLBAR),
+					NWidget(WWT_EMPTY, COLOUR_GREY, WID_FRW_TIMES_CURRENT), SetScrollbar(WID_FRW_SCROLLBAR),
+					NWidget(WWT_EMPTY, COLOUR_GREY, WID_FRW_TIMES_AVERAGE), SetScrollbar(WID_FRW_SCROLLBAR),
+				EndContainer(),
+				NWidget(WWT_TEXT, COLOUR_GREY, WID_FRW_INFO_DATA_POINTS), SetDataTip(STR_FRAMERATE_DATA_POINTS, 0x0),
 			EndContainer(),
-			NWidget(WWT_TEXT, COLOUR_GREY, WID_FRW_INFO_DATA_POINTS), SetDataTip(STR_FRAMERATE_DATA_POINTS, 0x0),
+		EndContainer(),
+		NWidget(NWID_VERTICAL),
+			NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_FRW_SCROLLBAR),
+			NWidget(WWT_RESIZEBOX, COLOUR_GREY),
 		EndContainer(),
 	EndContainer(),
 };
@@ -296,6 +379,8 @@ static const NWidgetPart _framerate_window_widgets[] = {
 struct FramerateWindow : Window {
 	bool small;
 	GUITimer next_update;
+	int num_active;
+	int num_displayed;

 	struct CachedDecimal {
 		StringID strid;
@@ -332,14 +417,19 @@ struct FramerateWindow : Window {
 	CachedDecimal times_shortterm[PFE_MAX]; ///< cached short term average times
 	CachedDecimal times_longterm[PFE_MAX];  ///< cached long term average times

-	static const int VSPACING = 3; ///< space between column heading and values
+	static const int VSPACING = 3;          ///< space between column heading and values
+	static const int MIN_ELEMENTS = 5;      ///< smallest number of elements to display

 	FramerateWindow(WindowDesc *desc, WindowNumber number) : Window(desc)
 	{
 		this->InitNested(number);
 		this->small = this->IsShaded();
 		this->UpdateData();
+		this->num_displayed = this->num_active;
 		this->next_update.SetInterval(100);
+
+		/* Window is always initialised to MIN_ELEMENTS height, resize to contain num_displayed */
+		ResizeWindow(this, 0, (max(MIN_ELEMENTS, this->num_displayed) - MIN_ELEMENTS) * FONT_HEIGHT_NORMAL);
 	}

 	virtual void OnRealtimeTick(uint delta_ms)
@@ -369,9 +459,19 @@ struct FramerateWindow : Window {

 		this->rate_drawing.SetRate(_pf_data[PFE_DRAWING].GetRate(), _pf_data[PFE_DRAWING].expected_rate);

+		int new_active = 0;
 		for (PerformanceElement e = PFE_FIRST; e < PFE_MAX; e++) {
 			this->times_shortterm[e].SetTime(_pf_data[e].GetAverageDurationMilliseconds(8), MILLISECONDS_PER_TICK);
 			this->times_longterm[e].SetTime(_pf_data[e].GetAverageDurationMilliseconds(NUM_FRAMERATE_POINTS), MILLISECONDS_PER_TICK);
+			if (_pf_data[e].num_valid > 0) new_active++;
+		}
+
+		if (new_active != this->num_active) {
+			this->num_active = new_active;
+			Scrollbar *sb = this->GetScrollbar(WID_FRW_SCROLLBAR);
+			sb->SetCount(this->num_active);
+			sb->SetCapacity(min(this->num_displayed, this->num_active));
+			this->ReInit();
 		}
 	}

@@ -425,11 +525,20 @@ struct FramerateWindow : Window {
 				break;

 			case WID_FRW_TIMES_NAMES: {
-				int linecount = PFE_MAX - PFE_FIRST;
 				size->width = 0;
-				size->height = FONT_HEIGHT_NORMAL * (linecount + 1) + VSPACING;
-				for (int line = 0; line < linecount; line++) {
-					Dimension line_size = GetStringBoundingBox(STR_FRAMERATE_GAMELOOP + line);
+				size->height = FONT_HEIGHT_NORMAL + VSPACING + MIN_ELEMENTS * FONT_HEIGHT_NORMAL;
+				resize->width = 0;
+				resize->height = FONT_HEIGHT_NORMAL;
+				for (PerformanceElement e : DISPLAY_ORDER_PFE) {
+					if (_pf_data[e].num_valid == 0) continue;
+					Dimension line_size;
+					if (e < PFE_AI0) {
+						line_size = GetStringBoundingBox(STR_FRAMERATE_GAMELOOP + e);
+					} else {
+						SetDParam(0, e - PFE_AI0 + 1);
+						SetDParamStr(1, GetAIName(e - PFE_AI0));
+						line_size = GetStringBoundingBox(STR_FRAMERATE_AI);
+					}
 					size->width = max(size->width, line_size.width);
 				}
 				break;
@@ -437,13 +546,14 @@ struct FramerateWindow : Window {

 			case WID_FRW_TIMES_CURRENT:
 			case WID_FRW_TIMES_AVERAGE: {
-				int linecount = PFE_MAX - PFE_FIRST;
 				*size = GetStringBoundingBox(STR_FRAMERATE_CURRENT + (widget - WID_FRW_TIMES_CURRENT));
 				SetDParam(0, 999999);
 				SetDParam(1, 2);
 				Dimension item_size = GetStringBoundingBox(STR_FRAMERATE_MS_GOOD);
 				size->width = max(size->width, item_size.width);
-				size->height += FONT_HEIGHT_NORMAL * linecount + VSPACING;
+				size->height += FONT_HEIGHT_NORMAL * MIN_ELEMENTS + VSPACING;
+				resize->width = 0;
+				resize->height = FONT_HEIGHT_NORMAL;
 				break;
 			}
 		}
@@ -452,14 +562,23 @@ struct FramerateWindow : Window {
 	/** Render a column of formatted average durations */
 	void DrawElementTimesColumn(const Rect &r, StringID heading_str, const CachedDecimal *values) const
 	{
+		const Scrollbar *sb = this->GetScrollbar(WID_FRW_SCROLLBAR);
+		uint16 skip = sb->GetPosition();
+		int drawable = this->num_displayed;
 		int y = r.top;
 		DrawString(r.left, r.right, y, heading_str, TC_FROMSTRING, SA_CENTER, true);
 		y += FONT_HEIGHT_NORMAL + VSPACING;
-
-		for (PerformanceElement e = PFE_FIRST; e < PFE_MAX; e++) {
-			values[e].InsertDParams(0);
-			DrawString(r.left, r.right, y, values[e].strid, TC_FROMSTRING, SA_RIGHT);
-			y += FONT_HEIGHT_NORMAL;
+		for (PerformanceElement e : DISPLAY_ORDER_PFE) {
+			if (_pf_data[e].num_valid == 0) continue;
+			if (skip > 0) {
+				skip--;
+			} else {
+				values[e].InsertDParams(0);
+				DrawString(r.left, r.right, y, values[e].strid, TC_FROMSTRING, SA_RIGHT);
+				y += FONT_HEIGHT_NORMAL;
+				drawable--;
+				if (drawable == 0) break;
+			}
 		}
 	}

@@ -468,11 +587,26 @@ struct FramerateWindow : Window {
 		switch (widget) {
 			case WID_FRW_TIMES_NAMES: {
 				/* Render a column of titles for performance element names */
-				int linecount = PFE_MAX - PFE_FIRST;
+				const Scrollbar *sb = this->GetScrollbar(WID_FRW_SCROLLBAR);
+				uint16 skip = sb->GetPosition();
+				int drawable = this->num_displayed;
 				int y = r.top + FONT_HEIGHT_NORMAL + VSPACING; // first line contains headings in the value columns
-				for (int i = 0; i < linecount; i++) {
-					DrawString(r.left, r.right, y, STR_FRAMERATE_GAMELOOP + i, TC_FROMSTRING, SA_LEFT);
-					y += FONT_HEIGHT_NORMAL;
+				for (PerformanceElement e : DISPLAY_ORDER_PFE) {
+					if (_pf_data[e].num_valid == 0) continue;
+					if (skip > 0) {
+						skip--;
+					} else {
+						if (e < PFE_AI0) {
+							DrawString(r.left, r.right, y, STR_FRAMERATE_GAMELOOP + e, TC_FROMSTRING, SA_LEFT);
+						} else {
+							SetDParam(0, e - PFE_AI0 + 1);
+							SetDParamStr(1, GetAIName(e - PFE_AI0));
+							DrawString(r.left, r.right, y, STR_FRAMERATE_AI, TC_FROMSTRING, SA_LEFT);
+						}
+						y += FONT_HEIGHT_NORMAL;
+						drawable--;
+						if (drawable == 0) break;
+					}
 				}
 				break;
 			}
@@ -494,19 +628,34 @@ struct FramerateWindow : Window {
 			case WID_FRW_TIMES_CURRENT:
 			case WID_FRW_TIMES_AVERAGE: {
 				/* Open time graph windows when clicking detail measurement lines */
-				int line = this->GetRowFromWidget(pt.y, widget, VSPACING, FONT_HEIGHT_NORMAL);
-				if (line > 0) {
-					line -= 1;
-					ShowFrametimeGraphWindow((PerformanceElement)line);
+				const Scrollbar *sb = this->GetScrollbar(WID_FRW_SCROLLBAR);
+				int line = sb->GetScrolledRowFromWidget(pt.y - FONT_HEIGHT_NORMAL - VSPACING, this, widget, VSPACING, FONT_HEIGHT_NORMAL);
+				if (line != INT_MAX) {
+					line++;
+					/* Find the visible line that was clicked */
+					for (PerformanceElement e : DISPLAY_ORDER_PFE) {
+						if (_pf_data[e].num_valid > 0) line--;
+						if (line == 0) {
+							ShowFrametimeGraphWindow(e);
+							break;
+						}
+					}
 				}
 				break;
 			}
 		}
 	}
+
+	virtual void OnResize()
+	{
+		auto *wid = this->GetWidget<NWidgetResizeBase>(WID_FRW_TIMES_NAMES);
+		this->num_displayed = (wid->current_y - wid->min_y - VSPACING) / FONT_HEIGHT_NORMAL - 1; // subtract 1 for headings
+		this->GetScrollbar(WID_FRW_SCROLLBAR)->SetCapacity(this->num_displayed);
+	}
 };

 static WindowDesc _framerate_display_desc(
-	WDP_AUTO, "framerate_display", 60, 40,
+	WDP_AUTO, "framerate_display", 0, 0,
 	WC_FRAMERATE_DISPLAY, WC_NONE,
 	0,
 	_framerate_window_widgets, lengthof(_framerate_window_widgets)
@@ -549,7 +698,13 @@ struct FrametimeGraphWindow : Window {
 	{
 		switch (widget) {
 			case WID_FGW_CAPTION:
-				SetDParam(0, STR_FRAMETIME_CAPTION_GAMELOOP + this->element);
+				if (this->element < PFE_AI0) {
+					SetDParam(0, STR_FRAMETIME_CAPTION_GAMELOOP + this->element);
+				} else {
+					SetDParam(0, STR_FRAMETIME_CAPTION_AI);
+					SetDParam(1, this->element - PFE_AI0 + 1);
+					SetDParamStr(2, GetAIName(this->element - PFE_AI0));
+				}
 				break;
 		}
 	}
@@ -829,7 +984,10 @@ void ConPrintFramerate()
 		"  Viewport drawing",
 		"Video output",
 		"Sound mixing",
+		"AI/GS scripts total",
+		"Game script",
 	};
+	char ai_name_buf[128];

 	static const PerformanceElement rate_elements[] = { PFE_GAMELOOP, PFE_DRAWING, PFE_VIDEO };

@@ -848,8 +1006,15 @@ void ConPrintFramerate()
 	for (PerformanceElement e = PFE_FIRST; e < PFE_MAX; e++) {
 		auto &pf = _pf_data[e];
 		if (pf.num_valid == 0) continue;
+		const char *name;
+		if (e < PFE_AI0) {
+			name = MEASUREMENT_NAMES[e];
+		} else {
+			seprintf(ai_name_buf, lastof(ai_name_buf), "AI %d %s", e - PFE_AI0 + 1, GetAIName(e - PFE_AI0)),
+			name = ai_name_buf;
+		}
 		IConsolePrintF(TC_LIGHT_BLUE, "%s times: %.2fms  %.2fms  %.2fms",
-			MEASUREMENT_NAMES[e],
+			name,
 			pf.GetAverageDurationMilliseconds(count1),
 			pf.GetAverageDurationMilliseconds(count2),
 			pf.GetAverageDurationMilliseconds(count3));
--- a/src/framerate_type.h
+++ b/src/framerate_type.h
@@ -60,6 +60,23 @@ enum PerformanceElement {
 	PFE_DRAWWORLD,     ///< Time spent drawing world viewports in GUI
 	PFE_VIDEO,         ///< Speed of painting drawn video buffer.
 	PFE_SOUND,         ///< Speed of mixing audio samples
+	PFE_ALLSCRIPTS,    ///< Sum of all GS/AI scripts
+	PFE_GAMESCRIPT,    ///< Game script execution
+	PFE_AI0,           ///< AI execution for player slot 1
+	PFE_AI1,           ///< AI execution for player slot 2
+	PFE_AI2,           ///< AI execution for player slot 3
+	PFE_AI3,           ///< AI execution for player slot 4
+	PFE_AI4,           ///< AI execution for player slot 5
+	PFE_AI5,           ///< AI execution for player slot 6
+	PFE_AI6,           ///< AI execution for player slot 7
+	PFE_AI7,           ///< AI execution for player slot 8
+	PFE_AI8,           ///< AI execution for player slot 9
+	PFE_AI9,           ///< AI execution for player slot 10
+	PFE_AI10,          ///< AI execution for player slot 11
+	PFE_AI11,          ///< AI execution for player slot 12
+	PFE_AI12,          ///< AI execution for player slot 13
+	PFE_AI13,          ///< AI execution for player slot 14
+	PFE_AI14,          ///< AI execution for player slot 15
 	PFE_MAX,           ///< End of enum, must be last.
 };
 DECLARE_POSTFIX_INCREMENT(PerformanceElement)
@@ -81,6 +98,7 @@ public:
 	PerformanceMeasurer(PerformanceElement elem);
 	~PerformanceMeasurer();
 	void SetExpectedRate(double rate);
+	static void SetInactive(PerformanceElement elem);
 	static void Paused(PerformanceElement elem);
 };

--- a/src/game/game_core.cpp
+++ b/src/game/game_core.cpp
@@ -15,6 +15,7 @@
 #include "../company_func.h"
 #include "../network/network.h"
 #include "../window_func.h"
+#include "../framerate_type.h"
 #include "game.hpp"
 #include "game_scanner.hpp"
 #include "game_config.hpp"
@@ -31,8 +32,16 @@

 /* static */ void Game::GameLoop()
 {
-	if (_networking && !_network_server) return;
-	if (Game::instance == NULL) return;
+	if (_networking && !_network_server) {
+		PerformanceMeasurer::SetInactive(PFE_GAMESCRIPT);
+		return;
+	}
+	if (Game::instance == NULL) {
+		PerformanceMeasurer::SetInactive(PFE_GAMESCRIPT);
+		return;
+	}
+
+	PerformanceMeasurer framerate(PFE_GAMESCRIPT);

 	Game::frame_counter++;

--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -58,6 +58,7 @@ static void GfxMainBlitter(const Sprite *sprite, int x, int y, BlitterMode mode,
 static ReusableBuffer<uint8> _cursor_backup;

 ZoomLevelByte _gui_zoom; ///< GUI Zoom level
+ZoomLevelByte _font_zoom; ///< Font Zoom level

 /**
 * The rect for repaint.
@@ -1130,13 +1131,14 @@ TextColour GetContrastColour(uint8 background, uint8 threshold)
 */
 void LoadStringWidthTable(bool monospace)
 {
+	ClearFontCache();
+
 	for (FontSize fs = monospace ? FS_MONO : FS_BEGIN; fs < (monospace ? FS_END : FS_MONO); fs++) {
 		for (uint i = 0; i != 224; i++) {
 			_stringwidth_table[fs][i] = GetGlyphWidth(fs, i + 32);
 		}
 	}

-	ClearFontCache();
 	ReInitAllWindows();
 }

--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -869,35 +869,26 @@ void ShowCompanyValueGraph()
 /*****************/

 struct PaymentRatesGraphWindow : BaseGraphWindow {
-	bool first_init; ///< This value is true until the first initialization of the window has finished.
+	uint line_height;   ///< Pixel height of each cargo type row.
+	Scrollbar *vscroll; ///< Cargo list scrollbar.
+
 	PaymentRatesGraphWindow(WindowDesc *desc, WindowNumber window_number) :
 			BaseGraphWindow(desc, WID_CPR_GRAPH, STR_JUST_CURRENCY_SHORT)
 	{
-		this->first_init = true;
 		this->num_on_x_axis = 20;
 		this->num_vert_lines = 20;
 		this->month = 0xFF;
 		this->x_values_start     = 10;
 		this->x_values_increment = 10;

+		this->CreateNestedTree();
+		this->vscroll = this->GetScrollbar(WID_CPR_MATRIX_SCROLLBAR);
+		this->vscroll->SetCount(_sorted_standard_cargo_specs_size);
+
 		/* Initialise the dataset */
 		this->OnHundredthTick();

-		this->InitNested(window_number);
-
-		this->UpdateLoweredWidgets();
-	}
-
-	virtual void OnInit()
-	{
-		/* UpdateLoweredWidgets needs to be called after a language or NewGRF change, but it can't be called before
-		 * InitNested is done. On the first init these functions are called in the correct order by the constructor. */
-		if (!this->first_init) {
-			/* Initialise the dataset */
-			this->OnHundredthTick();
-			this->UpdateLoweredWidgets();
-		}
-		this->first_init = false;
+		this->FinishInitNested(window_number);
 	}

 	void UpdateExcludedData()
@@ -912,53 +903,64 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		}
 	}

-	void UpdateLoweredWidgets()
-	{
-		for (int i = 0; i < _sorted_standard_cargo_specs_size; i++) {
-			this->SetWidgetLoweredState(WID_CPR_CARGO_FIRST + i, !HasBit(this->excluded_data, i));
-		}
-	}
-
 	virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
 	{
-		if (widget < WID_CPR_CARGO_FIRST) {
+		if (widget != WID_CPR_MATRIX) {
 			BaseGraphWindow::UpdateWidgetSize(widget, size, padding, fill, resize);
 			return;
 		}

-		const CargoSpec *cs = _sorted_cargo_specs[widget - WID_CPR_CARGO_FIRST];
-		SetDParam(0, cs->name);
-		Dimension d = GetStringBoundingBox(STR_GRAPH_CARGO_PAYMENT_CARGO);
-		d.width += 14; // colour field
-		d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
-		d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
-		*size = maxdim(d, *size);
+		const CargoSpec *cs;
+		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
+			SetDParam(0, cs->name);
+			Dimension d = GetStringBoundingBox(STR_GRAPH_CARGO_PAYMENT_CARGO);
+			d.width += 14; // colour field
+			d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
+			d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
+			*size = maxdim(d, *size);
+		}
+
+		this->line_height = size->height;
+		size->height = this->line_height * 11; /* Default number of cargo types in most climates. */
+		resize->width = 0;
+		resize->height = this->line_height;
 	}

 	virtual void DrawWidget(const Rect &r, int widget) const
 	{
-		if (widget < WID_CPR_CARGO_FIRST) {
+		if (widget != WID_CPR_MATRIX) {
 			BaseGraphWindow::DrawWidget(r, widget);
 			return;
 		}

-		const CargoSpec *cs = _sorted_cargo_specs[widget - WID_CPR_CARGO_FIRST];
 		bool rtl = _current_text_dir == TD_RTL;

-		/* Since the buttons have no text, no images,
-		 * both the text and the coloured box have to be manually painted.
-		 * clk_dif will move one pixel down and one pixel to the right
-		 * when the button is clicked */
-		byte clk_dif = this->IsWidgetLowered(widget) ? 1 : 0;
 		int x = r.left + WD_FRAMERECT_LEFT;
 		int y = r.top;

-		int rect_x = clk_dif + (rtl ? r.right - 12 : r.left + WD_FRAMERECT_LEFT);
+		int pos = this->vscroll->GetPosition();
+		int max = pos + this->vscroll->GetCapacity();

-		GfxFillRect(rect_x, y + clk_dif, rect_x + 8, y + 5 + clk_dif, PC_BLACK);
-		GfxFillRect(rect_x + 1, y + 1 + clk_dif, rect_x + 7, y + 4 + clk_dif, cs->legend_colour);
-		SetDParam(0, cs->name);
-		DrawString(rtl ? r.left : x + 14 + clk_dif, (rtl ? r.right - 14 + clk_dif : r.right), y + clk_dif, STR_GRAPH_CARGO_PAYMENT_CARGO);
+		const CargoSpec *cs;
+		FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
+			if (pos-- > 0) continue;
+			if (--max < 0) break;
+
+			bool lowered = !HasBit(_legend_excluded_cargo, cs->Index());
+
+			/* Redraw box if lowered */
+			if (lowered) DrawFrameRect(r.left, y, r.right, y + this->line_height - 1, COLOUR_ORANGE, lowered ? FR_LOWERED : FR_NONE);
+
+			byte clk_dif = lowered ? 1 : 0;
+			int rect_x = clk_dif + (rtl ? r.right - 12 : r.left + WD_FRAMERECT_LEFT);
+
+			GfxFillRect(rect_x, y + clk_dif, rect_x + 8, y + 5 + clk_dif, PC_BLACK);
+			GfxFillRect(rect_x + 1, y + 1 + clk_dif, rect_x + 7, y + 4 + clk_dif, cs->legend_colour);
+			SetDParam(0, cs->name);
+			DrawString(rtl ? r.left : x + 14 + clk_dif, (rtl ? r.right - 14 + clk_dif : r.right), y + clk_dif, STR_GRAPH_CARGO_PAYMENT_CARGO);
+
+			y += this->line_height;
+		}
 	}

 	virtual void OnClick(Point pt, int widget, int click_count)
@@ -968,7 +970,6 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 				/* Remove all cargoes from the excluded lists. */
 				_legend_excluded_cargo = 0;
 				this->excluded_data = 0;
-				this->UpdateLoweredWidgets();
 				this->SetDirty();
 				break;

@@ -981,23 +982,33 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 					SetBit(this->excluded_data, i);
 					i++;
 				}
-				this->UpdateLoweredWidgets();
 				this->SetDirty();
 				break;
 			}

-			default:
-				if (widget >= WID_CPR_CARGO_FIRST) {
-					int i = widget - WID_CPR_CARGO_FIRST;
-					ToggleBit(_legend_excluded_cargo, _sorted_cargo_specs[i]->Index());
-					this->ToggleWidgetLoweredState(widget);
+			case WID_CPR_MATRIX: {
+				uint row = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_CPR_MATRIX, 0, this->line_height);
+				if (row >= this->vscroll->GetCount()) return;
+
+				const CargoSpec *cs;
+				FOR_ALL_SORTED_STANDARD_CARGOSPECS(cs) {
+					if (row-- > 0) continue;
+
+					ToggleBit(_legend_excluded_cargo, cs->Index());
 					this->UpdateExcludedData();
 					this->SetDirty();
+					break;
 				}
 				break;
+			}
 		}
 	}

+	virtual void OnResize()
+	{
+		this->vscroll->SetCapacityFromWidget(this, WID_CPR_MATRIX);
+	}
+
 	virtual void OnGameTick()
 	{
 		/* Override default OnGameTick */
@@ -1031,23 +1042,6 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 	}
 };

-/** Construct the row containing the digit keys. */
-static NWidgetBase *MakeCargoButtons(int *biggest_index)
-{
-	NWidgetVertical *ver = new NWidgetVertical;
-
-	for (int i = 0; i < _sorted_standard_cargo_specs_size; i++) {
-		NWidgetBackground *leaf = new NWidgetBackground(WWT_PANEL, COLOUR_ORANGE, WID_CPR_CARGO_FIRST + i, NULL);
-		leaf->tool_tip = STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO;
-		leaf->SetFill(1, 0);
-		leaf->SetLowered(true);
-		ver->Add(leaf);
-	}
-	*biggest_index = WID_CPR_CARGO_FIRST + _sorted_standard_cargo_specs_size - 1;
-	return ver;
-}
-
-
 static const NWidgetPart _nested_cargo_payment_rates_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY),
@@ -1065,12 +1059,15 @@ static const NWidgetPart _nested_cargo_payment_rates_widgets[] = {
 		NWidget(NWID_HORIZONTAL),
 			NWidget(WWT_EMPTY, COLOUR_GREY, WID_CPR_GRAPH), SetMinimalSize(495, 0), SetFill(1, 1), SetResize(1, 1),
 			NWidget(NWID_VERTICAL),
-				NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 0), SetResize(0, 1),
+				NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CPR_ENABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_ENABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL), SetFill(1, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, WID_CPR_DISABLE_CARGOES), SetDataTip(STR_GRAPH_CARGO_DISABLE_ALL, STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL), SetFill(1, 0),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
-				NWidgetFunction(MakeCargoButtons),
-				NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1), SetResize(0, 1),
+				NWidget(NWID_HORIZONTAL),
+					NWidget(WWT_MATRIX, COLOUR_ORANGE, WID_CPR_MATRIX), SetResize(0, 2), SetMatrixDataTip(1, 0, STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO), SetScrollbar(WID_CPR_MATRIX_SCROLLBAR),
+					NWidget(NWID_VSCROLLBAR, COLOUR_ORANGE, WID_CPR_MATRIX_SCROLLBAR),
+				EndContainer(),
+				NWidget(NWID_SPACER), SetMinimalSize(0, 24), SetFill(0, 1),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0), SetFill(0, 1), SetResize(0, 1),
 		EndContainer(),
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -311,7 +311,7 @@ Group::~Group()
 * @param tile unused
 * @param flags type of operation
 * @param p1   vehicle type
- * @param p2   unused
+ * @param p2   parent groupid
 * @param text unused
 * @return the cost of this operation or an error
 */
@@ -322,15 +322,27 @@ CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3

 	if (!Group::CanAllocateItem()) return CMD_ERROR;

+	const Group *pg = Group::GetIfValid(GB(p2, 0, 16));
+	if (pg != NULL) {
+		if (pg->owner != _current_company) return CMD_ERROR;
+		if (pg->vehicle_type != vt) return CMD_ERROR;
+	}
+
 	if (flags & DC_EXEC) {
 		Group *g = new Group(_current_company);
 		g->replace_protection = false;
 		g->vehicle_type = vt;
 		g->parent = INVALID_GROUP;

-		const Company *c = Company::Get(_current_company);
-		g->livery.colour1 = c->livery[LS_DEFAULT].colour1;
-		g->livery.colour2 = c->livery[LS_DEFAULT].colour2;
+		if (pg == NULL) {
+			const Company *c = Company::Get(_current_company);
+			g->livery.colour1 = c->livery[LS_DEFAULT].colour1;
+			g->livery.colour2 = c->livery[LS_DEFAULT].colour2;
+		} else {
+			g->parent = pg->index;
+			g->livery.colour1 = pg->livery.colour1;
+			g->livery.colour2 = pg->livery.colour2;
+		}

 		_new_group_id = g->index;

--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -687,7 +687,7 @@ public:
 			}

 			case WID_GL_CREATE_GROUP: { // Create a new group
-				DoCommandP(0, this->vli.vtype, 0, CMD_CREATE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_CREATE), CcCreateGroup);
+				DoCommandP(0, this->vli.vtype, this->vli.index, CMD_CREATE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_CREATE), CcCreateGroup);
 				break;
 			}

--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -1063,6 +1063,9 @@ static bool MakeLake(TileIndex tile, void *user_data)
 		TileIndex t2 = tile + TileOffsByDiagDir(d);
 		if (IsWaterTile(t2)) {
 			MakeRiver(tile, Random());
+			/* Remove desert directly around the river tile. */
+			TileIndex t = tile;
+			CircularTileSearch(&t, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, NULL);
 			return false;
 		}
 	}
@@ -1134,7 +1137,7 @@ static void River_FoundEndNode(AyStar *aystar, OpenListNode *current)
 		if (!IsWaterTile(tile)) {
 			MakeRiver(tile, Random());
 			/* Remove desert directly around the river tile. */
-			CircularTileSearch(&tile, 5, RiverModifyDesertZone, NULL);
+			CircularTileSearch(&tile, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, NULL);
 		}
 	}
 }
@@ -1245,6 +1248,9 @@ static bool FlowRiver(TileIndex spring, TileIndex begin)
 				DistanceManhattan(spring, lakeCenter) > _settings_game.game_creation.min_river_length) {
 			end = lakeCenter;
 			MakeRiver(lakeCenter, Random());
+			/* Remove desert directly around the river tile. */
+			CircularTileSearch(&lakeCenter, RIVER_OFFSET_DESERT_DISTANCE, RiverModifyDesertZone, NULL);
+			lakeCenter = end;
 			uint range = RandomRange(8) + 3;
 			CircularTileSearch(&lakeCenter, range, MakeLake, &height);
 			/* Call the search a second time so artefacts from going circular in one direction get (mostly) hidden. */
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -985,6 +985,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normaal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dubbel groote
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quad grootte

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis-grafikastel
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kies die basis-grafikastel stel om te gebruik
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} verlore / korrupte ler{P "" s}
@@ -2062,9 +2064,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Verskaff
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Maatskappy is beskerm. Voer wagwoord in

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klient Lys
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Toeskou
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nuwe maatskapy
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klient Lys
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Toeskou
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nuwe maatskapy

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Skop
@@ -2079,7 +2081,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Aanskouers

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sleutel die bedrag geld in wat u wil gee
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Toeskouer

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Moenie die ingesleutelde wagwoord bewaar nie
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -946,6 +946,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :تقريب عا
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :تقريب ×2
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :تقريب ×4

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK} الواجهة الرسومية الاساسية
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK} اختر مجموعة الواجهة الرسومية
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ملف مفقود او غير صالح
@@ -1726,9 +1728,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}الخا
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}الشركه محميه. من فضلك ادخل كلمه المرور

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}قائمة العملاء
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}شاهد
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}شركة جديدة
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :قائمة العملاء
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :شاهد
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :شركة جديدة

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :اطرد
--- a/src/lang/basque.txt
+++ b/src/lang/basque.txt
@@ -972,6 +972,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normala
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Tamaina doblea
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Tamaina laukoitza

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafiko basea markatu
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Aukeratu erabili beharreko grafiko paketea
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} galdutako/hautsitako artxiboa{P "" k}
@@ -1970,9 +1972,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Zerbitza
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Konpainia babestua dago. Pasahitza sartu

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Bezero zerrenda
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Ikusle
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Konpainia berria
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Bezero zerrenda
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Ikusle
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Konpainia berria

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kanporatu
@@ -1987,7 +1989,6 @@ STR_NETWORK_CLIENT                                              :Bezeroa
 STR_NETWORK_SPECTATORS                                          :Ikusleak

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Eman nahi duzun diru kantitatea ezarri
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Ikusle

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ez gorde sartutako pasahitza
--- a/src/lang/belarusian.txt
+++ b/src/lang/belarusian.txt
@@ -1301,6 +1301,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Звычайн
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Падвоены
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Пачацвяроны

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Набор базавай ґрафікі
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Выбар базавага набору ґрафічных аб'ектаў
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} адсутнічаюч{P ы ых ых}/пашкоджан{P ы ых ых} файл{P "" ы аў}
@@ -2387,9 +2389,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сэрв
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Кампанія абароненая. Увядзіце пароль

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Сьпіс кліентаў
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Назіраць
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Новая кампанія
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Сьпіс кліентаў
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Назіраць
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Новая кампанія

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Выкінуць гульца
@@ -2404,7 +2406,6 @@ STR_NETWORK_CLIENT                                              :Кліент
 STR_NETWORK_SPECTATORS                                          :Назіральнікі

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Увядзіце суму грошай, якую вы хочаце перадаць
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Назіральнік

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Не захоўваць уведзены пароль
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -992,6 +992,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dobro
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quádruplo

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecionar o conjunto de gráficos base para usar
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} arquivo{P "" s} faltando/corrompido{P "" s}
@@ -2078,9 +2080,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa está protegida. Digite a senha

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Assistir
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Companhia
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Assistir
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova Companhia

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Banir
@@ -2095,7 +2097,6 @@ STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Entre a quantia a ser dada
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não salvar a senha digitada
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -976,6 +976,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Нормалн
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Двукратно
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Четирикратно

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Базов графичен набор
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Изберете базов графичен набор
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} липсващи/повредени файлове
@@ -2009,9 +2011,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сърв
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компанията е защитена. Въведете парола

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Списък с играчите
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Наблюдавай
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Нова фирма
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Списък с играчите
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Наблюдавай
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Нова фирма

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Изгони
@@ -2026,7 +2028,6 @@ STR_NETWORK_CLIENT                                              :Клиент
 STR_NETWORK_SPECTATORS                                          :Наблюдатели

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Въведете количеството пари, което искате да дадете
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Зрител

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Незапазвай паролата
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -990,6 +990,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Doble
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quàdruple

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunt de gràfics base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecciona el conjunt de gràfics base a utilitzar
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} arxiu{P "" s} absent{P "" s} o corromput{P "" s}.
@@ -2076,9 +2078,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companyia protegida: escriviu-ne la contrasenya

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Llista de clients
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Espectador
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova companyia
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Llista de clients
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Espectador
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova companyia

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Breu
@@ -2093,7 +2095,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Espectadors

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introdueix la quantitat de diners que vols donar
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No desis la nova contrasenya.
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -562,6 +562,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Zvuk/glazba
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Poslijednja poruka/vijest
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Povijest poruka
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Obriši sve poruke
 ############ range ends here

 ############ range for about menu starts
@@ -1090,6 +1091,13 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normalno
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dvostruka veličina
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Četvorostruka veličina

+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Veličina fonta
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Odaberite veličinu fonta za sučelje
+
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normalno
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Dvostruka veličina
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Četvorostruka veličina
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni set grafike
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Odaberi osnovni grafički set za igru
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} datotek{P a e a} nedostaj{P e u e}/korumpiran{P a e o}
@@ -2177,11 +2185,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Odspoji

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Poslužitelj je zaštićen. Unesite zaporku
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Tvrtka je zaštićena. Unesite zaporku
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Popis klijenata

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Popis klijenata
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Promatraj
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova tvrtka
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Popis klijenata
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Promatraj
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova tvrtka

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Izbaci
@@ -2196,7 +2205,6 @@ STR_NETWORK_CLIENT                                              :Klijent
 STR_NETWORK_SPECTATORS                                          :Promatrači

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Unesite iznos novca koji želite dati
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Gledatelj

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nemoj spremiti upisanu zaporku
@@ -3207,6 +3215,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Podmiti
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Ciljevi
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Globalni ciljevi
+STR_GOALS_SPECTATOR                                             :Globalni ciljevi
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globalni ciljevi:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Nijedan -
@@ -3255,6 +3264,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klikni n
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Priča
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Globalna priča
+STR_STORY_BOOK_SPECTATOR                                        :Globalna knjiga priča
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Stranica {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Preskoči na specifičnu stranicu odabravši je iz liste.
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -1076,6 +1076,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normální
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dvojnásobná velikost
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Čtyřnásobná velikost

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Základní sada grafiky
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zvol základní sadu grafiky
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} chybějící{P "" "" ch}/poškozen{P ý é ých} soubor{P "" y ů}
@@ -2156,9 +2158,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Společnost je chráněná. Napiš heslo

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Seznam hráčů
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Pozorovat
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nová společnost
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Seznam hráčů
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Pozorovat
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nová společnost

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Vyhodit
@@ -2173,7 +2175,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Pozorovatelé

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Napiš částku, kterou chceš poskytnout
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Pozorovatel

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neukládat zadané heslo
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -466,6 +466,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Lyd/Musik
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Seneste besked/nyhedsrapport
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Tidligere beskeder
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Slet alle beskeder
 ############ range ends here

 ############ range for about menu starts
@@ -994,6 +995,13 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dobbelt størrelse
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quad (4x) størrelse

+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Skriftstørrelse
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Vælg skriftstørrelsen du ønsker i grænsefladen
+
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normal
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Dobbelt størrelse
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Quad (4x) størrelse
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis-grafiksæt
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vælg det basis-grafiksæt der skal bruges
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} forsvund{P en ne}/ødelagt{P "" e} fil{P "" er}
@@ -2081,11 +2089,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Afbryd f

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveren er beskyttet. Indtast kodeord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Selskabet er beskyttet. Indtast kodeord
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Klientliste

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klient liste
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Tilslut som tilskuer
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nyt firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klient liste
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Tilslut som tilskuer
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nyt firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Smid ud
@@ -2100,7 +2109,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Tilskuere

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv beløbet du vil give
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Tilskuer

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Gem ikke den indtastede adgangskode
@@ -2739,6 +2747,9 @@ STR_FRAMERATE_DRAWING                                           :{BLACK}Grafik-t
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Landskabsvisninger:
 STR_FRAMERATE_VIDEO                                             :{BLACK}Grafik-output:
 STR_FRAMERATE_SOUND                                             :{BLACK}Lydmiksning:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Spilscript/AI total:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK}   Spilscript:
+STR_FRAMERATE_AI                                                :{BLACK}   AI {NUM} {STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Spillogik
@@ -2753,6 +2764,9 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Grafik-tegning
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Tegning af landskabsvisninger
 STR_FRAMETIME_CAPTION_VIDEO                                     :Grafik-output
 STR_FRAMETIME_CAPTION_SOUND                                     :Lydmiksning
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Spil/AI script total
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Spilscript
+STR_FRAMETIME_CAPTION_AI                                        :AI {NUM} {STRING}
 ############ End of leave-in-this-order


@@ -2779,6 +2793,8 @@ STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Ingen in
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
 STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filter-udtryk:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Overskriv fil
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Er du sikker på du vil overskrive den eksisterende fil?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Skriv et navn til det gemte spil

@@ -3109,6 +3125,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Bestik
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Mål
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Globale Mål
+STR_GOALS_SPECTATOR                                             :Globale Mål
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globale mål:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Ingen -
@@ -3157,6 +3174,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik på
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Historiebog
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Global Historiebog
+STR_STORY_BOOK_SPECTATOR                                        :Global Historiebog
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Side {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Gå til en bestemt side ved at vælge den i denne rulleliste.
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -466,6 +466,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Sound/music
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Last message/news report
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Message history
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Delete all messages
 ############ range ends here

 ############ range for about menu starts
@@ -994,6 +995,13 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Double size
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quad size

+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Font size
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Select the interface font size to use
+
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normal
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Double size
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Quad size
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base graphics set
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Select the base graphics set to use
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} missing/corrupted file{P "" s}
@@ -2081,11 +2089,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconne

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Client list

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client list
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New company
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Client list
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectate
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :New company

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kick
@@ -2100,7 +2109,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectators

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Enter the amount of money you want to give
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
@@ -2739,6 +2747,9 @@ STR_FRAMERATE_DRAWING                                           :{BLACK}Graphics
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  World viewports:
 STR_FRAMERATE_VIDEO                                             :{BLACK}Video output:
 STR_FRAMERATE_SOUND                                             :{BLACK}Sound mixing:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  GS/AI total:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK}   Game script:
+STR_FRAMERATE_AI                                                :{BLACK}   AI {NUM} {RAW_STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Game loop
@@ -2753,6 +2764,9 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Graphics render
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :World viewport rendering
 STR_FRAMETIME_CAPTION_VIDEO                                     :Video output
 STR_FRAMETIME_CAPTION_SOUND                                     :Sound mixing
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :GS/AI scripts total
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Game script
+STR_FRAMETIME_CAPTION_AI                                        :AI {NUM} {RAW_STRING}
 ############ End of leave-in-this-order


@@ -3111,6 +3125,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Bribe t
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Goals
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Global Goals
+STR_GOALS_SPECTATOR                                             :Global Goals
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Global goals:
 STR_GOALS_TEXT                                                  :{ORANGE}{RAW_STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- None -
@@ -3159,6 +3174,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click on
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Story Book
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Global Story Book
+STR_STORY_BOOK_SPECTATOR                                        :Global Story Book
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{RAW_STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Page {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Jump to a specific page by selecting it in this drop down list.
--- a/src/lang/english_AU.txt
+++ b/src/lang/english_AU.txt
@@ -970,6 +970,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :other



+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base graphics set
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Select the base graphics set to use
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} missing/corrupted file{P "" s}
@@ -2036,9 +2038,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server i
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client list
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New company
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Client list
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectate
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :New company

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kick
@@ -2053,7 +2055,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectators

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Enter the amount of money you want to give
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -189,6 +189,8 @@ STR_COLOUR_ORANGE                                               :Orange
 STR_COLOUR_BROWN                                                :Brown
 STR_COLOUR_GREY                                                 :Gray
 STR_COLOUR_WHITE                                                :White
+STR_COLOUR_RANDOM                                               :Random
+STR_COLOUR_DEFAULT                                              :Default

 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mph
@@ -464,6 +466,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Sound/music
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Last message/news report
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Message history
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Delete all messages
 ############ range ends here

 ############ range for about menu starts
@@ -475,6 +478,7 @@ STR_ABOUT_MENU_SCREENSHOT                                       :Screenshot
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Fully zoomed in screenshot
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Default zoom screenshot
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Whole map screenshot
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Show frame rate
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :About 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite aligner
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Toggle bounding boxes
@@ -814,6 +818,7 @@ STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLAC
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(President)

 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} sponsored construction of new town {TOWN}!
+STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}A new town called {TOWN} has been constructed!

 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}New {STRING} under construction near {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}New {STRING} being planted near {TOWN}!
@@ -913,7 +918,7 @@ STR_GAME_OPTIONS_CURRENCY_NLG                                   :Dutch Guilder (
 STR_GAME_OPTIONS_CURRENCY_NOK                                   :Norwegian Krone (NOK)
 STR_GAME_OPTIONS_CURRENCY_PLN                                   :Polish Złoty (PLN)
 STR_GAME_OPTIONS_CURRENCY_RON                                   :Romanian Leu (RON)
-STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Rubel (RUR)
+STR_GAME_OPTIONS_CURRENCY_RUR                                   :Russian Ruble (RUR)
 STR_GAME_OPTIONS_CURRENCY_SIT                                   :Slovenian Tolar (SIT)
 STR_GAME_OPTIONS_CURRENCY_SEK                                   :Swedish Krona (SEK)
 STR_GAME_OPTIONS_CURRENCY_TRY                                   :Turkish Lira (TRY)
@@ -926,6 +931,8 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :South African R
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Custom...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgian Lari (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranian Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :New Russian Ruble (RUB)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexican Peso (MXN)
 ############ end of currency region

 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Road vehicles
@@ -988,6 +995,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Double size
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quad size

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base graphics set
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Select the base graphics set to use
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} missing/corrupted file{P "" s}
@@ -1255,6 +1264,8 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Changing
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Infrastructure maintenance: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :When enabled, infrastructure causes maintenance costs. The cost grows over-proportional with the network size, thus affecting bigger companies more than smaller ones

+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR                      :Starting company color: {STRING}
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :Choose starting color for the company

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Airports never expire: {STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :Enabling this setting makes each airport type stay available forever after its introduction
@@ -1813,6 +1824,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Change c
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Enable modifying production values: {ORANGE}{STRING}

 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} - Color Scheme

 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Show general color schemes
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Show train color schemes
@@ -2072,11 +2084,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconne

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Client list

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client list
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New company
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Client list
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectate
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :New company

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kick
@@ -2091,7 +2104,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectators

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Enter the amount of money you want to give
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
@@ -2373,9 +2385,9 @@ STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Combo Si
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}One-way Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side
 STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signal Convert{}When selected, clicking an existing signal will convert it to the selected signal type and variant. Ctrl+Click will toggle the existing variant. Shift+Click shows estimated conversion cost
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dragging signal density
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Decrease dragging signal density
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Increase dragging signal density
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dragging signal distance
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Decrease dragging signal distance
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Increase dragging signal distance

 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Select Rail Bridge
@@ -2698,9 +2710,52 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2019 The OpenTTD team

 # Framerate display window
+STR_FRAMERATE_CAPTION                                           :{WHITE}Frame rate
+STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Simulation rate: {STRING}
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Number of game ticks simulated per second.
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}Graphics frame rate: {STRING}
+STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}Number of video frames rendered per second.
+STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Current game speed factor: {DECIMAL}x
+STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}How fast the game is currently running, compared to the expected speed at normal simulation rate.
+STR_FRAMERATE_CURRENT                                           :{WHITE}Current
+STR_FRAMERATE_AVERAGE                                           :{WHITE}Average
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Data based on {COMMA} measurements
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
+STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
+STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} frames/s
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} frames/s
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} frames/s
+STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
+STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 ############ Leave those lines in this order!!
+STR_FRAMERATE_GAMELOOP                                          :{BLACK}Game loop total:
+STR_FRAMERATE_GL_ECONOMY                                        :{BLACK}  Cargo handling:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  Train ticks:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  Road vehicle ticks:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Ship ticks:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}  Aircraft ticks:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK}  World ticks:
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}  Link graph delay:
+STR_FRAMERATE_DRAWING                                           :{BLACK}Graphics rendering:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  World viewports:
+STR_FRAMERATE_VIDEO                                             :{BLACK}Video output:
+STR_FRAMERATE_SOUND                                             :{BLACK}Sound mixing:
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Game loop
+STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Cargo handling
+STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Train ticks
+STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Road vehicle ticks
+STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Ship ticks
+STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Aircraft ticks
+STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :World ticks
+STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              :Link graph delay
+STR_FRAMETIME_CAPTION_DRAWING                                   :Graphics rendering
+STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :World viewport rendering
+STR_FRAMETIME_CAPTION_VIDEO                                     :Video output
+STR_FRAMETIME_CAPTION_SOUND                                     :Sound mixing
 ############ End of leave-in-this-order


@@ -2726,6 +2781,9 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Game Det
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}No information available
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filter string:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Overwrite File
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Are you sure you want to overwrite the existing file?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Enter a name for the savegame

@@ -2843,7 +2901,12 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Version:
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Min. compatible version: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palette: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Default (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Default (D) / 32 bpp
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY                              :Legacy (W)
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP                        :Legacy (W) / 32 bpp
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameters: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_NONE                              :None

 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}No information available
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Matching file not found
@@ -2924,6 +2987,8 @@ STR_NEWGRF_ERROR_READ_BOUNDS                                    :Read past end o
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Requested GRF resources not available (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} was disabled by {2:STRING}
 STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Invalid/unknown sprite layout format (sprite {3:NUM})
+STR_NEWGRF_ERROR_LIST_PROPERTY_TOO_LONG                         :Too many elements in property value list (sprite {3:NUM}, property {4:HEX})
+STR_NEWGRF_ERROR_INDPROD_CALLBACK                               :Invalid industry production callback (sprite {3:NUM}, "{1:STRING}")

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
@@ -3049,6 +3114,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Bribe t
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Goals
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Global Goals
+STR_GOALS_SPECTATOR                                             :Global Goals
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Global goals:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- None -
@@ -3097,6 +3163,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click on
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Story Book
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Global Story Book
+STR_STORY_BOOK_SPECTATOR                                        :Global Story Book
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Page {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Jump to a specific page by selecting it in this drop down list.
@@ -3301,6 +3368,9 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Center t
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Production level: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}The industry has announced imminent closure!

+STR_INDUSTRY_VIEW_REQUIRES_N_CARGO                              :{BLACK}Requires: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Produces: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}

 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Requires:
 STR_INDUSTRY_VIEW_ACCEPT_CARGO                                  :{YELLOW}{STRING}{BLACK}{3:STRING}
@@ -3358,6 +3428,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Groups -
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Click to create a group
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Delete the selected group
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Rename the selected group
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Change livery of the selected group
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Click to protect this group from global autoreplace

 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Delete Group
@@ -3401,6 +3472,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Refittable to: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :All cargo types
+STR_PURCHASE_INFO_NONE                                          :None
 STR_PURCHASE_INFO_ALL_BUT                                       :All but {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. Tractive Effort: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Range: {GOLD}{COMMA} tiles
@@ -3800,6 +3872,7 @@ STR_ORDER_CONDITIONAL_AGE                                       :Age (years)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Requires maintenance
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Always
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Remaining lifetime (years)
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Maximum reliability

 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}How to compare the vehicle data to the given value
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :is equal to
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -967,6 +967,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normala
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Duobla grandeco
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Kvaroble grandeco

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Baza grafikaro
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektu la uzendan bazgrafikaron
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} mankanta{P "" j}/koruptita{P "" j} dosiero{P "" j}
@@ -1713,9 +1715,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servilo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanio estas protektata. Enigu pasvorton

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientlisto
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spekti
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova kompanio
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klientlisto
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spekti
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova kompanio

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Forbatu
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -1043,6 +1043,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Tavaline
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Topeltsuurus
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Ruudu suurus

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Alusgraafika kogu
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Valib kasutatava alusgraafika kogu
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} puuduv{P "" ad}/viga{P ne sed} fail{P "" id}
@@ -2124,9 +2126,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server o
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Ettevõte on kaitstud. Sisesta salasõna

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientide nimekiri
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Jälgi
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uus ettevõte
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klientide nimekiri
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Jälgi
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Uus ettevõte

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Viska välja
@@ -2141,7 +2143,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Vaatlejad

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sisesta summa mida anda
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Vaatleja

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Sisestatud salasõna ei salvestata
--- a/src/lang/faroese.txt
+++ b/src/lang/faroese.txt
@@ -453,6 +453,7 @@ STR_ABOUT_MENU_SCREENSHOT                                       :Skermmynd
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Suma in skermmynd
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Vanliga suma skermmynd
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Skermmynd av øllum kortinum
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Vís mynda títtleika
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Um 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite aligner
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Skift millum bindingar kassar
@@ -950,6 +951,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað



+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Base grafikk sett
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vel ta base grafikk setti tú vil brúka
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} vantandi/oyðiløgd fíl{P a ir}
@@ -1880,9 +1883,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servarin
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Fyritøka er vard. Skriva loyniorð

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Listi yvir klientar
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Eygleið
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nýggja fyritøku
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Listi yvir klientar
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Eygleið
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nýggja fyritøku

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Sparka
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -991,6 +991,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Tavallinen
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Kaksinkertainen
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Nelinkertainen

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Perusgrafiikat
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Valitse käytettävät perusgrafiikat
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} puuttuva{P "" a}/korruptoitunut{P "" ta} tiedosto{P "" a}
@@ -2078,9 +2080,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Palvelin
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Yhtiö on suojattu. Anna salasana

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Asiakaslista
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Katsele
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uusi yhtiö
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Asiakaslista
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Katsele
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Uusi yhtiö

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Potkaise
@@ -2095,7 +2097,6 @@ STR_NETWORK_CLIENT                                              :Pelaaja
 STR_NETWORK_SPECTATORS                                          :Katsojat

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Syötä rahamäärä, jonka haluat antaa
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Katsoja

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Älä tallenna syötettyä salasanaa
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -467,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Son/Musique
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Message/Bulletin précédent
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Historique des messages
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Effacer tous les messages
 ############ range ends here

 ############ range for about menu starts
@@ -995,6 +996,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Taille double
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Taille quadruple

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Graphiques de base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Sélectionner les graphiques de base à utiliser
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fichier{P "" s} manquant{P "" s}/corrompu{P "" s}
@@ -2082,11 +2085,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Déconne

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Le serveur est protégé. Entrez le mot de passe
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}La compagnie est protégée. Entrez le mot de passe
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Liste des clients

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste des clients
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectateur
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nouvelle compagnie
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liste des clients
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectateur
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nouvelle compagnie

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Exclure
@@ -2101,7 +2105,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectateurs

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Entrer le montant que vous voulez donner
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectateur

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne pas sauver le mot de passe entré
@@ -2780,6 +2783,8 @@ STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Pas d'in
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}{NBSP}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF{NBSP}: {WHITE}{STRING}
 STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filtre{NBSP}:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Écraser le fichier
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Êtes-vous sûr de vouloir écraser le fichier existant{NBSP}?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Entrer un nom pour la sauvegarde

@@ -3110,6 +3115,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Corromp
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Objectifs de {COMPANY}
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Objectifs globaux
+STR_GOALS_SPECTATOR                                             :Objectifs globaux
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Objectifs globaux{NBSP}:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}− Aucun −
@@ -3158,6 +3164,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Cliquer
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}Livre d'histoire de {COMPANY}
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Livre d'histoire global
+STR_STORY_BOOK_SPECTATOR                                        :Livre d'histoire global
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Page {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Aller à une page spécifique en la choisissant dans cette liste
--- a/src/lang/gaelic.txt
+++ b/src/lang/gaelic.txt
@@ -849,6 +849,7 @@ STR_MUSIC_RULER_MARKER                                          :{TINY_FONT}{BLA
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
 STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
+STR_MUSIC_TITLE_NOMUSIC                                         :{TINY_FONT}{DKGREEN}Chan eil ceòl ann
 STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}“{STRING}"
 STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Traca
 STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Tiotal
@@ -869,10 +870,12 @@ STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Toglaich
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Seall uinneag taghadh tracaichean ciùil

 # Playlist window
+STR_PLAYLIST_MUSIC_SELECTION_SETNAME                            :{WHITE}Prògram ciùil - "{STRING}"
 STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} “{STRING}"
 STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}Clàr-amais nan traca
 STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}Prògram - “{STRING}"
 STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Falamhaich
+STR_PLAYLIST_CHANGE_SET                                         :{BLACK}Atharraich an seata
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Falamhaich am prògram làithreach (Gnàthaichte1 no Gnàthaichte2 a-mhàin)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Dèan briogadh air traca ciùil gus a chur ris a' phrògram làithreach (Gnàthaichte1 no Gnàthaichte2 a-mhàin)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Dèan briogadh air traca ciùil gus a thoirt air falbh bhon phrògram làithreach (Gnàthaichte1 no Gnàthaichte2 a-mhàin)
@@ -1079,10 +1082,10 @@ STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION                           :{BIG_FONT}{BLAC

 # Extra view window
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Port-seallaidh {COMMA}
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Cuir lethbhreac sa phort-seallaidh seo
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Atharraich am port-seallaidh
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Cuir lethbhreac dhen ionad air a' phrìomh shealladh sa phort-seallaidh seo
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Cuir ann bhon phort-seallaidh seo
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Cuir ionad a' phuirt-seallaidh seo sa phrìomh shealladh
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Atharraich am prìomh phort-seallaidh
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Cuir lethbhreac de dh'ionad a' phuirt-seallaidh seo sa phrìomh shealladh

 # Game options window
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Roghainnean a' gheama
@@ -1186,6 +1189,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Àbhaisteach
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dà uiread a mheud
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Ceithir uiread a mheud

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Seata grafaigeachd bunasach
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Tagh an seata grafaigeachd bunasach a chleachdas tu
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} {P fhaidhle fhaidhle faidhlichean faidhle} a dhìth/coirbte
@@ -1453,6 +1458,8 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Cha ghab
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Cumail suas a' bhun-structair: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Nuair a bhios seo air, bidh cumail suas a' bhun-structair a' cosg airgid. Fàsaidh na cosgaisean nas luaithe na meud an lìonraidh, mar sin bheir an roghainn seo barrachd buaidh air companaidhean mòra

+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR                      :Dath tòiseachadh na companaidh: {STRING}
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :Tagh dath tòiseachaidh airson na companaidh

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Chan fhalbh an ùine air puirt-adhair: {STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :Nuair a chuireas tu an roghainn seo an comas, cumaidh gach port-adhair a' dol gu bràth an dèidh a thogail
@@ -1537,6 +1544,7 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT                :Dath na crutha-
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :Uaine
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :Dorch-uaine
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Purpaidh
+STR_CONFIG_SETTING_SCROLLMODE_RMB                               :Gluais am mapa le putan deas na luchaige
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Sgroladh mìn nam port-seallaidh: {STRING}
 STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Tagh mar a ghluaiseas am prìomh-shealladh gu ionad sònraichte. Ma tha seo dheth, thèid leum dhan ionad a chaidh a thaghadh sa bhad
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :Seall gliocasan-sgrìn tomhais le innealan togail: {STRING}
@@ -2005,6 +2013,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Atharrai
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Cuir an comas atharrachadh air luachan saothrachaidh: {ORANGE}{STRING}

 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} - Sgeama nan dath

 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Seall sgeamannan nan dath coitcheann
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Seall sgeamannan nan dath airson trèanaichean
@@ -2266,9 +2275,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tha am f
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Tha a' chompanaidh dìonta. Cuir a-steach facal-faire

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liosta nan cliant
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Coimhead air
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Companaidh ùr
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liosta nan cliant
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Coimhead air
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Companaidh ùr

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Thoir a bhròg dha
@@ -2283,7 +2292,6 @@ STR_NETWORK_CLIENT                                              :Cliant
 STR_NETWORK_SPECTATORS                                          :Amharcaichean

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Cuir a-steach na tha thu airson toirt seachad
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Amharc

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Na sàbhail am facal-faire air a chur a-steach
@@ -2576,9 +2584,9 @@ STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Comharra
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Comharra slighe (dealain){}Leigidh comharra slighe le barrachd air aon trèan dol a-steach dhan bhloca comharra air an aon àm, mas urrainn dhan trèan slighe gu ionad stadaidh sàbhailte a ghlèidheadh. Faodar dol seachad air comharran slighe àbhaisteach on chùlaibh
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Comharra slighe aon-shligheach (dealain){}Leigidh comharra slighe le barrachd air aon trèan dol a-steach dhan bhloca comharra air an aon àm, mas urrainn dhan trèan slighe gu ionad stadaidh sàbhailte a ghlèidheadh. Chan fhaodar dol seachad air comharran slighe àbhaisteach on chùlaibh
 STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Iompachadh chomharran{}Ma thagh thu seo ’s tu a' briogadh air comharra a tha ann, iompaichidh seo an comharra dhan t-seòrsa a thagh thu. Seallaidh Shift+briogadh tuairmse air cosgaisean an iompachaidh dhut
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dlùths nan comharran air an cruthachadh le slaodadh
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Lùghdaich dlùths nan comharran air an cruthachadh le slaodadh
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Meudaich dlùths nan comharran air an cruthachadh le slaodadh
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Astar nan comharran air an cruthachadh le slaodadh
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Lùghdaich astar nan comharran air an cruthachadh le slaodadh
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Meudaich astar nan comharran air an cruthachadh le slaodadh

 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Tagh drochaid rèile
@@ -2928,9 +2936,29 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2019 An sgioba OpenTTD

 # Framerate display window
+STR_FRAMERATE_CAPTION                                           :{WHITE}Reat fhrèamaichean
+STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}Reat fhrèamaichean na grafaigeachd: {STRING}
+STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Factar làithreach air luaths a' gheama: {DECIMAL}x
+STR_FRAMERATE_CURRENT                                           :{WHITE}Làithreach
+STR_FRAMERATE_AVERAGE                                           :{WHITE}Cuibheasach
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Dàta stèidhichte air {COMMA} {P "tomhas" "thomhas" "tomhasan" "tomhas" }
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} {P "fhrèam" "fhrèam" "frèamaichean" "frèam" }/diog
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} {P "fhrèam" "fhrèam" "frèamaichean" "frèam" }/diog
+STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
 ############ Leave those lines in this order!!
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}  Dàil air graf nan ceangal:
+STR_FRAMERATE_DRAWING                                           :{BLACK}Reandaradh na grafaigeachd:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Puirt-sheallaidh an t-saoghail:
+STR_FRAMERATE_VIDEO                                             :{BLACK}Às-chur video:
+STR_FRAMERATE_SOUND                                             :{BLACK}Measgachadh fuaime:
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Lùb a' gheama
+STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              : Dàil air graf nan ceangal
+STR_FRAMETIME_CAPTION_VIDEO                                     :Às-chur video
+STR_FRAMETIME_CAPTION_SOUND                                     :Measgachadh fuaime
 ############ End of leave-in-this-order


@@ -2956,6 +2984,7 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Fiosrach
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Chan eil fiosrachadh ri làimh
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Sgrìobh thairis air an fhaidhle

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Cuir a-steach ainm ùr gus an geama a shàbhaladh

@@ -3073,6 +3102,10 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Tionndad
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}An tionndadh as sine a tha co-chòrdail: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}Suim MD5: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Pailead: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Bun-roghainn (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Bun-roghainn (D) / 32 bpp
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY                              :Dìleabach (W)
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP                        :Dìleabach (W) / 32 bpp
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paramadairean: {SILVER}{STRING}

 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Chan eil fiosrachadh ri làimh
@@ -3225,6 +3258,7 @@ STR_TOWN_POPULATION                                             :{BLACK}Sluagh a
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Mòr-bhaile)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Sluagh: {ORANGE}{COMMA}{BLACK}  Taighean: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} sa mhìos seo chaidh: {ORANGE}{COMMA}{BLACK}  as motha: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Carago a tha a dhìth ach am fàs am baile:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{RED}Feum air {ORANGE}{STRING}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{BLACK}Feum air {ORANGE}{STRING}{BLACK} sa gheamhradh
@@ -3277,6 +3311,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Ceannai
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Amasan aig {COMPANY}
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Amasan coitcheann
+STR_GOALS_SPECTATOR                                             :Amasan coitcheann
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Amasan coitcheann:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Chan eil gin -
@@ -3629,6 +3664,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Tomhas-l
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Carbadan le cumhachd: {GOLD}+{POWER}{BLACK} Cuideam: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Gabhaidh mùthadh airson: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Na h-uile seòrsa dhe charago
+STR_PURCHASE_INFO_NONE                                          :Chan eil gin
 STR_PURCHASE_INFO_ALL_BUT                                       :Na h-uile ach {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Spàirn tàirnge as motha: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Astar: {GOLD}{COMMA} {P leac leac leacan leac}
@@ -4460,6 +4496,7 @@ STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... tha
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... tha comhair an rathaid cearr
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... chan urrainn dha dh’oiseanan a bhith aig stèiseanan draibhidh troimhe
 STR_ERROR_DRIVE_THROUGH_JUNCTION                                :{WHITE}... chan urrainn dha ghoibhlean a bhith aig stèiseanan draibhidh troimhe
+STR_ERROR_DRIVE_THROUGH_ON_ONEWAY_ROAD                          :{WHITE}... rathad aon-shligheach no bacte

 # Station destruction related errors
 STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Cha ghabh pàirt dhen stèisean toirt air falbh...
@@ -4711,6 +4748,8 @@ STR_BASESOUNDS_DOS_DESCRIPTION                                  :Fuaimean aig an
 STR_BASESOUNDS_WIN_DESCRIPTION                                  :Fuaimean aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :Pacaid fhuaimean anns nach eil fuaim sam bith.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Ceòl aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
+STR_BASEMUSIC_DOS_DESCRIPTION                                   :Ceòl aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
+STR_BASEMUSIC_TTO_DESCRIPTION                                   :Ceòl aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe (Original/World Editor).
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Pacaid ciùil anns nach eil fonn sam bith.

 ##id 0x2000
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -985,6 +985,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dobre tamaño
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Tamaño do cadro

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conxunto básico de gráficos
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecciona o conxunto de gráficos básico a empregar
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} arquivo{P "" s} inexistente{P "" s}/erróneo{P "" s}
@@ -2065,9 +2067,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}O servid
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A compañía está protexida. Introduce o contrasinal

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova compañía
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Observar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova compañía

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Chimpar
@@ -2082,7 +2084,6 @@ STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduce a cantidade de cartos que queres dar
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Non grava-lo contrasinal introducido
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -995,6 +995,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Doppelt
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Vierfach

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisgrafiken
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zu benutzendes Set an Basisgrafiken auswählen
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fehlende/fehlerhafte Datei{P "" en}
@@ -1776,7 +1778,7 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Prüfe,
 STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Zeige KI- und Skripteinstellungen
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}OpenTTD beenden

-STR_INTRO_BASESET                                               :{BLACK}Dem momentan ausgewählten Basisgrafiken fehl{P 0 "t" "en"} {NUM} Sprite{P 0 "" s}. Bitte überprüfe, ob es Updates für die Basisgrafiken gibt.
+STR_INTRO_BASESET                                               :{BLACK}Den momentan ausgewählten Basisgrafiken fehl{P 0 "t" "en"} {NUM} Sprite{P 0 "" "s"}. Bitte überprüfe, ob es Updates für die Basisgrafiken gibt.
 STR_INTRO_TRANSLATION                                           :{BLACK}Dieser Übersetzung fehl{P 0 t en} {NUM} String{P "" s}. Bitte hilf, OpenTTD zu verbessern und melde Dich als Übersetzer an. Siehe readme.txt für weitere Details.

 # Quit window
@@ -2084,9 +2086,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server i
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma ist geschützt. Passwort eingeben:

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Teilnehmerliste
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Zuschauen
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Neue Firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Teilnehmerliste
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Zuschauen
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Neue Firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Hinauswerfen
@@ -2101,7 +2103,6 @@ STR_NETWORK_CLIENT                                              :Teilnehmer
 STR_NETWORK_SPECTATORS                                          :Zuschauer

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Wieviel Geld soll übergeben werden?
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Zuschauer

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Eingegebenes Passwort nicht speichern
--- a/src/lang/greek.txt
+++ b/src/lang/greek.txt
@@ -1099,6 +1099,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Κανονικ
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Διπλό μέγεθος
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Τετραπλό μέγεθος

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Βασικό σετ γραφικών
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Επιλογή του βασικού σετ γραφικών που θα χρησιμοποιηθεί
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} αρχεί{P ο α} που λείπ{P ει ουν} ή είναι κατεστραμμέν{P ο α}
@@ -2186,9 +2188,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Η πρ
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Η εταιρεία προστατεύεται από κωδικό. Εισάγετε κωδικό

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Λίστα συμμετεχόντων
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Παρακολούθηση
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Νέα εταιρεία
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Λίστα συμμετεχόντων
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Παρακολούθηση
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Νέα εταιρεία

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Εκδίωξη
@@ -2203,7 +2205,6 @@ STR_NETWORK_CLIENT                                              :Πελάτης
 STR_NETWORK_SPECTATORS                                          :Θεατές

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Εισάγετε το πόσο των χρημάτων που θέλετε να δώσετε
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Θεατής

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Να μην αποθηκευτεί ο κωδικός
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -1003,6 +1003,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :רגיל
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :גודל כפול
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :גודל מרובע

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}ערכת גרפיקה בסיסית
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}בחר בערכת גרפיקה בסיסית לשימוש
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{P 0 "קובץ " ""}{NUM}{P "" " קבצים"} חסר{P 0 "" ים}/הושחט{P 0 "" ו}
@@ -2087,9 +2089,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}שרת
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}חברה מוגנת. הזן סיסמה

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}רשימת משתתפים
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}צפה
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}חברה חדשה
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :רשימת משתתפים
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :צפה
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :חברה חדשה

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :בעט
@@ -2104,7 +2106,6 @@ STR_NETWORK_CLIENT                                              :לקוח
 STR_NETWORK_SPECTATORS                                          :צופים

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}הכנס סכום כסף שברצונך לתת
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}צופה

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}בטל שמירת הסיסמה החדשה
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -252,6 +252,8 @@ STR_COLOUR_ORANGE                                               :Narancssárga
 STR_COLOUR_BROWN                                                :Barna
 STR_COLOUR_GREY                                                 :Szürke
 STR_COLOUR_WHITE                                                :Fehér
+STR_COLOUR_RANDOM                                               :Véletlenszerű
+STR_COLOUR_DEFAULT                                              :Alapértelmezett

 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mi/h
@@ -527,6 +529,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Hang/zene
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Legutóbbi üzenet/újsághír
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Előző üzenetek
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Az összes üzenet törlése
 ############ range ends here

 ############ range for about menu starts
@@ -538,6 +541,7 @@ STR_ABOUT_MENU_SCREENSHOT                                       :Képmentés
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Teljes nagyítású képmentés
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Alapértelmezett nagyítású képmentés
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Képmentés teljes térképről
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :FPS ablak
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Az 'OpenTTD'-ről
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Sprite elhelyező
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Befoglaló doboz ki/bekapcsolása
@@ -713,6 +717,7 @@ STR_MUSIC_RULER_MARKER                                          :{TINY_FONT}{BLA
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
 STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
+STR_MUSIC_TITLE_NOMUSIC                                         :{TINY_FONT}{DKGREEN}Nincs elérhető zene
 STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}"{STRING}"
 STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Szám
 STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Cím
@@ -733,11 +738,14 @@ STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Véletle
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}A számkiválasztó ablak megjelenítése

 # Playlist window
+STR_PLAYLIST_MUSIC_SELECTION_SETNAME                            :{WHITE}Zenei lejátszási lista - '{STRING}'
 STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
 STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}Számlista
 STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}"{STRING}" Műsora
 STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Törlés
+STR_PLAYLIST_CHANGE_SET                                         :{BLACK}Lista választása
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Az aktuális műsor törlése (csak Saját 1 és Saját 2)
+STR_PLAYLIST_TOOLTIP_CHANGE_SET                                 :{BLACK}A zenei alapcsomag megváltoztatása
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Kattints a zeneszámra a zenei műsorhoz való hozzáadására (csak Saját 1 és Saját 2)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kattints a zeneszámra annak az aktuális zenei műsorból való eltávolításához (csak Saját 1 és Saját 2 esetén)

@@ -874,6 +882,7 @@ STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLAC
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Elnök)

 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} támogatásával új várost alapítottak {TOWN} néven!
+STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}Új várost alapítottak {TOWN} néven!

 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}Új {STRING.t} építenek {TOWN} közelében!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}Új {STRING.t} ültettek {TOWN} közelében!
@@ -986,6 +995,8 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Dél-afrikai Ra
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Saját...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Grúz Lari (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iráni Riál (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Új Orosz Rubel (RUB)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Mexikói Peso (MXN)
 ############ end of currency region

 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Közúti járművek
@@ -1048,6 +1059,13 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normál
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dupla méret
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Négyszeres méret

+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Betűméret
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Használni kívánt betűméret kiválasztása
+
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normál
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Dupla méret
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Négyszeres méret
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikus alapcsomag
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}A játékhoz használandó grafikus alapcsomag kiválasztása
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} hiányzó/hibás fájl
@@ -1315,6 +1333,8 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}A beáll
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Az infrastruktúra fenntartási költségének engedélyezése: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Bekapcsolva az infrastruktúrának fenntartási költsége van. A költség hatványozottan nő a hálózatnagysággal, nagyobb hatással a nagyobb vállalatokra mint a kisebbekre

+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR                      :A vállalat kezdő színsémája: {STRING}
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :A vállalat színsémája a játék kezdetén

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Repülőterek nem avulnak el: {STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :Bekapcsolva minden repülőtértípus örökké elérhető marad bevezetése után
@@ -1399,6 +1419,12 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT                :Talaj színe a
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :Zöld
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :Sötétzöld
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Sötétkék
+STR_CONFIG_SETTING_SCROLLMODE                                   :A látkép mozgatása: {STRING}
+STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :A látkép mozgatásának módja
+STR_CONFIG_SETTING_SCROLLMODE_DEFAULT                           :A látkép mozgatása jobb egérgombbal, fix kurzorral
+STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :A térkép mozgatása jobb egérgombbal, fix kurzorral
+STR_CONFIG_SETTING_SCROLLMODE_RMB                               :A térkép mozgatása jobb egérgombbal
+STR_CONFIG_SETTING_SCROLLMODE_LMB                               :A térkép mozgatása bal egérgombbal
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Finomított nézőpont-görgetés: {STRING}
 STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Beállítható, hogy a fő nézet hogyan mozogjon egy adott pozícióra a térképre kattintáskor ha egy adott objektumra történik mozgás. Bekapcsolva a nézet egyenletesen mozog, kikapcsolva közvetlenül a kijelölt helyre ugrik
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :Területinformációk mutatása építési eszközök használatakor: {STRING}
@@ -1867,6 +1893,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Aktuáli
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}A nyersanyagüzemek termelése változtatható: {ORANGE}{STRING}

 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} színsémája

 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Általános színsémák mutatása
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Vonat színsémák mutatása
@@ -2126,11 +2153,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Megszak

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}A szerver jelszóval van védve. Írd be
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A vállalat jelszóval van védve. Írd be
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Kliens lista

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Kliens lista
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Megfigyelés
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Új vállalat
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Kliens lista
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Megfigyelés
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Új vállalat

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kirúgás
@@ -2145,7 +2173,6 @@ STR_NETWORK_CLIENT                                              :Kliens
 STR_NETWORK_SPECTATORS                                          :Megfigyelők

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Add meg a küldeni kívánt pénz mennyiségét
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Megfigyelő

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne mentsd el a megadott jelszót
@@ -2342,6 +2369,7 @@ STR_LINKGRAPH_LEGEND_CAPTION                                    :{BLACK}Rakomán
 STR_LINKGRAPH_LEGEND_ALL                                        :{BLACK}Mind
 STR_LINKGRAPH_LEGEND_NONE                                       :{BLACK}Nincs
 STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}Megjelenítendő cégek kiválasztása
+STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP                            :{BLACK}{STRING}{}{COMPANY}

 # Linkgraph legend window and linkgraph legend in smallmap
 STR_LINKGRAPH_LEGEND_UNUSED                                     :{TINY_FONT}{BLACK}nem használt
@@ -2751,9 +2779,58 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2019 Az OpenTTD csapat

 # Framerate display window
+STR_FRAMERATE_CAPTION                                           :{WHITE}FPS ablak
+STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Szimuláció: {STRING}
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}A másodpercenként szimulált játékbeli tickek száma.
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}A grafika képkockasűrűsége: {STRING}
+STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}A másodpercenként renderelt képkockák száma.
+STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}A játék pillanatnyi sebessége: {DECIMAL}x
+STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Milyen gyorsan fut a játék, viszonyítva az elvárt sebességhez normál játéksebesség esetén.
+STR_FRAMERATE_CURRENT                                           :{WHITE}Pillanatnyi
+STR_FRAMERATE_AVERAGE                                           :{WHITE}Átlagos
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Adatok {COMMA} mérés alapján
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
+STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
+STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} képkocka/másodperc
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} képkocka/másodperc
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} képkocka/másodperc
+STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
+STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 ############ Leave those lines in this order!!
+STR_FRAMERATE_GAMELOOP                                          :{BLACK}Játékciklus összesen:
+STR_FRAMERATE_GL_ECONOMY                                        :{BLACK}  Árukezelés:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  Vonat tickek:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  Közúti jármű tickek:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Hajó tickek:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}  Repülőgép tickek:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK}  Világ tickek:
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}  Kapcsolati gráf:
+STR_FRAMERATE_DRAWING                                           :{BLACK}Renderelés:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Világ látképek:
+STR_FRAMERATE_VIDEO                                             :{BLACK}Videokimenet:
+STR_FRAMERATE_SOUND                                             :{BLACK}Hangkeverés:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Játékszkript/MI összesen:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK}   Játékszkript:
+STR_FRAMERATE_AI                                                :{BLACK}   MI {NUM} {STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Játékciklus
+STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Árukezelés
+STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Vonat tickek
+STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Közúti jármű tickek
+STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Hajó tickek
+STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Repülőgép tickek
+STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :Világ tickek
+STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              :Kapcsolati gráf
+STR_FRAMETIME_CAPTION_DRAWING                                   :Renderelés
+STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Világ látképek
+STR_FRAMETIME_CAPTION_VIDEO                                     :Videokimenet
+STR_FRAMETIME_CAPTION_SOUND                                     :Hangkeverés
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Játékszkriptek/MI-k összesen
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Játékszkript
+STR_FRAMETIME_CAPTION_AI                                        :MI {NUM} {STRING}
 ############ End of leave-in-this-order


@@ -2779,6 +2856,9 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Részlet
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Nincs elérhető információ
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Szűrő:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Fájl felülírása
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Biztos vagy benne, hogy felülírod a létező fájlt?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Add meg a játékmentés nevét

@@ -2896,7 +2976,12 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Vezió:
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Min. kompatibilis verzió: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paletta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Alapértelmezett (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Alapértelmezett (D) / 32 bpp
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY                              :Régi (W)
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP                        :Régi (W) / 32 bpp
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paraméterek: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_NONE                              :Nincs

 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Nem érhető el információ
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Fájl nem található
@@ -2977,6 +3062,8 @@ STR_NEWGRF_ERROR_READ_BOUNDS                                    :Ál-sprite táv
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Kért GRF források nem elérhetőek (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} kikapcsolva {STRING} által
 STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Érvénytelen/ismeretlen sprite szerkezet formátum (sprite {3:NUM})
+STR_NEWGRF_ERROR_LIST_PROPERTY_TOO_LONG                         :Túl sok érték a tulajdonságlistában (sprite {3:NUM}, property {4:HEX})
+STR_NEWGRF_ERROR_INDPROD_CALLBACK                               :Érvénytelen termelési callback gazdasági épületben (sprite {3:NUM}, "{1:STRING}")

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Figyelem!
@@ -3041,6 +3128,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Felirat
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Városok
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Nincs -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (Város){BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Városnevek - kattints egy névre a város megnézéséhez. Ctrl+kattintás esetén új látképet nyit a város pozíciójára
 STR_TOWN_POPULATION                                             :{BLACK}Világnépesség: {COMMA}

@@ -3048,6 +3136,7 @@ STR_TOWN_POPULATION                                             :{BLACK}Világn
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Város)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Lakosság: {ORANGE}{COMMA}{BLACK} Házak: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} a legutóbbi hónapban: {ORANGE}{COMMA}{BLACK}  maximum: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}A város növekedéséhez szükséges rakomány:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} szükséges
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} szükséges télen
@@ -3100,6 +3189,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}A megí
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} céljai
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Globális célok
+STR_GOALS_SPECTATOR                                             :Globális célok
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globális célok:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Nincs -
@@ -3148,6 +3238,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Kattints
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} naplója
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Globális napló
+STR_STORY_BOOK_SPECTATOR                                        :Globális napló
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :{NUM}. oldal
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Ugrás tetszőleges oldalra
@@ -3352,6 +3443,9 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}A fő n
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Termelési szint: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}A gyár bejelentette a közelgő bezárását!

+STR_INDUSTRY_VIEW_REQUIRES_N_CARGO                              :{BLACK}Elfogad: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Termel: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}

 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Elfogad:
 STR_INDUSTRY_VIEW_ACCEPT_CARGO                                  :{YELLOW}{STRING}{BLACK}{3:STRING}
@@ -3409,6 +3503,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Csoporto
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Csoport létrehozásához kattints ide
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Kijelölt csoport törlése
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Kijelölt csoport átnevezése
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}A kiválasztott csoport színsémájának megváltoztatása
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Csoport teljes listás automata csere alóli mentessége

 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Csoport törlése
@@ -3452,6 +3547,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacit
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Meghajtott vagonok: {GOLD}+{POWER}{BLACK} Súly: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Átalakítható: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Minden rakomány típusra
+STR_PURCHASE_INFO_NONE                                          :Semmi
 STR_PURCHASE_INFO_ALL_BUT                                       :Mindenre, kivéve {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Maximális vonóerő: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Hatótávolság: {GOLD}{COMMA} mező
@@ -3851,6 +3947,7 @@ STR_ORDER_CONDITIONAL_AGE                                       :Kor (év)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Javításra szorul
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Mindig
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Hátralévő élettartam (év)
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Maximális megbízhatóság

 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Hogyan viszonyul a jármű kiválasztott adata a megadott értékhez
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :egyenlő
@@ -4283,6 +4380,7 @@ STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... ez e
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... az út a másik irányba vezet
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... áthaladó megállóhelyeken nem lehet kanyar
 STR_ERROR_DRIVE_THROUGH_JUNCTION                                :{WHITE}... áthaladó megállóhelyeken nem lehet elágazás
+STR_ERROR_DRIVE_THROUGH_ON_ONEWAY_ROAD                          :{WHITE}... az út egyirányú vagy blokkolt

 # Station destruction related errors
 STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nem lehet eltávolítani az állomás részét...
@@ -4351,7 +4449,7 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Nem lehe
 STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Először el kell távolítani a jelzőket
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nincs megfelelő vasúti pálya
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Előbb le kell rombolnod a vasúti pályát
-STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Az út egyirányú vagy blokkolt
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}... az út egyirányú vagy blokkolt
 STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Ehhez a síntipushoz nem megengedett vasúti átjárók építése
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Nem helyezhetsz ide jelzőt...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Nem építhetsz ide vasúti pályát...
@@ -4534,6 +4632,8 @@ STR_BASESOUNDS_DOS_DESCRIPTION                                  :Az eredeti Tran
 STR_BASESOUNDS_WIN_DESCRIPTION                                  :Az eredeti Transport Tycoon Deluxe Windows verziójának hangjai.
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :Hang alapcsomag hangok nélkül.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Az eredeti Transport Tycoon Deluxe Windows verziójának zenéje.
+STR_BASEMUSIC_DOS_DESCRIPTION                                   :Az eredeti Transport Tycoon Deluxe DOS verziójának zenéje.
+STR_BASEMUSIC_TTO_DESCRIPTION                                   :Az eredeti Transport Tycoon (az első változat és a World Editor) DOS verziójának zenéje.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Zenei alapcsomag zene nélkül.

 ##id 0x2000
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -950,6 +950,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :annað



+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grunngrafík
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Nota grunngrafíkina
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} týnd{P "" ar} eða ónýt{P "" ar} skrá{P "" r}
@@ -1918,9 +1920,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Þjónn
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Fyrirtæki er varið. Sláðu inn lykilorð

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Listi yfir leikmenn
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Fylgjast með
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nýtt fyrirtæki
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Listi yfir leikmenn
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Fylgjast með
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nýtt fyrirtæki

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Sparka
@@ -1935,7 +1937,6 @@ STR_NETWORK_CLIENT                                              :Notandi
 STR_NETWORK_SPECTATORS                                          :Áhorfendur

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sláðu inn peningaupphæð sem þú vilt láta af hendi rakna
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Áhorfandi

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ekki vista innslegið lykilorð
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -989,6 +989,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Kali dua
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Kali empat

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set Grafik Dasar
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pilih grafik dasar yang digunakan
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} berkas hilang atau rusak
@@ -2071,9 +2073,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server t
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Perusahaan terkunci, masukkan kata kunci

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Daftar klien
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Menonton
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Buat Perusahaan
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Daftar klien
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Menonton
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Buat Perusahaan

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Usir
@@ -2088,7 +2090,6 @@ STR_NETWORK_CLIENT                                              :Klien
 STR_NETWORK_SPECTATORS                                          :Penonton

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Masukkan jumlah uang yang akan diberikan
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Pengamat

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Jangan simpan kata sandi yang telah dimasukkan
--- a/src/lang/irish.txt
+++ b/src/lang/irish.txt
@@ -984,6 +984,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Gnáth
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Méid dúbailte
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Méid cheathrúil

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Sraith graifice bunaidh
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Roghnaigh an sraith grafaice bunaidh le húsáid
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} {P ch ch ch gc c}omhad ar iarraidh/truaillithe
@@ -2061,9 +2063,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tá an f
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Tá an chuideachta faoi chosaint. Iontráil pasfhocal

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liosta na gcliant
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Féach air
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Cuideachta nua
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liosta na gcliant
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Féach air
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Cuideachta nua

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Ciceáil
@@ -2078,7 +2080,6 @@ STR_NETWORK_CLIENT                                              :Cliant
 STR_NETWORK_SPECTATORS                                          :Féachadóirí

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Iontráil an méid airgid is mian leat a thabhairt
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Féachadóir

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ná sábháil an pasfhocal a iontráladh
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -192,6 +192,7 @@ STR_COLOUR_BROWN                                                :Marrone
 STR_COLOUR_GREY                                                 :Grigio
 STR_COLOUR_WHITE                                                :Bianco
 STR_COLOUR_RANDOM                                               :Casuale
+STR_COLOUR_DEFAULT                                              :Predefinito

 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mph
@@ -467,6 +468,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Suoni/musica
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Ultimo messaggio/notizia
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Cronologia messaggi
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Elimina tutti i messaggi
 ############ range ends here

 ############ range for about menu starts
@@ -995,6 +997,13 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normale
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Doppia
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quadrupla

+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Dimensione caratteri
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Seleziona la dimensione dei caratteri dell'interfaccia
+
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normale
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Doppia
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Quadrupla
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Pacchetto grafico di base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Seleziona il pacchetto grafico di base da utilizzare
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} file mancant{P e i}/corrott{P o i}
@@ -1844,6 +1853,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Cambia l
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permetti la modifica dei valori di produzione: {ORANGE}{STRING}

 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} - Schema colori

 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Mostra gli schemi di colorazione generali
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Mostra gli schemi di colorazione dei treni
@@ -2103,11 +2113,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconne

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server protetto. Inserire la password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Compagnia protetta. Inserire la password
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Elenco dei client

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Elenco dei client
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Diventa spettatore
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nuova compagnia
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Elenco dei client
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Diventa spettatore
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nuova compagnia

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Espelli
@@ -2122,7 +2133,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spettatori

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Inserire la quantità di denaro da donare
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spettatore

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Non salvare la password inserita
@@ -2767,6 +2777,9 @@ STR_FRAMERATE_DRAWING                                           :{BLACK}Renderiz
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Visuali mondo:
 STR_FRAMERATE_VIDEO                                             :{BLACK}Output video:
 STR_FRAMERATE_SOUND                                             :{BLACK}Missaggio suoni:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Totale IA/Script:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK}   Script:
+STR_FRAMERATE_AI                                                :{BLACK}   IA {NUM} {STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Ciclo simulazione
@@ -2781,6 +2794,9 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Renderizzazione
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Renderizzazione visuali mondo
 STR_FRAMETIME_CAPTION_VIDEO                                     :Output video
 STR_FRAMETIME_CAPTION_SOUND                                     :Missaggio suoni
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Totale IA/Script
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Script
+STR_FRAMETIME_CAPTION_AI                                        :IA {NUM} {STRING}
 ############ End of leave-in-this-order


@@ -2807,6 +2823,8 @@ STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Informaz
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
 STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filtro:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Sovrascrivi file
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Si è sicuri di voler sovrascrivere il file esistente?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Inserire un nome per il salvataggio

@@ -3137,6 +3155,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Corromp
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Obiettivi della {COMPANY}
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Obiettivi globali
+STR_GOALS_SPECTATOR                                             :Obiettivi globali
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Obiettivi globali:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Nessuno -
@@ -3185,6 +3204,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Fare cli
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}Storia della {COMPANY}
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Storia globale
+STR_STORY_BOOK_SPECTATOR                                        :Storia globale
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Pagina {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Salta a una pagina specifica selezionandola dall'elenco
@@ -3449,6 +3469,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Gruppi -
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Fare clic per creare un gruppo
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Elimina il gruppo selezionato
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Rinomina il gruppo selezionato
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Cambia la livrea del gruppo selezionato
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Fare clic per proteggere questo gruppo dal rimpiazzo automatico

 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Elimina Gruppo
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -984,6 +984,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :通常
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :2倍
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :4倍

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}基本グラフィックセット
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}使用するグラフィックセットを選択します
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}見つからないか破損しているファイルが{NUM}個あります
@@ -2061,9 +2063,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}この
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}この会社は保護されています。経営に参画するにはパスワードを入力してください

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}クライアントリスト
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}観覧モード
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新会社
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :クライアントリスト
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :観覧モード
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :新会社

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :追放
@@ -2078,7 +2080,6 @@ STR_NETWORK_CLIENT                                              :クライアン
 STR_NETWORK_SPECTATORS                                          :観覧者

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}送りたい金額を入力
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}観覧者

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}入力したパスワードを保存しない
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -995,6 +995,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :보통
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :2배 크기
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :4배 크기

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}기본 그래픽 세트
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}사용하실 기본 그래픽을 선택하세요.
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM}개 파일 손실
@@ -2084,9 +2086,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}서버
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}회사 암호가 걸려있습니다. 암호를 입력하세요.

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}접속자 목록
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}관전
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}새 회사
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :접속자 목록
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :관전
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :새 회사

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :추방
@@ -2101,7 +2103,6 @@ STR_NETWORK_CLIENT                                              :접속자
 STR_NETWORK_SPECTATORS                                          :관전자

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}송금하고 싶은 양을 입력하세요.
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}관전자

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}입력한 비밀번호는 저장하지 않기
--- a/src/lang/latin.txt
+++ b/src/lang/latin.txt
@@ -1176,6 +1176,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Solita
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Duplex
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quadruplex

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Fundamentum graphicum
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Eligere fundamentum graphicum adhibendum
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fascicul{P us i} absen{P s tes}/corrupt{P us i}
@@ -2262,9 +2264,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servatru
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Societas tuta est. Tesseram inscribe

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Index clientum
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectare
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Societas Nova
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Index clientum
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Spectare
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Societas Nova

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Dimittere
@@ -2279,7 +2281,6 @@ STR_NETWORK_CLIENT                                              :Cliens
 STR_NETWORK_SPECTATORS                                          :Spectatores

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Inscribe quantitatem pecuniae dandam
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Relinquere tesseram inscriptam
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -983,6 +983,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Parasts
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Divkāršs
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Četrkāršs

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Pamata grafikas kopa
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Atlasīt lietošanai pamata grafikas kopu
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} iztrūkstošs/bojāts fail{P s i ""}
@@ -2007,9 +2009,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveris
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Uzņēmums ir aizsargāts. Ievadiet paroli

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spēlētāju saraksts
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Skatīt
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Jauns uzņēmums
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Spēlētāju saraksts
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Skatīt
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Jauns uzņēmums

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Izmest
@@ -2024,7 +2026,6 @@ STR_NETWORK_CLIENT                                              :Spēlētājs
 STR_NETWORK_SPECTATORS                                          :Novērotāji

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Ievadiet cik daudz naudas vēlaties dot
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Novērotājs

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nesaglabāt ievadīto paroli
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -1189,6 +1189,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normalus
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dvigubas
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Trigubas

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Bazinis grafikos rinkinys
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pasirinkti naudojimui bazinę grafikos rinkinį
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} trūkstam{P a ų os}/sugadint{P a ų os} byl{P a ų os}
@@ -2280,9 +2282,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveris
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanija apsaugota. Įvesk slaptažodį

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Žaidėjų sąrašas
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Stebėti
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nauja įmonė
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Žaidėjų sąrašas
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Stebėti
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nauja įmonė

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Išmesti (Kick)
@@ -2297,7 +2299,6 @@ STR_NETWORK_CLIENT                                              :Žaidėjas
 STR_NETWORK_SPECTATORS                                          :Stebėtojai

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Įveskite kiekį pinigų, kurį norite gauti
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Stebėtojas

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neišsaugotas įvestas slaptažodis
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -984,6 +984,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Duebel
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Véierfach

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis Grafikset
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Wielt de Basis Grafikset dee soll benotzt ginn
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fehlend/korrupt Datei{P "" en}
@@ -2064,9 +2066,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server a
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma ass geschützt. Passwuert aginn

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spillerlëscht
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Nokucken
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nei Firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Spillerlëscht
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Nokucken
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nei Firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kicken
@@ -2081,7 +2083,6 @@ STR_NETWORK_CLIENT                                              :Spiller
 STR_NETWORK_SPECTATORS                                          :Zuschauer

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Gëff de Betrag un deens du wëlls ginn
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Zuschauer

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Späicher d'Passwuert net
--- a/src/lang/malay.txt
+++ b/src/lang/malay.txt
@@ -959,6 +959,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Biasa
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Saiz berganda
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Saiz kuad

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set grafik asas
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pilih set grafik asas untuk digunakan
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fail hilang/rosak
@@ -1817,9 +1819,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Pelayan
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Syarikat ini dilindungi. Masukkan kata laluan

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Senarai klien
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Saksi
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Syarikat baru
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Senarai klien
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Saksi
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Syarikat baru

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Tendang
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -191,6 +191,8 @@ STR_COLOUR_ORANGE                                               :Oransje
 STR_COLOUR_BROWN                                                :Brun
 STR_COLOUR_GREY                                                 :Grå
 STR_COLOUR_WHITE                                                :Hvit
+STR_COLOUR_RANDOM                                               :Tilfeldig
+STR_COLOUR_DEFAULT                                              :Standard

 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mi/t
@@ -466,6 +468,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Lyd/musikk
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Siste melding/nyhet
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Tidligere meldinger
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Slett alle meldinger
 ############ range ends here

 ############ range for about menu starts
@@ -477,6 +480,7 @@ STR_ABOUT_MENU_SCREENSHOT                                       :Skjermbilde
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Fullt forstørret skjermbilde
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Normalt forstørret skjermbilde
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Skjermbilde av hele kartet
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Vis bildehastighet
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Om 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Spriteforskyver
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Vis/skjul markeringsramme
@@ -652,6 +656,7 @@ STR_MUSIC_RULER_MARKER                                          :{TINY_FONT}{BLA
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
 STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
+STR_MUSIC_TITLE_NOMUSIC                                         :{TINY_FONT}{DKGREEN}Ingen musikk tilgjengelig
 STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}«{STRING}»
 STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Spor
 STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Tittel
@@ -672,11 +677,14 @@ STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Skru av/
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Vis musikkspormeny

 # Playlist window
+STR_PLAYLIST_MUSIC_SELECTION_SETNAME                            :{WHITE}Musikkprogram - '{STRING}'
 STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
 STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}Sporliste
 STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}Program - '{STRING}'
 STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Tøm
+STR_PLAYLIST_CHANGE_SET                                         :{BLACK}Endre sett
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Slett gjeldende program (gjelder bare Egendefinert 1 og 2)
+STR_PLAYLIST_TOOLTIP_CHANGE_SET                                 :{BLACK} Bytt musikk til et annet installert sett
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klikk på et musikkspor for å legge til gjeldende program (Gjelder bare egendefinert 1 og 2)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klikk på et musikkspor for å fjerne det fra nåværende program (Gjelder bare egendefinert 1 og 2)

@@ -812,6 +820,7 @@ STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLAC
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Sjef)

 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} sponset grunnleggelsen av den nye byen {TOWN}!
+STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}En ny by kalt {TOWN} har blitt reist!

 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}Ny{G "" "" tt} {STRING} blir anlagt i nærheten av {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}Ny{G "" "" tt} {STRING} plantes i nærheten av {TOWN}!
@@ -881,8 +890,8 @@ STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION                           :{BIG_FONT}{BLAC
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Tilleggsvindu {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopier til tilleggsvindu
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopier hovedvisningen til dette tilleggsvinduet
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Lim inn fra tilleggsvindu
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Kopier plasseringen av dette tilleggsvinduet til hovedvisningen
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Endre hovedsynsfelt
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}flytt plasseringen i dette tilleggsvinduet til hovedvisningen

 # Game options window
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spillinnstillinger
@@ -918,12 +927,14 @@ STR_GAME_OPTIONS_CURRENCY_TRY                                   :Tyrkisk lire (T
 STR_GAME_OPTIONS_CURRENCY_SKK                                   :Slovakisk koruna (SKK)
 STR_GAME_OPTIONS_CURRENCY_BRL                                   :Brasiliansk real (BRL)
 STR_GAME_OPTIONS_CURRENCY_EEK                                   :Estlandsk krone (EEK)
-STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litauiske litas (LTL)
-STR_GAME_OPTIONS_CURRENCY_KRW                                   :Sørkoreanske won (KRW)
+STR_GAME_OPTIONS_CURRENCY_LTL                                   :Litauisk litas (LTL)
+STR_GAME_OPTIONS_CURRENCY_KRW                                   :Sørkoreansk won (KRW)
 STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Sørafrikanske rand (ZAR)
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Egendefinert...
-STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgianske Lari (GEL)
-STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iranske Rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_GEL                                   :Georgisk lari (GEL)
+STR_GAME_OPTIONS_CURRENCY_IRR                                   :Iransk rial (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Ny russisk rubel (RUB)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksikansk peso (MXN)
 ############ end of currency region

 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Kjøretøy
@@ -986,6 +997,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :2 ganger størrelse
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :4 ganger størrelse

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikksett
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Velg grafikksett som skal brukes
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} manglende/ødelagt{P "" e} fil{P "" er}
@@ -1254,6 +1267,8 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Det er i
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Vedlikehold av infrastruktur: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Når aktivert, medfører infrastruktur vedlikeholdskostnader. Kostnadene vokser over-proporsjonalt med nettverkets størrelse, og påvirker dermed større selskaper mer enn de små

+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR                      :Startifarge for firmaet: {STRING}
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :Velg startfarge for firmaet

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Flyplasser utgår aldri: {STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :Aktivering av denne innstillingen gjør at hver type flyplass forblir tilgjengelig for alltid etter at sin introduksjon
@@ -1277,9 +1292,9 @@ STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_BEFORE                :{COMMA} måned{
 STR_CONFIG_SETTING_AUTORENEW_MONTHS_VALUE_AFTER                 :{COMMA} måned{P 0 "" er} etter
 STR_CONFIG_SETTING_AUTORENEW_MONEY                              :Minimum formue for autofornyelse av kjøretøy: {STRING}
 STR_CONFIG_SETTING_AUTORENEW_MONEY_HELPTEXT                     :Minste pengemengde som må være igjen i banken for å vurdere automatisk fornying av kjøretøy
-STR_CONFIG_SETTING_ERRMSG_DURATION                              :Varighet av error-melding: {STRING}
+STR_CONFIG_SETTING_ERRMSG_DURATION                              :Varighet av feilmelding: {STRING}
 STR_CONFIG_SETTING_ERRMSG_DURATION_HELPTEXT                     :Varighet for visning av feilmeldinger i et rødt vindu. Vær oppmerksom på at noen (kritiske) feilmeldinger ikke lukkes automatisk etter dette tidspunktet, men må lukkes manuelt
-STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE                        :{COMMA} andre{P 0 "" s}
+STR_CONFIG_SETTING_ERRMSG_DURATION_VALUE                        :{COMMA} sekund{P 0 "" er}
 STR_CONFIG_SETTING_HOVER_DELAY                                  :Vis verktøytips: {STRING}
 STR_CONFIG_SETTING_HOVER_DELAY_HELPTEXT                         :Forsinkelse før verktøytips vises når musen svever over elementer i grensesnittet. Alternativt kan verktøytips bindes til den høyre museknappen
 STR_CONFIG_SETTING_HOVER_DELAY_VALUE                            :Hovre i {COMMA} millisekunder{P 0 "" s}
@@ -1338,6 +1353,12 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT                :Farge på terre
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :Grønn
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :Mørkegrønn
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Fiolett
+STR_CONFIG_SETTING_SCROLLMODE                                   :Rulleoppførsel for vindu: {STRING}
+STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :Oppførsel ved rulling av kart
+STR_CONFIG_SETTING_SCROLLMODE_DEFAULT                           :Flytt synsfelt med høyre museknapp, museposisjon låst
+STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :Rull kartet med høyre museknapp, museposisjon låst
+STR_CONFIG_SETTING_SCROLLMODE_RMB                               :Rull kartet med høyre museknapp
+STR_CONFIG_SETTING_SCROLLMODE_LMB                               :Rull kartet med venstre museknapp
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Myk rulling: {STRING}
 STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Velge hvordan synsfeltet ruller til en bestemt posisjon når du klikker på det lille kartet, eller ved utstedelse av en kommando for å gå til et bestemt objekt på kartet. Hvis aktivert, ruller synsfeltet jevnt, og hvis deaktivert hopper det direkte til det valgte punktet
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :Vis målingsverktøy ved bruk av byggingsverktøy: {STRING}
@@ -1806,6 +1827,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Endre n
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Tillat endring av produksjonsmengder: {ORANGE}{STRING}

 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} - Firmafarge

 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Vis generelle fargetemaer
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Vis togfargetemaer
@@ -2066,11 +2088,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Koble fr

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tjeneren er beskyttet. Skriv inn passord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firmaet er beskyttet. Skriv inn passord
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Klientliste

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste over klienter
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Vær tilskuer
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liste over klienter
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Vær tilskuer
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nytt firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kast ut
@@ -2085,7 +2108,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Tilskuere

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv inn hvor mye penger du ønsker å gi
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Tilskuer

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ikke lagre passordet
@@ -2282,6 +2304,7 @@ STR_LINKGRAPH_LEGEND_CAPTION                                    :{BLACK}Symbolfo
 STR_LINKGRAPH_LEGEND_ALL                                        :{BLACK}Alle
 STR_LINKGRAPH_LEGEND_NONE                                       :{BLACK}Ingen
 STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}Velg selskaper som skal vises
+STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP                            :{BLACK}{STRING}{}{COMPANY}

 # Linkgraph legend window and linkgraph legend in smallmap
 STR_LINKGRAPH_LEGEND_UNUSED                                     :{TINY_FONT}{BLACK}ubrukt
@@ -2367,8 +2390,8 @@ STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Avansert
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Enveis avansert signal (lyssignal){}Et avansert signal tillater flere tog å kjøre samtidig på samme signalblokk, dersom togene kan reservere en rute til et trygt stoppested . Enveis avanserte signaler kan ikke passeres bakfra.
 STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Konverter signal{}Konverterer signaler til den valgte signaltypen. Ctrl+klikk vil endre eksisterende variant. Shift+klikk viser kostnadsestimat
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Signaltetthet ved dra-og-slipp
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Senk signaltetthet ved dra-og-slipp
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Øk signaltetthet ved dra-og-slipp
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Senk signalavstand ved dra-og-slipp
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Øk signalavstand ved dra-og-slipp

 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Velg jernbanebrotype
@@ -2691,9 +2714,52 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2019 OpenTTD-teamet

 # Framerate display window
+STR_FRAMERATE_CAPTION                                           :{WHITE}Bildehastighet
+STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Simuleringshastighet: {STRING}
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Antall spill-tikk per sekund.
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}Bildehastighet: {STRING}
+STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}Antall bilder tegnet per sekund.
+STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Gjeldende spillhastighetsfaktor: {DECIMAL}x
+STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Hvor raskt spillet kjører i forhold til forventet hastighet ved normal simulering.
+STR_FRAMERATE_CURRENT                                           :{WHITE}Gjeldende
+STR_FRAMERATE_AVERAGE                                           :{WHITE}Middels
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Data basert på {COMMA} målinger
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
+STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
+STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} bilder/s
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} Bilder/s
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} frames/s
+STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
+STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 ############ Leave those lines in this order!!
+STR_FRAMERATE_GAMELOOP                                          :{BLACK}Spill-løkke totalt:
+STR_FRAMERATE_GL_ECONOMY                                        :{BLACK} Godshåndtering:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK} Tog-tikk:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK} Veikjøretøy-tikk:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Skips-tikk:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK} Fly-tikk:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK}  Spillverden-tikk:
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK} Koblingsgraf-etterslep:
+STR_FRAMERATE_DRAWING                                           :{BLACK}Grafikktegning:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Synsfelt for spillverden:
+STR_FRAMERATE_VIDEO                                             :{BLACK}Video output:
+STR_FRAMERATE_SOUND                                             :{BLACK}Lydmiksing:
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Spill-løkke
+STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Godshåndtering
+STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Tog-tikk
+STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Veikjøretøy-tikk
+STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Skips-tikk
+STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Fly-tikk
+STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :Verdens-tikk
+STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              :Koblingsgrad-etterslep
+STR_FRAMETIME_CAPTION_DRAWING                                   :Grafikktegning
+STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Tegning av synsfelt for spillverden
+STR_FRAMETIME_CAPTION_VIDEO                                     :Video output
+STR_FRAMETIME_CAPTION_SOUND                                     :Lydmiksing
 ############ End of leave-in-this-order


@@ -2719,6 +2785,9 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Spilldet
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Ingen informasjon tilgjengelig.
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Filtrer streng:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Overskriv fil
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Er du sikker på at du vil overskrive eksisterende fil?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Skriv inn et navn på spillet som skal lagres

@@ -2836,7 +2905,12 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Versjon:
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}Min. kompatibel versjon: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palett: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Default (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Default (D) / 32 bpp
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY                              :Legacy (W)
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP                        :Legacy (W) / 32 bpp
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametre: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_NONE                              :Ingen

 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ingen informasjon tilgjengelig
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Matchende fil ble ikke funnet
@@ -2854,7 +2928,7 @@ STR_SAVE_PRESET_SAVE                                            :{BLACK}Lagre
 STR_SAVE_PRESET_SAVE_TOOLTIP                                    :{BLACK}Lagre forhåndsinnstillingen med det valgte navnet

 # NewGRF parameters window
-STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Forandre NewGRF-parametre
+STR_NEWGRF_PARAMETERS_CAPTION                                   :{WHITE}Endre NewGRF-parametre
 STR_NEWGRF_PARAMETERS_CLOSE                                     :{BLACK}Lukk
 STR_NEWGRF_PARAMETERS_RESET                                     :{BLACK}Tilbakestill
 STR_NEWGRF_PARAMETERS_RESET_TOOLTIP                             :{BLACK}Sett alle parametere til standardverdi
@@ -2917,6 +2991,8 @@ STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leste forbi slu
 STR_NEWGRF_ERROR_GRM_FAILED                                     :Etterspurte GRF-ressurser ikke tilgjengelig (figur {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} ble deaktivert av {STRING}
 STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ugyldig/ukjent sprite layout-format (figur {3:NUM})
+STR_NEWGRF_ERROR_LIST_PROPERTY_TOO_LONG                         :For mange elementer i fortegnelse over eiendomsverdier (sprite {3:NUM}, property {4:HEX})
+STR_NEWGRF_ERROR_INDPROD_CALLBACK                               :Ugyldig industriprodukjson callback (sprite {3:NUM}, "{1:STRING}")

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!
@@ -2981,13 +3057,15 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Skriv in
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Byer
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Ingen -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (By){BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Bynavn - klikk på navnet for å gå til byen. Ctrl+klikk åpner et nytt tilleggsvindu over byen
 STR_TOWN_POPULATION                                             :{BLACK}Verdensbefolkning: {COMMA}

 # Town view window
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
-STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (By)
+STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Storby)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Innbyggertall: {ORANGE}{COMMA}{BLACK}  Antall hus: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} siste måned: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Varebehov for byvekst:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} påkrevd
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} nødvendig om vinteren
@@ -3040,6 +3118,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Du kan
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Målsetninger
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Globale mål
+STR_GOALS_SPECTATOR                                             :Globale mål
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globale mål:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Ingen -
@@ -3088,6 +3167,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klikk fo
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Historiebok
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Global historiebok
+STR_STORY_BOOK_SPECTATOR                                        :Global historiebok
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Side {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Gå til en bestemt side ved å velge den i denne nedtrekkslisten.
@@ -3292,6 +3372,9 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Gå til
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Produksjonsnivå: {YELLOW}{COMMA}%
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}Næringen har annonsert snarlig nedleggelse!

+STR_INDUSTRY_VIEW_REQUIRES_N_CARGO                              :{BLACK}Trenger: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Produserer: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}

 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Krever:
 STR_INDUSTRY_VIEW_ACCEPT_CARGO                                  :{YELLOW}{STRING}{BLACK}{3:STRING}
@@ -3349,6 +3432,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupper
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klikk for å opprette en gruppe
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Fjern den valgte gruppen
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Gi nytt navn på den valgte gruppen
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Endre firmafarger for valgt gruppe
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikk for å beskytte denne gruppen fra global autoerstatning

 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Slette gruppe
@@ -3392,6 +3476,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasite
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Lokomotivvogner: {GOLD}+{POWER}{BLACK} Vekt: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Kan bygges om til: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Alle varetyper
+STR_PURCHASE_INFO_NONE                                          :Ingen
 STR_PURCHASE_INFO_ALL_BUT                                       :Alt utenom {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Maks trekkraft: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Rekkevidde: {GOLD}{COMMA} ruter
@@ -3791,6 +3876,7 @@ STR_ORDER_CONDITIONAL_AGE                                       :Alder (år)
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Trenger vedlikehold
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Alltid
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Gjenstående levetid (år)
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Maksimal pålitelighet

 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Hvordan sammenligne kjøretøyets data til den gitte verdi
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :er lik
@@ -4224,6 +4310,7 @@ STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... denn
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... veien vender i feil retning
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... gjennomkjøringsstopper kan ikke ha hjørner
 STR_ERROR_DRIVE_THROUGH_JUNCTION                                :{WHITE}... gjennomkjøringsstopper kan ikke ha kryss
+STR_ERROR_DRIVE_THROUGH_ON_ONEWAY_ROAD                          :{WHITE}... veien er enveiskjørt eller blokkert

 # Station destruction related errors
 STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan ikke fjerne del av stasjonen...
@@ -4475,6 +4562,8 @@ STR_BASESOUNDS_DOS_DESCRIPTION                                  :Originale lyder
 STR_BASESOUNDS_WIN_DESCRIPTION                                  :Originale lyder fra Transport Tycoon Deluxe for Windows.
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :En lydpakke uten noen lyder.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Original musikk fra Transport Tycoon Deluxe for Windows.
+STR_BASEMUSIC_DOS_DESCRIPTION                                   :Original Transport Tycoon Deluxe DOS edition music.
+STR_BASEMUSIC_TTO_DESCRIPTION                                   :Original Transport Tycoon (Original/World Editor) DOS edition music.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :En musikkpakke uten noe musikk.

 ##id 0x2000
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -986,6 +986,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dobbel størrelse
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Firedobbel størrelse

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikksett
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vel grafikksett som skal nyttast
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} manglande/øydelagd{P "" e} fil{P "" er}
@@ -1984,9 +1986,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tenaren
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firmaet er beskytta. Skriv inn passord

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste over klientar
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Vær tilskodar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Liste over klientar
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Vær tilskodar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nytt firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kast ut
@@ -2001,7 +2003,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Tilskodarar

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv inn kor mykje pengar du ønskar å gje
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Tilskodar

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ikkje lagre passordet
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -1373,6 +1373,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normalne
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Podwójny
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Poczwórny

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Podstawowy zestaw grafik
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Wybierz podstawowy zestaw grafik do użycia
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} brak/uszkodzony plik{P "" i ów}
@@ -1640,6 +1642,7 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Zmiana t
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Utrzymywanie infrastruktury: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Kiedy włączone, utrzymanie infrastruktury jest naliczane w kosztach. Koszty wzrastają nadproporcjonalnie do rozmiarów sieci połączeń, a więc dotykają bardziej duże niż małe firmy

+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR                      :Początkowy kolor firmy: {STRING}
 STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :Wybierz początkowy kolor dla firmy

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Pozwól budować stare lotniska: {STRING}
@@ -2460,9 +2463,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serwer j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma jest chroniona. Wprowadź hasło

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista klientów
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Obserwuj
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nowa firma
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista klientów
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Obserwuj
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nowa firma

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Wyrzuć
@@ -2477,7 +2480,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Widzowie

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Wprowadź ilość pieniędzy, które chcesz przekazać
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Obserwator

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nie zapisuj podanego hasła
@@ -3776,6 +3778,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupy -
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Kliknij aby stworzyć grupę
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Usuń zaznaczoną grupę
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Zmień nazwę zaznaczonej grupy
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Zmień kolor zaznaczonej grupy
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Kliknij, aby ochronić tę grupę przed globalną zamianą pojazdów

 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Skasuj Grupę
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -467,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Som/música
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Última mensagem/notícia
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Histórico de mensagens
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Apagar todas as mensagens
 ############ range ends here

 ############ range for about menu starts
@@ -995,6 +996,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dobro do tamanho
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Quádruplo do tamanho

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Seleccione o conjunto de gráficos base a usar
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ficheiro{P "" s} que falta{P "" m} / corrupto{P "" s}
@@ -2082,11 +2085,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desligar

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Introduza palavra-chave
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introduza palavra-chave
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Lista de clientes

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Assistir
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova empresa
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Assistir
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nova empresa

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Expulsar
@@ -2101,7 +2105,6 @@ STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Insira a quantidade de dinheiro que pretende dar
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não gravar a palavra-chave introduzida
@@ -3112,6 +3115,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Suborna
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Objectivos
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Objetivos globais
+STR_GOALS_SPECTATOR                                             :Objectivos Globais
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Objetivos globais:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Nenhum -
@@ -3160,6 +3164,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clique n
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Livro de História
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Livro de História Global
+STR_STORY_BOOK_SPECTATOR                                        :Livro de Histórico Global
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Página nº {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Saltar para uma pagina especifica escolhendo-a nesta lista.
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -985,6 +985,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normală
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Mărime dublă
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Mărime împătrită

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set grafic de bază
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selectează setul grafic de bază utilizat în joc
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fişier{P "" "e"} lipsă/corupt{P "" e}
@@ -2034,9 +2036,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server p
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companie protejată. Introdu parola

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clienţi
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observă
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Companie nouă
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clienţi
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Observă
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Companie nouă

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Dă afară
@@ -2051,7 +2053,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :Spectatori

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduceţi suma pe care o oferiţi
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Spectator

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Parola introdusă nu se va salva
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -592,6 +592,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Звук/муз
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Последняя новость
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :История сообщений
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Удалить все сообщения
 ############ range ends here

 ############ range for about menu starts
@@ -1139,6 +1140,13 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Обычный
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Удвоенный
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Учетверённый

+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Размер шрифта
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Выберите размер шрифта, используемого в игре
+
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Нормальный
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Двукратный
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Четырёхкратный
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Базовый набор графики
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Выбрать базовый набор графики
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} отсутствующи{P й х х}/повреждённы{P й х х} файл{P "" а ов}
@@ -1539,7 +1547,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Выкл.
 STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE                        :Закрывать окна щелчком ПКМ: {STRING}
 STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT               :Закрывать окно щелчком правой кнопкой мыши в его пределах. При этом отключается появление подсказок по правой кнопке.

-STR_CONFIG_SETTING_AUTOSAVE                                     :Автосохранения: {STRING}
+STR_CONFIG_SETTING_AUTOSAVE                                     :Автосохранение: {STRING}
 STR_CONFIG_SETTING_AUTOSAVE_HELPTEXT                            :Укажите интервал между автоматическими сохранениями

 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :Использовать {STRING} формат даты для имён сохранений
@@ -1651,7 +1659,7 @@ STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER             :Первое т
 STR_CONFIG_SETTING_NEWS_ARRIVAL_FIRST_VEHICLE_OTHER_HELPTEXT    :Показывать новости о первом транспортном средстве, прибывающем на станцию конкурента
 STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS                     :Аварии и катастрофы: {STRING}
 STR_CONFIG_SETTING_NEWS_ACCIDENTS_DISASTERS_HELPTEXT            :Показывать новости об авариях и катастрофах
-STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION                     :Информация о Компании: {STRING}
+STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION                     :Информация о компании: {STRING}
 STR_CONFIG_SETTING_NEWS_COMPANY_INFORMATION_HELPTEXT            :Показывать новости об основании и риске банкротства транспортных компаний
 STR_CONFIG_SETTING_NEWS_INDUSTRY_OPEN                           :Открытие предприятий: {STRING}
 STR_CONFIG_SETTING_NEWS_INDUSTRY_OPEN_HELPTEXT                  :Показывать новости об открывающихся предприятиях
@@ -2233,11 +2241,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Откл

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сервер защищён. Введите пароль.
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компания защищена. Введите пароль.
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Список клиентов

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Список клиентов
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Наблюдать
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Новая компания
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Список клиентов
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Наблюдать
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Новая компания

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Отключить
@@ -2252,7 +2261,6 @@ STR_NETWORK_CLIENT                                              :Клиент
 STR_NETWORK_SPECTATORS                                          :Наблюдатели

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Введите сумму денег, которую вы хотите передать
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Наблюдатель

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Не сохранять пароль
@@ -2367,7 +2375,7 @@ STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Наим
 STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Нажмите на строке для просмотра подробностей{}Отметьте чекбокс для загрузки
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Выбрать всё
 STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Пометить весь контент для загрузки
-STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Выбрать обновл.
+STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Выбрать обновления
 STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Отметить для загрузки обновления для имеющегося контента
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Снять выделение
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Ничего не загружать
@@ -2919,6 +2927,9 @@ STR_FRAMERATE_DRAWING                                           :{BLACK}Отри
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK} Дополнительные окна:
 STR_FRAMERATE_VIDEO                                             :{BLACK}Вывод на экран:
 STR_FRAMERATE_SOUND                                             :{BLACK}Обработка звука:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Выполнение скриптов:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK}   Игровой скрипт:
+STR_FRAMERATE_AI                                                :{BLACK}   ИИ {NUM} {STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Расчёт игрового цикла
@@ -2933,6 +2944,9 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Отрисов
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Отрисовка изображения в доп. окнах
 STR_FRAMETIME_CAPTION_VIDEO                                     :Вывод на экран
 STR_FRAMETIME_CAPTION_SOUND                                     :Обработка звука
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Общее время выполнения скриптов
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Время выполнения игрового скрипта
+STR_FRAMETIME_CAPTION_AI                                        :ИИ {NUM} {STRING}
 ############ End of leave-in-this-order


@@ -3291,6 +3305,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Дат
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Задачи компании «{COMPANY}»
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Глобальные задачи
+STR_GOALS_SPECTATOR                                             :Общие задачи
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Общие задачи:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Нет -
@@ -3339,6 +3354,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Нажм
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}История компании «{COMPANY}»
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Мировая история
+STR_STORY_BOOK_SPECTATOR                                        :Мировая история
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Стр. {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Перейти на нужную страницу, выбрав её в выпадающем списке.
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -1183,6 +1183,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normalna velič
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Uvećavajte veličinu dva puta
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Uvećavajte veličinu četiri puta

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni skup grafika
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Odaberite željeni skup osnovnih grafika
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} datotek{P a e a} nedostaj{P e u e}/neispravn{P a o o}
@@ -2268,9 +2270,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Preduzeće je zaštićeno. Unesite lozinku

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spisak klijenata
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Praćenje
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Novo preduzeće
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Spisak klijenata
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Praćenje
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Novo preduzeće

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Izbaci
@@ -2285,7 +2287,6 @@ STR_NETWORK_CLIENT                                              :Igrač
 STR_NETWORK_SPECTATORS                                          :Posmatrači

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Unesite svotu novca koju želite dati
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Posmatrač

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Otkaži unetu lozinku
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -989,6 +989,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :正常大小
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :两倍大小
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :四倍大小

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}基础图形组
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}选择要使用的基础图形组
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} 文件{}未找到或不正确
@@ -2071,9 +2073,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}服务
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}公司需要密码：

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}客户端列表
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}旁观
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新公司
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :客户端列表
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :旁观
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :新公司

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :踢出
@@ -2088,7 +2090,6 @@ STR_NETWORK_CLIENT                                              :客户端
 STR_NETWORK_SPECTATORS                                          :旁观者

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}请输入您想赠与的资金数
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}旁观者

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}不保存所输入的密码
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1052,6 +1052,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normálne
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dvojnásobná veľkosť
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Štvornásobná veľkosť

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Základná sada grafiky
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zvoľte sadu grafiky, ktorá má byť použitá
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} chýbajúci/poškodený súbor{P "" "y" "ov"}
@@ -2129,9 +2131,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Spoločnosť je chránená. Zadaj heslo

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Zoznam klientov
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Pozorovať
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nová spoločnosť
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Zoznam klientov
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Pozorovať
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nová spoločnosť

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Vyhodit
@@ -2146,7 +2148,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Pozorovatelia

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vložte čiastku ktorú chcete dať
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Pozorovateľ

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neukladať zadané heslo
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -1137,6 +1137,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normalno
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dvojna velikost
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Velikost kvadrata

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni komplet grafik
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Izberi osnovni komplet grafik za uporabo
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} manjkajoč{P a i e ih}/okvarjen{P a i e ih} datotek{P a i e ""}
@@ -2215,9 +2217,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Strežni
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Podjetje je zaščiteno. Vnesi geslo

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Seznam gostov
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Opazuj
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Novo podjetje
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Seznam gostov
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Opazuj
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Novo podjetje

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Brcni
@@ -2232,7 +2234,6 @@ STR_NETWORK_CLIENT                                              :Gost
 STR_NETWORK_SPECTATORS                                          :Gledalci

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vpiši znesek denarja za darovanje
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Gledalec

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne shrani vnešenega gesla
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -994,6 +994,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Tamaño doble
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Tamaño cuádruple

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Conjunto de gráficos base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecciona el conjunto de gráficos base a usar
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} archivo{P "" s} perdido{P "" s} o corrupto{P "" s}
@@ -2075,9 +2077,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introduzca la contraseña

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Presenciar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nueva empresa
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Presenciar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nueva empresa

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Expulsar
@@ -2092,7 +2094,6 @@ STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduce la cantidad de dinero que deseas dar
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No guardar la contraseña introducida
--- a/src/lang/spanish_MX.txt
+++ b/src/lang/spanish_MX.txt
@@ -467,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Sonido y músic
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Último mensaje o noticia
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Historial de mensajes
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Eliminar todos los mensajes
 ############ range ends here

 ############ range for about menu starts
@@ -995,6 +996,13 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Doble
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Cuádruple

+STR_GAME_OPTIONS_FONT_ZOOM                                      :{BLACK}Tamaño de letra
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_TOOLTIP                     :{BLACK}Elegir qué tamaño de letra usar en la interfaz
+
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_NORMAL                      :Normal
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_2X_ZOOM                     :Doble
+STR_GAME_OPTIONS_FONT_ZOOM_DROPDOWN_4X_ZOOM                     :Cuádruple
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Gráficos base
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Elegir los gráficos base
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} archivo{P "" s} perdido{P "" s} o con errores
@@ -2082,11 +2090,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desconec

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Introducir contraseña
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introducir contraseña
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}Lista de clientes

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observar
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nueva empresa
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Lista de clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Observar
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nueva empresa

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Expulsar
@@ -2101,7 +2110,6 @@ STR_NETWORK_CLIENT                                              :Cliente
 STR_NETWORK_SPECTATORS                                          :Espectadores

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introducir la cantidad de dinero a dar
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Espectador

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No guardar la contraseña introducida
@@ -2740,6 +2748,9 @@ STR_FRAMERATE_DRAWING                                           :{BLACK}Presenta
 STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK} Ventanas de vista generales:
 STR_FRAMERATE_VIDEO                                             :{BLACK}Salida de video:
 STR_FRAMERATE_SOUND                                             :{BLACK}Mezcla de sonido:
+STR_FRAMERATE_ALLSCRIPTS                                        :{BLACK}  Scripts en total:
+STR_FRAMERATE_GAMESCRIPT                                        :{BLACK} Script de juego:
+STR_FRAMERATE_AI                                                :{BLACK} IA {NUM} {STRING}
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 STR_FRAMETIME_CAPTION_GAMELOOP                                  :Bucle de juego
@@ -2754,6 +2765,9 @@ STR_FRAMETIME_CAPTION_DRAWING                                   :Presentación d
 STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Presentación de ventanas de vista generales
 STR_FRAMETIME_CAPTION_VIDEO                                     :Salida de video
 STR_FRAMETIME_CAPTION_SOUND                                     :Mezcla de sonido
+STR_FRAMETIME_CAPTION_ALLSCRIPTS                                :Scripts de juego e IA en total
+STR_FRAMETIME_CAPTION_GAMESCRIPT                                :Script de juego
+STR_FRAMETIME_CAPTION_AI                                        :IA {NUM} {STRING}
 ############ End of leave-in-this-order


@@ -3112,6 +3126,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Soborna
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}Metas de {COMPANY}
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Metas globales
+STR_GOALS_SPECTATOR                                             :Metas globales
 STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Metas globales:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Ninguna -
@@ -3160,6 +3175,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clic en
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}Historial de {COMPANY}
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Historial global
+STR_STORY_BOOK_SPECTATOR                                        :Historial global
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Página {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Permitir ir a una página específica al elegirla en esta lista desplegable
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -994,6 +994,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dubbel storlek
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Fyrdubbel storlek

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Grafikpaket som standard
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Välj vilket grafikpaket som ska användas som standard
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} saknad{P "" e}/trasig{P "" a} fil{P "" er}
@@ -2083,9 +2085,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servern
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Företaget är skyddat. Ange lösenord

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientlista
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Åskåda
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt företag
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Klientlista
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Åskåda
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Nytt företag

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Kasta ut
@@ -2100,7 +2102,6 @@ STR_NETWORK_CLIENT                                              :Klient
 STR_NETWORK_SPECTATORS                                          :Åskådare

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv in mängd pengar som du vill ge
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Åskådare

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Spara inte det inmatade lösenordet
--- a/src/lang/tamil.txt
+++ b/src/lang/tamil.txt
@@ -946,6 +946,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :சராசர
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :இரண்டு மடங்கு
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :நான்கு மடங்கு

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}அடிப்படை அசைவூட்டம்
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}பயன்படுத்தப்போகும் அடிப்படை அசைவூட்டத்தினை தேர்ந்தெடுக்கவும்
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} இல்லாத/பிழையான கோப்பு{P "" கள்}
@@ -1811,9 +1813,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}சர
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}நிற்வனம் காக்கப்பட்டுள்ளது. கடவுச்சொல்லினை இடவும்

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}விளையாடுவோர் பட்டியல்
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}கவனி
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}புதிய நிறுவனம்
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :விளையாடுவோர் பட்டியல்
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :கவனி
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :புதிய நிறுவனம்

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :உதை
@@ -1828,7 +1830,6 @@ STR_NETWORK_CLIENT                                              :Client
 STR_NETWORK_SPECTATORS                                          :கவனிப்பவர்கள்

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}கொடுக்கப்படும் பணத்தின் அளவினை இடவும்
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}பார்வையாளர்

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}கடவுச்சொல்லினை நினைவில் வைத்திருக்காதே
--- a/src/lang/thai.txt
+++ b/src/lang/thai.txt
@@ -971,6 +971,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :อื่นๆ
 STR_GAME_OPTIONS_GUI_ZOOM_FRAME                                 :{BLACK}ขนาดของแผงควบคุม


+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}ตั้งค่า Graphic พื้นฐาน
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}เลือกและตั้งค่าฐานกราฟิกที่จะใช้
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ไฟล์สูญหายหรือไม่สมบูรณ์
@@ -2010,9 +2012,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}เซ
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}บริษัทมีการป้องกัน. กรุณากรอกพาสเวิร์ด

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}รายการลูกข่าย
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}ผู้ชม
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}บริษัทใหม่
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :รายการลูกข่าย
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :ผู้ชม
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :บริษัทใหม่

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :เตะ
@@ -2027,7 +2029,6 @@ STR_NETWORK_CLIENT                                              :ลูกข่
 STR_NETWORK_SPECTATORS                                          :ผู้ชม

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}กรอกจำนวนเงินที่ต้องการจะให้
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}ผู้สังเกตุการณ์

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}ไม่ทำการเก็บพาสเวิร์ดที่กรอกไว้แล้ว
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -984,6 +984,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :正常大小
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :兩倍大小
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :四倍大小

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}基本圖形集
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}選擇要使用的基本圖形集
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} 檔案遺失／損毀
@@ -2061,9 +2063,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}伺服
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}公司受保護，輸入密碼

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}用戶端清單
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}旁觀者
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新公司
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :用戶端清單
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :旁觀者
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :新公司

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :踢除
@@ -2078,7 +2080,6 @@ STR_NETWORK_CLIENT                                              :用戶端
 STR_NETWORK_SPECTATORS                                          :旁觀者

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}請輸入你要付出多少資金
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}旁觀者

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}不要儲存所輸入的密碼
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -190,6 +190,8 @@ STR_COLOUR_ORANGE                                               :Turuncu
 STR_COLOUR_BROWN                                                :Kahverengi
 STR_COLOUR_GREY                                                 :Gri
 STR_COLOUR_WHITE                                                :Beyaz
+STR_COLOUR_RANDOM                                               :Rastgele
+STR_COLOUR_DEFAULT                                              :Varsayılan

 # Units used in OpenTTD
 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA}{NBSP}mil/s
@@ -465,6 +467,7 @@ STR_TOOLBAR_SOUND_MUSIC                                         :Ses/müzik
 ############ range for message menu starts
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Son mesaj/haber raporu
 STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Mesaj geçmişi
+STR_NEWS_MENU_DELETE_ALL_MESSAGES                               :Tüm mesajları sil
 ############ range ends here

 ############ range for about menu starts
@@ -476,6 +479,7 @@ STR_ABOUT_MENU_SCREENSHOT                                       :Ekran görünt
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Tamamen yakınlaştırılmış ekran görüntüsü
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Varsayılan yakınlıkta ekran görüntüsü
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Tüm harita ekran görüntüsü
+STR_ABOUT_MENU_SHOW_FRAMERATE                                   :Kare oranını göster
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :'OpenTTD' Hakkında
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Nesne hizalayıcı
 STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES                            :Çerçeveleri aç/kapa
@@ -651,6 +655,7 @@ STR_MUSIC_RULER_MARKER                                          :{TINY_FONT}{BLA
 STR_MUSIC_TRACK_NONE                                            :{TINY_FONT}{DKGREEN}--
 STR_MUSIC_TRACK_DIGIT                                           :{TINY_FONT}{DKGREEN}{ZEROFILL_NUM}
 STR_MUSIC_TITLE_NONE                                            :{TINY_FONT}{DKGREEN}------
+STR_MUSIC_TITLE_NOMUSIC                                         :{TINY_FONT}{DKGREEN}Kullanılabilir müzik yok
 STR_MUSIC_TITLE_NAME                                            :{TINY_FONT}{DKGREEN}"{STRING}"
 STR_MUSIC_TRACK                                                 :{TINY_FONT}{BLACK}Şarkı
 STR_MUSIC_XTITLE                                                :{TINY_FONT}{BLACK}Başlığı
@@ -671,11 +676,14 @@ STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Rastgele
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Şarkı seçim penceresini göster

 # Playlist window
+STR_PLAYLIST_MUSIC_SELECTION_SETNAME                            :{WHITE}Müzik Programı - '{STRING}'
 STR_PLAYLIST_TRACK_NAME                                         :{TINY_FONT}{LTBLUE}{ZEROFILL_NUM} "{STRING}"
 STR_PLAYLIST_TRACK_INDEX                                        :{TINY_FONT}{BLACK}Parça Listesi
 STR_PLAYLIST_PROGRAM                                            :{TINY_FONT}{BLACK}Program - '{STRING}'
 STR_PLAYLIST_CLEAR                                              :{TINY_FONT}{BLACK}Temizle
+STR_PLAYLIST_CHANGE_SET                                         :{BLACK}Seti değiştir
 STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1              :{BLACK}Kullanılan programı temizle (Özel1 veya Özel2 için)
+STR_PLAYLIST_TOOLTIP_CHANGE_SET                                 :{BLACK}Müzik seçimini başka kurulu sete değiştir
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Kullanılan programa eklenecek parçayı seçin (Özel1 veya Özel2 için)
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kullanılan programdan kaldırılacak parçaya tıklayın (Özel1 veya Özel2 için)

@@ -811,6 +819,7 @@ STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIG_FONT}{BLAC
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENT_NAME}{}(Yönetici)

 STR_NEWS_NEW_TOWN                                               :{BLACK}{BIG_FONT}{STRING} {TOWN} adlı yeni kasabanın inşaasını finanse etti!
+STR_NEWS_NEW_TOWN_UNSPONSORED                                   :{BLACK}{BIG_FONT}{TOWN} adında yeni bir kasaba inşa edildi!

 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIG_FONT}{BLACK}Yeni bir {STRING}, {TOWN} şehri yakınlarında kuruldu!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIG_FONT}{BLACK}Yeni bir {STRING}, {TOWN} şehri yakınlarında kuruldu!
@@ -878,10 +887,10 @@ STR_NEWS_EXCLUSIVE_RIGHTS_DESCRIPTION                           :{BIG_FONT}{BLAC

 # Extra view window
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Görünüm {COMMA}
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Görünümü kopyala
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Görüş alanını değiştir
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Ana görünümü bu pencereye kopyala
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Görünümü yapıştır
-STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Bu görünümü ana görünüme yapıştır
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Ana görünümü değiştir
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Bu görüş alanını ana görünüme kopyala

 # Game options window
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Seçenekler
@@ -923,6 +932,8 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Güney Afrika R
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Özel...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Gürcistan Larisi (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :İran Riyali (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Yeni Rus Rublesi (RUB)
+STR_GAME_OPTIONS_CURRENCY_MXN                                   :Meksika Pezosu (MXN)
 ############ end of currency region

 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Karayolu taşıtları
@@ -985,6 +996,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :İki kat büyük
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Dört kat büyük

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Temel grafik kümesi
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kullanılacak temel grafik kümesini seçin
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} kayıp/bozuk dosya
@@ -1223,7 +1236,7 @@ STR_CONFIG_SETTING_AUTOSCROLL_HELPTEXT                          :Etkinleştirili
 STR_CONFIG_SETTING_AUTOSCROLL_DISABLED                          :Kapalı
 STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT_FULLSCREEN          :Asıl görüş alanı, sadece tam ekran
 STR_CONFIG_SETTING_AUTOSCROLL_MAIN_VIEWPORT                     :Ana görüş alanı
-STR_CONFIG_SETTING_AUTOSCROLL_EVERY_VIEWPORT                    :Tüm görünümler
+STR_CONFIG_SETTING_AUTOSCROLL_EVERY_VIEWPORT                    :Tüm görüş alanları
 STR_CONFIG_SETTING_BRIBE                                        :Belediye rüşveti izinli: {STRING}
 STR_CONFIG_SETTING_BRIBE_HELPTEXT                               :Şirketlerin yerel yönetime rüşvet vermeyi denemelerine izin ver. Şayet rüşvet girişimi bir gözlemci tarafından fark edilirse şirket o bölgede altı ay eylemde bulunamaz
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :Şehrin ulaşım haklarını satın alma izinli: {STRING}
@@ -1236,7 +1249,7 @@ STR_CONFIG_SETTING_ALLOW_GIVE_MONEY                             :Diğer şirketl
 STR_CONFIG_SETTING_ALLOW_GIVE_MONEY_HELPTEXT                    :Çok oyunculu oyunlarda şirketler arası para transferine izin ver
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :Ağır yük trenleri için ağırlık çarpanı: {STRING}
 STR_CONFIG_SETTING_FREIGHT_TRAINS_HELPTEXT                      :Trenlerde yük taşımanın etkisini ayarlayın. Yüksek bir değer trenlerde yük taşımayı özellikle tepelerde daha zor hale getirir
-STR_CONFIG_SETTING_PLANE_SPEED                                  :Uçak hız faktörü: {STRING}
+STR_CONFIG_SETTING_PLANE_SPEED                                  :Uçak hız çarpanı: {STRING}
 STR_CONFIG_SETTING_PLANE_SPEED_HELPTEXT                         :Havayolundan elde edilen geliri azaltmak için uçakların diğer araç türlerine göre hızını ayarlayın
 STR_CONFIG_SETTING_PLANE_SPEED_VALUE                            :1 / {COMMA}
 STR_CONFIG_SETTING_PLANE_CRASHES                                :Uçak kazası sayısı: {STRING}
@@ -1252,6 +1265,8 @@ STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Araçlar
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE                   :Altyapı bakımları: {STRING}
 STR_CONFIG_SETTING_INFRASTRUCTURE_MAINTENANCE_HELPTEXT          :Etkinleştirildiğinde; altyapı, bakım giderine neden olur. Maliyet ağ büyüklüğüne göre daha hızlı yükselir, dolayısıyla büyük şirketleri küçüklere göre daha çok etkiler

+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR                      :Şirket başlangıç rengi: {STRING}
+STR_CONFIG_SETTING_COMPANY_STARTING_COLOUR_HELPTEXT             :Şirketin başlangıç rengini seç

 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS                        :Havalimanlarının süresi asla dolmasın: {STRING}
 STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS_HELPTEXT               :Bu ayarı etkinleştirmek her havaalanı türünün, tanıtımından sonra sürekli olarak kullanılabilir kalmasını sağlar.
@@ -1336,7 +1351,13 @@ STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_HELPTEXT                :Küçük harita
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :Yeşil
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :Koyu yeşil
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Mor
-STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Düzgün viewport kaydırması: {STRING}
+STR_CONFIG_SETTING_SCROLLMODE                                   :Bakış noktası kaydırma davranışı: {STRING}
+STR_CONFIG_SETTING_SCROLLMODE_HELPTEXT                          :Haritada gezinirkenki davranış
+STR_CONFIG_SETTING_SCROLLMODE_DEFAULT                           :Sağ Fare Tuşu ile görüş alanını hareket ettir, fare konumu kilitli
+STR_CONFIG_SETTING_SCROLLMODE_RMB_LOCKED                        :Sağ Fare Tuşu ile haritayı hareket ettir, fare konumu kilitli
+STR_CONFIG_SETTING_SCROLLMODE_RMB                               :Sağ Fare Tuşu ile haritayı hareket ettir
+STR_CONFIG_SETTING_SCROLLMODE_LMB                               :Sol Fare Tuşu ile haritayı hareket ettir
+STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :Düzgün bakış noktası kaydırması: {STRING}
 STR_CONFIG_SETTING_SMOOTH_SCROLLING_HELPTEXT                    :Küçük haritaya tıklandığında veya harita üzerindeki belli bir nesneye gidilmesi için komut verildiğinde ana görüntünün nasıl kaydırılacağını kontrol eder. Etkinleştirildiğinde harita kayarak ilerler, kapatıldığında ise doğrudan hedeflenen noktaya atlama yapar.
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :İnşa araçları kullanılırken ölçüm ipucu göster: {STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP_HELPTEXT                     :İnşaat işlemleri sırasında fareyi sürükleyince kare-uzaklıkları ve yükseklik farklarını göster.
@@ -1578,9 +1599,9 @@ STR_CONFIG_SETTING_SOFT_LIMIT_HELPTEXT                          :Yeni pencereler
 STR_CONFIG_SETTING_SOFT_LIMIT_VALUE                             :{COMMA}
 STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :etkisiz
 STR_CONFIG_SETTING_ZOOM_MIN                                     :Azami yaklaşma seviyesi: {STRING}
-STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Haritadan kısımlar gösteren pencereler (viewport) için azami yaklaştırma (zoom-in) seviyesi. Daha yüksek yaklaştırma ayarları oyunun bellek gereksinimini arttırır.
+STR_CONFIG_SETTING_ZOOM_MIN_HELPTEXT                            :Görüş alanları için azami yakınlaşma seviyesi. Daha yüksek uzaklaştırma ayarları oyunda gecikmelere sebep olabilir
 STR_CONFIG_SETTING_ZOOM_MAX                                     :Azami uzaklaşma seviyesi: {STRING}
-STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT                            :Haritadan kısımlar gösteren pencereler (viewport) için azami uzaklaştırma (zoom-out) seviyesi. Daha yüksek uzaklaştırma ayarları oyunda gecikmelere sebep olabilir
+STR_CONFIG_SETTING_ZOOM_MAX_HELPTEXT                            :Görüş alanları için azami uzaklaşma seviyesi. Daha yüksek uzaklaştırma ayarları oyunda gecikmelere sebep olabilir
 STR_CONFIG_SETTING_ZOOM_LVL_MIN                                 :4x
 STR_CONFIG_SETTING_ZOOM_LVL_IN_2X                               :2x
 STR_CONFIG_SETTING_ZOOM_LVL_NORMAL                              :Normal
@@ -1666,7 +1687,7 @@ STR_CONFIG_SETTING_GRAPHICS                                     :{ORANGE}Grafikl
 STR_CONFIG_SETTING_SOUND                                        :{ORANGE}Ses
 STR_CONFIG_SETTING_INTERFACE                                    :{ORANGE}Arayüz
 STR_CONFIG_SETTING_INTERFACE_GENERAL                            :{ORANGE}Genel
-STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Harita kısım pencereleri
+STR_CONFIG_SETTING_INTERFACE_VIEWPORTS                          :{ORANGE}Görüş alanları
 STR_CONFIG_SETTING_INTERFACE_CONSTRUCTION                       :{ORANGE}İnşaat
 STR_CONFIG_SETTING_ADVISORS                                     :{ORANGE}Haberler / Danışmanlar
 STR_CONFIG_SETTING_COMPANY                                      :{ORANGE}Şirket
@@ -1804,6 +1825,7 @@ STR_CHEAT_CHANGE_DATE_QUERY_CAPT                                :{WHITE}Yılı d
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Üretim değerlerini değiştir: {ORANGE}{STRING}

 # Livery window
+STR_LIVERY_CAPTION                                              :{WHITE}{COMPANY} - Renk Düzeni

 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Genel renk şemalarını göster
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Tren renk düzenlerini göster
@@ -2063,11 +2085,12 @@ STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Bağlant

 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Sunucu korumalı. Parola girin
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Şirket korumalı. Parola girin
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST_CAPTION                    :{WHITE}İstemci listesi

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Oyuncu listesi
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Gözlemle
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Yeni şirket
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Oyuncu listesi
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Gözlemle
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Yeni şirket

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :At
@@ -2082,7 +2105,6 @@ STR_NETWORK_CLIENT                                              :İstemci
 STR_NETWORK_SPECTATORS                                          :İzleyiciler

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vermek istediğiniz para miktarını girin
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}İzleyici

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Girilen parolayı kaydetme
@@ -2279,6 +2301,7 @@ STR_LINKGRAPH_LEGEND_CAPTION                                    :{BLACK}Kargo Ak
 STR_LINKGRAPH_LEGEND_ALL                                        :{BLACK}Hepsi
 STR_LINKGRAPH_LEGEND_NONE                                       :{BLACK}Hiçbiri
 STR_LINKGRAPH_LEGEND_SELECT_COMPANIES                           :{BLACK}Gösterilecek şirketleri seçin
+STR_LINKGRAPH_LEGEND_COMPANY_TOOLTIP                            :{BLACK}{STRING}{}{COMPANY}

 # Linkgraph legend window and linkgraph legend in smallmap
 STR_LINKGRAPH_LEGEND_UNUSED                                     :{TINY_FONT}{BLACK}kullanılmayan
@@ -2363,9 +2386,9 @@ STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Karış
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Yol Sinyali (elektrikli){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Standart yol sinyalleri arka taraftan geçişe izin verir
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Tek Yön Yol Sinyali (elektrikli){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Tek yön yol sinyalleri arka taraftan geçişe izin vermez
 STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Sinyal Dönüştür{}Seçildiğinde, tıklama var olan sinyali seçili sinyal tür ve alt türüne çevirir, CTRL ile tıklama mevcut alt türü değiştirir. Shift ile tıklama maliyet tahminini gösterir
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Sinyal sürükleme yoğunluğu
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Sinyal sürükleme yoğunluğunu azalt
-STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Sinyal sürükleme yoğunluğunu arttır
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Sinyal sürükleme mesafesi
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Sinyal sürükleme mesafesini azalt
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Sinyal sürükleme mesafesini arttır

 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Tren Köprüsü Seç
@@ -2688,9 +2711,52 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2019 OpenTTD ekibi

 # Framerate display window
+STR_FRAMERATE_CAPTION                                           :{WHITE}Kare oranı
+STR_FRAMERATE_CAPTION_SMALL                                     :{STRING}{WHITE} ({DECIMAL}x)
+STR_FRAMERATE_RATE_GAMELOOP                                     :{BLACK}Simülasyon oranı: {STRING}
+STR_FRAMERATE_RATE_GAMELOOP_TOOLTIP                             :{BLACK}Saniyede simüle edilen oyun zaman birim sayısı.
+STR_FRAMERATE_RATE_BLITTER                                      :{BLACK}Grafik kare oranı: {STRING}
+STR_FRAMERATE_RATE_BLITTER_TOOLTIP                              :{BLACK}Saniyede işlenecek video kare sayısı.
+STR_FRAMERATE_SPEED_FACTOR                                      :{BLACK}Şu anki oyun hız çarpanı: {DECIMAL}x
+STR_FRAMERATE_SPEED_FACTOR_TOOLTIP                              :{BLACK}Beklenen normal simülasyon hızı yerine, şu anda oyunun ne kadar hızlı çalıştığı.
+STR_FRAMERATE_CURRENT                                           :{WHITE}Geçerli
+STR_FRAMERATE_AVERAGE                                           :{WHITE}Ortalama
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Veriler {COMMA} ölçümlerine dayanır
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
+STR_FRAMERATE_MS_BAD                                            :{RED}{DECIMAL} ms
+STR_FRAMERATE_FPS_GOOD                                          :{LTBLUE}{DECIMAL} kare/s
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} kare/s
+STR_FRAMERATE_FPS_BAD                                           :{RED}{DECIMAL} kare/s
+STR_FRAMERATE_GRAPH_MILLISECONDS                                :{TINY_FONT}{COMMA} ms
+STR_FRAMERATE_GRAPH_SECONDS                                     :{TINY_FONT}{COMMA} s
 ############ Leave those lines in this order!!
+STR_FRAMERATE_GAMELOOP                                          :{BLACK}Oyun döngüsü toplam:
+STR_FRAMERATE_GL_ECONOMY                                        :{BLACK}  Kargo işleme:
+STR_FRAMERATE_GL_TRAINS                                         :{BLACK}  Tren zaman birimleri:
+STR_FRAMERATE_GL_ROADVEHS                                       :{BLACK}  Yol taşıt zaman birimleri:
+STR_FRAMERATE_GL_SHIPS                                          :{BLACK}  Gemi zaman birimleri:
+STR_FRAMERATE_GL_AIRCRAFT                                       :{BLACK}  Hava taşıtı zaman birimleri:
+STR_FRAMERATE_GL_LANDSCAPE                                      :{BLACK}  Dünya zaman birimleri:
+STR_FRAMERATE_GL_LINKGRAPH                                      :{BLACK}  Bağlantı grafiği gecikmesi:
+STR_FRAMERATE_DRAWING                                           :{BLACK}Grafik işleme:
+STR_FRAMERATE_DRAWING_VIEWPORTS                                 :{BLACK}  Dünya görüş alanları:
+STR_FRAMERATE_VIDEO                                             :{BLACK}Video çıkışı:
+STR_FRAMERATE_SOUND                                             :{BLACK}Ses karıştırma:
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
+STR_FRAMETIME_CAPTION_GAMELOOP                                  :Oyun döngüsü
+STR_FRAMETIME_CAPTION_GL_ECONOMY                                :Kargo işleme
+STR_FRAMETIME_CAPTION_GL_TRAINS                                 :Tren zaman birimleri
+STR_FRAMETIME_CAPTION_GL_ROADVEHS                               :Yol aracı zaman birimleri
+STR_FRAMETIME_CAPTION_GL_SHIPS                                  :Gemi zaman birimleri
+STR_FRAMETIME_CAPTION_GL_AIRCRAFT                               :Hava taşıtı zaman birimleri
+STR_FRAMETIME_CAPTION_GL_LANDSCAPE                              :Dünya zaman birimleri
+STR_FRAMETIME_CAPTION_GL_LINKGRAPH                              :Bağlantı grafiği gecikmesi
+STR_FRAMETIME_CAPTION_DRAWING                                   :Grafik işleme
+STR_FRAMETIME_CAPTION_DRAWING_VIEWPORTS                         :Dünya görüş alanı derleme
+STR_FRAMETIME_CAPTION_VIDEO                                     :Video çıkışı
+STR_FRAMETIME_CAPTION_SOUND                                     :Ses karıştırma
 ############ End of leave-in-this-order


@@ -2716,6 +2782,9 @@ STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Oyun Ayr
 STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}Mevcut bilgi yok
 STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING}
 STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
+STR_SAVELOAD_FILTER_TITLE                                       :{BLACK}Süzgeç dizgesi:
+STR_SAVELOAD_OVERWRITE_TITLE                                    :{WHITE}Dosya Üzerine Yaz
+STR_SAVELOAD_OVERWRITE_WARNING                                  :{YELLOW}Mevcut dosyanın üzerine yazmak istediğinizden emin misiniz?

 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Kayıtlı oyun için bir isim girin

@@ -2833,7 +2902,12 @@ STR_NEWGRF_SETTINGS_VERSION                                     :{BLACK}Sürüm:
 STR_NEWGRF_SETTINGS_MIN_VERSION                                 :{BLACK}En düşük uyumlu sürüm: {SILVER}{NUM}
 STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palet: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT                             :Varsayılan (D)
+STR_NEWGRF_SETTINGS_PALETTE_DEFAULT_32BPP                       :Varsayılan (D) / 32 bpp
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY                              :Eski (W)
+STR_NEWGRF_SETTINGS_PALETTE_LEGACY_32BPP                        :Eski (W) / 32 bpp
 STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Seçenekler: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_NONE                              :Hiçbiri

 STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Hiç bilgi yok
 STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Eşleşen dosya bulunamadı
@@ -2914,6 +2988,8 @@ STR_NEWGRF_ERROR_READ_BOUNDS                                    :Pseudo-nesne bi
 STR_NEWGRF_ERROR_GRM_FAILED                                     :İstenen GRF kaynakları mevcut değil (nesne {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} {STRING} tarafından deaktive edildi
 STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Geçersiz/bilinmeyen nesne yerleşim biçimi (nesne {3:NUM})
+STR_NEWGRF_ERROR_LIST_PROPERTY_TOO_LONG                         :Özellik değeri listesinde çok fazla öğe (sprite {3:NUM}, özellik {4:HEX})
+STR_NEWGRF_ERROR_INDPROD_CALLBACK                               :Geçersiz endüstri üretim geri çağrımı (sprite {3:NUM}, "{1:STRING}")

 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Uyarı!
@@ -2978,6 +3054,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Tabela i
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Şehirler
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Hiçbiri -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_TOWN_DIRECTORY_CITY                                         :{ORANGE}{TOWN}{YELLOW} (Şehir){BLACK} ({COMMA})
 STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Şehir isimleri - şehre bakmak için ismine tıkla. Ctrl ile tıklama şehrin konumunu gösteren yeni bir pencere açar
 STR_TOWN_POPULATION                                             :{BLACK}Dünya nüfusu: {COMMA}

@@ -2985,6 +3062,7 @@ STR_TOWN_POPULATION                                             :{BLACK}Dünya n
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Şehir)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Nüfus: {ORANGE}{COMMA}{BLACK}  Ev: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_LAST_MONTH_MAX                              :{BLACK}{CARGO_LIST} son ay: {ORANGE}{COMMA}{BLACK}  azami: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Kasaba büyümesi için gerekli kargo:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} gerekli
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} kışın gerekir
@@ -3037,7 +3115,8 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Yakalan
 # Goal window
 STR_GOALS_CAPTION                                               :{WHITE}{COMPANY} Hedefler
 STR_GOALS_SPECTATOR_CAPTION                                     :{WHITE}Evrensel Amaçlar
-STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Genel hedefler:
+STR_GOALS_SPECTATOR                                             :Evrensel Amaçlar
+STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Evrensel amaçlar:
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Hiçbiri -
 STR_GOALS_SPECTATOR_NONE                                        :{ORANGE}- Kullanılamaz -
@@ -3085,6 +3164,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Görünt
 # Story book window
 STR_STORY_BOOK_CAPTION                                          :{WHITE}{COMPANY} Hikaye Kitabı
 STR_STORY_BOOK_SPECTATOR_CAPTION                                :{WHITE}Evrensel Hikaye Kitabı
+STR_STORY_BOOK_SPECTATOR                                        :Evrensel Hikaye Kitabı
 STR_STORY_BOOK_TITLE                                            :{YELLOW}{STRING}
 STR_STORY_BOOK_GENERIC_PAGE_ITEM                                :Sayfa {NUM}
 STR_STORY_BOOK_SEL_PAGE_TOOLTIP                                 :{BLACK}Bu listeden seçerek istenilen sayfaya git.
@@ -3191,7 +3271,7 @@ STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Hava Taş
 STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Gemi Bakımları
 STR_FINANCES_SECTION_PROPERTY_MAINTENANCE                       :{GOLD}İnşaat bakımları
 STR_FINANCES_SECTION_TRAIN_INCOME                               :{GOLD}Tren Geliri
-STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME                        :{GOLD}Kara Taşıtı Geliri
+STR_FINANCES_SECTION_ROAD_VEHICLE_INCOME                        :{GOLD}Yol Taşıtı Geliri
 STR_FINANCES_SECTION_AIRCRAFT_INCOME                            :{GOLD}Hava Taşıtı Geliri
 STR_FINANCES_SECTION_SHIP_INCOME                                :{GOLD}Gemi Geliri
 STR_FINANCES_SECTION_LOAN_INTEREST                              :{GOLD}Kredi Faizi
@@ -3289,6 +3369,9 @@ STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Görünt
 STR_INDUSTRY_VIEW_PRODUCTION_LEVEL                              :{BLACK}Üretim seviyesi: %{YELLOW}{COMMA}
 STR_INDUSTRY_VIEW_INDUSTRY_ANNOUNCED_CLOSURE                    :{YELLOW}Fabrika çok yakında kapanacağını duyurdu!

+STR_INDUSTRY_VIEW_REQUIRES_N_CARGO                              :{BLACK}Gereken: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_PRODUCES_N_CARGO                              :{BLACK}Üretilen: {YELLOW}{STRING}{STRING}
+STR_INDUSTRY_VIEW_CARGO_LIST_EXTENSION                          :, {STRING}{STRING}

 STR_INDUSTRY_VIEW_REQUIRES                                      :{BLACK}Gereken:
 STR_INDUSTRY_VIEW_ACCEPT_CARGO                                  :{YELLOW}{STRING}{BLACK}{3:STRING}
@@ -3346,6 +3429,7 @@ STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Gruplar
 STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Grup oluşturmak için tıklayın
 STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Seçili grubu sil
 STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Seçili grubun ismini değiştir
+STR_GROUP_LIVERY_TOOLTIP                                        :{BLACK}Seçien grubun logosunu değiştir
 STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Bu grubu otomatik yenilemeden ayrı tutmak için tıklayın

 STR_QUERY_GROUP_DELETE_CAPTION                                  :{WHITE}Grubu Sil
@@ -3389,6 +3473,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasite
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Güç Veren Vagonlar: {GOLD}+{POWER}{BLACK} Ağırlık: {GOLD}+{WEIGHT_SHORT}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Dönüştürülebildiği kargolar: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Tüm kargo türleri
+STR_PURCHASE_INFO_NONE                                          :Hiçbiri
 STR_PURCHASE_INFO_ALL_BUT                                       :Şunlar hariç tümü: {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Aza. Çekim Gücü: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Menzil: {GOLD}{COMMA} kare
@@ -3788,6 +3873,7 @@ STR_ORDER_CONDITIONAL_AGE                                       :Araç yaşı (y
 STR_ORDER_CONDITIONAL_REQUIRES_SERVICE                          :Bakım gerektirir
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Her zaman
 STR_ORDER_CONDITIONAL_REMAINING_LIFETIME                        :Kalan ömrü (yıl)
+STR_ORDER_CONDITIONAL_MAX_RELIABILITY                           :Azami güvenilirlik

 STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP                        :{BLACK}Araç verisinin verilen değerle nasıl karşılaştırılacağı
 STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS                         :eşittir
@@ -4220,6 +4306,7 @@ STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... bu y
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... yol yanlış yönde
 STR_ERROR_DRIVE_THROUGH_CORNER                                  :{WHITE}... yol üstü duraklar köşe üzerine inşa edilemez
 STR_ERROR_DRIVE_THROUGH_JUNCTION                                :{WHITE}... yol üstü duraklar kavşak üzerine inşa edilemez
+STR_ERROR_DRIVE_THROUGH_ON_ONEWAY_ROAD                          :{WHITE}... yol tek yön ya da engellenmiş

 # Station destruction related errors
 STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}İstasyonun parçasi kaldırılamaz...
@@ -4471,6 +4558,8 @@ STR_BASESOUNDS_DOS_DESCRIPTION                                  :Özgün Transpo
 STR_BASESOUNDS_WIN_DESCRIPTION                                  :Özgün Transport Tycoon Deluxe Windows sürümü sesleri.
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :Ses içermeyen boş bir ses kümesi.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Özgün Transport Tycoon Deluxe Windows sürümü müzikleri.
+STR_BASEMUSIC_DOS_DESCRIPTION                                   :Özgün Transport Tycoon Deluxe DOS sürüm müziği.
+STR_BASEMUSIC_TTO_DESCRIPTION                                   :Özgün Transport Tycoon Deluxe (Original/World Editor) DOS sürümü müzikleri.
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Müzik içermeyen boş bir müzik paketi.

 ##id 0x2000
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -1050,6 +1050,7 @@ STR_GAME_OPTIONS_CURRENCY_ZAR                                   :Південн
 STR_GAME_OPTIONS_CURRENCY_CUSTOM                                :Власна...
 STR_GAME_OPTIONS_CURRENCY_GEL                                   :Грузинські ларі (GEL)
 STR_GAME_OPTIONS_CURRENCY_IRR                                   :Іранський ріал (IRR)
+STR_GAME_OPTIONS_CURRENCY_RUB                                   :Російський новий рубель (RUB)
 ############ end of currency region

 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Сторона руху транспорту
@@ -1112,6 +1113,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Нормаль
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Подвійний розмір
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Почетверний розмір

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Базовий набір графіки
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Оберіть, яку основну графіку використовувати
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} відсутн{P ій іх іх}/пошкоджен{P ий их их} файл{P "" а ів}
@@ -2189,9 +2192,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Серв
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компанія захищена паролем. Введіть пароль

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Список клієнтів
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Спостерігати
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Нова компанія
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Список клієнтів
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Спостерігати
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Нова компанія

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Відключити гравця
@@ -2206,7 +2209,6 @@ STR_NETWORK_CLIENT                                              :Клієнт
 STR_NETWORK_SPECTATORS                                          :Спостерігачі

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Введіть суму грошей, яку Ви хочете віддати
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Глядач

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Не запам'ятовувати введений пароль
@@ -2814,6 +2816,10 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT} 2002-2019 команда OpenTTD

 # Framerate display window
+STR_FRAMERATE_DATA_POINTS                                       :{BLACK}Дані отримано з {COMMA} вимірюван {P "ня" "нь" "нь" }
+STR_FRAMERATE_MS_GOOD                                           :{LTBLUE}{DECIMAL} ms
+STR_FRAMERATE_MS_WARN                                           :{YELLOW}{DECIMAL} ms
+STR_FRAMERATE_FPS_WARN                                          :{YELLOW}{DECIMAL} кадр{P "" "и" "ів"}/сек
 ############ Leave those lines in this order!!
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
@@ -4582,6 +4588,7 @@ STR_BASESOUNDS_DOS_DESCRIPTION                                  :Оригіна
 STR_BASESOUNDS_WIN_DESCRIPTION                                  :Оригінальний набір звуків з Transport Tycoon Deluxe Windows edition.
 STR_BASESOUNDS_NONE_DESCRIPTION                                 :Порожній набір звуків.
 STR_BASEMUSIC_WIN_DESCRIPTION                                   :Оригінальна музика з Transport Tycoon Deluxe Windows edition.
+STR_BASEMUSIC_DOS_DESCRIPTION                                   :Оригінальна музика Transport Tycoon Deluxe(DOS)
 STR_BASEMUSIC_NONE_DESCRIPTION                                  :Порожній набір музики.

 ##id 0x2000
--- a/src/lang/unfinished/chuvash.txt
+++ b/src/lang/unfinished/chuvash.txt
@@ -519,6 +519,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :расна



+
+
 # Custom currency window


--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -983,6 +983,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Normaal
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dûbele grutte
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Fjouwerdûbele grutte

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basisset for ôfbyldings
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektearje de basis ôfbyldingsset om te brûken
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ûntbrekke{P "" nde}/korrupt{P "" e} bestân
@@ -1976,7 +1978,6 @@ STR_NETWORK_SERVER                                              :Tsjinner
 STR_NETWORK_CLIENT                                              :Kliïnt
 STR_NETWORK_SPECTATORS                                          :Taskôgers

-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Taskôger

 # Network set password
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Jou it bedriuw it nije wachtwurd
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -481,6 +481,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :altra



+
+
 # Custom currency window


--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -805,6 +805,8 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој ме



+
+
 # Custom currency window


--- a/src/lang/unfinished/maltese.txt
+++ b/src/lang/unfinished/maltese.txt
@@ -414,6 +414,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :oħrajn



+
+
 # Custom currency window


--- a/src/lang/unfinished/marathi.txt
+++ b/src/lang/unfinished/marathi.txt
@@ -759,6 +759,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :अन्य



+
+
 # Custom currency window


--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -969,6 +969,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :دیگر

 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :دو برابر

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}بسته گرافیک پایه
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}بسته گرافیک پایه را انتخاب کنید
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} فایل وجود ندارد یا خراب است
@@ -1791,7 +1793,6 @@ STR_NETWORK_CLIENT                                              :سرویس گی
 STR_NETWORK_SPECTATORS                                          :تماشاگران

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}مقدار پولی که می خواهید دریافت نمایید را وارد کنید
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}تماشگر

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}رمز وارد شده را به خاطر نسپار
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -946,6 +946,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER                               :دیگر



+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}بُنیادی گرافک سیٹ
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}بُنیادی گرافک سیٹ اختیار کریں
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} missing/corrupted file{P "" s}
--- a/src/lang/vietnamese.txt
+++ b/src/lang/vietnamese.txt
@@ -991,6 +991,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Bình thường
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Gấp 2 lần
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Gấp 4 lần

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Gói đồ họa
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Chọn gói đồ họa để sử dụng
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} thiếu/hỏng file
@@ -2077,9 +2079,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server y
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Công ty yêu cầu xác thực. Nhập mật khẩu

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Danh sách máy trạm
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Xem
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Công ty mới
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Danh sách máy trạm
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Xem
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Công ty mới

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Đá
@@ -2094,7 +2096,6 @@ STR_NETWORK_CLIENT                                              :Máy trạm
 STR_NETWORK_SPECTATORS                                          :Người xem

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Nhập số tiền muốn cho đi
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Người xem

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Không được ghi mật khẩu đã nhập
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -984,6 +984,8 @@ STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_NORMAL                       :Arferol
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_2X_ZOOM                      :Dyblyg
 STR_GAME_OPTIONS_GUI_ZOOM_DROPDOWN_4X_ZOOM                      :Pedwarplyg

+
+
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Set raffeg sylfaenol
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Dewiswch y set raffeg sylfaenol i'w defnyddio
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ffeil ar goll/llygredig
@@ -2064,9 +2066,9 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Mae'r gw
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Mae'r cwmni wedi'i ddiogelu. rhowch y cyfrinair.

 # Network company list added strings
-STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Rhestr Cleientiaid
-STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Gwylio
-STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Cwmni newydd
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Rhestr Cleientiaid
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :Gwylio
+STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :Cwmni newydd

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Cicio
@@ -2081,7 +2083,6 @@ STR_NETWORK_CLIENT                                              :Gwestai
 STR_NETWORK_SPECTATORS                                          :Gwylwyr

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Nodwch faint o arian yr hoffech chi ei roi
-STR_NETWORK_TOOLBAR_LIST_SPECTATOR                              :{BLACK}Gwyliwr

 # Network set password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Peidio cadw'r cyfrinair a roddwyd
--- a/src/linkgraph/linkgraph_gui.cpp
+++ b/src/linkgraph/linkgraph_gui.cpp
@@ -239,8 +239,12 @@ void LinkGraphOverlay::AddLinks(const Station *from, const Station *to)
 * Draw the linkgraph overlay or some part of it, in the area given.
 * @param dpi Area to be drawn to.
 */
-void LinkGraphOverlay::Draw(const DrawPixelInfo *dpi) const
+void LinkGraphOverlay::Draw(const DrawPixelInfo *dpi)
 {
+	if (this->dirty) {
+		this->RebuildCache();
+		this->dirty = false;
+	}
 	this->DrawLinks(dpi);
 	this->DrawStationDots(dpi);
 }
--- a/src/linkgraph/linkgraph_gui.h
+++ b/src/linkgraph/linkgraph_gui.h
@@ -56,11 +56,13 @@ public:
 			window(w), widget_id(wid), cargo_mask(cargo_mask), company_mask(company_mask), scale(scale)
 	{}

-	void RebuildCache();
-	void Draw(const DrawPixelInfo *dpi) const;
+	void Draw(const DrawPixelInfo *dpi);
 	void SetCargoMask(CargoTypes cargo_mask);
 	void SetCompanyMask(uint32 company_mask);

+	/** Mark the linkgraph dirty to be rebuilt next time Draw() is called. */
+	void SetDirty() { this->dirty = true; }
+
 	/** Get a bitmask of the currently shown cargoes. */
 	CargoTypes GetCargoMask() { return this->cargo_mask; }

@@ -75,6 +77,7 @@ protected:
 	LinkMap cached_links;              ///< Cache for links to reduce recalculation.
 	StationSupplyList cached_stations; ///< Cache for stations to be drawn.
 	uint scale;                        ///< Width of link lines.
+	bool dirty;                        ///< Set if overlay should be rebuilt.

 	Point GetStationMiddle(const Station *st) const;

@@ -85,6 +88,7 @@ protected:
 	bool IsLinkVisible(Point pta, Point ptb, const DrawPixelInfo *dpi, int padding = 0) const;
 	bool IsPointVisible(Point pt, const DrawPixelInfo *dpi, int padding = 0) const;
 	void GetWidgetDpi(DrawPixelInfo *dpi) const;
+	void RebuildCache();

 	static void AddStats(uint new_cap, uint new_usg, uint new_flow, bool new_shared, LinkProperties &cargo);
 	static void DrawVertex(int x, int y, int size, int colour, int border_colour);
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -220,6 +220,7 @@ enum {
 	GHK_RESET_OBJECT_TO_PLACE,
 	GHK_DELETE_WINDOWS,
 	GHK_DELETE_NONVITAL_WINDOWS,
+	GHK_DELETE_ALL_MESSAGES,
 	GHK_REFRESH_SCREEN,
 	GHK_CRASH,
 	GHK_MONEY,
@@ -266,7 +267,7 @@ struct MainWindow : Window
 			return;
 		}

-		this->viewport->overlay->RebuildCache();
+		this->viewport->overlay->SetDirty();
 		this->GetWidget<NWidgetBase>(WID_M_VIEWPORT)->SetDirty(this);
 	}

@@ -345,6 +346,7 @@ struct MainWindow : Window
 			case GHK_RESET_OBJECT_TO_PLACE: ResetObjectToPlace(); break;
 			case GHK_DELETE_WINDOWS: DeleteNonVitalWindows(); break;
 			case GHK_DELETE_NONVITAL_WINDOWS: DeleteAllNonVitalWindows(); break;
+			case GHK_DELETE_ALL_MESSAGES: DeleteAllMessages(); break;
 			case GHK_REFRESH_SCREEN: MarkWholeScreenDirty(); break;

 			case GHK_CRASH: // Crash the game
@@ -488,6 +490,7 @@ static Hotkey global_hotkeys[] = {
 	Hotkey(WKC_ESC, "reset_object_to_place", GHK_RESET_OBJECT_TO_PLACE),
 	Hotkey(WKC_DELETE, "delete_windows", GHK_DELETE_WINDOWS),
 	Hotkey(WKC_DELETE | WKC_SHIFT, "delete_all_windows", GHK_DELETE_NONVITAL_WINDOWS),
+	Hotkey(WKC_DELETE | WKC_CTRL, "delete_all_messages", GHK_DELETE_ALL_MESSAGES),
 	Hotkey('R' | WKC_CTRL, "refresh_screen", GHK_REFRESH_SCREEN),
 #if defined(_DEBUG)
 	Hotkey('0' | WKC_ALT, "crash_game", GHK_CRASH),
--- a/src/music/fluidsynth.cpp
+++ b/src/music/fluidsynth.cpp
@@ -149,7 +149,11 @@ bool MusicDriver_FluidSynth::IsSongPlaying()
 void MusicDriver_FluidSynth::SetVolume(byte vol)
 {
 	/* Allowed range of synth.gain is 0.0 to 10.0 */
-	if (fluid_settings_setnum(_midi.settings, "synth.gain", 1.0 * vol / 128.0) != 1) {
+	/* fluidsynth's default gain is 0.2, so use this as "full
+	 * volume". Set gain using OpenTTD's volume, as a number between 0
+	 * and 0.2. */
+	double gain = (1.0 * vol) / (128.0 * 5.0);
+	if (fluid_settings_setnum(_midi.settings, "synth.gain", gain) != 1) {
 		DEBUG(driver, 0, "Could not set volume");
 	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Lutz	919d7accd7	Update: Changelog for 1.9.0-beta3 and prepare for release.	2019-02-24 23:30:28 +01:00
Michael Lutz	fa2bea7394	Change: [AzurePipelines] Use a minimum OSX version of 10.9 during building. OpenTTD sources are still written in a way to work down to OSX 10.4 or so, as long as you can obtain a C++11 capable compiler. 10.9 is the minimal useful C++11 target using only Apple stuff out-of-the-box.	2019-02-24 22:18:10 +01:00
translators	d24a9dfe98	Update: Translations from eints italian: 11 changes by lorenzodv dutch: 46 changes by JanWillem russian: 5 changes by Lone_Wolf	2019-02-24 19:45:43 +01:00
Alexander Weiss	77ab6f8ec7	Change: [OSX] Prevent 2D scrolling for traditional scroll wheel mice	2019-02-24 17:54:59 +01:00
Alexander Weiss	0bb395b21d	Change #6800 : [OSX] Use high-precision scrolling deltas for 2D scrolling	2019-02-24 17:54:59 +01:00
PeterN	195fd0dc60	Fix #7266 : Reorder reinitialization of caches when changing font zoom level. (#7273 )	2019-02-24 16:27:44 +00:00
Patric Stout	91eee793e1	Fix `c3dbe836b4`: also compile without ENABLE_NETWORK defined again	2019-02-24 01:11:08 +01:00
PeterN	87ebfe1227	Fix #7004 : Mark linkgraph dirty to be rebuilt on next draw call. (#7265 ) Previously the linkgraph was rebuilt before the viewport extents were finalized.	2019-02-23 19:19:41 +00:00
translators	f240f61fb2	Update: Translations from eints danish: 11 changes by nielsmh spanish (mexican): 11 changes by Absay hungarian: 100 changes by Brumi russian: 6 changes by Lone_Wolf croatian: 9 changes by VoyagerOne	2019-02-23 19:45:45 +01:00
PeterN	eeae4512ae	Fix #7003 : Freetype fonts were scaled by both GUI and Font zoom levels. (#7267 )	2019-02-23 16:07:25 +00:00
Niels Martin Hansen	13962a8475	Change: Framerate window can now scroll and resize	2019-02-23 14:29:07 +01:00
Niels Martin Hansen	7e1e2756d4	Add: Show performance of AI and GS in framerate window	2019-02-23 14:29:07 +01:00
SamuXarick	4adb91202d	Fix: Remove desert around lakes upon generation	2019-02-23 13:16:12 +01:00
Peter Nelson	fde5bd0ccf	Change: Add scrollbar to cargo legend in cargo payment rates window.	2019-02-23 11:46:00 +01:00
Greg Carlin	00d28a500d	Feature: Add option to adjust font size separately from GUI size. (#7003 ) Adds an option in the "Game Options" next to "Interface Size" called "Font Size". Available options are normal, double, and quad.	2019-02-23 08:27:46 +00:00
peter1138	56a6d7aec8	Fix #7227 : Don't apply mouse-hasn't-moved test to scrollbars.	2019-02-22 21:32:12 +00:00
peter1138	69928df3f0	Fix: Resorting file list did not update filtered rows.	2019-02-22 21:31:46 +00:00
translators	fb1b6fa47a	Update: Translations from eints italian: 9 changes by lorenzodv norwegian (bokmal): 4 changes by Leifbk	2019-02-22 19:45:44 +01:00
Michael Lutz	690d1dd6a4	Fix #7159 , `e934f09`: Waiting time at red one-way signals was too short. This is not an exact fix as previously, the wait time was speed/acceleration dependant. This simple fix ignores that and just makes the 'days' from the settings comment to be actually days.	2019-02-21 23:19:03 +00:00
SamuXarick	456e67ac1c	Change: Owner of vehicle with exclusive transport rights may now load cargo from neutral stations (#7256 )	2019-02-21 21:23:37 +00:00
translators	673f6753e9	Update: Translations from eints dutch: 76 changes by JanWillem scottish gaelic: 44 changes by GunChleoc	2019-02-21 19:45:46 +01:00
peter1138	5ab1a73a8a	Codechange: Remove never-used StationIDList.	2019-02-21 17:45:47 +01:00
Nikolas Nyby	8a6e03c4d2	Fix #7189 : Fluidsynth volume gain too high	2019-02-21 10:08:07 +01:00
Peter Nelson	6733b71300	Change: Make mini-map widget capture mouse when left-click dragging. This allows the mini-map to be dragged when the cursor has left the widget.	2019-02-21 08:11:35 +00:00
Peter Nelson	6dfe36b5cd	Change: Make volume slider widget capture mouse when clicked. This makes the slider continue to respond even when mouse cursor is no longer over the widget.	2019-02-21 08:11:35 +00:00
Peter Nelson	de9f54ccc1	Codechange: Change scrolling_scrollbar to mouse_capture_widget, and dispatch OnClick() event if widget is not a scrollbar. This allows any widget to support mouse capture.	2019-02-21 08:11:35 +00:00
Samu	66d23e3e86	Fix #7090 : Close Query String window after rebuilding AI/GS settings	2019-02-21 01:40:34 +01:00
Samu	19fa960d83	Fix #7091 : Close dropdown menu windows after rebuilding AI/GS settings	2019-02-21 00:35:56 +01:00
translators	21f009dc78	Update: Translations from eints english (us): 11 changes by njn dutch: 244 changes by JanWillem turkish: 102 changes by wakeup	2019-02-20 19:45:42 +01:00
translators	21d8636722	Update: Translations from eints dutch: 100 changes by JanWillem	2019-02-19 19:45:43 +01:00
Samu	ba55f93f41	Doc: [AI] UnshareOrders empties the orders list of the vehicle.	2019-02-19 15:25:53 +01:00
J0an Josep	c4fe46a475	Fix #7244 , `6ca637b8c1`: OPF doesn't take 90 deg turns into account.	2019-02-19 01:06:10 +01:00
Juanjo	45ce517105	Codechange: Move some common code after adding/removing tiles to a station to its own function.	2019-02-18 22:57:43 +01:00
J0an Josep	6ca637b8c1	Fix #7226 : Don't call ship pathfinders if there is no available track due to "forbid 90 deg turns".	2019-02-18 22:57:19 +01:00
translators	349cbee6e9	Update: Translations from eints ukrainian: 6 changes by nsergiy dutch: 210 changes by JanWillem french: 1 change by glx portuguese: 4 changes by vesgo	2019-02-18 19:45:44 +01:00
PeterN	84961034e4	Change: Increase maximum number of orders from 64000 to ~16.7m. (#7220 )	2019-02-18 07:37:25 +00:00
translators	ef7e47a53a	Update: Translations from eints danish: 5 changes by nielsmh french: 3 changes by glx spanish (mexican): 4 changes by Absay russian: 4 changes by Lone_Wolf	2019-02-17 19:45:44 +01:00
glx	aadcf40b9b	Fix `1585eb1a3`: wrong default selection for goals and story book	2019-02-17 16:04:52 +01:00
Joan Josep	548ec05a48	Add: News menu entry and shortcut for deleting all messages. (#7240 )	2019-02-16 23:15:58 +00:00
glx	ebe84b9d4c	Cleanup: update modified and removed strings in languages	2019-02-16 22:19:16 +01:00
glx	1585eb1a3e	Fix: use more descriptive "spectator" strings for story book and goal dropdown menus	2019-02-16 22:19:16 +01:00
glx	7c31a32c2b	Fix: colour of network specific strings in company dropdown menus	2019-02-16 22:19:16 +01:00
Joan Josep	4919c8db13	Codechange: Re-arrange VehicleEnter_Track in rail_cmd. (#7239 )	2019-02-16 21:52:49 +01:00
PeterN	5dc377244d	Fix #7224 : AI could no longer create groups. (#7233 )	2019-02-15 19:15:53 +00:00
PeterN	3a4b6b476b	Change: Use selected group as parent when creating a new group. (#7224 )	2019-02-15 18:43:33 +00:00
Peter Nelson	57734fd85d	Fix #6599 : Disable build and rename button in build vehicle window when no vehicle is selected.	2019-02-14 19:35:48 +01:00
MrMamen	1f182c44c9	Fix: year for 1.9.0 betas in changelog	2019-02-14 19:24:58 +01:00
translators	045503e728	Update: Translations from eints english (us): 1 change by njn	2019-02-13 19:45:43 +01:00
PeterN	c0c8fb25fb	Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating. (#7219 )	2019-02-13 09:01:49 +00:00
Niels Martin Hansen	830ed6be61	Fix: Do not mangle tagged revision strings for network revision strings	2019-02-12 21:32:43 +00:00
Niels Martin Hansen	46d97239c4	Codechange: Include flag for whether a build is of a tagged revision	2019-02-12 21:32:43 +00:00
Thomas den Hollander	412e6132b6	Fix: CompanyEconomy documentation Company income was described as an unsigned integer, but it should be signed.	2019-02-12 19:26:21 +00:00
translators	6b5ebe2b09	Update: Translations from eints english (us): 64 changes by njn polish: 2 changes by McZapkie danish: 1 change by njn french: 2 changes by glx	2019-02-12 19:45:44 +01:00
PeterN	aa737715dd	Fix #7151 : AI start date deviation was still applied when not set to a random AI. (#7223 )	2019-02-11 18:59:55 +00:00
translators	75d3054ae4	Update: Translations from eints faroese: 1 change by JayPee german: 1 change by ShadowCop norwegian (bokmal): 96 changes by Leifbk	2019-02-11 19:45:43 +01:00
Peter Nelson	cac2f6226c	Codechange: In CmdCompanyCtrl, move client_id assignment to where it is used, and document bit usage better.	2019-02-10 22:48:23 +00:00
PeterN	22f33fdd08	Fix `148e5b41d6`: Uninitialized variable usage. (#7216 )	2019-02-10 21:06:09 +00:00
translators	13af2b88b4	Update: Translations from eints russian: 3 changes by Lone_Wolf	2019-02-10 19:45:45 +01:00
Patric Stout	4d5d21be76	Fix: [AzurePipelines] always list the full changelog since last stable	2019-02-10 18:46:54 +01:00
Eddi-z	148e5b41d6	Change: Skip reliability decay if servicing is disabled	2019-02-10 18:45:48 +01:00
glx	2ff10327d7	Fix: projects/generate now keeps the line ending	2019-02-10 12:44:10 +01:00
glx	748d72202a	Fix: generate and generate.vbs were sorting differently	2019-02-10 12:44:10 +01:00
glx	0df95811ce	Fix: generate.vbs used wrong data for basesets_vs142	2019-02-10 12:44:10 +01:00
glx	70e1c57f81	Fix: line ending issues with MSYS2	2019-02-10 12:44:10 +01:00
PeterN	d242875d27	Fix #7197 : Invalidate depot buttons when necessary. (#7212 )	2019-02-10 08:43:54 +00:00
				`@@ -519,6 +519,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :расна`





				`# Custom currency window`
				`@@ -481,6 +481,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :altra`





				`# Custom currency window`
				`@@ -805,6 +805,8 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH :Секој ме`





				`# Custom currency window`
				`@@ -414,6 +414,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :oħrajn`





				`# Custom currency window`
				`@@ -759,6 +759,8 @@ STR_GAME_OPTIONS_RESOLUTION_OTHER :अन्य`





				`# Custom currency window`