(svn r17010) -Release: 0.7.2

(svn r17009) [0.7] -Backport from trunk/prepare for release:
- Fix: Vehicles would wait "very long" when they had nothing to unload and gradual loading was disabled [FS#3054] (r16933)
2025-08-27 08:29:11 +00:00 · 2009-07-31 22:29:54 +00:00 · 2009-07-31 22:23:19 +00:00 · 2009-07-21 18:28:34 +00:00 · 2009-07-21 17:17:20 +00:00
40 changed files with 434 additions and 290 deletions
--- a/bin/data/opntitle.dat
+++ b/bin/data/opntitle.dat
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,16 @@
+0.7.2 (2009-08-01)
+------------------------------------------------------------------------
+- Fix: Vehicles would wait "very long" when they had nothing to unload and gradual loading was disabled [FS#3054] (r16933)
+
+
+0.7.2-RC2 (2009-07-21)
+------------------------------------------------------------------------
+- Fix: When marking trains stuck do not reset the unload/stuck counter when the vehicle is unloading. It will be automatically reset once the vehicle wants to leave the station [FS#3038] (r16901)
+- Fix: [NoAI]: Small errors in the API documentation [FS#3037] (r16865)
+- Fix: Savegames from before 0.4 would get their waypoint 'index' messed up (r16854)
+- Fix: Cargo payments were not destroyed when a vehicle was destructed. This only happened when you crashed a vehicle while it was unloading [FS#3032, FS#3046] (r16801)
+
+
 0.7.2-RC1 (2009-07-15)
 ------------------------------------------------------------------------
 - Add: Plural 'rule' for Korean (r16811)
--- a/config.lib
+++ b/config.lib
@@ -5,7 +5,7 @@ log() {
 }

 set_default() {
-	released_version=""
+	released_version="0.7.2"

 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override
@@ -47,8 +47,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"
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -11,10 +11,12 @@ by the number below on http://bugs.openttd.org.
 If the bug report is closed, it has been fixed, which then can be verified
 in the latest SVN version of /trunk.

-Bugs for 0.7.1
+Bugs for 0.7.2
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org

+- 3057	Road vehicle sometimes 'forget' the need for servicing
+- 3040	Not all alternatives are always shown in the "Join station" list
 - 2955	With path signals depots are less likely to be visited
 - 2891	Ignore signal does not keep the train running when in path signalled block till the next signal
 - 2769	No offer for buying bankrupt AIs
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,50 +1,62 @@
+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 2008 22:25:56 +0200
+ -- 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 2008 01:34:56 +0200
+ -- 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 2008 15:34:56 +0200
+ -- 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 2008 14:34:56 +0200
+ -- 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 2008 17:34:56 +0200
+ -- 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 2008 13:37:42 +0000
+ -- 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 2008 00:42:00 +0200
+ -- 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 2008 00:07:00 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 16 Mar 2009 00:07:00 +0200

 openttd (0.7.0~beta2) unstable; urgency=low

--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -10,7 +10,7 @@
 #-------------------------------------------------------------------------------

 Name:          openttd
-Version:       0.7.2-RC1
+Version:       0.7.2
 Release:       1%{?dist}

 Group:         Amusements/Games
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,7 +1,7 @@
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.7.2-RC1"  ; Define application version
+!define APPVERSION "0.7.2"  ; Define application version
 !define APPVERSIONINTERNAL "0.7.2.0" ; Define application version in X.X.X.X
-!define INSTALLERVERSION 63 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 65 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !include ${VERSION_INCLUDE}

 !define APPURLLINK "http://www.openttd.org"
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -32,6 +32,7 @@ Sub UpdateFiles(version)
 		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
+		version = "0.7.2"
 		revision = 0
 		modified = 1
 	End If
--- 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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;WITH_ICU;ENABLE_NETWORK;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:    2009-06-09
-Release version: 0.7.1
+Last updated:    2009-08-01
+Release version: 0.7.2
 ------------------------------------------------------------------------


@@ -191,6 +191,9 @@ Do NOT copy files included with OpenTTD into "shared" directories (explained in
 the following sections) as sooner or later you will run into graphical glitches
 when using other versions of the game.

+If you want AIs use the in-game content downloader to download some or download
+some from the internet and place them in the ai/ directory.
+
 4.2) OpenTTD directories
 ---- -------------------------------

--- a/src/ai/api/ai_airport.hpp
+++ b/src/ai/api/ai_airport.hpp
@@ -129,7 +129,7 @@ public:
 	 * @exception AIError::ERR_FLAT_LAND_REQUIRED
 	 * @exception AIError::ERR_LOCAL_AUTHORITY_REFUSES
 	 * @exception AIStation::ERR_STATION_TOO_LARGE
-	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_OTHER_STATION
+	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_ANOTHER_STATION
 	 * @return Whether the airport has been/can be build or not.
 	 */
 	static bool BuildAirport(TileIndex tile, AirportType type, StationID station_id);
--- a/src/ai/api/ai_order.hpp
+++ b/src/ai/api/ai_order.hpp
@@ -328,7 +328,7 @@ public:
 	 * @pre AIVehicle::IsValidVehicle(vehicle_id).
 	 * @pre AreOrderFlagsValid(destination, order_flags).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @exception AIOrder::ERR_ORDER_TOO_FAR_AWAY_FROM_PREVIOUS_DESTINATION
 	 * @return True if and only if the order was appended.
 	 */
@@ -341,7 +341,7 @@ public:
 	 * @pre AIVehicle::IsValidVehicle(vehicle_id).
 	 * @pre IsValidVehicleOrder(vehicle_id, jump_to).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @return True if and only if the order was appended.
 	 */
 	static bool AppendConditionalOrder(VehicleID vehicle_id, OrderPosition jump_to);
@@ -355,7 +355,7 @@ public:
 	 * @pre IsValidVehicleOrder(vehicle_id, order_position).
 	 * @pre AreOrderFlagsValid(destination, order_flags).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @exception AIOrder::ERR_ORDER_TOO_FAR_AWAY_FROM_PREVIOUS_DESTINATION
 	 * @return True if and only if the order was inserted.
 	 */
@@ -369,7 +369,7 @@ public:
 	 * @pre IsValidVehicleOrder(vehicle_id, order_position).
 	 * @pre IsValidVehicleOrder(vehicle_id, jump_to).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @return True if and only if the order was inserted.
 	 */
 	static bool InsertConditionalOrder(VehicleID vehicle_id, OrderPosition order_position, OrderPosition jump_to);
@@ -442,7 +442,7 @@ public:
 	 * @pre AIVehicle::IsValidVehicle(vehicle_id).
 	 * @pre AIVehicle::IsValidVehicle(main_vehicle_id).
 	 * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY
-	 * @exception AIOrder::ERR_ORDER_NO_MORE_SPACE
+	 * @exception AIOrder::ERR_ORDER_TOO_MANY
 	 * @return True if and only if the copying succeeded.
 	 */
 	static bool CopyOrders(VehicleID vehicle_id, VehicleID main_vehicle_id);
--- a/src/ai/api/ai_road.hpp
+++ b/src/ai/api/ai_road.hpp
@@ -349,7 +349,7 @@ public:
 	 * @exception AIError::ERR_FLAT_LAND_REQUIRED
 	 * @exception AIRoad::ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION
 	 * @exception AIRoad::ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD
-	 * @exception AIError:ERR_VEHICLE_IN_THE_WAY
+	 * @exception AIError::ERR_VEHICLE_IN_THE_WAY
 	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_ANOTHER_STATION
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS_IN_TOWN
@@ -372,7 +372,7 @@ public:
 	 * @exception AIError::ERR_FLAT_LAND_REQUIRED
 	 * @exception AIRoad::ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION
 	 * @exception AIRoad::ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD
-	 * @exception AIError:ERR_VEHICLE_IN_THE_WAY
+	 * @exception AIError::ERR_VEHICLE_IN_THE_WAY
 	 * @exception AIStation::ERR_STATION_TOO_CLOSE_TO_ANOTHER_STATION
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS
 	 * @exception AIStation::ERR_STATION_TOO_MANY_STATIONS_IN_TOWN
--- a/src/ai/api/ai_vehicle.hpp
+++ b/src/ai/api/ai_vehicle.hpp
@@ -58,7 +58,7 @@ public:
 		ERR_VEHICLE_IN_FLIGHT,                  // [STR_A017_AIRCRAFT_IS_IN_FLIGHT]

 		/** Vehicle is without power */
-		ERR_VEHCILE_NO_POWER,                   // [STR_TRAIN_START_NO_CATENARY]
+		ERR_VEHICLE_NO_POWER,                   // [STR_TRAIN_START_NO_CATENARY]

 	};

--- a/src/ai/api/ai_vehicle.hpp.sq
+++ b/src/ai/api/ai_vehicle.hpp.sq
@@ -37,7 +37,7 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_IS_DESTROYED,         "ERR_VEHICLE_IS_DESTROYED");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT,         "ERR_VEHICLE_NOT_IN_DEPOT");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_IN_FLIGHT,            "ERR_VEHICLE_IN_FLIGHT");
-	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHCILE_NO_POWER,             "ERR_VEHCILE_NO_POWER");
+	SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NO_POWER,             "ERR_VEHICLE_NO_POWER");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_RAIL,                          "VT_RAIL");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_ROAD,                          "VT_ROAD");
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VT_WATER,                         "VT_WATER");
@@ -85,7 +85,7 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	AIError::RegisterErrorMap(STR_TRAIN_MUST_BE_STOPPED,                                     AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
 	AIError::RegisterErrorMap(STR_980B_SHIP_MUST_BE_STOPPED_IN,                              AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
 	AIError::RegisterErrorMap(STR_A017_AIRCRAFT_IS_IN_FLIGHT,                                AIVehicle::ERR_VEHICLE_IN_FLIGHT);
-	AIError::RegisterErrorMap(STR_TRAIN_START_NO_CATENARY,                                   AIVehicle::ERR_VEHCILE_NO_POWER);
+	AIError::RegisterErrorMap(STR_TRAIN_START_NO_CATENARY,                                   AIVehicle::ERR_VEHICLE_NO_POWER);

 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_MANY,             "ERR_VEHICLE_TOO_MANY");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_AVAILABLE,        "ERR_VEHICLE_NOT_AVAILABLE");
@@ -98,7 +98,7 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_IS_DESTROYED,         "ERR_VEHICLE_IS_DESTROYED");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT,         "ERR_VEHICLE_NOT_IN_DEPOT");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_IN_FLIGHT,            "ERR_VEHICLE_IN_FLIGHT");
-	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHCILE_NO_POWER,             "ERR_VEHCILE_NO_POWER");
+	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NO_POWER,             "ERR_VEHICLE_NO_POWER");

 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::IsValidVehicle,                 "IsValidVehicle",                 2, ".i");
 	SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetNumWagons,                   "GetNumWagons",                   2, ".i");
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1552,6 +1552,7 @@ void PrepareUnload(Vehicle *front_v)
 static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 {
 	assert(v->current_order.IsType(OT_LOADING));
+	assert(v->load_unload_time_rem != 0);

 	/* We have not waited enough time till the next round of loading/unloading */
 	if (--v->load_unload_time_rem != 0) {
@@ -1799,7 +1800,8 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left)
 		}
 	}

-	v->load_unload_time_rem = unloading_time;
+	/* Always wait at least 1, otherwise we'll wait 'infinitively' long. */
+	v->load_unload_time_rem = max(1, unloading_time);

 	if (completely_emptied) {
 		TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY);
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -621,7 +621,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Placér
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Placér fyrtårn
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Placér sender
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definer ørkenområde.{}Hold CTRL nede for at fjerne det
-STR_CREATE_LAKE                                                 :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten holdes ved havniveau, hvorved omgivelserne oversvømmes i stedet
+STR_CREATE_LAKE                                                 :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten bruges ved havniveau, da omgivelserne i stedet vil blive oversvømmet
 STR_CREATE_RIVER                                                :{BLACK}Placér floder.
 STR_0290_DELETE                                                 :{BLACK}Slet
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slet denne by fuldstændigt
@@ -800,7 +800,7 @@ STR_TOWNNAME_CATALAN                                            :Catalanske
 ############ end of townname region

 STR_CURR_GBP                                                    :Pund (£)
-STR_CURR_USD                                                    :Dollar ($)
+STR_CURR_USD                                                    :Dollars ($)
 STR_CURR_EUR                                                    :Euro (€)
 STR_CURR_YEN                                                    :Yen (¥)
 STR_CURR_ATS                                                    :Østrisk Shilling (ATS)
@@ -886,7 +886,7 @@ STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delt ordreliste - -

 STR_TRAIN_IS_STUCK                                              :{WHITE}{VEHICLE} kan ikke finde en rute at fortsætte ad.
-STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} er gået tabt.
+STR_TRAIN_IS_LOST                                               :{WHITE}{VEHICLE} er faret vild.
 STR_VEHICLE_IS_UNPROFITABLE                                     :{WHITE}{VEHICLE}s indtjening sidste år var {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europæisk fællesvaluta!{}{}Euroen er introduceret som eneste betalingsmiddel i dit land!

@@ -1301,14 +1301,14 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}År
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Antallet af år{}spillet varer

 STR_NETWORK_GAME_INFO                                           :{SILVER}SPIL INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Klima:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Klima: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Start dato:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuværende dato:  {WHITE}{DATE_SHORT}
+STR_NETWORK_START_DATE                                          :{SILVER}Start dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuværende dato: {WHITE}{DATE_SHORT}
 STR_NETWORK_PASSWORD                                            :{SILVER}Beskyttet af kodeord!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVEREN ER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVEREN ER FULD
@@ -1390,7 +1390,7 @@ STR_NETWORK_LANG_LATVIAN                                        :Lettisk

 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Netværksspils lobby

-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Forbereder tilslutning:   {ORANGE}{STRING}
+STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Forbereder tilslutning: {ORANGE}{STRING}
 STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}En liste over alle selskaber i spillet lige nu. Du kan enten tilslutte dig et eller starte et nyt, hvis der er plads til flere selskaber
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nyt selskab
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Opret et nyt selskab
@@ -1403,16 +1403,16 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Genopfri

 STR_NETWORK_COMPANY_INFO                                        :{SILVER}SELSKABSINFO

-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Selskabsnavn:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grundlagt:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Virksomhedens værdi:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuværende beholdning:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Sidste års indtægt:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Præstation:  {WHITE}{NUM}
+STR_NETWORK_COMPANY_NAME                                        :{SILVER}Selskabsnavn: {WHITE}{STRING}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grundlagt: {WHITE}{NUM}
+STR_NETWORK_VALUE                                               :{SILVER}Virksomhedens værdi: {WHITE}{CURRENCY}
+STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuværende beholdning: {WHITE}{CURRENCY}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Sidste års indtægt: {WHITE}{CURRENCY}
+STR_NETWORK_PERFORMANCE                                         :{SILVER}Præstation: {WHITE}{NUM}

-STR_NETWORK_VEHICLES                                            :{SILVER}Køretøjer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spillere:  {WHITE}{STRING}
+STR_NETWORK_VEHICLES                                            :{SILVER}Køretøjer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_STATIONS                                            :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_PLAYERS                                             :{SILVER}Spillere: {WHITE}{STRING}

 STR_NETWORK_CONNECTING                                          :{WHITE}Tilslutter...

@@ -1440,22 +1440,22 @@ STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Tilslut
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nyt firma

 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ingen netværksheder fundet eller kompilet uden ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kunne ikke finde nogen netværksspil
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Serveren besvarede ikke denne forspørgsel
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kunne ikke tilslutte grundet NewGRF ulighed
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Netværks synkroniseringsfejl
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Netværksforbindelse mistet
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kunne ikke hente gemt spil
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Kunne ikke starte serveren
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Kunne ikke forbinde
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Forbindelsen #{NUM} svarer ikke
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Der opstod en protokol-fejl og forbindelse blev lukket
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Revisionen af denne klient passer ikke sammen med serverens revision
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Forkert kodeord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Serveren er fuld
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Du har forbud mod at bruge denne server
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Du blev smidt ud af spillet
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Snyderi er ikke tilladt på denne server
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kunne ikke finde nogen netværksspil
+STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Serveren besvarede ikke denne forspørgsel
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Kunne ikke tilslutte grundet NewGRF ulighed
+STR_NETWORK_ERR_DESYNC                                          :{WHITE}Netværks synkroniseringsfejl
+STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Netværksforbindelse mistet
+STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kunne ikke hente gemt spil
+STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Kunne ikke starte serveren
+STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Kunne ikke forbinde
+STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Forbindelsen #{NUM} svarer ikke
+STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Der opstod en protokol-fejl og forbindelse blev lukket
+STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Revisionen af denne klient passer ikke sammen med serverens revision
+STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Forkert kodeord
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Serveren er fuld
+STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Du har forbud mod at bruge denne server
+STR_NETWORK_ERR_KICKED                                          :{WHITE}Du blev smidt ud af spillet
+STR_NETWORK_ERR_CHEATER                                         :{WHITE}Snyderi er ikke tilladt på denne server

 ############ Leave those lines in this order!!
 STR_NETWORK_ERR_CLIENT_GENERAL                                  :generel fejl
@@ -1468,7 +1468,7 @@ STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikke autorisere
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :modtog en underlig pakke
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :forkert revision
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :navnet er allerede i brug
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :forkert spil password
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :forkert spil kodeord
 STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :forkert firma-id i DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :smidt ud af serveren
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :prøvede at snyde
@@ -1521,7 +1521,7 @@ STR_NETWORK_SEND                                                :{BLACK}Send

 ##### PNG-MAP-Loader

-STR_PNGMAP_ERROR                                                :{WHITE}Kan ikke hente billedet fra PNG...
+STR_PNGMAP_ERROR                                                :{WHITE}Kan ikke hente landskab fra PNG...
 STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...filen blev ikke fundet.
 STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan ikke konvertere billedtype. Der skal bruges 8 eller 24-bit PNG.
 STR_PNGMAP_ERR_MISC                                             :{WHITE}...noget gik galt. Undskyld (Måske en ødelagt fil)
@@ -1588,10 +1588,10 @@ STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Vælg or
 STR_1021_RAILROAD_TRACK                                         :Jernbaneskinner
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Remise
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...området ejes af et andet selskab
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Jernbane med almindelige signaler
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Jernbane med blok signaler
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Jernbane med præ-signaler
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Jernbane med exit-signaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbaneskinne med kombi-signaler
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbane med kombi-signaler
 STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Jernbane med avancerede signaler
 STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Jernbane med ensrettede avancerede signaler
 STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Jernbanespor med normale og præ-signaler
@@ -2731,7 +2731,7 @@ STR_8823_SKIP                                                   :{BLACK}Spring o
 STR_8824_DELETE                                                 :{BLACK}Slet
 STR_8826_GO_TO                                                  :{BLACK}Gå til
 STR_REFIT                                                       :{BLACK}Ombyg
-STR_REFIT_TIP                                                   :{BLACK}Vælg hvilken lasttype der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
+STR_REFIT_TIP                                                   :{BLACK}Vælg hvilken lasttype, der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
 STR_REFIT_ORDER                                                 :(Ombyg til {STRING})
 STR_REFIT_STOP_ORDER                                            :(Ombyg til {STRING} og stop)
 STR_STOP_ORDER                                                  :(Stop)
@@ -2815,6 +2815,8 @@ STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan ikke
 STR_8867_NAME_TRAIN                                             :{BLACK}Giv toget et navn
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Tog forulykket!{}{COMMA} døde i flammerne efter kollision
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikke vende retningen af toget...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan ikke vende køretøjet om...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Omdøb tog-/togvognstypen
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikke omdøbe tog-/togvognstypen...
 STR_CLEAR_TIME                                                  :{BLACK}Nulstil tid
@@ -2902,7 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Indbyggerne fester . . .{}Første fragt-sporvogn ankommer til {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Lastbil forulykket!{}Chauffør dør i flammerne efter sammenstød med tog
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Bus forulykket!{}{COMMA} dør i flammerne efter kollision med et tog
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Tillader ikke køretøjer at vende om...
 STR_9034_RENAME                                                 :{BLACK}Omdøb
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Omdøb køretøjstypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Omdøb køretøjstypen
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -1054,6 +1054,7 @@ STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Malebli
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Malebligu ŝipojn por la komputilo: {ORANGE}{STRING}

 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Permesu ArtefaritajnIntelektojn en pluropaj ludoj: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodes antaŭ ArtefariteIntelekto estos prokrestita: {ORANGE}{STRING}

 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Prizorgintervala procentaĵo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Defaŭlta prizorgintervalo por trajnoj: {ORANGE}{STRING} tagoj/%
@@ -1590,6 +1591,10 @@ STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...regio
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Reloj kun normalaj signaloj
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Reloj kun antaŭ-signaloj
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Reloj kun elir-signaloj
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Reloj kun kombin-signaloj
+STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Reloj kun pad-signaloj
+STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Reloj kun unudirektaj pad-signaloj
+STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Reloj kun blok- kaj antaŭ-signaloj



--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -310,7 +310,7 @@ STR_015A_COMPANY_LEAGUE_TABLE                                   :Yhtiökilpataul
 STR_PERFORMANCE_DETAIL_MENU                                     :Suoritearviointi
 ############ range for menu ends

-STR_015B_OPENTTD                                                :{WHITE}Tietoa OpenTTD:stä
+STR_015B_OPENTTD                                                :{WHITE}Tietoja OpenTTD:stä
 STR_015C_SAVE_GAME                                              :Tallenna peli
 STR_015D_LOAD_GAME                                              :Lataa peli
 STR_015E_QUIT_GAME                                              :Lopeta peli
@@ -352,19 +352,19 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Rahtikapasiteet
 STR_NO_WAITING_CARGO                                            :{BLACK}Minkäänlaista lastia ei ole odottamassa
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Valitse kaikki laitteet
 STR_SELECT_ALL_TYPES                                            :{BLACK}Valitse kaikki lastityypit (myös odottava lasti)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Käytettävissä olevat junat
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Käytettävissä olevat ajoneuvot
-STR_AVAILABLE_SHIPS                                             :{BLACK}Käytettävissä olevat laivat
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Käytettävissä olevat ilma-alukset
+STR_AVAILABLE_TRAINS                                            :{BLACK}Käytett. Junat
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Käytett. Ajoneuvot
+STR_AVAILABLE_SHIPS                                             :{BLACK}Käytett. Laivat
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Käytett. Ilma-alukset
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Näytä lista saatavilla olevista moottorityypeistä tälle ajoneuvotyypille.
 STR_MANAGE_LIST                                                 :{BLACK}Muokkaa listaa
 STR_MANAGE_LIST_TIP                                             :{BLACK}Ohjaa kaikkia listan ajoneuvoja
-STR_REPLACE_VEHICLES                                            :Korvaa liikennevälineitä
+STR_REPLACE_VEHICLES                                            :Korvaa liikenneväl.
 STR_SEND_TRAIN_TO_DEPOT                                         :Lähetä varikolle
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Lähetä varikolle
 STR_SEND_SHIP_TO_DEPOT                                          :Lähetä varikolle
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Lähetä varikolle
-STR_SEND_FOR_SERVICING                                          :Lähetä huollettavaksi
+STR_SEND_FOR_SERVICING                                          :Lähetä huoltoon

 ############ range for months starts
 STR_0162_JAN                                                    :01.
@@ -892,10 +892,10 @@ STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT

 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
-STR_VEHICLE_HAS_TOO_FEW_ORDERS                                  :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on liian vähän käskyjä
-STR_VEHICLE_HAS_VOID_ORDER                                      :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on epäkelpo käsky
+STR_VEHICLE_HAS_TOO_FEW_ORDERS                                  :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on liian vähän käskyjä
+STR_VEHICLE_HAS_VOID_ORDER                                      :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on epäkelpo käsky
 STR_VEHICLE_HAS_DUPLICATE_ENTRY                                 :{WHITE}Ajoneuvolla {VEHICLE} on toistuvia määräyksiä
-STR_VEHICLE_HAS_INVALID_ENTRY                                   :Kulkuneuvon {WHITE}{VEHICLE} aikataulussa on virheellinen asema
+STR_VEHICLE_HAS_INVALID_ENTRY                                   :{WHITE}Kulkuneuvon {VEHICLE} aikataulussa on virheellinen asema
 # end of order system

 STR_VEHICLE_AUTORENEW_FAILED                                    :{WHITE}Automaattinen korvaus epäonnistui ajoneuvolle {VEHICLE}{}{STRING}
@@ -2224,7 +2224,7 @@ STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Ota lis
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Lyhennä lainaa.
 STR_7037_PRESIDENT                                              :{WHITE}{PRESIDENTNAME}{}{GOLD}(pääjohtaja)
 STR_7038_INAUGURATED                                            :{GOLD}Avattu: {WHITE}{NUM}
-STR_7039_VEHICLES                                               :{GOLD}Liikennevälineet:
+STR_7039_VEHICLES                                               :{GOLD}Liikenneväl.:
 STR_TRAINS                                                      :{WHITE}{COMMA} juna{P "" a}
 STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} ajoneuvo{P "" a}
 STR_AIRCRAFT                                                    :{WHITE}{COMMA} lentokone{P "" tta}
@@ -3078,9 +3078,9 @@ STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
 STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
-STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Liikennevälineitä:
+STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Liikenneväl.:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Asemia:
-STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Vähimmäistuotto:
+STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Väh. tuotto:
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Vähimmäistulo:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Enimmäistulo:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Kuljetettu:
@@ -3232,8 +3232,8 @@ STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} ilma-alus{P "" ta}

 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Korvaa {STRING}
-STR_REPLACE_VEHICLES_START                                      :{BLACK}Aloita ajoneuvojen korvaaminen
-STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lopeta ajoneuvojen korvaaminen
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Aloita ajoneuvojen korv.
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lopeta ajoneuvojen korv.
 STR_NOT_REPLACING                                               :{BLACK}Ei korvata
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ei liikennevälinettä valittuna
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Valitse korvattava veturityyppi.
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -685,6 +685,7 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Sinais
 STR_02D5_LAND_BLOCK_INFO                                        :Información de área de terreo
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Des/Activar Consola
+STR_AI_DEBUG_MENU                                               :Depuración IA
 STR_02D7_SCREENSHOT_CTRL_S                                      :Captura de Pantalla (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Capt.Pant. Xigante (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Acerca de 'OpenTTD'
@@ -842,7 +843,9 @@ STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Formato
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Selecciona o formato a utilizar nas capturas de pantalla

+STR_OPTIONS_BASE_GRF                                            :{BLACK}Conxunto básico de gráficos
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Selecciona o conxunto de gráficos básico a usar
 STR_AUTOSAVE_FAILED                                             :{WHITE}Autograbado fallido

 STR_MONTH_JAN                                                   :Xaneiro
@@ -891,6 +894,7 @@ STR_VEHICLE_HAS_DUPLICATE_ENTRY                                 :{WHITE}{VEHICLE
 STR_VEHICLE_HAS_INVALID_ENTRY                                   :{WHITE}{VEHICLE} ten unha estación inválida nas súas ordes
 # end of order system

+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}{VEHICLE} é demasiado longo despois do reemprazo
 STR_AUTOREPLACE_NOTHING_TO_DO                                   :{WHITE}Non se aplicaron as regras de autosubstitución/renovación
 STR_AUTOREPLACE_MONEY_LIMIT                                     :(límite de diñeiro)

@@ -939,6 +943,7 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Permiti
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Permiti-la construción de estacións contiguas: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Activar motor para múltiples NewGRF: {ORANGE}{STRING}

+STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Non é posible cambiar esta opción cando hai vehículos.
 STR_CONFIG_SETTING_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING}

 STR_CONFIG_SETTING_WARN_LOST_TRAIN                              :{LTBLUE}Avisar se un tren se perde: {ORANGE}{STRING}
@@ -972,6 +977,7 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Rotaci
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Esquerda
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Dereita
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Nivel de altitude dun escenario chairo: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Activa-la terraformación nos bordes do mapa: {ORANGE}{STRING}

 # Start of map water border strings.
 # DON'T ADD OR REMOVE LINES HERE
@@ -999,7 +1005,11 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Tecla Command
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_CONTROL                  :Tecla Control
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Apagado

+STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Desprazamento con click esquerdo: {ORANGE}{STRING}

+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :longo (31 Dec 2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :corto (31-12-2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

 STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME                            :{LTBLUE}Pausar automáticamente ó comezo dunha nova partida: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADVANCED_VEHICLE_LISTS                       :{LTBLUE}Usa-la lista avanzada de vehículos: {ORANGE}{STRING}
@@ -1033,6 +1043,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROADVEH                            :{LTBLUE}Deshabi
 STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Deshabilita-los avións para o ordenador: {ORANGE}{STRING}
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Deshabilita-los barcos para o ordenador: {ORANGE}{STRING}

+STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Permitir IA en multixogador: {ORANGE}{STRING}

 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Intervalos de servizo en porcentaxes: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Intervalo de servizo para os trens: {ORANGE}{STRING} días/%
@@ -1063,6 +1074,7 @@ STR_CONFIG_SETTING_CYCLE_SIGNAL_NORMAL                          :Só normais
 STR_CONFIG_SETTING_CYCLE_SIGNAL_PBS                             :Só avanzadas
 STR_CONFIG_SETTING_CYCLE_SIGNAL_ALL                             :Todas

+STR_CONFIG_SETTING_TOWN_LAYOUT                                  :{LTBLUE}Distribución das estradas en novas cidades: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_LAYOUT_DEFAULT                          :defecto
 STR_CONFIG_SETTING_TOWN_LAYOUT_BETTER_ROADS                     :mellores estradas
 STR_CONFIG_SETTING_TOWN_LAYOUT_2X2_GRID                         :Reixa 2x2
@@ -1093,8 +1105,11 @@ STR_CONFIG_SETTING_VEHICLES                                     :{ORANGE}Vehícu
 STR_CONFIG_SETTING_STATIONS                                     :{ORANGE}Estacións
 STR_CONFIG_SETTING_ECONOMY                                      :{ORANGE}Economía
 STR_CONFIG_SETTING_AI                                           :{ORANGE}Competidores
+STR_CONFIG_SETTING_DISPLAY_OPTIONS                              :{ORANGE}Mostrar opcións
+STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Interacción
 STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}Sinais
 STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Xogadores do ordenador
+STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Autorenovar
 STR_CONFIG_SETTING_VEHICLES_TRAINS                              :{ORANGE}Trens
 STR_CONFIG_SETTING_ECONOMY_TOWNS                                :{ORANGE}Cidades
 STR_CONFIG_SETTING_ECONOMY_INDUSTRIES                           :{ORANGE}Industrias
@@ -1404,10 +1419,11 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduc
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}O servidor está protexido. Introduce clave
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A compañía está protexida. Introduce clave
 STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de Clientes
+STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observar
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Compañía

 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Non se atoparon dispositivos de rede ou compilouse sen ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Non se atoparon xogos en rede
+STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Non se atoparon xogos en rede
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} O servidor non respondeu á solicitude
 STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Non se pode conectar debido a un problema cos NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE}Sincronización da partida en rede fallida
@@ -1443,7 +1459,21 @@ STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor cheo
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS                  :Partida en pausa (non hai suficientes xogadores)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS                :Partida funcionando (hai suficientes xogadores)
+STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Partida en pausa (cliente conectando)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Partida funcionando (cliente conectado)
+STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Partida funcionando (o cliente non pudio conectar)
 ############ End of leave-in-this-order
+STR_NETWORK_CLIENT_LEAVING                                      :saíndo
+STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} uniuse á partida
+STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} uniuse a compañía #{2:NUM}
+STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} uniuse ós espectadores
+STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} comezou unha nova compañía (#{2:NUM})
+STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} saiu da partida ({2:STRING})
+STR_NETWORK_NAME_CHANGE                                         :*** {STRING} cambiou o seu nome a {STRING}
+STR_NETWORK_GIVE_MONEY                                          :*** {STRING} deu a túa companía {2:CURRENCY}
+STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Diches a {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Equipo] :
 STR_NETWORK_CHAT_COMPANY                                        :[Equipo] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Equipo] A {STRING}: {WHITE}{STRING}
@@ -1566,6 +1596,8 @@ STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Vía de tren co
 STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Vía de tren con sinais combo e de ruta dun sentido
 STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Vía de tren con sinais de ruta e de ruta dun sentido
 STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}debes quita-la estación de tren primeiro
+STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construír unha estación separada
+STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Unir estación



@@ -1851,6 +1883,7 @@ STR_4001_LOAD_GAME                                              :{WHITE}Cargar P
 STR_4002_SAVE                                                   :{BLACK}Grabar
 STR_4003_DELETE                                                 :{BLACK}Borrar
 STR_4004                                                        :{COMPANY}, {STRING}
+STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Espectador, {SKIP}{STRING}
 STR_4005_BYTES_FREE                                             :{BLACK}{BYTES} libre{P "" s}
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}No se pode lee-la unidade
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Grabación da partida fallida{}{STRING}
@@ -1861,6 +1894,7 @@ STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Partida grabada
 STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :A partida grabouse cunha versión máis nova do xogo
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Ficheiro ilexible
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Non se pode escribir no ficheiro
+STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Fallou a comprobación de integridade dos datos
 STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}Lista de unidades, directorios e arquivos de partida
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Nome seleccionado actualmente para o arquivo
 STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Borra-lo arquivo que está seleccionado
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -154,7 +154,7 @@ STR_ABBREV_ALL                                                  :{TINYFONT}SMA
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Peta - {STRING}
-STR_00B1_GAME_OPTIONS                                           :{WHITE}Pilihan permainan
+STR_00B1_GAME_OPTIONS                                           :{WHITE}Pengaturan permainan
 STR_00B2_MESSAGE                                                :{YELLOW}Pesan
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Pesan dari {STRING}
 STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Peringatan!
@@ -269,7 +269,7 @@ STR_SCENARIO_EDITOR                                             :{BLACK}Editor S

 STR_MAPSIZE                                                     :{BLACK}Ukuran Peta:
 STR_BY                                                          :{BLACK}*
-STR_0148_GAME_OPTIONS                                           :{BLACK}Pilihan Permainan
+STR_0148_GAME_OPTIONS                                           :{BLACK}Pengaturan Permainan

 STR_0150_SOMEONE                                                :seseorang{SKIP}{SKIP}

@@ -669,7 +669,7 @@ STR_02BD                                                        :{BLACK}{STRING}

 STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
-STR_02C4_GAME_OPTIONS                                           :Pilihan Permainan
+STR_02C4_GAME_OPTIONS                                           :Pengaturan permainan
 STR_02C6_DIFFICULTY_SETTINGS                                    :Pengaturan tingkat kesulitan
 STR_MENU_CONFIG_SETTINGS                                        :Pengaturan lanjutan
 STR_NEWGRF_SETTINGS                                             :Pengaturan NewGRF
@@ -695,7 +695,7 @@ STR_02D9_ABOUT_OPENTTD                                          :Tentang 'OpenTT
 ############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Non-aktifkan
-STR_02DA_ON                                                     :{BLACK}Hidup
+STR_02DA_ON                                                     :{BLACK}Aktif
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Tampilkan subsidi
 STR_02DD_SUBSIDIES                                              :Subsidi
 STR_02DE_MAP_OF_WORLD                                           :Peta Dunia
@@ -1159,7 +1159,7 @@ STR_TOYLAND_LANDSCAPE                                           :Lansekap 'Taman

 STR_CHEATS                                                      :{WHITE}Kode Curang
 STR_CHEATS_TIP                                                  :{BLACK}Daftar cek ini mengindikasikan bahwa anda telah menggunakan kode curang ini sebelumnya
-STR_CHEATS_WARNING                                              :{BLACK}Peringatan! Anda akan mencurangi pemain lainya. Kecurangan ini akan tetap tercatat selama game berjalan.
+STR_CHEATS_WARNING                                              :{BLACK}Peringatan! Anda akan mencurangi pemain lainnya. Kecurangan ini akan tetap tercatat selama game berjalan.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Tambah uang sebanyak {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Bermain sebagai pemain: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Buldozer ajaib (hancurkan industri, mercu suar dsb): {ORANGE}{STRING}
@@ -2161,7 +2161,7 @@ STR_6833_9_MONTHS_AFTER_PLAYER                                  :9 bulan setelah
 STR_6834_AT_END_OF_LINE_AND_AT_STATIONS                         :Pada ujung rel, dan pada stasiun
 STR_6835_AT_END_OF_LINE_ONLY                                    :Hanya pada ujung rel
 STR_6836_OFF                                                    :Non-aktifkan
-STR_6837_ON                                                     :Hidup
+STR_6837_ON                                                     :Aktif
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Tampilkan tabel skor tertinggi
 STR_PERMISSIVE                                                  :Selalu boleh
 STR_TOLERANT                                                    :Toleran
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -607,6 +607,7 @@ STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kan ikke
 STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...der er ikke mer plass på kartet
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Øk bystørrelse
 STR_023C_EXPAND                                                 :{BLACK}Utvid
+STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Byen kommer ikke til å bygge veier. Du kan slå på bygging av veier via Avanserte innstillinger->Økonomi->Byer.
 STR_023D_RANDOM_TOWN                                            :{BLACK}Lag tilfeldig by
 STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Grunnlegg by et tilfeldig sted
 STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Kan ikke bygge {STRING} her...
@@ -646,6 +647,7 @@ STR_02A2_MEDIUM                                                 :{BLACK}Middels
 STR_02A3_LARGE                                                  :{BLACK}Stor
 STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Tilfeldig
 STR_FOUND_TOWN_CITY                                             :{BLACK}By
+STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Store byer vokser raskere enn vanlige byer{}Avhengig av valgte innstillinger er de større når de blir grunnlagt
 STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Velg bystørrelse
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Bystørrelse:

@@ -844,7 +846,9 @@ STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Filforma
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Velg hvilket format skjermdumpet skal lagers i

+STR_OPTIONS_BASE_GRF                                            :{BLACK}Grafikksett
 STR_OPTIONS_BASE_GRF_CBO                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_OPTIONS_BASE_GRF_TIP                                        :{BLACK}Velg grafikksett som skal brukes

 STR_AUTOSAVE_FAILED                                             :{WHITE}Autolagring feilet

@@ -942,9 +946,11 @@ STR_CONFIG_SETTING_NONUNIFORM_STATIONS                          :{LTBLUE}Uensart
 STR_CONFIG_SETTING_FREIGHT_TRAINS                               :{LTBLUE}Vektmultiplikator for frakt til å simulere tunge tog: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PLANE_SPEED                                  :{LTBLUE}Fly hastighet faktor: {ORANGE}1 / {STRING}
 STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD                            :{LTBLUE}Tillat gjennomkjøring av stoppesteder på veier som er eid av byene: {ORANGE}{STRING}
+STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD                      :{LTBLUE}Tillat gjennomkjøringsstopp på veier som er eid av konkurrenter {ORANGE}{STRING}
 STR_CONFIG_SETTING_ADJACENT_STATIONS                            :{LTBLUE}Tillat bygging av nærliggende stasjoner: {ORANGE}{STRING}
 STR_CONFIG_SETTING_DYNAMIC_ENGINES                              :{LTBLUE}Sett i gang flere ny grafikk kjerne sets: {ORANGE}{STRING}

+STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES            :{WHITE}Det er ikke mulig å endre denne innstillingen mens det allerede finnes kjøretøy.
 STR_CONFIG_SETTING_SMALL_AIRPORTS                               :{LTBLUE}Alltid tillat bygging av små flyplasser: {ORANGE}{STRING}

 STR_CONFIG_SETTING_WARN_LOST_TRAIN                              :{LTBLUE}Vis en advarsel hvis et tog har kjørt seg vill{ORANGE}{STRING}
@@ -978,6 +984,9 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}Høydek
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Mot klokka
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :Med klokka
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Høyden et flatt scenariokart får: {ORANGE}{STRING}
+STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE}Aktiver terraforming av ruter ved endene av kartet: {ORANGE}{STRING}
+STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}En eller flere ruter ved den nordlige kanten av kartet er ikke tom
+STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}En eller flere ruter ved en av kantene av kartet er ikke vann

 STR_CONFIG_SETTING_STATION_SPREAD                               :{LTBLUE}Maks stasjonspedning: {ORANGE}{STRING} {RED}Advarsel: Høy instilling gir tregere spill
 STR_CONFIG_SETTING_SERVICEATHELIPAD                             :{LTBLUE}Automatisk vedlikehold ved helikopterlandingsteder: {ORANGE}{STRING}
@@ -1030,6 +1039,7 @@ STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_LAST                       :Sist tilgjengel
 STR_CONFIG_SETTING_DEFAULT_RAIL_TYPE_MOST_USED                  :Mest brukt
 STR_CONFIG_SETTING_SHOW_TRACK_RESERVATION                       :{LTBLUE}Vis reserverte spor: {ORANGE}{STRING}
 STR_CONFIG_SETTING_PERSISTENT_BUILDINGTOOLS                     :{LTBLUE}La byggingsverktøy være aktiv etter bruk: {ORANGE}{STRING}
+STR_CONFIG_SETTING_EXPENSES_LAYOUT                              :{LTBLUE}Gruppér utgifter i firmafinansvinduet: {ORANGE}{STRING}

 STR_CONFIG_SETTING_ALWAYS_BUILD_INFRASTRUCTURE                  :{LTBLUE}Vis byggingsverktøy når det ikke er noen tilgjengelige kjøretøy: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAX_TRAINS                                   :{LTBLUE}Maks antall tog per spiller: {ORANGE}{STRING}
@@ -1043,6 +1053,7 @@ STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Hindre
 STR_CONFIG_SETTING_AI_BUILDS_SHIPS                              :{LTBLUE}Hindre datamaskinen i å bygge skip: {ORANGE}{STRING}

 STR_CONFIG_SETTING_AI_IN_MULTIPLAYER                            :{LTBLUE}Tillat AIer i flerspiller: {ORANGE}{STRING}
+STR_CONFIG_SETTING_AI_MAX_OPCODES                               :{LTBLUE}#opcodes før AI suspenderes: {ORANGE}{STRING}

 STR_CONFIG_SETTING_SERVINT_ISPERCENT                            :{LTBLUE}Vedlikeholdsintervaller i prosent: {ORANGE}{STRING}
 STR_CONFIG_SETTING_SERVINT_TRAINS                               :{LTBLUE}Standard vedlikeholdsintervall for tog: {ORANGE}{STRING} dager
@@ -1111,6 +1122,7 @@ STR_CONFIG_SETTING_DISPLAY_OPTIONS                              :{ORANGE}Visning
 STR_CONFIG_SETTING_INTERACTION                                  :{ORANGE}Samhandling
 STR_CONFIG_SETTING_CONSTRUCTION_SIGNALS                         :{ORANGE}Signaler
 STR_CONFIG_SETTING_STATIONS_CARGOHANDLING                       :{ORANGE}Lastehåndtering
+STR_CONFIG_SETTING_AI_NPC                                       :{ORANGE}Datamaskinstyrte spillere
 STR_CONFIG_SETTING_VEHICLES_AUTORENEW                           :{ORANGE}Autoforny
 STR_CONFIG_SETTING_VEHICLES_SERVICING                           :{ORANGE}Vedlikehold
 STR_CONFIG_SETTING_VEHICLES_ROUTING                             :{ORANGE}Ruting
@@ -1185,6 +1197,7 @@ STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kan ikke
 STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Bygg jernbane ved hjelp av autobanemodusen

 STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...det er ingen byer i dette scenarioet
+STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kartgenerering avbrutt...{}...ingen brukbare steder å plassere byene

 STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mange tilfeldige byer
 STR_RANDOM_TOWNS_TIP                                            :{BLACK}Dekk kartet med tilfeldig plasserte byer
@@ -1196,7 +1209,6 @@ STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}Åpne ve
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landskaping
 STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Utjevn land

-
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Trær av tilfeldig type
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plasser trær av tilfeldig type

@@ -1674,6 +1686,7 @@ STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Bytt nav
 STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passasjerer forrige måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post forrige måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Godsbehov for byekspansjon:
+STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} påkrevd
 STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} levert sist måned
 STR_200F_TALL_OFFICE_BLOCK                                      :Høyhus
 STR_2010_OFFICE_BLOCK                                           :Kontorblokk
@@ -1790,6 +1803,7 @@ STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}For nær
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Grenser til mer enn én eksiterende stasjon/lasteterminal
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stasjoner/lasteterminaler i byen
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}For mange stasjoner/lasteterminaler
+STR_TOO_MANY_STATION_SPECS                                      :{WHITE}For mange enkeltdeler på jernbanestasjonen
 STR_TOO_MANY_BUS_STOPS                                          :{WHITE}For mange bussholdeplasser
 STR_TOO_MANY_TRUCK_STOPS                                        :{WHITE}For mange lasteterminaler
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}For nær en annen jernbanestasjon/lasteterminal
@@ -2226,6 +2240,7 @@ STR_704A_SELECT_FEMALE_FACES                                    :{BLACK}Velg kvi
 STR_704B_GENERATE_RANDOM_NEW_FACE                               :{BLACK}Lag et tilfeldig ansikt
 STR_704C_KEY                                                    :{BLACK}Nøkkel
 STR_704D_SHOW_KEY_TO_GRAPHS                                     :{BLACK}Vis oversikt over grafvalg
+STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Vis detaljerte ytelsesmålinger
 STR_704E_KEY_TO_COMPANY_GRAPHS                                  :{WHITE}Vis oversikt over firmagrafvalg
 STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY                           :{BLACK}Trykk her for å vise/skjule et firma
 STR_7050_UNITS_OF_CARGO_DELIVERED                               :{WHITE}Antall varer levert
@@ -2784,12 +2799,12 @@ STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Fjern va
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nullstill senhetstelleren slik at kjøretøyet ankommer i tide
 STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren med mindre vedlikehold trengs.
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Koster: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {CARGO}
-STR_885C_BROKEN_DOWN                                            :{RED}Havarert
-STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnad: {LTBLUE}{CURRENCY}/år
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Vekt: {LTBLUE}{WEIGHT_S}  {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maks. fart: {LTBLUE}{VELOCITY}
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Vekt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Høyeste fart: {LTBLUE}{VELOCITY} {BLACK}Høyeste hastighet.: {LTBLUE}{FORCE}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Vekt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maksfart: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Inntekt i år: {LTBLUE}{CURRENCY}  (sist år: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pålitelighet: {LTBLUE}{COMMA}{NBSP}%  {BLACK}Havarier siden forrige vedlikehold: {LTBLUE}{COMMA}
+STR_885C_BROKEN_DOWN                                            :{RED}Motorstopp
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnad: {LTBLUE}{CURRENCY}/år
 STR_8861_STOPPED                                                :{RED}Stoppet
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan ikke tvinge tog til å kjøre på rødt lys ved fare...
 STR_8863_CRASHED                                                :{RED}Krasjet
@@ -2799,6 +2814,8 @@ STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Kan ikke
 STR_8867_NAME_TRAIN                                             :{BLACK}Navngi tog
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Togkrasj!{}{COMMA} dør i kollisjonen
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikke snu toget...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan ikke snu kjøreretningen til kjøretøy...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke snu kjøretøy som består av flere deler
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Gi tog/vogn nytt navn
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Kan ikke gi tog/vogn nytt navn...
 STR_CLEAR_TIME                                                  :{BLACK}Nullstill tid
@@ -2886,7 +2903,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Borgerne jubler . . .{}Første frakttrikk ankommer {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Kollisjon!{}Sjåfør dør etter kollisjon med tog
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Kollisjon!{}{COMMA} dør etter kollisjon med tog
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke snu kjøretøy som består av flere deler
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Kan ikke snu kjøretøy...
 STR_9034_RENAME                                                 :{BLACK}Endre navn
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Endre navnet til kjøretøytypen
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Endre navnet til kjøretøytypen
@@ -3113,6 +3130,7 @@ STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uforventet spri
 STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukjent hendelse 0 eiendom.
 STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøk å bruke ugyldig ID.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inneholder en ødelagt grafikk. All ødelagt grafikk vil bli vist som røde spørsmålstegn (?).
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneholder flere "Action 8" oppføringer

 STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Last den valgte fastsette på forhånd
 STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Lagre fastsette på forhånd
@@ -3153,6 +3171,9 @@ STR_NEWGRF_BROKEN                                               :{WHITE}Oppførs
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Det endrer kjøretøyets lengde for '{1:ENGINE}' når ikke i ett depo.
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Tog '{VEHICLE}' tilhører '{COMPANY}' har ugyldig lengde. Det er sannsynligvis forårsaket av problemer med ny grafikk. Spillet kan desynkronisere eller kollidere.

+STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' utgir ukorrekt informasjon.
+STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Gods-/ombygningsinformasjon for '{1:ENGINE}' er forskjellig fra kjøpelisten etter konstruksjonen. Dette kan resultere i at autofornying ikke fungerer på riktig måte.
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' forårsaket en uendelig loop i produksjonstilbakekallet.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spillet ble lagret i versjon uten trikk støtte. Alle trikker har blitt fjernet.

 STR_CURRENCY_WINDOW                                             :{WHITE}Vanlig valuta
@@ -3344,6 +3365,7 @@ STR_NORTHWEST                                                   :{BLACK}Nordvest
 STR_NORTHEAST                                                   :{BLACK}Nordøst
 STR_SOUTHEAST                                                   :{BLACK}Sørøst
 STR_SOUTHWEST                                                   :{BLACK}Sørvest
+STR_BORDER_FREEFORM                                             :{BLACK}Friform
 STR_BORDER_WATER                                                :{BLACK}Sjø
 STR_BORDER_RANDOM                                               :{BLACK}Tilfeldig
 STR_BORDER_RANDOMIZE                                            :{BLACK}Tilfeldig
@@ -3539,6 +3561,9 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_AI_SETTINGS_BUTTON                                          :{BLACK}AI instillinger
 STR_AI_SETTINGS_BUTTON_TIP                                      :{BLACK}Vis AI instillinger
 STR_AI_DEBUG                                                    :{WHITE}AI feilsøking
+STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Navnet til AIen
+STR_AI_DEBUG_RELOAD                                             :{BLACK}Last inn AI på nytt
+STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Slå av AI, last skript på nytt, og start AI på nytt
 STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI feilsøkingsvidu er kun tilgjengelig for serveren
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI konfigurasjon
 STR_AI_CHANGE                                                   :{BLACK}Velg AI
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -153,7 +153,7 @@ STR_ABBREV_PLASTIC                                              :{TINYFONT}ПЛ
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}ГЗ
 STR_ABBREV_NONE                                                 :{TINYFONT}НЕТ
 STR_ABBREV_ALL                                                  :{TINYFONT}Все
-STR_00AE                                                        :{WHITE}{DATE_SHORT}
+STR_00AE                                                        :{WHITE}{DATE_SHORT} г.
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Карта - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Настройки игры
@@ -1015,7 +1015,7 @@ STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_OFF                      :Выкл.
 STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING                     :{LTBLUE}Скроллинг по клику левой кнопкой мыши: {ORANGE}{STRING}

 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES                    :{LTBLUE}Использовать {ORANGE}{STRING}{LTBLUE} формат даты для имён сохранений
-STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :длинный (31-е дек 2008)
+STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG               :длинный (31-е дек 2008 г.)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT              :короткий (31.12.2008)
 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO                :ISO (2008-12-31)

@@ -1569,7 +1569,7 @@ STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Магн
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Выберите железнодорожный мост
 STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Здесь невозможно построить депо...
 STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Здесь невозможно построить станцию...
-STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Здесь невозможно построить светофор...
+STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Здесь невозможно поставить светофор...
 STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Здесь невозможно проложить рельсы...
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Невозможно удалить рельсы...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Невозможно удалить светофор...
@@ -1911,14 +1911,14 @@ STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Нево
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Невозможно удалить файл
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}Невозможно загрузить игру{}{STRING}
 STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR                   :Внутренняя ошибка: {STRING}
-STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Нарушена структура сэйва - {STRING}
-STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Сэйв сделан в более новой версии
+STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME                         :Файл сохранения повреждён - {STRING}
+STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Сохранение сделано в более новой версии
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Файл не читается
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Незаписываемый файл
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Нарушена целостность
-STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}Список дисков, папок и сохраненных игр
+STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}Список дисков, папок и сохранённых игр
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Выбранное имя для сохранения игры
-STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Удалить выбранную сохраненную игру
+STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Удалить выбранную сохранённую игру
 STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Сохранить игру, используя выбранное имя
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Сгенерировать случайную карту
 STR_LOAD_HEIGHTMAP                                              :{WHITE}Загрузить карту
@@ -2010,31 +2010,31 @@ STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Опор
 STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Слишком низкий мост
 STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}Начало и конец должны быть на одной линии
 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL                             :{WHITE}Неподходящее место для строительства туннеля
-STR_500D                                                        :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
-STR_500E_SUSPENSION_STEEL                                       :Подвесной, Стальной
-STR_500F_GIRDER_STEEL                                           :Балочный, Стальной
-STR_5010_CANTILEVER_STEEL                                       :Консольный, Стальной
-STR_5011_SUSPENSION_CONCRETE                                    :Подвесной, Бетонный
+STR_500D                                                        :{GOLD}{STRING}{}{VELOCITY}; {WHITE}{CURRENCY}
+STR_500E_SUSPENSION_STEEL                                       :Висячий стальной
+STR_500F_GIRDER_STEEL                                           :Балочный стальной
+STR_5010_CANTILEVER_STEEL                                       :Консольный стальной
+STR_5011_SUSPENSION_CONCRETE                                    :Висячий бетонный
 STR_5012_WOODEN                                                 :Деревянный
 STR_5013_CONCRETE                                               :Бетонный
-STR_5014_TUBULAR_STEEL                                          :Трубчатый, Стальной
-STR_BRIDGE_TUBULAR_SILICON                                      :Трубчатый, Силиконовый
+STR_5014_TUBULAR_STEEL                                          :Трубчатый стальной
+STR_BRIDGE_TUBULAR_SILICON                                      :Трубчатый силиконовый
 STR_5015_CAN_T_BUILD_BRIDGE_HERE                                :{WHITE}Здесь невозможно построить мост...
 STR_5016_CAN_T_BUILD_TUNNEL_HERE                                :{WHITE}Здесь невозможно построить туннель...
 STR_5017_RAILROAD_TUNNEL                                        :Железнодорожный туннель
 STR_5018_ROAD_TUNNEL                                            :Автомобильный туннель
-STR_501B_STEEL_SUSPENSION_RAIL_BRIDGE                           :Стальной подвесной ж/д мост
+STR_501B_STEEL_SUSPENSION_RAIL_BRIDGE                           :Стальной висячий ж/д мост
 STR_501C_STEEL_GIRDER_RAIL_BRIDGE                               :Стальной балочный ж/д мост
 STR_501D_STEEL_CANTILEVER_RAIL_BRIDGE                           :Стальной консольный ж/д мост
-STR_501E_REINFORCED_CONCRETE_SUSPENSION                         :Укреплённый подвесной железобетонный ж/д мост
+STR_501E_REINFORCED_CONCRETE_SUSPENSION                         :Железобетонный висячий ж/д мост
 STR_501F_WOODEN_RAIL_BRIDGE                                     :Деревянный ж/д мост
 STR_5020_CONCRETE_RAIL_BRIDGE                                   :Бетонный ж/д мост
-STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE                           :Стальной подвесной мост
-STR_5022_STEEL_GIRDER_ROAD_BRIDGE                               :Стальной балочный мост
-STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE                           :Стальной консольный мост
-STR_5024_REINFORCED_CONCRETE_SUSPENSION                         :Укреплённый подвесной железобетонный мост
-STR_5025_WOODEN_ROAD_BRIDGE                                     :Деревянный мост
-STR_5026_CONCRETE_ROAD_BRIDGE                                   :Бетонный мост
+STR_5021_STEEL_SUSPENSION_ROAD_BRIDGE                           :Стальной висячий автомобильный мост
+STR_5022_STEEL_GIRDER_ROAD_BRIDGE                               :Стальной балочный автомобильный мост
+STR_5023_STEEL_CANTILEVER_ROAD_BRIDGE                           :Стальной консольный автомобильный мост
+STR_5024_REINFORCED_CONCRETE_SUSPENSION                         :Железобетонный висячий автомобильный мост
+STR_5025_WOODEN_ROAD_BRIDGE                                     :Деревянный автомобильный мост
+STR_5026_CONCRETE_ROAD_BRIDGE                                   :Бетонный автомобильный мост
 STR_5027_TUBULAR_RAIL_BRIDGE                                    :Трубчатый ж/д мост
 STR_5028_TUBULAR_ROAD_BRIDGE                                    :Трубчатый автомобильный мост

@@ -2182,20 +2182,20 @@ STR_700A_COMPANY_NAME                                           :Компани
 STR_700B_PRESIDENT_S_NAME                                       :Имя директора
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Невозможно изменить название компании...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Невозможно изменить имя директора...
-STR_700E_FINANCES                                               :{WHITE}{COMPANY} Денежные средства {BLACK}{COMPANYNUM}
+STR_700E_FINANCES                                               :{WHITE}Финансы - {COMPANY} {BLACK}{COMPANYNUM}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Расход/доход
 STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Строительство
 STR_7012_NEW_VEHICLES                                           :{GOLD}Новая техника
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Обслуживание ж/д
 STR_7014_ROAD_VEH_RUNNING_COSTS                                 :{GOLD}Обслуживание авто
-STR_7015_AIRCRAFT_RUNNING_COSTS                                 :{GOLD}Обслуживание авиа
-STR_7016_SHIP_RUNNING_COSTS                                     :{GOLD}Обслуживание кораблей
+STR_7015_AIRCRAFT_RUNNING_COSTS                                 :{GOLD}Обслуж. авиатранспорта
+STR_7016_SHIP_RUNNING_COSTS                                     :{GOLD}Обслуж. кораблей
 STR_7017_PROPERTY_MAINTENANCE                                   :{GOLD}Обслуж. собственности
 STR_7018_TRAIN_INCOME                                           :{GOLD}Доход от ж/д
-STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Доход от автотранспорта
+STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Доход от авто
 STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Доход от авиации
-STR_701B_SHIP_INCOME                                            :{GOLD}Доход от водного транспорта
+STR_701B_SHIP_INCOME                                            :{GOLD}Доход от кораблей
 STR_701C_LOAN_INTEREST                                          :{GOLD}Проценты по займу
 STR_701D_OTHER                                                  :{GOLD}Прочие расходы
 STR_701E                                                        :{BLACK}-{CURRENCY}
@@ -2518,9 +2518,9 @@ STR_80AD_RMT_RUBBER_TRUCK                                       :Грузови
 STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :Грузовик MightyMover (сахар)
 STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Грузовик Powernaught (сахар)
 STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Грузовик Wizzowow (сахар)
-STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :Грузовик MightyMover (кола)
-STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Грузовик Powernaught (кола)
-STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Грузовик Wizzowow (кола)
+STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :Цистерна MightyMover (кола)
+STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Цистерна Powernaught (кола)
+STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Цистерна Wizzowow (кола)
 STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :Грузовик MightyMover (сах. вата)
 STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Грузовик Powernaught (сах. вата)
 STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Грузовик Wizzowow (сах. вата)
@@ -2531,7 +2531,7 @@ STR_80BA_MIGHTYMOVER_TOY_VAN                                    :Грузови
 STR_80BB_POWERNAUGHT_TOY_VAN                                    :Грузовик Powernaught (игрушки)
 STR_80BC_WIZZOWOW_TOY_VAN                                       :Грузовик Wizzowow (игрушки)
 STR_80BD_MIGHTYMOVER_CANDY_TRUCK                                :Грузовик MightyMover (конфеты)
-STR_80BE_POWERNAUGHT_CANDY_TRUCK                                :Powernaught Грузовик (конфеты)
+STR_80BE_POWERNAUGHT_CANDY_TRUCK                                :Грузовик Powernaught (конфеты)
 STR_80BF_WIZZOWOW_CANDY_TRUCK                                   :Грузовик Wizzowow (конфеты)
 STR_80C0_MIGHTYMOVER_BATTERY_TRUCK                              :Грузовик MightyMover (батарейки)
 STR_80C1_POWERNAUGHT_BATTERY_TRUCK                              :Грузовик Powernaught (батарейки)
@@ -2598,7 +2598,7 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Вертолё
 STR_80FE_GURU_X2_HELICOPTER                                     :Вертолёт Guru X2
 STR_80FF_POWERNAUT_HELICOPTER                                   :Вертолёт Powernaut
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Сообщение от производителя транспорта
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Мы создали новый {STRING}. Заинтересованы ли вы в его годовом эксклюзивном использовании для проверки перед запуском в серийное производство?
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Мы создали новую модель {STRING}. Заинтересованы ли вы в его годовом эксклюзивном использовании для проверки перед запуском в серийное производство?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :ж/д локомотив
 STR_8103_ROAD_VEHICLE                                           :автомобиль
 STR_8104_AIRCRAFT                                               :авиатранспорт
@@ -2721,7 +2721,7 @@ STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Новы
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Новый магниторельс
 STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Поезда

-STR_881F_BUILD_VEHICLE                                          :{BLACK}Построить
+STR_881F_BUILD_VEHICLE                                          :{BLACK}Купить
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Копировать
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Создаёт копию автомобиля. Control+щелчок копирует задания
 STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Создаёт копию автомобиля. Щёлкнуть на кнопке и затем на машине внутри или снаружи гаража. Control+щелчок копирует и задания
@@ -2744,7 +2744,7 @@ STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Пере
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Задания)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Конец заданий - -
 STR_SERVICE                                                     :{BLACK}Обслуж.
-STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Невозможно построить ж/д транспорт...
+STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Невозможно купить ж/д транспорт...
 STR_882C_BUILT_VALUE                                            :{LTBLUE}{ENGINE}{BLACK}  Построен в {LTBLUE}{NUM} г.{BLACK} Стоимость: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{ENGINE}{BLACK}   Стоимость: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
@@ -2773,11 +2773,11 @@ STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Осмо
 STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Интервал обслуж.: {LTBLUE}{COMMA}%{BLACK}   Последний раз: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Поезда - нажмите для получения справки
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Поезда - кликните для получения информации, используйте перетаскивание для изменения состава
-STR_8840_BUILD_NEW_TRAIN_VEHICLE                                :{BLACK}Построить новый поезд
+STR_8840_BUILD_NEW_TRAIN_VEHICLE                                :{BLACK}Купить новый поезд
 STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE                             :{BLACK}Перетащите сюда транспорт, чтобы продать его
 STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Показать депо в основном окне
 STR_8843_TRAIN_VEHICLE_SELECTION                                :{BLACK}Выбор вагонов - кликните для справки
-STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Построить выделенный вагон
+STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Купить выбранный локомотив/вагон
 STR_8845_RENAME_TRAIN_VEHICLE_TYPE                              :{BLACK}Переименовать тип вагона
 STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Текущее действие поезда; кликните для его остановки/запуска
 STR_8847_SHOW_TRAIN_S_ORDERS                                    :{BLACK}Показать задания
@@ -2858,8 +2858,8 @@ STR_9002                                                        :{WHITE}{VEHICLE
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}Гараж {TOWN}
 STR_9004_NEW_VEHICLES                                           :{BLACK}Новая машина
 STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Новая машина
-STR_9007_BUILD_VEHICLE                                          :{BLACK}Построить
-STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Невозможно построить машину...
+STR_9007_BUILD_VEHICLE                                          :{BLACK}Купить
+STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Невозможно купить машину...
 STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Детали)
 STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Возраст: {LTBLUE}{STRING}{BLACK} Цена обслуживания: {LTBLUE}{CURRENCY}/год
 STR_900E_MAX_SPEED                                              :{BLACK}Макс. скорость: {LTBLUE}{VELOCITY}
@@ -2885,11 +2885,11 @@ STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Отпр
 STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Принудительно развернуть автомобиль
 STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Показать информацию об автомобиле
 STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Автомобили - кликните для получения справки
-STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Построить новый автомобиль
+STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Купить новый автомобиль
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Перетащите сюда автомобиль, чтобы продать его
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Показать гараж в главном окне
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Список автотранспорта - кликните для получения информации
-STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Построить выделенный автомобиль
+STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Купить выбранный автомобиль
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Цена: {CURRENCY}{}Скорость: {VELOCITY}{}Стоимость обслуживания: {CURRENCY}/год{}Емкость: {CARGO}
 STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Ёмкость: {LTBLUE}
 STR_BARE_CARGO                                                  :{CARGO}
@@ -2928,12 +2928,12 @@ STR_9804_NEW_SHIPS                                              :{BLACK}Ново
 STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} корабл{P ь я ей}
 STR_9808_NEW_SHIPS                                              :{WHITE}Покупка кораблей
 STR_9809_BUILD_SHIP                                             :{BLACK}Купить
-STR_CLONE_SHIP                                                  :{BLACK}Копировать судно
+STR_CLONE_SHIP                                                  :{BLACK}Копировать
 STR_CLONE_SHIP_INFO                                             :{BLACK}Создаёт копию корабля. Control+клик копирует задания
 STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Создаёт копию корабля. Щёлкнуть на кнопке и затем на корабле внутри или снаружи дока. Control+клик копирует задания
 STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Корабль должен быть остановлен в доке
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Невозможно продать корабль...
-STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Невозможно построить корабль...
+STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Невозможно купить корабль...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Корабль на пути
 STR_980F                                                        :{WHITE}{VEHICLE}
 STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Детали)
@@ -2954,12 +2954,12 @@ STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}{VEHICLE
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Строительство пристаней
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Строительство доков (для строительства и обслуживания кораблей)
 STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Корабли - нажмите для получения справки
-STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Построить новый корабль
+STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Купить новый корабль
 STR_9821_DRAG_SHIP_TO_HERE_TO_SELL                              :{BLACK}Перетащите сюда корабль, чтобы продать его
 STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Показать док в основном окне
 STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Корабли - нажмите для получения справки
 STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Список кораблей - нажмите для получения справки
-STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Построить выбранный корабль
+STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Купить выбранный корабль
 STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Текущее действие корабля; кликните для его остановки/запуска
 STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Показать задания
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Показать корабль в главном окне
@@ -2996,10 +2996,10 @@ STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}Анга
 STR_A003_NEW_AIRCRAFT                                           :{BLACK}Новое судно
 STR_CLONE_AIRCRAFT                                              :{BLACK}Копировать
 STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Создаёт копию самолёта. Control+клик - копирует задания
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Построить копию возд. судна. Нажмите на кнопку, а потом на возд. судно в/вне ангара. Ctrl+click - также скопирует и задание.
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Создаёт копию самолёта. Нажмите на кнопку, а потом на возд. судно в/вне ангара. Ctrl+click - также скопирует и задание.
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Новый
-STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Построить
-STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Невозможно построить возд. транспорт...
+STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Купить
+STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Невозможно купить возд. транспорт...
 STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} единиц{P а ы ""} авиатранспорта
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Детали)
@@ -3021,15 +3021,14 @@ STR_A019_CAPACITY                                               :{BLACK}Емко
 STR_A01A_CAPACITY                                               :{BLACK}Емкость: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
 STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Самолёт должен быть остановлен в ангаре
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Не могу продать авиатранспорт...
-STR_A01D_AIRPORT_CONSTRUCTION                                   :Строительство аэропорта
+STR_A01D_AIRPORT_CONSTRUCTION                                   :Строительство аэропортов
 STR_A01E_BUILD_AIRPORT                                          :{BLACK}Строительство аэропортов
-STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Авиатранспорт - нажмите для получения справки
 STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Авиатранспорт - нажмите для получения справки
-STR_A022_BUILD_NEW_AIRCRAFT                                     :{BLACK}Построить новый авиатранспорт
+STR_A022_BUILD_NEW_AIRCRAFT                                     :{BLACK}Купить новый авиатранспорт
 STR_A023_DRAG_AIRCRAFT_TO_HERE_TO                               :{BLACK}Перетащите сюда транспорт, чтобы продать его
 STR_A024_CENTER_MAIN_VIEW_ON_HANGAR                             :{BLACK}Показать ангар в главном окне
 STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Авиатранспорт - нажмите для получения справки
-STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Построить выделенный авиатранспорт
+STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Купить выбранный авиатранспорт
 STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Текущее действие воздушного судна; кликните для его остановки/запуска
 STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Показать задания
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Показать транспорт в главном окне
@@ -3387,8 +3386,8 @@ STR_HELIDEPOT                                                   :{BLACK}Верт
 STR_HELISTATION                                                 :{BLACK}Вертолётная станция

 STR_SMALL_AIRPORTS                                              :{BLACK}Малые аэропорты
-STR_LARGE_AIRPORTS                                              :{BLACK}Большие аэропорты
-STR_HUB_AIRPORTS                                                :{BLACK}Базовые аэропорты
+STR_LARGE_AIRPORTS                                              :{BLACK}Средние аэропорты
+STR_HUB_AIRPORTS                                                :{BLACK}Большие аэропорты
 STR_HELIPORTS                                                   :{BLACK}Вертолётные площадки

 ############ Tooltip measurment
@@ -3599,12 +3598,12 @@ STR_STATION_NOISE                                               :{BLACK}Прои
 ############ Downloading of content from the central server
 STR_CONTENT_NO_ZLIB                                             :{WHITE}OpenTTD собрана без поддержки библиотеки «zlib»...
 STR_CONTENT_NO_ZLIB_SUB                                         :{WHITE}...загрузка контента невозможна!
-STR_CONTENT_TYPE_BASE_GRAPHICS                                  :Основная графика
-STR_CONTENT_TYPE_NEWGRF                                         :NewGRF
-STR_CONTENT_TYPE_AI                                             :ИИ
-STR_CONTENT_TYPE_AI_LIBRARY                                     :Библиотека ИИ
-STR_CONTENT_TYPE_SCENARIO                                       :Сценарии
-STR_CONTENT_TYPE_HEIGHTMAP                                      :Высотные карты
+STR_CONTENT_TYPE_BASE_GRAPHICS                                  :{G=f}Базовая графика
+STR_CONTENT_TYPE_NEWGRF                                         :{G=m}NewGRF
+STR_CONTENT_TYPE_AI                                             :{G=m}ИИ
+STR_CONTENT_TYPE_AI_LIBRARY                                     :{G=f}Библиотека ИИ
+STR_CONTENT_TYPE_SCENARIO                                       :{G=m}Сценарий
+STR_CONTENT_TYPE_HEIGHTMAP                                      :{G=f}Карта высот
 STR_CONTENT_TITLE                                               :{WHITE}Загрузка контента
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Тип
 STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Тип контента
@@ -3629,7 +3628,7 @@ STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Буд
 STR_CONTENT_DETAIL_SUBTITLE_AUTOSELECTED                        :{SILVER}Этот модуль зависит от другого и будет загружен
 STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Уже установлен
 STR_CONTENT_DETAIL_SUBTITLE_DOES_NOT_EXIST                      :{SILVER}Этот модуль неизвестен и не может быть загружен для OpenTTD
-STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Он заменит уже имеющийся {STRING}
+STR_CONTENT_DETAIL_UPDATE                                       :{SILVER}Он заменит уже имеющ{G ий ую ее ие}ся {STRING}
 STR_CONTENT_DETAIL_NAME                                         :{SILVER}Наименование: {WHITE}{STRING}
 STR_CONTENT_DETAIL_VERSION                                      :{SILVER}Версия: {WHITE}{STRING}
 STR_CONTENT_DETAIL_DESCRIPTION                                  :{SILVER}Описание: {WHITE}{STRING}
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -275,22 +275,55 @@ STR_QUANTITY_MAIZE                                              :{WEIGHT} kukuru
 STR_QUANTITY_FRUIT                                              :{WEIGHT} voća
 STR_QUANTITY_DIAMONDS                                           :{COMMA} džak{P "" a ova} dijamanata
 STR_QUANTITY_FOOD                                               :{WEIGHT} hrane
-STR_QUANTITY_PAPER                                              :{WEIGHT} nad papir
+STR_QUANTITY_PAPER                                              :{WEIGHT} papira
 STR_QUANTITY_GOLD                                               :{COMMA} džak{P "" a ova} zlata
-STR_QUANTITY_WATER                                              :{VOLUME} nad voda
-STR_QUANTITY_WHEAT                                              :{WEIGHT} nad pšenica
-STR_QUANTITY_RUBBER                                             :{VOLUME} nad guma
-STR_QUANTITY_SUGAR                                              :{WEIGHT} nad zasladiti
+STR_QUANTITY_WATER                                              :{VOLUME} vode
+STR_QUANTITY_WHEAT                                              :{WEIGHT} pšenice
+STR_QUANTITY_RUBBER                                             :{VOLUME} gume
+STR_QUANTITY_SUGAR                                              :{WEIGHT} šećera
 STR_QUANTITY_TOYS                                               :{COMMA} igrač{P ka ke aka}
 STR_QUANTITY_SWEETS                                             :{COMMA} džak{P "" a ova} slatkiša
-STR_QUANTITY_COLA                                               :{VOLUME} nad kola
-STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} nad candyfloss
-STR_QUANTITY_BUBBLES                                            :{COMMA} mehur{P "" a ova}
-STR_QUANTITY_TOFFEE                                             :{WEIGHT} nad karamela
+STR_QUANTITY_COLA                                               :{VOLUME} kole
+STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} šećerne vune
+STR_QUANTITY_BUBBLES                                            :{COMMA} balon{P "" a a}
+STR_QUANTITY_TOFFEE                                             :{WEIGHT} karamele
 STR_QUANTITY_BATTERIES                                          :{COMMA} baterij{P a e a}
-STR_QUANTITY_PLASTIC                                            :{VOLUME} nad plastika
+STR_QUANTITY_PLASTIC                                            :{VOLUME} plastike
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} gaziran{P o a a} pić{P 0 e a a}
 STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
+STR_ABBREV_NONE                                                 :{TINYFONT}NO
+STR_ABBREV_ALL                                                  :{TINYFONT}ALL
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
@@ -300,13 +333,13 @@ STR_00B3_MESSAGE_FROM                                           :{YELLOW}{STRING
 STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Oprez!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Neizvodljivo...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Područje ne može biti očišćeno...
-STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
+STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Originalni kopirajt {COPYRIGHT} 1995 Chris Sawyer, Sva prava zadržana
 STR_00B7_VERSION                                                :{BLACK}OpenTTD verzija {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD tim

 STR_00C5                                                        :{BLACK}{CROSS}
 STR_00C6                                                        :{SILVER}{CROSS}
-STR_00C7_QUIT                                                   :{WHITE}Napusti
+STR_00C7_QUIT                                                   :{WHITE}Izađi
 STR_00C8_YES                                                    :{BLACK}Da
 STR_00C9_NO                                                     :{BLACK}Ne
 STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Da li ste sigurni da želite da napustite OpenTTD i vratite se u {STRING}?
@@ -327,7 +360,7 @@ STR_00D8_DARK_GREEN                                             :Tamno zelena
 STR_00D9_BLUE                                                   :Plava
 STR_00DA_CREAM                                                  :Krem
 STR_00DB_MAUVE                                                  :Lavanda
-STR_00DC_PURPLE                                                 :Purpurna
+STR_00DC_PURPLE                                                 :Ljubičasta
 STR_00DD_ORANGE                                                 :Narandžasta
 STR_00DE_BROWN                                                  :Braon
 STR_00DF_GREY                                                   :Siva
@@ -377,7 +410,7 @@ STR_012A_DESERT                                                 :{BLACK}{TINYFON
 STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Sneg
 STR_012C_MESSAGE                                                :{WHITE}Poruka
 STR_012D                                                        :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Propust
+STR_DEFAULT                                                     :{BLACK}Prvobitno
 STR_012E_CANCEL                                                 :{BLACK}Otkaži
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Preimenuj
@@ -396,18 +429,18 @@ STR_013B_OWNED_BY                                               :{WHITE}...je u
 STR_013C_CARGO                                                  :{BLACK}Tovar
 STR_013D_INFORMATION                                            :{BLACK}Informacija
 STR_013E_CAPACITIES                                             :{BLACK}Kapaciteti
-STR_TOTAL_CARGO                                                 :{BLACK}Zbir Tovar
+STR_TOTAL_CARGO                                                 :{BLACK}Ukupni tovar
 STR_013F_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}{STRING}
 STR_CAPACITY_MULT                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}{STRING} (x{NUM})
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Zbir tovar kapacitet nad ova trenirati:
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Ukupan kapacitet ovog voza:
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nova igra
 STR_0141_LOAD_GAME                                              :{BLACK}Učitaj igru
-STR_MULTIPLAYER                                                 :{BLACK}Mreža igra
-STR_SCENARIO_EDITOR                                             :{BLACK}Scenarij Urednik
+STR_MULTIPLAYER                                                 :{BLACK}Mrežna igra
+STR_SCENARIO_EDITOR                                             :{BLACK}Editor scenarija

-STR_MAPSIZE                                                     :{BLACK}Karta veličina:
+STR_MAPSIZE                                                     :{BLACK}Veličina mapa:
 STR_BY                                                          :{BLACK}*
 STR_0148_GAME_OPTIONS                                           :{BLACK}Opcije

@@ -418,7 +451,7 @@ STR_UNITS_METRIC                                                :Metrički
 STR_UNITS_SI                                                    :SI

 STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} milja na sat
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA} kilometar na sat
+STR_UNITS_VELOCITY_METRIC                                       :{COMMA} km/h
 STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s

 STR_UNITS_POWER_IMPERIAL                                        :{COMMA}ks
@@ -434,7 +467,7 @@ STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg
 STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}l
 STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³

-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} lit{P ra re ara}
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} lit{P ar ra ara}
 STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_SI                                              :{COMMA} kN
@@ -447,7 +480,7 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Grafikon istori
 STR_0158_COMPANY_VALUE_GRAPH                                    :Grafikon vrednosti kompanije
 STR_0159_CARGO_PAYMENT_RATES                                    :Stope naplate tovara
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Tabela lige kompanija
-STR_PERFORMANCE_DETAIL_MENU                                     :Detaljan pergled poslovanja
+STR_PERFORMANCE_DETAIL_MENU                                     :Detaljan pregled poslovanja
 ############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}O OpenTTD-u
@@ -462,25 +495,25 @@ STR_SORT_CRITERIA_TIP                                           :{BLACK}Odaberit
 STR_SORT_BY                                                     :{BLACK}Sortiraj po

 STR_SORT_BY_POPULATION                                          :{BLACK}Naseljenost
-STR_SORT_BY_PRODUCTION                                          :Proizvodnja
-STR_SORT_BY_TYPE                                                :Vrsta
+STR_SORT_BY_PRODUCTION                                          :Proizvodnji
+STR_SORT_BY_TYPE                                                :Vrsti
 STR_SORT_BY_TRANSPORTED                                         :Transportovano
 STR_SORT_BY_NAME                                                :{BLACK}Ime
-STR_SORT_BY_DROPDOWN_NAME                                       :Ime
-STR_SORT_BY_DATE                                                :{BLACK}Datum
-STR_SORT_BY_NUMBER                                              :Broj
-STR_SORT_BY_PROFIT_LAST_YEAR                                    :Zarada prošle godine
-STR_SORT_BY_PROFIT_THIS_YEAR                                    :Zarada ove godine
-STR_SORT_BY_AGE                                                 :Starost
-STR_SORT_BY_RELIABILITY                                         :Pouzdanost
-STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Ukupna nosivost po vrsti tovara
+STR_SORT_BY_DROPDOWN_NAME                                       :Imenu
+STR_SORT_BY_DATE                                                :{BLACK}Datumu
+STR_SORT_BY_NUMBER                                              :Broju
+STR_SORT_BY_PROFIT_LAST_YEAR                                    :Zaradi prošle godine
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :Zaradi ove godine
+STR_SORT_BY_AGE                                                 :Starosti
+STR_SORT_BY_RELIABILITY                                         :Pouzdanosti
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Ukupnoj nosivosti po vrsti tovara
 STR_SORT_BY_MAX_SPEED                                           :Nejvećoj brzini
-STR_SORT_BY_MODEL                                               :Model
-STR_SORT_BY_VALUE                                               :Vrednost
-STR_SORT_BY_LENGTH                                              :Dužina
-STR_SORT_BY_LIFE_TIME                                           :Preostao životni vek
-STR_SORT_BY_FACILITY                                            :Vrsta stanice
-STR_SORT_BY_WAITING                                             :Vrednost tovara na čekanju
+STR_SORT_BY_MODEL                                               :Modelu
+STR_SORT_BY_VALUE                                               :Vrednosti
+STR_SORT_BY_LENGTH                                              :Dužini
+STR_SORT_BY_LIFE_TIME                                           :Preostalom životnom veku
+STR_SORT_BY_FACILITY                                            :Vrsti stanice
+STR_SORT_BY_WAITING                                             :Vrednosti tovara na čekanju
 STR_SORT_BY_RATING_MAX                                          :Kvalitet usluge
 STR_ENGINE_SORT_ENGINE_ID                                       :ID mašine (standardno)
 STR_ENGINE_SORT_COST                                            :Cena
@@ -794,7 +827,7 @@ STR_0299_SAVE_SCENARIO                                          :{WHITE}Sačuvaj
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Igraj scenario
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Igra Visina
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Start jedan nov igra , pomoću jedan visina ace krajolik
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Biti te siguran te oskudica za slobodan današji scenarij?
+STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Da li ste sigurni da želite da izađete iz ovog scenarija?
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...dozvoljeno izgraditi samo u naseljima sa populacijom od najmanje 1200
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Pomeranje datuma početka za jednu godinu unazad
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Pomeranje datuma početka za jednu godinu unapred
@@ -1314,8 +1347,8 @@ STR_SUB_TROPICAL_LANDSCAPE                                      :Suptropski klim
 STR_TOYLAND_LANDSCAPE                                           :Zemlja igračaka

 STR_CHEATS                                                      :{WHITE}Varanja
-STR_CHEATS_TIP                                                  :{BLACK}Štiklirano polje označava da ste i renije koristili ovu opciju
-STR_CHEATS_WARNING                                              :{BLACK}Upozorenje! Upravo ćete revariti vaše saradnike. Imajte na umu da će takav loš postupak biti trajno upamćen.
+STR_CHEATS_TIP                                                  :{BLACK}Štiklirano polje označava da ste i ranije koristili ovu opciju
+STR_CHEATS_WARNING                                              :{BLACK}Upozorenje! Upravo ćete prevariti vaše saradnike. Imajte na umu da će takav loš postupak biti trajno upamćen.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Dodati još {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Upravljanje kompanijom: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magični buldožer (uklonite industrije, nepokretnosti): {ORANGE}{STRING}
@@ -1907,14 +1940,14 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Izgradnja statu
 STR_204B_FUND_NEW_BUILDINGS                                     :Finansiranje novih zgrada
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Kupovina ekskluzivnih prava na transport
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Podmićivanje lokalne vlasti
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Ulaganje u manju reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{}  Trošak: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Ulaganje u reklamnu kampanju srednjeg budžeta će doneti kompaniji više putnika i robe iz ovog naselja.{}  Trošak: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Ulaganje u veliku reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{}  Trošak: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Finansiranje rekonstrukcije lokalne mreže puteva. Može prouzrokovati kolaps u drumskom saobraćaju u trajanju do 6 meseci.{}  Trošak: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Ulaganje u malu reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Ulaganje u reklamnu kampanju srednje veličine će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Ulaganje u veliku reklamnu kampanju će doneti kompaniji više putnika i robe iz ovog naselja.{} Trošak: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Finansiranje rekonstrukcije lokalne mreže puteva. Može prouzrokovati kolaps u drumskom saobraćaju u trajanju do 6 meseci.{} Trošak: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Otkrivanje spomenika kompanije.{} Trošak: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finansiranje izgradnje novih komercijalnih objekata u naselju.{} Trošak: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kupovina ekskluzivnih transportnih prava od lokalne vlasti, osigurava da će lokalni korisnici transporta koristiti isključivo usluge kompanije. Prava ističu nakon godinu dana.{} Trošak: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Krumpiranje lokalne vlasti kako bi porastao rejting vaše kompanije, uz rizik velike štete ukoliko se otkrije.{}  Cena: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kupovina ekskluzivnih transportnih prava od lokalne vlasti na godinu dana, osigurava da će lokalni korisnici transporta koristiti isključivo usluge vaše kompanije.{} Trošak: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Davanje mita lokalnoj vlasti kako bi porastao rejting vaše kompanije, uz rizik velike štete ukoliko se otkrije.{} Cena: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}{TOWN} - haos na ulicama!{}{}Program rekonstrukcije puteva sponzorisan od strane kompanije {STRING} donosi vozačima 6 meseci agonije!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -2578,6 +2611,7 @@ STR_8050_TOY_VAN                                                :Vagon za Igrač
 STR_8051_BATTERY_TRUCK                                          :Vagon za Baterije
 STR_8052_FIZZY_DRINK_TRUCK                                      :Vagon za Bezalkoholna Pića
 STR_8053_PLASTIC_TRUCK                                          :Vagon za Plastiku
+STR_8054_LEV1_LEVIATHAN_ELECTRIC                                :Lev1 'Leviathan' (Electric)
 STR_8059_PASSENGER_CAR                                          :Putnička Kola
 STR_805A_MAIL_VAN                                               :Poštanski Vagon
 STR_805B_COAL_CAR                                               :Vagon za Ugalj
@@ -3146,10 +3180,10 @@ STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Promena
 ############ End of list of rail types


-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK}   Snaga: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK} Snaga: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Brzina: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cena odrzavanja: {GOLD}{CURRENCY}/yr
-STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Tezina: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Težina: {GOLD}{WEIGHT_S} ({WEIGHT_S})

 ########### For showing numbers in widgets

--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -11,7 +11,7 @@
 STR_NULL                                                        :
 STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}超过地图边界
 STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}距离地图边界过近
-STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}没有足够的资金 - 需要 {CURRENCY}
+STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}资金不足 - 需要 {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY}
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}需要平坦的地面
@@ -32,7 +32,7 @@ STR_0015_GRAIN                                                  :谷物
 STR_0016_WOOD                                                   :木材
 STR_0017_IRON_ORE                                               :铁矿石
 STR_0018_STEEL                                                  :钢材
-STR_0019_VALUABLES                                              :金块
+STR_0019_VALUABLES                                              :贵重品
 STR_001A_COPPER_ORE                                             :铜矿石
 STR_001B_MAIZE                                                  :玉米
 STR_001C_FRUIT                                                  :水果
@@ -87,35 +87,35 @@ STR_004C_PLASTIC                                                :塑料
 STR_004D_FIZZY_DRINK                                            :跳跳水
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA} 位旅客
-STR_QUANTITY_COAL                                               :{WEIGHT}煤炭
+STR_QUANTITY_COAL                                               :{WEIGHT} 煤炭
 STR_QUANTITY_MAIL                                               :{COMMA} 包邮件
-STR_QUANTITY_OIL                                                :{VOLUME}原油
+STR_QUANTITY_OIL                                                :{VOLUME} 原油
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} 头牲畜
 STR_QUANTITY_GOODS                                              :{COMMA} 件货物
-STR_QUANTITY_GRAIN                                              :{WEIGHT}谷物
-STR_QUANTITY_WOOD                                               :{WEIGHT}木材
-STR_QUANTITY_IRON_ORE                                           :{WEIGHT}铁矿石
-STR_QUANTITY_STEEL                                              :{WEIGHT}钢材
-STR_QUANTITY_VALUABLES                                          :{COMMA} 包金块
-STR_QUANTITY_COPPER_ORE                                         :{WEIGHT}铜矿石
-STR_QUANTITY_MAIZE                                              :{WEIGHT}玉米
-STR_QUANTITY_FRUIT                                              :{WEIGHT}水果
+STR_QUANTITY_GRAIN                                              :{WEIGHT} 谷物
+STR_QUANTITY_WOOD                                               :{WEIGHT} 木材
+STR_QUANTITY_IRON_ORE                                           :{WEIGHT} 铁矿石
+STR_QUANTITY_STEEL                                              :{WEIGHT} 钢材
+STR_QUANTITY_VALUABLES                                          :{COMMA} 包贵重品
+STR_QUANTITY_COPPER_ORE                                         :{WEIGHT} 铜矿石
+STR_QUANTITY_MAIZE                                              :{WEIGHT} 玉米
+STR_QUANTITY_FRUIT                                              :{WEIGHT} 水果
 STR_QUANTITY_DIAMONDS                                           :{COMMA} 包钻石
-STR_QUANTITY_FOOD                                               :{WEIGHT}食品
-STR_QUANTITY_PAPER                                              :{WEIGHT}纸张
+STR_QUANTITY_FOOD                                               :{WEIGHT} 食品
+STR_QUANTITY_PAPER                                              :{WEIGHT} 纸张
 STR_QUANTITY_GOLD                                               :{COMMA} 包黄金
-STR_QUANTITY_WATER                                              :{VOLUME}饮用水
-STR_QUANTITY_WHEAT                                              :{WEIGHT}小麦
-STR_QUANTITY_RUBBER                                             :{VOLUME}橡胶
-STR_QUANTITY_SUGAR                                              :{WEIGHT}蔗糖
+STR_QUANTITY_WATER                                              :{VOLUME} 饮用水
+STR_QUANTITY_WHEAT                                              :{WEIGHT} 小麦
+STR_QUANTITY_RUBBER                                             :{VOLUME} 橡胶
+STR_QUANTITY_SUGAR                                              :{WEIGHT} 蔗糖
 STR_QUANTITY_TOYS                                               :{COMMA} 件玩具
 STR_QUANTITY_SWEETS                                             :{COMMA} 包糖果
-STR_QUANTITY_COLA                                               :{VOLUME}可乐
-STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT}棉花糖
+STR_QUANTITY_COLA                                               :{VOLUME} 可乐
+STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} 棉花糖
 STR_QUANTITY_BUBBLES                                            :{COMMA} 个泡泡
-STR_QUANTITY_TOFFEE                                             :{WEIGHT}太妃糖
+STR_QUANTITY_TOFFEE                                             :{WEIGHT} 太妃糖
 STR_QUANTITY_BATTERIES                                          :{COMMA} 箱电池
-STR_QUANTITY_PLASTIC                                            :{VOLUME}塑料
+STR_QUANTITY_PLASTIC                                            :{VOLUME} 塑料
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} 瓶跳跳水
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}客
@@ -128,7 +128,7 @@ STR_ABBREV_GRAIN                                                :{TINYFONT}谷
 STR_ABBREV_WOOD                                                 :{TINYFONT}木
 STR_ABBREV_IRON_ORE                                             :{TINYFONT}铁
 STR_ABBREV_STEEL                                                :{TINYFONT}钢
-STR_ABBREV_VALUABLES                                            :{TINYFONT}金
+STR_ABBREV_VALUABLES                                            :{TINYFONT}贵
 STR_ABBREV_COPPER_ORE                                           :{TINYFONT}铜
 STR_ABBREV_MAIZE                                                :{TINYFONT}黍
 STR_ABBREV_FRUIT                                                :{TINYFONT}果
@@ -177,22 +177,22 @@ STR_00CE_4                                                      :{BLACK}4
 STR_00CF_5                                                      :{BLACK}5
 STR_00D0_NOTHING                                                :无
 STR_00D1_DARK_BLUE                                              :深蓝色
-STR_00D2_PALE_GREEN                                             :粉绿色
+STR_00D2_PALE_GREEN                                             :浅绿色
 STR_00D3_PINK                                                   :粉红色
 STR_00D4_YELLOW                                                 :明黄色
-STR_00D5_RED                                                    :红  色
+STR_00D5_RED                                                    :红　色
 STR_00D6_LIGHT_BLUE                                             :淡蓝色
-STR_00D7_GREEN                                                  :绿  色
+STR_00D7_GREEN                                                  :绿　色
 STR_00D8_DARK_GREEN                                             :深绿色
-STR_00D9_BLUE                                                   :蓝  色
+STR_00D9_BLUE                                                   :蓝　色
 STR_00DA_CREAM                                                  :奶油色
 STR_00DB_MAUVE                                                  :深紫色
-STR_00DC_PURPLE                                                 :紫  色
+STR_00DC_PURPLE                                                 :紫　色
 STR_00DD_ORANGE                                                 :橘黄色
-STR_00DE_BROWN                                                  :棕  色
+STR_00DE_BROWN                                                  :棕　色
 STR_00DF_GREY                                                   :浅灰色
-STR_00E0_WHITE                                                  :白  色
-STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}游戏中的车辆太多了
+STR_00E0_WHITE                                                  :白　色
+STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}游戏中的车辆过多
 STR_00E2                                                        :{BLACK}{COMMA}
 STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}定位
@@ -201,7 +201,7 @@ STR_00E6_VEHICLES                                               :车辆
 STR_00E7_INDUSTRIES                                             :工业
 STR_00E8_ROUTES                                                 :路线
 STR_00E9_VEGETATION                                             :植被
-STR_00EA_OWNERS                                                 :公司所属
+STR_00EA_OWNERS                                                 :所有者
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}公路
 STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}铁路
 STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}车站/机场/码头
@@ -259,7 +259,7 @@ STR_013E_CAPACITIES                                             :{BLACK}运载
 STR_TOTAL_CARGO                                                 :{BLACK}全部货物
 STR_013F_CAPACITY                                               :{BLACK}装载能力：{LTBLUE}{CARGO}{STRING}
 STR_CAPACITY_MULT                                               :{BLACK}装载能力：{LTBLUE}{CARGO}{STRING} (x{NUM})
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}全车的运载量为：
+STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}全车的装载能力为：
 STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}新游戏
@@ -297,7 +297,7 @@ STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA} 立方
 STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} 升
 STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} 立方米

-STR_UNITS_FORCE_SI                                              :{COMMA} 千牛顿
+STR_UNITS_FORCE_SI                                              :{COMMA} 千牛

 ############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :利润图表
@@ -317,7 +317,7 @@ STR_015E_QUIT_GAME                                              :放弃游戏
 STR_015F_QUIT                                                   :退出
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}你确定要放弃当前的游戏吗？
 STR_0161_QUIT_GAME                                              :{WHITE}放弃游戏
-STR_SORT_ORDER_TIP                                              :{BLACK}选择排序方法 (降序/升序)
+STR_SORT_ORDER_TIP                                              :{BLACK}选择排序方法 （降序/升序）
 STR_SORT_CRITERIA_TIP                                           :{BLACK}选择排序标准
 STR_SORT_BY                                                     :{BLACK}排序

@@ -342,7 +342,7 @@ STR_SORT_BY_LIFE_TIME                                           :剩余寿命年
 STR_SORT_BY_FACILITY                                            :车站类型
 STR_SORT_BY_WAITING                                             :等待的货物数量
 STR_SORT_BY_RATING_MAX                                          :货物评价
-STR_ENGINE_SORT_ENGINE_ID                                       :引擎ID (默认方式)
+STR_ENGINE_SORT_ENGINE_ID                                       :引擎ID （默认方式）
 STR_ENGINE_SORT_COST                                            :售价
 STR_ENGINE_SORT_POWER                                           :功率
 STR_ENGINE_SORT_INTRO_DATE                                      :设计日期
@@ -385,15 +385,15 @@ STR_016E                                                        :{TINYFONT}{STRI
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
 STR_0171_PAUSE_GAME                                             :{BLACK}暂停游戏
-STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}保存游戏、放弃游戏等
+STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}保存游戏、放弃游戏、退出
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}显示公司所有的车站列表
-STR_0174_DISPLAY_MAP                                            :{BLACK}显示地图
-STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}显示地图和城镇列表等
+STR_0174_DISPLAY_MAP                                            :{BLACK}显示地图、附加视点或标志列表
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}显示地图和城镇列表
 STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}显示城镇列表
 STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}显示公司财务状况
 STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}显示公司综合信息
 STR_0179_DISPLAY_GRAPHS                                         :{BLACK}显示图表
-STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}显示公司评价表
+STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}显示公司名次表
 STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}显示公司的火车列表
 STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}显示公司的汽车列表
 STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}显示公司的船只列表
@@ -412,20 +412,20 @@ STR_0189                                                        :{BLACK}{SMALLDO
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}不能改变保养周期……
 STR_018B_CLOSE_WINDOW                                           :{BLACK}关闭窗口
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}窗口标题 - 拖动这里可以移动该窗口
-STR_STICKY_BUTTON                                               :{BLACK} 锁定窗口  当使用‘关闭所有窗口’{}快捷键(Del)时会保留锁定的窗口
-STR_RESIZE_BUTTON                                               :{BLACK}点击并拖动这里可以放缩窗口
+STR_STICKY_BUTTON                                               :{BLACK}锁定窗口 使用“关闭所有窗口”快捷键时保留此窗口
+STR_RESIZE_BUTTON                                               :{BLACK}点击并拖动这里可以缩放窗口
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}点击这里返回默认的游戏存档目录
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}拆除地块上的建筑物等设施
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}降低地块的一角
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}升高地块的一角
-STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}滚动条 - 可让列表上下滚动
-STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}滚动条 - 可让列表左右滚动
-STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}显示地形海拔高度
+STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}滚动条 - 上下滚动列表
+STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}滚动条 - 左右滚动列表
+STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}在地图上显示等高线
 STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}在地图上显示车辆
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}在地图上显示工业
 STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}在地图上显示运输路线
 STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}在地图上显示植被分布
-STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}显示各公司所属
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}在地图上显示各公司所属
 STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}切换是否显示城镇名称
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}今年利润：{CURRENCY} (去年利润：{CURRENCY})

@@ -836,7 +836,7 @@ STR_OPTIONS_LANG_TIP                                            :{BLACK}选择

 STR_OPTIONS_FULLSCREEN                                          :{BLACK}全屏幕
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}选择此项可以在全屏幕模式下进行 OpenTTD 游戏
-STR_FULLSCREEN_FAILED                                           :{WHITE}无法切换到全屏模式
+STR_FULLSCREEN_FAILED                                           :{WHITE}无法切换到全屏模式{}尝试使用不同的分辨率

 STR_OPTIONS_RES                                                 :{BLACK}屏幕分辨率
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -998,7 +998,7 @@ STR_CONFIG_SETTING_LIVERIES                                     :{LTBLUE}显示
 STR_CONFIG_SETTING_LIVERIES_NONE                                :不显示
 STR_CONFIG_SETTING_LIVERIES_OWN                                 :本公司
 STR_CONFIG_SETTING_LIVERIES_ALL                                 :所有公司
-STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}按下<ENTER> 时默认与团队交谈：{ORANGE}{STRING}
+STR_CONFIG_SETTING_PREFER_TEAMCHAT                              :{LTBLUE}使用<ENTER>与团队交谈：{ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING                        :{LTBLUE}鼠标滚轮的作用：{ORANGE}{STRING}
 STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM                             :缩放地图
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :滚动地图
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -1355,7 +1355,7 @@ STR_NETWORK_ENTER_IP                                            :{BLACK}Zadajte

 STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
 STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienti
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienti online / klienti max
+STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientov online / klientov max{}Spoločností online / spoločností max

 STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
 STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Velkost mapy
@@ -1368,11 +1368,11 @@ STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Roky
 STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Pocet rokov,{}kolko hra beží

 STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HRE
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Prostredie:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Velkost mapy:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzia servera:  {WHITE}{STRING}
+STR_NETWORK_CLIENTS                                             :{SILVER}Klientov: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk: {WHITE}{STRING}
+STR_NETWORK_TILESET                                             :{SILVER}Prostredie: {WHITE}{STRING}
+STR_NETWORK_MAP_SIZE                                            :{SILVER}Velkost mapy: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzia servera: {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa servera:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Datum zaciatku:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aktualny datum:  {WHITE}{DATE_SHORT}
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -444,6 +444,7 @@ STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{VEHICLE
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}土地資訊
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}整地花費：{LTBLUE}不適用
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}整地花費：{RED}{CURRENCY}
+STR_REVENUE_WHEN_CLEARED                                        :{BLACK}清除時確認收入： {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :不適用
 STR_01A7_OWNER                                                  :{BLACK}所有人：{LTBLUE}{STRING}
 STR_ROAD_OWNER                                                  :{BLACK}道路所有者：{LTBLUE}{STRING}
@@ -2814,6 +2815,8 @@ STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}無法
 STR_8867_NAME_TRAIN                                             :{BLACK}為列車命名
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}列車事故！{}衝撞後 {COMMA} 人死在火球下
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}無法倒轉列車方向...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}無法調轉車輛方向...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}無法迴轉由多節車廂組成的車輛
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}重新命名列車類型
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}無法修改列車類型名稱...
 STR_CLEAR_TIME                                                  :{BLACK}清除時刻表
@@ -2901,7 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}市民慶賀 . . .{}首輛載貨電車抵達 {STATION}！
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}車禍！{}駕駛在與列車對撞後罹難
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}車禍！{}車輛在與列車對撞後，造成 {COMMA} 人罹難
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}無法迴轉由多節車廂組成的車輛
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}無法讓車輛轉向...
 STR_9034_RENAME                                                 :{BLACK}更名
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}為車輛類型更名
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}為車輛類型更名
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -2977,6 +2977,8 @@ STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Немо
 STR_8867_NAME_TRAIN                                             :{BLACK}Назвати поїзд
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Аварія!{}Поїзди зіткнулися.{}{COMMA} загинуло.
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Неможливо розвернути поїзд...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Не можна розвернути поїзд...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Неможливо розвернути довгий транспорт
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Перейменувати тип поїзду
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Неможливо перейменувати тип поїзду...
 STR_CLEAR_TIME                                                  :{BLACK}Очистити час
@@ -3064,7 +3066,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Жителі святкують . . .{}Перший вантажний трамвай прибув на {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Аварія!{}Водій загинув при зіткненні авто з поїздом
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Аварія!{}{COMMA} загинуло при зіткненні авто з поїздом
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Неможливо розвернути довгий транспорт
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Неможливо розвернути машину...
 STR_9034_RENAME                                                 :{BLACK}Зміна назви
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Перейменувати тип авто
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Перейменувати тип авто
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -1689,8 +1689,6 @@ STR_AI_VERSION                                                  :version:



-STR_AI_AUTHOR                                                   :نویسنده:
-STR_AI_VERSION                                                  :version:
 STR_CONTENT_INTRO_BUTTON_TIP                                    :{BLACK}بررسی وجود مجموعه ها و به روز رسانی های جدید در اینترنت
 STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}یافتن مجموعه ای که کم است در اینترنت
 STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK} بررسی اینکه آیا مجموعه ای که کم است در اینترنت یافت می شود یا نه
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -2815,6 +2815,8 @@ STR_8866_CAN_T_NAME_TRAIN                                       :{WHITE}Methu en
 STR_8867_NAME_TRAIN                                             :{BLACK}Enwi trên
 STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Trên wedi crashio!{}Bu {COMMA} farw yn y ddamwain
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Methu gwrthdroi cyfeiriad  trên...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}ddim yn medru reversio'r cerbyd...
+STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Ailenwi math y cerbyd trên
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Methu ailenwi math y cerbyd trên...
 STR_CLEAR_TIME                                                  :{BLACK}Clirio Amser
@@ -2902,7 +2904,7 @@ STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM                     :{BLACK}{BIGFONT
 STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM                         :{BLACK}{BIGFONT}Mae'r trigolion yn dathlu . . .{} Mae'r tram nwyddau cyntaf wedi cyrraedd {STATION}!
 STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu gyrrwr farw mewn damwain â thrên
 STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Damwain Cerbyd Ffordd!{}Bu farw {COMMA} mewn damwain â thrên
-STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
+STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}ddim yn methu troi'r cerbyd...
 STR_9034_RENAME                                                 :{BLACK}Ailenwi
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Ailenwi'r math cerbyd ffordd
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Ailenwi'r math cerbyd ffordd
@@ -3172,6 +3174,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Mae gan

 STR_NEWGRF_BUGGY                                                :{WHITE}Mae NewGRF '{0:STRING}' yn darparu gwybodaeth anghywir.
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Mae'r wybodaeth cargo/ailffitio ar gyfer '{1:ENGINE}' yn wahanol i'r rhestr brynu wedi'r adeiladu. Gall hyn beri i awtoadnewyddy/-ddisodli fethu ag ailfitio'n gywir.
+STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' creu lwp anorffen yn y production callback.
 STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb dram. Cafodd y tramiau eu dileu.

 STR_CURRENCY_WINDOW                                             :{WHITE}Arian cyfaddas
--- a/src/ottdres.rc.in
+++ b/src/ottdres.rc.in
@@ -64,8 +64,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,0,!!REVISION!!
- PRODUCTVERSION 0,7,0,!!REVISION!!
+ FILEVERSION 0,7,2,17010
+ PRODUCTVERSION 0,7,2,17010
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -83,14 +83,14 @@ BEGIN
            VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
            VALUE "CompanyName", "OpenTTD Development Team\0"
            VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "Development !!VERSION!!\0"
+            VALUE "FileVersion", "0.7.2\0"
            VALUE "InternalName", "openttd\0"
            VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2009. All Rights Reserved.\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "openttd.exe\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "OpenTTD\0"
-            VALUE "ProductVersion", "Development !!VERSION!!\0"
+            VALUE "ProductVersion", "0.7.2\0"
            VALUE "SpecialBuild", "-\0"
        END
    END
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -20,7 +20,7 @@
 * norev000 is for non-releases that are made on systems without
 * subversion or sources that are not a checkout of subversion.
 */
-const char _openttd_revision[] = "!!VERSION!!";
+const char _openttd_revision[] = "0.7.2";

 /**
 * Let us know if current build was modified. This detection
@@ -45,11 +45,11 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
 * final release will always have a lower version number than the released
 * version, thus making comparisions on specific revisions easy.
 */
-const uint32 _openttd_newgrf_version = 0 << 28 | 7 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 0 << 28 | 7 << 24 | 2 << 20 | 1 << 19 | (17010 & ((1 << 19) - 1));

 #ifdef __MORPHOS__
 /**
 * Variable used by MorphOS to show the version.
 */
-extern const char morphos_versions_tag[] = "$VER: OpenTTD !!VERSION!! (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]";
+extern const char morphos_versions_tag[] = "$VER: OpenTTD 0.7.2 (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]";
 #endif
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -416,6 +416,9 @@ bool AfterLoadGame()
 		}
 	}

+	/* Update all waypoints */
+	if (CheckSavegameVersion(12)) FixOldWaypoints();
+
 	if (CheckSavegameVersion(84)) {
 		FOR_ALL_COMPANIES(c) {
 			c->name = CopyFromOldName(c->name_1);
@@ -440,7 +443,7 @@ bool AfterLoadGame()
 		Waypoint *wp;
 		FOR_ALL_WAYPOINTS(wp) {
 			wp->name = CopyFromOldName(wp->string);
-			wp->string = STR_EMPTY;
+			wp->string = STR_NULL;
 		}
 	}

@@ -518,9 +521,6 @@ bool AfterLoadGame()
 		}
 	}

-	/* Update all waypoints */
-	if (CheckSavegameVersion(12)) FixOldWaypoints();
-
 	/* make sure there is a town in the game */
 	if (_game_mode == GM_NORMAL && !ClosestTownFromTile(0, UINT_MAX)) {
 		SetSaveLoadError(STR_NO_TOWN_IN_SCENARIO);
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -45,8 +45,8 @@ void FixOldWaypoints()
 	FOR_ALL_WAYPOINTS(wp) {
 		wp->town_index = ClosestTownFromTile(wp->xy, UINT_MAX)->index;
 		wp->town_cn = 0;
-		if (wp->string & 0xC000) {
-			wp->town_cn = wp->string & 0x3F;
+		if ((wp->string & 0xC000) == 0xC000) {
+			wp->town_cn = (wp->string >> 8) & 0x3F;
 			wp->string = STR_NULL;
 		}
 	}
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -1557,6 +1557,10 @@ static void MarkTrainAsStuck(Vehicle *v)
 	if (!HasBit(v->u.rail.flags, VRF_TRAIN_STUCK)) {
 		/* It is the first time the problem occured, set the "train stuck" flag. */
 		SetBit(v->u.rail.flags, VRF_TRAIN_STUCK);
+
+		/* When loading the vehicle is already stopped. No need to change that. */
+		if (v->current_order.IsType(OT_LOADING)) return;
+
 		v->load_unload_time_rem = 0;

 		/* Stop train */
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -535,6 +535,8 @@ void Vehicle::PreDestructor()
 		GetStation(this->last_station_visited)->loading_vehicles.remove(this);

 		HideFillingPercent(&this->fill_percent_te_id);
+
+		delete this->cargo_payment;
 	}

 	if (IsEngineCountable(this)) {
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -407,7 +407,7 @@ struct RefitWindow : public Window {
 static const Widget _vehicle_refit_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_00C5,                            STR_018B_CLOSE_WINDOW},
 	{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   239,     0,    13, STR_983B_REFIT,                      STR_018C_WINDOW_TITLE_DRAG_THIS},
-	{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   239,    14,    27, STR_983F_SELECT_CARGO_TYPE_TO_CARRY, NULL},
+	{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   239,    14,    27, STR_983F_SELECT_CARGO_TYPE_TO_CARRY, STR_NULL},

 	{     WWT_MATRIX, RESIZE_BOTTOM,  COLOUR_GREY,     0,   227,    28,   139, 0x801,                               STR_EMPTY},
 	{  WWT_SCROLLBAR, RESIZE_BOTTOM,  COLOUR_GREY,   228,   239,    28,   139, 0x0,                                 STR_0190_SCROLL_BAR_SCROLLS_LIST},
@@ -1882,7 +1882,7 @@ struct VehicleViewWindow : Window {
 			} else { // no train
 				str = STR_8861_STOPPED;
 			}
-		} else if (v->type == VEH_TRAIN && HasBit(v->u.rail.flags, VRF_TRAIN_STUCK)) {
+		} else if (v->type == VEH_TRAIN && HasBit(v->u.rail.flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) {
 			str = STR_TRAIN_STUCK;
 		} else { // vehicle is in a "normal" state, show current order
 			switch (v->current_order.GetType()) {
Author	SHA1	Message	Date
rubidium	5a5c02f55d	(svn r17010) -Release: 0.7.2	2009-07-31 22:29:54 +00:00
rubidium	f39f14aceb	(svn r17009) [0.7] -Backport from trunk/prepare for release: - Fix: Vehicles would wait "very long" when they had nothing to unload and gradual loading was disabled [FS#3054] (r16933)	2009-07-31 22:23:19 +00:00
rubidium	a86469d6bc	(svn r16904) [0.7] -Backport language updates	2009-07-21 18:28:34 +00:00
rubidium	d567f99ecf	(svn r16902) [0.7] -Backport from trunk: - Fix: When marking trains stuck do not reset the unload/stuck counter when the vehicle is unloading. It will be automatically reset once the vehicle wants to leave the station [FS#3046] (r16901) - Fix: [NoAI]: Small errors in the API documentation [FS#3037] (r16865) - Fix: Savegames from before 0.4 would get their waypoint 'index' messed up (r16854) - Fix: Cargo payments were not destroyed when a vehicle was destructed. This only happened when you crashed a vehicle while it was unloading [FS#3032, FS#3046] (r16801)	2009-07-21 17:17:20 +00:00