(svn r19530) -Release: 1.0.0, oh yes... finally it's April fool's day!

2025-08-14 18:19:11 +00:00 · 2010-03-31 22:12:30 +00:00
258 changed files with 4086 additions and 12279 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,46 +1,12 @@
+Makefile*
 bin/*
-!bin/ai
-bin/ai/*
-!bin/ai/compat*.nut
-!bin/ai/regression
-!bin/data
-bin/data/*
+bundle/*
+!bin/data/chars.grf
 !bin/data/openttdd.grf
 !bin/data/openttdw.grf
-!bin/data/opntitle.dat
-!bin/data/orig_*.obg
-!bin/data/orig_*.obs
-!bin/data/no_sound.obs
-!bin/gm
-bin/gm/*
-!bin/gm/no_music.obm
-!bin/gm/orig_*.obm
-!bin/scripts
-bin/scripts/*
-!bin/scripts/*.example
-!bin/scripts/readme.txt
-
-bundle/*
-bundles/*
-docs/aidocs/*
-docs/source/*
-media/openttd.desktop
-media/openttd.desktop.install
+!bin/data/opntitle.grf
+!bin/scenario/README
+!bin/scripts*
+config.*
 objs/*
-projects/Debug
-projects/Release
-projects/*.ncb
-projects/*.suo
-projects/*.sdf
-projects/*.opensdf
-projects/*.vcproj.*.user
-projects/*.vcxproj.user
 src/rev.cpp
-src/os/windows/ottdres.rc
-
-/Makefile*
-!/Makefile.msvc
-/config.*
-!/config.lib
-!*.in
-*.tmp
--- a/.hgignore
+++ b/.hgignore
@@ -1,26 +1,11 @@
-syntax: glob
-
 bin/lang/*
-bin/openttd*
-bin/*.cfg
+bin/opentd*
 bundle/*
-bundles/*
-config.cache*
+config.cache.*
 config.log
 config.pwd
-docs/aidocs/*
-docs/source/*
 Makefile
 Makefile.am
-Makefile.bundle
-media/openttd.desktop
-media/openttd.desktop.install
+media/openttd.desktop*
 objs/*
-projects/*.ncb
-projects/*.suo
-projects/*.sdf
-projects/*.opensdf
-projects/*.vcproj.*.user
-projects/*.vcxproj.user
 src/rev.cpp
-src/os/windows/ottdres.rc
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -88,8 +88,7 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
-	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
+	$(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,6 @@ OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
 REVISION    = !!REVISION!!
 AWK         = !!AWK!!
-SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!

 RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi )
--- a/bin/ai/regression/regression.nut
+++ b/bin/ai/regression/regression.nut
@@ -192,9 +192,9 @@ function Regression::Base()
 	print("  RandRange(2): " + AIBase.RandRange(2));
 	print("  RandRange(2): " + AIBase.RandRange(2));
 	print("  RandRange(2): " + AIBase.RandRange(2));
-	print("  RandRange(1000000): " + AIBase.RandRange(1000000)); // 32 bit tests
-	print("  RandRange(1000000): " + AIBase.RandRange(1000000));
-	print("  RandRange(1000000): " + AIBase.RandRange(1000000));
+	print("  RandRange(9): " + AIBase.RandRange(9));
+	print("  RandRange(9): " + AIBase.RandRange(9));
+	print("  RandRange(9): " + AIBase.RandRange(9));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
 	print("  Chance(1, 2): " + AIBase.Chance(1, 2));
@@ -1027,7 +1027,6 @@ function Regression::RailTypeList()
 	for (local i = list.Begin(); list.HasNext(); i = list.Next()) {
 		print("    RailType:                " + i);
 		print("    IsRailTypeAvailable():   " + AIRail.IsRailTypeAvailable(i));
-		print("    GetMaxSpeed():           " + AIRail.GetMaxSpeed(i));
 	}
 }

@@ -1755,48 +1754,6 @@ function Regression::PrintSubsidy(subsidy_id)
 	print("        GetCargoType():        " + AISubsidy.GetCargoType(subsidy_id));
 }

-function Regression::Math()
-{
-	print("");
-	print("--Math--");
-	print("  -2147483648 < -2147483647:   " + (-2147483648 < -2147483647));
-	print("  -2147483648 < -1         :   " + (-2147483648 < -1         ));
-	print("  -2147483648 <  0         :   " + (-2147483648 <  0         ));
-	print("  -2147483648 <  1         :   " + (-2147483648 <  1         ));
-	print("  -2147483648 <  2147483647:   " + (-2147483648 <  2147483647));
-
-	print("  -2147483647 < -2147483648:   " + (-2147483647 < -2147483648));
-	print("  -1          < -2147483648:   " + (-1          < -2147483648));
-	print("   0          < -2147483648:   " + ( 0          < -2147483648));
-	print("   1          < -2147483648:   " + ( 1          < -2147483648));
-	print("   2147483647 < -2147483648:   " + ( 2147483647 < -2147483648));
-
-	print("  -1          >  2147483647:   " + (-1          >  2147483647));
-	print("  -1          >  1         :   " + (-1          >  1         ));
-	print("  -1          >  0         :   " + (-1          >  0         ));
-	print("  -1          > -1         :   " + (-1          > -1         ));
-	print("  -1          > -2147483648:   " + (-1          > -2147483648));
-
-	print("   1          >  2147483647:   " + ( 1          >  2147483647));
-	print("   1          >  1         :   " + ( 1          >  1         ));
-	print("   1          >  0         :   " + ( 1          >  0         ));
-	print("   1          > -1         :   " + ( 1          > -1         ));
-	print("   1          > -2147483648:   " + ( 1          > -2147483648));
-
-	print("   2147483647 >  2147483646:   " + ( 2147483647 >  2147483646));
-	print("   2147483647 >  1         :   " + ( 2147483647 >  1         ));
-	print("   2147483647 >  0         :   " + ( 2147483647 >  0         ));
-	print("   2147483647 > -1         :   " + ( 2147483647 > -1         ));
-	print("   2147483647 > -2147483648:   " + ( 2147483647 > -2147483648));
-
-	print("   2147483646 >  2147483647:   " + ( 2147483646 >  2147483647));
-	print("   1          >  2147483647:   " + ( 1          >  2147483647));
-	print("   0          >  2147483647:   " + ( 0          >  2147483647));
-	print("  -1          >  2147483647:   " + (-1          >  2147483647));
-	print("  -2147483648 >  2147483647:   " + (-2147483648 >  2147483647));
-
-	print("   13725      > -2147483648:   " + ( 13725      > -2147483648));
-}

 function Regression::Start()
 {
@@ -1862,7 +1819,5 @@ function Regression::Start()
 		}
 	}
 	print("  IsEventWaiting:        false");
-
-	this.Math();
 }

--- a/bin/ai/regression/regression.txt
+++ b/bin/ai/regression/regression.txt
@@ -96,10 +96,10 @@
  RandRange(1): 0
  RandRange(2): 0
  RandRange(2): 0
-  RandRange(2): 0
-  RandRange(1000000): 987346
-  RandRange(1000000): 781750
-  RandRange(1000000): 191841
+  RandRange(2): 1
+  RandRange(9): 6
+  RandRange(9): 7
+  RandRange(9): 4
  Chance(1, 2): true
  Chance(1, 2): false
  Chance(1, 2): false
@@ -2148,201 +2148,201 @@ ERROR: HasNext() is invalid as Begin() is never called
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 57
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Passenger Carriage
+    GetCargoType():     0
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      45
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1447
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        25
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 58
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Mail Van
+    GetCargoType():     2
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      35
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1335
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        21
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 59
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
-    CanRefitCargo():    false
-    GetCapacity():      -1
+    IsValidEngine():    true
+    GetName():          Coal Truck
+    GetCargoType():     1
+    CanRefitCargo():    true
+    GetCapacity():      35
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1031
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        18
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 60
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Oil Tanker
+    GetCargoType():     3
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      35
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1171
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        24
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 61
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Livestock Van
+    GetCargoType():     4
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      30
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1125
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        20
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 62
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Goods Van
+    GetCargoType():     5
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      30
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1113
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        21
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 63
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Grain Hopper
+    GetCargoType():     6
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      35
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1066
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        19
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 64
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Wood Truck
+    GetCargoType():     7
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      35
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1060
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        16
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 65
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Iron Ore Hopper
+    GetCargoType():     8
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      35
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1048
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        19
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 66
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Steel Truck
+    GetCargoType():     9
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      25
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1148
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        18
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 67
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Armoured Van
+    GetCargoType():     10
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      25
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1494
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        30
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      2
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 68
@@ -2724,201 +2724,201 @@ ERROR: HasNext() is invalid as Begin() is never called
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 89
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Passenger Carriage
+    GetCargoType():     0
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      47
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1447
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        25
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 90
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Mail Van
+    GetCargoType():     2
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      37
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1335
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        21
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 91
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
-    CanRefitCargo():    false
-    GetCapacity():      -1
+    IsValidEngine():    true
+    GetName():          Coal Truck
+    GetCargoType():     1
+    CanRefitCargo():    true
+    GetCapacity():      37
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1031
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        18
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 92
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Oil Tanker
+    GetCargoType():     3
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      37
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1171
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        24
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 93
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Livestock Van
+    GetCargoType():     4
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      32
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1125
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        20
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 94
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Goods Van
+    GetCargoType():     5
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      32
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1113
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        21
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 95
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Grain Hopper
+    GetCargoType():     6
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      37
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1066
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        19
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 96
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Wood Truck
+    GetCargoType():     7
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      37
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1060
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        16
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 97
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Iron Ore Hopper
+    GetCargoType():     8
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      37
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1048
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        19
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 98
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Steel Truck
+    GetCargoType():     9
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      27
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1148
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        18
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 99
-    IsValidEngine():    false
-    GetName():          (null : 0x00000000)
-    GetCargoType():     255
+    IsValidEngine():    true
+    GetName():          Armoured Van
+    GetCargoType():     10
    CanRefitCargo():    false
-    GetCapacity():      -1
+    GetCapacity():      27
    GetReliability():   -1
-    GetMaxSpeed():      -1
-    GetPrice():         -1
+    GetMaxSpeed():      0
+    GetPrice():         1494
    GetMaxAge():        -1
-    GetRunningCost():   -1
+    GetRunningCost():   0
    GetPower():         -1
-    GetWeight():        -1
+    GetWeight():        30
    GetMaxTractiveEffort(): -1
-    GetVehicleType():   255
-    GetRailType():      255
+    GetVehicleType():   0
+    GetRailType():      3
    GetRoadType():      -1
    GetPlaneType():     -1
  Engine 100
@@ -5747,7 +5747,7 @@ ERROR: HasNext() is invalid as Begin() is never called
    GetRailType():      255
    GetRoadType():      -1
    GetPlaneType():     -1
-  Valid Engines:        31
+  Valid Engines:        53

 --EngineList--
  Count():             11
@@ -7093,7 +7093,7 @@ ERROR: HasNext() is invalid as Begin() is never called
  IsBuoyTile():         false
  IsLockTile():         false
  IsCanalTile():        false
-  GetBankBalance():     479851
+  GetBankBalance():     480703
  BuildWaterDepot():    true
  BuildDock():          true
  BuildBuoy():          true
@@ -7106,7 +7106,7 @@ ERROR: HasNext() is invalid as Begin() is never called
  IsBuoyTile():         true
  IsLockTile():         true
  IsCanalTile():        true
-  GetBankBalance():     450302
+  GetBankBalance():     451154

 --AIWaypointList(BUOY)--
  Count():             1
@@ -7125,7 +7125,7 @@ ERROR: HasNext() is invalid as Begin() is never called
  IsBuoyTile():         false
  IsLockTile():         false
  IsCanalTile():        false
-  GetBankBalance():     427657
+  GetBankBalance():     428509
  BuildWaterDepot():    true
  BuildDock():          true

@@ -7208,7 +7208,6 @@ ERROR: HasNext() is invalid as Begin() is never called
  ListDump:
    RailType:                0
    IsRailTypeAvailable():   true
-    GetMaxSpeed():           0

 --Road--
  Road
@@ -8047,7 +8046,7 @@ ERROR: HasNext() is invalid as Begin() is never called
    GetPopulation(): 737
    GetLocation():   6446
    GetHouseCount(): 26
-    GetRating():     6
+    GetRating():     5
  Town 11
    IsValidTown():   true
    GetName():       Fort Frindston
@@ -8082,7 +8081,7 @@ ERROR: HasNext() is invalid as Begin() is never called
    GetPopulation(): 807
    GetLocation():   42338
    GetHouseCount(): 33
-    GetRating():     6
+    GetRating():     5
  Town 16
    IsValidTown():   true
    GetName():       Kennville
@@ -8117,7 +8116,7 @@ ERROR: HasNext() is invalid as Begin() is never called
    GetPopulation(): 437
    GetLocation():   22585
    GetHouseCount(): 15
-    GetRating():     6
+    GetRating():     5
  Town 21
    IsValidTown():   true
    GetName():       Franinghead
@@ -8630,37 +8629,4 @@ ERROR: HasNext() is invalid as Begin() is never called
    GetEventType:        6
      Unknown Event
  IsEventWaiting:        false
-
--Math--
-  -2147483648 < -2147483647:   true
-  -2147483648 < -1         :   true
-  -2147483648 <  0         :   true
-  -2147483648 <  1         :   true
-  -2147483648 <  2147483647:   true
-  -2147483647 < -2147483648:   false
-  -1          < -2147483648:   false
-   0          < -2147483648:   false
-   1          < -2147483648:   false
-   2147483647 < -2147483648:   false
-  -1          >  2147483647:   false
-  -1          >  1         :   false
-  -1          >  0         :   false
-  -1          > -1         :   false
-  -1          > -2147483648:   true
-   1          >  2147483647:   false
-   1          >  1         :   false
-   1          >  0         :   true
-   1          > -1         :   true
-   1          > -2147483648:   true
-   2147483647 >  2147483646:   true
-   2147483647 >  1         :   true
-   2147483647 >  0         :   true
-   2147483647 > -1         :   true
-   2147483647 > -2147483648:   true
-   2147483646 >  2147483647:   false
-   1          >  2147483647:   false
-   0          >  2147483647:   false
-  -1          >  2147483647:   false
-  -2147483648 >  2147483647:   false
-   13725      > -2147483648:   true
 ERROR: The AI died unexpectedly.
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,156 +1,3 @@
-1.0.3-RC1 (2010-07-17)
------------------------------------------------------------------------
- Feature: [NewGRF] Textstack support for CB 38 (r20086)
- Feature: [NewGRF] Add a railtype flag to disallow level crossings per railtype (r20049)
- Change: Improve desync debugging, crash log data and the Debian packaging (by making a debug symbols package) (r20138, r20136, r20129)
- Fix: Do not scan /data and ~/data (if they happen to be your working directory). If it is the directory where your binary is located it will still scan them [FS#3949] (r20166)
- Fix: Integer comparison failed in case the difference was more than 'MAX_UINT'/2 [FS#3954] (r20162)
- Fix: [YAPP] Converting a one-way block to a path signal with trains on both sides could lead to a train crash [FS#3937] (r20156)
- Fix: [NewGRF] Improve handling of snowing of railtypes and (infra)structures on foundations [FS#3883] (r20153, r20132, r20126, r20125)
- Fix: Ships were not marked as dirty when stopping inside a depot [FS#3880] (r20142)
- Fix: Some windows ignored all hotkeys [FS#3902] (r20141, r20140, r20139)
- Fix: Do not allow building a rail track to the water using a tree-tile [FS#3695] (r20110)
- Fix: [NoAI] AITown::GetRating() returned wrong values [FS#3934] (r20103)
- Fix: Reading deleted memory when selecting a NewGRF in the content download window of which the data has not been acquired from the content server. The crash would occur after the content server's reply was processed and the ContentInfo object was replaced with another [FS#3899] (r20089, r20082)
- Fix: If after loading a savegame (including intro game) one tried to save a game (including autosave) and that failed (very) early on because it could not open the file for writing all pointers would be converted to NULLs which then causes corrupted game states [FS#3876, FS#3887, FS#3920, FS#3923] (r20087)
- Fix: gitignore and hgignore had more missing/wrong entries (r20078, r20033, r20031)
- Fix: Remove the space between 'open' and 'ttd' in the title screen (r20077)
- Fix: Road vehicles could get crashed twice in a tick [FS#3896] (r20053, r20034)
- Fix: Coloured_news_year was stored in savegames while it should be a client setting [FS#3916] (r20051)
- Fix: Crash when spectator tried to open a vehicle list without selecting any company [FS#3892] (r20041)
- Fix: Instead of loading the intro game when loading a savegame fails on the dedicated server, generate a new game [FS#3907] (r20039)
- Fix: Tram tracks did not show at level crossing with the new railtypes [FS#3911] (r20036)
- Fix: Under some circumstances you could get into an infinite loop [FS#3909] (r20035)
- Fix: The 64 bits TortoiseSVN was not always properly detected (r20029)
- Fix: Do not close the sort dropdown in the (original) vehicle list when there are no vehicles. That code is meant for the 'actions' dropdown [FS#3881] (r20014)
- Fix: When joining a company with a password you could only enter 20 characters of the password (r20012)
- Fix: Sign sorting was unstable [FS#3893] (r20009)
- Fix: Trains should also have running cost while slowing down for stop (r20006)
- Fix: [NewGRF] Stringcodes 82, 83 and 84 were not properly converted to openttd codes so they did not work (r20004)
- Fix: Clear force_proceed when entering depots and when loading, resetting of force_proceed on manual stopping did not work [FS#3878] (r19992)
- Fix: Do not show an error message when trying to start/stop a crashed plane [FS#3874] (r19953)
- Fix: Allow turning of roadvehicles while waiting in a queue (r19945)
- Fix: Disallow moving of vehicle news window [FS#3865] (r19943)
- Fix: Under some (unlucky) circumstances the wrong company would be 'current company' when changing company colour or orders [FS#3903]
-
-
-1.0.2 (2010-06-19)
------------------------------------------------------------------------
- Fix: Owner of the Waypoint View window was not properly set (r19990)
- Fix: Close list of vehicles with given oil rig in orders when the oil rig is deleted (r19956)
- Fix: Close list of vehicles with given buoy/oil rig in orders when switching company (r19955)
- Fix: Do not close list of waypoint's trains when the waypoint view is closed when it is sticky (r19952)
- Fix: Close buoy's vehicle list when the buoy is deleted [FS#3869] (r19951)
-
-
-1.0.2-RC1 (2010-06-05)
------------------------------------------------------------------------
- Feature: Translated desktop shortcut comments (r19884)
- Fix: When 'pause on new game' is set, pause the game before CleanupGeneration() to avoid conflicts with concurrent GUI code [FS#3857] (r19934)
- Fix: Pay for the rail/road when constructing tunnels, bridges, depots and stations [FS#3859, FS#3827] (r19925, r19887, r19881)
- Fix: Closing chatbox could cause glitches when news message was shown [FS#3865] (r19921)
- Fix: [YAPP] Inform the pathfinder as well about the fact that the backside of an one-way path signal can be a safe waiting point [FS#3803] (r19896)
- Fix: Allow loading savegames from the console without specifying the '.sav' extension, i.e. make it consistent with saving savegames from the console [FS#3761] (r19885)
- Fix: Dropdowns did affect positioning of new windows because they were not yet removed when the new windows were positioned [FS#3812] (r19883)
- Fix: [NoAI] AIEngine::IsValidEngine() and AIEngine::IsBuildable() returned false positives. Especially wagons of unavailable railtypes were reported available (r19880)
- Fix: Default vehicle group texts were drawn one pixel too low [FS#3851] (r19878)
- Fix: It was not possible to send all trains with common waypoint order to depot (r19876)
- Fix: Compilation for NetBSD [FS#3809, FS#3840, FS#3845] (r19874, r19859, r19853, r19781)
- Fix: If the (guessed initial) destination tile of a road vehicle was not a road stop but was a T-junction or turn, the road vehicles would jump around in circles [FS#3817] (r19873)
- Fix: When a network connection gets lost and a game with AIs was loaded the client might crash due to the AIs not being loaded while the game loop is executed [FS#3819] (r19869)
- Fix: Use non-breaking spaces for currency pre-/postfixes (r19867)
- Fix: Crash when changing/viewing locale settings in the console [FS#3830] (r19865, r19864, r19863, r19862)
- Fix: Drawing fallback sprites for unavailable NewGRF waypoints failed (r19852)
- Fix: Ensure that both texts of the NewGRF gui download button fit (r19823)
- Fix: Kicking clients by IP did not work [FS#3784] (r19818)
- Fix: Compilation with MinGW GCC 4.5.0 and UNICODE (r19787)
- Fix: If a waypoint is immediately followed by a path signal a reservation would be made from that path signal before the waypoint is marked passed. As a result the order to go to the waypoint is used to reserve the path after the waypoint and as such trains get lost [FS#3770] (r19784)
- Fix: NULL pointer deference when testing relative scope *action2 on an unbuilt engine [FS#3828] (r19782)
- Fix: Crash on too long paths [FS#3807] (r19780, r19779, r19778, r19777, r19776)
- Fix: MP_VOID tiles shall have no tropic zone [FS#3820] (r19769)
- Fix: Half-desert tiles would never revert back to clear tiles (r19768)
- Fix: Height in smallmap was different from measured heights [FS#3808] (r19767)
- Fix: [NewGRF] Vehicle var 43 missed AI information in purchase list (r19761)
- Fix: Blocked roadvehicles should first check whether they are still blocked before accelerating again, instead of continuous starting/stopping (r19755)
- Fix: Try harder to find a suitable font that can be loaded, i.e. while searching for a suitable font test whether you can open it [FS#3740] (r19753)
- Fix: Make sure the chat area fits in the default window size; if you want it larger, you can always change/override it in the config file [FS#3798] (r19751)
- Fix: [NewGRF] Industry var 0x43 is not 'safe' during callbacks 22 and 38 either (r19750)
- Fix: [NewGRF] Possible divide-by-zero if a NewGRF checked industry var 42 while the production level was 0 (r19749)
- Fix: Do not recenter usually centered windows when resizing main window or changing language, if they have been moved/resized before [FS#3675] (r19746)
- Fix: The GUI is controlled by _local_company, not _current_company (r19745)
- Fix: NewGRFs could access map bits of not yet constructed industries and houses during construction callbacks (r19748, r19743)
- Fix: [NewGRF] Passing some invalid data to industry variable 67/68 could cause a crash (r19713)
- Fix: Check for industry availability more thoroughly and cancel object placement when selecting not available industries [FS#3787] (r19701)
- Fix: Avoid showing building toolbars behind the main toolbar when the 'Link landscape toolbar' setting is active [FS#3781] (r19696)
- Fix: Under some circumstances the player's name could be empty (r19693)
- Fix: Do not show an error message when trying to give another client an amount of 0 money [FS#3779] (r19684)
- Fix: Do not display an error message when double clicking on a vehicle in the 'available vehicles'-window (r19669)
- Change: Name invalid engines, cargos and industries 'invalid', if the player removed the supplying NewGRFs, hide invalid engines from the purchase list (r19879, r19877)
-
-
-1.0.1 (2010-05-01)
------------------------------------------------------------------------
- Fix: Crash when using restart via rcon (r19722)
- Fix: Leaking a file descriptor [CVE-2010-0406] [FS#3785] (r19695)
- Fix: Crash when the music/graphics metadata files were unreadable [FS#3774] (r19674)
-
-
-1.0.1-RC2 (2010-04-22)
------------------------------------------------------------------------
- Fix: Desync when joining the game because of using the wrong variable (r19687)
- Fix: Truncated archives were not detected when using zlib 1.2.3. This also fixes zlib 1.2.4 compatibility, zlib 1.2.5 is bugfree (r19686)
- Fix: Towns with 3x3 and 2x2 road layouts could not expand (r19683)
- Fix: When joining a MP game all clients with company ID > 0 would be shown as if they were a spectator [FS#3775] (r19680)
- Fix: Client status was shown incorrect in the console (r19678)
-
-
-1.0.1-RC1 (2010-04-17)
------------------------------------------------------------------------
- Feature: [NewGRF] Support for extended text code 0x9A 11, print qword (r19570)
- Feature: Give more detailed error message when trying to build a too long bridge (r19561)
- Feature: Add rail speed limit to land area information window (r19556, r19434)
- Add: [NoAI] AIRail::GetMaxSpeed(RailType) to get the speed limit of railtypes (r19591)
- Change: Sync Debian packaging updates from Debian, but keep building a single package (r19572)
- Fix: Crash of a dedicated server if the null blitter is overridden and (after a while) there is no company 0 on new year anymore [FS#3749] (r19664)
- Fix: In rare cases, update of signals could be missed (r19663)
- Fix: Various improvements of command handling, missing error messages, improper validation causing crashes [CVE-2010-0402] [FS#3748] (r19658, r19657, r19656, r19655, r19654, r19637, r19633, r19621, r19616, r19605, r19604)
- Fix: Industry generation failed for large maps and lots of industry types (r19652, r19643)
- Fix: When a company is sold, move connected clients to spectators [FS#3745] (r19651)
- Fix: A client would not be properly moved when moved while joining, e.g. when entering a company's password. This caused the client to be in the wrong company (according to the rest of the clients) and the client being kicked on the first command [FS#3760] (r19648)
- Fix: Trains loaded above the original IDs did not have a default railtypelabel assigned to them, causing them to be unavailable. Could cause desyncs if the multiplayer game was not started from a savegame [FS#3768] (r19647)
- Fix: Do not allow building cacti outside of the desert or rain forest trees outside of the rain forest area. This to prevent people from thinking planting rain forest trees makes the rain forest bigger and thus adds more place to build a lumber mill [FS#3728] (r19644, r19635, r19634)
- Fix: Desync when taking over companies (r19636)
- Fix: Chat message caused glitch when rejoining a network game [FS#3757] (r19629)
- Fix: Desync when a command is received and in the queue while a client starts joining, i.e. save the game state. This can happen in two ways: with frame_freq > 1 a command received in a previous frame might not be executed yet or when a command is received in the same frame as the join but before the savegame is made. In both cases the joining client would not get all commands to get in-sync with the server (and the other clients) (r19620)
- Fix: Company related graphs were not updated correctly after changing the company colour [FS#3763] (r19615)
- Fix: Possible invalid read when server moves client to spectators before he finishes joining [FS#3755] (r19613)
- Fix: Crash when opening a savegame with a waypoint from around 0.4.0 [FS#3756] (r19612)
- Fix: Improve joining behaviour; kicking clients when entering passwords that was just cleared, 'connection lost' for people failing the password, access restriction circumvention [CVE-2010-0401] [FS#3754] (r19610, r19609, r19608, r19607, r19606)
- Fix: Desync debugging; false positives in the cache validity checks and saving/loading the command stream (r19619, r19617, r19602, r19601, r19600, r19596, r19593, r19592, r19589, r19587, r19586)
- Fix: Presence of online content was not properly updated after download due to duplicate slashes in the path (r19600)
- Fix: [NewGRF] Setting industry prop 0x24 to 0 caused empty station names (r19590)
- Fix: Crash when pressing 'h' (non-stop) in the order window of a ship or aircraft [FS#3744] (r19584)
- Fix: Graphs were not properly updated when going toggling keys (i.e. companies) (r19574)
- Fix: The timetable button was not automatically raised [FS#3739] (r19571)
- Fix: [NewGRF] Possible buffer underflow in NewGRF string code (r19569)
- Fix: [NewGRF] Do not return a random colour for unowned industries in var 45; TTDPatch does not seem to set the colour data in that case either and it could lead to desyncs (r19566)
- Fix: Window::OnResize() was not always called while resizing a window causing incorrect windows [FS#3730] (r19563, r19558)
- Fix: Bridge build error message should not show the same message twice (r19560, r19559)
- Fix: [NewGRF] During NewGRF loading, store rail type labels in temporary data and process after loading has finished. This avoids deactivated rail vehicles being reactivated if the climate property is set after the rail type property (r19557, r19502)
- Fix: Improperly scaled cargo payment graph when having lots of cargo (r19550, 19543)
- Fix: [NewGRF] Properties set before property 08 (house, industry, industry tiles) should be ignored, not trigger the NewGRF to be disabled [FS#3725] (r19547)
- Fix: Sorting industries by production was broken for NewGRF industries (r19538)
- Fix: Vehicle details window did not resize correctly after refitting a road vehicle to a longer variant [FS#3720] (r19533)
- Fix: Prevent drawing industries disabled at the smallmap as land tiles when they are built on water (r19523)
- Fix: Tunnels, bridges and roadstops are build with only one roadtype (r19506)
- Fix: Remove same_industry_close setting did not do what it said and caused NewGRF trouble (r19499)
- Fix: Keep number padding intact when cloning vehicle names [FS#3710] (r19498)
- Fix: [NewGRF] Bytes and words get sign-extended for temporary/persistent storage (r19497)
- Fix: Stop reducing the size of the vehicle list after selecting a vehicle with a long description (r19480)
- Fix: Implement custom sound effect for helicopter take-off [FS#3668] (r19364)
- Update: Plural type of Slovak (r19452)
-
-
 1.0.0 (2010-04-01)
 ------------------------------------------------------------------------
 - Fix: Network clients would crash while connecting to a server with AIs (r19526)
@@ -176,7 +23,7 @@
 - Fix: [NoAI] The AI Debug window did not open if an AI or library fails to compile when loading a savegame [FS#3669] (r19395)
 - Fix: One could not level the whole map anymore at once (r19392)
 - Fix: Only show the 'No AIs available' error message when explicitly changing the number of AI opponents [FS3676] (r19389)
- Fix: [NoAI] When reloading a savegame, an AI failing to compile could trigger (trying) to read the not yet loaded information of another AI via the AI Debug window and its 'open with the most recently used AI' feature [FS#3666] (r19388)
+- Fix: [NoAI] When reloading a savegame, an AI failing to compile could trigger (trying) to read the not yet loaded information of another AI via the AI Debug window and its "open with the most recently used AI" feature [FS#3666] (r19388)
 - Fix: Close all orders windows when switching companies [FS#3671] (r19387)
 - Fix: [IPv6] Netmask calculations were wrong if cidr >= 32 [FS#3684] (r19385)
 - Fix: Overbuilding bridges, rail stations did not properly update PBS reservation [FS#3680] (r19384, r19383)
@@ -245,7 +92,7 @@
 - Fix: Crash when a baseset has an empty metadata field (r19095)
 - Fix: Possible read/write after free when the client triggered the server to close the connection [FS#3599] (r19072)
 - Fix: Remove Bidi control characters from the reordered text so they are not drawn [FS#3604] (r19067)
- Fix: [NewGRF] Settings that are part of the 'TTDPatch flags' can cause desyncs if they are changed in network games (r19066)
+- Fix: [NewGRF] Settings that are part of the "TTPatch flags" can cause desyncs if they are changed in network games (r19066)
 - Fix: When banning yourself via rcon do not send the 'command response' to the client as the connection has already been terminated [FS#3598] (r19054)
 - Fix: Mass stopping/starting/autoreplacing gave empty errors when there were no vehicles [FS#3577] (r19024)
 - Fix: City airport introduction date had become 5 years later (r19023)
@@ -502,7 +349,7 @@
 - Fix: Some inconsistencies with the difficulty settings in the scenario editor. Also re-enable changing some difficulty settings (e.g. max loan) in the scenario editor [FS#3219] (r17644)
 - Fix: Do not accept cargo produced in the same industry; generalise and improve the check used only for valuables (r17437)
 - Fix: Pay only for cargo actually delivered, not for all cargo unloaded at station; can differ with 'stockpiling' industries (r17436)
- Fix: Improve movement of aircraft; do not make turns bigger than 45 degrees while in flight, do not move while turning on the ground (r17415, r17405)
+- Fix: Improve movement of aircraft; do not make turns bigger then 45 degrees while in flight, do not move while turning on the ground (r17415, r17405)
 - Fix: Crash in order GUI when changing some orders with both the mouse and keyboard at the exact same time [FS#2859] (r17384)
 - Fix: Trains would not show smoke if the load/unload counter was not 0, though there does not seem to be a reason to check that variable anyhow anymore [FS#3162] (r17352)
 - Fix: One was not offered to take over bankrupt companies anymore; caused by the introduction NoAI, although NewAI had the same problem too [FS#2769] (r17345)
@@ -1692,7 +1539,7 @@
 - Codechange: Add new vehicle hash table for collision detection and finding vehicles on a tile. The hash area scanned is far smaller than the old hash table, which is now used for viewport updates only. This should give a significant performance improvement for games with many vehicles (r10111)
 - Codechange: Do not redraw all station tiles when cargo is added or removed if the station has no custom graphics (r10062)
 - Codechange: Add some support for NewGRF var 7D, temporary storage array (r9707)
- Codechange: Add support for returning 'TTDPatch variables' (Action D) (r9701)
+- Codechange: Add support for returning 'ttdpatch variables' (Action D) (r9701)
 - Codechange: Implement NewGRF callback 36, which allows changing of various properties which were previously static (r9671 and several others)
 - Codechange: Add support for multiple 'base' directories for NewGRF searching (r9560)
 - Codechange: Implement actions 1/2/3 for cargoes, callback handler and custom icon sprites (rmany)
@@ -2462,7 +2309,7 @@
 - Fix: Incorrect validating of tree-planting command which can allow a buffer-overflow (r3446)
 - Fix: [NewGRF] When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf) (r3449)
 - Fix: You could not remove an item from a list-type of config ingame from the configuration file (r3475)
- Fix: [NewGRF] Always reinitialize the TTDPatch flags as patch settings may have changed (r3486)
+- Fix: [NewGRF] Always reinitialize the ttdpatch flags as patch settings may have changed (r3486)
 - Fix: Price for demolishing a bridge was dependent on orientation and map size (r3487)


@@ -2655,7 +2502,7 @@
 - Fix: [Network] 'kick 1' did crash dedicated servers
 - Fix: [Network] A server no longer crashes when a client sends an invalid DoCommand, but drops the client instead
 - Fix: [Network] Added packet protection. No longer a client or server
- Fix: [Network] Bug in bind system. Advertising failed on systems with more than 1 ip, and server_bind active to one of them
+- Fix: [Network] Bug in bind system. Advertising failed on systems with more then 1 ip, and server_bind active to one of them
 - Fix: [Network] Disabled 'money-cheat' (read: bug which could give people a lot of money)
 - Fix: [SDL] Now the binary never links to SDL if DEDICATED is set
 - Fix: [Windows] Somehow mousewheel was disabled on windows using SDL; reenabled again
--- a/config.lib
+++ b/config.lib
@@ -11,7 +11,7 @@ log() {
 }

 set_default() {
-	released_version="1.0.3-RC1"
+	released_version="1.0.0"

 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -55,8 +55,8 @@ set_default() {
 	enable_static="1"
 	enable_translator="0"
 	enable_unicode="1"
-	enable_assert="1"
-	enable_strip="0"
+	enable_assert="0"
+	enable_strip="1"
 	enable_universal="1"
 	enable_osx_g5="0"
 	enable_cocoa_quartz="1"
@@ -2304,13 +2304,6 @@ detect_library() {
 		if [ -z "$res" ]; then
 			log 2 "  trying /usr/local/include/$4$5... no"
 		fi
-		if [ -z "$res" ] && [ "$os" = "NETBSD" ]; then
-			eval "$2=`ls -1 /usr/pkg/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
-			eval "res=\$$2"
-			if [ -z "$res" ]; then
-				log 2 "  trying /usr/pkg/include/$4$5... no"
-			fi
-		fi

 		eval "res=\$$2"
 		if [ -n "$res" ] && ( [ -n "$force_static" ] || ( [ "$enable_static" != "0" ] && [ "$os" != "OSX" ] ) ); then
@@ -3161,7 +3154,6 @@ showhelp() {
 	echo "  --with-midi=midi               define which midi-player to use"
 	echo "  --with-midi-arg=arg            define which args to use for the"
 	echo "                                 midi-player"
-	echo "  --with-libtimidity             enables libtimidity support"
 	echo "  --with-allegrol[=allegro-config]"
 	echo "                                 enables Allegro video driver support"
 	echo "  --with-cocoa                   enables COCOA video driver (OSX ONLY)"
--- a/docs/multiplayer.txt
+++ b/docs/multiplayer.txt
@@ -23,7 +23,7 @@ Multiplayer Manual for OpenTTD (0.3.5)
 - If you want to see which servers all online on the Internet, click on 'Internet'
    and 'Find Server'

- - If there were more than one server
+ - If there were more then one server
   - select one in the list below the buttons
   - click on 'join game'

--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2010-07-17
-Release version: 1.0.3-RC1
+Last updated:    2010-04-01
+Release version: 1.0.0
 ------------------------------------------------------------------------


@@ -34,11 +34,10 @@ that you can find at: http://bugs.openttd.org
 If the bugs are closed but still listed here it means that the bug is fixed
 and that the nightlies and next major release will not have that bug.

- 3938	DirectMusic not properly resetting state causing music to sound wrong
- 3935	Under some circumstances two road vehicles can leave road stop simultaniously
- 3816	Console text does not always fit at 640x480
- 3746	Console output with right-to-left texts in left-to-right texts is not correct
+- 3725	[NewGRF] Incorrect handling of some house action0s
+- 3720	When refitting to a vehicle with more trailers, the details view is not made bigger
 - 3714	Some corrupted savegames can cause crashes
+- 3695	Behaviour inconsistency building railway/road down towards water
 - 3651	[OSX] Crash when selecting full screen
 - 3648	[OSX] Crash when selecting music
 - 3637	Second highest competing station gets penalised twice
@@ -178,11 +177,3 @@ OpenTTD not properly resizing with SDL on X [FS#3305]
 	Window managers that are known to exhibit this behaviour are KDE's
 	and GNOME's. With the XFCE's and LXDE's window managers the resize
 	event is sent when the user releases the mouse.
-
-Content files not properly extracted with zlib 1.2.3.5-1.2.4 [FS#3753]
-	With zlib 1.2.3.5 up to and including 1.2.4 the function "gzeof",
-	which tells when we read the whole file, is broken in such a way
-	that OpenTTD thinks it has extracted and written the whole file
-	while the last few hundred/thousand bytes are not extracted yet.
-	This causes problems for everything that is downloaded from the
-	online content system when using one of those versions of zlib.
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -4,8 +4,8 @@
 Type=Application
 Version=1.1
 Name=!!MENU_NAME!!
+Comment=A clone of Transport Tycoon Deluxe
 Icon=openttd
 Exec=!!TTD!!
 Terminal=false
 Categories=!!MENU_GROUP!!
-Comment=A clone of Transport Tycoon Deluxe
--- a/media/openttd.desktop.translation.awk
+++ b/media/openttd.desktop.translation.awk
@@ -1,15 +0,0 @@
-# $Id$
-
-# This file is part of OpenTTD.
-# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
-# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Awk script to automatically generate a single comment line
-# for a translated desktop shortcut. If it does not exist there
-# is no output.
-#
-
-/##isocode/ { lang = $2; next }
-/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next}
--- a/os/debian/NEWS
+++ b/os/debian/NEWS
@@ -1,25 +0,0 @@
-openttd (1.0.0~rc3-2) unstable; urgency=low
-
-    The openttd package has been moved from contrib into main. Since the
-    OpenGFX free graphics set has been packaged for Debian, one can now run
-    OpenTTD without needing any of the resources from the original game
-    (though the original resources are still supported).
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:09:35 +0100
-
-openttd (0.7.0-1) unstable; urgency=low
-
-    Handling of AI players has changed in 0.7.0. This package no longer
-    contains any AI players, so playing against the computer is not possible
-    out of the box any longer. However, you can easily download AI players
-    through the new "Content Downloading Service", after which playing with
-    computer players is possible.
-
-    Loading old savegames with computer players is supported (AI players will
-    be converted according to the current AI settings), but at this moment
-    there are no AIs that completely handle any existing infrastructure built
-    by the old AI, so starting a new game might be more fun (especially since
-    most of the new AIs are a lot less erratic).
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 13 Apr 2009 15:11:20 +0200
-
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -2,38 +2,28 @@ OpenTTD for Debian
 ------------------

 To properly play this game, you need a base graphics and sound set.
-Currently, the graphics, sound and music files from the original
-Transport Tycoon Deluxe game (Windows and DOS versions) are supported,
-as well as the free graphics replacement set "OpenGFX", sound
-replacement set "OpenSFX" (which is in non-free due to a restrictive
-license) and the free music replacement set "OpenMSX".
+Currently, the graphics files from the original Transport Tycoon Deluxe
+game (Windows and DOS versions) are supported, as well as the free
+graphics replacement set "OpenGFX".

-Normally, installing the openttd package should automatically install
-openttd-opengfx as well, allowing OpenTTD to run out of the box. If you
-want sound, you'll have to enable non-free sources and install the
-openttd-opensfx package manually (or install the original Transport
-Tyccon Deluxe sound files).
+See readme.txt, section 4.1 for instructions on how to install these
+files.

-The easiest way to install the OpenMSX music files is to use the in-game
-content download system, which should offer the latest version of the
-music files.
+-Music
+	For in game music (optional), you should copy all files in the gm/
+	subdir of your ttd installation to /usr/share/games/openttd/gm.  You
+	should also install timidity and a soundfont (freepats is packaged in
+	Debian and works out of the box).

-To find out how to install the original Transport Tycoon Deluxe graphics
-sound files and music files, see readme.txt, section 4.1.
-
-Playing Music
-	In addition to installing a music set (see above), you'll also need
-	to install the timidity midi player, available in the timidity
-	package.
-
-	Remember that not all audio devices support multiple audiostreams
-	(music and sound), so you might have to use alsa software mixing or
-	pulseaudio.
+	Don't forget to use -m extmidi if you want music, and if you have
+	problems, remember that not all audio devices support multiple
+	audiostreams (music and sound), so you might have to use alsa
+	software mixing or pulseaudio.

 -Scenarios
 	There are no scenarios included in this release. Scenarios can be
-	downloaded using OpenTTD's content service, which is available from
-	OpenTTD's main menu. If you have obtained a scenario through other
+	downloaded using openttd's content service, which is available from
+	openttd's main menu. If you have obtained a scenario through other
 	means, you can place it either in your ~/.openttd/scenario directory
 	or in the system-wide /usr/share/games/openttd/scenario directory.

--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,196 +1,164 @@
-openttd (1.0.3~rc1-0) unstable; urgency=low
+openttd (1.0.0) unstable; urgency=low

-  * New upstream release 1.0.3-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jun 2010 17:37:21 +0000
-
-openttd (1.0.2-0) unstable; urgency=low
-
-  * New upstream release 1.0.2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 19 Jun 2010 18:36:21 +0000
-
-openttd (1.0.2~rc1-0) unstable; urgency=low
-
-  * New upstream release 1.0.2-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 05 Jun 2010 23:36:21 +0000
-
-openttd (1.0.1-0) unstable; urgency=low
-
-  * New upstream release 1.0.1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 May 2010 00:00:00 +0200
-
-openttd (1.0.1~rc2-0) unstable; urgency=low
-
-  * New upstream release 1.0.1-RC2
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 21 Apr 2010 21:36:21 +0200
-
-openttd (1.0.1~rc1-0) unstable; urgency=low
-
-  * New upstream release 1.0.1-RC1
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 17 Apr 2010 23:36:21 +0000
-
-openttd (1.0.0-1) unstable; urgency=low
-
-  * [30a2162] New upstream release 1.0.0. (Closes: #570104)
-  * [102698a] Make openttd-wrapper work with older mktemp versions.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 02 Apr 2010 23:36:21 +0200
-
-openttd (1.0.0~rc3-2) unstable; urgency=low
-
-  * [279c5ef] Recommend openttd-opengfx and suggest openttd-opensfx.
-  * [9330ad7] Update README.Debian concerning music files.
-  * [07bde24] Move openttd from contrib to main. (Closes: #560810)
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 13:16:32 +0100
-
-openttd (1.0.0~rc3-1) unstable; urgency=low
-
-  * [412d153] New upstream release 1.0.0~rc3.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 10:09:33 +0100
-
-openttd (1.0.0~rc2-1) unstable; urgency=low
-
-  * [9c99af4] New upstream release 1.0.0~rc2.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Mar 2010 12:22:28 +0100
-
-openttd (1.0.0~rc1-1) unstable; urgency=low
-
-  * [fe4eb51] New upstream release 1.0.0~rc1.
-  * [6aa2be0] Note that the embedded md5 implementation has a different
-    license.
-  * [39eb336] Remove lintian override for empty gm directory.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 13:00:53 +0100
-
-openttd (1.0.0~beta4-1) unstable; urgency=low
-
-  * [6718224] New upstream release 1.0.0~beta4.
-  * [7b0fa8d] Remove some more docs that we don't want in the package.
-  * [bb9d744] Use liblzo2 instead of an embedded minilzo version.
-  * [949c06b] Explicitly disable iconv support.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 19 Feb 2010 12:59:27 +0100
-
-openttd (0.7.5-4) unstable; urgency=low
-
-  * [174d0b1] Don't use deprecated < in Replaces.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 15 Feb 2010 00:35:33 +0100
-
-openttd (0.7.5-3) unstable; urgency=low
-
-  * [d12fc5a] Make openttd-data replace openttd (< 0.7.5-2).
-    (Closes: #569679)
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 14 Feb 2010 16:56:31 +0100
-
-openttd (0.7.5-2) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * [fbab21d] Switch to source format 3.0 (quilt).
-  * [85c0c7d] No longer check for (and complain about missing) datafiles
-    on installation and upgrades. (Closes: #524651, 562574)
-  * [827eb61] Split the architecture independent data into openttd-data.
-    (Closes: #492462)
-  * [6fbd9c7] Update README.Debian.
-  * [76a5148] Support cross compilation. (Closes: #550951)
-  * [2005bf8] Simplify the rules file, make debhelper do more stuff.
-  * [fc0500e] Remove some configure arguments.
-  * [8ca38bb] Explicitly enable or disable all of the dependencies.
-  * [e38fb3e] Let the upstream Makefile install documentation.
-  * [5954fcf] Update the watch file to the new upstream url scheme.
-  * [7249594] Fix typo in copyright file.
-  * [660fb61] Bump the Standards-Version to 3.8.4, with no changes
-    required.
-  * [f94ab89] Move the packaging git repository to git.debian.org.
-
- -- Jordi Mallach <jordi@debian.org>  Tue, 09 Feb 2010 21:40:24 +0100
-
-openttd (0.7.5-1) unstable; urgency=high
-
-  * [cdcb73a] Imported Upstream version 0.7.5. This release fixes
-    CVE-2009-4007.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 00:55:45 +0100
-
-openttd (0.7.4-1) unstable; urgency=low
-
-  * [a2c297b0] Imported Upstream version 0.7.4
-  * [0232a645] Make Debian-specific patches executable.
-  * [76be04b] Switch the Debian packaging to git.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 15 Dec 2009 22:11:52 +0100
-
-openttd (0.7.3-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release
-  * Use printf instead of echo -en in openttd-wrapper to make it POSIX
-    compatible (Closes: #547758).
-  * Remove three patches that are now included in upstream.
-
- -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 22:52:59 +0200
-
-openttd (0.7.2-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
-  * New upstream release
-  * Bump Standards-Version to 3.8.3, with no changes required.
-  * Clean up the rules file a bit and add some lintian overrides.
-  * Explain why openttd is in contrib (Closes: #539381).
-  * Add the DM-Upload-Allowed control field.
-  * Re-add dpatch infrastructure.
-  * Fix the copyright file, since upstream only allows GPLv2, not later
-    versions.
-  * Add a section to the copyright file on the different license used by the
-    "Squirrel" programming language, which is shipped with OpenTTD since
-     0.7.0.
-  * Backport upstream r17226, which removes the deprecated Encoding entry from
-    the .desktop file.
-  * Add a wrapper script for openttd, which captures any stderr output and
-    displays it when openttd returns an error code (Closes: #533557).
-  * Recommend x11-utils, since we use xmessage for displaying errors. Don't
-    depend on it, since openttd will still run fine without it, you just won't
-    see any errors.
-  * Backport upstream r17227 and r17229, which prevents terminal escape codes
-    from ending up in the captured error output.
-  * Backport upstream r17240, which improves stderr output when files are
-    missing or corrupt.
-
- -- Jordi Mallach <jordi@debian.org>  Fri, 21 Aug 2009 15:27:26 +0200
-
-openttd (0.7.1-1) unstable; urgency=low
-
-  [ Matthijs Kooijman ]
  * New upstream release.
-  * Link against libicu to enable right-to-left language support.

- -- Jordi Mallach <jordi@debian.org>  Tue, 09 Jun 2009 21:46:28 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Apr 2010 00:01:02 +0200

-openttd (0.7.0-1) unstable; urgency=low
+openttd (1.0.0~RC3) unstable; urgency=low

-  [ Matthijs Kooijman ]
  * New upstream release.
-  * Remove Debian specific desktop file, upstream provides one now.
-  * Add debian/watch file.

-  [ Jordi Mallach ]
-  * Bump Standards-Version to 3.8.1, with no changes required.
-  * Move to debhelper compat 7. Bump Build-Depends accordingly.
-  * Use dh_prep.
-  * Add "set -e" to config script.
-  * Remove a few extra doc files that get installed by upstream Makefile.
-  * Add more complete copyright information.
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Mar 2010 00:01:02 +0100

- -- Jordi Mallach <jordi@debian.org>  Wed, 15 Apr 2009 18:22:10 +0200
+openttd (1.0.0~RC2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Mar 2010 00:01:02 +0100
+
+openttd (1.0.0~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 18 Feb 2010 00:01:02 +0100
+
+openttd (1.0.0~beta4) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 04 Feb 2010 18:36:02 +0100
+
+openttd (1.0.0~beta3) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Jan 2010 00:01:02 +0100
+
+openttd (1.0.0~beta2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 05 Jan 2010 21:36:51 +0100
+
+openttd (1.0.0~beta1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:01:01 +0100
+
+openttd (0.7.5) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 20:52:34 +0100
+
+openttd (0.7.5~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Dec 2009 19:28:37 +0100
+
+openttd (0.7.4) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 01 Dec 2009 01:23:45 +0100
+
+openttd (0.7.4~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Nov 2009 16:30:07 +0100
+
+openttd (0.7.3) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 01 Oct 2009 12:35:47 +0200
+
+openttd (0.7.3~RC2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Sep 2009 21:30:43 +0200
+
+openttd (0.7.3~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 13 Sep 2009 10:25:56 +0200
+
+openttd (0.7.2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 01 Aug 2009 00:19:43 +0200
+
+openttd (0.7.2~RC2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 21 Jul 2009 20:25:56 +0200
+
+openttd (0.7.2~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 15 Jul 2009 22:25:56 +0200
+
+openttd (0.7.1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 09 Jun 2009 01:34:56 +0200
+
+openttd (0.7.1~RC3) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Jun 2009 15:34:56 +0200
+
+openttd (0.7.1~RC2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 21 Mar 2009 14:34:56 +0200
+
+openttd (0.7.1~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 11 Mar 2009 17:34:56 +0200
+
+openttd (0.7.0) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Apr 2009 13:37:42 +0000
+
+openttd (0.7.0~RC2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 23 Mar 2009 00:42:00 +0200
+
+openttd (0.7.0~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Mar 2009 00:07:00 +0200
+
+openttd (0.7.0~beta2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Tue, 10 Mar 2009 00:33:05 +0100
+
+openttd (0.7.0~beta1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Feb 2009 23:07:05 +0100

 openttd (0.6.3-1) unstable; urgency=low

@@ -199,7 +167,7 @@ openttd (0.6.3-1) unstable; urgency=low

  [ Jordi Mallach ]
  * Add Spanish Debconf template translation, after fixing its corrupted
-    encoding (thanks, Germana Oliveira, closes: #499214).
+    encoding.

 -- Jordi Mallach <jordi@debian.org>  Thu, 02 Oct 2008 16:59:03 +0200

--- a/os/debian/control
+++ b/os/debian/control
@@ -1,10 +1,9 @@
 Source: openttd
-Section: games
+Section: contrib/games
 Priority: optional
 Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
 Uploaders: Jordi Mallach <jordi@debian.org>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzo2-dev
+Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, liblzo2-dev, libicu-dev
 Standards-Version: 3.8.4
 Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
 Vcs-Git: git://git.debian.org/collab-maint/openttd.git
@@ -13,25 +12,12 @@ Homepage: http://www.openttd.org/
 Package: openttd
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: openttd-opengfx, x11-utils
 Replaces: openttd-data
 Conflicts: openttd-data
-Suggests: openttd-opensfx, timidity, freepats
+Suggests: timidity, freepats
 Description: reimplementation of Transport Tycoon Deluxe with enhancements
 OpenTTD is a reimplementation of the Microprose game "Transport
- Tycoon Deluxe" with lots of new features and enhancements.
- .
- OpenTTD is playable with the free graphics files from the openttd-opengfx
- package and optional sound files from the openttd-opensfx package (which is in
- non-free). Alternatively, OpenTTD can use the graphics files from the original
- Transport Tycoon Deluxe game (See README.Debian on how to set this up).
-
-Package: openttd-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: openttd (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for openttd
- This package contains the debugging symbols for OpenTTD, the reimplementation
- of the Micropose game "Transport Tycoon Deluxe" with lots of new features and
- enhancements.
+ Tycoon Deluxe" with lots of new features and enhancements. The data
+ files of the original Transport Tycoon Deluxe for Windows are
+ mandatory to play the game. They must be manually copied to the game
+ data directory (see README.Debian for details).
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -1,6 +1,11 @@
 This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
 on Wed, 15 Sep 2004 00:24:01 +0200.

+This package is not part of the main Debian GNU/Linux distribution, but
+uploaded to the contrib section. This is because the openttd program is
+non-functional by itself, it needs (non-free) graphical and sound
+resources from the Transport Tycoon Deluxe game to work.
+
 Upstream author: Ludvig Strigeus (ludde) and many others.
 Upstream homepage: http://www.openttd.org

@@ -54,24 +59,3 @@ language, which is shipped under the following license:

 		3. This notice may not be removed or
 		altered from any source distribution.
-
-This package contains an implementation of the md5 hash algorithm, which
-is shipped under the following license:
-
-	Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-
-	This software is provided 'as-is', without any express or implied
-	warranty.  In no event will the authors be held liable for any damages
-	arising from the use of this software.
-
-	Permission is granted to anyone to use this software for any purpose,
-	including commercial applications, and to alter it and redistribute it
-	freely, subject to the following restrictions:
-
-	1. The origin of this software must not be misrepresented; you must not
-	   claim that you wrote the original software. If you use this software
-	   in a product, an acknowledgment in the product documentation would be
-	   appreciated but is not required.
-	2. Altered source versions must be plainly marked as such, and must not be
-	   misrepresented as being the original software.
-	3. This notice may not be removed or altered from any source distribution.
--- a/os/debian/gbp.conf
+++ b/os/debian/gbp.conf
@@ -1,13 +0,0 @@
-[DEFAULT]
-# Use pristine-tar
-pristine-tar = True
-
-[git-dch]
-# We use metaheaders in commit messages.
-meta = True
-# Put git commit ids in the debian changelog.
-id-length = 7
-
-[git-import-orig]
-# Use a custom commit message for upstream imports.
-import-msg = New upstream release %(version)s.
--- a/os/debian/openttd-wrapper
+++ b/os/debian/openttd-wrapper
@@ -2,10 +2,8 @@
 # This is a wrapper script that checks openttd's exit status and
 # displays its stderr output

-# Get a file to capture stderr to. Use the deprecated -t option, so this
-# works on the old mktemp from the mktemp package (which has been
-# replaced by the version from the coreutils package).
-TMPFILE=`mktemp -t openttd.errout.XXXXXXXXX`
+# Get a file to capture stderr to
+TMPFILE=`mktemp --tmpdir openttd.errout.XXXXXXXXX`

 if [ ! -w "$TMPFILE" ]; then
 	xmessage "Could not create temporary file for error messages. Not starting OpenTTD."
--- a/os/debian/patches/run-openttd-wrapper.patch
+++ b/os/debian/patches/run-openttd-wrapper.patch
@@ -1,20 +0,0 @@
-From: Matthijs Kooijman <matthijs@stdin.nl>
-Subject: Use a wrapper script for running openttd
-
-The wrapper script captures stderr from openttd and displays this in
-case of an error. This patch makes the the .desktop file call the
-wrapper instead of the openttd binary directly.
-
-Index: media/openttd.desktop.in
-===================================================================
--- a/media/openttd.desktop.in	(revision 20124)
-+++ b/media/openttd.desktop.in	(working copy)
-@@ -5,7 +5,7 @@
- Version=1.1
- Name=!!MENU_NAME!!
- Icon=openttd
-Exec=!!TTD!!
-+Exec=/usr/share/games/openttd/openttd-wrapper
- Terminal=false
- Categories=!!MENU_GROUP!!
- Comment=A clone of Transport Tycoon Deluxe
--- a/os/debian/patches/series
+++ b/os/debian/patches/series
@@ -1 +0,0 @@
-run-openttd-wrapper.patch
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -17,7 +17,7 @@ endif
 # to be explicit about the dependencies, in case we're not running in a
 # clean build root.
 override_dh_auto_configure:
-	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --without-iconv --disable-strip CFLAGS="$(CFLAGS) -g"
+	./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-lzo2 --with-sdl --with-png --with-freetype --with-fontconfig --with-icu

 # Do some extra installation
 override_dh_auto_install:
@@ -41,7 +41,3 @@ override_dh_auto_test:
 # target, while there isn't.
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) mrproper
-
-# We want to strip the debug informatiton into the -dbg package.
-override_dh_strip:
-	dh_strip --dbg-package=openttd-dbg
--- a/os/debian/source/format
+++ b/os/debian/source/format
@@ -1 +0,0 @@
-3.0 (quilt)
--- a/os/debian/watch
+++ b/os/debian/watch
@@ -1,5 +0,0 @@
-version=3
-
-options=downloadurlmangle=s/(.*)\/index.html$/\1\/openttd-\1-source.tar.gz/ \
-http://master.binaries.openttd.org/releases/ \
-(\d+(?:\.\d+)*)/index.html
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
@echo off

-set OPENTTD_VERSION=1.0.3
+set OPENTTD_VERSION=1.0.0
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=0.7.0
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -13,7 +13,7 @@
 #-------------------------------------------------------------------------------

 Name:          openttd
-Version:       1.0.3
+Version:       1.0.0
 Release:       1%{?dist}

 Group:         Amusements/Games
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -1,9 +1,9 @@
 # Version numbers to update
 !define APPV_MAJOR 1
 !define APPV_MINOR 0
-!define APPV_MAINT 3
-!define APPV_BUILD 0
-!define APPV_EXTRA "-RC1"
+!define APPV_MAINT 0
+!define APPV_BUILD 7
+!define APPV_EXTRA ""

 !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
@@ -39,7 +39,7 @@ Sub UpdateFiles(version)
 		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
-		version = "1.0.3-RC1"
+		version = "1.0.0"
 		revision = 0
 		modified = 1
 	End If
@@ -97,7 +97,7 @@ Function DetermineSVNVersion()
 	Dim sTortoise
 	' First, try with 32-bit architecture
 	sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32)
-	If sTortoise = "" Or IsNull(sTortoise) Then
+	If sTortoise = "" Then
 		' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored)
 		sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 64)
 	End If
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -376,21 +376,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\irish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating irish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-					Outputs="..\bin\lang\irish.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\italian.txt"
 			>
--- a/projects/langs_vs90.vcproj
+++ b/projects/langs_vs90.vcproj
@@ -377,21 +377,6 @@
 				/>
 			</FileConfiguration>
 		</File>
-		<File
-			RelativePath="..\src\lang\irish.txt"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="Generating irish language file"
-					CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang &quot;$(InputPath)&quot;&#x0D;&#x0A;exit 0&#x0D;&#x0A;"
-					AdditionalDependencies="..\src\lang\english.txt;..\objs\strgen\strgen.exe"
-					Outputs="..\bin\lang\irish.lng"
-				/>
-			</FileConfiguration>
-		</File>
 		<File
 			RelativePath="..\src\lang\italian.txt"
 			>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -60,7 +60,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -273,7 +273,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -60,7 +60,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -273,7 +273,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -61,7 +61,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -271,7 +271,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -61,7 +61,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -271,7 +271,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2010-07-17
-Release version: 1.0.3-RC1
+Last updated:    2010-04-01
+Release version: 1.0.0
 ------------------------------------------------------------------------


@@ -226,10 +226,9 @@ You need to copy the following files:

 4.1.3) Original Transport Tycoon Deluxe music
 ------ --------------------------------------
-If you want the Transport Tycoon Deluxe music, copy the gm/ folder from the
-Windows version of Transport Tycoon Deluxe to your OpenTTD folder (not your
-data folder - also explained in the following sections). The music from the
-DOS version as well as the original Transport Tycoon does not work.
+If you want the TTD music, copy the gm/ folder from the Windows version
+of TTD to your OpenTTD folder (not your data folder - also explained in
+the following sections). The music from the DOS version does not work.

 4.1.4) AIs
 ------ ---
@@ -249,13 +248,9 @@ wait for an error message to pop up. The error message will tell you
 4.2) OpenTTD directories
 ---- -------------------------------

-The required 3rd party files listed in the section 4.1 "(Required) 3rd party files"
-as well as other non-compulsory extensions (NewGRFs, AI, heightmaps, scenarios) can be
-placed in a few different locations:
+The TTD artwork files listed in the section 4.1 "(Required) 3rd party files"
+can be placed in a few different locations:
 	1. The current working directory (from where you started OpenTTD)
-		For non-Windows operating systems OpenTTD will not scan for files in this
-		directory if it is your personal directory, i.e. "~/", or when it is the
-		root directory, i.e. "/".
 	2. Your personal directory
 		Windows: C:\My Documents (95, 98, ME)
 		         C:\Documents and Settings\<username>\My Documents\OpenTTD (2000, XP)
@@ -307,9 +302,9 @@ again, see section 4.1).
 5.0) OpenTTD features:
 ---- -----------------

-OpenTTD has a lot of features going beyond the original Transport Tycoon Deluxe
-emulation. Unfortunately, there is currently no comprehensive list of features,
-but there is a basic features list on the web, and some optional features can be
+OpenTTD has a lot of features going beyond the original TTD emulation.
+Unfortunately, there is currently no comprehensive list of features, but there
+is a basic features list on the web, and some optional features can be
 controlled through the Advanced Settings dialog. We also implement some
 features known from TTDPatch (http://www.ttdpatch.net/).

@@ -340,8 +335,7 @@ Information logged:
 * Adding / removing / changing order of NewGRFs
 * Changing NewGRF parameters, loading compatible NewGRF
 * Changing game mode (scenario editor <-> normal game)
-* Loading game saved in a different OpenTTD / TTDPatch / Transport Tycoon Deluxe /
-  original Transport Tycoon version
+* Loading game saved in a different OpenTTD / TTDPatch / TTD version
 * Running a modified OpenTTD build
 * Changing settings affecting NewGRF behaviour (non-network-safe settings)
 * Changing landscape (by cheat)
@@ -571,7 +565,7 @@ Retired Developers:

 Thanks to:
  Josef Drexler                  - For his great work on TTDPatch.
-  Marcin Grzegorczyk             - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations)
+  Marcin Grzegorczyk             - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
  Petr Baudiš (pasky)            - Many patches, newgrf support, etc.
  Simon Sasburg (HackyKid)       - For the many bugfixes he has blessed us with
  Stefan Meißner (sign_de)       - For his work on the console
--- a/src/3rdparty/squirrel/squirrel/sqvm.cpp
+++ b/src/3rdparty/squirrel/squirrel/sqvm.cpp
@@ -186,8 +186,7 @@ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
 		case OT_STRING:
 			_RET_SUCCEED(scstrcmp(_stringval(o1),_stringval(o2)));
 		case OT_INTEGER:
-			/* FS#3954: wrong integer comparison */
-			_RET_SUCCEED((_integer(o1)<_integer(o2))?-1:(_integer(o1)==_integer(o2))?0:1);
+			_RET_SUCCEED(_integer(o1)-_integer(o2));
 		case OT_FLOAT:
 			_RET_SUCCEED((_float(o1)<_float(o2))?-1:1);
 		case OT_TABLE:
--- a/src/ai/api/ai_bridge.hpp
+++ b/src/ai/api/ai_bridge.hpp
@@ -86,7 +86,7 @@ public:
 	static int32 GetMaxSpeed(BridgeID bridge_id);

 	/**
-	 * Get the new cost of a bridge, excluding the road and/or rail.
+	 * Get the new cost of a bridge.
 	 * @param bridge_id The bridge to get the new cost of.
 	 * @param length The length of the bridge.
 	 * @pre IsValidBridge(bridge_id).
--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -14,23 +14,10 @@
 * functions may still be available if you return an older API version
 * in GetAPIVersion() in info.nut.
 *
- * \b 1.0.3
- *
- * API additions:
- * \li AIRail::ERR_RAILTYPE_DISALLOWS_CROSSING
- *
- * \b 1.0.2
- *
- * Other changes:
- * \li AIBridge::GetPrice now returns the price of the bridge without the cost for the rail or road.
- *
- * \b 1.0.1
- *
- * API additions:
- * \li AIRail::GetMaxSpeed
- *
 * \b 1.0.0
 *
+ * 1.0.0 is not yet released. The following changes are not set in stone yet.
+ *
 * API additions:
 * \li AIBaseStation
 * \li AIEngine::IsBuildable
--- a/src/ai/api/ai_engine.cpp
+++ b/src/ai/api/ai_engine.cpp
@@ -16,21 +16,20 @@
 #include "../../strings_func.h"
 #include "../../rail.h"
 #include "../../engine_base.h"
-#include "../../engine_func.h"
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"

 /* static */ bool AIEngine::IsValidEngine(EngineID engine_id)
 {
 	const Engine *e = ::Engine::GetIfValid(engine_id);
-	return e != NULL && (::IsEngineBuildable(engine_id, e->type, _current_company) || ::Company::Get(_current_company)->num_engines[engine_id] > 0);
+	return e != NULL && (HasBit(e->company_avail, _current_company) || ::Company::Get(_current_company)->num_engines[engine_id] > 0);

 }

 /* static */ bool AIEngine::IsBuildable(EngineID engine_id)
 {
 	const Engine *e = ::Engine::GetIfValid(engine_id);
-	return e != NULL && ::IsEngineBuildable(engine_id, e->type, _current_company);
+	return e != NULL && HasBit(e->company_avail, _current_company);
 }

 /* static */ char *AIEngine::GetName(EngineID engine_id)
--- a/src/ai/api/ai_industrytype.cpp
+++ b/src/ai/api/ai_industrytype.cpp
@@ -14,7 +14,6 @@
 #include "../../command_type.h"
 #include "../../strings_func.h"
 #include "../../industry.h"
-#include "../../newgrf_industries.h"
 #include "../../core/random_func.hpp"

 /* static */ bool AIIndustryType::IsValidIndustryType(IndustryType industry_type)
@@ -89,8 +88,6 @@
 /* static */ bool AIIndustryType::CanBuildIndustry(IndustryType industry_type)
 {
 	if (!IsValidIndustryType(industry_type)) return false;
-
-	if (!::CheckIfCallBackAllowsAvailability(industry_type, IACT_USERCREATION)) return false;
 	if (!::GetIndustrySpec(industry_type)->IsRawIndustry()) return true;

 	/* raw_industry_construction == 1 means "Build as other industries" */
@@ -100,9 +97,7 @@
 /* static */ bool AIIndustryType::CanProspectIndustry(IndustryType industry_type)
 {
 	if (!IsValidIndustryType(industry_type)) return false;
-
 	if (!::GetIndustrySpec(industry_type)->IsRawIndustry()) return false;
-	if (!::CheckIfCallBackAllowsAvailability(industry_type, IACT_USERCREATION)) return false;

 	/* raw_industry_construction == 2 means "prospect" */
 	return _settings_game.construction.raw_industry_construction == 2;
--- a/src/ai/api/ai_rail.cpp
+++ b/src/ai/api/ai_rail.cpp
@@ -469,10 +469,3 @@ static bool IsValidSignalType(int signal_type)
 		default: return -1;
 	}
 }
-
-/* static */ int32 AIRail::GetMaxSpeed(RailType railtype)
-{
-	if (!AIRail::IsRailTypeAvailable(railtype)) return -1;
-
-	return ::GetRailTypeInfo((::RailType)railtype)->max_speed;
-}
--- a/src/ai/api/ai_rail.hpp
+++ b/src/ai/api/ai_rail.hpp
@@ -38,9 +38,6 @@ public:

 		/** Non-uniform stations is diabled */
 		ERR_NONUNIFORM_STATIONS_DISABLED,  // [STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED]
-
-		/** This railtype cannot have crossings */
-		ERR_RAILTYPE_DISALLOWS_CROSSING,   // [STR_ERROR_CROSSING_DISALLOWED]
 	};

 	/**
@@ -443,18 +440,6 @@ public:
 	 * @return The baseprice of building the given object.
 	 */
 	static Money GetBuildCost(RailType railtype, BuildType build_type);
-
-	/**
-	 * Get the maximum speed of trains running on this railtype.
-	 * @param railtype The railtype to get the maximum speed of.
-	 * @pre IsRailTypeAvailable(railtype)
-	 * @return The maximum speed trains can run on this railtype
-	 *   or 0 if there is no limit.
-	 * @note The speed is in OpenTTD's internal speed unit.
-	 *       This is mph / 1.6, which is roughly km/h.
-	 *       To get km/h multiply this number by 1.00584.
-	 */
-	static int32 GetMaxSpeed(RailType railtype);
 };

 #endif /* AI_RAIL_HPP */
--- a/src/ai/api/ai_rail.hpp.sq
+++ b/src/ai/api/ai_rail.hpp.sq
@@ -42,7 +42,6 @@ void SQAIRail_Register(Squirrel *engine)
 	SQAIRail.DefSQConst(engine, AIRail::ERR_CROSSING_ON_ONEWAY_ROAD,      "ERR_CROSSING_ON_ONEWAY_ROAD");
 	SQAIRail.DefSQConst(engine, AIRail::ERR_UNSUITABLE_TRACK,             "ERR_UNSUITABLE_TRACK");
 	SQAIRail.DefSQConst(engine, AIRail::ERR_NONUNIFORM_STATIONS_DISABLED, "ERR_NONUNIFORM_STATIONS_DISABLED");
-	SQAIRail.DefSQConst(engine, AIRail::ERR_RAILTYPE_DISALLOWS_CROSSING,  "ERR_RAILTYPE_DISALLOWS_CROSSING");
 	SQAIRail.DefSQConst(engine, AIRail::RAILTYPE_INVALID,                 "RAILTYPE_INVALID");
 	SQAIRail.DefSQConst(engine, AIRail::RAILTRACK_NE_SW,                  "RAILTRACK_NE_SW");
 	SQAIRail.DefSQConst(engine, AIRail::RAILTRACK_NW_SE,                  "RAILTRACK_NW_SE");
@@ -72,12 +71,10 @@ void SQAIRail_Register(Squirrel *engine)
 	AIError::RegisterErrorMap(STR_ERROR_CROSSING_ON_ONEWAY_ROAD,        AIRail::ERR_CROSSING_ON_ONEWAY_ROAD);
 	AIError::RegisterErrorMap(STR_ERROR_NO_SUITABLE_RAILROAD_TRACK,     AIRail::ERR_UNSUITABLE_TRACK);
 	AIError::RegisterErrorMap(STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED, AIRail::ERR_NONUNIFORM_STATIONS_DISABLED);
-	AIError::RegisterErrorMap(STR_ERROR_CROSSING_DISALLOWED,            AIRail::ERR_RAILTYPE_DISALLOWS_CROSSING);

 	AIError::RegisterErrorMapString(AIRail::ERR_CROSSING_ON_ONEWAY_ROAD,      "ERR_CROSSING_ON_ONEWAY_ROAD");
 	AIError::RegisterErrorMapString(AIRail::ERR_UNSUITABLE_TRACK,             "ERR_UNSUITABLE_TRACK");
 	AIError::RegisterErrorMapString(AIRail::ERR_NONUNIFORM_STATIONS_DISABLED, "ERR_NONUNIFORM_STATIONS_DISABLED");
-	AIError::RegisterErrorMapString(AIRail::ERR_RAILTYPE_DISALLOWS_CROSSING,  "ERR_RAILTYPE_DISALLOWS_CROSSING");

 	SQAIRail.DefSQStaticMethod(engine, &AIRail::IsRailTile,                      "IsRailTile",                      2, ".i");
 	SQAIRail.DefSQStaticMethod(engine, &AIRail::IsLevelCrossingTile,             "IsLevelCrossingTile",             2, ".i");
@@ -109,7 +106,6 @@ void SQAIRail_Register(Squirrel *engine)
 	SQAIRail.DefSQStaticMethod(engine, &AIRail::BuildSignal,                     "BuildSignal",                     4, ".iii");
 	SQAIRail.DefSQStaticMethod(engine, &AIRail::RemoveSignal,                    "RemoveSignal",                    3, ".ii");
 	SQAIRail.DefSQStaticMethod(engine, &AIRail::GetBuildCost,                    "GetBuildCost",                    3, ".ii");
-	SQAIRail.DefSQStaticMethod(engine, &AIRail::GetMaxSpeed,                     "GetMaxSpeed",                     2, ".i");

 	SQAIRail.PostRegister(engine);
 }
--- a/src/ai/api/ai_tile.cpp
+++ b/src/ai/api/ai_tile.cpp
@@ -248,7 +248,7 @@
 {
 	EnforcePrecondition(false, ::IsValidTile(tile));

-	return AIObject::DoCommand(tile, TREE_INVALID, tile, CMD_PLANT_TREE);
+	return AIObject::DoCommand(tile, UINT_MAX, tile, CMD_PLANT_TREE);
 }

 /* static */ bool AITile::PlantTreeRectangle(TileIndex tile, uint width, uint height)
@@ -258,7 +258,7 @@
 	EnforcePrecondition(false, height >= 1 && height <= 20);
 	TileIndex end_tile = tile + ::TileDiffXY(width - 1, height - 1);

-	return AIObject::DoCommand(tile, TREE_INVALID, end_tile, CMD_PLANT_TREE);
+	return AIObject::DoCommand(tile, UINT_MAX, end_tile, CMD_PLANT_TREE);
 }

 /* static */ bool AITile::IsWithinTownInfluence(TileIndex tile, TownID town_id)
--- a/src/ai/api/ai_town.cpp
+++ b/src/ai/api/ai_town.cpp
@@ -14,7 +14,6 @@
 #include "ai_cargo.hpp"
 #include "ai_error.hpp"
 #include "../../town.h"
-#include "../../town_type.h"
 #include "../../strings_func.h"
 #include "../../company_func.h"
 #include "../../station_base.h"
@@ -173,25 +172,8 @@
 	if (company == AICompany::COMPANY_INVALID) return TOWN_RATING_INVALID;

 	const Town *t = ::Town::Get(town_id);
-	if (!HasBit(t->have_ratings, company)) {
-		return TOWN_RATING_NONE;
-	} else if (t->ratings[company] <= RATING_APPALLING) {
-		return TOWN_RATING_APPALLING;
-	} else if (t->ratings[company] <= RATING_VERYPOOR) {
-		return TOWN_RATING_VERY_POOR;
-	} else if (t->ratings[company] <= RATING_POOR) {
-		return TOWN_RATING_POOR;
-	} else if (t->ratings[company] <= RATING_MEDIOCRE) {
-		return TOWN_RATING_MEDIOCRE;
-	} else if (t->ratings[company] <= RATING_GOOD) {
-		return TOWN_RATING_GOOD;
-	} else if (t->ratings[company] <= RATING_VERYGOOD) {
-		return TOWN_RATING_VERY_GOOD;
-	} else if (t->ratings[company] <= RATING_EXCELLENT) {
-		return TOWN_RATING_EXCELLENT;
-	} else {
-		return TOWN_RATING_OUTSTANDING;
-	}
+	if (!HasBit(t->have_ratings, company)) return TOWN_RATING_NONE;
+	return max(TOWN_RATING_APPALLING, (TownRating)((t->ratings[company] / 200) + 3));
 }

 /* static */ int AITown::GetAllowedNoise(TownID town_id)
--- a/src/ai/api/ai_tunnel.cpp
+++ b/src/ai/api/ai_tunnel.cpp
@@ -77,10 +77,10 @@ static void _DoCommandReturnBuildTunnel1(class AIInstance *instance)

 	uint type = 0;
 	if (vehicle_type == AIVehicle::VT_ROAD) {
-		type |= (TRANSPORT_ROAD << 8);
+		type |= (TRANSPORT_ROAD << 9);
 		type |= ::RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType());
 	} else {
-		type |= (TRANSPORT_RAIL << 8);
+		type |= (TRANSPORT_RAIL << 9);
 		type |= AIRail::GetCurrentRailType();
 	}

--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -237,10 +237,9 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height)
 */
 CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	EngineID eid = GB(p1, 0, 16);
-	if (!IsEngineBuildable(eid, VEH_AIRCRAFT, _current_company)) return_cmd_error(STR_ERROR_AIRCRAFT_NOT_AVAILABLE);
+	if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_company)) return_cmd_error(STR_ERROR_AIRCRAFT_NOT_AVAILABLE);

-	const Engine *e = Engine::Get(eid);
+	const Engine *e = Engine::Get(p1);
 	const AircraftVehicleInfo *avi = &e->u.air;
 	CommandCost value(EXPENSES_NEW_VEHICLES, e->GetCost());

@@ -253,7 +252,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 	if (!IsHangarTile(tile) || !IsTileOwner(tile, _current_company)) return CMD_ERROR;

 	/* Prevent building aircraft types at places which can't handle them */
-	if (!CanVehicleUseStation(eid, Station::GetByTile(tile))) return CMD_ERROR;
+	if (!CanVehicleUseStation(p1, Station::GetByTile(tile))) return CMD_ERROR;

 	/* We will need to allocate 2 or 3 vehicle structs, depending on type */
 	if (!Vehicle::CanAllocateItem(avi->subtype & AIR_CTOL ? 2 : 3)) {
@@ -300,8 +299,8 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin

 		v->max_speed = avi->max_speed;
 		v->acceleration = avi->acceleration;
-		v->engine_type = eid;
-		u->engine_type = eid;
+		v->engine_type = p1;
+		u->engine_type = p1;

 		v->subtype = (avi->subtype & AIR_CTOL ? AIR_AIRCRAFT : AIR_HELICOPTER);
 		v->UpdateDeltaXY(INVALID_DIR);
@@ -363,7 +362,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		/* Aircraft with 3 vehicles (chopper)? */
 		if (v->subtype == AIR_HELICOPTER) {
 			Aircraft *w = new Aircraft();
-			w->engine_type = eid;
+			w->engine_type = p1;
 			w->direction = DIR_N;
 			w->owner = _current_company;
 			w->x_pos = v->x_pos;
@@ -388,7 +387,7 @@ CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		if (IsLocalCompany())
 			InvalidateAutoreplaceWindow(v->engine_type, v->group_id); // updates the replace Aircraft window

-		Company::Get(_current_company)->num_engines[eid]++;
+		Company::Get(_current_company)->num_engines[p1]++;
 	}

 	return value;
@@ -877,11 +876,7 @@ static bool AircraftController(Aircraft *v)
 		/* Make sure the rotors don't rotate too fast */
 		if (u->cur_speed > 32) {
 			v->cur_speed = 0;
-			if (--u->cur_speed == 32) {
-				if (!PlayVehicleSound(v, VSE_START)) {
-					SndPlayVehicleFx(SND_18_HELICOPTER, v);
-				}
-			}
+			if (--u->cur_speed == 32) SndPlayVehicleFx(SND_18_HELICOPTER, v);
 		} else {
 			u->cur_speed = 32;
 			count = UpdateAircraftSpeed(v);
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -108,11 +108,10 @@ struct BaseSet {
 	 * Read the set information from a loaded ini.
 	 * @param ini      the ini to read from
 	 * @param path     the path to this ini file (for filenames)
-	 * @param full_filename the full filename of the loaded file (for error reporting purposes)
 	 * @param allow_empty_filename empty filenames are valid
 	 * @return true if loading was successful.
 	 */
-	bool FillSetDetails(IniFile *ini, const char *path, const char *full_filename, bool allow_empty_filename = true);
+	bool FillSetDetails(IniFile *ini, const char *path, bool allow_empty_filename = true);

 	/**
 	 * Get the description for the given ISO code.
@@ -239,7 +238,7 @@ enum GraphicsFileType {
 struct GraphicsSet : BaseSet<GraphicsSet, MAX_GFT, DATA_DIR> {
 	PaletteType palette;       ///< Palette of this graphics set

-	bool FillSetDetails(struct IniFile *ini, const char *path, const char *full_filename);
+	bool FillSetDetails(struct IniFile *ini, const char *path);
 };

 /** All data/functions related with replacing the base graphics. */
@@ -277,7 +276,7 @@ struct MusicSet : BaseSet<MusicSet, NUM_SONGS_AVAILABLE, GM_DIR> {
 	byte track_nr[NUM_SONGS_AVAILABLE];
 	byte num_available;

-	bool FillSetDetails(struct IniFile *ini, const char *path, const char *full_filename);
+	bool FillSetDetails(struct IniFile *ini, const char *path);
 };

 /** All data/functions related with replacing the base music */
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -25,13 +25,12 @@ template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::availab
 #define fetch_metadata(name) \
 	item = metadata->GetItem(name, false); \
 	if (item == NULL || StrEmpty(item->value)) { \
-		DEBUG(grf, 0, "Base " SET_TYPE "set detail loading: %s field missing.", name); \
-		DEBUG(grf, 0, "  Is %s readable for the user running OpenTTD?", full_filename); \
+		DEBUG(grf, 0, "Base " SET_TYPE "set detail loading: %s field missing", name); \
 		return false; \
 	}

 template <class T, size_t Tnum_files, Subdirectory Tsubdir>
-bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *path, const char *full_filename, bool allow_empty_filename)
+bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *path, bool allow_empty_filename)
 {
 	memset(this, 0, sizeof(*this));

@@ -71,7 +70,7 @@ bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *p
 		/* Find the filename first. */
 		item = files->GetItem(BaseSet<T, Tnum_files, Tsubdir>::file_names[i], false);
 		if (item == NULL || (item->value == NULL && !allow_empty_filename)) {
-			DEBUG(grf, 0, "No " SET_TYPE " file for: %s (in %s)", BaseSet<T, Tnum_files, Tsubdir>::file_names[i], full_filename);
+			DEBUG(grf, 0, "No " SET_TYPE " file for: %s", BaseSet<T, Tnum_files, Tsubdir>::file_names[i]);
 			return false;
 		}

@@ -89,7 +88,7 @@ bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *p
 		/* Then find the MD5 checksum */
 		item = md5s->GetItem(filename, false);
 		if (item == NULL) {
-			DEBUG(grf, 0, "No MD5 checksum specified for: %s (in %s)", filename, full_filename);
+			DEBUG(grf, 0, "No MD5 checksum specified for: %s", filename);
 			return false;
 		}
 		char *c = item->value;
@@ -102,7 +101,7 @@ bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *p
 			} else if ('A' <= *c && *c <= 'F') {
 				j = *c - 'A' + 10;
 			} else {
-				DEBUG(grf, 0, "Malformed MD5 checksum specified for: %s (in %s)", filename, full_filename);
+				DEBUG(grf, 0, "Malformed MD5 checksum specified for: %s", filename);
 				return false;
 			}
 			if (i % 2 == 0) {
@@ -156,7 +155,7 @@ bool BaseMedia<Tbase_set>::AddFile(const char *filename, size_t basepath_length)
 		*path = '\0';
 	}

-	if (set->FillSetDetails(ini, path, filename)) {
+	if (set->FillSetDetails(ini, path)) {
 		Tbase_set *duplicate = NULL;
 		for (Tbase_set *c = BaseMedia<Tbase_set>::available_sets; c != NULL; c = c->next) {
 			if (strcmp(c->name, set->name) == 0 || c->shortname == set->shortname) {
--- a/src/bridge.h
+++ b/src/bridge.h
@@ -67,7 +67,7 @@ static inline const BridgeSpec *GetBridgeSpec(BridgeType i)

 void DrawBridgeMiddle(const TileInfo *ti);

-CommandCost CheckBridgeAvailability(BridgeType bridge_type, uint bridge_len, DoCommandFlag flags = DC_NONE);
+bool CheckBridge_Stuff(BridgeType bridge_type, uint bridge_len, DoCommandFlag flags = DC_NONE);
 int CalcBridgeLenCostFactor(int x);

 void ResetBridges();
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -14,7 +14,6 @@
 #include "command_func.h"
 #include "economy_func.h"
 #include "bridge.h"
-#include "rail.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "sound_func.h"
@@ -376,7 +375,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
 		case TRANSPORT_RAIL: last_bridge_type = _last_railbridge_type; break;
 		default: break; // water ways and air routes don't have bridge types
 	}
-	if (_ctrl_pressed && CheckBridgeAvailability(last_bridge_type, bridge_len).Succeeded()) {
+	if (_ctrl_pressed && CheckBridge_Stuff(last_bridge_type, bridge_len)) {
 		DoCommandP(end, start, type | last_bridge_type, CMD_BUILD_BRIDGE | CMD_MSG(STR_ERROR_CAN_T_BUILD_BRIDGE_HERE), CcBuildBridge);
 		return;
 	}
@@ -395,23 +394,16 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo

 		bl = new GUIBridgeList();

-		Money infra_cost = 0;
-		switch (transport_type) {
-			case TRANSPORT_ROAD: infra_cost = (bridge_len + 2) * _price[PR_BUILD_ROAD] * 2; break;
-			case TRANSPORT_RAIL: infra_cost = (bridge_len + 2) * RailBuildCost((RailType)road_rail_type); break;
-			default: break;
-		}
-
 		/* loop for all bridgetypes */
 		for (BridgeType brd_type = 0; brd_type != MAX_BRIDGES; brd_type++) {
-			if (CheckBridgeAvailability(brd_type, bridge_len).Succeeded()) {
+			if (CheckBridge_Stuff(brd_type, bridge_len)) {
 				/* bridge is accepted, add to list */
 				BuildBridgeData *item = bl->Append();
 				item->index = brd_type;
 				item->spec = GetBridgeSpec(brd_type);
 				/* Add to terraforming & bulldozing costs the cost of the
 				 * bridge itself (not computed with DC_QUERY_COST) */
-				item->cost = ret.GetCost() + (((int64)tot_bridgedata_len * _price[PR_BUILD_BRIDGE] * item->spec->price) >> 8) + infra_cost;
+				item->cost = ret.GetCost() + (((int64)tot_bridgedata_len * _price[PR_BUILD_BRIDGE] * item->spec->price) >> 8);
 			}
 		}
 	}
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -1017,7 +1017,7 @@ struct BuildVehicleWindow : Window {
 				size_t num_items = this->eng_list.Length();
 				this->sel_engine = (i < num_items) ? this->eng_list[i] : INVALID_ENGINE;
 				this->SetDirty();
-				if (click_count > 1 && !this->listview_mode) this->OnClick(pt, BUILD_VEHICLE_WIDGET_BUILD, 1);
+				if (click_count > 1) this->OnClick(pt, BUILD_VEHICLE_WIDGET_BUILD, 1);
 				break;
 			}

@@ -1122,9 +1122,8 @@ struct BuildVehicleWindow : Window {
 				}
 			}
 			if (needed_height != this->details_height) { // Details window are not high enough, enlarge them.
-				int resize = needed_height - this->details_height;
 				this->details_height = needed_height;
-				this->ReInit(0, resize);
+				this->ReInit();
 				return;
 			}
 		}
--- a/src/clear_cmd.cpp
+++ b/src/clear_cmd.cpp
@@ -189,40 +189,19 @@ static void TileLoopClearAlps(TileIndex tile)
 	MarkTileDirtyByTile(tile);
 }

-/**
- * Tests if at least one surrounding tile is desert
- * @param tile tile to check
- * @return does this tile have at least one desert tile around?
- */
-static inline bool NeighbourIsDesert(TileIndex tile)
-{
-	return GetTropicZone(tile + TileDiffXY(  1,  0)) == TROPICZONE_DESERT ||
-			GetTropicZone(tile + TileDiffXY( -1,  0)) == TROPICZONE_DESERT ||
-			GetTropicZone(tile + TileDiffXY(  0,  1)) == TROPICZONE_DESERT ||
-			GetTropicZone(tile + TileDiffXY(  0, -1)) == TROPICZONE_DESERT;
-}
-
 static void TileLoopClearDesert(TileIndex tile)
 {
-	/* Current desert level - 0 if it is not desert */
-	uint current = 0;
-	if (IsClearGround(tile, CLEAR_DESERT)) current = GetClearDensity(tile);
+	if (IsClearGround(tile, CLEAR_DESERT)) return;

-	/* Expected desert level - 0 if it shouldn't be desert */
-	uint expected = 0;
 	if (GetTropicZone(tile) == TROPICZONE_DESERT) {
-		expected = 3;
-	} else if (NeighbourIsDesert(tile)) {
-		expected = 1;
-	}
-
-	if (current == expected) return;
-
-	if (expected == 0) {
-		SetClearGroundDensity(tile, CLEAR_GRASS, 3);
+		SetClearGroundDensity(tile, CLEAR_DESERT, 3);
 	} else {
-		/* Transition from clear to desert is not smooth (after clearing desert tile) */
-		SetClearGroundDensity(tile, CLEAR_DESERT, expected);
+		if (GetTropicZone(tile + TileDiffXY( 1,  0)) != TROPICZONE_DESERT &&
+				GetTropicZone(tile + TileDiffXY(-1,  0)) != TROPICZONE_DESERT &&
+				GetTropicZone(tile + TileDiffXY( 0,  1)) != TROPICZONE_DESERT &&
+				GetTropicZone(tile + TileDiffXY( 0, -1)) != TROPICZONE_DESERT)
+			return;
+		SetClearGroundDensity(tile, CLEAR_DESERT, 1);
 	}

 	MarkTileDirtyByTile(tile);
--- a/src/cmd_helper.h
+++ b/src/cmd_helper.h
@@ -12,16 +12,25 @@
 #ifndef CMD_HELPER_H
 #define CMD_HELPER_H

-#include "core/enum_type.hpp"
+#include "direction_type.h"
+#include "road_type.h"

-template<typename T, uint S, uint N, typename U> static inline T Extract(U v)
+
+template<uint N> static inline void ExtractValid();
+template<> inline void ExtractValid<1>() {}
+
+
+template<typename T> struct ExtractBits;
+template<> struct ExtractBits<Axis>          { static const uint Count =  1; };
+template<> struct ExtractBits<DiagDirection> { static const uint Count =  2; };
+template<> struct ExtractBits<RoadBits>      { static const uint Count =  4; };
+
+
+template<typename T, uint N, typename U> static inline T Extract(U v)
 {
 	/* Check if there are enough bits in v */
-	assert_tcompile(N == EnumPropsT<T>::num_bits);
-	assert_tcompile(S + N <= sizeof(U) * 8);
-	assert_tcompile(EnumPropsT<T>::end <= (1 << N));
-	U masked = GB(v, S, N);
-	return IsInsideMM(masked, EnumPropsT<T>::begin, EnumPropsT<T>::end) ? (T)masked : EnumPropsT<T>::invalid;
+	ExtractValid<N + ExtractBits<T>::Count <= sizeof(U) * 8>();
+	return (T)GB(v, N, ExtractBits<T>::Count);
 }

 #endif
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -188,8 +188,6 @@ CommandProc CmdSetVehicleOnTime;
 CommandProc CmdAutofillTimetable;
 CommandProc CmdSetTimetableStart;

-#define DEF_CMD(proc, flags) {proc, #proc, flags}
-
 /**
 * The master command table
 *
@@ -198,141 +196,141 @@ CommandProc CmdSetTimetableStart;
 * as the value from the CMD_* enums.
 */
 static const Command _command_proc_table[] = {
-	DEF_CMD(CmdBuildRailroadTrack,       CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_RAILROAD_TRACK
-	DEF_CMD(CmdRemoveRailroadTrack,                     CMD_AUTO), // CMD_REMOVE_RAILROAD_TRACK
-	DEF_CMD(CmdBuildSingleRail,          CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_SINGLE_RAIL
-	DEF_CMD(CmdRemoveSingleRail,                        CMD_AUTO), // CMD_REMOVE_SINGLE_RAIL
-	DEF_CMD(CmdLandscapeClear,                                 0), // CMD_LANDSCAPE_CLEAR
-	DEF_CMD(CmdBuildBridge,                             CMD_AUTO), // CMD_BUILD_BRIDGE
-	DEF_CMD(CmdBuildRailStation,         CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_RAIL_STATION
-	DEF_CMD(CmdBuildTrainDepot,          CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_TRAIN_DEPOT
-	DEF_CMD(CmdBuildSingleSignal,                       CMD_AUTO), // CMD_BUILD_SIGNALS
-	DEF_CMD(CmdRemoveSingleSignal,                      CMD_AUTO), // CMD_REMOVE_SIGNALS
-	DEF_CMD(CmdTerraformLand,           CMD_ALL_TILES | CMD_AUTO), // CMD_TERRAFORM_LAND
-	DEF_CMD(CmdPurchaseLandArea,         CMD_NO_WATER | CMD_AUTO), // CMD_PURCHASE_LAND_AREA
-	DEF_CMD(CmdSellLandArea,                                   0), // CMD_SELL_LAND_AREA
-	DEF_CMD(CmdBuildTunnel,                             CMD_AUTO), // CMD_BUILD_TUNNEL
-	DEF_CMD(CmdRemoveFromRailStation,                          0), // CMD_REMOVE_FROM_RAIL_STATION
-	DEF_CMD(CmdConvertRail,                                    0), // CMD_CONVERT_RAILD
-	DEF_CMD(CmdBuildRailWaypoint,                              0), // CMD_BUILD_RAIL_WAYPOINT
-	DEF_CMD(CmdRenameWaypoint,                                 0), // CMD_RENAME_WAYPOINT
-	DEF_CMD(CmdRemoveFromRailWaypoint,                         0), // CMD_REMOVE_FROM_RAIL_WAYPOINT
+	{CmdBuildRailroadTrack,   CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_RAILROAD_TRACK
+	{CmdRemoveRailroadTrack,                 CMD_AUTO}, // CMD_REMOVE_RAILROAD_TRACK
+	{CmdBuildSingleRail,      CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_SINGLE_RAIL
+	{CmdRemoveSingleRail,                    CMD_AUTO}, // CMD_REMOVE_SINGLE_RAIL
+	{CmdLandscapeClear,                             0}, // CMD_LANDSCAPE_CLEAR
+	{CmdBuildBridge,                         CMD_AUTO}, // CMD_BUILD_BRIDGE
+	{CmdBuildRailStation,     CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_RAIL_STATION
+	{CmdBuildTrainDepot,      CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_TRAIN_DEPOT
+	{CmdBuildSingleSignal,                   CMD_AUTO}, // CMD_BUILD_SIGNALS
+	{CmdRemoveSingleSignal,                  CMD_AUTO}, // CMD_REMOVE_SIGNALS
+	{CmdTerraformLand,       CMD_ALL_TILES | CMD_AUTO}, // CMD_TERRAFORM_LAND
+	{CmdPurchaseLandArea,     CMD_NO_WATER | CMD_AUTO}, // CMD_PURCHASE_LAND_AREA
+	{CmdSellLandArea,                               0}, // CMD_SELL_LAND_AREA
+	{CmdBuildTunnel,                         CMD_AUTO}, // CMD_BUILD_TUNNEL
+	{CmdRemoveFromRailStation,                      0}, // CMD_REMOVE_FROM_RAIL_STATION
+	{CmdConvertRail,                                0}, // CMD_CONVERT_RAILD
+	{CmdBuildRailWaypoint,                          0}, // CMD_BUILD_RAIL_WAYPOINT
+	{CmdRenameWaypoint,                             0}, // CMD_RENAME_WAYPOINT
+	{CmdRemoveFromRailWaypoint,                     0}, // CMD_REMOVE_FROM_RAIL_WAYPOINT

-	DEF_CMD(CmdBuildRoadStop,            CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_ROAD_STOP
-	DEF_CMD(CmdRemoveRoadStop,                                 0), // CMD_REMOVE_ROAD_STOP
-	DEF_CMD(CmdBuildLongRoad,            CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_LONG_ROAD
-	DEF_CMD(CmdRemoveLongRoad,            CMD_NO_TEST | CMD_AUTO), // CMD_REMOVE_LONG_ROAD; towns may disallow removing road bits (as they are connected) in test, but in exec they're removed and thus removing is allowed.
-	DEF_CMD(CmdBuildRoad,                CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_ROAD
-	DEF_CMD(CmdBuildRoadDepot,           CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_ROAD_DEPOT
+	{CmdBuildRoadStop,        CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_ROAD_STOP
+	{CmdRemoveRoadStop,                             0}, // CMD_REMOVE_ROAD_STOP
+	{CmdBuildLongRoad,        CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_LONG_ROAD
+	{CmdRemoveLongRoad,        CMD_NO_TEST | CMD_AUTO}, // CMD_REMOVE_LONG_ROAD; towns may disallow removing road bits (as they are connected) in test, but in exec they're removed and thus removing is allowed.
+	{CmdBuildRoad,            CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_ROAD
+	{CmdBuildRoadDepot,       CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_ROAD_DEPOT

-	DEF_CMD(CmdBuildAirport,             CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_AIRPORT
-	DEF_CMD(CmdBuildDock,                               CMD_AUTO), // CMD_BUILD_DOCK
-	DEF_CMD(CmdBuildShipDepot,                          CMD_AUTO), // CMD_BUILD_SHIP_DEPOT
-	DEF_CMD(CmdBuildBuoy,                               CMD_AUTO), // CMD_BUILD_BUOY
-	DEF_CMD(CmdPlantTree,                               CMD_AUTO), // CMD_PLANT_TREE
-	DEF_CMD(CmdBuildRailVehicle,                               0), // CMD_BUILD_RAIL_VEHICLE
-	DEF_CMD(CmdMoveRailVehicle,                                0), // CMD_MOVE_RAIL_VEHICLE
+	{CmdBuildAirport,         CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_AIRPORT
+	{CmdBuildDock,                           CMD_AUTO}, // CMD_BUILD_DOCK
+	{CmdBuildShipDepot,                      CMD_AUTO}, // CMD_BUILD_SHIP_DEPOT
+	{CmdBuildBuoy,                           CMD_AUTO}, // CMD_BUILD_BUOY
+	{CmdPlantTree,                           CMD_AUTO}, // CMD_PLANT_TREE
+	{CmdBuildRailVehicle,                           0}, // CMD_BUILD_RAIL_VEHICLE
+	{CmdMoveRailVehicle,                            0}, // CMD_MOVE_RAIL_VEHICLE

-	DEF_CMD(CmdSellRailWagon,                                  0), // CMD_SELL_RAIL_WAGON
-	DEF_CMD(CmdSendTrainToDepot,                               0), // CMD_SEND_TRAIN_TO_DEPOT
-	DEF_CMD(CmdForceTrainProceed,                              0), // CMD_FORCE_TRAIN_PROCEED
-	DEF_CMD(CmdReverseTrainDirection,                          0), // CMD_REVERSE_TRAIN_DIRECTION
+	{CmdSellRailWagon,                              0}, // CMD_SELL_RAIL_WAGON
+	{CmdSendTrainToDepot,                           0}, // CMD_SEND_TRAIN_TO_DEPOT
+	{CmdForceTrainProceed,                          0}, // CMD_FORCE_TRAIN_PROCEED
+	{CmdReverseTrainDirection,                      0}, // CMD_REVERSE_TRAIN_DIRECTION

-	DEF_CMD(CmdModifyOrder,                                    0), // CMD_MODIFY_ORDER
-	DEF_CMD(CmdSkipToOrder,                                    0), // CMD_SKIP_TO_ORDER
-	DEF_CMD(CmdDeleteOrder,                                    0), // CMD_DELETE_ORDER
-	DEF_CMD(CmdInsertOrder,                                    0), // CMD_INSERT_ORDER
+	{CmdModifyOrder,                                0}, // CMD_MODIFY_ORDER
+	{CmdSkipToOrder,                                0}, // CMD_SKIP_TO_ORDER
+	{CmdDeleteOrder,                                0}, // CMD_DELETE_ORDER
+	{CmdInsertOrder,                                0}, // CMD_INSERT_ORDER

-	DEF_CMD(CmdChangeServiceInt,                               0), // CMD_CHANGE_SERVICE_INT
+	{CmdChangeServiceInt,                           0}, // CMD_CHANGE_SERVICE_INT

-	DEF_CMD(CmdBuildIndustry,                                  0), // CMD_BUILD_INDUSTRY
-	DEF_CMD(CmdBuildCompanyHQ,           CMD_NO_WATER | CMD_AUTO), // CMD_BUILD_COMPANY_HQ
-	DEF_CMD(CmdSetCompanyManagerFace,                          0), // CMD_SET_COMPANY_MANAGER_FACE
-	DEF_CMD(CmdSetCompanyColour,                               0), // CMD_SET_COMPANY_COLOUR
+	{CmdBuildIndustry,                              0}, // CMD_BUILD_INDUSTRY
+	{CmdBuildCompanyHQ,       CMD_NO_WATER | CMD_AUTO}, // CMD_BUILD_COMPANY_HQ
+	{CmdSetCompanyManagerFace,                      0}, // CMD_SET_COMPANY_MANAGER_FACE
+	{CmdSetCompanyColour,                           0}, // CMD_SET_COMPANY_COLOUR

-	DEF_CMD(CmdIncreaseLoan,                                   0), // CMD_INCREASE_LOAN
-	DEF_CMD(CmdDecreaseLoan,                                   0), // CMD_DECREASE_LOAN
+	{CmdIncreaseLoan,                               0}, // CMD_INCREASE_LOAN
+	{CmdDecreaseLoan,                               0}, // CMD_DECREASE_LOAN

-	DEF_CMD(CmdWantEnginePreview,                              0), // CMD_WANT_ENGINE_PREVIEW
+	{CmdWantEnginePreview,                          0}, // CMD_WANT_ENGINE_PREVIEW

-	DEF_CMD(CmdRenameVehicle,                                  0), // CMD_RENAME_VEHICLE
-	DEF_CMD(CmdRenameEngine,                                   0), // CMD_RENAME_ENGINE
+	{CmdRenameVehicle,                              0}, // CMD_RENAME_VEHICLE
+	{CmdRenameEngine,                               0}, // CMD_RENAME_ENGINE

-	DEF_CMD(CmdRenameCompany,                                  0), // CMD_RENAME_COMPANY
-	DEF_CMD(CmdRenamePresident,                                0), // CMD_RENAME_PRESIDENT
+	{CmdRenameCompany,                              0}, // CMD_RENAME_COMPANY
+	{CmdRenamePresident,                            0}, // CMD_RENAME_PRESIDENT

-	DEF_CMD(CmdRenameStation,                                  0), // CMD_RENAME_STATION
+	{CmdRenameStation,                              0}, // CMD_RENAME_STATION

-	DEF_CMD(CmdSellAircraft,                                   0), // CMD_SELL_AIRCRAFT
+	{CmdSellAircraft,                               0}, // CMD_SELL_AIRCRAFT

-	DEF_CMD(CmdBuildAircraft,                                  0), // CMD_BUILD_AIRCRAFT
-	DEF_CMD(CmdSendAircraftToHangar,                           0), // CMD_SEND_AIRCRAFT_TO_HANGAR
-	DEF_CMD(CmdRefitAircraft,                                  0), // CMD_REFIT_AIRCRAFT
+	{CmdBuildAircraft,                              0}, // CMD_BUILD_AIRCRAFT
+	{CmdSendAircraftToHangar,                       0}, // CMD_SEND_AIRCRAFT_TO_HANGAR
+	{CmdRefitAircraft,                              0}, // CMD_REFIT_AIRCRAFT

-	DEF_CMD(CmdPlaceSign,                                      0), // CMD_PLACE_SIGN
-	DEF_CMD(CmdRenameSign,                                     0), // CMD_RENAME_SIGN
+	{CmdPlaceSign,                                  0}, // CMD_PLACE_SIGN
+	{CmdRenameSign,                                 0}, // CMD_RENAME_SIGN

-	DEF_CMD(CmdBuildRoadVeh,                                   0), // CMD_BUILD_ROAD_VEH
-	DEF_CMD(CmdSellRoadVeh,                                    0), // CMD_SELL_ROAD_VEH
-	DEF_CMD(CmdSendRoadVehToDepot,                             0), // CMD_SEND_ROADVEH_TO_DEPOT
-	DEF_CMD(CmdTurnRoadVeh,                                    0), // CMD_TURN_ROADVEH
-	DEF_CMD(CmdRefitRoadVeh,                                   0), // CMD_REFIT_ROAD_VEH
+	{CmdBuildRoadVeh,                               0}, // CMD_BUILD_ROAD_VEH
+	{CmdSellRoadVeh,                                0}, // CMD_SELL_ROAD_VEH
+	{CmdSendRoadVehToDepot,                         0}, // CMD_SEND_ROADVEH_TO_DEPOT
+	{CmdTurnRoadVeh,                                0}, // CMD_TURN_ROADVEH
+	{CmdRefitRoadVeh,                               0}, // CMD_REFIT_ROAD_VEH

-	DEF_CMD(CmdPause,                                 CMD_SERVER), // CMD_PAUSE
+	{CmdPause,                             CMD_SERVER}, // CMD_PAUSE

-	DEF_CMD(CmdBuyShareInCompany,                              0), // CMD_BUY_SHARE_IN_COMPANY
-	DEF_CMD(CmdSellShareInCompany,                             0), // CMD_SELL_SHARE_IN_COMPANY
-	DEF_CMD(CmdBuyCompany,                                     0), // CMD_BUY_COMANY
+	{CmdBuyShareInCompany,                          0}, // CMD_BUY_SHARE_IN_COMPANY
+	{CmdSellShareInCompany,                         0}, // CMD_SELL_SHARE_IN_COMPANY
+	{CmdBuyCompany,                                 0}, // CMD_BUY_COMANY

-	DEF_CMD(CmdFoundTown,                            CMD_NO_TEST), // CMD_FOUND_TOWN; founding random town can fail only in exec run
-	DEF_CMD(CmdRenameTown,                            CMD_SERVER), // CMD_RENAME_TOWN
-	DEF_CMD(CmdDoTownAction,                                   0), // CMD_DO_TOWN_ACTION
+	{CmdFoundTown,                        CMD_NO_TEST}, // CMD_FOUND_TOWN; founding random town can fail only in exec run
+	{CmdRenameTown,                        CMD_SERVER}, // CMD_RENAME_TOWN
+	{CmdDoTownAction,                               0}, // CMD_DO_TOWN_ACTION

-	DEF_CMD(CmdSellShip,                                       0), // CMD_SELL_SHIP
-	DEF_CMD(CmdBuildShip,                                      0), // CMD_BUILD_SHIP
-	DEF_CMD(CmdSendShipToDepot,                                0), // CMD_SEND_SHIP_TO_DEPOT
-	DEF_CMD(CmdRefitShip,                                      0), // CMD_REFIT_SHIP
+	{CmdSellShip,                                   0}, // CMD_SELL_SHIP
+	{CmdBuildShip,                                  0}, // CMD_BUILD_SHIP
+	{CmdSendShipToDepot,                            0}, // CMD_SEND_SHIP_TO_DEPOT
+	{CmdRefitShip,                                  0}, // CMD_REFIT_SHIP

-	DEF_CMD(CmdOrderRefit,                                     0), // CMD_ORDER_REFIT
-	DEF_CMD(CmdCloneOrder,                                     0), // CMD_CLONE_ORDER
+	{CmdOrderRefit,                                 0}, // CMD_ORDER_REFIT
+	{CmdCloneOrder,                                 0}, // CMD_CLONE_ORDER

-	DEF_CMD(CmdClearArea,                            CMD_NO_TEST), // CMD_CLEAR_AREA; destroying multi-tile houses makes town rating differ between test and execution
+	{CmdClearArea,                        CMD_NO_TEST}, // CMD_CLEAR_AREA; destroying multi-tile houses makes town rating differ between test and execution

-	DEF_CMD(CmdMoneyCheat,                           CMD_OFFLINE), // CMD_MONEY_CHEAT
-	DEF_CMD(CmdBuildCanal,                              CMD_AUTO), // CMD_BUILD_CANAL
-	DEF_CMD(CmdCompanyCtrl,                        CMD_SPECTATOR), // CMD_COMPANY_CTRL
+	{CmdMoneyCheat,                       CMD_OFFLINE}, // CMD_MONEY_CHEAT
+	{CmdBuildCanal,                          CMD_AUTO}, // CMD_BUILD_CANAL
+	{CmdCompanyCtrl,                    CMD_SPECTATOR}, // CMD_COMPANY_CTRL

-	DEF_CMD(CmdLevelLand, CMD_ALL_TILES | CMD_NO_TEST | CMD_AUTO), // CMD_LEVEL_LAND; test run might clear tiles multiple times, in execution that only happens once
+	{CmdLevelLand, CMD_ALL_TILES | CMD_NO_TEST | CMD_AUTO}, // CMD_LEVEL_LAND; test run might clear tiles multiple times, in execution that only happens once

-	DEF_CMD(CmdRefitRailVehicle,                               0), // CMD_REFIT_RAIL_VEHICLE
-	DEF_CMD(CmdRestoreOrderIndex,                              0), // CMD_RESTORE_ORDER_INDEX
-	DEF_CMD(CmdBuildLock,                               CMD_AUTO), // CMD_BUILD_LOCK
+	{CmdRefitRailVehicle,                           0}, // CMD_REFIT_RAIL_VEHICLE
+	{CmdRestoreOrderIndex,                          0}, // CMD_RESTORE_ORDER_INDEX
+	{CmdBuildLock,                           CMD_AUTO}, // CMD_BUILD_LOCK

-	DEF_CMD(CmdBuildSignalTrack,                        CMD_AUTO), // CMD_BUILD_SIGNAL_TRACK
-	DEF_CMD(CmdRemoveSignalTrack,                       CMD_AUTO), // CMD_REMOVE_SIGNAL_TRACK
+	{CmdBuildSignalTrack,                    CMD_AUTO}, // CMD_BUILD_SIGNAL_TRACK
+	{CmdRemoveSignalTrack,                   CMD_AUTO}, // CMD_REMOVE_SIGNAL_TRACK

-	DEF_CMD(CmdGiveMoney,                                      0), // CMD_GIVE_MONEY
-	DEF_CMD(CmdChangeSetting,                         CMD_SERVER), // CMD_CHANGE_SETTING
-	DEF_CMD(CmdChangeCompanySetting,                           0), // CMD_CHANGE_COMPANY_SETTING
-	DEF_CMD(CmdSetAutoReplace,                                 0), // CMD_SET_AUTOREPLACE
-	DEF_CMD(CmdCloneVehicle,                         CMD_NO_TEST), // CMD_CLONE_VEHICLE; NewGRF callbacks influence building and refitting making it impossible to correctly estimate the cost
-	DEF_CMD(CmdStartStopVehicle,                               0), // CMD_START_STOP_VEHICLE
-	DEF_CMD(CmdMassStartStopVehicle,                           0), // CMD_MASS_START_STOP
-	DEF_CMD(CmdAutoreplaceVehicle,                             0), // CMD_AUTOREPLACE_VEHICLE
-	DEF_CMD(CmdDepotSellAllVehicles,                           0), // CMD_DEPOT_SELL_ALL_VEHICLES
-	DEF_CMD(CmdDepotMassAutoReplace,                           0), // CMD_DEPOT_MASS_AUTOREPLACE
-	DEF_CMD(CmdCreateGroup,                                    0), // CMD_CREATE_GROUP
-	DEF_CMD(CmdDeleteGroup,                                    0), // CMD_DELETE_GROUP
-	DEF_CMD(CmdRenameGroup,                                    0), // CMD_RENAME_GROUP
-	DEF_CMD(CmdAddVehicleGroup,                                0), // CMD_ADD_VEHICLE_GROUP
-	DEF_CMD(CmdAddSharedVehicleGroup,                          0), // CMD_ADD_SHARE_VEHICLE_GROUP
-	DEF_CMD(CmdRemoveAllVehiclesGroup,                         0), // CMD_REMOVE_ALL_VEHICLES_GROUP
-	DEF_CMD(CmdSetGroupReplaceProtection,                      0), // CMD_SET_GROUP_REPLACE_PROTECTION
-	DEF_CMD(CmdMoveOrder,                                      0), // CMD_MOVE_ORDER
-	DEF_CMD(CmdChangeTimetable,                                0), // CMD_CHANGE_TIMETABLE
-	DEF_CMD(CmdSetVehicleOnTime,                               0), // CMD_SET_VEHICLE_ON_TIME
-	DEF_CMD(CmdAutofillTimetable,                              0), // CMD_AUTOFILL_TIMETABLE
-	DEF_CMD(CmdSetTimetableStart,                              0), // CMD_SET_TIMETABLE_START
+	{CmdGiveMoney,                                  0}, // CMD_GIVE_MONEY
+	{CmdChangeSetting,                     CMD_SERVER}, // CMD_CHANGE_SETTING
+	{CmdChangeCompanySetting,                       0}, // CMD_CHANGE_COMPANY_SETTING
+	{CmdSetAutoReplace,                             0}, // CMD_SET_AUTOREPLACE
+	{CmdCloneVehicle,                     CMD_NO_TEST}, // CMD_CLONE_VEHICLE; NewGRF callbacks influence building and refitting making it impossible to correctly estimate the cost
+	{CmdStartStopVehicle,                           0}, // CMD_START_STOP_VEHICLE
+	{CmdMassStartStopVehicle,                       0}, // CMD_MASS_START_STOP
+	{CmdAutoreplaceVehicle,                         0}, // CMD_AUTOREPLACE_VEHICLE
+	{CmdDepotSellAllVehicles,                       0}, // CMD_DEPOT_SELL_ALL_VEHICLES
+	{CmdDepotMassAutoReplace,                       0}, // CMD_DEPOT_MASS_AUTOREPLACE
+	{CmdCreateGroup,                                0}, // CMD_CREATE_GROUP
+	{CmdDeleteGroup,                                0}, // CMD_DELETE_GROUP
+	{CmdRenameGroup,                                0}, // CMD_RENAME_GROUP
+	{CmdAddVehicleGroup,                            0}, // CMD_ADD_VEHICLE_GROUP
+	{CmdAddSharedVehicleGroup,                      0}, // CMD_ADD_SHARE_VEHICLE_GROUP
+	{CmdRemoveAllVehiclesGroup,                     0}, // CMD_REMOVE_ALL_VEHICLES_GROUP
+	{CmdSetGroupReplaceProtection,                  0}, // CMD_SET_GROUP_REPLACE_PROTECTION
+	{CmdMoveOrder,                                  0}, // CMD_MOVE_ORDER
+	{CmdChangeTimetable,                            0}, // CMD_CHANGE_TIMETABLE
+	{CmdSetVehicleOnTime,                           0}, // CMD_SET_VEHICLE_ON_TIME
+	{CmdAutofillTimetable,                          0}, // CMD_AUTOFILL_TIMETABLE
+	{CmdSetTimetableStart,                          0}, // CMD_SET_TIMETABLE_START
 };

 /*!
@@ -364,20 +362,6 @@ byte GetCommandFlags(uint32 cmd)
 	return _command_proc_table[cmd & CMD_ID_MASK].flags;
 }

-/*!
- * This function mask the parameter with CMD_ID_MASK and returns
- * the name which belongs to the given command.
- *
- * @param cmd The integer value of the command
- * @return The name for this command
- */
-const char *GetCommandName(uint32 cmd)
-{
-	assert(IsValidCommand(cmd));
-
-	return _command_proc_table[cmd & CMD_ID_MASK].name;
-}
-
 static int _docommand_recursive = 0;

 /**
@@ -656,7 +640,7 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 		return_dcpi(CommandCost(), false);
 	}
 #endif /* ENABLE_NETWORK */
-	DEBUG(desync, 1, "cmd: %08x; %02x; %02x; %06x; %08x; %08x; %08x; \"%s\" (%s)", _date, _date_fract, (int)_current_company, tile, p1, p2, cmd & ~CMD_NETWORK_COMMAND, text, GetCommandName(cmd));
+	DEBUG(desync, 1, "cmd: %08x; %08x; %1x; %06x; %08x; %08x; %04x; %s\n", _date, _date_fract, (int)_current_company, tile, p1, p2, cmd & ~CMD_NETWORK_COMMAND, text);

 	/* Actually try and execute the command. If no cost-type is given
 	 * use the construction one */
@@ -678,9 +662,6 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
 	/* If we're needing more money and we haven't done
 	 * anything yet, ask for the money! */
 	if (_additional_cash_required != 0 && res2.GetCost() == 0) {
-		/* It could happen we removed rail, thus gained money, and deleted something else.
-		 * So make sure the signal buffer is empty even in this case */
-		UpdateSignalsInBuffer();
 		SetDParam(0, _additional_cash_required);
 		return_dcpi(CommandCost(STR_ERROR_NOT_ENOUGH_CASH_REQUIRES_CURRENCY), false);
 	}
--- a/src/command_func.h
+++ b/src/command_func.h
@@ -67,10 +67,6 @@ bool IsValidCommand(uint32 cmd);
 * Returns the flags from a given command.
 */
 byte GetCommandFlags(uint32 cmd);
-/**
- * Returns the name of a given command.
- */
-const char *GetCommandName(uint32 cmd);
 /**
 * Returns the current money available which can be used for a command.
 */
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -382,9 +382,8 @@ typedef CommandCost CommandProc(TileIndex tile, DoCommandFlag flags, uint32 p1,
 * the #CMD_AUTO, #CMD_OFFLINE and #CMD_SERVER values.
 */
 struct Command {
-	CommandProc *proc; ///< The procedure to actually executing
-	const char *name;  ///< A human readable name for the procedure
-	byte flags;        ///< The (command) flags to that apply to this command
+	CommandProc *proc;
+	byte flags;
 };

 /**
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -15,7 +15,6 @@
 #include "company_gui.h"
 #include "town.h"
 #include "news_func.h"
-#include "cmd_helper.h"
 #include "command_func.h"
 #include "network/network.h"
 #include "network/network_func.h"
@@ -592,11 +591,14 @@ static void HandleBankruptcyTakeover(Company *c)

 	SetBit(c->bankrupt_asked, best->index);

-	c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
+	if (IsInteractiveCompany(best->index)) {
+		c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
+		ShowBuyCompanyDialog(c->index);
+		return;
+	}
+
 	if (best->is_ai) {
 		AI::NewEvent(best->index, new AIEventCompanyAskMerger(c->index, ClampToI32(c->bankrupt_value)));
-	} else if (IsInteractiveCompany(best->index)) {
-		ShowBuyCompanyDialog(c->index);
 	}
 }

@@ -895,11 +897,14 @@ CommandCost CmdSetCompanyManagerFace(TileIndex tile, DoCommandFlag flags, uint32
 */
 CommandCost CmdSetCompanyColour(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	Colours colour = Extract<Colours, 0, 4>(p2);
-	LiveryScheme scheme = Extract<LiveryScheme, 0, 8>(p1);
+	if (p2 >= 16) return CMD_ERROR; // max 16 colours
+
+	Colours colour = (Colours)p2;
+
+	LiveryScheme scheme = (LiveryScheme)GB(p1, 0, 8);
 	byte state = GB(p1, 8, 2);

-	if (scheme >= LS_END || state >= 3 || colour == INVALID_COLOUR) return CMD_ERROR;
+	if (scheme >= LS_END || state >= 3) return CMD_ERROR;

 	Company *c = Company::Get(_current_company);

@@ -960,13 +965,6 @@ CommandCost CmdSetCompanyColour(TileIndex tile, DoCommandFlag flags, uint32 p1,
 		ResetVehicleColourMap();
 		MarkWholeScreenDirty();

-		/* All graph related to companies use the company colour. */
-		InvalidateWindowData(WC_INCOME_GRAPH, 0);
-		InvalidateWindowData(WC_OPERATING_PROFIT, 0);
-		InvalidateWindowData(WC_DELIVERED_CARGO, 0);
-		InvalidateWindowData(WC_PERFORMANCE_HISTORY, 0);
-		InvalidateWindowData(WC_COMPANY_VALUE, 0);
-
 		/* Company colour data is indirectly cached. */
 		Vehicle *v;
 		FOR_ALL_VEHICLES(v) {
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -1984,7 +1984,7 @@ struct CompanyWindow : Window
 					MarkWholeScreenDirty();
 				} else if (NetworkCompanyIsPassworded(company)) {
 					/* ask for the password */
-					ShowQueryString(STR_EMPTY, STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION, NETWORK_PASSWORD_LENGTH, 180, this, CS_ALPHANUMERAL, QSF_NONE);
+					ShowQueryString(STR_EMPTY, STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION, 20, 180, this, CS_ALPHANUMERAL, QSF_NONE);
 				} else {
 					/* just send the join command */
 					NetworkClientRequestMove(company);
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -437,10 +437,6 @@ void IConsoleCmdExec(const char *cmdstr)
 			break;
 		case '"': // Tokens enclosed in "" are one token
 			longtoken = !longtoken;
-			if (!foundtoken) {
-				tokens[t_index++] = &tokenstream[tstream_i];
-				foundtoken = true;
-			}
 			break;
 		case '\\': // Escape character for ""
 			if (cmdptr[1] == '"' && tstream_i + 1 < lengthof(tokenstream)) {
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -252,18 +252,7 @@ static const FiosItem *GetFiosItem(const char *file)
 	int i = strtol(file, &endptr, 10);
 	if (file == endptr || *endptr != '\0') i = -1;

-	if (IsInsideMM(i, 0, _fios_items.Length())) return _fios_items.Get(i);
-
-	/* As a last effort assume it is an OpenTTD savegame and
-	 * that the ".sav" part was not given. */
-	char long_file[MAX_PATH];
-	seprintf(long_file, lastof(long_file), "%s.sav", file);
-	for (const FiosItem *item = _fios_items.Begin(); item != _fios_items.End(); item++) {
-		if (strcmp(long_file, item->name) == 0) return item;
-		if (strcmp(long_file, item->title) == 0) return item;
-	}
-
-	return NULL;
+	return IsInsideMM(i, 0, _fios_items.Length()) ? _fios_items.Get(i) : NULL;
 }


@@ -402,59 +391,12 @@ DEF_CONSOLE_CMD(ConClearBuffer)
 **********************************/
 #ifdef ENABLE_NETWORK

-static bool ConKickOrBan(const char *argv, bool ban)
-{
-	const char *ip = argv;
-
-	if (strchr(argv, '.') == NULL && strchr(argv, ':') == NULL) { // banning with ID
-		ClientID client_id = (ClientID)atoi(argv);
-
-		if (client_id == CLIENT_ID_SERVER) {
-			IConsolePrintF(CC_ERROR, "ERROR: Silly boy, you can not %s yourself!", ban ? "ban" : "kick");
-			return true;
-		}
-
-		NetworkClientInfo *ci = NetworkFindClientInfoFromClientID(client_id);
-		if (ci == NULL) {
-			IConsoleError("Invalid client");
-			return true;
-		}
-
-		if (!ban) {
-			/* Kick only this client, not all clients with that IP */
-			NetworkServerKickClient(client_id);
-			return true;
-		}
-
-		/* When banning, kick+ban all clients with that IP */
-		ip = GetClientIP(ci);
-	}
-
-	uint n = NetworkServerKickOrBanIP(ip, ban);
-	if (n == 0) {
-		IConsolePrint(CC_DEFAULT, ban ? "Client not online, address added to banlist" : "Client not found");
-	} else {
-		IConsolePrintF(CC_DEFAULT, "%sed %u client(s)", ban ? "Bann" : "Kick", n);
-	}
-
-	return true;
-}
-
-DEF_CONSOLE_CMD(ConKick)
-{
-	if (argc == 0) {
-		IConsoleHelp("Kick a client from a network game. Usage: 'kick <ip | client-id>'");
-		IConsoleHelp("For client-id's, see the command 'clients'");
-		return true;
-	}
-
-	if (argc != 2) return false;
-
-	return ConKickOrBan(argv[1], false);
-}
-
 DEF_CONSOLE_CMD(ConBan)
 {
+	NetworkClientInfo *ci;
+	const char *banip = NULL;
+	ClientID client_id;
+
 	if (argc == 0) {
 		IConsoleHelp("Ban a client from a network game. Usage: 'ban <ip | client-id>'");
 		IConsoleHelp("For client-id's, see the command 'clients'");
@@ -464,7 +406,39 @@ DEF_CONSOLE_CMD(ConBan)

 	if (argc != 2) return false;

-	return ConKickOrBan(argv[1], true);
+	if (strchr(argv[1], '.') == NULL && strchr(argv[1], ':') == NULL) { // banning with ID
+		client_id = (ClientID)atoi(argv[1]);
+		ci = NetworkFindClientInfoFromClientID(client_id);
+	} else { // banning IP
+		ci = NetworkFindClientInfoFromIP(argv[1]);
+		if (ci == NULL) {
+			banip = argv[1];
+			client_id = (ClientID)-1;
+		} else {
+			client_id = ci->client_id;
+		}
+	}
+
+	if (client_id == CLIENT_ID_SERVER) {
+		IConsoleError("Silly boy, you can not ban yourself!");
+		return true;
+	}
+
+	if (client_id == INVALID_CLIENT_ID || (ci == NULL && client_id != (ClientID)-1)) {
+		IConsoleError("Invalid client");
+		return true;
+	}
+
+	if (ci != NULL) {
+		IConsolePrint(CC_DEFAULT, "Client banned");
+		banip = GetClientIP(ci);
+	} else {
+		IConsolePrint(CC_DEFAULT, "Client not online, banned IP");
+	}
+
+	NetworkServerBanIP(banip);
+
+	return true;
 }

 DEF_CONSOLE_CMD(ConUnBan)
@@ -621,6 +595,46 @@ DEF_CONSOLE_CMD(ConClientNickChange)
 	return true;
 }

+DEF_CONSOLE_CMD(ConKick)
+{
+	NetworkClientInfo *ci;
+	ClientID client_id;
+
+	if (argc == 0) {
+		IConsoleHelp("Kick a client from a network game. Usage: 'kick <ip | client-id>'");
+		IConsoleHelp("For client-id's, see the command 'clients'");
+		return true;
+	}
+
+	if (argc != 2) return false;
+
+	if (strchr(argv[1], '.') == NULL) {
+		client_id = (ClientID)atoi(argv[1]);
+		ci = NetworkFindClientInfoFromClientID(client_id);
+	} else {
+		ci = NetworkFindClientInfoFromIP(argv[1]);
+		client_id = (ci == NULL) ? INVALID_CLIENT_ID : ci->client_id;
+	}
+
+	if (client_id == CLIENT_ID_SERVER) {
+		IConsoleError("Silly boy, you can not kick yourself!");
+		return true;
+	}
+
+	if (client_id == INVALID_CLIENT_ID) {
+		IConsoleError("Invalid client");
+		return true;
+	}
+
+	if (ci != NULL) {
+		NetworkServerKickClient(client_id);
+	} else {
+		IConsoleError("Client not found");
+	}
+
+	return true;
+}
+
 DEF_CONSOLE_CMD(ConJoinCompany)
 {
 	if (argc < 2) {
@@ -975,7 +989,7 @@ DEF_CONSOLE_CMD(ConRestart)
 	/* Don't copy the _newgame pointers to the real pointers, so call SwitchToMode directly */
 	_settings_game.game_creation.map_x = MapLogX();
 	_settings_game.game_creation.map_y = FindFirstBit(MapSizeY());
-	_switch_mode = SM_RESTARTGAME;
+	SwitchToMode(SM_RESTARTGAME);
 	return true;
 }

--- a/src/core/enum_type.hpp
+++ b/src/core/enum_type.hpp
@@ -58,16 +58,14 @@ template <typename Tenum_t> struct EnumPropsT;
 *  @param Tbegin first valid value from the contiguous range (i.e. TRACK_BEGIN)
 *  @param Tend one past the last valid value from the contiguous range (i.e. TRACK_END)
 *  @param Tinvalid value used as invalid value marker (i.e. INVALID_TRACK)
- *  @param Tnum_bits Number of bits for storing the enum in command parameters
 */
-template <typename Tenum_t, typename Tstorage_t, Tenum_t Tbegin, Tenum_t Tend, Tenum_t Tinvalid, uint Tnum_bits = 8 * sizeof(Tstorage_t)>
+template <typename Tenum_t, typename Tstorage_t, Tenum_t Tbegin, Tenum_t Tend, Tenum_t Tinvalid>
 struct MakeEnumPropsT {
 	typedef Tenum_t type;                     ///< enum type (i.e. Trackdir)
 	typedef Tstorage_t storage;               ///< storage type (i.e. byte)
 	static const Tenum_t begin = Tbegin;      ///< lowest valid value (i.e. TRACKDIR_BEGIN)
 	static const Tenum_t end = Tend;          ///< one after the last valid value (i.e. TRACKDIR_END)
 	static const Tenum_t invalid = Tinvalid;  ///< what value is used as invalid value (i.e. INVALID_TRACKDIR)
-	static const uint num_bits = Tnum_bits;   ///< Number of bits for storing the enum in command parameters
 };


--- a/src/core/random_func.cpp
+++ b/src/core/random_func.cpp
@@ -24,9 +24,9 @@ uint32 Randomizer::Next()
 	return this->state[1] = ROR(s, 3) - 1;
 }

-uint32 Randomizer::Next(uint32 max)
+uint32 Randomizer::Next(uint16 max)
 {
-	return ((uint64)this->Next() * (uint64)max) >> 32;
+	return GB(this->Next(), 0, 16) * max >> 16;
 }

 void Randomizer::SetSeed(uint32 seed)
@@ -55,8 +55,8 @@ uint32 DoRandom(int line, const char *file)
 	return _random.Next();
 }

-uint32 DoRandomRange(uint32 max, int line, const char *file)
+uint DoRandomRange(uint max, int line, const char *file)
 {
-	return ((uint64)DoRandom(line, file) * (uint64)max) >> 32;
+	return GB(DoRandom(line, file), 0, 16) * max >> 16;
 }
 #endif /* RANDOM_DEBUG */
--- a/src/core/random_func.hpp
+++ b/src/core/random_func.hpp
@@ -48,7 +48,7 @@ struct Randomizer {
 	 * @param max the maximum value of the returned random number
 	 * @return the random number
 	 */
-	uint32 Next(uint32 max);
+	uint32 Next(uint16 max);

 	/**
 	 * (Re)set the state of the random number generator.
@@ -92,14 +92,14 @@ void SetRandomSeed(uint32 seed);
 	#endif
 	uint32 DoRandom(int line, const char *file);
 	#define RandomRange(max) DoRandomRange(max, __LINE__, __FILE__)
-	uint32 DoRandomRange(uint32 max, int line, const char *file);
+	uint DoRandomRange(uint max, int line, const char *file);
 #else
 	static FORCEINLINE uint32 Random()
 	{
 		return _random.Next();
 	}

-	static FORCEINLINE uint32 RandomRange(uint32 max)
+	static FORCEINLINE uint32 RandomRange(uint16 max)
 	{
 		return _random.Next(max);
 	}
@@ -110,7 +110,7 @@ static FORCEINLINE uint32 InteractiveRandom()
 	return _interactive_random.Next();
 }

-static FORCEINLINE uint32 InteractiveRandomRange(uint32 max)
+static FORCEINLINE uint32 InteractiveRandomRange(uint16 max)
 {
 	return _interactive_random.Next(max);
 }
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -109,25 +109,22 @@ char *CrashLog::LogConfiguration(char *buffer, const char *last) const
 	buffer += seprintf(buffer, last,
 			"Configuration:\n"
 			" Blitter:      %s\n"
-			" Graphics set: %s (%d)\n"
+			" Graphics set: %s\n"
 			" Language:     %s\n"
 			" Music driver: %s\n"
-			" Music set:    %s (%d)\n"
+			" Music set:    %s\n"
 			" Network:      %s\n"
 			" Sound driver: %s\n"
-			" Sound set:    %s (%d)\n"
+			" Sound set:    %s\n"
 			" Video driver: %s\n\n",
 			BlitterFactoryBase::GetCurrentBlitter() == NULL ? "none" : BlitterFactoryBase::GetCurrentBlitter()->GetName(),
 			BaseGraphics::GetUsedSet() == NULL ? "none" : BaseGraphics::GetUsedSet()->name,
-			BaseGraphics::GetUsedSet() == NULL ? -1 : BaseGraphics::GetUsedSet()->version,
 			StrEmpty(_dynlang.curr_file) ? "none" : _dynlang.curr_file,
 			_music_driver == NULL ? "none" : _music_driver->GetName(),
 			BaseMusic::GetUsedSet() == NULL ? "none" : BaseMusic::GetUsedSet()->name,
-			BaseMusic::GetUsedSet() == NULL ? -1 : BaseMusic::GetUsedSet()->version,
 			_networking ? (_network_server ? "server" : "client") : "no",
 			_sound_driver == NULL ? "none" : _sound_driver->GetName(),
 			BaseSounds::GetUsedSet() == NULL ? "none" : BaseSounds::GetUsedSet()->name,
-			BaseSounds::GetUsedSet() == NULL ? -1 : BaseSounds::GetUsedSet()->version,
 			_video_driver == NULL ? "none" : _video_driver->GetName()
 	);

--- a/src/currency.cpp
+++ b/src/currency.cpp
@@ -14,44 +14,43 @@
 #include "news_func.h"
 #include "settings_type.h"
 #include "date_func.h"
-#include "string_type.h"

 #include "table/strings.h"

-	/*   exchange rate    prefix                         symbol_pos
-	 *   |  separator        |           postfix             |
-	 *   |   |   Euro year   |              |                | name
-	 *   |   |    |          |              |                |  | */
+	/*   exchange rate    prefix                      symbol_pos
+	 *   |  separator        |           postfix          |
+	 *   |   |   Euro year   |              |             | name
+	 *   |   |    |          |              |             |  | */
 static const CurrencySpec origin_currency_specs[NUM_CURRENCY] = {
-	{    1, "", CF_NOEURO, "\xC2\xA3",     "",              0, STR_GAME_OPTIONS_CURRENCY_GBP    }, ///< british pounds
-	{    2, "", CF_NOEURO, "$",            "",              0, STR_GAME_OPTIONS_CURRENCY_USD    }, ///< us dollars
-	{    2, "", CF_ISEURO, "\xE2\x82\xAC", "",              0, STR_GAME_OPTIONS_CURRENCY_EUR    }, ///< Euro
-	{  220, "", CF_NOEURO, "\xC2\xA5",     "",              0, STR_GAME_OPTIONS_CURRENCY_YEN    }, ///< yen
-	{   20, "", 2002,      "",             NBSP"S.",        1, STR_GAME_OPTIONS_CURRENCY_ATS    }, ///< austrian schilling
-	{   59, "", 2002,      "BEF"NBSP,      "",              0, STR_GAME_OPTIONS_CURRENCY_BEF    }, ///< belgian franc
-	{    2, "", CF_NOEURO, "CHF"NBSP,      "",              0, STR_GAME_OPTIONS_CURRENCY_CHF    }, ///< swiss franc
-	{   41, "", CF_NOEURO, "",             NBSP"K\xC4\x8D", 1, STR_GAME_OPTIONS_CURRENCY_CZK    }, ///< czech koruna
-	{    3, "", 2002,      "DM"NBSP,       "",              0, STR_GAME_OPTIONS_CURRENCY_DEM    }, ///< deutsche mark
-	{   11, "", CF_NOEURO, "",             NBSP"kr",        1, STR_GAME_OPTIONS_CURRENCY_DKK    }, ///< danish krone
-	{  245, "", 2002,      "Pts"NBSP,      "",              0, STR_GAME_OPTIONS_CURRENCY_ESP    }, ///< spanish pesetas
-	{    9, "", 2002,      "",             NBSP"mk",        1, STR_GAME_OPTIONS_CURRENCY_FIM    }, ///< finnish markka
-	{   10, "", 2002,      "FF"NBSP,       "",              0, STR_GAME_OPTIONS_CURRENCY_FRF    }, ///< french francs
-	{  500, "", 2002,      "",             "Dr.",           1, STR_GAME_OPTIONS_CURRENCY_GRD    }, ///< greek drachma
-	{  378, "", CF_NOEURO, "",             NBSP"Ft",        1, STR_GAME_OPTIONS_CURRENCY_HUF    }, ///< hungarian forint
-	{  130, "", CF_NOEURO, "",             NBSP"Kr",        1, STR_GAME_OPTIONS_CURRENCY_ISK    }, ///< icelandic krona
-	{ 2850, "", 2002,      "",             NBSP"L.",        1, STR_GAME_OPTIONS_CURRENCY_ITL    }, ///< italian lira
-	{    3, "", 2002,      "NLG"NBSP,      "",              0, STR_GAME_OPTIONS_CURRENCY_NLG    }, ///< dutch gulden
-	{   12, "", CF_NOEURO, "",             NBSP"Kr",        1, STR_GAME_OPTIONS_CURRENCY_NOK    }, ///< norwegian krone
-	{    6, "", CF_NOEURO, "",             NBSP"z\xC5\x82", 1, STR_GAME_OPTIONS_CURRENCY_PLN    }, ///< polish zloty
-	{    5, "", CF_NOEURO, "",             NBSP"Lei",       1, STR_GAME_OPTIONS_CURRENCY_RON    }, ///< romanian Lei
-	{   50, "", CF_NOEURO, "",             NBSP"p",         1, STR_GAME_OPTIONS_CURRENCY_RUR    }, ///< russian rouble
-	{  352, "", 2007,      "",             NBSP"SIT",       1, STR_GAME_OPTIONS_CURRENCY_SIT    }, ///< slovenian tolar
-	{   13, "", CF_NOEURO, "",             NBSP"Kr",        1, STR_GAME_OPTIONS_CURRENCY_SEK    }, ///< swedish krona
-	{    3, "", CF_NOEURO, "",             NBSP"TL",        1, STR_GAME_OPTIONS_CURRENCY_TRY    }, ///< turkish lira
-	{   52, "", 2009,      "",             NBSP"Sk",        1, STR_GAME_OPTIONS_CURRENCY_SKK    }, ///< slovak koruna
-	{    4, "", CF_NOEURO, "R$"NBSP,       "",              0, STR_GAME_OPTIONS_CURRENCY_BRL    }, ///< brazil real
-	{   20, "", CF_NOEURO, "",             NBSP"EEK",       1, STR_GAME_OPTIONS_CURRENCY_EEK    }, ///< estonian krooni
-	{    1, "", CF_NOEURO, "",             "",              2, STR_GAME_OPTIONS_CURRENCY_CUSTOM }, ///< custom currency
+	{    1, "", CF_NOEURO, "\xC2\xA3",     "",           0, STR_GAME_OPTIONS_CURRENCY_GBP    }, ///< british pounds
+	{    2, "", CF_NOEURO, "$",            "",           0, STR_GAME_OPTIONS_CURRENCY_USD    }, ///< us dollars
+	{    2, "", CF_ISEURO, "\xE2\x82\xAC", "",           0, STR_GAME_OPTIONS_CURRENCY_EUR    }, ///< Euro
+	{  220, "", CF_NOEURO, "\xC2\xA5",     "",           0, STR_GAME_OPTIONS_CURRENCY_YEN    }, ///< yen
+	{   20, "", 2002,      "",             " S.",        1, STR_GAME_OPTIONS_CURRENCY_ATS    }, ///< austrian schilling
+	{   59, "", 2002,      "BEF ",         "",           0, STR_GAME_OPTIONS_CURRENCY_BEF    }, ///< belgian franc
+	{    2, "", CF_NOEURO, "CHF ",         "",           0, STR_GAME_OPTIONS_CURRENCY_CHF    }, ///< swiss franc
+	{   41, "", CF_NOEURO, "",             " K\xC4\x8D", 1, STR_GAME_OPTIONS_CURRENCY_CZK    }, ///< czech koruna
+	{    3, "", 2002,      "DM ",          "",           0, STR_GAME_OPTIONS_CURRENCY_DEM    }, ///< deutsche mark
+	{   11, "", CF_NOEURO, "",             " kr",        1, STR_GAME_OPTIONS_CURRENCY_DKK    }, ///< danish krone
+	{  245, "", 2002,      "Pts ",         "",           0, STR_GAME_OPTIONS_CURRENCY_ESP    }, ///< spanish pesetas
+	{    9, "", 2002,      "",             " mk",        1, STR_GAME_OPTIONS_CURRENCY_FIM    }, ///< finnish markka
+	{   10, "", 2002,      "FF ",          "",           0, STR_GAME_OPTIONS_CURRENCY_FRF    }, ///< french francs
+	{  500, "", 2002,      "",             "Dr.",        1, STR_GAME_OPTIONS_CURRENCY_GRD    }, ///< greek drachma
+	{  378, "", CF_NOEURO, "",             " Ft",        1, STR_GAME_OPTIONS_CURRENCY_HUF    }, ///< hungarian forint
+	{  130, "", CF_NOEURO, "",             " Kr",        1, STR_GAME_OPTIONS_CURRENCY_ISK    }, ///< icelandic krona
+	{ 2850, "", 2002,      "",             " L.",        1, STR_GAME_OPTIONS_CURRENCY_ITL    }, ///< italian lira
+	{    3, "", 2002,      "NLG ",         "",           0, STR_GAME_OPTIONS_CURRENCY_NLG    }, ///< dutch gulden
+	{   12, "", CF_NOEURO, "",             " Kr",        1, STR_GAME_OPTIONS_CURRENCY_NOK    }, ///< norwegian krone
+	{    6, "", CF_NOEURO, "",             " z\xC5\x82", 1, STR_GAME_OPTIONS_CURRENCY_PLN    }, ///< polish zloty
+	{    5, "", CF_NOEURO, "",             " Lei",       1, STR_GAME_OPTIONS_CURRENCY_RON    }, ///< romanian Lei
+	{   50, "", CF_NOEURO, "",             " p",         1, STR_GAME_OPTIONS_CURRENCY_RUR    }, ///< russian rouble
+	{  352, "", 2007,      "",             " SIT",       1, STR_GAME_OPTIONS_CURRENCY_SIT    }, ///< slovenian tolar
+	{   13, "", CF_NOEURO, "",             " Kr",        1, STR_GAME_OPTIONS_CURRENCY_SEK    }, ///< swedish krona
+	{    3, "", CF_NOEURO, "",             " TL",        1, STR_GAME_OPTIONS_CURRENCY_TRY    }, ///< turkish lira
+	{   52, "", 2009,      "",             " Sk",        1, STR_GAME_OPTIONS_CURRENCY_SKK    }, ///< slovak koruna
+	{    4, "", CF_NOEURO, "R$ ",          "",           0, STR_GAME_OPTIONS_CURRENCY_BRL    }, ///< brazil real
+	{   20, "", CF_NOEURO, "",             " EEK",       1, STR_GAME_OPTIONS_CURRENCY_EEK    }, ///< estonian krooni
+	{    1, "", CF_NOEURO, "",             "",           2, STR_GAME_OPTIONS_CURRENCY_CUSTOM }, ///< custom currency
 };

 /* Array of currencies used by the system */
--- a/src/date.cpp
+++ b/src/date.cpp
@@ -218,6 +218,12 @@ static void OnNewYear()
 */
 static void OnNewMonth()
 {
+	if (_debug_desync_level > 2) {
+		char name[MAX_PATH];
+		snprintf(name, lengthof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);
+		SaveOrLoad(name, SL_SAVE, AUTOSAVE_DIR);
+	}
+
 	if (_settings_client.gui.autosave != 0 && (_cur_month % _autosave_months[_settings_client.gui.autosave]) == 0) {
 		_do_autosave = true;
 		RedrawAutosave();
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -93,7 +93,7 @@ static void debug_print(const char *dbg, const char *buf)
 		static FILE *f = FioFOpenFile("commands-out.log", "wb", AUTOSAVE_DIR);
 		if (f == NULL) return;

-		fprintf(f, "%s%s\n", GetLogPrefix(), buf);
+		fprintf(f, "%s%s", GetLogPrefix(), buf);
 		fflush(f);
 	}
 }
--- a/src/direction_type.h
+++ b/src/direction_type.h
@@ -41,7 +41,7 @@ enum Direction {
 DECLARE_POSTFIX_INCREMENT(Direction);

 /** Define basic enum properties */
-template <> struct EnumPropsT<Direction> : MakeEnumPropsT<Direction, byte, DIR_BEGIN, DIR_END, INVALID_DIR, 3> {};
+template <> struct EnumPropsT<Direction> : MakeEnumPropsT<Direction, byte, DIR_BEGIN, DIR_END, INVALID_DIR> {};
 typedef TinyEnumT<Direction> DirectionByte; // typedefing-enumification of Direction


@@ -91,7 +91,7 @@ enum DiagDirection {
 DECLARE_POSTFIX_INCREMENT(DiagDirection);

 /** Define basic enum properties */
-template <> struct EnumPropsT<DiagDirection> : MakeEnumPropsT<DiagDirection, byte, DIAGDIR_BEGIN, DIAGDIR_END, INVALID_DIAGDIR, 2> {};
+template <> struct EnumPropsT<DiagDirection> : MakeEnumPropsT<DiagDirection, byte, DIAGDIR_BEGIN, DIAGDIR_END, INVALID_DIAGDIR> {};
 typedef TinyEnumT<DiagDirection> DiagDirectionByte; // typedefing-enumification of DiagDirection


@@ -130,6 +130,5 @@ enum Axis {
 	AXIS_END,            ///< Used for iterations
 	INVALID_AXIS = 0xFF, ///< Flag for an invalid Axis
 };
-template <> struct EnumPropsT<Axis> : MakeEnumPropsT<Axis, byte, AXIS_X, AXIS_END, INVALID_AXIS, 1> {};

 #endif /* DIRECTION_TYPE_H */
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -297,11 +297,6 @@ int UpdateCompanyRatingAndValue(Company *c, bool update)
 /*  use INVALID_OWNER as new_owner to delete the company. */
 void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 {
-#ifdef ENABLE_NETWORK
-	/* In all cases, make spectators of clients connected to that company */
-	if (_networking) NetworkClientsToSpectators(old_owner);
-#endif /* ENABLE_NETWORK */
-
 	Town *t;
 	CompanyID old = _current_company;

@@ -476,6 +471,21 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 	MarkWholeScreenDirty();
 }

+static void ChangeNetworkOwner(Owner current_owner, Owner new_owner)
+{
+#ifdef ENABLE_NETWORK
+	if (!_networking) return;
+
+	if (current_owner == _local_company) {
+		SetLocalCompany(new_owner);
+	}
+
+	if (!_network_server) return;
+
+	NetworkServerChangeOwner(current_owner, new_owner);
+#endif /* ENABLE_NETWORK */
+}
+
 static void CompanyCheckBankrupt(Company *c)
 {
 	/*  If the company has money again, it does not go bankrupt */
@@ -537,6 +547,8 @@ static void CompanyCheckBankrupt(Company *c)
 			SetDParamStr(2, cni->company_name);
 			AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_BANKRUPT, cni);

+			/* Remove the company */
+			ChangeNetworkOwner(c->index, COMPANY_SPECTATOR);
 			ChangeOwnershipOfCompanyItems(c->index, INVALID_OWNER);

 			if (c->is_ai) AI::Stop(c->index);
@@ -1447,6 +1459,8 @@ static void DoAcquireCompany(Company *c)
 	AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_MERGER, cni);
 	AI::BroadcastNewEvent(new AIEventCompanyMerger(ci, _current_company));

+	/* original code does this a little bit differently */
+	ChangeNetworkOwner(ci, _current_company);
 	ChangeOwnershipOfCompanyItems(ci, _current_company);

 	if (c->bankrupt_value == 0) {
@@ -1488,12 +1502,12 @@ extern int GetAmountOwnedBy(const Company *c, Owner owner);
 CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
 	CommandCost cost(EXPENSES_OTHER);
-	CompanyID target_company = (CompanyID)p1;
-	Company *c = Company::GetIfValid(target_company);
+
+	Company *c = Company::GetIfValid(p1);

 	/* Check if buying shares is allowed (protection against modified clients)
 	 * Cannot buy own shares */
-	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == target_company) return CMD_ERROR;
+	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;

 	/* Protect new companies from hostile takeovers */
 	if (_cur_year - c->inaugurated_year < 6) return_cmd_error(STR_ERROR_PROTECTED);
@@ -1519,7 +1533,7 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1,
 				break;
 			}
 		}
-		SetWindowDirty(WC_COMPANY, target_company);
+		SetWindowDirty(WC_COMPANY, p1);
 	}
 	return cost;
 }
@@ -1534,12 +1548,11 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1,
 */
 CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	CompanyID target_company = (CompanyID)p1;
-	Company *c = Company::GetIfValid(target_company);
+	Company *c = Company::GetIfValid(p1);

 	/* Check if selling shares is allowed (protection against modified clients)
 	 * Cannot sell own shares */
-	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == target_company) return CMD_ERROR;
+	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;

 	/* Those lines are here for network-protection (clients can be slow) */
 	if (GetAmountOwnedBy(c, _current_company) == 0) return CommandCost();
@@ -1552,7 +1565,7 @@ CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1
 		OwnerByte *b = c->share_owners;
 		while (*b != _current_company) b++; // share owners is guaranteed to contain company
 		*b = COMPANY_SPECTATOR;
-		SetWindowDirty(WC_COMPANY, target_company);
+		SetWindowDirty(WC_COMPANY, p1);
 	}
 	return CommandCost(EXPENSES_OTHER, cost);
 }
@@ -1570,8 +1583,7 @@ CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1
 */
 CommandCost CmdBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	CompanyID target_company = (CompanyID)p1;
-	Company *c = Company::GetIfValid(target_company);
+	Company *c = Company::GetIfValid(p1);
 	if (c == NULL) return CMD_ERROR;

 	/* Disable takeovers when not asked */
@@ -1581,7 +1593,7 @@ CommandCost CmdBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 	if (!_networking && _local_company == c->index) return CMD_ERROR;

 	/* Do not allow companies to take over themselves */
-	if (target_company == _current_company) return CMD_ERROR;
+	if ((CompanyID)p1 == _current_company) return CMD_ERROR;

 	/* Get the cost here as the company is deleted in DoAcquireCompany. */
 	CommandCost cost(EXPENSES_OTHER, c->bankrupt_value);
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -165,20 +165,20 @@ static TrackBits MaskWireBits(TileIndex t, TrackBits tracks)
 /**
 * Get the base wire sprite to use.
 */
-static inline SpriteID GetWireBase(TileIndex tile, bool upper_halftile = false)
+static inline SpriteID GetWireBase(TileIndex tile)
 {
 	const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
-	SpriteID wires = GetCustomRailSprite(rti, tile, RTSG_WIRES, upper_halftile);
+	SpriteID wires = GetCustomRailSprite(rti, tile, RTSG_WIRES);
 	return wires == 0 ? SPR_WIRE_BASE : wires;
 }

 /**
 * Get the base pylon sprite to use.
 */
-static inline SpriteID GetPylonBase(TileIndex tile, bool upper_halftile = false)
+static inline SpriteID GetPylonBase(TileIndex tile)
 {
 	const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
-	SpriteID pylons = GetCustomRailSprite(rti, tile, RTSG_PYLONS, upper_halftile);
+	SpriteID pylons = GetCustomRailSprite(rti, tile, RTSG_PYLONS);
 	return pylons == 0 ? SPR_PYLON_BASE : pylons;
 }

@@ -274,11 +274,7 @@ static void DrawCatenaryRailway(const TileInfo *ti)

 	/* Half tile slopes coincide only with horizontal/vertical track.
 	 * Faking a flat slope results in the correct sprites on positions. */
-	Corner halftile_corner = CORNER_INVALID;
-	if (IsHalftileSlope(tileh[TS_HOME])) {
-		halftile_corner = GetHalftileSlopeCorner(tileh[TS_HOME]);
-		tileh[TS_HOME] = SLOPE_FLAT;
-	}
+	if (IsHalftileSlope(tileh[TS_HOME])) tileh[TS_HOME] = SLOPE_FLAT;

 	TLG tlg = GetTLG(ti->tile);
 	byte PCPstatus = 0;
@@ -299,17 +295,9 @@ static void DrawCatenaryRailway(const TileInfo *ti)

 	AdjustTileh(ti->tile, &tileh[TS_HOME]);

-	SpriteID pylon_normal = GetPylonBase(ti->tile);
-	SpriteID pylon_halftile = (halftile_corner != CORNER_INVALID) ? GetPylonBase(ti->tile, true) : pylon_normal;
+	SpriteID pylon_base = GetPylonBase(ti->tile);

 	for (DiagDirection i = DIAGDIR_BEGIN; i < DIAGDIR_END; i++) {
-		static const uint edge_corners[] = {
-			1 << CORNER_N | 1 << CORNER_E, // DIAGDIR_NE
-			1 << CORNER_S | 1 << CORNER_E, // DIAGDIR_SE
-			1 << CORNER_S | 1 << CORNER_W, // DIAGDIR_SW
-			1 << CORNER_N | 1 << CORNER_W, // DIAGDIR_NW
-		};
-		SpriteID pylon_base = (halftile_corner != CORNER_INVALID && HasBit(edge_corners[i], halftile_corner)) ? pylon_halftile : pylon_normal;
 		TileIndex neighbour = ti->tile + TileOffsByDiagDir(i);
 		Foundation foundation = FOUNDATION_NONE;
 		byte elevation = GetPCPElevation(ti->tile, i);
@@ -438,21 +426,11 @@ static void DrawCatenaryRailway(const TileInfo *ti)
 		if (height <= GetTileMaxZ(ti->tile) + TILE_HEIGHT) return;
 	}

-	SpriteID wire_normal = GetWireBase(ti->tile);
-	SpriteID wire_halftile = (halftile_corner != CORNER_INVALID) ? GetWireBase(ti->tile, true) : wire_normal;
-	Track halftile_track;
-	switch (halftile_corner) {
-		case CORNER_W: halftile_track = TRACK_LEFT; break;
-		case CORNER_S: halftile_track = TRACK_LOWER; break;
-		case CORNER_E: halftile_track = TRACK_RIGHT; break;
-		case CORNER_N: halftile_track = TRACK_UPPER; break;
-		default:       halftile_track = INVALID_TRACK; break;
-	}
+	SpriteID wire_base = GetWireBase(ti->tile);

 	/* Drawing of pylons is finished, now draw the wires */
 	for (Track t = TRACK_BEGIN; t < TRACK_END; t++) {
 		if (HasBit(wireconfig[TS_HOME], t)) {
-			SpriteID wire_base = (t == halftile_track) ? wire_halftile : wire_normal;
 			byte PCPconfig = HasBit(PCPstatus, PCPpositions[t][0]) +
 				(HasBit(PCPstatus, PCPpositions[t][1]) << 1);

--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -808,8 +808,6 @@ bool IsEngineBuildable(EngineID engine, VehicleType type, CompanyID company)
 	/* check if it's available */
 	if (!HasBit(e->company_avail, company)) return false;

-	if (e->info.string_id == STR_NEWGRF_INVALID_ENGINE) return false;
-
 	if (type == VEH_TRAIN) {
 		/* Check if the rail type is available to this company */
 		const Company *c = Company::Get(company);
--- a/src/fileio.cpp
+++ b/src/fileio.cpp
@@ -44,7 +44,7 @@ struct Fio {
 	FILE *handles[MAX_FILE_SLOTS];         ///< array of file handles we can have open
 	byte buffer_start[FIO_BUFFER_SIZE];    ///< local buffer when read from file
 	const char *filenames[MAX_FILE_SLOTS]; ///< array of filenames we (should) have open
-	char *shortnames[MAX_FILE_SLOTS];      ///< array of short names for spriteloader's use
+	char *shortnames[MAX_FILE_SLOTS];///< array of short names for spriteloader's use
 #if defined(LIMITED_FDS)
 	uint open_handles;                     ///< current amount of open handles
 	uint usage_count[MAX_FILE_SLOTS];      ///< count how many times this file has been opened
@@ -53,9 +53,6 @@ struct Fio {

 static Fio _fio;

-/** Whether the working directory should be scanned. */
-static bool _do_scan_working_directory = true;
-
 /* Get current position in file */
 size_t FioGetPos()
 {
@@ -451,21 +448,16 @@ void FioCreateDirectory(const char *name)
 * It does not add the path separator to zero-sized strings.
 * @param buf    string to append the separator to
 * @param buflen the length of the buf
- * @return true iff the operation succeeded
 */
-bool AppendPathSeparator(char *buf, size_t buflen)
+void AppendPathSeparator(char *buf, size_t buflen)
 {
 	size_t s = strlen(buf);

 	/* Length of string + path separator + '\0' */
-	if (s != 0 && buf[s - 1] != PATHSEPCHAR) {
-		if (s + 2 >= buflen) return false;
-
+	if (s != 0 && buf[s - 1] != PATHSEPCHAR && s + 2 < buflen) {
 		buf[s]     = PATHSEPCHAR;
 		buf[s + 1] = '\0';
 	}
-
-	return true;
 }

 /**
@@ -542,18 +534,7 @@ static void SimplifyFileName(char *name)
 #endif
 }

-/* static */ uint TarScanner::DoScan() {
-	DEBUG(misc, 1, "Scanning for tars");
-	TarScanner fs;
-	uint num = fs.Scan(".tar", DATA_DIR, false);
-	num += fs.Scan(".tar", AI_DIR, false);
-	num += fs.Scan(".tar", AI_LIBRARY_DIR, false);
-	num += fs.Scan(".tar", SCENARIO_DIR, false);
-	DEBUG(misc, 1, "Scan complete, found %d files", num);
-	return num;
-}
-
-bool TarScanner::AddFile(const char *filename, size_t basepath_length)
+bool TarListAddFile(const char *filename)
 {
 	/* The TAR-header, repeated for every file */
 	typedef struct TarHeader {
@@ -839,6 +820,66 @@ bool ExtractTar(const char *tar_filename)
 	return true;
 }

+static int ScanPathForTarFiles(const char *path, size_t basepath_length)
+{
+	extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
+
+	uint num = 0;
+	struct stat sb;
+	struct dirent *dirent;
+	DIR *dir;
+
+	if (path == NULL || (dir = ttd_opendir(path)) == NULL) return 0;
+
+	while ((dirent = readdir(dir)) != NULL) {
+		const char *d_name = FS2OTTD(dirent->d_name);
+		char filename[MAX_PATH];
+
+		if (!FiosIsValidFile(path, dirent, &sb)) continue;
+
+		snprintf(filename, lengthof(filename), "%s%s", path, d_name);
+
+		if (S_ISDIR(sb.st_mode)) {
+			/* Directory */
+			if (strcmp(d_name, ".") == 0 || strcmp(d_name, "..") == 0) continue;
+			AppendPathSeparator(filename, lengthof(filename));
+			num += ScanPathForTarFiles(filename, basepath_length);
+		} else if (S_ISREG(sb.st_mode)) {
+			/* File */
+			char *ext = strrchr(filename, '.');
+
+			/* If no extension or extension isn't .tar, skip the file */
+			if (ext == NULL) continue;
+			if (strcasecmp(ext, ".tar") != 0) continue;
+
+			if (TarListAddFile(filename)) num++;
+		}
+	}
+
+	closedir(dir);
+	return num;
+}
+
+void ScanForTarFiles()
+{
+	Searchpath sp;
+	char path[MAX_PATH];
+	uint num = 0;
+
+	DEBUG(misc, 1, "Scanning for tars");
+	FOR_ALL_SEARCHPATHS(sp) {
+		FioAppendDirectory(path, MAX_PATH, sp, DATA_DIR);
+		num += ScanPathForTarFiles(path, strlen(path));
+		FioAppendDirectory(path, MAX_PATH, sp, AI_DIR);
+		num += ScanPathForTarFiles(path, strlen(path));
+		FioAppendDirectory(path, MAX_PATH, sp, AI_LIBRARY_DIR);
+		num += ScanPathForTarFiles(path, strlen(path));
+		FioAppendDirectory(path, MAX_PATH, sp, SCENARIO_DIR);
+		num += ScanPathForTarFiles(path, strlen(path));
+	}
+	DEBUG(misc, 1, "Scan complete, found %d files", num);
+}
+
 #if defined(WIN32) || defined(WINCE)
 /**
 * Determine the base (personal dir and game data dir) paths
@@ -878,33 +919,6 @@ void ChangeWorkingDirectory(const char *exe)
 #endif /* WITH_COCOA */
 }

-/**
- * Whether we should scan the working directory.
- * It should not be scanned if it's the root or
- * the home directory as in both cases a big data
- * directory can cause huge amounts of unrelated
- * files scanned. Furthermore there are nearly no
- * use cases for the home/root directory to have
- * OpenTTD directories.
- * @return true if it should be scanned.
- */
-bool DoScanWorkingDirectory()
-{
-	/* No working directory, so nothing to do. */
-	if (_searchpaths[SP_WORKING_DIR] == NULL) return false;
-
-	/* Working directory is root, so do nothing. */
-	if (strcmp(_searchpaths[SP_WORKING_DIR], PATHSEP) == 0) return false;
-
-	/* No personal/home directory, so the working directory won't be that. */
-	if (_searchpaths[SP_PERSONAL_DIR] == NULL) return true;
-
-	char tmp[MAX_PATH];
-	snprintf(tmp, lengthof(tmp), "%s%s", _searchpaths[SP_WORKING_DIR], PERSONAL_DIR);
-	AppendPathSeparator(tmp, MAX_PATH);
-	return strcmp(tmp, _searchpaths[SP_PERSONAL_DIR]) != 0;
-}
-
 /**
 * Determine the base (personal dir and game data dir) paths
 * @param exe the path to the executable
@@ -950,8 +964,6 @@ void DetermineBasePaths(const char *exe)
 	_searchpaths[SP_WORKING_DIR] = strdup(tmp);
 #endif

-	_do_scan_working_directory = DoScanWorkingDirectory();
-
 	/* Change the working directory to that one of the executable */
 	ChangeWorkingDirectory(exe);
 	if (getcwd(tmp, MAX_PATH) == NULL) *tmp = '\0';
@@ -992,10 +1004,7 @@ void DeterminePaths(const char *exe)
 	DetermineBasePaths(exe);

 	Searchpath sp;
-	FOR_ALL_SEARCHPATHS(sp) {
-		if (sp == SP_WORKING_DIR && !_do_scan_working_directory) continue;
-		DEBUG(misc, 4, "%s added as search path", _searchpaths[sp]);
-	}
+	FOR_ALL_SEARCHPATHS(sp) DEBUG(misc, 4, "%s added as search path", _searchpaths[sp]);

 	if (_config_file != NULL) {
 		_personal_dir = strdup(_config_file);
@@ -1070,7 +1079,7 @@ void DeterminePaths(const char *exe)
 	}
 #endif /* ENABLE_NETWORK */

-	TarScanner::DoScan();
+	ScanForTarFiles();
 }

 /**
@@ -1149,7 +1158,7 @@ static uint ScanPath(FileScanner *fs, const char *extension, const char *path, s
 			/* Directory */
 			if (!recursive) continue;
 			if (strcmp(d_name, ".") == 0 || strcmp(d_name, "..") == 0) continue;
-			if (!AppendPathSeparator(filename, lengthof(filename))) continue;
+			AppendPathSeparator(filename, lengthof(filename));
 			num += ScanPath(fs, extension, filename, basepath_length, recursive);
 		} else if (S_ISREG(sb.st_mode)) {
 			/* File */
@@ -1211,9 +1220,6 @@ uint FileScanner::Scan(const char *extension, Subdirectory sd, bool tars, bool r
 	uint num = 0;

 	FOR_ALL_SEARCHPATHS(sp) {
-		/* Don't search in the working directory */
-		if (sp == SP_WORKING_DIR && !_do_scan_working_directory) continue;
-
 		FioAppendDirectory(path, MAX_PATH, sp, sd);
 		num += ScanPath(this, extension, path, strlen(path), recursive);
 	}
@@ -1239,6 +1245,6 @@ uint FileScanner::Scan(const char *extension, const char *directory, bool recurs
 {
 	char path[MAX_PATH];
 	strecpy(path, directory, lastof(path));
-	if (!AppendPathSeparator(path, lengthof(path))) return 0;
+	AppendPathSeparator(path, lengthof(path));
 	return ScanPath(this, extension, path, strlen(path), recursive);
 }
--- a/src/fileio_func.h
+++ b/src/fileio_func.h
@@ -57,7 +57,7 @@ char *FioAppendDirectory(char *buf, size_t buflen, Searchpath sp, Subdirectory s
 char *FioGetDirectory(char *buf, size_t buflen, Subdirectory subdir);

 void SanitizeFilename(char *filename);
-bool AppendPathSeparator(char *buf, size_t buflen);
+void AppendPathSeparator(char *buf, size_t buflen);
 void DeterminePaths(const char *exe);
 void *ReadFileToMem(const char *filename, size_t *lenp, size_t maxsize);
 bool FileExists(const char *filename);
@@ -87,14 +87,6 @@ public:
 	virtual bool AddFile(const char *filename, size_t basepath_length) = 0;
 };

-/** Helper for scanning for files with tar as extension */
-class TarScanner : FileScanner {
-public:
-	/* virtual */ bool AddFile(const char *filename, size_t basepath_length);
-
-	/** Do the scan for Tars. */
-	static uint DoScan();
-};

 /* Implementation of opendir/readdir/closedir for Windows */
 #if defined(WIN32)
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -313,44 +313,23 @@ static int CALLBACK EnumFontCallback(const ENUMLOGFONTEX *logfont, const NEWTEXT
 		if ((fs.fsCsb[0] & info->locale.lsCsbSupported[0]) == 0 && (fs.fsCsb[1] & info->locale.lsCsbSupported[1]) == 0) return 1;
 	}

-	char font_name[MAX_PATH];
-#if defined(UNICODE)
-	WIDE_TO_MB_BUFFER((const TCHAR*)logfont->elfFullName, font_name, lengthof(font_name));
-#else
-	strecpy(font_name, (const TCHAR*)logfont->elfFullName, lastof(font_name));
-#endif
-
-	/* Add english name after font name */
 	const char *english_name = GetEnglishFontName(logfont);
-	strecpy(font_name + strlen(font_name) + 1, english_name, lastof(font_name));
-
-	/* Check whether we can actually load the font. */
-	bool ft_init = _library != NULL;
-	bool found = false;
-	FT_Face face;
-	/* Init FreeType if needed. */
-	if ((ft_init || FT_Init_FreeType(&_library) == FT_Err_Ok) && GetFontByFaceName(font_name, &face) == FT_Err_Ok) {
-		FT_Done_Face(face);
-		found = true;
-	}
-	if (!ft_init) {
-		/* Uninit FreeType if we did the init. */
-		FT_Done_FreeType(_library);
-		_library = NULL;
-	}
-
-	if (!found) return 1;
-
+	const char *font_name = WIDE_TO_MB((const TCHAR*)logfont->elfFullName);
 	DEBUG(freetype, 1, "Fallback font: %s (%s)", font_name, english_name);
+
 	strecpy(info->settings->small_font,  font_name, lastof(info->settings->small_font));
 	strecpy(info->settings->medium_font, font_name, lastof(info->settings->medium_font));
 	strecpy(info->settings->large_font,  font_name, lastof(info->settings->large_font));
+
+	/* Add english name after font name */
+	strecpy(info->settings->small_font + strlen(info->settings->small_font) + 1, english_name, lastof(info->settings->small_font));
+	strecpy(info->settings->medium_font + strlen(info->settings->medium_font) + 1, english_name, lastof(info->settings->medium_font));
+	strecpy(info->settings->large_font + strlen(info->settings->large_font) + 1, english_name, lastof(info->settings->large_font));
 	return 0; // stop enumerating
 }

 bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, int winlangid, const char *str)
 {
-	DEBUG(freetype, 1, "Trying fallback fonts");
 	EFCParam langInfo;
 	if (GetLocaleInfo(MAKELCID(winlangid, SORT_DEFAULT), LOCALE_FONTSIGNATURE, (LPTSTR)&langInfo.locale, sizeof(langInfo.locale) / sizeof(TCHAR)) == 0) {
 		/* Invalid langid or some other mysterious error, can't determine fallback font. */
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -176,8 +176,9 @@ static void _GenerateWorld(void *)
 		ShowNewGRFError();

 		if (_network_dedicated) DEBUG(net, 0, "Map generated, starting game");
-		DEBUG(desync, 1, "new_map: %08x", _settings_game.game_creation.generation_seed);
+		DEBUG(desync, 1, "new_map: %i\n", _settings_game.game_creation.generation_seed);

+		if (_settings_client.gui.pause_on_newgame && _game_mode == GM_NORMAL) DoCommandP(0, PM_PAUSED_NORMAL, 1, CMD_PAUSE);
 		if (_debug_desync_level > 0) {
 			char name[MAX_PATH];
 			snprintf(name, lengthof(name), "dmp_cmds_%08x_%08x.sav", _settings_game.game_creation.generation_seed, _date);
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -677,7 +677,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {

 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
-		EventState state = ES_NOT_HANDLED;
+		EventState state;
 		this->HandleEditBoxKey(GLAND_RANDOM_EDITBOX, key, keycode, state);
 		/* the seed is unsigned, therefore atoi cannot be used.
 		 * As UINT32_MAX is a 'magic' value (use random seed) it
--- a/src/gfx_type.h
+++ b/src/gfx_type.h
@@ -196,7 +196,6 @@ enum Colours {
 	COLOUR_END,
 	INVALID_COLOUR = 0xFF,
 };
-template <> struct EnumPropsT<Colours> : MakeEnumPropsT<Colours, byte, COLOUR_DARK_BLUE, COLOUR_END, INVALID_COLOUR, 4> {};

 /** Colour of the strings, see _string_colourmap in table/palettes.h or docs/ottd-colourtext-palette.png */
 enum TextColour {
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -203,9 +203,9 @@ void GfxLoadSprites()
 	GfxInitPalettes();
 }

-bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *full_filename)
+bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path)
 {
-	bool ret = this->BaseSet<GraphicsSet, MAX_GFT, DATA_DIR>::FillSetDetails(ini, path, full_filename, false);
+	bool ret = this->BaseSet<GraphicsSet, MAX_GFT, DATA_DIR>::FillSetDetails(ini, path, false);
 	if (ret) {
 		IniGroup *metadata = ini->GetGroup("metadata");
 		IniItem *item;
@@ -213,7 +213,7 @@ bool GraphicsSet::FillSetDetails(IniFile *ini, const char *path, const char *ful
 		fetch_metadata("palette");
 		this->palette = (*item->value == 'D' || *item->value == 'd') ? PAL_DOS : PAL_WINDOWS;
 	}
-	return ret;
+	return true;
 }


--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -88,11 +88,11 @@ struct GraphLegendWindow : Window {
 		ToggleBit(_legend_excluded_companies, widget - GLW_FIRST_COMPANY);
 		this->ToggleWidgetLoweredState(widget);
 		this->SetDirty();
-		InvalidateWindowData(WC_INCOME_GRAPH, 0);
-		InvalidateWindowData(WC_OPERATING_PROFIT, 0);
-		InvalidateWindowData(WC_DELIVERED_CARGO, 0);
-		InvalidateWindowData(WC_PERFORMANCE_HISTORY, 0);
-		InvalidateWindowData(WC_COMPANY_VALUE, 0);
+		SetWindowDirty(WC_INCOME_GRAPH, 0);
+		SetWindowDirty(WC_OPERATING_PROFIT, 0);
+		SetWindowDirty(WC_DELIVERED_CARGO, 0);
+		SetWindowDirty(WC_PERFORMANCE_HISTORY, 0);
+		SetWindowDirty(WC_COMPANY_VALUE, 0);
 	}

 	virtual void OnInvalidateData(int data)
@@ -199,33 +199,25 @@ protected:
 	byte colours[GRAPH_MAX_DATASETS];
 	OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][GRAPH_NUM_MONTHS]; ///< Stored costs for the last #GRAPH_NUM_MONTHS months

-	/**
-	 * Get the highest value of the graph's data. Excluded data is ignored to allow showing smaller values in
-	 * better detail when disabling higher ones.
-	 * @return Highest value of the graph (ignoring disabled data).
-	 */
-	int64 GetHighestValue() const
+	int64 GetHighestValue(int initial_highest_value) const
 	{
-		OverflowSafeInt64 highest_value = 0;
+		OverflowSafeInt64 highest_value = initial_highest_value;

 		for (int i = 0; i < this->num_dataset; i++) {
-			if (HasBit(this->excluded_data, i)) continue;
-			for (int j = 0; j < this->num_on_x_axis; j++) {
-				OverflowSafeInt64 datapoint = this->cost[i][j];
+			if (!HasBit(this->excluded_data, i)) {
+				for (int j = 0; j < this->num_on_x_axis; j++) {
+					OverflowSafeInt64 datapoint = this->cost[i][j];

-				if (datapoint != INVALID_DATAPOINT) {
-					/* For now, if the graph has negative values the scaling is
-					 * symmetrical about the x axis, so take the absolute value
-					 * of each data point. */
-					highest_value = max(highest_value, abs(datapoint));
+					if (datapoint != INVALID_DATAPOINT) {
+						/* For now, if the graph has negative values the scaling is
+						 * symmetrical about the x axis, so take the absolute value
+						 * of each data point. */
+						highest_value = max(highest_value, abs(datapoint));
+					}
 				}
 			}
 		}

-		/* Prevent showing the highest value too close to the graph upper limit. */
-		highest_value = (11 * highest_value) / 10;
-		/* Avoid using zero as the highest value. */
-		if (highest_value == 0) highest_value = GRAPH_NUM_LINES_Y - 1;
 		/* Round up highest_value so that it will divide cleanly into the number of
 		 * axis labels used. */
 		int round_val = highest_value % (GRAPH_NUM_LINES_Y - 1);
@@ -282,7 +274,13 @@ protected:
 		r.left   += 9;
 		r.right  -= 5;

-		highest_value = GetHighestValue();
+		/* Start of with a highest_value of twice the height of the graph in pixels.
+		 * It's a bit arbitrary, but it makes the cargo payment graph look a little
+		 * nicer, and prevents division by zero when calculating where the datapoint
+		 * should be drawn. */
+		highest_value = r.bottom - r.top + 1;
+		if (!this->has_negative_values) highest_value *= 2;
+		highest_value = GetHighestValue(highest_value);

 		/* Get width for Y labels */
 		int label_width = GetYLabelWidth(highest_value);
@@ -526,11 +524,6 @@ public:
 		this->UpdateStatistics(false);
 	}

-	virtual void OnInvalidateData(int data)
-	{
-		this->UpdateStatistics(true);
-	}
-
 	/**
 	 * Update the statistics.
 	 * @param initialize Initialize the data structure.
@@ -903,11 +896,6 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
 		/* Override default OnTick */
 	}

-	virtual void OnInvalidateData(int data)
-	{
-		this->OnHundredthTick();
-	}
-
 	virtual void OnHundredthTick()
 	{
 		this->excluded_data = _legend_excluded_cargo;
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -10,7 +10,6 @@
 /** @file group_cmd.cpp Handling of the engine groups */

 #include "stdafx.h"
-#include "cmd_helper.h"
 #include "command_func.h"
 #include "group.h"
 #include "train.h"
@@ -83,7 +82,7 @@ void InitializeGroup()
 */
 CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	VehicleType vt = Extract<VehicleType, 0, 3>(p1);
+	VehicleType vt = (VehicleType)p1;
 	if (!IsCompanyBuildableVehicleType(vt)) return CMD_ERROR;

 	if (!Group::CanAllocateItem()) return CMD_ERROR;
@@ -259,12 +258,13 @@ CommandCost CmdAddVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, u
 */
 CommandCost CmdAddSharedVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	VehicleType type = Extract<VehicleType, 0, 3>(p2);
-	GroupID id_g = p1;
-	if (!Group::IsValidID(id_g) || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;
+	VehicleType type = (VehicleType)p2;
+	if (!Group::IsValidID(p1) || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;

 	if (flags & DC_EXEC) {
 		Vehicle *v;
+		VehicleType type = (VehicleType)p2;
+		GroupID id_g = p1;

 		/* Find the first front engine which belong to the group id_g
 		 * then add all shared vehicles of this front engine to the group id_g */
@@ -298,13 +298,13 @@ CommandCost CmdAddSharedVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32
 */
 CommandCost CmdRemoveAllVehiclesGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	GroupID old_g = p1;
-	Group *g = Group::GetIfValid(old_g);
-	VehicleType type = Extract<VehicleType, 0, 3>(p2);
+	Group *g = Group::GetIfValid(p1);
+	VehicleType type = (VehicleType)p2;

 	if (g == NULL || g->owner != _current_company || !IsCompanyBuildableVehicleType(type)) return CMD_ERROR;

 	if (flags & DC_EXEC) {
+		GroupID old_g = p1;
 		Vehicle *v;

 		/* Find each Vehicle that belongs to the group old_g and add it to the default group */
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -381,12 +381,12 @@ public:
 	{
 		switch (widget) {
 			case GRP_WIDGET_ALL_VEHICLES:
-				DrawString(r.left + WD_FRAMERECT_LEFT + 8, r.right - WD_FRAMERECT_RIGHT - 8, r.top + WD_FRAMERECT_TOP + 1,
+				DrawString(r.left + WD_FRAMERECT_LEFT + 8, r.right - WD_FRAMERECT_RIGHT - 8, r.top + WD_MATRIX_TOP,
 						STR_GROUP_ALL_TRAINS + this->vehicle_type, IsAllGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
 				break;

 			case GRP_WIDGET_DEFAULT_VEHICLES:
-				DrawString(r.left + WD_FRAMERECT_LEFT + 8, r.right - WD_FRAMERECT_RIGHT - 8, r.top + WD_FRAMERECT_TOP + 1,
+				DrawString(r.left + WD_FRAMERECT_LEFT + 8, r.right - WD_FRAMERECT_RIGHT - 8, r.top + WD_MATRIX_TOP,
 						STR_GROUP_DEFAULT_TRAINS + this->vehicle_type, IsDefaultGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
 				break;

--- a/src/industry.h
+++ b/src/industry.h
@@ -26,7 +26,7 @@ extern IndustryPool _industry_pool;
 * Defines the internal data of a functionnal industry
 */
 struct Industry : IndustryPool::PoolItem<&_industry_pool> {
-	typedef PersistentStorageArray<int32, 16> PersistentStorage;
+	typedef PersistentStorageArray<uint32, 16> PersistentStorage;

 	TileArea location;                  ///< Location of the industry
 	const Town *town;                   ///< Nearest town
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -1512,14 +1512,31 @@ static bool CheckIfCanLevelIndustryPlatform(TileIndex tile, DoCommandFlag flags,
 }


-static bool CheckIfFarEnoughFromConflictingIndustry(TileIndex tile, int type)
+static bool CheckIfFarEnoughFromIndustry(TileIndex tile, int type)
 {
 	const IndustrySpec *indspec = GetIndustrySpec(type);
 	const Industry *i;
+
+	if (_settings_game.economy.same_industry_close && indspec->IsRawIndustry())
+		/* Allow primary industries to be placed close to any other industry */
+		return true;
+
 	FOR_ALL_INDUSTRIES(i) {
 		/* Within 14 tiles from another industry is considered close */
 		bool in_low_distance = DistanceMax(tile, i->location.tile) <= 14;

+		/* check if an industry that accepts the same goods is nearby */
+		if (in_low_distance &&
+				!indspec->IsRawIndustry() && // not a primary industry?
+				indspec->accepts_cargo[0] == i->accepts_cargo[0] && (
+				/* at least one of those options must be true */
+				_game_mode != GM_EDITOR || // editor must not be stopped
+				!_settings_game.economy.same_industry_close ||
+				!_settings_game.economy.multiple_industry_per_town)) {
+			_error_message = STR_ERROR_INDUSTRY_TOO_CLOSE;
+			return false;
+		}
+
 		/* check if there are any conflicting industry types around */
 		if ((i->type == indspec->conflicting[0] ||
 				i->type == indspec->conflicting[1] ||
@@ -1688,7 +1705,7 @@ static Industry *CreateNewIndustryHelper(TileIndex tile, IndustryType type, DoCo
 	}

 	if (!custom_shape_check && _settings_game.game_creation.land_generator == LG_TERRAGENESIS && _generating_world && !_ignore_restrictions && !CheckIfCanLevelIndustryPlatform(tile, DC_NO_WATER, it, type)) return NULL;
-	if (!CheckIfFarEnoughFromConflictingIndustry(tile, type)) return NULL;
+	if (!CheckIfFarEnoughFromIndustry(tile, type)) return NULL;

 	const Town *t = FindTownForIndustry(tile, type);
 	if (t == NULL) return NULL;
@@ -1736,10 +1753,6 @@ CommandCost CmdBuildIndustry(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		return CMD_ERROR;
 	}

-	if (_game_mode != GM_EDITOR && !CheckIfCallBackAllowsAvailability(it, IACT_USERCREATION)) {
-		return CMD_ERROR;
-	}
-
 	const Industry *ind = NULL;
 	if (_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indspec->IsRawIndustry()) {
 		if (flags & DC_EXEC) {
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -374,13 +374,15 @@ public:
 					uint16 callback_res = GetIndustryCallback(CBID_INDUSTRY_FUND_MORE_TEXT, 0, 0, NULL, this->selected_type, INVALID_TILE);
 					if (callback_res != CALLBACK_FAILED) {  // Did it fail?
 						str = GetGRFStringID(indsp->grf_prop.grffile->grfid, 0xD000 + callback_res);  // No. here's the new string
-						if (str != STR_UNDEFINED) {
-							PrepareTextRefStackUsage(6);
-							DrawStringMultiLine(left, right, y, bottom, str);
-							StopTextRefStackUsage();
-						}
 					}
 				}
+
+				/* Draw the Additional purchase text, provided by newgrf callback, if any.
+				 * Otherwhise, will print Nothing */
+				if (str != STR_NULL && str != STR_UNDEFINED) {
+					SetDParam(0, str);
+					DrawStringMultiLine(left, right, y, bottom, STR_JUST_STRING);
+				}
 			} break;
 		}
 	}
@@ -404,10 +406,8 @@ public:

 					this->SetDirty();

-					if (GetCallbackWnd() == this &&
-							((_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indsp != NULL && indsp->IsRawIndustry()) ||
-							this->selected_type == INVALID_INDUSTRYTYPE ||
-							!this->enabled[this->selected_index])) {
+					if ((_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indsp != NULL && indsp->IsRawIndustry()) ||
+							this->selected_type == INVALID_INDUSTRYTYPE) {
 						/* Reset the button state if going to prospecting or "build many industries" */
 						this->RaiseButtons();
 						ResetObjectToPlace();
@@ -955,14 +955,18 @@ protected:
 	/** Sort industries by production and name */
 	static int CDECL IndustryProductionSorter(const Industry * const *a, const Industry * const *b)
 	{
-		uint prod_a = 0, prod_b = 0;
-		for (uint i = 0; i < lengthof((*a)->produced_cargo); i++) {
-			if ((*a)->produced_cargo[i] != CT_INVALID) prod_a += (*a)->last_month_production[i];
-			if ((*b)->produced_cargo[i] != CT_INVALID) prod_b += (*b)->last_month_production[i];
-		}
-		int r = prod_a - prod_b;
+		int r = 0;

-		return (r == 0) ? IndustryTypeSorter(a, b) : r;
+		if ((*a)->produced_cargo[0] == CT_INVALID) {
+			if ((*b)->produced_cargo[0] != CT_INVALID) return -1;
+		} else {
+			if ((*b)->produced_cargo[0] == CT_INVALID) return 1;
+
+			r = ((*a)->last_month_production[0] + (*a)->last_month_production[1]) -
+			    ((*b)->last_month_production[0] + (*b)->last_month_production[1]);
+		}
+
+		return (r == 0) ? IndustryNameSorter(a, b) : r;
 	}

 	/** Sort industries by transported cargo and name */
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -604,8 +604,8 @@ CommandCost CmdLandscapeClear(TileIndex tile, DoCommandFlag flags, uint32 p1, ui

 /** Clear a big piece of landscape
 * @param tile end tile of area dragging
- * @param flags of operation to conduct
 * @param p1 start tile of area dragging
+ * @param flags of operation to conduct
 * @param p2 unused
 * @param text unused
 * @return the cost of this operation or an error
@@ -827,8 +827,6 @@ static void CreateDesertOrRainForest()
 	for (TileIndex tile = 0; tile != MapSize(); ++tile) {
 		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

-		if (!IsValidTile(tile)) continue;
-
 		for (data = _make_desert_or_rainforest_data;
 				data != endof(_make_desert_or_rainforest_data); ++data) {
 			TileIndex t = AddTileIndexDiffCWrap(tile, *data);
@@ -847,8 +845,6 @@ static void CreateDesertOrRainForest()
 	for (TileIndex tile = 0; tile != MapSize(); ++tile) {
 		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

-		if (!IsValidTile(tile)) continue;
-
 		for (data = _make_desert_or_rainforest_data;
 				data != endof(_make_desert_or_rainforest_data); ++data) {
 			TileIndex t = AddTileIndexDiffCWrap(tile, *data);
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -1099,6 +1099,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :geen
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :as ander nywerhede
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :vooruitsigting
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Laat meer as een soortgelyke nywerhede per dorp toe: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Nywerhede van die selfde tipe kan naby aan mekaar gebou word: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Toon altyd lang datum in die standbaan: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Toon seine op die bestuur kant: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Toon finansies venster op die einde van die jaar: {ORANGE}{STRING}
@@ -2124,7 +2125,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stasie t
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NuweGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Vrag aangeneem: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Spoorlyn spoed limiet: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rotse
@@ -2346,6 +2346,8 @@ STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Gelyke lê
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Gestrem

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Invoer NewGRF parameters
+
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Beskikbaar NewGRF lêers
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Voeg na seleksie
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Voeg die verkiesde NewGRF lêer na u configurasie
@@ -4108,5 +4110,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -1098,6 +1098,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :بدون
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :ككل المصانع الأخرى
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :تنقيب
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}السماح بوجود اكثر من مصنع من نفس النوع في المدينة الواحدة: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}من الممكن بناء مصانع من نفس النوع بجوار بعض: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}استخدام التاريخ الطويل في لوحة العرض دائما: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}اظهار الاشارات على جهة السائق: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}أعرض نافذة المالية في آخر السنه: {ORANGE}{STRING}
@@ -2123,7 +2124,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}نوع
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}الشحنة المقبولة: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA} /8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}حدود سرعة سكة الحديد: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :صخور
@@ -2345,6 +2345,8 @@ STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}لم يت
 STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}معطل

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}ادخل اعدادات NewGRF
+
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}ملفات NewGFR المتاحة
 STR_NEWGRF_ADD_FILE                                             :{BLACK}اضف الى الخيارات
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}اضف ملف NewGFR المختار الى اعداداتك الخاصة
@@ -4107,5 +4109,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -216,7 +216,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Entre com o filtro desejado
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Entre uma palavra a ser filtrada
@@ -372,7 +371,7 @@ STR_MAP_MENU_SIGN_LIST                                          :Lista de placas
 ############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
 STR_TOWN_MENU_TOWN_DIRECTORY                                    :Lista de cidades
 ############ end of the 'Display map' dropdown
-STR_TOWN_MENU_FOUND_TOWN                                        :Fundar cidade
+STR_TOWN_MENU_FOUND_TOWN                                        :Cidade encontrada
 ############ end of the 'Town' dropdown

 ############ range for subsidies menu starts
@@ -1086,7 +1085,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Sistema
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Original
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realista
 STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Inclinação do terreno para trens{ORANGE}{STRING}%
-STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Proibir trens e embarcações girar em angulos de 90° graus: {ORANGE}{STRING} {LTBLUE} (indisp. com OPF)
+STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Proibir trens e embarcações girar em angulos de 90 graus: {ORANGE}{STRING} {LTBLUE} (indisp. com OPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Unir estações ferroviárias construídas juntas: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Permitie unir estações não adjacentes: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo de carregamento melhorado: {ORANGE}{STRING}
@@ -1100,6 +1099,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :nenhum
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :como as outras indústrias
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :em prospecção
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Permitir várias indústrias semelhantes por cidade: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Indústrias do mesmo tipo podem ser construídas próximas: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Sempre exibir a data completa na barra de estado: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Exibir sinais no lado da circulação: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Exibir janela das finanças no fim do ano: {ORANGE}{STRING}
@@ -1752,7 +1752,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :conexão perdid
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :erro de protocolo
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF errado
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :não autorizado
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :um pacote inválido ou inesperado foi recebido
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :recebido um pacote estranho
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :versão incorreta
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nome já está em uso
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :senha incorreta
@@ -1770,7 +1770,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Jogo ainda paus
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Jogo ainda pausado ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Jogo ainda pausado ({STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Jogo despausado ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :número de jogadores
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :jogadores insuficientes
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :clientes conectando-se
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :manual
 ############ End of leave-in-this-order
@@ -2115,7 +2115,7 @@ STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/D
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Proprietário: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Dono da estrada: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Dono da linha de bonde: {LTBLUE}{STRING}
-STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Dono da linha ferroviária: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Dono da linha de trem: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoridade local: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nenhum
 STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
@@ -2125,7 +2125,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipo de
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceita: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Velocidade limite do trilho: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rochas
@@ -2348,12 +2347,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desativado

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Insira novos parâmetros de NewGRF

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}NewGRF disponíveis
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Adicionar à seleção
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Adiciona o NewGRF selecionado à sua configuração
@@ -2395,8 +2389,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}arquivo(
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Arquivo(s) GRF faltantes
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Despausar pode travar OpenTTD. Não envie relatórios de erros sobre travas subsequentes.{}Você realmente quer despausar?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}'{0:STRING}' tem altas chances de causar desincronias e/ou travamentos.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Muda o tamanho de um veículo para '{1:ENGINE}' apesar de não estar em um depósito.
@@ -2406,13 +2398,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}O NewGRF
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}A informação de adaptação para '{1:ENGINE}' difere da lista de compras após a construção. Isso pode causar erros na autosubstituição/autoadaptação.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' causou um loop infinito no callback da produção.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<carga inválida>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} de <carga inválida>
-STR_NEWGRF_INVALID_ENGINE                                       :<locom. inválida>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<indústria inválida>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de Placas - {COMMA} Placa{P "" s}

@@ -2765,7 +2750,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} G
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Depósito Naval de {TOWN}
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veículo{P "" s}{STRING}
@@ -2962,8 +2946,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Manuten
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Manutenção no Hangar de {STATION}
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Manutenção no Hangar de {STATION}, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalhes)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
@@ -3134,7 +3116,7 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Manutenção se

 STR_ORDER_NEAREST_DEPOT                                         :mais próximo
 STR_ORDER_NEAREST_HANGAR                                        :hangar mais próximo
-STR_ORDER_TRAIN_DEPOT                                           :Depósito Ferroviário
+STR_ORDER_TRAIN_DEPOT                                           :Depósito de Trem
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de Veículos
 STR_ORDER_SHIP_DEPOT                                            :Depósito de Navios
 STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
@@ -3471,7 +3453,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Impossí
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Impossível construir depósito aqui...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Impossível construir depósito naval aqui...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}O trem deve estar parado dentro do depósito
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... deve estar parado dentro de uma garagem
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}A embarcação deve estar parado no depósito naval
@@ -3501,7 +3482,6 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Remova o
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Tipo de linha não apropriado
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Remova a ferrovia antes
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Rua é mão única ou está bloqueado
-STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Cruzamentos de nível não são permitidos para esse tipo de trilho
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Impossível construir sinais aqui...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Impossível construir ferrovia aqui...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Impossível remover a ferrovia daqui...
@@ -3529,7 +3509,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Impossí

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... árvore já plantada aqui
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... terreno errado para esse tipo de árvore
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Impossível plantar árvore aqui...

 # Bridge related errors
@@ -3540,7 +3519,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Extremid
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Ponte é muito baixa para o terreno
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Inicio e fim devem estar alinhados
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... os extremos da ponte devem estar sobre a terra
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... ponte muito longa

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Impossível construir túnel aqui...
@@ -3653,9 +3631,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Impossí
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Impossível alterar nome da placa...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Impossível remover placa

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Um clone de Transport Tycoon Deluxe
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Edifício alto de escritórios
@@ -4046,7 +4021,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} de {
 STR_FORMAT_WAYPOINT_NAME                                        :Ponto de controle {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Ponto de controle {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :estação desconhecida
 STR_DEFAULT_SIGN_NAME                                           :Placa
 STR_COMPANY_SOMEONE                                             :alguém
@@ -4136,5 +4110,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -29,7 +29,7 @@ STR_JUST_NOTHING                                                :Нищо
 # Cargo related strings
 # Plural cargo name
 STR_CARGO_PLURAL_NOTHING                                        :
-STR_CARGO_PLURAL_PASSENGERS                                     :Пътници
+STR_CARGO_PLURAL_PASSENGERS                                     :пасажери
 STR_CARGO_PLURAL_COAL                                           :Въглища
 STR_CARGO_PLURAL_MAIL                                           :Поща
 STR_CARGO_PLURAL_OIL                                            :Нефт
@@ -167,12 +167,12 @@ STR_ABBREV_NONE                                                 :{TINYFONT}НЩ
 STR_ABBREV_ALL                                                  :{TINYFONT}ВЧ

 # 'Mode' of transport for cargoes
-STR_PASSENGERS                                                  :пътници
+STR_PASSENGERS                                                  :пасажери
 STR_BAGS                                                        :торби
 STR_TONS                                                        :тона
 STR_LITERS                                                      :литри
 STR_ITEMS                                                       :елемента
-STR_CRATES                                                      :кашони
+STR_CRATES                                                      :кратери
 STR_RES_OTHER                                                   :друго
 STR_NOTHING                                                     :

@@ -217,7 +217,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} куб.

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Въведете филтър
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Въведете ключова дума за филтър на списъка
@@ -306,13 +305,13 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Пока
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Инвестирай в нова индустрия
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Покажи списъка с влакове на компанията. Ctrl-click превключва между списъците с групи/превозни средства
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Покажи списъка с камиони/автобуси на компанията
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Покажи списъка с кораби на компанията. Ctrl+Click показва списък с корабите.
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Покажи списъка със самолети на компанията. Ctrl+Click показва списъка със самолетите.
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Покажи списъка с кораби на компанията
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Покажи списъка със самолети на компанията
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Увеличи мащаба
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Намаляване на мащаба
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Построй ЖП линии
 STR_TOOLBAR_TOOLTIP_BUILD_ROADS                                 :{BLACK}Построй пътища
-STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Построй пристанище
+STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS                            :{BLACK}Построй докове
 STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Построй летища
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Отворете лентата с инструменти за тераформиране за да повишавате/понижавате земя, засаждате дърва, и др.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Покажи прозореца за звук/музика
@@ -371,7 +370,7 @@ STR_MAP_MENU_MAP_OF_WORLD                                       :Карта на
 STR_MAP_MENU_EXTRA_VIEW_PORT                                    :Допълнителна камера
 STR_MAP_MENU_SIGN_LIST                                          :Списък с табели
 ############ range for town menu starts, yet the town directory is shown in the map menu in the scenario editor
-STR_TOWN_MENU_TOWN_DIRECTORY                                    :Списък с градовете
+STR_TOWN_MENU_TOWN_DIRECTORY                                    :Списък от градовете
 ############ end of the 'Display map' dropdown
 STR_TOWN_MENU_FOUND_TOWN                                        :Основи град
 ############ end of the 'Town' dropdown
@@ -658,7 +657,7 @@ STR_SMALLMAP_TOOLTIP_SHOW_LAND_OWNERS_ON_MAP                    :{BLACK}Пока

 STR_SMALLMAP_LEGENDA_ROADS                                      :{TINYFONT}{BLACK}Пътища
 STR_SMALLMAP_LEGENDA_RAILROADS                                  :{TINYFONT}{BLACK}ЖП
-STR_SMALLMAP_LEGENDA_STATIONS_AIRPORTS_DOCKS                    :{TINYFONT}{BLACK}Гари/Летища/Пристанища
+STR_SMALLMAP_LEGENDA_STATIONS_AIRPORTS_DOCKS                    :{TINYFONT}{BLACK}Гари/Летища/Докове
 STR_SMALLMAP_LEGENDA_BUILDINGS_INDUSTRIES                       :{TINYFONT}{BLACK}Сгради/Индустрии
 STR_SMALLMAP_LEGENDA_VEHICLES                                   :{TINYFONT}{BLACK}Превозни средства
 STR_SMALLMAP_LEGENDA_100M                                       :{TINYFONT}{BLACK}100 м
@@ -691,7 +690,7 @@ STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Сняг

 STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Покажи имената на градовете на картата
-STR_SMALLMAP_CENTER                                             :{BLACK}Фиксиране на малката карта на текущата позиция
+STR_SMALLMAP_CENTER                                             :{BLACK}Центриране на малката карта на текущата позиция
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Изключване на всички
@@ -812,7 +811,7 @@ STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} е прекалено остаряло и спешно има нужда от замяна
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} не може да намери път за да продължи.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} се е загубил.
-STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}{VEHICLE} миналата година е направил печалба от {CURRENCY}
+STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :Прихода на {WHITE}{VEHICLE} миналата година е бил {CURRENCY}

 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} спря поради провалена задача за преоборудване
 STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}Неуспешна автоматична замяна на {VEHICLE}{}{STRING}
@@ -826,13 +825,13 @@ STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}{STATION} вече приема {STRING}
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION} вече приема {STRING} и {STRING}

-STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Предложението за субсидия изтече:{}{}Превозът на {STRING} от {STRING} до {STRING} повече няма да получава субсидия.
-STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Анулирана субсидия:{}{}Превозът на {STRING} от {STRING} до {STRING} вече не се субсидира.
+STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Предложението за субсидия изтече:{}{}Превоз на {STRING} от {STRING} до {STRING} няма да спечели субсидия.
+STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Изтеглена субсидия:{}{}Превоз на {STRING} от {STRING} до {STRING} вече не се субсидира.
 STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}Предложена субсидия:{}{}Първият превоз на {STRING} от {STRING} до {STRING} ще спечели едногодишна субсидия от местните власти!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}{STRING} спечели субсидия!{}{}Превозът на {STRING} от {STRING} до {STRING} ще се заплаща с 50% повече през следващата година!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}{STRING} спечели субсидия!!{}{}Превозът на {STRING} от {STRING} до {STRING} ще се заплаща двойно през следващата година!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{STRING} спечели субсидия!!{}{}Превозът на {STRING} от {STRING} до {STRING} ще се заплаща тройно през следващата година!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{STRING} спечели субсидия!!{}{}Превозът на {STRING} от {STRING} до {STRING} ще се заплаща четворно през следващата година!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}{STRING} спечели субсидия!{}{}Превоз на {STRING} от {STRING} до {STRING} ще се заплаща с 50% повече през следващата година!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}{STRING} спечели субсидия!!{}{}Превоз на {STRING} от {STRING} до {STRING} ще се заплаща двойно през следващата година!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{STRING} спечели субсидия!!{}{}Превоз на {STRING} от {STRING} до {STRING} ще се заплаща тройно през следващата година!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{STRING} спечели субсидия!!{}{}Превоз на {STRING} от {STRING} до {STRING} ще се заплаща четворно през следващата година!

 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Хаос на трафика в {TOWN}!{}{}Програмата за пътна реконструкция, финансирана от {STRING}, доведе до 6 месеца мизерия за мотористите!

@@ -1087,7 +1086,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Мод
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Оригинален
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Реалистичен
 STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Стръмнина на склона за влакове {ORANGE}{STRING}%
-STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Забрани 90 градусовите завои: {ORANGE}{STRING}{LTBLUE} (не може с OPF)
+STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Забрана 90 градусови завои: {ORANGE}{STRING}{LTBLUE} (не може с OPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Обединяване на гари построени една до друга: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Позволено е присъединяването на станции, които не се допират: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Подобрен алгоритъм за зареждане: {ORANGE}{STRING}
@@ -1101,6 +1100,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :нищо
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :като други промишлености
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :предстоящ
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Няколко еднакви индустрии на град: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Индустрии от еднакъв тип могат да бъдат строени близо една до друга: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Дълга дата в лента за състоянието: {ORANGE}{STRING.f}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Семафорите от страната на пътното движение: {ORANGE}{STRING.n}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Финансов отчет в края на годината: {ORANGE}{STRING.m}
@@ -1226,7 +1226,7 @@ STR_CONFIG_SETTING_MAX_SHIPS                                    :{LTBLUE}Мак

 STR_CONFIG_SETTING_AI_BUILDS_TRAINS                             :{LTBLUE}Премахване на влаковете за компютърния играч: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES                      :{LTBLUE}Премахване на пътните превозни средства за компютърния играч: {ORANGE}{STRING}
-STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Премахване на летателните машини за компютърния играч: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Премахване на летателните апарати за компютърния играч: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Премахване на корабите за компютърния играч: {ORANGE}{STRING}

 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Позволи AI в мрежова игра: {ORANGE}{STRING}
@@ -1505,7 +1505,7 @@ STR_FACE_EARRING                                                :Oбица:
 STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cмени вратовръзкатa или oбицатa

 # Network server list
-STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Много играчи
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Няколко играча
 STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Връзка:
 STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Избор между игра в интернет или локална мрежа (LAN)
 STR_NETWORK_SERVER_LIST_LAN                                     :LAN
@@ -1534,7 +1534,7 @@ STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Нати
 STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}ИНФО ЗА ИГРАТА
 STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Играчи: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Език: {WHITE}{STRING}
-STR_NETWORK_SERVER_LIST_LANDSCAPE                               :{SILVER}Пейзаж: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_LANDSCAPE                               :{SILVER}Терен: {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Големина на картата: {WHITE}{COMMA}x{COMMA}
 STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Версия на сървъра: {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Адрес на сървъра: {WHITE}{STRING}
@@ -1574,7 +1574,7 @@ STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Генерир
 STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Интернет
 STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Интернет (реклама)
 STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{NUM} клиент{P "" s}
-STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Макс. брой играчи:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Макс. брой клиенти:
 STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Избор на максималния брой клиенти. Не всички слотове трябва да се попълнят
 STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{NUM} компани{P а ий}
 STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Макс. брой компании:
@@ -1671,7 +1671,7 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Р
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Сваляне инфо за играта..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Сваляне инфо за компанията..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} играч{P "" и} преди вас
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} клиент{P "" и} срещу вас
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} изтеглени

 STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Изключване
@@ -1752,7 +1752,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :връзкат
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :грешка в протокола
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF се различават
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :не оторизиран
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :грешка при свързването
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :получен странен пакет
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :грешна ревизия
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :името вече се използва
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :грешна парола
@@ -1769,9 +1769,9 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED                          :Играта е
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Играта все още е временно спряна ({STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Играта все още е временно спряна ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Играта все още е временно спряна ({STRING}, {STRING}, {STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Играта продължава ({STRING})
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Играта е продължена ({STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :няма достатъчно играчи
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :влиза играч
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :клиент се свързва
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :ръчно
 ############ End of leave-in-this-order
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :напускам
@@ -1882,15 +1882,15 @@ STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Стро
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Конструкции за Еднорелсов път
 STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :{WHITE}Конструкции за Магниторелсов път

-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Построй релсовия път. Ctrl показва възможните конструкции.
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK} Строеж на жп линия в режим Автоматичен. Ctrl показва възможните конфигурации.
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Построй релсовия път
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK} Строеж на жп линия в режим Автоматичен
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Построй влаково депо (за купуване и обслужване на влакове)
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Промяна ЖП линия на ЖП пункт. Ctrl позволява обединяване на ЖП пунктовете.
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Промяна ЖП линия на пункт
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Построй ЖП гара. Ctrl позволява съединяването на гари
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Построй ЖП сигнализация. Ctrl показва семафорната/светлинната сигнализация.
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Построй ЖП сигнализация
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Построй ЖП мост
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Строене на жп тунел
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Показва строене/премахване на жп линия, сигнализация, пунктове и гари. Задържането на Ctrl премахва линиите от пунктовете и гарите
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Строене/премахване на жп линия и семафори
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Промяна/обновяване на ЖП линия

 # Rail depot construction window
@@ -1923,13 +1923,13 @@ STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Сигн
 STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Нормален сигнал (семафор){}Сигналите са необходими за да предпазват влаковете от катастрофи по ЖП мрежата.
 STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Входен сигнал (семафор){}Свети зелено докато има поне един зелен изходен сигнал от следващия сегмент от пътя. В противен случай свети червено.
 STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Изходен сигнал (семафор){}Действа като нормален сигнал, но е необходим за да работят входните и комбинираните сигнали.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Комбиниран сигнал (семафор){}Комбинирания сигнал действа едновременно като входен и изходен сигнал. Това позволява изграждането на големи разклонения от сигнали.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Комбиниран сигнал (семафор){}Комбинирания сигнал действа едновременно като входен и изходен сигнал. Това позволява за изграждането на големи "дървета" от сигнали.
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Маршрутизиращ знак(семафор){}Маршрутизиращите знаци позволяват на повече от един влак да навлязат в сигнален блок едновременно ако влаковете могат да резервират маршрут до безопасно място. През стандартните сигнали може да се преминава и в двете посоки.
 STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Еднопосочен маршрутизиращ знак(семафор){}Маршрутизиращите знаци позволяват на повече от един влак да навлязат в сигнален блок едновременно ако влаковете могат да резервират маршрут до безопасно място. рез еднопосочните сигнали може да се премине само в едната посока.
 STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Нормален сигнал (електрически){}Сигналите са необходими за да предпазват влаковете от катастрофи по ЖП мрежата.
 STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Входен сигнал (електрически){}Свети зелено докато има поне един зелен изходен сигнал от следващия сегмент от пътя. В противен случай свети червено.
 STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Изходен сигнал (електрически){}Действа като нормален сигнал, но е необходим за да работят входните и комбинираните сигнали.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Комбиниран сигнал (електрически){}Комбинирания сигнал действа едновременно като входен и изходен сигнал. Това позволява изграждането на големи разклонения от сигнали.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Комбиниран сигнал (електрически){}Комбинирания сигнал действа едновременно като входен и изходен сигнал. Това позволява за изграждането на големи "дървета" от сигнали.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Маршрутизиращ знак(електрически){}Маршрутизиращите знаци позволяват на повече от един влак да навлязат в сигнален блок едновременно ако влаковете могат да резервират маршрут до безопасно място. През стандартните сигнали може да се преминава и в двете посоки.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Еднопосочен маршрутизиращ знак(електрически){}Маршрутизиращите знаци позволяват на повече от един влак да навлязат в сигнален блок едновременно ако влаковете могат да резервират маршрут до безопасно място. рез еднопосочните сигнали може да се премине само в едната посока.
 STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Конвертиране на сигнал{}Когато е избран, натискането на съществуващ сигнал ще го конвертира в избрания тип и вариант, CTRL-click ще смени съществуващия вариант.
@@ -2346,12 +2346,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Изклю

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Въвеждане на NewGRF параметри

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Налични NewGRF файлове
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Добави избраните
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Добавя избраните NewGRF файлове към конфигурацията
@@ -2392,8 +2387,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Липс
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Липсва GRF файл(ове)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Може да счупи OpenTTD. Не пускайте съобщение за грешка за последвали счупвания.{}Желаете ли да се махне паузата?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Поведението на NewGRF '{STRING}' вероятно ще предизвика десинхронизции и/или сривове
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Смяна на дължината на превозното средство '{1:ENGINE}', когато не е в депо.
@@ -2402,13 +2395,6 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Влак
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{STRING}' дава невярна информация.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' предизвика вечен цикъл в callback на производството

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<невалиден товар>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} на <невалиден товар>
-STR_NEWGRF_INVALID_ENGINE                                       :<невалидна машина>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<невалдна индустрия>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Списък с табели - {COMMA} Табел{P а и}

@@ -2423,21 +2409,21 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Въве
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Градове
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Отсъства -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Имена на градовете - натисни на името, за да фокусираш този град. Ctrl+Click отваря нова гледна точка от позицията на града.
-STR_TOWN_POPULATION                                             :{BLACK}Обща популация на картата: {COMMA}
+STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Имена на градовете - натисни на името за да центрираш този град
+STR_TOWN_POPULATION                                             :{BLACK}Световна популация: {COMMA}

 # Town view window
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Град)
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Население: {ORANGE}{COMMA}{BLACK}  Жилища: {ORANGE}{COMMA}
-STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Пътници през последния месец: {ORANGE}{COMMA}{BLACK}  максимум: {ORANGE}{COMMA}
+STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Пасажери през последния месец: {ORANGE}{COMMA}{BLACK}  максимум: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Поща през последния месец: {ORANGE}{COMMA}{BLACK}  максимум: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Товар нужен за растеж на града:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{STRING}{BLACK} необходим
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} необходим през зимата
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{ORANGE}{CARGO}{BLACK} доставено миналия месец
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Лимит на шумът в градът: {ORANGE}{COMMA}{BLACK}  най-много: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Фиксиране на главния изглед върху града. Ctrl+Click отваря прозорец на нов изглед върху града.
+STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Центриране на главния изглед спрямо разположението на града
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Местни власти
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Показване на информация за местните власти
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Промяна на име на град
@@ -2454,7 +2440,7 @@ STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}{TOWN}
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Рейтинги на транспортни компании:
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANYNUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Валидни дейности:
-STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Списък с нещата за правене в този град - натисни за подробности
+STR_LOCAL_AUTHORITY_ACTIONS_TOOLTIP                             :{BLACK}Списък от нещата за правене в този град - натисни за подробности
 STR_LOCAL_AUTHORITY_DO_IT_BUTTON                                :{BLACK}Направи го
 STR_LOCAL_AUTHORITY_DO_IT_TOOLTIP                               :{BLACK}Изпълнение на отбелязаната дейност в списъка по-горе

@@ -2486,7 +2472,7 @@ STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING
 STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Кликни върху услугата, за да се фокусира върху индустрията/града

 # Station list window
-STR_STATION_LIST_TOOLTIP                                        :{BLACK}Имена на станции - натиснете върху името, за да фиксирате главния прозорец върху станцията
+STR_STATION_LIST_TOOLTIP                                        :{BLACK}Имена на станции - натиснете върху името за да центрирате главния прозорец върху станцията
 STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Задържете CTRL за да изберете повече от един обект
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Станци{P я и}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
@@ -2498,7 +2484,7 @@ STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Няма

 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
-STR_STATION_VIEW_WAITING_TITLE                                  :{BLACK}Чакат: {WHITE}{STRING}
+STR_STATION_VIEW_WAITING_TITLE                                  :{BLACK}Чакане: {WHITE}{STRING}
 STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({SHORTCARGO} на път от {STATION})

@@ -2522,7 +2508,7 @@ STR_CARGO_RATING_EXCELLENT                                      :Отлично
 STR_CARGO_RATING_OUTSTANDING                                    :Невероятно
 ############ range for rating ends

-STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Фокусиране на главния изглед върху станцията. Ctrl+Click отваря прозорец на нов изглед върху гарата.
+STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Центриране на главния прозорец върху станцията
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Промяна името на станцията

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Показване на всички влакове които минават през гарата
@@ -2574,7 +2560,7 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE

 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Открита: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Цветове:
-STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Машини:
+STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}МПС-та:
 STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} влак{P "" ове}
 STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} автомобил{P "" и}
 STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} самолет
@@ -2615,13 +2601,13 @@ STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- От
 STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% превозено)
 STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% превозено)
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Имена на индустриите - натисни за да фокусираш върху индустрията. Ctrl+Click отваря прозорец на нов изглед върху индустрията.
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Имена на индустиите - натисни за да центрираш изгледа

 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Произведено миналия месец:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% превозено)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Фокусиране на основният изглед върху индустрията. Ctrl+Click отваря прозорец на нов изглед върху индустрията.
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Центриране главния прозорец върху индустрията

 ############ range for requires starts
 STR_INDUSTRY_VIEW_REQUIRES_CARGO                                :{BLACK}Нуждае се от: {YELLOW}{STRING}{STRING}
@@ -2636,7 +2622,7 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO                                :{BLACK}Прои
 STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Произвежда: {YELLOW}{STRING}{STRING}, {STRING}{STRING}
 ############ range for produces ends

-STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Промени производството
+STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Промяна на производство

 # Vehicle lists
 STR_VEHICLE_LIST_TRAIN_CAPTION                                  :{WHITE}{STRING} - {COMMA} Влак{P "" ове}
@@ -2703,7 +2689,7 @@ STR_BUY_VEHICLE_TRAIN_MAGLEV_CAPTION                            :{WHITE}Нови
 STR_BUY_VEHICLE_TRAIN_ALL_CAPTION                               :{WHITE}Нови ЖП превозни средства
 STR_BUY_VEHICLE_ROAD_VEHICLE_CAPTION                            :{WHITE}Нова кола
 STR_BUY_VEHICLE_SHIP_CAPTION                                    :{WHITE}Нови Кораби
-STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :{WHITE}Нова летателна машина
+STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :{WHITE}Ново самолет

 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Цена: {GOLD}{CURRENCY}{BLACK} Тегло: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Скорост: {GOLD}{VELOCITY}{BLACK} Мощност: {GOLD}{POWER}
@@ -2718,9 +2704,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Тегл
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Цема {GOLD}{CURRENCY}{BLACK} Скорост: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Капацитет: {GOLD}{CARGO}, {CARGO}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Вагони с мощност: {GOLD}+{POWER}{BLACK} Тегло: {GOLD}+{WEIGHT_S}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Преобразуваем на: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Преобразуваем до: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Всички видове товар
-STR_PURCHASE_INFO_ALL_BUT                                       :Всичко освен {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Всички освен {GOLD}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Макс. теглеща сила: {GOLD}{FORCE}

 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Списък с влакове - натисни върху влак за информация
@@ -2729,14 +2715,14 @@ STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Спис
 STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Избор на самолет - натиснете върху самолет за информация

 STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Купи Машина
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Купи Машина
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Покупка на превозно средство
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Купи Кораб
-STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Купи самолет
+STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Строене на самолет

-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Купи маркираният влак
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_TOOLTIP                       :{BLACK}Строене на избрания влак
 STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Купи посоченото МПС
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Купи посоченият кораб
-STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Купи посоченият самолет
+STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Строене на избрания самолет

 STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Преименувай
 STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Преименувай
@@ -2759,7 +2745,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN}
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Корабно депо
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} хангар за самолети

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} превозно средство{P о а}{STRING}
@@ -2790,27 +2775,27 @@ STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Авто
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Нови ПС
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Ново превозно средство
 STR_DEPOT_SHIP_NEW_VEHICLES_BUTTON                              :{BLACK}Нови Кораби
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Нова лететална машина
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_BUTTON                          :{BLACK}Ново летище

 STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP                            :{BLACK}Купи нова ЖП машина
-STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Купи ново МПС
+STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Покупка на нов автомобил
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Купи нов кораб
-STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Купи нова лететелна машина
+STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Строене на самолет

 STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Клониране на влак
 STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Копиране на превозно средство
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Клониране на кораб
-STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Клониране на летателната машина
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Клониране на летателен апарат

-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Така ще бъде закупено копие на влака, заедно с всички негови вагони. Натисни този бутон и след това върху влак вътре или вън от депото. Натисни CTRL, за да споделиш задачите
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Така ще бъде закупено копие на МПС-то. Натисни този бутон и след това върху МПС-то вътре или вън от депото. Натисни CTRL, за да споделиш задачите
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Така ще бъде закупено копие на кораб. Натисни този бутон и след това върху кораб вътре или вън от депото. Натисни CTRL, за да споделиш задачите
-STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Така ще бъде закупено копие на летателната машина. Натисни този бутон и след това върху летателната машина вътре или вън от хангара. Натисни CTRL, за да споделиш задачите
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Така ще бъде построено копие на влака заедно с всички негови вагони. Натисни на този бутон и след това на влак вътре или вън от депото. Натисни CTRL за да споделиш задачите
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Така ще бъде построено копие на пътното превозно средство. Натисни на този бутон и след това на пътно превозно средство вътре или вън от депото. Натисни CTRL за да споделиш задачите
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Така ще бъде построено копие на кораб. Натисни този бутон и след това върху кораб вътре или вън от депото. Натисни CTRL за да споделиш задачите
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Така ще бъде построено копие на летателния апарат. Натисни на този бутон и след това на летателен апарат вътре или вън от хангара. Натисни CTRL за да споделиш задачите

 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Фокусирай върху мястото на влаковото депо
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Фокусирай общия план върху местонахождението на МПС-депото
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Фокусирай общия план върху местонахождението на корабното депо
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Позициониране на главния изглед върху хангара. Ctrl+Click ще отвори прозорец за нов изглед върху хангара
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Центриране на главния прозорец върху хангара

 STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Списък на всички влакове с това депо в техния пътен лист
 STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Списък на всички автомобили с този гараж в техния пътен лист
@@ -2840,9 +2825,9 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :локомот
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :локомотив за магниторелсов път

 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Цена: {CURRENCY} Тегло: {WEIGHT_S}{}Скорост: {VELOCITY}  Мощност: {POWER}{}Разход: {CURRENCY}/г.{}Капацитет: {CARGO}
-STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Цена: {CURRENCY} Тегло: {WEIGHT_S}{}Скорост: {VELOCITY}  Мощност: {POWER}  Макс. Т.С.: {6:FORCE}{}Експлоатационни разходи: {4:CURRENCY}/год.{}Вместимост: {5:CARGO}
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Цена: {CURRENCY} Макс. Скорост: {VELOCITY}{}Вместимост: {CARGO}, {CARGO}{}Експлоатационни разходи: {CURRENCY}/год.
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Цена: {CURRENCY} Макс. Скорост: {VELOCITY}{}Вместимост: {CARGO}{}Експлоатационни разходи: {CURRENCY}/год.
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Цена: {CURRENCY} Тегло: {WEIGHT_S}{}Скорост: {VELOCITY}  Мощност: {POWER}  Макс. Т.С.: {6:FORCE}{}Експлоатационни разноски: {4:CURRENCY}/год.{}Капацитет: {5:CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Цена: {CURRENCY} Макс. Скорост: {VELOCITY}{}Капацитет: {CARGO}, {CARGO}{}Експлоатационни разноски: {CURRENCY}/год.
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Цена: {CURRENCY} Макс. Скорост: {VELOCITY}{}Капацитет: {CARGO}{}Експлоатационни разноски: {CURRENCY}/год.

 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Замяна {STRING}
@@ -2879,10 +2864,10 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Авто
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}

-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Позициониране на главният изглед върху влака.При Ctrl+Click ще проследява влака в главният изглед
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Позициониране на главния изглед върху МПС-то. При Ctrl+Click МПС-то ще бъде проследявано в главния изглед
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Центриране главния прозорец върху влака
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Центриране на главния прозорец върху превозното средство
 STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Фокусирай общия план върху местонахождението на кораба
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Позициониране на главния изглед върху летателната машина. При Ctrl-click летателната машина ще бъде проследяван в главния изглед
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Центриране на главния прозорец върху летателния апарат. При Ctrl-click летателният апарат ще бъде проследяван в главния изглед

 STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Изпращане влака в депо
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Изпращане на ПС в депо. CTRL+натискане ще изпрати само за преглед
@@ -2890,9 +2875,9 @@ STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Прат
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Изпращане на самолета в хангар

 STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Така ще бъде закупено копие на влака заедно с всички негови вагони. Натисни Ctrl за да споделиш задачите
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Така ще бъде закупено копие на МПС-то. Натисни Ctrl за да споделиш задачите
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Така ще бъде закупено копие на кораба. Натисни Ctrl за да споделиш задачите
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Така ще бъде закупено копие на летателната машина. Натисни Ctrl за да споделиш задачите
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Така ще бъде построено копие на пътното превозно средство. Натисни Ctrl за да споделиш задачите
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Така ще бъде построено копие на кораба. Натисни Ctrl за да споделиш задачите
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Така ще бъде построено копие на летателния апарат. Натисни Ctrl за да споделиш задачите

 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Игнориране на семафор

@@ -2914,7 +2899,7 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Пока
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Покажи детайлите за кораба
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Информация за самолета

-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Текущо състояние на влака - натиснете за спиране/пускане. Ctrl-click за да скролирате до целта
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Текущо същояние на влака - натиснете за спиране/пускане. С Ctrl-click можете да скролирате до целта
 STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Текущо действие - натиснете за спиране/пускане на превозното средство. С Ctrl-click можеш да скролираш до целта
 STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Настоящо корабно действие - натисни тук, за да спреш/задвижиш кораба. С Ctrl-click можеш да скролираш до целта
 STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Състояние на самолета - натиснете за спиране/пускане. С Ctrl-click можете да скролирате до целта
@@ -2956,8 +2941,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}На р
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}На ремонт в Хангара на летище {STATION}
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}На ремонт в Хангара на летище {STATION}, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Подробности)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Име
@@ -2967,7 +2950,7 @@ STR_VEHICLE_DETAILS_ROAD_VEHICLE_RENAME                         :{BLACK}Преи
 STR_VEHICLE_DETAILS_SHIP_RENAME                                 :{BLACK}Наименувай кораба
 STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Име на самолет

-STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Години: {LTBLUE}{STRING}{BLACK}   Експлоатационни разходи: {LTBLUE}{CURRENCY}/год.
+STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Години: {LTBLUE}{STRING}{BLACK}   Експлоатационни разноски: {LTBLUE}{CURRENCY}/год.
 # The next two need to stay in this order
 STR_VEHICLE_INFO_AGE                                            :{COMMA} годин{P а и} ({COMMA})
 STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} годин{P а и} ({COMMA})
@@ -3457,7 +3440,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Тук
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Тук не може да бъде построено трамвайно депо...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Тук не може да бъде построен док...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Влакът трябва да бъде спрян в депото
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... трябва да бъде спряно в сервиз за коли
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Корабът трябва да е спрян в депото
@@ -3487,7 +3469,6 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Първ
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Неподходящ за употреба релсов път
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Първо трябва да бъде премахнат релсовия път
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Пътят е еднопосочен или блокиран
-STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Пресичането на различни видове ЖП линии не е позволено.
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Тук не може да бъде поставена сигнализация...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Тук не могат да бъдат построени ЖП релси...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Не може да премахнеш тези ЖП релси...
@@ -3636,9 +3617,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Тук
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Името на знака не може да бъде променяно...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Не може да изтриеш знака...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Клонинг на Transport Tycoon Deluxe
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Висока офис сграда
@@ -3732,21 +3710,21 @@ STR_SV_STNAME_EAST                                              :{STRING} Изт
 STR_SV_STNAME_WEST                                              :{STRING} Запад
 STR_SV_STNAME_CENTRAL                                           :{STRING} Център
 STR_SV_STNAME_TRANSFER                                          :{STRING} Трансфер
-STR_SV_STNAME_HALT                                              :{STRING} Извънградски
+STR_SV_STNAME_HALT                                              :{STRING} Край
 STR_SV_STNAME_VALLEY                                            :{STRING} Долина
 STR_SV_STNAME_HEIGHTS                                           :{STRING} Височини
 STR_SV_STNAME_WOODS                                             :{STRING} Гора
 STR_SV_STNAME_LAKESIDE                                          :{STRING} Езеро
 STR_SV_STNAME_EXCHANGE                                          :{STRING} Размяна
 STR_SV_STNAME_AIRPORT                                           :{STRING} Летище
-STR_SV_STNAME_OILFIELD                                          :{STRING} Нефтено находище
+STR_SV_STNAME_OILFIELD                                          :{STRING} Нефтено поле
 STR_SV_STNAME_MINES                                             :{STRING} Мини
-STR_SV_STNAME_DOCKS                                             :{STRING} Пристанище
+STR_SV_STNAME_DOCKS                                             :{STRING} Докове
 STR_SV_STNAME_BUOY                                              :{STRING}
 STR_SV_STNAME_WAYPOINT                                          :{STRING}
 ##id 0x6020
 STR_SV_STNAME_ANNEXE                                            :{STRING} Пристройка
-STR_SV_STNAME_SIDINGS                                           :{STRING} Крайградски
+STR_SV_STNAME_SIDINGS                                           :{STRING} Обшивки
 STR_SV_STNAME_BRANCH                                            :{STRING} Клон
 STR_SV_STNAME_UPPER                                             :Горно {STRING}
 STR_SV_STNAME_LOWER                                             :Долно {STRING}
@@ -3990,13 +3968,13 @@ STR_VEHICLE_NAME_AIRCRAFT_DARWIN_400                            :Дарвин 40
 STR_VEHICLE_NAME_AIRCRAFT_DARWIN_500                            :Дарвин 500
 STR_VEHICLE_NAME_AIRCRAFT_DARWIN_600                            :Дарвин 600
 STR_VEHICLE_NAME_AIRCRAFT_GURU_GALAXY                           :Гуру Галакси
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A21                           :Аеротакси A21
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A31                           :Аеротакси A31
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A32                           :Аеротакси A32
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A33                           :Аеротакси A33
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A21                           :Аертакси A21
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A31                           :Аертакси A31
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A32                           :Аертакси A32
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A33                           :Аертакси A33
 STR_VEHICLE_NAME_AIRCRAFT_YATE_AEROSPACE_YAE46                  :Яте Аероспейс YAe46
 STR_VEHICLE_NAME_AIRCRAFT_DINGER_100                            :Дингер 100
-STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A34_1000                      :Аеротакси A34-1000
+STR_VEHICLE_NAME_AIRCRAFT_AIRTAXI_A34_1000                      :Аертакси A34-1000
 STR_VEHICLE_NAME_AIRCRAFT_YATE_Z_SHUTTLE                        :Яте Z-Shuttle
 STR_VEHICLE_NAME_AIRCRAFT_KELLING_K1                            :Келинг K1
 STR_VEHICLE_NAME_AIRCRAFT_KELLING_K6                            :Келинг K6
@@ -4029,7 +4007,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:T
 STR_FORMAT_WAYPOINT_NAME                                        :Пътна точка {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Пътна точка {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :неизвестна гара
 STR_DEFAULT_SIGN_NAME                                           :Знак
 STR_COMPANY_SOMEONE                                             :някой
@@ -4119,4 +4096,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -216,9 +216,8 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
-STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Introdueix una cadena de filtre
+STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Introdueix una cadena filtrant
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Introdueix una paraula clau per filtrar la llista de
 STR_LIST_FILTER_TITLE                                           :{BLACK}Cadena filtrant:

@@ -227,7 +226,7 @@ STR_TOOLTIP_SORT_CRITERIA                                       :{BLACK}Seleccio
 STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selecciona el criteri de filtratge
 STR_BUTTON_SORT_BY                                              :{BLACK}Ordenar per
 STR_BUTTON_LOCATION                                             :{BLACK}Situació
-STR_BUTTON_RENAME                                               :{BLACK}Canvia el nom
+STR_BUTTON_RENAME                                               :{BLACK}Reanomena

 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Tanca la finestra
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Títol de la finestra - arrossega això per moure la finestra
@@ -360,7 +359,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Signes d'estaci

 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Desa el joc
-STR_FILE_MENU_LOAD_GAME                                         :Carrega un joc
+STR_FILE_MENU_LOAD_GAME                                         :Carrega el joc
 STR_FILE_MENU_QUIT_GAME                                         :Abandona el joc
 STR_FILE_MENU_EXIT                                              :Surt
 ############ range ends here
@@ -546,7 +545,7 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :President
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnat

 # Performance detail window
-STR_PERFORMANCE_DETAIL                                          :{WHITE}Detall dels ratis de rendiment
+STR_PERFORMANCE_DETAIL                                          :{WHITE}Detall de ratis de rendiment
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detall
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
@@ -606,7 +605,7 @@ STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC                        :{BLACK}Seleccio
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Selecciona el programa 'Ezy Street style music'
 STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED                  :{BLACK}Selecciona el programa 'Opcional 1' (definit per l'usuari)
 STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED                  :{BLACK}Selecciona el programa 'Opcional 2' (definit per l'usuari)
-STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Commuta el programa aleatori actiu/inactiu
+STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Control de programa aleatori actiu/inactiu
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Mostra la finestra de selecció de pistes de música

 STR_ERROR_NO_SONGS                                              :{WHITE}S'ha seleccionat un conjunt de músiques sense cançons. No es reproduiran cançons
@@ -693,8 +692,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Activa/d
 STR_SMALLMAP_CENTER                                             :{BLACK}Centra el mapa petit a la posició actual
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Desactiva-ho tot
-STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activa-ho tot
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Desactiva tots
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activa tots
 STR_SMALLMAP_SHOW_HEIGHT                                        :{BLACK}Mostra alçada
 STR_SMALLMAP_TOOLTIP_DISABLE_ALL                                :{BLACK}No mostris les indústries al mapa
 STR_SMALLMAP_TOOLTIP_ENABLE_ALL                                 :{BLACK}Mostra totes les indústries al mapa
@@ -731,7 +730,7 @@ STR_NEWS_MESSAGE_TYPE_INDUSTRY_CLOSE                            :{YELLOW}Tancame
 STR_NEWS_MESSAGE_TYPE_ECONOMY_CHANGES                           :{YELLOW}Canvis de l'Economia
 STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_COMPANY        :{YELLOW}Canvis de producció de les indústries aprovisionades per la companyia
 STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_SERVED_BY_OTHER          :{YELLOW}Canvis de producció en indústries proveïdes pel competidor(s)
-STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_UNSERVED                 :{YELLOW}Altres canvis de producció de la indústria
+STR_NEWS_MESSAGE_TYPE_INDUSTRY_CHANGES_UNSERVED                 :{YELLOW}Altres canvis de producció de l'indústria
 STR_NEWS_MESSAGE_TYPE_ADVICE_INFORMATION_ON_COMPANY             :{YELLOW}Alertes / informació sobre els vehicles de la companyia
 STR_NEWS_MESSAGE_TYPE_NEW_VEHICLES                              :{YELLOW}Nous vehicles
 STR_NEWS_MESSAGE_TYPE_CHANGES_OF_CARGO_ACCEPTANCE               :{YELLOW}Canvis en l'admissió de càrrega
@@ -825,13 +824,13 @@ STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO_OR_CARGO               :{WHITE}{STATION
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO                              :{WHITE}{STATION} ara accepta {STRING}
 STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION} ara accepta {STRING} i {STRING}

-STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Oferta de subvenció caducada: {}{}{STRING} des de {STRING} fins a {STRING} no tindrà subvenció.
+STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIGFONT}{BLACK}Oferiment de subvenció caducada: {}{}{STRING} des de {STRING} fins a {STRING} s'ha declarat desert.
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIGFONT}{BLACK}Subvenció retirada:{}{}{STRING} des de {STRING} fins a {STRING} ja no està subvencionat.
-STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}Oferta de subvenció per a un servei:{}{} El primer servei de {STRING} des de {STRING} fins a {STRING} tindrà una subvenció d'un any per part de l'autoritat local!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Subvenció per a un servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} rebrà un 50% addicional durant el pròxim any!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Subvenció per a un servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} pagarà el doble de la tarifa durant el pròxim any!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subvenció per a un servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} pagarà el triple de la tarifa durant el pròxim any!
-STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subvenció per a un servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} pagarà el quàdruple de la tarifa durant el pròxim any!
+STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIGFONT}{BLACK}Subvenció per un servei oferta:{}{} El primer servei de {STRING} des de {STRING} fins a {STRING} tindrà una subvenció d'un any de l'autoritat local!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIGFONT}{BLACK}Subvenció pel servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} rebrà un 50% addicional durant el pròxim any!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK}Subvenció per servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} pagarà el doble de la tarifa durant el pròxim any!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subvenció per servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} pagarà el triple de la tarifa durant el pròxim any!
+STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subvenció per servei concedida a {STRING}!{}{} Servei de {STRING} des de {STRING} fins a {STRING} pagarà el quàdruple de la tarifa durant el pròxim any!

 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Caos de trànsit a {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {STRING} porta 6 mesos de misèria als motoristes!

@@ -1100,6 +1099,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :cap
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :com les altres indústries
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospeccionant
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Permet vàries indústries similars a cada població: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Permet construir indústries del mateix tipus unes aprop de les altres: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Mostra sempre la data llarga a la barra d'estat: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Mostra senyals en el sentit de la marxa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Mostra la finestra de balanç al finalitzar cada any: {ORANGE}{STRING}
@@ -1412,7 +1412,7 @@ STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Canvia
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activa la modificació de valors de producció: {ORANGE}{STRING}

 # Livery window
-STR_LIVERY_CAPTION                                              :{WHITE}Nou esquema de colors
+STR_LIVERY_CAPTION                                              :{WHITE}Nou esquema de color

 STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Mostra esquemes de colors generals
 STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Mostra els esquemes de colors dels trens
@@ -1752,7 +1752,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :connexió perdu
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :error de protocol
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Diferència NewGRF
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :no autoritzat
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :s'ha rebut un paquet invàlid o no esperat
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :s'ha rebut un paquet estrany
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :revisió incorrecta
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nom ja utilitzat
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :contrasenya incorrecta
@@ -1770,7 +1770,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Joc encara paus
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Joc encara pausat ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Joc encara pausat ({STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Joc despausat ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :nombre de jugadors
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :no hi ha prou jugadors
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :connectant clients
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :manual
 ############ End of leave-in-this-order
@@ -1889,12 +1889,12 @@ STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Converte
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Construeix una estació de tren. Ctrl permet ajuntar estacions
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Construeix senyals de tren. Ctrl commuta el semàfor/senyals de llums{}Arrossegant es construeixen senyals al llarg d'un tros recte de rail. Ctrl construeix senyals fins a la propera intersecció{}Ctrl+Clic commuta l'obertura de la finestra de detecció de senyals
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Construeix un pont de tren
-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construeix un túnel per a trens
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construeix túnel de tren
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Commuta construeix/treu per vies de tren, senyals, punts de control i estacions
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Converteix/Millora el tipus de via

 # Rail depot construction window
-STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientació Cotxeres
+STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Cotxeres de Tren
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selecciona l'orientació de les cotxeres de tren

 # Rail waypoint construction window
@@ -1938,8 +1938,8 @@ STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Disminue
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Incrementa la densitat de senyals en arrossegar

 # Bridge selection window
-STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selecciona pont de tren
-STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selecciona un Pont de carretera
+STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selecciona pont per la via
+STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selecciona un Pont per Carretera
 STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selecció de pont - clica sobre el pont triat per construir-lo
 STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensió, Acer
@@ -1969,7 +1969,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Activa/D
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Construeix un pont per carretera
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE                   :{BLACK}Construeix pont per tramvies
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Construeix un túnel per carretera
-STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Construeix un túnel per a tramvies
+STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Construeix túnel per tramvies
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Intercanvia funció construeix/treu per la construcció de carreteres
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Canvia construeix/treu de la construcció de vies de tramvia

@@ -1980,9 +1980,9 @@ STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientac
 STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecciona l'orientació de les cotxeres de tramvies

 # Road vehicle station construction window
-STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientació Parada d'autobús
+STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Parada d'autobús
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Selecciona l'orientació de la parada d'autobús
-STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Orientació Estació de Mercaderies
+STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Estació de Mercaderies
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Selecciona l'orientació del moll de càrrega de camions
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientació estació passatgers
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Selecciona l'orientació de l'estació de tramvies de passatgers
@@ -2125,7 +2125,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipus d'
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Càrrega acceptada: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Límit de velocitat de la via: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Roques
@@ -2348,12 +2347,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desactivat

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Introdueix els paràmetres NewGRF

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Arxius NewGRF disponibles
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Afegeix a la selecció
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Afegeix l'arxiu NewGRF seleccionat a la teva configuració
@@ -2401,16 +2395,9 @@ STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Canvia l
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}El tren '{VEHICLE}' pertanyent a la '{COMPANY}' té una llargada invàlida. Això està causat probablement per problemes amb els NewGRFs. El joc podria desincronitzar-se i/o penjar-se.

 STR_NEWGRF_BUGGY                                                :{WHITE}El NewGRF '{0:STRING}' està donant informació incorrecta.
-STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}La informació de càrrega/remodelació per '{1:ENGINE}' no encaixa amb la llista de compres després de la construcció. Això podria causar un mal funcionament de autorenova/-substitueix.
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}La informació de càrrega/remodelació per '{1:ENGINE}' no encaixa amb la llista de compres després de la construcció. Això podria causar un mal funcionament de autorenov/-substitueix.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' ha provocat un bucle infinit en la crida de producció.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<càrrega invàlida>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} de <càrrega invàlida>
-STR_NEWGRF_INVALID_ENGINE                                       :<motor invàlid>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<indústria invàlida>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA} Senyal{P "" s}

@@ -2449,7 +2436,7 @@ STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Incremen
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Esborra
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Esborra totalment aquesta població

-STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :Canvia el nom de la Població
+STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :Reanomena Població

 # Town local authority window
 STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}{TOWN} autoritat local
@@ -2485,7 +2472,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}- Cap -
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Serveis ja subvencionats:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} des de {STRING} fins a {STRING}{YELLOW} ({COMPANY}{YELLOW}, fins a {DATE_SHORT})
-STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clica al servei per centrar la vista a la indústria/població. Ctrl+Clic obre una nova vista al lloc de la indústria/població
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clica al servei per centrar la vista a l'indústria/població. Ctrl+Clic obre una nova vista al lloc de la indústria/població

 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Noms d'estació - clica al nom per centrar la vista principal a l'estació. Ctrl+Clic obre una nova vista al lloc de l'estació
@@ -2532,7 +2519,7 @@ STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostra t
 STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostra tots els avions que tinguin aquest aeroport en el seu itinerari
 STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostra tots els vaixells que tinguin aquest port en el seu itinerari

-STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Canvia el nom de l'estació/àrea de càrrega
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Reanomena l'estació/àrea de càrrega

 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
@@ -2577,7 +2564,7 @@ STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(President)

 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurat: {WHITE}{NUM}
-STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Esquema de colors:
+STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Esquema de color:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehicles:
 STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tren{P "" s}
 STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automòbil{P "" s}
@@ -2596,7 +2583,7 @@ STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Trasllad

 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nova Cara
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Selecciona una nova cara pel president
-STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Esquema de colors
+STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Esquema de color
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Canvia l'aspecte dels vehicles de la companyia
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Nom Empresa
 STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP                           :{BLACK}Canvia el nom de la companyia
@@ -2619,13 +2606,13 @@ STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Cap -
 STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportat)
 STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nom de les indústries - clica al nom per centrar la vista a la indústria. Ctrl+Clic obre una nova vista al lloc de la indústria
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nom de les indústries - clica al nom per centrar la vista a l'indústria. Ctrl+Clic obre una nova vista al lloc de l'indústria

 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Producció del darrer mes:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% transportat)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centra la vista principal al lloc de la indústria. Ctrl+Clic obre una nova vista al lloc de la indústria
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centra la vista principal al lloc de l'indústria. Ctrl+Clic obre una nova vista al lloc de l'indústria

 ############ range for requires starts
 STR_INDUSTRY_VIEW_REQUIRES_CARGO                                :{BLACK}Necessita: {YELLOW}{STRING}{STRING}
@@ -2742,20 +2729,20 @@ STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_TOOLTIP                :{BLACK}Compra l
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_TOOLTIP                        :{BLACK}Compra el vaixell seleccionat
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_TOOLTIP                    :{BLACK}Compra l'avió seleccionat

-STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Canvia el nom
-STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Canvia el nom
-STR_BUY_VEHICLE_SHIP_RENAME_BUTTON                              :{BLACK}Canvia el nom
-STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON                          :{BLACK}Canvia el nom
+STR_BUY_VEHICLE_TRAIN_RENAME_BUTTON                             :{BLACK}Reanomena
+STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_BUTTON                      :{BLACK}Reanomena
+STR_BUY_VEHICLE_SHIP_RENAME_BUTTON                              :{BLACK}Reanomena
+STR_BUY_VEHICLE_AIRCRAFT_RENAME_BUTTON                          :{BLACK}Reanomena

-STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP                            :{BLACK}Canvia el nom del tipus de vehicle ferroviari
-STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Canvia el nom del tipus d'automòbil
-STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP                             :{BLACK}Canvia el nom del tipus de vaixell
-STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}Canvia el nom del tipus d'avió
+STR_BUY_VEHICLE_TRAIN_RENAME_TOOLTIP                            :{BLACK}Reanomena el tipus de vehicle ferroviari
+STR_BUY_VEHICLE_ROAD_VEHICLE_RENAME_TOOLTIP                     :{BLACK}Reanomena tipus d'automòbil
+STR_BUY_VEHICLE_SHIP_RENAME_TOOLTIP                             :{BLACK}Reanomena tipus de vaixell
+STR_BUY_VEHICLE_AIRCRAFT_RENAME_TOOLTIP                         :{BLACK}Reanomena tipus d'avió

-STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Canvia el nom del tipus vehicle ferroviari
-STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Canvia el nom del tipus d'automòbil
-STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Canvia el nom del tipus de vaixell
-STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Canvia el nom del tipus d'avió
+STR_QUERY_RENAME_TRAIN_TYPE_CAPTION                             :{WHITE}Reanomena el tipus vehicle ferroviari
+STR_QUERY_RENAME_ROAD_VEHICLE_TYPE_CAPTION                      :{WHITE}Reanomena tipus d'automòbil
+STR_QUERY_RENAME_SHIP_TYPE_CAPTION                              :{WHITE}Reanomena tipus de vaixell
+STR_QUERY_RENAME_AIRCRAFT_TYPE_CAPTION                          :{WHITE}Reanomena tipus d'avió

 # Depot window
 STR_DEPOT_TRAIN_CAPTION                                         :{WHITE}{TOWN} Cotxeres de Tren
@@ -2763,7 +2750,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} C
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Drassana
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar d'Avions

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{STRING}
@@ -2960,8 +2946,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Revisi
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Revisió a l'hangar de {STATION}
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Revisió a l'hangar de {STATION}, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalls)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nom
@@ -3385,7 +3369,7 @@ STR_ERROR_PROTECTED                                             :{WHITE}Aquesta

 # Town related errors
 STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Impossible construir poblacions
-STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}No es pot canviar el nom de la població...
+STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}No es pot reanomenar la població...
 STR_ERROR_CAN_T_FOUND_TOWN_HERE                                 :{WHITE}No es pot construir una població aquí...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... massa prop del límit del mapa
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... massa prop d'una altra població
@@ -3430,7 +3414,7 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}Massa pr
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Massa prop d'una altra estació/àrea de càrrega
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Massa prop d'un altre moll
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Massa prop d'un altre aeroport
-STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}No es pot canviar el nom de l'estació...
+STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}No es pot reanomenar l'estació...
 STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... aquesta carretera es propietat de la població
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... sentit de la carretera en la direcció incorrecta

@@ -3469,7 +3453,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Aquí no
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Aquí no puc construir les cotxeres de tramvies...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Aquí no es pot construir una drassana...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}El tren s'ha de parar dins de la cotxera
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... s'ha de parar dins d'una cotxera
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}El vaixell s'ha de parar a la drassana
@@ -3526,7 +3509,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Aquí no

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... aquí ja hi ha arbres
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... el terreny no és vàlid per aquest tipus d'arbre
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Aquí no es poden plantar arbres...

 # Bridge related errors
@@ -3537,7 +3519,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Les cap
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}El pont és massa baix pel terreny
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Inici i final han d'estar en línia recta
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... els extrems del pont han d'estar tots dos a terra
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... el pont és massa llarg

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Aquí no es pot construir el túnel...
@@ -3592,10 +3573,10 @@ STR_ERROR_CAN_T_BUY_ROAD_VEHICLE                                :{WHITE}No es po
 STR_ERROR_CAN_T_BUY_SHIP                                        :{WHITE}No es pot comprar el vaixell...
 STR_ERROR_CAN_T_BUY_AIRCRAFT                                    :{WHITE}No es pot comprar l'avió...

-STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}No es pot canviar el nom del tipus de vehicle ferroviari...
-STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}No es pot canviar el nom del tipus d'automòbil
-STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}No es pot canviar el nom del tipus de vaixell...
-STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}No es pot canviar el nom del tipus d'avió...
+STR_ERROR_CAN_T_RENAME_TRAIN_TYPE                               :{WHITE}No es pot reanomenar el tipus de vehicle ferroviari...
+STR_ERROR_CAN_T_RENAME_ROAD_VEHICLE_TYPE                        :{WHITE}No es pot reanomenar tipus d'automòbil
+STR_ERROR_CAN_T_RENAME_SHIP_TYPE                                :{WHITE}No es pot reanomenar el tipus de vaixell...
+STR_ERROR_CAN_T_RENAME_AIRCRAFT_TYPE                            :{WHITE}No es pot reanomenar el tipus d'avió...

 STR_ERROR_CAN_T_SELL_TRAIN                                      :{WHITE}No es pot vendre el vehicle...
 STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}No pots vendre l'automòbil...
@@ -3650,9 +3631,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Aquí no
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}No es pot canviar el nom del senyal...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}La senyal no es pot esborrar...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Un clon de Transport Tycoon Deluxe
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloc d'oficines alt
@@ -4043,7 +4021,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Punt de Control
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Punt de Control #{COMMA}

-
 STR_UNKNOWN_STATION                                             :estació desconeguda
 STR_DEFAULT_SIGN_NAME                                           :Senyal
 STR_COMPANY_SOMEONE                                             :algú
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -194,7 +194,7 @@ STR_QUANTITY_PASSENGERS                                         :{COMMA} putnik{
 STR_QUANTITY_COAL                                               :{WEIGHT} ugljena
 STR_QUANTITY_MAIL                                               :{COMMA} poštansk{P a e ih} vreć{P a e a}
 STR_QUANTITY_OIL                                                :{VOLUME} nafte
-STR_QUANTITY_LIVESTOCK                                          :{COMMA} grl{P o a a} domaćih životinja
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} grl{P o a a} stoke
 STR_QUANTITY_GOODS                                              :{COMMA} sanduk{P "" a a} robe
 STR_QUANTITY_GRAIN                                              :{WEIGHT} žita
 STR_QUANTITY_WOOD                                               :{WEIGHT} drveta
@@ -311,7 +311,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Unesi znak za filter
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Unesite ključnu riječ kako bi filtrirali popis
@@ -372,7 +371,7 @@ STR_SORT_BY_VALUE                                               :Vrijednost
 STR_SORT_BY_LENGTH                                              :Dužina
 STR_SORT_BY_LIFE_TIME                                           :Preostali životni vijek
 STR_SORT_BY_TIMETABLE_DELAY                                     :Kašnjenje voznog reda
-STR_SORT_BY_FACILITY                                            :Vrsta stanice
+STR_SORT_BY_FACILITY                                            :Vrsta postaje
 STR_SORT_BY_WAITING                                             :Vrijednost tereta koji čeka
 STR_SORT_BY_RATING_MAX                                          :Najviša ocjena tereta
 STR_SORT_BY_RATING_MIN                                          :Najniža ocjena tereta
@@ -1195,6 +1194,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :nijedna
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :kao i druge industrije
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prosperirajuća
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Dopusti više sličnih industrija po gradu: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Industrije iste vrste mogu biti izgrađene u blizini jedna druge: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Uvijek pokaži dugi datum u statusnoj traci: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Pokaži signale na vozačkoj strani: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Pokaži financijski prozor na kraju godine: {ORANGE}{STRING}
@@ -1413,14 +1413,14 @@ STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Industr

 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Pronalaženje putanje za vlakove: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Preporučljivo)
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Preporučeno)
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :{LTBLUE}Pronalaženje putanje za cestovna vozila: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_NPF             :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_YAPF            :YAPF {BLUE}(Preporučeno)
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Pronalaženje putanje za brodove: {ORANGE}{STRING}
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF                     :Original {BLUE}(Preporučljivo)
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF                     :Original {BLUE}(Preporučeno)
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_NPF                     :NPF
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Nije preporučljivo)
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Nije preporučivo)

 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}X veličina karte: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y veličina karte: {ORANGE}{STRING}
@@ -1847,7 +1847,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :veza je izgublj
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :greška u protokolu
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF nepodudaranje
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nije ovlašten
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :primljen je nepoznat ili neočekivani paket
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :primljen je nepoznat paket
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :pogrešna revizija
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :ime se već koristi
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :pogrešna zaporka
@@ -1985,7 +1985,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Izgradi
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Izgradi željezničke signale. Ctrl aktivira semafore/svjetlosne signale{}Povlačenjem će se izgraditi signali uzduž ravnog dijela pruge. Ctrl će izgraditi signale do sljedećeg križanja.{}Ctrl+klik aktivira otvaranje prozora za odabir signala
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Izgradi željeznički most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Izgradi željeznički tunel
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Aktiviraj izgradnju/uklanjanje željezničke pruge, signala, čvorišta i postaja. Držanjem tipke Ctrl također se uklanjaju tračnice na čvorištima i postajama.
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Aktiviraj izgradnju/uklanjanje željezničke pruge, znakova, čvorišta i postaja. Držanjem tipke Ctrl također se uklanjaju tračnice na čvorištima i postajama.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Pretvori/nadogradi vrstu pruge

 # Rail depot construction window
@@ -2220,7 +2220,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Vrsta po
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Prihvaćeni teret: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Najveća brzina željeznice: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Stijenje
@@ -2443,12 +2442,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Onemoguće

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Unesite NewGRF parametre

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupne NewGRF datoteke
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Dodaj u izabrano
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Dodaj odabrane NewGRF datoteke u svoju konfiguraciju
@@ -2490,8 +2484,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Neprona
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Nedostaje GRF datoteka(e)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Odpauziranje može uzrokovati rušenje OpenTTD-a. Nemojte slati prijave bugova za posljedična rušenja.{}Želite li stvarno odpauzirati?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Ponašanje NewGRF '{0:STRING}' će vjerojatno uzrokovati deharmonizaciju i/ili rušenje igre.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Ovo mijenja dužinu vozila za '{1:ENGINE}' kada vozilo nije unutar spremišta.
@@ -2501,13 +2493,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informacija o teretu/obnovi za '{1:ENGINE}' je različita od kupovne liste nakon izgradnje. Zbog toga bi automatsko obnavljanje/zamjena mogla biti neuspješna.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{G=male}{WHITE}'{1:STRING}' je uzrokovao beskonačnu petlju u pozivu za povrat produkcije.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<pogrešan teret>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} od <pogrešan teret>
-STR_NEWGRF_INVALID_ENGINE                                       :<pogrešan model vozila>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<pogrešna industrija>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Popis znakova - {COMMA} znak{P "" a ova}

@@ -2563,7 +2548,7 @@ STR_LOCAL_AUTHORITY_ACTION_LARGE_ADVERTISING_CAMPAIGN           :Velika oglasna
 STR_LOCAL_AUTHORITY_ACTION_ROAD_RECONSTRUCTION                  :Financiraj popravljanje lokalne prometnice
 STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY                    :Izgradi kip vlasnika tvrtke
 STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS                        :Financiraj nove građevine
-STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT                  :Kupi ekskluzivna prava prijevoza
+STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT                  :Kupi ekskluzivna prava prijevozna
 STR_LOCAL_AUTHORITY_ACTION_BRIBE                                :Podmiti lokalnu samoupravu

 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING            :{YELLOW}Pokreni malu oglasnu kampanju, kako bi privukao više putnika i tereta za svoje prijevozne usluge.{} Trošak: {CURRENCY}
@@ -2860,16 +2845,15 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Spremiš
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Spremište brodova grada {TOWN}a
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Zrakoplovni hangar

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozil{P o a a}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})

-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlakovi - drži lijevi klik i vuci vozilo za dodavanje/skidanjed iz vlaka, desni klik za informacije. Drži tipku Ctrl da obje funkcije rade na slijedu
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - desni klik na vozilo za informacije
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Brodovi - desni klik na brod za informacije
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Zrakoplov - desni klik na zrakoplov za informacije
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vlakovi - klikni na vlak za informacije, vuci vozilo kako bi dodao/oduzeo od vlaka
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vozila - klikni na vozilo za informaciju
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Brodovi - klikni na brod za informacije
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Zrakoplov - klikni na zrakoplov za informacije

 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Ovdje povuci vlak kako bi ga prodao
 STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Povuci cestovno vozilo ovdje kako bi ga prodao
@@ -3057,8 +3041,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servisi
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Servisiranje u hangaru {STATION}
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Servisiranje u hangaru {STATION}, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalji)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ime
@@ -3566,7 +3548,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Ovdje ni
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Ovdje nije moguće izgraditi tramvajsko spremište...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Ovdje nije moguće izgraditi spremište brodova...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak mora biti zaustavljen unutar spremišta
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... mora biti zaustavljen unutar spremišta cestovnih vozila
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Brod mora biti zaustavljen u spremištu
@@ -3596,7 +3577,6 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Najprije
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nije prikladno za želježnicku prugu
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Najprije je potrebno ukloniti željezničku prugu
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Cesta je jednosmjerna ili je blokirana
-STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Pružni prijelazi nisu dozvoljeni za ovu vrstu pruge
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Ovdje nije moguće postaviti signale...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Ovdje nije moguće izgraditi željezničke tračnice...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Nije moguće ukloniti željezničku prugu odavde...
@@ -3624,7 +3604,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Ovdje ni

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... ovdje već postoji drvo
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... pogrešan teren za tu vrstu drveća
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Ovdje nije moguće posaditi drvo...

 # Bridge related errors
@@ -3635,7 +3614,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Glave mo
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most je prenizak za teren
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Početak i kraj moraju biti u ravnini
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... oba kraja mosta moraju biti na zemlji
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... predugačak most

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Ovdje nije moguće izgraditi tunel...
@@ -3748,9 +3726,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Ovdje ni
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nije moguće promijeniti ime znaka...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nije moguće obrisati znak...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Klon Transport Tycoon Deluxea
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Visoki uredski blok
@@ -3875,8 +3850,8 @@ STR_SV_SHIP_NAME                                                :Brod {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Zrakoplov {COMMA}

 STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} Sjever
-STR_SV_STNAME_SOUTH                                             :{STRING} Jug
+STR_SV_STNAME_NORTH                                             :{STRING} sjever
+STR_SV_STNAME_SOUTH                                             :{STRING} jug
 STR_SV_STNAME_EAST                                              :{STRING} Istok
 STR_SV_STNAME_WEST                                              :{STRING} Zapad
 STR_SV_STNAME_CENTRAL                                           :Centrala {STRING}
@@ -4178,7 +4153,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :Čvorište {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Čvorište {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :nepoznata postaja
 STR_DEFAULT_SIGN_NAME                                           :Znak
 STR_COMPANY_SOMEONE                                             :netko
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -75,7 +75,7 @@ STR_CARGO_PLURAL_DIAMONDS                                       :diamanty
 STR_CARGO_PLURAL_DIAMONDS.gen                                   :diamantů
 STR_CARGO_PLURAL_DIAMONDS.big                                   :Diamanty
 STR_CARGO_PLURAL_FOOD                                           :jídlo
-STR_CARGO_PLURAL_FOOD.gen                                       :jídla
+STR_CARGO_PLURAL_FOOD.gen                                       :jídlo
 STR_CARGO_PLURAL_FOOD.big                                       :Jídlo
 STR_CARGO_PLURAL_PAPER                                          :papír
 STR_CARGO_PLURAL_PAPER.gen                                      :papíru
@@ -130,8 +130,6 @@ STR_CARGO_PLURAL_FIZZY_DRINKS.big                               :Limonáda
 # Singular cargo name
 STR_CARGO_SINGULAR_NOTHING                                      :
 STR_CARGO_SINGULAR_PASSENGER                                    :cestujících
-STR_CARGO_SINGULAR_PASSENGER.acc                                :cestující
-STR_CARGO_SINGULAR_PASSENGER.big                                :Cestující
 STR_CARGO_SINGULAR_COAL                                         :uhlí
 STR_CARGO_SINGULAR_MAIL                                         :pošty
 STR_CARGO_SINGULAR_OIL                                          :ropy
@@ -241,7 +239,7 @@ STR_TONS                                                        :tun
 STR_LITERS                                                      :litrů
 STR_ITEMS                                                       :kusů
 STR_CRATES                                                      :krabic
-STR_RES_OTHER                                                   :jiné
+STR_RES_OTHER                                                   :Jiné
 STR_NOTHING                                                     :

 # Colours, do not shuffle
@@ -285,7 +283,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Vložte filtr
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Vložte klíčové slovo pro filtr seznamu
@@ -371,7 +368,7 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}Zobrazit
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}Zobrazit obecné informace o společnosti
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Zobrazit grafy
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Zobrazit tabulku společností
-STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Financovat konstrukci nového průmyslu, nebo zobrazit všechen průmysl
+STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Průmysl
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Zobrazit seznam vlaků společnosti. Ctrl+Klik přepíná seznam skupin/vlaků
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Zobrazit seznam silničních vozidel společnosti. Ctrl+Klik přepíná seznam skupin/vozidel
 STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Zobrazit seznam lodí společnosti. Ctrl+Klik přepíná seznam skupin/lodí
@@ -1136,7 +1133,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :nezaujatý
 STR_CITY_APPROVAL_TOLERANT                                      :tolerantní
 STR_CITY_APPROVAL_HOSTILE                                       :zaujatý

-STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Žádná vhodná AI není k dispozici...{}Některé AI lze stáhnout pomocí služby "Stahovat součásti"
+STR_WARNING_NO_SUITABLE_AI                                      :{WHITE}Žádné vhodné AI není k dispozici...{}některé Ai lze stáhnout pomocí služby 'Stahovat součásti'
 STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Tato akce změnila úroveň obtížnosti na 'vlastní'

 # Advanced settings window
@@ -1169,6 +1166,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :žádný
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :jako u ostatniho průmyslu
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :průzkum
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Povolit více stejného průmyslu kolem jednoho města: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Průmysl stejného druhu může být budován poblíž sebe: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Ukazovat dlouhé datum ve stavové liště: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Ukazovat semafory na straně, kde jezdí silniční vozidla: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Ukazovat finanční okno na konci každého roku: {ORANGE}{STRING}
@@ -1186,9 +1184,9 @@ STR_CONFIG_SETTING_NONUNIFORM_STATIONS                          :{LTBLUE}Nejedno
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :{LTBLUE}Pro simulaci těžkých vlaků vynásobit hmotnost nákladu: {ORANGE}{STRING}x
 STR_CONFIG_SETTING_PLANE_SPEED                                  :{LTBLUE}Činitel rychlosti letadel: {ORANGE}1/{STRING}
 STR_CONFIG_SETTING_PLANE_CRASHES                                :{LTBLUE}Počet leteckých havárií: {ORANGE}{STRING}
-STR_CONFIG_SETTING_PLANE_CRASHES_NONE                           :nulový
-STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :nižší
-STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :obvyklý
+STR_CONFIG_SETTING_PLANE_CRASHES_NONE                           :žádné
+STR_CONFIG_SETTING_PLANE_CRASHES_REDUCED                        :snížené
+STR_CONFIG_SETTING_PLANE_CRASHES_NORMAL                         :normální
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Stavba průjezdných zastávek na obecních silnicích: {ORANGE}{STRING}
 STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Stavba průjezdných zastávek na silnicích vlastněných konkurencí: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Povolit stavění přilehlých stanic: {ORANGE}{STRING}
@@ -1236,9 +1234,9 @@ STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Největ
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Údržba vrtulníků na heliportech: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Otevírat lištu na úpravy terénu s lištami na výstavbu tratí/silnic atd.: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR                         :{LTBLUE}Barva země v mapě: {ORANGE}{STRING}
-STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :zelená
-STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :tmavě zelená
-STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :fialová
+STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_GREEN                   :Zelená
+STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_DARK_GREEN              :Tmavě zelená
+STR_CONFIG_SETTING_SMALLMAP_LAND_COLOUR_VIOLET                  :Fialová
 STR_CONFIG_SETTING_REVERSE_SCROLLING                            :{LTBLUE}Posouvat pohled opačným směrem: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SMOOTH_SCROLLING                             :{LTBLUE}Plynulé posouvání po mapě: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MEASURE_TOOLTIP                              :{LTBLUE}Ukázat rozměry při použití stavebních nástrojů: {ORANGE}{STRING}
@@ -1369,7 +1367,7 @@ STR_CONFIG_SETTING_MODIFIED_ROAD_REBUILD                        :{LTBLUE}Odstra

 STR_CONFIG_SETTING_GUI                                          :{ORANGE}Ovládaní
 STR_CONFIG_SETTING_CONSTRUCTION                                 :{ORANGE}Výstavba
-STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Dopravní prostředky
+STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Dop. prostředky
 STR_CONFIG_SETTING_STATIONS                                     :{ORANGE}Stanice
 STR_CONFIG_SETTING_ECONOMY                                      :{ORANGE}Ekonomika
 STR_CONFIG_SETTING_AI                                           :{ORANGE}Konkurenti
@@ -1844,8 +1842,8 @@ STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :připojují se
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :ručně
 ############ End of leave-in-this-order
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :odpojování
-STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} se připojil do hry
-STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} se připojil do hry (klient č. {2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} jde hrát
+STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {STRING} jde hrát (klient č. {2:NUM})
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} se přidává ke společnosti č. {2:NUM}
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} se stává pozorovatelem
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} zakládá novou společnost (č. {2:NUM})
@@ -1874,8 +1872,8 @@ STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Stáhnou
 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Začít stahovat vybraný obsah
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Celková velikost dat: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORMACE O OBSAHU
-STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Položka není vybrána ke stažení
-STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Položka je vybrána ke stažení
+STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Tohle nemáš vybráno ke stažení
+STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Tohle máš vybráno ke stažení
 STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED                        :{SILVER}Ke stažení byla vybrána i tato závislost
 STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Tohle už máš
 STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}Tento obsah je neznámý a nejde stáhnout do OpenTTD
@@ -2194,7 +2192,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Druh sta
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Přijímané zboží: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Rychlostní omezení tratě: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kamení
@@ -2417,12 +2414,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Vypnuto

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Zadej parametry grafiky

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupné grafiky
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Přidat do výběru
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Přidat vybranou grafiku do tvého seznamu
@@ -2464,8 +2456,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Chyběj
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Chybějící grafické soubory
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Spuštění hry může shodit OpenTTD. Nehlaš chybu kvůli pádům způsobeným touto akcí.{}Opravdu chceš rozjet hru?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Chování grafiky '{0:STRING}' by mohlo způsobit desynchronizaci a/nebo pád hry.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Mění délku vozidla '{1:ENGINE}', které není v depu.
@@ -2475,13 +2465,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}Grafika
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informace o nákladu/možnosti přestavby pro '{1:ENGINE}' se po nákupu změnily. To může způsobit problémy při automatické výměně vozidel.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' způsobil(a) nekonečnou smyčku v callbacku produkce průmyslu.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<neplatný náklad>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} jednot{P ka ky ek} <neplatného nákladu>
-STR_NEWGRF_INVALID_ENGINE                                       :<neplatný druh vozidla>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<neplatný průmysl>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Seznam popisků - {COMMA} popis{P ek ky ků}

@@ -2834,7 +2817,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Garáže
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}Lodní depo {TOWN}
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Letištní hangár

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozid{P lo la el}{STRING}
@@ -2995,9 +2977,9 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Ukaž de
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Ukázat detaily lodi
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Ukázat detaily letadla

-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Současná činnost vlaku - když sem klikneš, vlak se zastaví nebo rozjede. Když ještě podržíš Ctrl, pohled se posune na cílovou stanici.
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Současná činnost vozidla - klikni sem pro zastavení/rozjetí.
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Současná činnost plavidla - pro zastavení či rozjetí, klikni sem
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Současná činnost vlaku - vlak se zastaví nebo rozjede, když sem klikneš
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Současná činnost silničního vozidla - klikni sem pro zastavení/rozjetí vozidla. Ctrl+kliknutí pro zobrazení cíle
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Činnost lodi - na rozjetí nebo zastavení lodi klepni sem
 STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Činnost letadla - stiskni pro rozjetí/zastavení letadla

 # Messages in the start stop button in the vehicle view
@@ -3037,8 +3019,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Údržb
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Údržba v hangáru {STATION}
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Údržba v hangáru {STATION}, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaily)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Jméno
@@ -3160,7 +3140,7 @@ STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vyber, n

 STR_ORDER_SERVICE                                               :{BLACK}Údržba
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Jeď vždy
-STR_ORDER_DROP_SERVICE_DEPOT                                    :Údržba v případě potřeby
+STR_ORDER_DROP_SERVICE_DEPOT                                    :Servis v případě potřeby
 STR_ORDER_DROP_HALT_DEPOT                                       :Zastavit
 STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Přeskoč tento cíl, pokud není potřeba pravidelná údržba

@@ -3179,8 +3159,8 @@ STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN                      :je menší než
 STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS                    :je menší nebo rovno
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :je více než
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :je více nebo rovno
-STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :platí
-STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :neplatí
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je pravda
+STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :není pravda

 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Hodnota, se kterou srovnat vlastnost vozidla
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Zadej hodnotu pro srovnávání
@@ -3402,7 +3382,6 @@ STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Varován
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Tak velká zmena velikosti zdrojové mapy není doporučena. Pokračovat s generováním?

 # Soundset messages
-STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Byl nalezen pouze nouzový zvukový soubor. Pokud chcete zvuky, nainstalujte prosim zvukové soubory skrze systém stahování obsahu

 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot úspěšně uložen jako '{STRING}'
@@ -3546,7 +3525,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Zde nelz
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Zde nelze postavit depo pro tramvaje...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Zde nelze postavit lodní depo...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak musí stát v depu
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... musí být zastaven v garáži
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Loď musí být zastavena v depu
@@ -3603,7 +3581,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Zde nelz

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... strom už tu je
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... nevhodný terén pro tento typ stromu
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Zde nelze vysadit strom...

 # Bridge related errors
@@ -3614,7 +3591,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Nájezdy
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most je pro terén moc nízký
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Začátek a konec musí být ve stejné výšce
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... oba konce mostu musí být na zemi
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... most je příliš dlouhý

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Zde nelze postavit tunel...
@@ -3727,9 +3703,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Zde nelz
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nelze změnit nápis...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nelze smazat nápis...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Klon Transport Tycoon Deluxe
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Vysoký kancelářský blok
@@ -4120,7 +4093,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:T
 STR_FORMAT_WAYPOINT_NAME                                        :Směrování {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Směrování {TOWN} č. {COMMA}

-
 STR_UNKNOWN_STATION                                             :neznámá stanice
 STR_DEFAULT_SIGN_NAME                                           :Nápis
 STR_COMPANY_SOMEONE                                             :někdo
@@ -4211,4 +4183,3 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}

-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -215,7 +215,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Indtast filter-udtryk
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Indtast nøgleord til at filtrere listen efter
@@ -1099,6 +1098,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :ingen
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :som andre industrier
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :efterforskning
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Tillad flere af samme slags industri per by: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Tillad flere af samme type industri tæt på hinanden: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Vis altid lang dato i statusbaren: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Vis signaler i kørselssiden: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Vis finansvinduet i slutningen af året: {ORANGE}{STRING}
@@ -1751,7 +1751,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :forbindelsen bl
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokol fejl
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF ulighed
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :ikke autoriseret
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :modtog en ikke gyldig eller underlig pakke
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :modtog en underlig pakke
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :forkert revision
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :navnet er allerede i brug
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :forkert spil kodeord
@@ -1769,7 +1769,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Spillet er stad
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Spillet er stadig pauset. ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Spillet er stadig pauset. ({STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Spillet er sat igang ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :antal spillere spillere
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :ikke nok spillere
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :forbinder klienter
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :manuelt
 ############ End of leave-in-this-order
@@ -2124,7 +2124,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stations
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Accepteret last: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Togspors hastighedsgrænse: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Klipper
@@ -2347,12 +2346,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Deaktivere

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Indtast NewGRF-parameter

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tilgængelige NewGRF sæt
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Tilføj til udvalg
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Tilføj det valgte NewGRF sæt til din konfiguration
@@ -2378,7 +2372,7 @@ STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Indlæsning af
 STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uventet grafikelement.
 STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukendt Action 0 egenskab.
 STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøg på brug af ugyldig ID.
-STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} indeholder en ødelagt sprite. Alle ødelagte sprites vil blive vist som et rødt spørgsmålstegn (?).
+STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} indeholder en ødelagt sprite. Alle ødelagte sprites vil blive vist som et rødt spørgsmålstegm (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Indeholder flere "Action 8" poster.
 STR_NEWGRF_ERROR_READ_BOUNDS                                    :Læs forbi enden af pseudo-sprite

@@ -2403,13 +2397,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Fragt-/ombygningsinformation for '{1:ENGINE}' afviger fra indkøbslisten efter konstruktion. Dette kan medføre, at autofornyelse ikke fungerer korrekt.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' forårsagede en uendelig løkke i produktions-callback'en.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<ikke gyldigt gods>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} af <ikke gyldigt gods>
-STR_NEWGRF_INVALID_ENGINE                                       :<ikke gyldig motor>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<ikke gyldig industri type>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste over skilte - {COMMA} Skilt{P "" e}

@@ -2762,7 +2749,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} v
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} skibsdok
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} flyhangar

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} køretøj{P "" er}{STRING}
@@ -2959,8 +2945,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Service
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Service i {STATION} hangar
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Service i {STATION} hangar, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaljer)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Navn
@@ -3468,7 +3452,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Kan ikke
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Kan ikke bygge sporvognsremise her...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Kan ikke bygge en skibsdok her...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Toget skal være stoppet inde i en remise
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... skal være stoppet inde i et værksted først
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Skibet skal være stoppet i dok
@@ -3525,7 +3508,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kan ikke

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... der er allerede træer her
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... forkert terræn for træ type
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan ikke plante træer her...

 # Bridge related errors
@@ -3536,7 +3518,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Brohoved
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Broen er for lav til terrænet
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start- og slutposition skal være på linje
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... begge ender af en bro skal være på land
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... broen er for lang

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan ikke bygge en tunnel her...
@@ -3649,9 +3630,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan ikke
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan ikke ændre navnet på skiltet...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan ikke slette skilt...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :En klon af Transport Tycoon Deluxe
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høj kontorbygning
@@ -4042,7 +4020,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :Kontrolsted {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Kontrolsted {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :ukendt station
 STR_DEFAULT_SIGN_NAME                                           :Skilt
 STR_COMPANY_SOMEONE                                             :en eller anden
@@ -4132,5 +4109,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -215,7 +215,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Geef het filter op
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Geef een woord waarop gefilterd kan worden in de lijst
@@ -1085,7 +1084,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Trein a
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Origineel
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistisch
 STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Hellingshoek voor treinen {ORANGE}{STRING}%
-STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Verbied treinen en schepen om 90° te draaien: {ORANGE}{STRING} {LTBLUE} (niet met OPF)
+STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Verbied treinen en schepen om 90 graden te draaien: {ORANGE}{STRING} {LTBLUE} (onmogelijk met OPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Stations samenvoegen als ze naast elkaar worden gebouwd: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Sta het samenvoegen van niet direct aaneensluitende stations toe: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Gebruik verbeterd laadalgoritme: {ORANGE}{STRING}
@@ -1093,12 +1092,13 @@ STR_CONFIG_SETTING_GRADUAL_LOADING                              :{LTBLUE}Voertui
 STR_CONFIG_SETTING_INFLATION                                    :{LTBLUE}Inflatie: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SELECTGOODS                                  :{LTBLUE}Vracht alleen bezorgen aan een station als er vraag naar is: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGBRIDGES                                  :{LTBLUE}Bouwen van zeer lange bruggen toestaan: {ORANGE}{STRING}
-STR_CONFIG_SETTING_GOTODEPOT                                    :{LTBLUE}Sta 'Ga naar depot' order toe: {ORANGE}{STRING}
-STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Handmatige bouwmethode voor primaire industrie: {ORANGE}{STRING}
+STR_CONFIG_SETTING_GOTODEPOT                                    :{LTBLUE}'Ga naar depot' order toestaan: {ORANGE}{STRING}
+STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD             :{LTBLUE}Handmatige bouwmethode voor primaire industrieën: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :geen
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :zoals andere industrieën
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :proberen
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Meerdere vergelijkbare industrieën per stad toestaan: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Industrieën van hetzelfde type dicht bij elkaar toestaan: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Altijd lange datum in statusbalk weergeven: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Seinen aan rijzijde plaatsen: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Financieel overzicht aan het eind van het jaar weergeven: {ORANGE}{STRING}
@@ -1751,7 +1751,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :verbinding verb
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protocolfout
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Ongelijke NewGRF-instelling
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :niet toegestaan
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :ongeldig of onverwacht pakket ontvangen
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :raar pakket ontvangen
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :foute revisie
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :naam al in gebruik
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :fout spelwachtwoord
@@ -1769,7 +1769,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Spel nog steeds
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Spel nog steeds gepauzeerd ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Spel nog steeds gepauzeerd ({STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Spel vervolgd ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :aantal spelers
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :niet genoeg spelers
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :spelers maken verbinding
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :handmatig
 ############ End of leave-in-this-order
@@ -2051,7 +2051,7 @@ STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Versprei
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Landontwikkeling
 STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Plaats rotsachtige gebieden op de kaart
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Plaats vuurtoren
-STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definieer woestijngebied.{}Hou Ctrl vast om het te verwijderen
+STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definieer woestijngebied.{}Gebruik Ctrl om het te verwijderen
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Plaats radiomast
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Vergroot de landoppervlakte om te verhogen/verlagen
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Verklein de landoppervlakte om te verhogen/verlagen
@@ -2124,7 +2124,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stations
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Geaccepteerde vracht: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Spoor snelheidslimiet: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rotsen
@@ -2347,12 +2346,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Uitgeschak

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF-parameters ingeven

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Beschikbare NewGRF-bestanden
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Voeg toe aan selectie
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Voeg het geselecteerde NewGRF-bestand toe aan je configuratie
@@ -2394,8 +2388,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missend(
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Ontbrekend(e) GRF-bestand(en)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Het spel vervolgen kan OpenTTD laten vastlopen. Rapporteer geen bugs als het spel vastloopt.{}Weet je zeker dat je het spel wilt vervolgen?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Gedrag van NewGRF '{0:STRING}' zal waarschijnlijk desynchronisatiefouten (desyncs) en/of crashes veroorzaken.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Het verandert de lengte van voertuig '{1:ENGINE}' terwijl het niet in een depot is.
@@ -2405,13 +2397,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Vracht-/ombouwinformatie voor '{1:ENGINE}' wijkt af van aanschaflijst na het bouwen. Dit kan resulteren in problemen bij ombouwen door automatisch vernieuwen/vervangen.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' Een eindeloze loop gevonden in de productie-callback.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<ongeldige vracht>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} van <ongeldige vracht>
-STR_NEWGRF_INVALID_ENGINE                                       :<ongeldige treinmodel>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<ongeldig bedrijf>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordenlijst - {COMMA} bord{P "" en}

@@ -2764,16 +2749,15 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} G
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Dok
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Hangar

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} voertuig{P "" en}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})

-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Treinen - klik op trein voor informatie, sleep voertuig voor toevoegen/verwijderen van trein, klik rechts voor trein informatie, CTRL+klik voor samengestelde informatie
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wegvoertuigen - rechts-klik op wegvoertuig voor informatie
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Schepen - rechts-klik op schip voor informatie
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vliegtuig - rechts-klik op vliegtuig voor informatie
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Treinen - klik op trein voor informatie, sleep voertuig om voor toevoegen/verwijderen van trein
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Wegvoertuigen - klik op wegvoertuig voor informatie
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Schepen - klik op schip voor informatie
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Vliegtuig - klik op vliegtuig voor informatie

 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Sleep railvoertuig hier om het te verkopen
 STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Sleep wegvoertuig hier om het te verkopen
@@ -2961,8 +2945,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Onderho
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Onderhoud bij {STATION} Hangar
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Onderhoud bij {STATION} Hangar, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Details)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Naam
@@ -3147,16 +3129,16 @@ STR_ORDER_STOP_ORDER                                            :(Stop)
 STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}

 STR_ORDER_FULL_LOAD                                             :(Volledig laden)
-STR_ORDER_FULL_LOAD_ANY                                         :(Één soort vracht volledig laden)
+STR_ORDER_FULL_LOAD_ANY                                         :(Volledig laden één soort vracht)
 STR_ORDER_NO_LOAD                                               :(Niet laden)
 STR_ORDER_UNLOAD                                                :(Lossen en vracht meenemen)
 STR_ORDER_UNLOAD_FULL_LOAD                                      :(Lossen en wacht tot volledig vol)
 STR_ORDER_UNLOAD_FULL_LOAD_ANY                                  :(Lossen en wacht tot één soort vracht vol)
 STR_ORDER_UNLOAD_NO_LOAD                                        :(Lossen en vertrek leeg)
-STR_ORDER_TRANSFER                                              :(Overladen en neem vracht mee)
-STR_ORDER_TRANSFER_FULL_LOAD                                    :(Overladen en wacht tot volledig vol)
-STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Overladen en wacht tot één soort vol)
-STR_ORDER_TRANSFER_NO_LOAD                                      :(Overladen en vertrek leeg)
+STR_ORDER_TRANSFER                                              :(Transfer en neem vracht mee)
+STR_ORDER_TRANSFER_FULL_LOAD                                    :(Transfer en wacht tot volledig vol)
+STR_ORDER_TRANSFER_FULL_LOAD_ANY                                :(Transfer en wacht tot één soort vol)
+STR_ORDER_TRANSFER_NO_LOAD                                      :(Transfer en vertrek leeg)
 STR_ORDER_NO_UNLOAD                                             :(Niet lossen en neem vracht mee)
 STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Niet lossen en wacht tot volledig vol)
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Niet lossen en wacht tot één soort vol)
@@ -3169,90 +3151,90 @@ STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Spring naar ord
 STR_ORDER_CONDITIONAL_NUM                                       :Spring naar order {COMMA} als {STRING} {STRING} {COMMA}
 STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Spring naar order {COMMA} als {STRING} {STRING}

-STR_INVALID_ORDER                                               :{RED} (Ongeldige order)
+STR_INVALID_ORDER                                               :{RED} (Ongeldige Order)

 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Dienstregeling)
 STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Orders
-STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Ga naar het orderscherm
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Ga naar het order scherm

-STR_TIMETABLE_TOOLTIP                                           :{BLACK}Dienstregeling - klik op een order om te selecteren
+STR_TIMETABLE_TOOLTIP                                           :{BLACK}Dienstregeling - klik op een opdracht om het te selecteren

 STR_TIMETABLE_NO_TRAVEL                                         :Niet rijden
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Reis (geen dienstregeling)
 STR_TIMETABLE_TRAVEL_FOR                                        :Reis naar {STRING}
 STR_TIMETABLE_STAY_FOR                                          :en blijf voor {STRING}
-STR_TIMETABLE_AND_TRAVEL_FOR                                    :en rijd naar {STRING}
+STR_TIMETABLE_AND_TRAVEL_FOR                                    :en rijdt naar {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dag{P "" en}
 STR_TIMETABLE_TICKS                                             :{COMMA} tik{P "" ken}

 STR_TIMETABLE_TOTAL_TIME                                        :{BLACK}Dit tijdschema duurt {STRING} om te volbrengen
 STR_TIMETABLE_TOTAL_TIME_INCOMPLETE                             :{BLACK}Dit tijdschema duurt minstens {STRING} om te volbrengen (niet alles geselecteerd)

-STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Dit voertuig is op tijd
+STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Dit voertuig loopt op schema
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Dit voertuig heeft {STRING} vertraging
 STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Dit voertuig is {STRING} te vroeg
-STR_TIMETABLE_STATUS_NOT_STARTED                                :{BLACK}Deze dienstregeling is nog niet gestart
-STR_TIMETABLE_STATUS_START_AT                                   :{BLACK}Deze dienstregeling begint bij {STRING}
+STR_TIMETABLE_STATUS_NOT_STARTED                                :{BLACK}Dit reisschema is nog niet gestart
+STR_TIMETABLE_STATUS_START_AT                                   :{BLACK}Dit reisschema begint bij {STRING}

-STR_TIMETABLE_STARTING_DATE                                     :{BLACK}Begindatum
-STR_TIMETABLE_STARTING_DATE_TOOLTIP                             :{BLACK}Kies een datum als beginpunt voor deze dienstregeling
+STR_TIMETABLE_STARTING_DATE                                     :{BLACK}Startdatum
+STR_TIMETABLE_STARTING_DATE_TOOLTIP                             :{BLACK}Kies een datum als startpunt voor dit reisschema

 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Verander de tijd
-STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Verander de tijdsduur die de geselecteerde order mag duren
+STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Verander de hoeveelheid tijd die de geselecteerde opdracht mag innemen

-STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Verwijder tijd
-STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Verwijder de tijdsduur die de geselecteerde order mag duren
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Reset de tijd
+STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Verwijder de hoeveelheid tijd die de geselecteerde opdracht mag innemen

-STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset vertragingsteller
-STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset de vertragingsteller zodat het voertuig op tijd is
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset teller
+STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset de teller zodat het voertuig toch op tijd is

 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto-aanvullen
-STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Vul de dienstregeling automatisch in aan de hand van de volgende reis (Ctrl+klik om proberen wachttijden te bewaren)
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Vul de dienstregeling automatisch in aan de hand van de volgende reis (Ctrl+klik om wachttijden proberen te bewaren)

 STR_TIMETABLE_EXPECTED                                          :{BLACK}Verwacht
-STR_TIMETABLE_SCHEDULED                                         :{BLACK}Volgens dienstregeling
-STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Wissel tussen verwacht en volgens dienstregeling
+STR_TIMETABLE_SCHEDULED                                         :{BLACK}Schema
+STR_TIMETABLE_EXPECTED_TOOLTIP                                  :{BLACK}Wissel tussen verwacht and schema

 STR_TIMETABLE_ARRIVAL_ABBREVIATION                              :A:
 STR_TIMETABLE_DEPARTURE_ABBREVIATION                            :V:


 # Date window (for timetable)
-STR_DATE_CAPTION                                                :{WHITE}Datum selecteren
-STR_DATE_SET_DATE                                               :{BLACK}Datum selecteren
-STR_DATE_SET_DATE_TOOLTIP                                       :{BLACK}Gebruik de geselecteerde datum als startdatum voor de dienstregeling
-STR_DATE_DAY_TOOLTIP                                            :{BLACK}Selecteer dag
-STR_DATE_MONTH_TOOLTIP                                          :{BLACK}Selecteer maand
-STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Selecteer jaar
+STR_DATE_CAPTION                                                :{WHITE}Datum vastleggen
+STR_DATE_SET_DATE                                               :{BLACK}Datum vastleggen
+STR_DATE_SET_DATE_TOOLTIP                                       :{BLACK}Gebruik de geselecteerde datum als startdatum voor het reisschema
+STR_DATE_DAY_TOOLTIP                                            :{BLACK}Kies dag
+STR_DATE_MONTH_TOOLTIP                                          :{BLACK}Kies maand
+STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Kies jaar


 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}AI Debug
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
-STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Naam van computerspeler
-STR_AI_DEBUG_SETTINGS                                           :{BLACK}Instellingen van AI
-STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Wijzig de instellingen van de AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Naam computerspeler
+STR_AI_DEBUG_SETTINGS                                           :{BLACK}AI Instellingen
+STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Wijzig de instelling van de AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Herlaad computerspeler
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Verwijder computerspeler, herlaad het script en herstart computerspeler

 STR_ERROR_NO_AI                                                 :{WHITE}OpenTTD is gecompileerd zonder AI ondersteuning...
-STR_ERROR_NO_AI_SUB                                             :{WHITE}... geen AI's beschikbaar!
+STR_ERROR_NO_AI_SUB                                             :{WHITE}... geen AIs zijn beschikbaar!

 STR_ERROR_AI_NO_AI_FOUND                                        :Geen geschikte AI gevonden. {} Deze AI is een 'dummy' en voert niets uit.{}Verschillende AI's kunnen worden gedownload via het 'Online Content' systeem.
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Een van de actieve AI's is vastgelopen. Meld dit a.u.b. bij de auteur van deze AI met een schermprint van het AI Debugscherm
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Computerspeler Debugvenster is alleen beschikbaar voor de server
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Een van de draaiende AI's is gecrashed. Meldt dit bij de schrijver van deze AI met een schermprint van het AI Debugscherm.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}computerspeler Debug venster is alleen beschikbaar voor de server

 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}AI configuratie
+STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Configuratie
 STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Alle AI's die in het volgende spel geladen zullen worden
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Menselijke speler
 STR_AI_CONFIG_RANDOM_AI                                         :Willekeurige AI

-STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Omhoog verplaatsen
-STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Geselecteerde AI omhoog verplaatsen in de lijst
-STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Omlaag verplaatsen
-STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}De geselecteerde AI naar omlaag verplaatsen in de lijst
+STR_AI_CONFIG_MOVE_UP                                           :{BLACK}Verplaats Omhoog
+STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Verplaats geselecteerde AI omhoog in de lijst
+STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Verplaats Omlaag
+STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Verplaats de geselecteerde AI naar omlaag in de lijst

 STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecteer AI
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Laad andere AI
@@ -3263,19 +3245,19 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configur
 STR_AI_LIST_CAPTION                                             :{WHITE}Beschikbare AI's
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Klik om een AI te selecteren

-STR_AI_LIST_AUTHOR                                              :{BLACK}Auteur: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Maker: {STRING}
 STR_AI_LIST_VERSION                                             :{BLACK}Versie: {NUM}
 STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}

 STR_AI_LIST_ACCEPT                                              :{BLACK}Accepteer
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecteer gemarkeerde AI
 STR_AI_LIST_CANCEL                                              :{BLACK}Annuleren
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}AI niet veranderen
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Verander AI niet

 # AI Parameters
-STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI parameters
-STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sluiten
-STR_AI_SETTINGS_RESET                                           :{BLACK}Herstellen
+STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parameters
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sluit
+STR_AI_SETTINGS_RESET                                           :{BLACK}Herstel

 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3299,9 +3281,9 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Verwacht
 STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Opslaan van spel is nog bezig,{}Wacht tot dit voltooid is!
 STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automatisch opslaan mislukt
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kan niet lezen van schijf
-STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Opslaan spel mislukt{}{STRING}
+STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Opslaan Spel Mislukt{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Kan bestand niet verwijderen
-STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}Laden spel mislukt{}{STRING}
+STR_ERROR_GAME_LOAD_FAILED                                      :{WHITE}Laden Spel Mislukt{}{STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Interne fout: {STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Kapotte savegame - {STRING}
 STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Opgeslagen spel hoort bij een nieuwere versie
@@ -3316,11 +3298,11 @@ STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... er i

 STR_ERROR_PNGMAP                                                :{WHITE}Kan landschap uit PNG niet laden...
 STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... bestand niet gevonden.
-STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... kon afbeelding niet omzetten. 8 óf 24-bit PNG afbeelding nodig.
-STR_ERROR_PNGMAP_MISC                                           :{WHITE}... er ging iets fout. Sorry (bestand waarschijnlijk corrupt).
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... kon plaatje niet omzetten. 8 óf 24-bit PNG benodigd.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... er ging iets fout. Sorry. (waarschijnlijk corrupt bestand)

-STR_ERROR_BMPMAP                                                :{WHITE}Kan het landschap uit BMP niet laden...
-STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kan dit type afbeelding niet omzetten.
+STR_ERROR_BMPMAP                                                :{WHITE}Kan het landschap uit de BMP niet laden...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kan dit type foto niet omzetten.

 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Schaalwaarschuwing
 STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Het aanpassen van de grootte van een bronkaart is niet aan te bevelen. Toch doorgaan?
@@ -3329,8 +3311,8 @@ STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Het aan
 STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Alleen backup geluid is gevonden. Als je geluid wilt, installeer dan een geluiddsset via het downloadsysteem.

 # Screenshot related messages
-STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Schermprint succesvol opgeslagen als '{STRING}'
-STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Schermprint mislukt!
+STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot succesvol opgeslagen als '{STRING}'
+STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Screenshot mislukt!

 # Error message titles
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Bericht
@@ -3355,91 +3337,91 @@ STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{1:STRIN
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}De gemeenteraad van {TOWN} staat dit niet toe
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}De gemeenteraad van {TOWN} staat bouwen van nog een vliegveld niet toe
-STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} lokale autoriteiten weigeren toestemming te geven voor vliegveld wegens zorgen om geluidsoverlast
-STR_ERROR_BRIBE_FAILED                                          :{WHITE}Kan land hier niet ontgraven...
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} lokale autoriteiten weigeren toestemming te geven voor vliegveld wegens zorgen om geluid
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Je poging tot omkopen is
 STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}ontdekt door een regionale onderzoeker

 # Levelling errors
-STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kan land hier niet ophogen...
+STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kan het land hier niet verhogen...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Kan het land hier niet verlagen...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kan land hier niet egaliseren...
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Graafwerkzaamheden zouden tunnel beschadigen
-STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... al op zeeniveau
-STR_ERROR_TOO_HIGH                                              :{WHITE}... te hoog
-STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... al vlak
+STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Reeds op zeeniveau
+STR_ERROR_TOO_HIGH                                              :{WHITE}Te hoog
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... is al plat

 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kan bedrijfsnaam niet veranderen...
-STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Kan directeursnaam niet veranderen...
+STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Kan naam directeur niet veranderen...

-STR_ERROR_MAXIMUM_PERMITTED_LOAN                                :{WHITE}... maximaal toegestane lening bedraagt {CURRENCY}
+STR_ERROR_MAXIMUM_PERMITTED_LOAN                                :{WHITE}... maximaal toegestane leninggrootte is {CURRENCY}
 STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan geen geld meer lenen...
-STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... geen lening om af te betalen
+STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... geen lening om terug te betalen
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... {CURRENCY} benodigd
-STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan geen lening afbetalen
+STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan geen lening terugbetalen
 STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kan geen geld weggeven dat van de bank geleend is...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Kan bedrijf niet kopen...
-STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan bedrijfshoofdkantoor niet bouwen...
+STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan bedrijfshoofdkwartier niet bouwen
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kan geen 25% aandeel in dit bedrijf kopen...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kan geen 25% aandeel in dit bedrijf verkopen...
 STR_ERROR_PROTECTED                                             :{WHITE}Dit bedrijf verhandelt nog geen aandelen...

 # Town related errors
-STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan geen plaatsen bouwen
-STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Kan plaats niet hernoemen...
-STR_ERROR_CAN_T_FOUND_TOWN_HERE                                 :{WHITE}Kan hier geen nieuwe plaats bouwen...
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan geen enkele plaats bouwen
+STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Kan dorp niet hernoemen...
+STR_ERROR_CAN_T_FOUND_TOWN_HERE                                 :{WHITE}Kan hier geen nieuw dorp bouwen...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... te dicht bij de rand van de kaart
-STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... te dicht bij een andere plaats
-STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... te veel plaatsen
+STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... te dicht bij een ander dorp
+STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... te veel dorpen
 STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... er is geen ruimte meer op de kaart
-STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}De plaats bouwt geen wegen. Het bouwen van wegen kan aangezet worden via Geavanceerde Instellingen->Economie->Plaatsen.
-STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Wegwerkzaamheden in uitvoering
-STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kan deze plaats niet verwijderen...{}Een station of depot verwijst naar deze plaats of een door de plaats beheerde tegel kan niet worden verwijderd
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Het dorp bouwt geen wegen. Het bouwen van wegen kan aangezet worden via Geavanceerde Instellingen->Economie->Dorpen.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Er wordt aan de weg gewerkt
+STR_ERROR_TOWN_CAN_T_DELETE                                     :{WHITE}Kan dit dorp niet verwijderen...{}Een station of depot verwijst naar dit dorp of een dorpbeheerde tegel kan niet worden verwijderd

 # Industry related errors
-STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan geen industrieën genereren...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan geen industrieën genereren
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kan {STRING} hier niet bouwen...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kan dit type industrie hier niet bouwen...
 STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... te dicht bij een andere industrie
-STR_ERROR_MUST_FOUND_TOWN_FIRST                                 :{WHITE}... bouw eerst een plaats
-STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... slechts één per plaats toegestaan
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... kan alleen in plaatsen met meer dan 1.200 inwoners worden gebouwd
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... kan alleen in regenwouden gebouwd worden
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... kan alleen in woestijnen gebouwd worden
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... kan alleen in plaatsen gebouwd worden
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... kan alleen in laaggelegen gebieden gebouwd worden
+STR_ERROR_MUST_FOUND_TOWN_FIRST                                 :{WHITE}... plaats eerst dorp
+STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... slechts één per dorp toegestaan
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... kan alleen in dorpen met bevolking van meer dan 1200 worden gebouwd
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... kan alleen in het regenwoud gebouwd worden
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... kan alleen in woestijngebieden gebouwd worden
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... kan alleen in steden gebouwd worden
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... kan alleen gebouwd worden in laaggelegen gebieden
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... kan alleen aan de rand van de kaart geplaatst worden
-STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... bossen kunnen alleen boven de sneeuwgrens worden geplant
+STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... bossen kunnen alleen worden geplant boven de sneeuwgrens

 # Station construction related errors
 STR_ERROR_CAN_T_BUILD_RAILROAD_STATION                          :{WHITE}Kan hier geen treinstation bouwen...
 STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Kan hier geen bushalte bouwen...
-STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}Kan hier geen vrachtwagenlaadstation bouwen...
+STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}Kan hier geen vrachtwagenlaadhal bouwen...
 STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION                    :{WHITE}Kan geen passagierstramstation bouwen...
 STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION                        :{WHITE}Kan geen vrachttramhalte bouwen...
 STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Kan hier geen haven bouwen...
-STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kan hier geen vliegveld bouwen...
+STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kan vliegveld hier niet bouwen...

 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Voegt meer dan één bestaand (laad)station samen
-STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... station te omvangrijk
-STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... niet-uniforme stations uit
-STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Teveel (laad)stations
-STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Teveel treinstationsdelen
+STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... station te verspreid
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... niet uniforme stations uit
+STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Te veel (laad)stations
+STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Te veel treinstationsonderdelen
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Te veel bushaltes
-STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te veel vrachtwagenlaadstations
+STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Te veel vrachtwagenlaadhallen
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}Te dicht bij een ander station
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Te dicht bij een ander (laad)station
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Te dicht bij een andere haven
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Te dicht bij een ander vliegveld
-STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan stationsnaam niet veranderen...
-STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... deze weg is eigendom van een plaats
+STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan station niet hernoemen...
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... deze weg is van een stad
 STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... weg is in de verkeerde richting

 # Station destruction related errors
 STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan deel van station niet weghalen...
 STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Treinstation moet eerst verwijderd worden
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kan busstation niet verwijderen...
-STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan vrachtwagenlaadstation niet verwijderen...
+STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan vrachtwagenlaadhal niet verwijderen...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kan passagierstramstation niet verwijderen...
 STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Kan vrachttramhalte niet verwijderen...

@@ -3470,7 +3452,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Kan hier
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Kan hier geen tramdepot bouwen...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Kan dok hier niet bouwen...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trein moet gestopt zijn in depot
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... moet gestopt zijn binnen een wegvoertuigdepot
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Schip moet gestopt zijn binnen een dok
@@ -3500,7 +3481,6 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Sein moe
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Geen bruikbaar spoor
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Bestaand spoor moet eerst weggehaald worden
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Weg is eenrichtingsverkeer of geblokkeerd
-STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Gelijkvloerse kruisingen zijn niet toegestaan voor dit type spoor
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Kan hier geen seinen plaatsen...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Kan hier geen spoor leggen...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Kan hier geen spoor weghalen...
@@ -3528,7 +3508,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kan hier

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... er staat hier al een boom
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... verkeerde ondergrond voor dit type bomen
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan hier geen boom planten...

 # Bridge related errors
@@ -3539,7 +3518,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Begin va
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Brug is te laag voor dit terrein
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Begin en einde moeten op een lijn staan
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... uiteinden van brug moeten beiden op land zijn
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... brug te lang

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan hier geen tunnel bouwen...
@@ -3652,9 +3630,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan hier
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan de naam van het bord niet wijzigen
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan bord niet verwijderen...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Een kloon van Transport Tycoon Deluxe
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Hoog kantoorgebouw
@@ -4045,7 +4020,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Controlepost
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Controlepost #{COMMA}

-
 STR_UNKNOWN_STATION                                             :onbekend station
 STR_DEFAULT_SIGN_NAME                                           :Bord
 STR_COMPANY_SOMEONE                                             :iemand
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -215,7 +215,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Enter filter string
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Enter a keyword to filter the list for
@@ -1085,7 +1084,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Train a
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Original
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistic
 STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Slope steepness for trains {ORANGE}{STRING1}%
-STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships from making 90° turns: {ORANGE}{STRING1} {LTBLUE} (not with OPF)
+STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING1} {LTBLUE} (not with OPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Join train stations built next to each other: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Allow to join stations not directly adjacent: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1}
@@ -1099,6 +1098,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :none
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :as other industries
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospecting
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING1}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING1}
@@ -1751,7 +1751,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :connection lost
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protocol error
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF mismatch
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :not authorized
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :received invalid or unexpected packet
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :received strange packet
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :wrong revision
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :name already in use
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :wrong password
@@ -1769,7 +1769,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Game still paus
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Game still paused ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Game still paused ({STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Game unpaused ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :number of players
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :not enough players
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :connecting clients
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :manual
 ############ End of leave-in-this-order
@@ -1889,7 +1889,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Build ra
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Build railway signals. Ctrl toggles semaphore/light signals{}Dragging builds signals along a straight stretch of rail. Ctrl builds signals till the next junction{}Ctrl+Click toggles opening the signal selection window
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Build railway bridge
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Build railway tunnel
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Toggle build/remove for railway track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Toggle build/remove for railway track, signals, waypoints and stations. Holding Ctrl also removes rail from waypoints and stations
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Convert/Upgrade the type of rail

 # Rail depot construction window
@@ -2051,7 +2051,7 @@ STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Plant tr
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Land Generation
 STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Place rocky areas on landscape
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Place lighthouse
-STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Define desert area.{}Hold Ctrl to remove it
+STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Define desert area.{}Press and hold Ctrl to remove it
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Place transmitter
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Increase area of land to lower/raise
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Decrease area of land to lower/raise
@@ -2124,7 +2124,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Station
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{RAW_STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Cargo accepted: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Rail speed limit: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rocks
@@ -2347,12 +2346,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Disabled

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enter NewGRF parameters

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Available NewGRF files
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Add to selection
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Add the selected NewGRF file to your configuration
@@ -2394,8 +2388,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missing
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Missing GRF file(s)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Unpausing can crash OpenTTD. Do not file bug reports for subsequent crashes.{}Do you really want to unpause?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Behaviour of NewGRF '{0:RAW_STRING}' is likely to cause desyncs and/or crashes.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It changes vehicle length for '{1:ENGINE}' when not inside a depot.
@@ -2405,13 +2397,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit information for '{1:ENGINE}' differs from purchase list after construction. This might cause autorenew/-replace to fail refitting correctly.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' caused an endless loop in the production callback.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<invalid cargo>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} of <invalid cargo>
-STR_NEWGRF_INVALID_ENGINE                                       :<invalid vehicle model>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<invalid industry>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA} Sign{P "" s}

@@ -2490,7 +2475,7 @@ STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click on

 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Station names - click on name to centre view on station. Ctrl+Click opens a new viewport on station location
-STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hold Ctrl to select more than one item
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hold down Ctrl to select more than one item
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Station{P "" s}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
@@ -2764,16 +2749,15 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} R
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Ship Depot
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Aircraft Hangar

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{RAW_STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{RAW_STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})

-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trains - drag vehicle with left-click to add/remove from train, right-click for information. Hold Ctrl to make both functions apply to the following chain
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehicles - right-click on vehicle for information
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Ships - right-click on ship for information
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aircraft - right-click on aircraft for information
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Trains - click on train for information, drag vehicle to add/remove from train
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Vehicles - click on vehicle for information
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Ships - click on ship for information
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Aircraft - click on aircraft for information

 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Drag train vehicle to here to sell it
 STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Drag road vehicle to here to sell it
@@ -2961,8 +2945,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Service
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Service at {STATION} Hangar
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Service at {STATION} Hangar, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Details)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Name
@@ -2994,8 +2976,8 @@ STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer

 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Increase servicing interval by 10. Ctrl+Click increases servicing interval by 5
-STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Decrease servicing interval by 10. Ctrl+Click decreases servicing interval by 5
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Increase servicing interval with 10. Ctrl+Click increases servicing interval with 5
+STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Decrease servicing interval with 10. Ctrl+Click decreases servicing interval with 5

 STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Name train
 STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Name road vehicle
@@ -3470,7 +3452,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Can't bu
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Can't build tram vehicle depot here...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Can't build ship depot here...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Train must be stopped inside a depot
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... must be stopped inside a road vehicle depot
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Ship must be stopped in depot
@@ -3500,7 +3481,6 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Must rem
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}No suitable railway track
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Must remove railway track first
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Road is one way or blocked
-STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Level crossings not allowed for this rail type
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Can't build signals here...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Can't build railway track here...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Can't remove railway track from here...
@@ -3528,7 +3508,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Can't bu

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... tree already here
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... wrong terrain for tree type
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Can't plant tree here...

 # Bridge related errors
@@ -3539,7 +3518,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Bridge h
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Bridge is too low for the terrain
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start and end must be in line
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... ends of bridge must both be on land
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... bridge too long

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Can't build tunnel here...
@@ -3652,9 +3630,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Can't pl
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Can't change sign name...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Can't delete sign...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :A clone of Transport Tycoon Deluxe
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Tall office block
@@ -4045,7 +4020,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Waypoint
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Waypoint #{COMMA}

-
 STR_UNKNOWN_STATION                                             :unknown station
 STR_DEFAULT_SIGN_NAME                                           :Sign
 STR_COMPANY_SOMEONE                                             :someone
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -215,7 +215,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Enter filter string
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Enter a keyword to filter the list for
@@ -1099,6 +1098,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :none
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :as other industries
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospecting
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Allow multiple similar industries per town: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Industries of the same type can be built close to each other: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Always show long date in the status bar: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Show signals on the drive side: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING}
@@ -2346,12 +2346,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Disabled

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enter NewGRF parameters

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Available NewGRF files
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Add to selection
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Add the selected NewGRF file to your configuration
@@ -2393,8 +2388,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missing
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Missing GRF file(s)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Unpausing can crash OpenTTD. Do not file bug reports for subsequent crashes.{}Do you really want to unpause?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Behaviour of NewGRF '{STRING}' is likely to cause desyncs and/or crashes.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It changes vehicle length for '{1:ENGINE}' when not inside a depot.
@@ -2404,8 +2397,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit information for '{1:ENGINE}' differs from purchase list after construction. This might cause autorenew/-replace to fail refitting correctly.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' caused an endless loop in the production callback.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA} Sign{P "" s}

@@ -2758,7 +2749,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} R
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Ship Depot
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Aircraft Hangar

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{STRING}
@@ -2955,8 +2945,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Mainten
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Maintenance at {STATION} Hangar
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Maintenance at {STATION} Hangar, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Details)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Name
@@ -3463,7 +3451,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Can't bu
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Can't build streetcar depot here...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Can't build ship depot here...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Train must be stopped inside a depot
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... must be stopped inside a road vehicle depot
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Ship must be stopped in depot
@@ -3642,8 +3629,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Can't pl
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Can't change sign name...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Can't delete sign...

-# Translatable comment for OpenTTD's desktop shortcut
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Tall office block
@@ -4034,7 +4019,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :Waypoint {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Waypoint {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :unknown station
 STR_DEFAULT_SIGN_NAME                                           :Sign
 STR_COMPANY_SOMEONE                                             :someone
@@ -4124,4 +4108,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -216,7 +216,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Entajpu filtrotekston.
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Enigu ŝlosilvorton laŭ kiu filtri la liston
@@ -896,7 +895,7 @@ STR_GAME_OPTIONS_TOWN_NAMES_FRAME                               :{BLACK}Urbonomo
 STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP                    :{BLACK}Elektu stilon de urbonomoj

 ############ start of townname region
-STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH                     :Angle (Originale)
+STR_GAME_OPTIONS_TOWN_NAME_ORIGINAL_ENGLISH                     :Angle (Origine)
 STR_GAME_OPTIONS_TOWN_NAME_FRENCH                               :France
 STR_GAME_OPTIONS_TOWN_NAME_GERMAN                               :Germane
 STR_GAME_OPTIONS_TOWN_NAME_ADDITIONAL_ENGLISH                   :Angle (Aldone)
@@ -1079,8 +1078,8 @@ STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Permesu
 STR_CONFIG_SETTING_EXTRADYNAMITE                                :{LTBLUE}Permesu forigon de pli da urbaj stratoj, pontoj ktp: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAMMOTHTRAINS                                :{LTBLUE}Permesu konstrui tre longajn trajnojn: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Modelo de trajnakcelado: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Originale
-STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realisme
+STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Originala
+STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realisma
 STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Trajnoj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING} {LTBLUE} (bezonas NPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Ligu stacidomojn konstruatajn unu apud la alia: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Permesu ligi staciojn ne rekte najbarajn: {ORANGE}{STRING}
@@ -1095,6 +1094,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :neniu
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :kiel aliaj industrioj
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :prospektori
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Permesu pliajn similajn industriojn en la sama urbo: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Samtipaj industrioj povas esti konstruataj proksime unu de la alia: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Ĉiam montru longan daton en la statbreto: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Montru signalojn veturflanke: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Montru financan fenestron fine de la jaro: {ORANGE}{STRING}
@@ -1137,7 +1137,7 @@ STR_CONFIG_SETTING_ERRMSG_DURATION                              :{LTBLUE}Daŭro
 STR_CONFIG_SETTING_POPULATION_IN_LABEL                          :{LTBLUE}Montru enloĝantaron en urbnomindikilo: {ORANGE}{STRING}

 STR_CONFIG_SETTING_LAND_GENERATOR                               :{LTBLUE}Landgenerilo: {ORANGE}{STRING}
-STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Originale
+STR_CONFIG_SETTING_LAND_GENERATOR_ORIGINAL                      :Origina
 STR_CONFIG_SETTING_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
 STR_CONFIG_SETTING_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Maksimuma distanco de rando por Oleproduktejoj {ORANGE}{STRING}
 STR_CONFIG_SETTING_SNOWLINE_HEIGHT                              :{LTBLUE}Neĝregiona alto: {ORANGE}{STRING}
@@ -1148,7 +1148,7 @@ STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_ROUGH                   :Neregule
 STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Malregule
 STR_CONFIG_SETTING_TREE_PLACER                                  :{LTBLUE}Arbometa algoritmo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TREE_PLACER_NONE                             :Neniu
-STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL                         :Originale
+STR_CONFIG_SETTING_TREE_PLACER_ORIGINAL                         :Origina
 STR_CONFIG_SETTING_TREE_PLACER_IMPROVED                         :Plibonigita
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Altecmapa turniĝo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Maldekstrume
@@ -1255,7 +1255,7 @@ STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Pad-signaloj so
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :ĉiom

 STR_CONFIG_SETTING_TOWN_LAYOUT                                  :{LTBLUE}Strataranĝo por novaj urboj: {ORANGE}{STRING}
-STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT                          :originale
+STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT                          :defaŭlte
 STR_CONFIG_SETTING_TOWN_LAYOUT_BETTER_ROADS                     :pli bonaj stratoj
 STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :kvadrataro de 2x2
 STR_CONFIG_SETTING_TOWN_LAYOUT_3X3_GRID                         :kvadrataro de 3x3
@@ -1264,7 +1264,6 @@ STR_CONFIG_SETTING_ALLOW_TOWN_ROADS                             :{LTBLUE}Permesu
 STR_CONFIG_SETTING_NOISE_LEVEL                                  :{LTBLUE}Permesu urbe kontrolatan laŭtecon por flughavenoj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_FOUNDING_FORBIDDEN                      :prohibita
 STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED                        :permesita
-STR_CONFIG_SETTING_TOWN_FOUNDING_ALLOWED_CUSTOM_LAYOUT          :permesite, propra urbomapo

 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_RAINFOREST              :nur en pluvarbaroj
 STR_CONFIG_SETTING_EXTRA_TREE_PLACEMENT_ALL                     :ĉie
@@ -1308,14 +1307,14 @@ STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Industr

 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS                        :{LTBLUE}Padtrovilo por trajnoj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_NPF                    :NPF
-STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Rekomendite)
+STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS_YAPF                   :YAPF {BLUE}(Rekomendita)
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES                 :{LTBLUE}Padtrovilo por stratveturiloj: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_NPF             :NPF
 STR_CONFIG_SETTING_PATHFINDER_FOR_ROAD_VEHICLES_YAPF            :YAPF {BLUE}(Rekomendita)
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS                         :{LTBLUE}Padtrovilo por ŝipoj: {ORANGE}{STRING}
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF                     :Originale {BLUE}(Rekomendite)
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_OPF                     :Originala {BLUE}(Rekomendita)
 STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_NPF                     :NPF
-STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Nerekomendite)
+STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(malrekomenda)

 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}X-grandeco de la mapo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-grandeco de la mapo: {ORANGE}{STRING}
@@ -2056,7 +2055,7 @@ STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Urbegoj

 STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Urba strataranĝo:
 STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selektu strataranĝon uzendan por ĉi tiu urbo
-STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originale
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalo
 STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Pli bonaj stratoj
 STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 krado
 STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 krado
@@ -2091,7 +2090,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stacioti
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Ŝarĝo akceptata: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Rela rapideclimo: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rokoj
@@ -2245,7 +2243,6 @@ STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Mapa nom
 STR_MAPGEN_HEIGHTMAP_SIZE_LABEL                                 :{BLACK}Grandeco:
 STR_MAPGEN_HEIGHTMAP_SIZE                                       :{ORANGE}{NUM} * {NUM}

-STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Enigu hazardan semon
 STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ŝanĝu altecon de la neĝlinio
 STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Ŝanĝu komencjaron

@@ -2306,12 +2303,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Malaktiva

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enigu NewGRF-parametrojn

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Haveblaj NewGRF-dosieroj
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Aldonu al elekto
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Aldonu la elektitan NewGRF-dosieron al viaj agordoj
@@ -2703,7 +2695,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} S
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Ŝipgaraĝo
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Flugmaŝinhangaro

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veturilo{P "" j}{STRING}
@@ -2900,8 +2891,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Prizorg
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Prizorgo ĉe Hangaro de {STATION}
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Prizorgo ĉe Hangaro de {STATION}, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaloj)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nomo
@@ -3387,7 +3376,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Ne povas
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Ne povas konstrui tramgaraĝon ĉi tie...
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Ne povas konstrui ŝipgaraĝon ĉi tie...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trajno estu haltita en garaĝo
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... devas esti halta en stratveturila garaĝo
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Ŝipo devas halti en garaĝo
@@ -3452,7 +3440,6 @@ STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Ne povas
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Ponto estas tro malalta por la tereno
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Komenco kaj fino devas esti samliniaj
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... ambaŭ pontfinoj devas esti sur tero
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... ponto estas tro longa

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Ne povas konstrui tunelon ĉi tie...
@@ -3954,7 +3941,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :Vojpunkto {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Vojpunkto {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :nekonata stacio
 STR_DEFAULT_SIGN_NAME                                           :Signo
 STR_COMPANY_SOMEONE                                             :iu
@@ -4044,5 +4030,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -272,7 +272,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Sisesta filterkirjend
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Sisesta märksõna mida loendist otsida
@@ -1142,7 +1141,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL                     :{LTBLUE}Rongide
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_ORIGINAL            :Algupärane
 STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC           :Realistlik
 STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS                        :{LTBLUE}Järsakute kalde suurus rongide jaoks {ORANGE}{STRING}%
-STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Rongidel ja laevadel keelatakse 90 kraadised pöörded: {ORANGE}{STRING} {LTBLUE} (ei tööta OPF-ga)
+STR_CONFIG_SETTING_FORBID_90_DEG                                :{LTBLUE}Rongidel ja laevadel keelatakse 90 kraadised pöörded: {ORANGE}{STRING} {LTBLUE} (vajab NPF)
 STR_CONFIG_SETTING_JOINSTATIONS                                 :{LTBLUE}Kõrvuti ehitatud jaamade ühendamine: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS                        :{LTBLUE}Mitte kõrvuti asetsevate jaamade liitmine: {ORANGE}{STRING}
 STR_CONFIG_SETTING_IMPROVEDLOAD                                 :{LTBLUE}Täiustatud laadimisalgoritm: {ORANGE}{STRING}
@@ -1156,6 +1155,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :pole
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :nagu muud tööstused
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :eeluuringutega
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Samalaadsed tööstused ühes linnas: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Samalaadsed tööstused lähestiku: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Täispikk kuupäev olekuribal: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Signaalide paigutamine sõidusuunda: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Aastalõpu rahavoogude aruanne: {ORANGE}{STRING}
@@ -1406,7 +1406,7 @@ STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Internet
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Tehismõistuse seaded
 STR_INTRO_QUIT                                                  :{BLACK}Välju

-STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Alusta uut mängu. Ctrl+Klikk jätab kaardi seadistamise vahele
+STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Alusta uut mängu
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Laadi salvestatud mäng
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Alusta uut mängu kasutades kõrguskaarti maastikuna
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Alusta omatehtud stsenaariumit kasutades uut mängu
@@ -1592,7 +1592,7 @@ STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Kliendi
 STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Keel: {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_LANDSCAPE                               :{SILVER}Maastik: {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kaardi suurus: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Serveri versioon: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Osa serveris:  {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Serveri aadress: {WHITE}{STRING}
 STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Aeg alguses: {WHITE}{DATE_SHORT}
 STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Aeg hetkel: {WHITE}{DATE_SHORT}
@@ -1738,7 +1738,7 @@ STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Ettevõt
 # 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_NEW_COMPANY                            :{WHITE}Uus Ettevõte

 # Network client list
 STR_NETWORK_CLIENTLIST_KICK                                     :Viska välja
@@ -1938,7 +1938,7 @@ STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrir
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Monorelsi ehitamine
 STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :{WHITE}Magnethõljuktee ehitamine

-STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Ehita raudteed. Ctrl vahetab ehitamise eemaldamise vastu
+STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Ehita rööbasteed
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Rööbaste ehitamine kasutades "lohistamist"
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Ehita rongidepoo (rongide ehitamiseks ja hoolduseks)
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Muuda rööpad meldepunktiks
@@ -2158,7 +2158,7 @@ STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Vali sii
 STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Palju suvalisi tööstusi
 STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Kata kaart suvaliselt paigutatud tööstustega
 STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Hind: {YELLOW}{CURRENCY}
-STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Rahasta
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Uuri
 STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Ehita
 STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Rahasta

@@ -2181,7 +2181,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Jaama r
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Vastuvõetavad veosed: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Raudtee kiirusepiirang: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kaljud
@@ -2404,12 +2403,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Väljas

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Sisesta NewGRF parameetrid

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Olemasolevad NewGRF failid
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Lisa valikule
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Lisa valitud NewGRF fail enda seadistusse
@@ -2451,8 +2445,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Puuduvad
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Puuduolevad GRF failid
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Seisatuse lõpetamine võib põhjustada OpenTTD krahhi. Ära teavita järgnevatest krahhidest.{}Oled sa tõepoolest veendunud, et sa soovid seisatuse lõpetada?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}NewGRF '{STRING}' käitumine põhjustab tõenäoliselt sünkrooni katkemisi ja/või mängu kokkujooksmiseid.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Depoost väljas asudes muudab sõiduki '{1:ENGINE}' pikkust.
@@ -2462,13 +2454,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Veose/ümberseadistamise teave sõidukil '{1:ENGINE}' erineb ehitamisaegsest ostunimekirjast. Seetõttu võib uuendamisel või asendamisel ümberseadistamine ebaõnnestuda.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' põhjustas toodangu tagasikutsumises lõpmatu korduse.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<vale või vigane kaup>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} <vale või vigane kaup>
-STR_NEWGRF_INVALID_ENGINE                                       :<vigane mootor>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<vigane tööstus>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Siltide nimekiri - {COMMA} Silt{P "" i}

@@ -2527,10 +2512,10 @@ STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS                        :Rahasta uute ho
 STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT                  :Osta monopoolsed veoõigused
 STR_LOCAL_AUTHORITY_ACTION_BRIBE                                :Paku kohalikule omavalitsusele altkäemaksu

-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING            :{YELLOW} Pisikese kohaliku reklaamikampaania korraldamine meelitab rohkem reisijaid ja kaupu sinu veoteenuseid kasutama.{} Hind: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING           :{YELLOW} Keskmise reklaamikampaania korraldamine, et meelitada rohkem reisijaid ja kaupu sinu teenuste juurede.{} Hind: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING            :{YELLOW} Suure reklaamikampaania korraldamine, et meelitada rohkem reisijaid ja kaupu sinu teenuste juurede.{} Hind: {CURRENCY}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION          :{YELLOW} Teehoiutööde rahastamine. Põhjustab linnatänavatel tõsiseid liiklusprobleeme kuni 6 kuuks.{} Hind: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING            :{YELLOW} Pisikese kohaliku reklaamikampaania korraldamine meelitab rohkem reisijaid ja kaupu sinu veoteenuseid kasutama.{}  Hind: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING           :{YELLOW} Keskmise reklaamikampaania korraldamine, et meelitada rohkem reisijaid ja kaupu sinu teenuste juurede.{}  Hind: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING            :{YELLOW} Suure reklaamikampaania korraldamine, et meelitada rohkem reisijaid ja kaupu sinu teenuste juurede.{}  Hind: {CURRENCY}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION          :{YELLOW} Teehoiutööde rahastamine. Põhjustab linnatänavatel tõsiseid liiklusprobleeme kuni 6 kuuks.{}  Hind: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY            :{YELLOW} Oma ettevõtte auks kuju ehitamine.{} Hind: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW} Uute ärihoonete ehitamise rahastamine selles linnas.{} Hind: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW} Üheks aastaks monopoolsete veoõiguste ostmine selles linnas. Linna omavalitsus lubab reisijate ja kauba veoks kasutada ainult sinu jaamasid.{} Hind: {CURRENCY}
@@ -2623,7 +2608,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Kokku:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Kontojääk
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Laen
-STR_FINANCES_MAX_LOAN                                           :{WHITE}Laenupiir: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Laenupiir:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Laena {CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Laena raha
@@ -2768,7 +2753,7 @@ STR_BUY_VEHICLE_SHIP_CAPTION                                    :{WHITE}Uued lae
 STR_BUY_VEHICLE_AIRCRAFT_CAPTION                                :{WHITE}Uus lennuk

 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Hind: {GOLD}{CURRENCY}{BLACK} Tühimass: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Tippkiirus: {GOLD}{VELOCITY}{BLACK} Võimsus: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Tippkiirus: {GOLD}{VELOCITY}{BLACK}   Võimsus: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Tippkiirus: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Käituskulud: {GOLD}{CURRENCY}/aastas
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kandevõime: {GOLD}{CARGO} {STRING}
@@ -2776,7 +2761,7 @@ STR_PURCHASE_INFO_REFITTABLE                                    :(ümberseadista
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Kujundatud: {GOLD}{NUM}{BLACK} Vanus: {GOLD}{COMMA} aastat
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Parim tehnoseisund: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Hind: {GOLD}{CURRENCY}
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Mass: {GOLD}{WEIGHT_S} {WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Mass: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Hind: {GOLD}{CURRENCY}{BLACK} Tippkiirus: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kandevõime: {GOLD}{CARGO}, {CARGO}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Kiirendavad vagunid: {GOLD}+{POWER}{BLACK} Mass: {GOLD}+{WEIGHT_S}
@@ -2821,7 +2806,6 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}Linna {T
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN} Laevaremonditehas
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}{STATION} Lennujaama angaar

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} sõiduk{P "" id}{STRING}
@@ -3018,8 +3002,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Hooldus
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Hooldus linna {STATION} angaaris
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Hooldus linna {STATION} angaaris, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (täpsustused)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nimi
@@ -3049,10 +3031,10 @@ STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Kandevõ

 STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Ülekantud tulu: {LTBLUE}{CURRENCY}

-STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA}päevad{BLACK}  Viimati hooldatud: {LTBLUE}{DATE_LONG}
+STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA} päeva{BLACK}  Viimati hooldatud: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA}%{BLACK}   Viimati hooldatud: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Suurenda hooldusvahemiku 10 võrra. Ctrl+Klõps suurendab hooldusvahemikku 5 võrra.
-STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Vähenda hooldusvahemiku 10 võrra. Ctrl+Klõps vähendab hooldusvahemikku 5 võrra.
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Suurenda hooldusvahemiku
+STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Vähenda hooldusvahemiku

 STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Anna rongile nimi
 STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeta mootorsõiduk ümber
@@ -3380,7 +3362,7 @@ STR_ERROR_BMPMAP                                                :{WHITE}Ei suuda
 STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... ei suutnud muuta pildi tüüpi.

 STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skaala hoiatus
-STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Kaardi suuruse liigne muutmine pole soovitatav. Jätka?
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Kaardi suuruse muutmine pole soovitatav. Jätka?

 # Soundset messages
 STR_WARNING_FALLBACK_SOUNDSET                                   :{WHITE}Mäng ei leidnud helisid. Helid saad paigaldada Internetisisu laadimise aknast.
@@ -3527,7 +3509,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Siia ei
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Trammidepood ei saa siia rajada
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Laevaremonditehast ei saa siia ehitada...

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Rong peab olema depoos peatatud
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... peab garaažis olema
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Laev peab olema sadamas peatatud
@@ -3557,10 +3538,9 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Signaali
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Sobiv rongitee puudub
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Rööbastee tuleb eelnevalt lammutada
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Läbipääsmatu või ühesuunaline maantee
-STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Ülesõidukohad on selle raudteetüübi puhul keelatud
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Siia ei saa signaale rajada...
-STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Siia ei saa raudteed ehitada...
-STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Siit ei saa raudteed lammutada...
+STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Siia ei saa rööbasteed ehitada...
+STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Siit ei saa rööbasteed lammutada...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Siit ei saa signaale lammutada...
 STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Siin ei saa signaale teisendada...

@@ -3585,7 +3565,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Siia ei

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... siin on juba puu olemas
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... vale maa tüüp puu jaoks
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Siia ei saa puud istutada...

 # Bridge related errors
@@ -3596,7 +3575,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Sillaots
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Sild on maastiku suhtes liiga madal
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Algus ja lõpp peavad samal joonel olema
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... mõlemad sillaotsad peavad olema maal
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}.. sild on liiga pik

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Siia ei saa tunnelit ehitada...
@@ -3709,9 +3687,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Siia ei
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Silti ei saa muuta...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Silti ei saa kustutada...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Koopia Transport Tycoon Deluxe-est
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Kõrge büroohoone
@@ -3800,9 +3775,9 @@ STR_SV_AIRCRAFT_NAME                                            :Õhusõiduk {CO

 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :Põhja {STRING}
-STR_SV_STNAME_SOUTH                                             :{STRING} Lõuna
-STR_SV_STNAME_EAST                                              :{STRING} Ida
-STR_SV_STNAME_WEST                                              :{STRING} Lääne
+STR_SV_STNAME_SOUTH                                             : Lõuna {STRING}
+STR_SV_STNAME_EAST                                              : Ida {STRING}
+STR_SV_STNAME_WEST                                              : Lääne {STRING}
 STR_SV_STNAME_CENTRAL                                           :{STRING} keskus
 STR_SV_STNAME_TRANSFER                                          :{STRING} ümberlaadimispaik
 STR_SV_STNAME_HALT                                              :{STRING} peatus
@@ -4102,7 +4077,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
 STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} meldepunkt
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Meldepunkt {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :tundmatu jaam
 STR_DEFAULT_SIGN_NAME                                           :Silt
 STR_COMPANY_SOMEONE                                             :keegi
@@ -4192,5 +4166,3 @@ STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}
-
-STR_TOOLBAR_RAILTYPE_VELOCITY                                   :{STRING} ({VELOCITY})
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -171,7 +171,7 @@ STR_TONS                                                        :tonnia
 STR_LITERS                                                      :litraa
 STR_ITEMS                                                       :erää
 STR_CRATES                                                      :laatikkoa
-STR_RES_OTHER                                                   :muu
+STR_RES_OTHER                                                   :muut
 STR_NOTHING                                                     :

 # Colours, do not shuffle
@@ -215,7 +215,6 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-
 # Common window strings
 STR_LIST_FILTER_OSKTITLE                                        :{BLACK}Syötä suodatin teksti
 STR_LIST_FILTER_TOOLTIP                                         :{BLACK}Syötä avainsana suodattaaksesi listan
@@ -233,7 +232,7 @@ STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Ikkunan
 STR_TOOLTIP_SHADE                                               :{BLACK}Pienennä ikkuna - näytä vain otsikko
 STR_TOOLTIP_STICKY                                              :{BLACK}'Sulje Kaikki Ikkunat'-nappi ei vaikuta tähän ikkunaan.
 STR_TOOLTIP_RESIZE                                              :{BLACK}Napsauta ja vedä muuttaaksesi tämän ikkunan kokoa.
-STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Suurenna/pienennä ikkuna
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Suuri/pieni ikkunan koko
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Vierityspalkki - luettelon vieritys ylös/alas
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Vierityspalkki - luettelon vieritys vasemmalle/oikealle.
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Tuhoa rakennuksia, puita, jne.
@@ -292,7 +291,7 @@ STR_SORT_BY_CARGO_CAPACITY                                      :Rahtikapasiteet
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Tauko
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Nopeuta peliä
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Asetukset
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Tallenna peli, lopeta peli, poistu
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Pelin tallennus, lopetus ja sulkeminen
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Näytä kartta, lisänäkymä ja kylttilista
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Näytä kaupunkihakemisto
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Näytä tukitarjoukset
@@ -302,10 +301,10 @@ STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_GENERAL                     :{BLACK}Näytä
 STR_TOOLBAR_TOOLTIP_DISPLAY_GRAPHS                              :{BLACK}Näytä kuvaajat
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_LEAGUE                      :{BLACK}Näytä yhtiökilpataulukko
 STR_TOOLBAR_TOOLTIP_FUND_CONSTRUCTION_OF_NEW                    :{BLACK}Rahoita uuden teollisuuden rakentamista ja näytä teollisuushakemisto
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Näytä luettelo yhtiön junista. Ctrl+Klik avaa ryhmä/kulkuneuvolistan
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Näytä luettelo yhtiön ajoneuvoista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Näytä luettelo yhtiön laivoista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan
-STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Näytä luettelo yhtiön lentokoneista. Ctrl+Klik avaa ryhmä/kulkuneuvoikkunan
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_TRAINS              :{BLACK}Näytä luettelo yhtiön junista. Ctrl+Click avaa ryhmä/kulkuneuvolistan
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_ROAD_VEHICLES       :{BLACK}Näytä luettelo yhtiön ajoneuvoista. Ctrl+Click avaa ryhmä/kulkuneuvoikkunan
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_SHIPS               :{BLACK}Näytä luettelo yhtiön laivoista. Ctrl+Click avaa ryhmä/kulkuneuvoikkunan
+STR_TOOLBAR_TOOLTIP_DISPLAY_LIST_OF_COMPANY_AIRCRAFT            :{BLACK}Näytä luettelo yhtiön lentokoneista. Ctrl+Click avaa ryhmä/kulkuneuvoikkunan
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN                            :{BLACK}Lähennä näkymää
 STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_OUT                           :{BLACK}Loitonna näkymää
 STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                        :{BLACK}Rakenna rautateitä
@@ -319,7 +318,7 @@ STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Maa-alue
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Vaihda työkalupalkkeja

 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Tallenna skenaario, lataa skenaario, sulje skenaariomuokkain, poistu
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Tallenna skenaario, lataa skenaario, hylkää skenaariomuokkain, poistu
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Skenaariomuokkain
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Siirrä aloituspäivää vuodella taaksepäin
@@ -553,7 +552,7 @@ STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
 ############ Those following lines need to be in this order!!
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Liikennevälineitä:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Asemia:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Vähimmäistuotto:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Väh. tuotto:
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Vähimmäistulo:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Enimmäistulo:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Kuljetettu:
@@ -1075,7 +1074,7 @@ STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Lisäase
 STR_CONFIG_SETTING_OFF                                          :pois
 STR_CONFIG_SETTING_ON                                           :päällä
 STR_CONFIG_SETTING_DISABLED                                     :pois käytöstä
-STR_CONFIG_SETTING_VEHICLESPEED                                 :{LTBLUE}Näytä liikennevälineen nopeus tilapalkissa: {ORANGE}{STRING}
+STR_CONFIG_SETTING_VEHICLESPEED                                 :{LTBLUE}Ajoneuvon nopeus tilapalkissa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_BUILDONSLOPES                                :{LTBLUE}Rakentaminen rinteisiin ja rannikolle sallittu: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSLOPE                                    :{LTBLUE}Salli maaston muokkaaminen rakennusten, raiteiden jne. juurella (autoslope): {ORANGE}{STRING}
 STR_CONFIG_SETTING_CATCHMENT                                    :{LTBLUE}Realistisemman kokoiset vaikutusalueet: {ORANGE}{STRING}
@@ -1099,6 +1098,7 @@ STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE        :ei mikään
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL      :kuten muut tehtaat
 STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :koekaivaus
 STR_CONFIG_SETTING_MULTIPINDTOWN                                :{LTBLUE}Kaupungissa voi olla useita samanlaisia teollisuustyyppejä: {ORANGE}{STRING}
+STR_CONFIG_SETTING_SAMEINDCLOSE                                 :{LTBLUE}Samantyyppistä teollisuutta voidaan rakentaa lähekkäin: {ORANGE}{STRING}
 STR_CONFIG_SETTING_LONGDATE                                     :{LTBLUE}Näytä aina koko päiväys tilapalkissa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SIGNALSIDE                                   :{LTBLUE}Näytä opastimet ajokaistalla: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SHOWFINANCES                                 :{LTBLUE}Näytä rahoitusikkuna vuoden lopussa: {ORANGE}{STRING}
@@ -1185,7 +1185,7 @@ STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :{LTBLUE}Rullan

 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU                          :{LTBLUE}Oikean painikkeen emulointi: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Command
-STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Ctrl+Klik
+STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Control
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Pois

 STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Vasemmalla hiiren painikkeella liikkuminen: {ORANGE}{STRING}
@@ -1282,10 +1282,10 @@ STR_CONFIG_SETTING_TOOLBAR_POS                                  :{LTBLUE}Pääty
 STR_CONFIG_SETTING_TOOLBAR_POS_LEFT                             :vasen
 STR_CONFIG_SETTING_TOOLBAR_POS_CENTER                           :keskellä
 STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT                            :oikea
-STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}{STRING} pikseliä
+STR_CONFIG_SETTING_SNAP_RADIUS                                  :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}{STRING} piks.
 STR_CONFIG_SETTING_SNAP_RADIUS_DISABLED                         :{LTBLUE}Ikkunan kiinniottosäde: {ORANGE}pois päältä
-STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Ikkunoiden rajoitus (ei-kiinnitetyt): {ORANGE}{STRING}
-STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Ikkunoiden rajoitus (ei-kiinnitetyt): {ORANGE}pois käytöstä
+STR_CONFIG_SETTING_SOFT_LIMIT                                   :{LTBLUE}Ikkunoiden rajoitus (ei-kiinnittyvä): {ORANGE}{STRING}
+STR_CONFIG_SETTING_SOFT_LIMIT_DISABLED                          :{LTBLUE}Ikkunoiden rajoitus (ei-kiinnittyvä): {ORANGE}pois käytöstä
 STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}Kaupunkien kasvunopeus: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :Ei kasvua
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :Hidas
@@ -1349,7 +1349,7 @@ STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Tarkista
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Tekoälyasetukset
 STR_INTRO_QUIT                                                  :{BLACK}Sulje

-STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Aloita uusi peli. Ctrl+Klik ohittaa kartan asetukset
+STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Aloita uusi peli. Ctrl+Click ohittaa kartan asetukset
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Lataa tallennettu peli.
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Aloita uusi peli, käyttäen korkeuskarttaa maastona
 STR_INTRO_TOOLTIP_PLAY_SCENARIO                                 :{BLACK}Aloita uusi peli käyttäen omaa skenaariota.
@@ -1751,7 +1751,7 @@ STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :yhteys katkesi
 STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokollavirhe
 STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF-virhe
 STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :ei valtuutettu
-STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :vastaanotettiin viallinen tai odottamaton paketti
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :vastaanotettiin omituinen paketti
 STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :väärä revisio
 STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nimi on jo käytössä
 STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :väärä salasana
@@ -1769,7 +1769,7 @@ STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1                  :Peli yhä pysä
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2                  :Peli yhä pysäytetty ({STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3                  :Peli yhä pysäytetty ({STRING}, {STRING}, {STRING})
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED                        :Peliä jatketaan ({STRING})
-STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :pelaajien määrä
+STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS       :ei tarpeeksi pelaajia
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS       :yhdistäviä pelaajia
 STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL                   :manuaalinen
 ############ End of leave-in-this-order
@@ -1799,7 +1799,7 @@ STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Valitse
 STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Valitse kaikki sisältö, joka on päivitys nykyiseen sisältöön, ladattavaksi
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Poista valinnat
 STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Poista kaikesta sisällöstä valinta ladattavaksi
-STR_CONTENT_FILTER_TITLE                                        :{BLACK}Avainsana/nimi suodatus:
+STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tagi/nimi suodatus:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Lataa
 STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Aloita valitun sisällön lataaminen
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Latausten koko: {WHITE}{BYTES}
@@ -1848,15 +1848,15 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Ei voitu

 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Läpinäkyvyysasetukset
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Muuta asemakylttien läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Muuta ajolinjojen läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
-STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+Klik lukitaksesi.
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Muuta asemakylttien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Muuta ajolinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
 STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Tee kohteista läpinäkyvyyden sijaan näkymättömiä

 # Base for station construction window(s)
@@ -1889,7 +1889,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Rakenna
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Rakenna opastimia. Ctrl vaihtaa joko siipiopastimet tai valo-opastimet{}Vetäminen rakentaa opastimia suoralle rautatielle. Ctrl rakentaa opastimia seuraavaan risteykseen saakka{}Ctrl+Click avaa opastimenvalintaikkunan
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Rakenna rautatiesilta.
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Rakenna rautatietunneli.
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Rautatien, opastimien, reittipisteiden ja asemien rakentaminen/poisto päälle/pois. Pidä pohjassa Ctrl-näppäintä poistaaksesi myös aseman tai reittipisteen alla olevat raiteet.
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Rautatien, reittipisteiden, asemien ja opastimien rakentaminen/poisto päälle/pois.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Muunna/päivitä raidetyyppi.

 # Rail depot construction window
@@ -1931,7 +1931,7 @@ STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Poistumi
 STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Yhdistelmäopastin (valo-opastin){}Yhdistelmäopastin toimii yhtä aikaa tulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita".
 STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Reittiopastin (valo-opastin){}Reittiopastin varmistaa junille turvallisen reitin ja siten mahdollistaa useampien junien yhtäaikaisen liikenteen moniraiteisissa risteyksissä. Tavalliset reittiopastimet voi ohittaa takakautta.
 STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Yksisuuntainen reittiopastin (valo-opastin){}Reittiopastin varmistaa junille turvallisen reitin ja siten mahdollistaa useampien junien yhtäaikaisen liikenteen moniraiteisissa risteyksissä. Yksisuuntaisia opastimia ei voi ohittaa takakautta.
-STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen klikkaaminen muuntaa siitä valituntyyppisen ja -muotoisen. Ctrl+Klik vaihtaa nykyistä opastimen muotoa.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen klikkaaminen muuntaa siitä valituntyyppisen ja -muotoisen. Ctrl+Click vaihtaa nykyistä opastimen muotoa.
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Opastimien väli vetämällä lisättäessä
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Pienennä opastimien väliä vetämällä lisättäessä
 STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Suurenna opastimien väliä vetämällä lisättäessä
@@ -1997,7 +1997,7 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Rakenna
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Rakenna satama. Ctrl liittää asemat
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Sijoita poiju: voidaan käyttää ylimääräisenä reittipisteenä.
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Rakenna akvedukti
-STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Määrittele vesialue.{}Tee kanava, paitsi jos Ctrl on painettuna merenpinnalla. Tällöin meri laajenee ympäristöön.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Määrittele vesialue.{}Tee kanava, paitsi jos Ctrl on alaspainettuna merenpinnalla. Tällöin meri laajenee ympäristöön.
 STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Sijoita jokia.

 # Ship depot construction window
@@ -2051,7 +2051,7 @@ STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Istuta p
 STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION                   :{WHITE}Maanrakennus
 STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Sijoita kallioisia alueita maastoon.
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Sijoita majakka.
-STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Määrittele aavikon alue.{}Pidä Ctrl-nappia pohjassa poistaaksesi sitä
+STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Määrittele aavikon alue.{}Paina ja pidä pohjassa CTRL-nappia poistaaksesi aavikkoa.
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Sijoita lähetin.
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Suurenna madallettavan/korotettavan maa-alueen kokoa.
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Pienennä madallettavan/korotettavan maa-alueen kokoa.
@@ -2124,7 +2124,6 @@ STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Aseman t
 STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Vastaanottaa rahtia: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Raiteiden nopeusrajoitus: {LTBLUE}{VELOCITY}

 # Description of land area of different tiles
 STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kalliota
@@ -2347,12 +2346,7 @@ STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Ei käytö

 STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Anna NewGRF-parametrit

-# NewGRF inspect window
-
-
-
-# Sprite aligner window
-
+# NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}NewGRF-tiedostot
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Lisää valintaan
 STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Lisää valittu NewGRF-tiedosto peliin
@@ -2394,8 +2388,6 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Puuttuva
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Puuttuva(t) GRF-tiedosto(t)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Taukotilasta poistuminen saattaa kaataa OpenTTD:n. Älä lähetä virheraportteja tämänjälkeisistä kaatumisista.{}Haluatko todella poistua taukotilasta?

-# NewGRF status
-
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}NewGRF:n '{0:STRING}' käytös aiheuttaa todennäköisesti nykimistä ja/tai kaatumisia.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Se muuttaa kulkuneuvon '{1:ENGINE}' pituutta, kun se ei ole varikolla.
@@ -2405,13 +2397,6 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Rahti/uudelleensovitus tiedot kulkuneuvolle '{1:ENGINE}' ovat eri kuin ostolistassa rakentamisen jälkeen. Tämä voi aiheuttaa, että kulkuneuvon korvaus ei uudelleensovita oikein.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' aiheutti ikuisen silmukan tuotannon callback-funktiossa.

-# 'User removed essential NewGRFs'-placeholders for stuff without specs.
-STR_NEWGRF_INVALID_CARGO                                        :<virheellinen rahti>
-STR_NEWGRF_INVALID_CARGO_ABBREV                                 :??
-STR_NEWGRF_INVALID_CARGO_QUANTITY                               :{COMMA} <virheellistä rahtia>
-STR_NEWGRF_INVALID_ENGINE                                       :<virheellinen kulkuneuvo>
-STR_NEWGRF_INVALID_INDUSTRYTYPE                                 :<virheellinen teollisuus>
-
 # Sign list window
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Kylttilista - {COMMA} kylttiä

@@ -2426,7 +2411,7 @@ STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Syötä
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Kaupungit
 STR_TOWN_DIRECTORY_NONE                                         :{ORANGE}- Ei mitään -
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Kaupunkien nimet - nimen klikkaaminen keskittää näkymän kaupunkiin. Ctrl+Klik avaa uuden näkymäikkunan kaupungin sijaintiin
+STR_TOWN_DIRECTORY_LIST_TOOLTIP                                 :{BLACK}Kaupunkien nimet - nimen klikkaaminen keskittää näkymän kaupunkiin. Ctrl+Click avaa uuden näkymäikkunan kaupungin sijaintiin
 STR_TOWN_POPULATION                                             :{BLACK}Maailman asukasluku: {COMMA}

 # Town view window
@@ -2440,7 +2425,7 @@ STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{STRING
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} vaaditaan talvella
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{ORANGE}{CARGO}{BLACK} kuljetettu viime kuussa
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Meluraja kaupungissa: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
-STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Keskitä näkymä kaupungin sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan kaupungin sijaintiin
+STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Keskitä näkymä kaupungin sijaintiin. Ctrl+Click avaa uuden näkymäikkunan kaupungin sijaintiin
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Viranomaiset
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Näytä tietoja paikallisviranomaisista.
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Vaihda kaupungin nimeä.
@@ -2486,11 +2471,11 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}- Ei mitään -
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Käytetyt tuet:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} välille {STRING}-{STRING}{YELLOW} ({COMPANY}{YELLOW}, {DATE_SHORT} asti)
-STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Napsauta palvelua keskittääksesi näkymän teollisuuteen/kaupunkiin. Ctrl+Klik avaa uuden näkymäikkunan teollisuuden/kaupungin sijaintiin
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Napsauta palvelussa keskittääksesi näkymän teollisuuteen/kaupunkiin. Ctrl+Click avaa uuden näkymäikkunan teollisuuden/kaupungin sijaintiin

 # Station list window
-STR_STATION_LIST_TOOLTIP                                        :{BLACK}Asemien nimet - napsauta nimeä keskittääksesi näkymän asemaan. Ctrl+Klik avaa uuden näkymäikkunan aseman sijaintiin
-STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Pidä Ctrl-näppäin painettuna valitaksesi useamman kuin yhden vaihtoehdon
+STR_STATION_LIST_TOOLTIP                                        :{BLACK}Asemien nimet - napsauta nimeä keskittääksesi näkymän asemaan. Ctrl+Click avaa uuden näkymäikkunan aseman sijaintiin
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Pidä Ctrl painettuna valitaksesi useamman kuin yhden vaihtoehdon
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} asema{P "" a}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
@@ -2525,7 +2510,7 @@ STR_CARGO_RATING_EXCELLENT                                      :Mainio
 STR_CARGO_RATING_OUTSTANDING                                    :Loistava
 ############ range for rating ends

-STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Keskitä näkymä aseman sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan aseman sijaintiin
+STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Keskitä näkymä aseman sijaintiin. Ctrl+Click avaa uuden näkymäikkunan aseman sijaintiin
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Muuta aseman nimi.

 STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Näytä kaikki junat, joilla on asema aikataulussaan.
@@ -2537,9 +2522,9 @@ STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Nimeä asema/la

 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
-STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Keskitä ruutu reittipisteen sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan reittipisteen sijaintiin
+STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Keskitä ruutu reittipisteen sijaintiin. Ctrl+Click avaa uuden näkymäikkunan reittipisteen sijaintiin
 STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Muuta reittipisteen nimeä
-STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Keskitä ruutu poijun sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan poijun sijaintiin
+STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Keskitä ruutu poijun sijaintiin. Ctrl+Click avaa uuden näkymäikkunan poijun sijaintiin
 STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Vaihda poijun nimeä

 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Muokkaa reittipisteen nimeä
@@ -2551,7 +2536,7 @@ STR_FINANCES_YEAR                                               :{WHITE}{NUM}
 STR_FINANCES_SECTION_CONSTRUCTION                               :{GOLD}Rakentaminen
 STR_FINANCES_SECTION_NEW_VEHICLES                               :{GOLD}Uudet ajoneuvot
 STR_FINANCES_SECTION_TRAIN_RUNNING_COSTS                        :{GOLD}Junien käyttökustannukset
-STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}Ajoneuvojen käyttökustannukset
+STR_FINANCES_SECTION_ROAD_VEHICLE_RUNNING_COSTS                 :{GOLD}Autojen käyttökustannukset
 STR_FINANCES_SECTION_AIRCRAFT_RUNNING_COSTS                     :{GOLD}Lentokoneiden käyttökustannukset
 STR_FINANCES_SECTION_SHIP_RUNNING_COSTS                         :{GOLD}Laivojen käyttökustannukset
 STR_FINANCES_SECTION_PROPERTY_MAINTENANCE                       :{GOLD}Omaisuudenhallinta
@@ -2569,9 +2554,9 @@ STR_FINANCES_LOAN_TITLE                                         :{WHITE}Laina
 STR_FINANCES_MAX_LOAN                                           :{WHITE}Laina enimmillään: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Ota lainaa {CURRENCY}
-STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Ota lisää lainaa. Ctrl+Klik lisää lainaa niin paljon kuin mahdollista
+STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Ota lisää lainaa. Ctrl+Click lisää lainaa niin paljon kuin mahdollista
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Lyhennä lainaa {CURRENCY}
-STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Lyhennä lainaa. Ctrl+Klik lyhentää lainaa niin paljon kuin mahdollista
+STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Lyhennä lainaa. Ctrl+Click lyhentää lainaa niin paljon kuin mahdollista

 # Company view
 STR_COMPANY_VIEW_CAPTION                                        :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
@@ -2620,13 +2605,13 @@ STR_INDUSTRY_DIRECTORY_NONE                                     :{ORANGE}- Ei mi
 STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% kuljetettu)
 STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% kuljetettu)
 STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
-STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Teollisuusmuotojen nimet - klikkaa nimeä kohdistaaksesi näkymän teollisuuslaitokseen. Ctrl+Klik avaa uuden näkymäikkunan teollisuuslaitoksen sijaintiin
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Teollisuusmuotojen nimet - klikkaa nimeä kohdistaaksesi kuvakulman teollisuuslaitokseen. Ctrl+Click avaa uuden näkymäikkunan teollisuuslaitoksen sijaintiin

 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Tuotto viime kuussa:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}{NBSP}% kuljetettu)
-STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Keskitä päänäkymä teollisuuden sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan teollisuuden sijaintiin
+STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Keskitä päänäkymä teollisuuden sijaintiin. Ctrl+Click avaa uuden näkymäikkunan teollisuuden sijaintiin

 ############ range for requires starts
 STR_INDUSTRY_VIEW_REQUIRES_CARGO                                :{BLACK}Tarvitsee: {YELLOW}{STRING}{STRING}
@@ -2764,16 +2749,15 @@ STR_DEPOT_ROAD_VEHICLE_CAPTION                                  :{WHITE}{TOWN} h
 STR_DEPOT_SHIP_CAPTION                                          :{WHITE}{TOWN}, telakka
 STR_DEPOT_AIRCRAFT_CAPTION                                      :{WHITE}Lentokonehalli, {STATION}

-
 STR_DEPOT_NO_ENGINE                                             :{BLACK}-
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} kulkuneuvo{P "" a}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})

-STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Junat - vedä kulkuneuvoa vasemmalla hiiren painikkella lisätäksesi/poistaaksesi junasta, oikealla näppäimellä lisätietoja, Pidä pohjassa Ctrl-näppäintä toteuttaaksesi molemmat toiminnot seuraavaan ketjuun
-STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Ajoneuvot - napsauta ajoneuvoa oikealla hiiren näppäimellä saadaksesi tietoja.
-STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laivat - napsauta laivaa oikealla hiiren näppäimellä saadaksesi tietoja.
-STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lentokoneet - napsauta lentokonetta oikealla hiiren näppäimellä saadaksesi tietoja.
+STR_DEPOT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Junat - napsauta junaa saadaksesi tietoja, vedä vaunu lisätäksesi/poistaaksesi junasta.
+STR_DEPOT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Ajoneuvot - napsauta ajoneuvoa saadaksesi tietoja.
+STR_DEPOT_SHIP_LIST_TOOLTIP                                     :{BLACK}Laivat - napsauta laivaa saadaksesi tietoja.
+STR_DEPOT_AIRCRAFT_LIST_TOOLTIP                                 :{BLACK}Lentokoneet - napsauta lentokonetta saadaksesi tietoja.

 STR_DEPOT_TRAIN_SELL_TOOLTIP                                    :{BLACK}Vedä yksikkö tähän myydäksesi sen.
 STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Vedä ajoneuvo tähän myydäksesi sen.
@@ -2807,15 +2791,15 @@ STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloonaa
 STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloonaa laiva
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloonaa lentokone

-STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Tämä ostaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Tämä ostaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot
-STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Tämä ostaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot
-STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Tämä ostaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Klik jakaa komennot
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Tämä ostaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Tämä ostaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Tämä ostaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Tämä ostaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Click jakaa komennot

-STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Keskitä näkymä veturitallin sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan veturitallin sijaintiin
-STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Keskitä päänäkymä varikon sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan varikon sijaintiin
-STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Keskitä näkymä telakan sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan telekan sijaintiin
-STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Keskitä näkymä lentokonehallin sijaintiin. Ctrl+Klik avaa uuden näkymäikkunan lentokonehallin sijaintiin
+STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Keskitä näkymä veturitallin sijaintiin. Ctrl+Click avaa uuden näkymäikkunan veturitallin sijaintiin
+STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Keskitä päänäkymä varikon sijaintiin. Ctrl+Click avaa uuden näkymäikkunan varikon sijaintiin
+STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Keskitä näkymä telakan sijaintiin. Ctrl+Click avaa uuden näkymäikkunan telekan sijaintiin
+STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Keskitä näkymä lentokonehallin sijaintiin. Ctrl+Click avaa uuden näkymäikkunan lentokonehallin sijaintiin

 STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Näytä tällä asemalla olevien junien käskyt
 STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Näytä tässä terminaalissa olevien ajoneuvojen käskyt
@@ -2884,20 +2868,20 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Automaat
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}

-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Keskitä näkymä junan sijaintiin. Ctrl+Klik seuraa junaa näkymässä
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Keskitä näkymä ajoneuvon sijaintiin. Ctrl+Klik seuraa ajoneuvoa päänäkymässä
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Keskitä näkymä junan sijaintiin. Ctrl+Click seuraa junaa näkymässä
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Keskitä näkymä ajoneuvon sijaintiin. Ctrl+Click seuraa ajoneuvoa näkymässä
 STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Keskitä näkymä laivan sijaintiin. Ctrl+Click seuraa laivaa näkymässä
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Keskitä näkymä lentokoneen sijaintiin. Ctrl+Klik seuraa lentokonetta päänäkymässä
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Keskitä näkymä lentokoneen sijaintiin. Ctrl+Click seuraa lentokonetta näkymässä

-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Lähetä juna veturitalliin. Ctrl+Klik suorittaa vain huollon
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Lähetä ajoneuvo huoltoasemalle. Ctrl+Klik suorittaa vain huollon
-STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Lähetä laiva telakalle. Ctrl+Klik suorittaa vain huollon
-STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Lähetä lentokone lentokonehalliin. Ctrl+Klik suorittaa vain huollon
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Lähetä juna veturitalliin.
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Lähetä ajoneuvo huoltoasemalle.
+STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Lähetä laiva telakalle.
+STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Lähetä lentokone lentokonehalliin.

-STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Tämä ostaa kopion junasta ja kaikista sen vaunuista. Ctrl+Klik jakaa komennot
-STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Tämä ostaa kopion ajoneuvosta. Ctrl+Klik jakaa komennot
-STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Tämä ostaa kopion laivasta. Ctrl+Klik jakaa komennot
-STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Tämä ostaa kopion lentokoneesta. Ctrl+Klik jakaa komennot
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Tämä ostaa kopion junasta ja kaikista sen vaunuista. Ctrl+Click jakaa komennot
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Tämä ostaa kopion ajoneuvosta. Ctrl+Click jakaa komennot
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Tämä ostaa kopion laivasta. Ctrl+Click jakaa komennot
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Tämä ostaa kopion lentokoneesta. Ctrl+Click jakaa komennot

 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Anna junalle lupa ohittaa punainen opastin.

@@ -2909,20 +2893,20 @@ STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Sovita l
 STR_VEHICLE_VIEW_TRAIN_REVERSE_TOOLTIP                          :{BLACK}Käännä junan suunta.
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Pakota ajoneuvo kääntymään ympäri.

-STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Näytä junan käskyt. Ctrl+Klik näyttää junan aikataulun
-STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Näytä ajoneuvon käskyt. Ctrl+Klik näyttää ajoneuvon aikataulun
+STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP                           :{BLACK}Näytä junan käskyt. Ctrl+Click näyttää junan aikataulun
+STR_VEHICLE_VIEW_ROAD_VEHICLE_ORDERS_TOOLTIP                    :{BLACK}Näytä ajoneuvon käskyt. Ctrl+Click näyttää ajoneuvon aikataulun
 STR_VEHICLE_VIEW_SHIP_ORDERS_TOOLTIP                            :{BLACK}Näytä laivan käskyt. Ctrl+Click näyttää laivan aikataulun
-STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Näytä lentokoneen käskyt. Ctrl+Klik näyttää lentokoneen aikataulun
+STR_VEHICLE_VIEW_AIRCRAFT_ORDERS_TOOLTIP                        :{BLACK}Näytä lentokoneen käskyt. Ctrl+Click näyttää lentokoneen aikataulun

 STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP                     :{BLACK}Näytä junan tiedot.
 STR_VEHICLE_VIEW_ROAD_VEHICLE_SHOW_DETAILS_TOOLTIP              :{BLACK}Näytä ajoneuvon tiedot.
 STR_VEHICLE_VIEW_SHIP_SHOW_DETAILS_TOOLTIP                      :{BLACK}Näytä laivan tiedot.
 STR_VEHICLE_VIEW_AIRCRAFT_SHOW_DETAILS_TOOLTIP                  :{BLACK}Näytä lentokoneen tiedot.

-STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Valitun junan toiminnot - napsauta pysäyttääksesi/käynnistääksesi junan. Ctrl+Klik vierittääksesi kohteeseen
-STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nykyisen ajoneuvon toiminnot - napsauta pysäyttääksesi/käynnistääksesi ajoneuvon. Ctrl+Klik vierittääksesi kohteeseen
-STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nykyisen laivat toiminnot - napsauta pysäyttääksesi/käynnistääksesi laivan. Ctrl+Klik vierittääksesi kohteeseen
-STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nykyisen lentokoneen toiminnot - napsauta pysäyttääksesi/käynnistääksesi lentokoneen. Ctrl+Klik vierittääksesi kohteeseen
+STR_VEHICLE_VIEW_TRAIN_STATE_START_STOP_TOOLTIP                 :{BLACK}Valitun junan toiminnot - napsauta pysäyttääksesi/käynnistääksesi junan. Ctrl+Click vierittääksesi kohteeseen
+STR_VEHICLE_VIEW_ROAD_VEHICLE_STATE_START_STOP_TOOLTIP          :{BLACK}Nykyisen ajoneuvon toiminnot - napsauta pysäyttääksesi/käynnistääksesi ajoneuvon. Ctrl+Click vierittääksesi kohteeseen
+STR_VEHICLE_VIEW_SHIP_STATE_START_STOP_TOOLTIP                  :{BLACK}Nykyisen laivat toiminnot - napsauta pysäyttääksesi/käynnistääksesi laivan. Ctrl+Click vierittääksesi kohteeseen
+STR_VEHICLE_VIEW_AIRCRAFT_STATE_START_STOP_TOOLTIP              :{BLACK}Nykyisen lentokoneen toiminnot - napsauta pysäyttääksesi/käynnistääksesi lentokoneen. Ctrl+Click vierittääksesi kohteeseen

 # Messages in the start stop button in the vehicle view
 STR_VEHICLE_STATUS_LOADING_UNLOADING                            :{LTBLUE}Lastataan/puretaan
@@ -2961,8 +2945,6 @@ STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Huolto
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Huolto {STATION} Halli
 STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Huolto {STATION} Halli, {VELOCITY}

-# Vehicle stopped/started animations
-
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (yksityiskohdat)
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nimi
@@ -2994,8 +2976,8 @@ STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Siirrä

 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Huoltoväli: {LTBLUE}{COMMA} päivää{BLACK}   Viimeisin huolto: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Huoltoväli: {LTBLUE}{COMMA}%{BLACK}   Viime huolto: {LTBLUE}{DATE_LONG}
-STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Kasvata huoltoväliä kymmenellä. Ctrl+Klik kasvattaa huoltoväliä viidellä
-STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Pienennä huoltoväliä kymmenellä. Ctrl+Klik vähentää huoltoväliä viidellä
+STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Kasvata huoltoväliä kymmenellä. Ctrl+Click kasvattaa huoltoväliä viidellä
+STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP         :{BLACK}Pienennä huoltoväliä kymmenellä. Ctrl+Click vähentää huoltoväliä viidellä

 STR_QUERY_RENAME_TRAIN_CAPTION                                  :{WHITE}Nimeä juna
 STR_QUERY_RENAME_ROAD_VEHICLE_CAPTION                           :{WHITE}Nimeä ajoneuvo
@@ -3050,7 +3032,7 @@ STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE
 STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Aikataulu
 STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Näytä aikataulu

-STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Aikataulu - napsauta määräystä korostaaksesi sen. Ctrl+Klik näyttää aseman
+STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Aikataulu - napsauta määräystä korostaaksesi.
 STR_ORDER_INDEX                                                 :{COMMA}:{NBSP}
 STR_ORDER_TEXT                                                  :{STRING} {STRING}

@@ -3080,7 +3062,7 @@ STR_ORDER_DROP_NO_UNLOADING                                     :Ei rahdinpurkua
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Muuta korostetun määräyksen purkamiskäyttäytymistä

 STR_ORDER_REFIT                                                 :{BLACK}Sovita
-STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Valitse mihin rahtityyppiin tämä käsky sovittaa. Ctrl+Klik poistaa sovituskäskyn
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Valitse mihin rahtityyppiin tämä käsky sovittaa. Ctrl+Click poistaa sovituskäskyn

 STR_ORDER_SERVICE                                               :{BLACK}Huolto
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Mene aina
@@ -3110,7 +3092,7 @@ STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Arvo, jo
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Syötä arvo, johon verrataan

 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Ohita
-STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}Ohita nykyinen pysähdys ja aloita seuraava. Ctrl+Klik hyppää valittuun määräykseen
+STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}Ohita nykyinen pysähdys ja aloita seuraava.

 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Poista
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}Poista korostettu määräys.
@@ -3119,7 +3101,7 @@ STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Mene
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Mene lähimmälle varikolle
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Mene lähimmälle varikolle
 STR_ORDER_CONDITIONAL                                           :Ehdollinen hyppymääräys
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Lisää uusi käsky ennen valittua, tai lisää listan viimeiseksi. Ctrl tekee asemakäskyistä 'lastaa täyteen kaikki rahti', reittipistekäskyistä 'non-stop' ja veturitallikäskyistä 'huolto'
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Lisää uusi käsky ennen valittua, tai lisää listan viimeiseksi. Ctrl tekee asemakäskyistä 'lastaa täyteen kaikki rahti', reittipisteistä 'non-stop' ja veturitallista 'huolto'
 STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Lisää kehittynyt määräys

 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Näytä kaikki ajoneuvot, joilla on sama aikataulu
@@ -3208,7 +3190,7 @@ STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nollaa m
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nollaa myöhästymislaskuri, jotta vaunu olisi taas aikataulussa

 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Automaattinen
-STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+Klik: yritä säilyttää odotusajat)
+STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täytä aikataulu automaattisesti seuraavan matkan arvoilla (Ctrl+Click: yritä säilyttää odotusajat)

 STR_TIMETABLE_EXPECTED                                          :{BLACK}Odotettu
 STR_TIMETABLE_SCHEDULED                                         :{BLACK}Aikataulu
@@ -3470,7 +3452,6 @@ STR_ERROR_CAN_T_BUILD_ROAD_DEPOT                                :{WHITE}Autovari
 STR_ERROR_CAN_T_BUILD_TRAM_DEPOT                                :{WHITE}Tähän ei voi rakentaa varikkoa.
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Telakkaa ei voi rakentaa.

-
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Juna täytyy pysäyttää veturitallin sisällä
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... sen pitää olla pysähtyneenä huoltoasemalle
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Laivan pitää olla pysähdyksissä telakalla.
@@ -3500,7 +3481,6 @@ STR_ERROR_MUST_REMOVE_SIGNALS_FIRST                             :{WHITE}Opastime
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Ei kelvollista rautatietä.
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Rautatie pitää poistaa ensin.
 STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Tie on yksisuuntainen tai suljettu
-STR_ERROR_CROSSING_DISALLOWED                                   :{WHITE}Tasoristeykset eivät ole sallittu tälle raidetyypille
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Opastinta ei voi rakentaa.
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Rautatietä ei voi rakentaa.
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Rautatietä ei voi poistaa.
@@ -3528,7 +3508,6 @@ STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Tähän

 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... tässä on jo puu.
-STR_ERROR_TREE_WRONG_TERRAIN_FOR_TREE_TYPE                      :{WHITE}... väärä maasto puulle
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Puuta ei voi istuttaa.

 # Bridge related errors
@@ -3539,7 +3518,6 @@ STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Sillan p
 STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Silta on liian matalalla maastoa varten
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Alku- ja päätepisteen pitää olla linjassa.
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... sillan molempien päiden pitää sijaita maalla.
-STR_ERROR_BRIDGE_TOO_LONG                                       :{WHITE}... silta liian pitkä

 # Tunnel related errors
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Tunnelia ei voi rakentaa...
@@ -3652,9 +3630,6 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kylttiä
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kyltin nimeä ei voi muuttaa.
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kylttiä ei voi poistaa...

-# Translatable comment for OpenTTD's desktop shortcut
-STR_DESKTOP_SHORTCUT_COMMENT                                    :Klooni Transport Tycoon Deluxesta
-
 ##id 0x2000
 # Town building names
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Korkea toimistorakennus
@@ -4045,7 +4020,6 @@ STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} ({STRING
 STR_FORMAT_WAYPOINT_NAME                                        :Reittipiste: {TOWN}
 STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Reittipiste: {TOWN} #{COMMA}

-
 STR_UNKNOWN_STATION                                             :tuntematon asema
 STR_DEFAULT_SIGN_NAME                                           :Kyltti
 STR_COMPANY_SOMEONE                                             :joku
--- a/Show More
+++ b/Show More