(svn r9383) -Release 0.5.1-RC1.

2025-08-26 16:09:10 +00:00 · 2007-03-20 21:25:34 +00:00
143 changed files with 5700 additions and 7362 deletions
--- a/63
+++ b/63
@@ -268,7 +268,7 @@ ENDIAN_CHECK=endian_check$(EXE)
 STRGEN=strgen/strgen$(EXE)
 OSXAPP="OpenTTD.app"

-REV := 0.5.3
+REV := 0.5.1-RC1

 # define flag to use for -lrt (some OSes overwrites this later for compatibility)
 ifndef LRT
@@ -836,12 +836,8 @@ ifdef WIN32
  SRCS += sound/win32_s.c
  SRCS += video/win32_v.c
 else
-  ifdef OS2
-    SRCS += os2.c
-  else
-    SRCS += unix.c
-    SRCS += music/extmidi.c
-  endif
+  SRCS += unix.c
+  SRCS += music/extmidi.c
 endif

 ifdef OSX
@@ -946,31 +942,36 @@ lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt
 ifdef MORPHOS

 release: all
-	$(Q)rm -fr "/t/openttd-$(REV)-morphos.lha"
+	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha"
 	$(Q)mkdir -p "/t/"
-	$(Q)mkdir -p "/t/openttd-$(REV)-morphos"
-	$(Q)mkdir -p "/t/openttd-$(REV)-morphos/docs"
-	$(Q)mkdir -p "/t/openttd-$(REV)-morphos/data"
-	$(Q)mkdir -p "/t/openttd-$(REV)-morphos/lang"
-	$(Q)mkdir -p "/t/openttd-$(REV)-morphos/scenario"
-	$(Q)mkdir -p "/t/openttd-$(REV)-morphos/scenario/heightmap"
-	$(Q)cp -R $(TTD)                      "/t/openttd-$(REV)-morphos/"
-	$(Q)cp data/*                         "/t/openttd-$(REV)-morphos/data/"
-	$(Q)cp lang/*.lng                     "/t/openttd-$(REV)-morphos/lang/"
-	$(Q)-cp scenario/*.scn                "/t/openttd-$(REV)-morphos/scenario/"
-	$(Q)-cp scenario/heightmap/*          "/t/openttd-$(REV)-morphos/scenario/heightmap/"
-	$(Q)cp readme.txt                     "/t/openttd-$(REV)-morphos/docs/ReadMe"
-	$(Q)cp COPYING                        "/t/openttd-$(REV)-morphos/docs/"
-	$(Q)cp changelog.txt                  "/t/openttd-$(REV)-morphos/docs/ChangeLog"
-	$(Q)cp known-bugs.txt                 "/t/openttd-$(REV)-morphos/docs/known-bugs.txt"
-	$(Q)cp os/morphos/icons/openttd.info  "/t/openttd-$(REV)-morphos/$(TTD).info"
-	$(Q)cp os/morphos/icons/docs.info     "/t/openttd-$(REV)-morphos/docs.info"
-	$(Q)cp os/morphos/icons/drawer.info   "/t/openttd-$(REV)-morphos.info"
-	$(Q)strip --strip-all --strip-unneeded --remove-section .comment "/t/openttd-$(REV)-morphos/$(TTD)"
-	$(Q)lha a -r "t:openttd-$(REV)-morphos.lha" "t:openttd-$(REV)-morphos"
-	$(Q)lha a    "t:openttd-$(REV)-morphos.lha" "t:openttd-$(REV)-morphos.info"
-	$(Q)rm -fr "/t/openttd-$(REV)-morphos"
-	$(Q)rm -fr "/t/openttd-$(REV)-morphos.info"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/docs"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/data"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/lang"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario/heightmap"
+	$(Q)cp -R $(TTD)                      "/t/openttd-$(RELEASE)-morphos/"
+	$(Q)cp data/*                         "/t/openttd-$(RELEASE)-morphos/data/"
+	$(Q)cp lang/*.lng                     "/t/openttd-$(RELEASE)-morphos/lang/"
+	$(Q)-cp scenario/*.scn                "/t/openttd-$(RELEASE)-morphos/scenario/"
+	$(Q)-cp scenario/heightmap/*          "/t/openttd-$(RELEASE)-morphos/scenario/heightmap/"
+	$(Q)cp readme.txt                     "/t/openttd-$(RELEASE)-morphos/docs/ReadMe"
+	$(Q)cp docs/console.txt               "/t/openttd-$(RELEASE)-morphos/docs/Console"
+	$(Q)cp COPYING                        "/t/openttd-$(RELEASE)-morphos/docs/"
+	$(Q)cp changelog.txt                  "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog"
+	$(Q)cp known-bugs.txt                 "/t/openttd-$(RELEASE)-morphos/docs/known-bugs.txt"
+	$(Q)cp os/morphos/icons/openttd.info  "/t/openttd-$(RELEASE)-morphos/$(TTD).info"
+	$(Q)cp os/morphos/icons/docs.info     "/t/openttd-$(RELEASE)-morphos/docs.info"
+	$(Q)cp os/morphos/icons/drawer.info   "/t/openttd-$(RELEASE)-morphos.info"
+	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/ReadMe.info"
+	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/Console.info"
+	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/COPYING.info"
+	$(Q)cp os/morphos/icons/document.info "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog.info"
+	$(Q)strip --strip-all --strip-unneeded --remove-section .comment "/t/openttd-$(RELEASE)-morphos/$(TTD)"
+	$(Q)lha a -r "t:openttd-$(RELEASE)-morphos.lha" "t:openttd-$(RELEASE)-morphos"
+	$(Q)lha a    "t:openttd-$(RELEASE)-morphos.lha" "t:openttd-$(RELEASE)-morphos.info"
+	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos"
+	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.info"
 	@echo "Release archive can be found in RAM:t/ now."

 .PHONY: release
--- a/ai/ai.c
+++ b/ai/ai.c
@@ -105,6 +105,7 @@ int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint pr

 	/* If we did a DC_EXEC, and the command did not return an error, execute it
 	 * over the network */
+	if (flags & DC_AUTO)     procc |= CMD_AUTO;
 	if (flags & DC_NO_WATER) procc |= CMD_NO_WATER;

 	/* NetworkSend_Command needs _local_player to be set correctly, so
--- a/ai/default/default.c
+++ b/ai/default/default.c
@@ -239,6 +239,14 @@ static int32 AiGetBasePrice(const Player* p)
 	return base;
 }

+#if 0
+static EngineID AiChooseShipToBuild(byte cargo, int32 money)
+{
+	// XXX: not done
+	return INVALID_ENGINE;
+}
+#endif
+
 static EngineID AiChooseRoadVehToReplaceWith(const Player* p, const Vehicle* v)
 {
 	int32 avail_money = p->player_money + v->value;
@@ -269,7 +277,9 @@ static EngineID AiChooseTrainToReplaceWith(const Player* p, const Vehicle* v)

 static EngineID AiChooseShipToReplaceWith(const Player* p, const Vehicle* v)
 {
-	/* Ships are not implemented in this (broken) AI */
+	error("!AiChooseShipToReplaceWith");
+
+	/* maybe useless, but avoids compiler warning this way */
 	return INVALID_ENGINE;
 }

@@ -390,7 +400,7 @@ static void AiHandleReplaceAircraft(Player *p)

 static void AiHandleReplaceShip(Player *p)
 {
-	/* Ships are not implemented in this (broken) AI */
+	error("!AiHandleReplaceShip");
 }

 typedef EngineID CheckReplaceProc(const Player* p, const Vehicle* v);
@@ -1468,6 +1478,12 @@ static void AiWantAircraftRoute(Player *p)
 	}
 }

+static void AiWantShipRoute(Player *p)
+{
+	// XXX
+//	error("AiWaitShipRoute");
+}
+


 static void AiStateWantNewRoute(Player *p)
@@ -1501,7 +1517,8 @@ static void AiStateWantNewRoute(Player *p)
 			if (_patches.ai_disable_veh_aircraft) continue;
 			AiWantAircraftRoute(p);
 		} else {
-			/* Ships are not implemented in this (broken) AI */
+			if (_patches.ai_disable_veh_ship) continue;
+			AiWantShipRoute(p);
 		}

 		// got a route?
@@ -3493,17 +3510,20 @@ static void AiStateBuildAircraftVehicles(Player *p)

 static void AiStateCheckShipStuff(Player *p)
 {
-	/* Ships are not implemented in this (broken) AI */
+	// XXX
+	error("!AiStateCheckShipStuff");
 }

 static void AiStateBuildDefaultShipBlocks(Player *p)
 {
-	/* Ships are not implemented in this (broken) AI */
+	// XXX
+	error("!AiStateBuildDefaultShipBlocks");
 }

 static void AiStateDoShipStuff(Player *p)
 {
-	/* Ships are not implemented in this (broken) AI */
+	// XXX
+	error("!AiStateDoShipStuff");
 }

 static void AiStateSellVeh(Player *p)
@@ -3538,8 +3558,9 @@ static void AiStateSellVeh(Player *p)
 			}

 			DoCommand(0, v->index, 0, DC_EXEC, CMD_SELL_AIRCRAFT);
-		} else if (v->type == VEH_Ship) {
-			/* Ships are not implemented in this (broken) AI */
+			} else if (v->type == VEH_Ship) {
+			// XXX: not implemented
+			error("!v->type == VEH_Ship");
 		}
 	}

@@ -3817,7 +3838,7 @@ static void AiHandleTakeover(Player *p)
 		if (best_pl->player_money >> 1 >= p->bankrupt_value) {
 			// Computer wants to buy it.
 			old_p = _current_player;
-			_current_player = best_pl->index;
+			_current_player = p->index;
 			DoCommand(0, old_p, 0, DC_EXEC, CMD_BUY_COMPANY);
 			_current_player = old_p;
 		}
--- a/airport_gui.c
+++ b/airport_gui.c
@@ -32,7 +32,7 @@ void CcBuildAirport(bool success, TileIndex tile, uint32 p1, uint32 p2)

 static void PlaceAirport(TileIndex tile)
 {
-	DoCommandP(tile, _selected_airport_type, 0, CcBuildAirport, CMD_BUILD_AIRPORT | CMD_NO_WATER | CMD_MSG(STR_A001_CAN_T_BUILD_AIRPORT_HERE));
+	DoCommandP(tile, _selected_airport_type, 0, CcBuildAirport, CMD_BUILD_AIRPORT | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_A001_CAN_T_BUILD_AIRPORT_HERE));
 }

 static void PlaceAir_DemolishArea(TileIndex tile)
--- a/airport_movement.h
+++ b/airport_movement.h
@@ -180,7 +180,7 @@ static const AirportMovingData _airport_moving_data_international[51] = {
 	{  193,  104, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 32 Fly to landing position in air
 	{  105,  104, AMED_NOSPDCLAMP | AMED_LAND,     0 }, // 33 Going down for land
 	{    3,  104, AMED_NOSPDCLAMP | AMED_BRAKE,    0 }, // 34 Just landed, brake until end of runway
-	{   12,  104, AMED_SLOWTURN,                   0 }, // 35 Just landed, turn around and taxi 1 square
+	{   12,  104, 0,                               0 }, // 35 Just landed, turn around and taxi 1 square
 	{    7,   84, 0,                               0 }, // 36 Taxi from runway to crossing
 	{  -31,  209, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 37 Fly around waiting for a landing spot (north-east)
 	{    1,    6, AMED_NOSPDCLAMP | AMED_SLOWTURN, 0 }, // 38 Fly around waiting for a landing spot (north-west)
@@ -261,7 +261,7 @@ static const AirportMovingData _airport_moving_data_intercontinental[77] = {
 	{  136,   96, AMED_HELI_LOWER,                 0 }, // 56 Land in front of hangar2
 	{  126,  104, 0,                               3 }, // 57 Outway 2
 	{  136,  136, 0,                               1 }, // 58 Airport OUTWAY 2
-	{  136,  152, AMED_EXACTPOS,                   1 }, // 59 Accelerate to end of runway2
+	{  136,  152, AMED_EXACTPOS,                   5 }, // 59 Accelerate to end of runway2
 	{   16,  152, AMED_NOSPDCLAMP,                 0 }, // 60 Release control of runway2, for smoother movement
 	{   20,  152, AMED_NOSPDCLAMP,                 0 }, // 61 End of runway2
 	{  -56,  152, AMED_NOSPDCLAMP | AMED_TAKEOFF,  0 }, // 62 Take off2
--- a/bridge_gui.c
+++ b/bridge_gui.c
@@ -35,7 +35,7 @@ static void BuildBridge(Window *w, int i)
 	DeleteWindow(w);
 	DoCommandP(_bridgedata.end_tile, _bridgedata.start_tile,
 		_bridgedata.indexes[i] | (_bridgedata.type << 8), CcBuildBridge,
-		CMD_BUILD_BRIDGE | CMD_MSG(STR_5015_CAN_T_BUILD_BRIDGE_HERE));
+		CMD_BUILD_BRIDGE | CMD_AUTO | CMD_MSG(STR_5015_CAN_T_BUILD_BRIDGE_HERE));
 }

 static void BuildBridgeWndProc(Window *w, WindowEvent *e)
--- a/callback_table.c
+++ b/callback_table.c
@@ -31,7 +31,6 @@ CommandCallback CcPlaySound10;
 CommandCallback CcPlaceSign;
 CommandCallback CcTerraform;
 CommandCallback CcBuildTown;
-CommandCallback CcGiveMoney;

 /* rail_gui.c */
 CommandCallback CcPlaySound1E;
@@ -86,8 +85,7 @@ CommandCallback *_callback_table[] = {
 	/* 0x17 */ CcCloneShip,
 	/* 0x18 */ CcCloneTrain,
 	/* 0x19 */ CcAI,
-	/* 0x1A */ CcCloneVehicle,
-	/* 0x1B */ CcGiveMoney,
+	/* 0x1A */ CcCloneVehicle
 };

 const int _callback_table_count = lengthof(_callback_table);
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,179 +1,43 @@
-0.5.3 (2007-09-15)
------------------------------------------------------------------------
- Fix: Possible NULL pointer dereference that could be triggered remotely (r11074)
- Fix: Removing CMD_AUTO from some commands could remotely trigger an assertion [FS#1179] (r11040)
- Fix: Underflow that caused overflows in the performance rating [FS#1179] (r11039)
- Fix: [Windows] MIDI does not stop when closing openttd [FS#1164] (r11029)
- Fix: Do not unconditionally assume that a tile has a depot (r11027)
- Fix: Give a more correct error when building some things on tile 0 [FS#1173] (r11024)
- Fix: Do not display income/expenses when they do not belong to a "valid" tile, like the money cheat and giving money [FS#1175] (r11021)
- Fix: One could not give money when (s)he had too much money [FS#1174] (r11020)
- Fix: Disallow buying/selling shares in your own company or a bankrupt company [FS#1169] (r11018)
- Fix: Crash when quiting the game in one of the end score windows [FS#1218] (r11071)
-
-
-0.5.3-RC3 (2007-08-30)
------------------------------------------------------------------------
- Fix: Spectators are not allowed to issue commands (r11006)
- Fix: Make the AI not crash when it has ships as the AI does not support them [FS#1133] (r10942)
- Fix: Trains would not get flooded when they are at the lower part of a tile that would become a coast tile after flooding [FS#1127] (r10892)
- Fix: Removing road with the road removal tool would also work with a negative bank account, making the bank account even more negative than it was [FS#1125] (r10890)
- Fix: Some isocodes were wrong, resulting in some NewGRF not working properly for the affected languages (r10877)
- Fix: [Windows] Do not try to minimise or restore the window when closing OpenTTD [FS#998] (r10835)
- Fix: Trains going over bridges would get the "going down hill" accelerate bonus, which causes trains to go faster on bridges than they would be going on level land [FS#1096] (r10739)
- Fix: Trains being split into two pieces when loading an old savegame [FS#1062] (r10735)
- Fix: [OS/2] Fix chdir problem with open/save dialog (r10650)
- Fix: One could not remove locks that were build in a (very) old version of OpenTTD [FS#1038] (r10593)
- Fix: One cannot navigate using arrow keys in the game name text box [FS#1038] (r10500)
- Fix: Ship's maximum speed wrongly shown [FS#1013] (r10497)
- Fix: [OSX] Of the resolution is changed to something that is too high for the monitor, then it is reduced to fit the monitor size, solving several crashes and graphical glitches [FS#458] (r10410)
- Fix: NPF was leaking memory each time it got initialized, except for the first time (r10357)
- Fix: [YAPF] 'target_seen' flag that is set prematurely in some cases (1 tile long cached segment followed by target station) which caused asserts to trigger [FS#884] (r10199)
-
-
-0.5.3-RC2 (2007-07-07)
------------------------------------------------------------------------
- Fix: Visual glitches when a window is resized in the WE_CREATE callback (r10465)
- Fix: [Windows] _wnd.has_focus was not properly set after using ALT-TAB [FS#962] (r10399)
-
-
-0.5.3-RC1 (2007-06-28)
------------------------------------------------------------------------
- Feature: Make the client list window (for network games) stickyable (r10293)
- Feature: console command to get the current game date (r10137)
- Fix: Waypoints could be renamed when you are not the owner (r10368)
- Fix: Smooth economy did not close primary industries and it allowed increasing of production of industries that should not have rising productions (r10348, r10347, r10290)
- Fix: Acceleration for trains on slopes is not calculated properly [FS#786] (r10344, r10317)
- Fix: The 'old' pathfinders (OPF and NPF) for road vehicles could not find a path when in a tunnel [FS#290] (r10345)
- Fix: Only add the autoreplace menu when autoreplace actually knows about the group [FS#880] (r10337)
- Fix: Signal state sometimes not properly set when the signal "pathfinder" reached the end of a line [FS#910] (r10336)
- Fix: News messages were shown over the endgame/highscore windows [FS#943] (r10333)
- Fix: Rail could be destroyed when building tunnels (r10306)
- Fix: Flush the output of the dedicated server console (r10295)
- Fix: The "pause" key did not work in the scenario editor (r10294)
- Fix: Age non-front engines too (so when you move engines around in the depot they do not get age 0 when they are much older [FS#202] (r10288)
- Fix: Do not make everyone spectator if 1 joining client failed to create new company (r10284)
- Fix: Remove invalid characters (for the file system) from savegame names [FS#916, FS#850] (r10272, r10116)
- Fix: Some old savegames could have the wrong bits unset (r10268, r10147)
- Fix: Do not look in every direction for tunnels when building one, one direction is enough (r10258)
- Fix: [Windows] Do not mess desktop when using ALT-TAB [FS#876] (r10251, r10186)
- Fix: Take the age of the front vehicle for station rating (r10246)
- Fix: Terraforming wipes out canals. Now you always have to remove the canal before terraforming, instead of "just" removing the canal [FS#594] (r10240)
- Fix: Only 2 trains could crash at one time as collision checking stopped on the first hit. This could technically cause desyncs in network games as the collision hash order is not guaranteed [FS#892] (r10222)
- Fix: Land under foundations was terraform when it shouldn't be terraformed [FS#882, FS#890] (r10219)
- Fix: Do not make a 270 degree turn on the international airport when a 90 degree turn is enough (r10187)
- Fix: Crash when trying to get the aircraft movement state of an aircraft going to a just deleted airport [FS#874] (r10165)
- Fix: Airports did not flood when there are aircraft on the airport [FS#601] (r10155)
- Fix: Some vehicles were not drawn when having a high resolution and a high zoom-out level [FS#870] (r10154)
- Fix: Vehicles disappear when crossing certain tiles [FS#869] (r10153)
- Fix: Train disconnects in some old TTD savegames [FS#862] (10151)
- Fix: OpenTTD assumes that the resolution is at least 1 by 1, so force the resolution to be always at least 1 by 1 (r10139)
- Fix: When you got a sufficiently small resolution, there is a possibility for a division by zero when a sound is played (r10138)
- Fix: When removing a dock, a ship will always try to reach the old location of the dock even when it cannot anymore because it the old location of the dock is now land instead of water [FS#810] (r10131)
- Fix: SetCurrentGrfLangID returned the wrong language ids for most languages (r10130)
- Fix: Some NewGRFs use the same (unused in the "current" climate) sprite IDs. Normally this gives some artefacts, but when one NewGRF expects it to be a sprite and another NewGRF overwrites it with a non-sprite nasty things happen (drawing a non-sprite crashes OTTD) [FS#838] (r10109)
- Fix: Multiple subsequent "give money" actions could result in duplicate messages that money has been transfered when it only happened once, or tell you paid money when you did not [FS#834, FS#839] (r10087, r10085)
- Fix: "Deactivate Electrified Railways" did not work [FS#836] (10083)
- Fix: Memory leaks in the networking code [FS#846, FS#844] (r10082, r10075)
- Fix: Coverage area highlight was still show when it was turned off for docks [FS#835] (r10068)
- Fix: Do not use override engine type for articulated wagon parts (r10048)
- Fix: Sprite resulting from '?' substitution was reloaded into the cache entry for SPR_IMG_QUERY instead of the original sprite cache entry. This resulted in unaccounted missing sprite cache memory, and was exacerbated because the original missing sprite was not cached, so it did it again and again and again. Slowdowns and boom (r10038)
- Fix: One could build on (some) slopes when building on slopes was disabled [FS#823] (r10030)
- Fix: When deleting the first engine of a train with multiple engines, only reopen the train window if the player had the original train window open. This fixes 'random' windows opening for multiple players of the same company (r10028)
- Fix: When selling trains, if there were no wagons between multiheaded engines the rear part could be checked despite having already been deleted (10023)
-
-
-0.5.2 (2007-05-29)
------------------------------------------------------------------------
- Feature: Add threading support for MorphOS (r9759)
- Fix: Bridges and tunnels were not always removed on bankruptcy, thus leaving tunnels/bridges with an invalid owner that would crash the game when clicking with the query tool on them (r9966)
- Fix: Null pointer dereference under MorphOS and AmigaOS (r9861)
-
-
-0.5.2-RC1 (2007-05-16)
------------------------------------------------------------------------
- Feature: Windows 95/98/ME check in Windows 2000/XP/2003/Vista builds (r9834)
- Feature: Add password protected status to 'players' (network server) console command (r9771)
- Feature: Add server_lang in [network] section of openttd.cfg (r9716)
- Fix: Loading some TTDP savegames caused an instant assertion on loading (r9857)
- Fix: [NewGRF] Catch occurance of division-by-zero in varaction handling (r9837)
- Fix: Only non dedicated servers cannot have 0 players [FS#765] (r9785)
- Fix: Remove arbitrary limit on length of NewGRF strings (r9775)
- Fix: [NewGRF] Ignore axis-bit of station tile layouts [FS#756] (r9758)
- Fix: [win32] Dead key and open/close console. (r9728)
- Fix: When you have closed the "Load game"/"New game" windows which you started from the "start server" menu, you shouldn't start a server when starting a new game [SF#1244842] (r9757)
- Fix: Trains were lost after autorenewal/autoreplace [FS#732] (r9753)
- Fix: Stop flooded towns from building roads on water [FS#598] (r9743)
- Fix: Station signs were not resized when the language changed [FS#672] (r9741)
- Fix: In news history, newlines were not replaced with spaces [FS#677] (r9731)
- Fix: Crash when destroying bridge with train partially on it [FS#738] (r9726)
- Fix: Planes made a 270 degree turn instead of a 90 degree turn on the southern runway of the intercontinental airport [FS#743] (r9725)
- Fix: In-game private messages did not work for clients with high ClientIDs (r9719)
- Fix: Do not allow building of rail vehicles whose railtype is not available (r9718)
- Fix: [YAPF] The guessed path was ignored for ships [FS#736] (r9694)
-
-
-0.5.1 (2007-04-20)
------------------------------------------------------------------------
-(None)
-
-
-0.5.1-RC3 (2007-04-17)
------------------------------------------------------------------------
- Feature: Add list_patches to console commands; shows all patches and values (r9565)
- Fix: Select "Custom" in the difficulty settings gui when changing a setting [FS#733] (r9647)
- Fix: Building rail on steep slopes ignored build_on_slopes patch setting (r9602)
- Fix: Wrong characters in Finnish town names (r9641)
- Fix: When checking for no vehicle on ground-tiles, do not take into account vehicles that are in the air (r9542)
- Fix: Bankrupt AIs no longer buy over themselves (also added safeguards to prevent in future) (r9540 / r9541)
- Fix: When company is removed, sell all shares of the and in the company (r9533)
- Fix: Crash when 2 or more clients joined at roughly the same time (r9529)
- Fix: Custom currency was overwritten and fix euro introduction (r9467, r9469)
- Fix: Values of diff_custom and snow_line in .cfg were not checked properly (r9455)
- Fix: When deleting a vehicle which has shared orders with one more vehicle and no orders, segfaulted (r9429)
-
-
-0.5.1-RC2 (2007-03-23)
------------------------------------------------------------------------
- Fix: crashes when the chatbox would be drawn outside of the main window [FS#701] (r9420)
- Fix: reading out of an array caused a segmentation fault [FS#694] (r9394)
-
-
 0.5.1-RC1 (2007-03-20)
 ------------------------------------------------------------------------
 - Feature: Translation dependant formatting of dates (r8906)
- Feature: Kick inactive initial network connections after some time [FS#115] (r9038, r9061)
+- Feature: Kick inactive initial network connections after some time (r9038, r9061)
 - Feature: Add an extra news group for opening and closing of industries (r9097)
- Codechange: Disable shares by default and increase the default maximum distance from edge for oil refineries (r9339)
- Codechange: When you started openttd with '-g' you got the same map every run (r9205)
- Codechange: When all news-setting buttons are 'full', make the for-all button show 'full' too (r9137)
- Codechange: Disable the ability to make flooding water with the canal build tool. In the scenario editor you can still make both canals and flood water at height level 0 [FS#622, FS#629] (r9105, r9115)
- Codechange: The station list, sorted by cargo rating, now takes stations into account that have no cargo waiting [FS#595] (r9062)
- Fix: Close the Shared Order Vehicle List if you remove the shared link with only 2 vehicles (r9338)
- Fix: A34-1000, Z-Shuttle, and Kelling K1 are now listed as small aircraft (r9298)
- Fix: Shared orders got messed up when the 'first' trains got removed in the depot [FS#685] (r9277)
- Fix: Use a less CPU-intensive algorithm to find a random industry for the AI to prevent it slowing down the game [FS#644] (r9251)
- Fix: When loading games, enroute_from was updated in the wrong place, causing issues with TTD savegames/scenarios (r9147)
- Fix: "Train is lost" message is generated incorrectly [FS#676] (r9146)
- Fix: Difficulty level button was not selected when opening the difficulty window (r9117)
- Fix: The wrong catenary wires were drawn for tunnel entrances [FS#612] (r9077)
- Fix: The intercontinental airport used 'T-junction' runway sprites when there is no exit in the middle of the runway as in the city airport [FS#529] (r9076)
- Fix: [win] dedicated console now doesn't need an extra 'enter' to fully quit [FS#459] (r9074)
- Fix: Take over companies properly in multiplayer games [FS#459] (r9071)
- Fix: When a bribe failed and you haven't picked up cargo yet, you would never be able to do so for a given station [FS#404] (r9070)
- Fix: Don't keep on scrolling for non-numeric values in settings, but require reclick [FS#663] (r9064)
- Fix: The personal (.openttd) directories were hidden in the load/save directory listings [FS#652] (r9043)
- Fix: Desync caused by buffer overflow [FS#664] (r9027)
- Fix: When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length. (r9012)
- Fix: Play the correct engine sound based on the engine type instead of the sprite (r9009)
- Fix: New locomotive names were not announced in the news, it said "new railway locomotive available - railway locomotive" [FS#581] (r9000, r9001)
- Fix: [NewGRF] Do not select a disabled platform length/number of track count when going out of drag-drop mode [FS#450] (r8999)
- Fix: [win] Resolution doubled in cfg file when fullscreen mode used [FS#642] (r8994)
- Fix: The industry list should also be (re)set when the number of industries is 0 [FS#656] (r8980)
- Fix: [win] Possible buffer overflow if unicode text is pasted into an input box and needs trimming. (r8975)
- Fix: [win] Support compilation with the Vista Platform SDK (r8974)
+- Codechange: Change windows unicode handling and allow a pure non-unicode build to function. (r9055)
+- Codechange: Be more lenient when trimming UTF-8 strings and don't terminate the string when an invalid encoding is encountered, but only focus on maximum length. (r9083)
+- Codechange: Dsable shares by default and increase the default maximum distance from edge for oil refineries (r9339)
+- Regression: [win32] Possible buffer overflow if unicode text is pasted into an input box and needs trimming. (r8975)
+- Fix: NewGRF support for vehicle variable 48 (r8943)
 - Fix: Crash on loading savegames with GRFs that do not have their GRF info/name set (r8955)
- Fix: [NewGRF] support for vehicle variable 48 was wrong (r8943)
+- Fix: Support compilation with the Vista Platform SDK (r8974)
+- Fix: The industry list should also be (re)set when the number of industries is 0 (r8980)
+- Fix: Resolution doubled in cfg file when fullscreen mode used (r8994)
+- Fix: Do not select a disabled platform length/number of track count when going out of drag-drop mode (r8999)
+- Fix: New locomotive names were not announced in the news, it said "new railway locomotive available - railway locomotive" (r9000, r9001)
+- Fix: Play the correct engine sound based on the engine type instead of the sprite (r9009)
+- Fix: When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length. (r9012)
+- Fix: Desync caused by buffer overflow (r9027)
+- Fix: The personal (.openttd) directories were hidden in the load/save directory listings (r9043)
+- Fix: The station list, sorted by cargo rating, now takes stations into account that have no cargo waiting (r9062)
+- Fix: Don't keep on scrolling for non-numeric values in settings, but require reclick (r9064)
+- Fix: When a bribe failed and you haven't picked up cargo yet, you would never be able to do so for a given station (r9070)
+- Fix: Take over companies properly in multiplayer games (r9071)
+- Fix: win32 dedicated console now doesn't need an extra 'enter' to fully quit (r9074)
+- Fix: The intercontinental airport used 'T-junction' runway sprites when there is no exit in the middle of the runway as in the city airport (r9076)
+- Fix: The wrong catenary wires were drawn for tunnel entrances (r9077)
+- Fix: [win9x] Clipboard paste for Windows95 correctly converts the input to the current locale. (r9084)
+- Fix: Disable the ability to make flooding water with the canal build tool. In the scenario editor you can still make both canals and flooding water at height level 0 (r9105)
+- Fix: Make clear in the tooltips when the canal build tool (in the scenario editor) makes flooding water (r9115)
+- Fix: Difficulty level button was not selected when opening the difficulty window (r9117)
+- Fix: "Train is lost" message is generated incorrectly (r9146)
+- Fix: When loadin games, enroute_from was updated in the wrong place, causing issues with TTD savegames/scenarios (r9147)
+- Fix: When you started openttd with '-g' you got the same map every run (r9205)
+- Fix: Shared orders got messed up when the 'first' trains got removed in the depot (r9277)
+- Fix: Use a less CPU-intensive algorithm to find a random industry for the AI to prevent it slowing down the game (r9251)
+- Fix: A34-1000, Z-Shuttle, and Kelling K1 are now listed as small aircraft (r9298)
+- Fix: Assert() when you removed the orders of a shared list while having the shared order vehicle list open (r9337)
+- Fix: Close the Shared Order Vehicle List if you remove the shared link with only 2 vehicles (r9338)
+- Fix: When all news-setting buttons are 'full', make the for-all button show 'full' too (r9137)


 0.5.0 (2007-02-27)
@@ -1472,6 +1336,7 @@

 0.2.1 (2004-04-04)
 ------------------------------------------------------------------------
+
 - Fix: copy orders crashed if you clicked on a wagon
 - Feature: 'A' hotkey now always opens autorail
 - Change: Moved autorail button
@@ -1484,6 +1349,7 @@

 0.2 (2004-04-03)
 ------------------------------------------------------------------------
+
 - Feature: autoscroll (only works to left/right)
 - Feature: train checkpoints, instead of ttdpatch's nonstop handling
 - Feature: ttdpatch compatible nonstop handling
@@ -1544,6 +1410,7 @@

 0.1.4 (2004-03-25)
 ------------------------------------------------------------------------
+
 - Feature: crash submit system on win32
 - Fix: train smoke clouds
 - Fix: train engine sounds
@@ -1584,6 +1451,7 @@

 0.1.3 (2004-03-18)
 ------------------------------------------------------------------------
+
 - Fixed message options window
 - Fixed company takeover/purchase
 - Feature: Improved mouse scroll zooming
@@ -1607,6 +1475,7 @@

 0.1.2 (2004-03-15)
 ------------------------------------------------------------------------
+
 - Mouse wheel can be used to zoom in out on win32 (ludde)
 - Implemented some support for resizing the window dynamically in win32 (ludde)
 - Fixed tunnel mouse icon for maglev and monorail
@@ -1614,6 +1483,7 @@

 0.1.1 (2004-03-14)
 ------------------------------------------------------------------------
+
 - Preliminary presignal support
 - Added external MIDI driver for unix version (by robertnorris)
 - Added DirectMusic driver for Win32 version
--- a/clear_cmd.c
+++ b/clear_cmd.c
@@ -17,7 +17,6 @@
 #include "unmovable_map.h"
 #include "genworld.h"
 #include "industry.h"
-#include "water_map.h"

 typedef struct TerraformerHeightMod {
 	TileIndex tile;
@@ -112,7 +111,7 @@ static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode)
 		// basement and then you raise/lower the other corner.
 		tileh = GetTileSlope(tile, &z);
 		if (tileh == unsafe_slope[mode] ||
-				tileh == (SLOPE_STEEP | ComplementSlope(unsafe_slope[mode]))) {
+				tileh == ComplementSlope(unsafe_slope[mode])) {
 			_terraform_err_tile = tile;
 			_error_message = STR_1008_MUST_REMOVE_RAILROAD_TRACK;
 			return -1;
@@ -137,13 +136,6 @@ static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode)
 		}
 	}

-	/* Canals can't be terraformed */
-	if (IsClearWaterTile(tile) && IsCanal(tile)) {
-		_terraform_err_tile = tile;
-		_error_message = STR_MUST_DEMOLISH_CANAL_FIRST;
-		return -1;
-	}
-
 	ret = DoCommand(tile, 0,0, ts->flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);

 	if (CmdFailed(ret)) {
@@ -414,6 +406,8 @@ int32 CmdPurchaseLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);

+	if (!EnsureNoVehicle(tile)) return CMD_ERROR;
+
 	if (IsOwnedLandTile(tile) && IsTileOwner(tile, _current_player)) {
 		return_cmd_error(STR_5807_YOU_ALREADY_OWN_IT);
 	}
--- a/command.c
+++ b/command.c
@@ -166,20 +166,20 @@ DEF_COMMAND(CmdDepotMassAutoReplace);

 /* The master command table */
 static const Command _command_proc_table[] = {
-	{CmdBuildRailroadTrack,           CMD_AUTO}, /*   0 */
-	{CmdRemoveRailroadTrack,          CMD_AUTO}, /*   1 */
-	{CmdBuildSingleRail,              CMD_AUTO}, /*   2 */
-	{CmdRemoveSingleRail,             CMD_AUTO}, /*   3 */
+	{CmdBuildRailroadTrack,                  0}, /*   0 */
+	{CmdRemoveRailroadTrack,                 0}, /*   1 */
+	{CmdBuildSingleRail,                     0}, /*   2 */
+	{CmdRemoveSingleRail,                    0}, /*   3 */
 	{CmdLandscapeClear,                      0}, /*   4 */
-	{CmdBuildBridge,                  CMD_AUTO}, /*   5 */
-	{CmdBuildRailroadStation,         CMD_AUTO}, /*   6 */
-	{CmdBuildTrainDepot,              CMD_AUTO}, /*   7 */
-	{CmdBuildSingleSignal,            CMD_AUTO}, /*   8 */
-	{CmdRemoveSingleSignal,           CMD_AUTO}, /*   9 */
-	{CmdTerraformLand,                CMD_AUTO}, /*  10 */
-	{CmdPurchaseLandArea,             CMD_AUTO}, /*  11 */
+	{CmdBuildBridge,                         0}, /*   5 */
+	{CmdBuildRailroadStation,                0}, /*   6 */
+	{CmdBuildTrainDepot,                     0}, /*   7 */
+	{CmdBuildSingleSignal,                   0}, /*   8 */
+	{CmdRemoveSingleSignal,                  0}, /*   9 */
+	{CmdTerraformLand,                       0}, /*  10 */
+	{CmdPurchaseLandArea,                    0}, /*  11 */
 	{CmdSellLandArea,                        0}, /*  12 */
-	{CmdBuildTunnel,                  CMD_AUTO}, /*  13 */
+	{CmdBuildTunnel,                         0}, /*  13 */
 	{CmdRemoveFromRailroadStation,           0}, /*  14 */
 	{CmdConvertRail,                         0}, /*  15 */
 	{CmdBuildTrainWaypoint,                  0}, /*  16 */
@@ -187,19 +187,19 @@ static const Command _command_proc_table[] = {
 	{CmdRemoveTrainWaypoint,                 0}, /*  18 */
 	{NULL,                                   0}, /*  19 */
 	{NULL,                                   0}, /*  20 */
-	{CmdBuildRoadStop,                CMD_AUTO}, /*  21 */
+	{CmdBuildRoadStop,                       0}, /*  21 */
 	{NULL,                                   0}, /*  22 */
-	{CmdBuildLongRoad,                CMD_AUTO}, /*  23 */
-	{CmdRemoveLongRoad,               CMD_AUTO}, /*  24 */
+	{CmdBuildLongRoad,                       0}, /*  23 */
+	{CmdRemoveLongRoad,                      0}, /*  24 */
 	{CmdBuildRoad,                           0}, /*  25 */
 	{CmdRemoveRoad,                          0}, /*  26 */
-	{CmdBuildRoadDepot,               CMD_AUTO}, /*  27 */
+	{CmdBuildRoadDepot,                      0}, /*  27 */
 	{NULL,                                   0}, /*  28 */
-	{CmdBuildAirport,                 CMD_AUTO}, /*  29 */
-	{CmdBuildDock,                    CMD_AUTO}, /*  30 */
-	{CmdBuildShipDepot,               CMD_AUTO}, /*  31 */
-	{CmdBuildBuoy,                    CMD_AUTO}, /*  32 */
-	{CmdPlantTree,                    CMD_AUTO}, /*  33 */
+	{CmdBuildAirport,                        0}, /*  29 */
+	{CmdBuildDock,                           0}, /*  30 */
+	{CmdBuildShipDepot,                      0}, /*  31 */
+	{CmdBuildBuoy,                           0}, /*  32 */
+	{CmdPlantTree,                           0}, /*  33 */
 	{CmdBuildRailVehicle,                    0}, /*  34 */
 	{CmdMoveRailVehicle,                     0}, /*  35 */
 	{CmdStartStopTrain,                      0}, /*  36 */
@@ -217,7 +217,7 @@ static const Command _command_proc_table[] = {
 	{CmdChangeServiceInt,                    0}, /*  46 */

 	{CmdBuildIndustry,                       0}, /*  47 */
-	{CmdBuildCompanyHQ,               CMD_AUTO}, /*  48 */
+	{CmdBuildCompanyHQ,                      0}, /*  48 */
 	{CmdSetPlayerFace,                       0}, /*  49 */
 	{CmdSetPlayerColor,                      0}, /*  50 */

@@ -290,17 +290,17 @@ static const Command _command_proc_table[] = {
 	{NULL,                                   0}, /* 101 */

 	{CmdMoneyCheat,                CMD_OFFLINE}, /* 102 */
-	{CmdBuildCanal,                   CMD_AUTO}, /* 103 */
+	{CmdBuildCanal,                          0}, /* 103 */
 	{CmdPlayerCtrl,                          0}, /* 104 */

-	{CmdLevelLand,                    CMD_AUTO}, /* 105 */
+	{CmdLevelLand,                           0}, /* 105 */

 	{CmdRefitRailVehicle,                    0}, /* 106 */
 	{CmdRestoreOrderIndex,                   0}, /* 107 */
-	{CmdBuildLock,                    CMD_AUTO}, /* 108 */
+	{CmdBuildLock,                           0}, /* 108 */
 	{NULL,                                   0}, /* 109 */
-	{CmdBuildSignalTrack,             CMD_AUTO}, /* 110 */
-	{CmdRemoveSignalTrack,            CMD_AUTO}, /* 111 */
+	{CmdBuildSignalTrack,                    0}, /* 110 */
+	{CmdRemoveSignalTrack,                   0}, /* 111 */
 	{NULL,                                   0}, /* 112 */
 	{CmdGiveMoney,                           0}, /* 113 */
 	{CmdChangePatchSetting,         CMD_SERVER}, /* 114 */
@@ -335,7 +335,7 @@ int32 DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
 	CommandProc *proc;

 	/* Do not even think about executing out-of-bounds tile-commands */
-	if (tile >= MapSize() || IsTileType(tile, MP_VOID)) {
+	if (tile >= MapSize()) {
 		_cmd_text = NULL;
 		return CMD_ERROR;
 	}
@@ -413,7 +413,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	int y = TileY(tile) * TILE_SIZE;

 	/* Do not even think about executing out-of-bounds tile-commands */
-	if (tile >= MapSize() || IsTileType(tile, MP_VOID)) {
+	if (tile >= MapSize()) {
 		_cmd_text = NULL;
 		return false;
 	}
@@ -433,6 +433,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	}

 	flags = 0;
+	if (cmd & CMD_AUTO) flags |= DC_AUTO;
 	if (cmd & CMD_NO_WATER) flags |= DC_NO_WATER;

 	// get pointer to command handler
@@ -443,8 +444,6 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 		return false;
 	}

-	if (GetCommandFlags(cmd) & CMD_AUTO) flags |= DC_AUTO;
-
 	// Some commands have a different output in dryrun than the realrun
 	//  e.g.: if you demolish a whole town, the dryrun would say okay.
 	//  but by really destroying, your rating drops and at a certain point
@@ -538,7 +537,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	SubtractMoneyFromPlayer(res2);

 	if (IsLocalPlayer() && _game_mode != GM_EDITOR) {
-		if (res2 != 0 && tile != 0) ShowCostOrIncomeAnimation(x, y, GetSlopeZ(x, y), res2);
+		if (res2 != 0) ShowCostOrIncomeAnimation(x, y, GetSlopeZ(x, y), res2);
 		if (_additional_cash_required) {
 			SetDParam(0, _additional_cash_required);
 			ShowErrorMessage(STR_0003_NOT_ENOUGH_CASH_REQUIRES, error_part1, x,y);
--- a/command.h
+++ b/command.h
@@ -158,6 +158,7 @@ enum {
 #define CMD_MSG(x) ((x)<<16)

 enum {
+	CMD_AUTO                  = 0x0200,
 	CMD_NO_WATER              = 0x0400,
 	CMD_NETWORK_COMMAND       = 0x0800, // execute the command without sending it on the network
 	CMD_NO_TEST_IF_IN_NETWORK = 0x1000, // When enabled, the command will bypass the no-DC_EXEC round if in network
@@ -170,7 +171,6 @@ enum {
 enum {
 	CMD_SERVER  = 0x1, /// the command can only be initiated by the server
 	CMD_OFFLINE = 0x2, /// the command cannot be executed in a multiplayer game; single-player only
-	CMD_AUTO    = 0x4, ///< set the DC_AUTO flag on this command
 };

 typedef int32 CommandProc(TileIndex tile, uint32 flags, uint32 p1, uint32 p2);
--- a/console.c
+++ b/console.c
@@ -385,8 +385,7 @@ void IConsolePrint(uint16 color_code, const char *string)
 	str_validate(str);

 	if (_network_dedicated) {
-		fprintf(stdout, "%s\n", str);
-		fflush(stdout);
+		printf("%s\n", str);
 		IConsoleWriteToLogFile(str);
 		free(str); // free duplicated string since it's not used anymore
 		return;
--- a/console_cmds.c
+++ b/console_cmds.c
@@ -928,20 +928,6 @@ DEF_CONSOLE_CMD(ConGetSeed)
 	return true;
 }

-DEF_CONSOLE_CMD(ConGetDate)
-{
-	YearMonthDay ymd;
-	if (argc == 0) {
-		IConsoleHelp("Returns the current date (day-month-year) of the game. Usage: 'getdate'");
-		return true;
-	}
-
-	ConvertDateToYMD(_date, &ymd);
-	IConsolePrintF(_icolour_def, "Date: %d-%d-%d", ymd.day, ymd.month + 1, ymd.year);
-	return true;
-}
-
-
 DEF_CONSOLE_CMD(ConAlias)
 {
 	IConsoleAlias *alias;
@@ -1230,20 +1216,16 @@ DEF_CONSOLE_CMD(ConPlayers)

 	FOR_ALL_PLAYERS(p) {
 		char buffer[512];
-		const NetworkPlayerInfo *npi;

 		if (!p->is_active) continue;

-		npi = &_network_player_info[p->index];
-
 		GetString(buffer, STR_00D1_DARK_BLUE + _player_colors[p->index], lastof(buffer));
-		IConsolePrintF(8, "#:%d(%s) Company Name: '%s'  Year Founded: %d  Money: %d  Loan: %d  Value: %" OTTD_PRINTF64 "d  (T:%d, R:%d, P:%d, S:%d) %sprotected",
-			p->index + 1, buffer, npi->company_name, p->inaugurated_year, p->player_money, p->current_loan, CalculateCompanyValue(p),
-			/* trains      */ npi->num_vehicle[0],
-			/* lorry + bus */ npi->num_vehicle[1] + npi->num_vehicle[2],
-			/* planes      */ npi->num_vehicle[3],
-			/* ships       */ npi->num_vehicle[4],
-			/* protected   */ npi->password[0] == '\0' ? "un" : "");
+		IConsolePrintF(8, "#:%d(%s) Company Name: '%s'  Year Founded: %d  Money: %d  Loan: %d  Value: %" OTTD_PRINTF64 "d  (T:%d, R:%d, P:%d, S:%d)",
+			p->index + 1, buffer, _network_player_info[p->index].company_name, p->inaugurated_year, p->player_money, p->current_loan, CalculateCompanyValue(p),
+			/* trains      */ _network_player_info[p->index].num_vehicle[0],
+			/* lorry + bus */ _network_player_info[p->index].num_vehicle[1] + _network_player_info[p->index].num_vehicle[2],
+			/* planes      */ _network_player_info[p->index].num_vehicle[3],
+			/* ships       */ _network_player_info[p->index].num_vehicle[4]);
 	}

 	return true;
@@ -1420,19 +1402,6 @@ DEF_CONSOLE_CMD(ConPatch)
 	return true;
 }

-DEF_CONSOLE_CMD(ConListPatches)
-{
-	if (argc == 0) {
-		IConsoleHelp("List patch options. Usage: 'list_patches'");
-		return true;
-	}
-
-	if (argc != 1) return false;
-
-	IConsoleListPatches();
-	return true;
-}
-
 DEF_CONSOLE_CMD(ConListDumpVariables)
 {
 	const IConsoleVar *var;
@@ -1498,7 +1467,6 @@ void IConsoleStdLibRegister(void)
 	IConsoleCmdRegister("newgame",      ConNewGame);
 	IConsoleCmdRegister("restart",      ConRestart);
 	IConsoleCmdRegister("getseed",      ConGetSeed);
-	IConsoleCmdRegister("getdate",      ConGetDate);
 	IConsoleCmdRegister("quit",         ConExit);
 	IConsoleCmdRegister("resetengines", ConResetEngines);
 	IConsoleCmdRegister("return",       ConReturn);
@@ -1514,7 +1482,6 @@ void IConsoleStdLibRegister(void)
 	IConsoleCmdRegister("pwd",          ConPrintWorkingDirectory);
 	IConsoleCmdRegister("clear",        ConClearBuffer);
 	IConsoleCmdRegister("patch",        ConPatch);
-	IConsoleCmdRegister("list_patches", ConListPatches);

 	IConsoleAliasRegister("dir",      "ls");
 	IConsoleAliasRegister("del",      "rm %+");
--- a/currency.c
+++ b/currency.c
@@ -153,17 +153,12 @@ void CheckSwitchToEuro(void)
 }

 /**
- * Will fill _currency_specs array with
+ * Called only from newgrf.c.  Will fill _currency_specs array with
 * default values from origin_currency_specs
- * Called only from newgrf.c and settings.c.
- * @param preserve_custom will not reset custom currency (the latest one on the list)
- *        if ever it is flagged to true. In which case, the total size of the memory to move
- *        will be one currency spec less, thus preserving the custom curreny from been
- *        overwritten.void ResetCurrencies(bool preserve_custom)
-*/
-void ResetCurrencies(bool preserve_custom)
+ **/
+void ResetCurrencies(void)
 {
-	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs) - (preserve_custom ? sizeof(_custom_currency) : 0));
+	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs));
 }

 /**
--- a/currency.h
+++ b/currency.h
@@ -38,7 +38,7 @@ extern CurrencySpec _currency_specs[NUM_CURRENCY];

 uint GetMaskOfAllowedCurrencies(void);
 void CheckSwitchToEuro(void);
-void ResetCurrencies(bool preserve_custom);
+void ResetCurrencies(void);
 StringID* BuildCurrencyDropdown(void);
 byte GetNewgrfCurrencyIdConverted(byte grfcurr_id);

--- a/depot.h
+++ b/depot.h
@@ -10,7 +10,6 @@
 #include "oldpool.h"
 #include "tile.h"
 #include "variables.h"
-#include "station_map.h"

 struct Depot {
 	TileIndex xy;
@@ -83,21 +82,6 @@ static inline bool IsTileDepotType(TileIndex tile, TransportType type)
 	}
 }

-/**
- * Is the given tile a tile with a depot on it?
- * @param tile the tile to check
- * @return true if and only if there is a depot on the tile.
- */
-static inline bool IsDepotTile(TileIndex tile)
-{
-	switch (GetTileType(tile)) {
-		case MP_STREET:  return (_m[tile].m5 & 0xF0) == 0x20;
-		case MP_WATER:   return (_m[tile].m5 &   ~3) == 0x80;
-		case MP_RAILWAY: return (_m[tile].m5 & 0xFC) == 0xC0;
-		case MP_STATION: return IsHangar(tile);
-		default:         return false;
-	}
-}

 /**
 * Find out if the slope of the tile is suitable to build a depot of given direction
--- a/dock_gui.c
+++ b/dock_gui.c
@@ -36,17 +36,17 @@ void CcBuildCanal(bool success, TileIndex tile, uint32 p1, uint32 p2)

 static void PlaceDocks_Dock(TileIndex tile)
 {
-	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_DOCK | CMD_MSG(STR_9802_CAN_T_BUILD_DOCK_HERE));
+	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_DOCK | CMD_AUTO | CMD_MSG(STR_9802_CAN_T_BUILD_DOCK_HERE));
 }

 static void PlaceDocks_Depot(TileIndex tile)
 {
-	DoCommandP(tile, _ship_depot_direction, 0, CcBuildDocks, CMD_BUILD_SHIP_DEPOT | CMD_MSG(STR_3802_CAN_T_BUILD_SHIP_DEPOT));
+	DoCommandP(tile, _ship_depot_direction, 0, CcBuildDocks, CMD_BUILD_SHIP_DEPOT | CMD_AUTO | CMD_MSG(STR_3802_CAN_T_BUILD_SHIP_DEPOT));
 }

 static void PlaceDocks_Buoy(TileIndex tile)
 {
-	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_BUOY | CMD_MSG(STR_9835_CAN_T_POSITION_BUOY_HERE));
+	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_BUOY | CMD_AUTO | CMD_MSG(STR_9835_CAN_T_POSITION_BUOY_HERE));
 }

 static void PlaceDocks_DemolishArea(TileIndex tile)
@@ -61,7 +61,7 @@ static void PlaceDocks_BuildCanal(TileIndex tile)

 static void PlaceDocks_BuildLock(TileIndex tile)
 {
-	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_LOCK | CMD_MSG(STR_CANT_BUILD_LOCKS));
+	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_LOCK | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_LOCKS));
 }


@@ -160,7 +160,7 @@ static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
 			if ((e->we.place.userdata & 0xF) == VPM_X_AND_Y) { // dragged actions
 				GUIPlaceProcDragXY(e);
 			} else if (e->we.place.userdata == VPM_X_OR_Y) {
-				DoCommandP(e->we.place.tile, e->we.place.starttile, 0, CcBuildCanal, CMD_BUILD_CANAL | CMD_MSG(STR_CANT_BUILD_CANALS));
+				DoCommandP(e->we.place.tile, e->we.place.starttile, 0, CcBuildCanal, CMD_BUILD_CANAL | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_CANALS));
 			}
 		}
 		break;
@@ -236,16 +236,14 @@ static void BuildDockStationWndProc(Window *w, WindowEvent *e)
 	case WE_CREATE: LowerWindowWidget(w, _station_show_coverage + 3); break;

 	case WE_PAINT: {
-		int rad = (_patches.modified_catchment) ? CA_DOCK : 4;
+		int rad;

 		if (WP(w,def_d).close) return;
 		DrawWindowWidgets(w);

-		if (_station_show_coverage) {
-			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
-		} else {
-			SetTileSelectSize(1, 1);
-		}
+		rad = (_patches.modified_catchment) ? CA_DOCK : 4;
+
+		if (_station_show_coverage) SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);

 		DrawStationCoverageAreaText(4, 50, (uint)-1, rad);
 		break;
--- a/docs/Readme_OS2.txt
+++ b/docs/Readme_OS2.txt
@@ -50,9 +50,6 @@ To enable music, start OpenTTD with the command line:
 If I hear enough responses that both music and sound work together (it might
 just be my system), I'll have the defaults changed.

-Please note also that the GCC version does not currently support the MCI MIDI
-system.
-
 A NOTE ABOUT DEDICATED MULTIPLAYER SERVERS
 ------------------------------------------

@@ -77,17 +74,9 @@ may help to set one up (although some of the links from that page are broken):

   http://www.mozilla.org/ports/os2/gccsetup.html

-Alternatively, Paul Smedley's ready-to-go GCC build environment has been known to
-successfully build the game:
-
-   http://www.smedley.info/os2ports/index.php?page=build-environment
-
 To build, you should, if your environment is set up well enough, be able to just
 type `./configure' (or `sh configure' if you're using the OS/2 shell) and `make'.

-You may have to manually specify `--os OS2' on the configure command line, as
-configure cannot currently detect OS/2 manually.
-
 A note on Open Watcom
 ---------------------

@@ -133,4 +122,4 @@ issues, see the Contacting section of readme.txt.

 Thanks to Paul Smedley for his help with getting OpenTTD to compile under GCC on OS/2.

- Owen Rudge, 24th June 2007
+- Owen Rudge, 8th January 2007
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Sep 15, 2007
+.Dd March 20, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
--- a/driver.c
+++ b/driver.c
@@ -58,7 +58,7 @@ static const DriverDesc _music_driver_descs[] = {
 	M("qt",      "QuickTime MIDI Driver",   &_qtime_music_driver),
 #endif
 #ifdef UNIX
-#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(__OS2__)
+#if !defined(__MORPHOS__) && !defined(__AMIGA__)
 	M("extmidi", "External MIDI Driver",    &_extmidi_music_driver),
 #endif
 #endif
--- a/economy.c
+++ b/economy.c
@@ -217,7 +217,10 @@ int UpdateCompanyRatingAndValue(Player *p, bool update)
 			// Skip the total
 			if (i == SCORE_TOTAL) continue;
 			// Check the score
-			s = clamp(_score_part[owner][i], 0, _score_info[i].needed) * _score_info[i].score / _score_info[i].needed;
+			s = (_score_part[owner][i] >= _score_info[i].needed) ?
+				_score_info[i].score :
+				_score_part[owner][i] * _score_info[i].score / _score_info[i].needed;
+			if (s < 0) s = 0;
 			score += s;
 			total_score += _score_info[i].score;
 		}
@@ -243,41 +246,6 @@ void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player)
 {
 	Town *t;
 	PlayerID old = _current_player;
-
-	assert(old_player != new_player);
-
-	{
-		Player *p;
-		uint i;
-
-		/* See if the old_player had shares in other companies */
-		_current_player = old_player;
-		FOR_ALL_PLAYERS(p) {
-			for (i = 0; i < 4; i++) {
-				if (p->share_owners[i] == old_player) {
-					/* Sell his shares */
-					int32 res = DoCommand(0, p->index, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
-					/* Because we are in a DoCommand, we can't just execute an other one and
-					 *  expect the money to be removed. We need to do it ourself! */
-					SubtractMoneyFromPlayer(res);
-				}
-			}
-		}
-
-		/* Sell all the shares that people have on this company */
-		p = GetPlayer(old_player);
-		for (i = 0; i < 4; i++) {
-			_current_player = p->share_owners[i];
-			if (_current_player != PLAYER_SPECTATOR) {
-				/* Sell the shares */
-				int32 res = DoCommand(0, old_player, 0, DC_EXEC, CMD_SELL_SHARE_IN_COMPANY);
-				/* Because we are in a DoCommand, we can't just execute an other one and
-				 *  expect the money to be removed. We need to do it ourself! */
-				SubtractMoneyFromPlayer(res);
-			}
-		}
-	}
-
 	_current_player = old_player;

 	/* Temporarily increase the player's money, to be sure that
@@ -370,6 +338,25 @@ void ChangeOwnershipOfPlayerItems(PlayerID old_player, PlayerID new_player)
 	/* Change color of existing windows */
 	if (new_player != PLAYER_SPECTATOR) ChangeWindowOwner(old_player, new_player);

+	{
+		Player *p;
+		uint i;
+
+		/* Check for shares */
+		FOR_ALL_PLAYERS(p) {
+			for (i = 0; i < 4; i++) {
+				/* 'Sell' the share if this player has any */
+				if (p->share_owners[i] == _current_player) {
+					p->share_owners[i] = PLAYER_SPECTATOR;
+				}
+			}
+		}
+		p = GetPlayer(_current_player);
+		/* Sell all the shares that people have on this company */
+		for (i = 0; i < 4; i++)
+			p->share_owners[i] = PLAYER_SPECTATOR;
+	}
+
 	_current_player = old;

 	MarkWholeScreenDirty();
@@ -646,8 +633,6 @@ static void AddInflation(void)
 	int i;
 	int32 inf = _economy.infl_amount * 54;

-	if ((_cur_year - _patches.starting_year) >= (ORIGINAL_MAX_YEAR - ORIGINAL_BASE_YEAR)) return;
-
 	for (i = 0; i != NUM_PRICES; i++) {
 		AddSingleInflation((int32*)&_price + i, _price_frac + i, inf);
 	}
@@ -1467,7 +1452,7 @@ int LoadUnloadVehicle(Vehicle *v, bool just_arrived)

 		// if last speed is 0, we treat that as if no vehicle has ever visited the station.
 		ge->last_speed = min(t, 255);
-		ge->last_age = _cur_year - u->build_year;
+		ge->last_age = _cur_year - v->build_year;

 		// If there's goods waiting at the station, and the vehicle
 		//  has capacity for it, load it on the vehicle.
@@ -1632,16 +1617,11 @@ int32 CmdBuyShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	Player *p;
 	int64 cost;

-	/* Check if buying shares is allowed (protection against modified clients) */
-	/* Cannot buy own shares */
-	if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares || _current_player == (PlayerID)p1) return CMD_ERROR;
-
-	p = GetPlayer((PlayerID)p1);
-
-	/* Cannot buy shares of non-existent nor bankrupted company */
-	if (!p->is_active) return CMD_ERROR;
+	/* Check if buying shares is allowed (protection against modified clients */
+	if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR;

 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
+	p = GetPlayer(p1);

 	/* Protect new companies from hostile takeovers */
 	if (_cur_year - p->inaugurated_year < 6) return_cmd_error(STR_7080_PROTECTED);
@@ -1682,16 +1662,11 @@ int32 CmdSellShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	Player *p;
 	int64 cost;

-	/* Check if selling shares is allowed (protection against modified clients) */
-	/* Cannot sell own shares */
-	if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares || _current_player == (PlayerID)p1) return CMD_ERROR;
-
-	p = GetPlayer((PlayerID)p1);
-
-	/* Cannot sell shares of non-existent nor bankrupted company */
-	if (!p->is_active) return CMD_ERROR;
+	/* Check if buying shares is allowed (protection against modified clients */
+	if (!IsValidPlayer((PlayerID)p1) || !_patches.allow_shares) return CMD_ERROR;

 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
+	p = GetPlayer(p1);

 	/* Those lines are here for network-protection (clients can be slow) */
 	if (GetAmountOwnedBy(p, _current_player) == 0) return 0;
@@ -1720,16 +1695,12 @@ int32 CmdSellShareInCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 int32 CmdBuyCompany(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	Player *p;
-	PlayerID pid = (PlayerID)p1;

 	/* Disable takeovers in multiplayer games */
-	if (!IsValidPlayer(pid) || _networking) return CMD_ERROR;
-
-	/* Do not allow players to take over themselves */
-	if (pid == _current_player) return CMD_ERROR;
+	if (!IsValidPlayer((PlayerID)p1) || _networking) return CMD_ERROR;

 	SET_EXPENSES_TYPE(EXPENSES_OTHER);
-	p = GetPlayer(pid);
+	p = GetPlayer(p1);

 	if (!p->is_ai) return CMD_ERROR;

--- a/elrail.c
+++ b/elrail.c
@@ -422,7 +422,6 @@ int32 SettingsDisableElrail(int32 p1)
 		if (rv_info->engclass == 2 && e->railtype == old_railtype) {
 			/* change it to the proper one */
 			e->railtype = new_railtype;
-			_engine_info[e_id].railtype = new_railtype;
 		}
 	}

--- a/engine.c
+++ b/engine.c
@@ -372,7 +372,7 @@ int32 CmdRenameEngine(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
 	StringID str;

-	if (!IsEngineIndex(p1) || _cmd_text == NULL || _cmd_text[0] == '\0') return CMD_ERROR;
+	if (!IsEngineIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;

 	str = AllocateNameUnique(_cmd_text, 0);
 	if (str == 0) return CMD_ERROR;
@@ -414,12 +414,6 @@ bool IsEngineBuildable(EngineID engine, byte type, PlayerID player)
 	// check if it's available
 	if (!HASBIT(e->player_avail, player)) return false;

-	if (type == VEH_Train) {
-		/* Check if the rail type is available to this player */
-		const Player *p = GetPlayer(player);
-		if (!HASBIT(p->avail_railtypes, EngInfo(engine)->railtype)) return false;
-	}
-
 	return true;
 }

--- a/engine_gui.c
+++ b/engine_gui.c
@@ -79,7 +79,7 @@ static void EnginePreviewWndProc(Window *w, WindowEvent *e)

 		DrawStringCentered(w->width >> 1, 80, GetCustomEngineName(engine), 0x10);

-		dei = &_draw_engine_list[GetEngine(engine)->type - VEH_Train];
+		dei = &_draw_engine_list[GetEngine(engine)->type];

 		width = w->width;
 		dei->engine_proc(width >> 1, 100, engine, 0);
@@ -182,7 +182,7 @@ StringID GetNewsStringNewVehicleAvail(const NewsItem *ni)
 void DrawNewsNewVehicleAvail(Window *w)
 {
 	EngineID engine = WP(w, news_d).ni->string_id;
-	const DrawEngineInfo *dei = &_draw_engine_list[GetEngine(engine)->type - VEH_Train];
+	const DrawEngineInfo *dei = &_draw_engine_list[GetEngine(engine)->type];

 	DrawNewsBorder(w);

--- a/fileio.c
+++ b/fileio.c
@@ -149,20 +149,3 @@ void FioOpenFile(int slot, const char *filename)
 	_fio.handles[slot] = f;
 	FioSeekToFile(slot << 24);
 }
-
-/**
- * Sanitizes a filename, i.e. removes all illegal characters from it.
- * @param filename the "\0" terminated filename
- */
-void SanitizeFilename(char *filename)
-{
-	for (; *filename != '\0'; filename++) {
-		switch (*filename) {
-			/* The following characters are not allowed in filenames
-			 * on at least one of the supported operating systems: */
-			case ':': case '\\': case '*': case '?': case '/': case '<': case '>': case '|': case '"':
-				*filename = '_';
-				break;
-		}
-	}
-}
--- a/fileio.h
+++ b/fileio.h
@@ -15,6 +15,5 @@ void FioOpenFile(int slot, const char *filename);
 void FioReadBlock(void *ptr, uint size);
 void FioSkipBytes(int n);
 bool FioCheckFileExists(const char *filename);
-void SanitizeFilename(char *filename);

 #endif /* FILEIO_H */
--- a/fontcache.c
+++ b/fontcache.c
@@ -144,10 +144,10 @@ static FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)


 folder_error:
-registry_no_font_found:
 #if defined(UNICODE)
-	free(font_namep);
+	free(font_path);
 #endif
+registry_no_font_found:
 	RegCloseKey(hKey);
 	return err;
 }
--- a/gfxinit.c
+++ b/gfxinit.c
@@ -206,7 +206,7 @@ static const SpriteID trg1idx[] = {
 /* Medium font */
 	   2,   92, // ' ' till 'z'
 	SKIP,   36,
-	 160,  160, // Move Ÿ to the correct position
+	 160,  160, // Move <EFBFBD> to the correct position
 	  98,   98, // Up arrow
 	 131,  133,
 	SKIP,    1, // skip currency sign
@@ -231,7 +231,7 @@ static const SpriteID trg1idx[] = {
 /* Small font */
 	 226,  316, // ' ' till 'z'
 	SKIP,   36,
-	 384,  384, // Move Ÿ to the correct position
+	 384,  384, // Move <EFBFBD> to the correct position
 	 322,  322, // Up arrow
 	 355,  357,
 	SKIP,    1, // skip currency sign
@@ -253,7 +253,7 @@ static const SpriteID trg1idx[] = {
 /* Big font */
 	 450,  540, // ' ' till 'z'
 	SKIP,   36,
-	 608,  608, // Move Ÿ to the correct position
+	 608,  608, // Move <EFBFBD> to the correct position
 	SKIP,    1,
 	 579,  581,
 	SKIP,    1,
@@ -292,47 +292,47 @@ static const SpriteID _openttd_grf_indexes[] = {
 	582, 582,  // euro symbol large size
 	358, 358,  // euro symbol tiny
 	SPR_CURSOR_CANAL, SPR_IMG_FASTFORWARD, // more icons
-	648, 648, // nordic char: æ
-	616, 616, // nordic char: Æ
-	666, 666, // nordic char: ø
-	634, 634, // nordic char: Ø
+	648, 648, // nordic char: <EFBFBD>
+	616, 616, // nordic char: <EFBFBD>
+	666, 666, // nordic char: <EFBFBD>
+	634, 634, // nordic char: <EFBFBD>
 	SPR_PIN_UP, SPR_CURSOR_CLONE_TRAIN, // more icons
-	382, 383, // Œ œ tiny
-	158, 159, // Œ œ medium
-	606, 607, // Œ œ large
-	360, 360, // Š tiny
-	362, 362, // š tiny
-	136, 136, // Š medium
-	138, 138, // š medium
-	584, 584, // Š large
-	586, 586, // š large
-	626, 626, // Ð large
-	658, 658, // ð large
-	374, 374, // Ž tiny
-	378, 378, // ž tiny
-	150, 150, // Ž medium
-	154, 154, // ž medium
-	598, 598, // Ž large
-	602, 602, // ž large
-	640, 640, // Þ large
-	672, 672, // þ large
-	380, 380, // º tiny
-	156, 156, // º medium
-	604, 604, // º large
+	382, 383, // <EFBFBD> <20> tiny
+	158, 159, // <EFBFBD> <20> medium
+	606, 607, // <EFBFBD> <20> large
+	360, 360, // <EFBFBD> tiny
+	362, 362, // <EFBFBD> tiny
+	136, 136, // <EFBFBD> medium
+	138, 138, // <EFBFBD> medium
+	584, 584, // <EFBFBD> large
+	586, 586, // <EFBFBD> large
+	626, 626, // <EFBFBD> large
+	658, 658, // <EFBFBD> large
+	374, 374, // <EFBFBD> tiny
+	378, 378, // <EFBFBD> tiny
+	150, 150, // <EFBFBD> medium
+	154, 154, // <EFBFBD> medium
+	598, 598, // <EFBFBD> large
+	602, 602, // <EFBFBD> large
+	640, 640, // <EFBFBD> large
+	672, 672, // <EFBFBD> large
+	380, 380, // <EFBFBD> tiny
+	156, 156, // <EFBFBD> medium
+	604, 604, // <EFBFBD> large
 	317, 320, // { | } ~ tiny
 	 93,  96, // { | } ~ medium
 	541, 544, // { | } ~ large
 	SPR_HOUSE_ICON, SPR_HOUSE_ICON,
-	585, 585, // § large
-	587, 587, // © large
-	592, 592, // ® large
-	594, 597, // ° ± ² ³ large
-	633, 633, // × large
-	665, 665, // ÷ large
+	585, 585, // <EFBFBD> large
+	587, 587, // <EFBFBD> large
+	592, 592, // <EFBFBD> large
+	594, 597, // <EFBFBD> <20> <20> <20> large
+	633, 633, // <EFBFBD> large
+	665, 665, // <EFBFBD> large
 	SPR_SELL_TRAIN, SPR_SHARED_ORDERS_ICON,
-	377, 377, // · small
-	153, 153, // · medium
-	601, 601, // · large
+	377, 377, // <EFBFBD> small
+	153, 153, // <EFBFBD> medium
+	601, 601, // <EFBFBD> large
 	END
 };

--- a/graph_gui.c
+++ b/graph_gui.c
@@ -997,7 +997,13 @@ static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
 				DrawStringRightAligned(107, y, SET_PERFORMANCE_DETAIL_INT, 0);

 				// Calculate the %-bar
-				x = clamp(val, 0, needed) * 50 / needed;
+				if (val > needed) {
+					x = 50;
+				} else if (val == 0) {
+					x = 0;
+				} else {
+					x = val * 50 / needed;
+				}

 				// SCORE_LOAN is inversed
 				if (val < 0 && i == SCORE_LOAN) x = 0;
@@ -1007,7 +1013,7 @@ static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
 				if (x != 50) GfxFillRect(112 + x, y - 2, 112 + 50, y + 10, color_notdone);

 				// Calculate the %
-				x = clamp(val, 0, needed) * 100 / needed;
+				x = (val <= needed) ? val * 100 / needed : 100;

 				// SCORE_LOAN is inversed
 				if (val < 0 && i == SCORE_LOAN) x = 0;
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -1615,16 +1615,13 @@ static void ExtChangeIndustryProduction(Industry *i)
 				int mag;

 				new = old = i->production_rate[j];
-				if (CHANCE16I(20, 1024, r)) new -= max(((RandomRange(50) + 10) * old) >> 8, 1U);
-				/* Chance of increasing becomes better when more is transported */
-				if (CHANCE16I(20 + (i->pct_transported[j] * 20 >> 8), 1024, r >> 16) &&
-						(i->type != IT_OIL_WELL || _opt.landscape != LT_NORMAL)) {
-					new += max(((RandomRange(50) + 10) * old) >> 8, 1U);
-				}
+				if (CHANCE16I(20, 1024, r))
+					new -= ((RandomRange(50) + 10) * old) >> 8;
+				if (CHANCE16I(20 + (i->pct_transported[j] * 20 >> 8), 1024, r >> 16))
+					new += ((RandomRange(50) + 10) * old) >> 8;

-				new = clamp(new, 1, 255);
-				/* Do not stop closing the industry when it has the lowest possible production rate */
-				if (new == old && old > 1) {
+				new = clamp(new, 0, 255);
+				if (new == old) {
 					closeit = false;
 					continue;
 				}
@@ -1632,8 +1629,8 @@ static void ExtChangeIndustryProduction(Industry *i)
 				percent = new * 100 / old - 100;
 				i->production_rate[j] = new;

-				/* Close the industry when it has the lowest possible production rate */
-				if (new > 1) closeit = false;
+				if (new >= indspec->production_rate[j] / 4)
+					closeit = false;

 				mag = abs(percent);
 				if (mag >= 10) {
--- a/intro_gui.c
+++ b/intro_gui.c
@@ -64,12 +64,6 @@ static void SelectGameWndProc(Window *w, WindowEvent *e)
 		break;

 	case WE_CLICK:
-		/* Do not create a network server when you (just) have closed one of the game
-		 * creation/load windows for the network server. */
-#ifdef ENABLE_NETWORK
-		if (2 <= e->we.click.widget && e->we.click.widget <= 6) _is_network_server = false;
-#endif /* ENABLE_NETWORK */
-
 		switch (e->we.click.widget) {
 		case 2: ShowGenerateLandscape(); break;
 		case 3: ShowSaveLoadDialog(SLD_LOAD_GAME); break;
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -4,34 +4,46 @@ All bugs listed below are marked as known. Please do not submit any bugs
 that are the same as these. If you do, don't act surprised, because
 we WILL flame you!!

+There is an experimental AI included in the game which you can enable
+from the "Configure Patches" window. All bugs related to this AI should
+go to: http://www.tt-forums.net/viewtopic.php?t=9576
+
 Of course if you have more knowledge about any of these bugs, have more
 specifics, we welcome you to report them. React to the given bug indicated
-by the number below on http://bugs.openttd.org.
+by the number below on http://sourceforge.net/tracker/?group_id=103924&atid=636365
+or http://bugs.openttd.org.
 If the bug report is closed, it has been fixed, which then can be verified
 in the latest SVN version.

-Bugs for 0.5.3
+Bugs for 0.5.0
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org

-944	Incorrect el-rail catenary pole/wire offsets
-917	Load scenario with no towns failed without proper warning
-873	Assertion window fails to open on OSX
-820	Pillar drawing order glich, with newbridges
-716	Train Crash in Depot
-674	Map signs allow less nonenglish characters than english ones
+-677 	Badspacing in news summaries
+-674 	Map signs allow less nonenglish characters than english ones
+-672 	Non-transparent station names' backgrounds do not resize properly upon language change
 -669	Docks/Airports/RV Stations can be built without available vehicles
 -646	AI builds useless stations
-599	Reloaded game lost company passwords
+-601	airports can't get flooded when they have planes in them
+-599	reloaded game lost company passwords
+-594	terraforming wipes out canals
 -591	Autorenew fails under certain conditions
+-583	Fatal fault or crash during startup
+-571	Problems with vehicle purchase lists with NewGRFs
+-559	Front-/Rear-facing engines don't line up with each other
 -553	Autorenew doesn't warn when replacement isn't available
-546	Overflows due to inflation
+-546	[0.5.0 RC3] Inflation overflow
+-540	Planes vanished when offered exclusive
+-539	Trains can cash the same cargo multiple times
 -524	OSX sometimes (not always) fails to find free disk space
-522	Overflow on vehicle costs
+-522	overflow on vehicle costs
+-508	Destroying trees and replanting => raised rating
 -502	OSX can incorrectly print "dbg: [sl] Cannot open savegame 'data/opntitle.dat' for saving/loading."
 -501	Mouse pointer gets hidden, when draging out of window and back again. Only affects Wacom etc.
 -494	Get free money abusing a stock bug
 -474	Overtaking car doesn't hit the against-riding car.
+-458	Crash when changing Resolution on Mac OS X (x86)
+-442	Alt-tab behaviour flawed whilst full screen (win32)
 -435	Assertion window doesn't show when in fullscreen on Mac OS X
 -423	Improved loading causes high CPU use with long trains
 -410	Openttd in dedicated mode don't run without data files
@@ -40,11 +52,55 @@ URL: http://bugs.openttd.org
 -355	graphics bugs with trains - water, tunnels
 -354	Maglev Trains faster than All Planes
 -339	Crash in Quicktime when exiting game
-299	Disable 90 deg turns patch - AI builds 90 deg turns
+-299	disable 90 deg turns patch - AI builds 90 deg turns
+-290	NPF - no path to depot from tunnel
 -282	AI Players do not clear loans as soon as they could
+-274	Autoclean ignores any share holdings
+-265	Subsidy awarded detection bug
 -259	AIs start unnamed companies that do nothing
+-216	AI build train vans one van less
 -202	2 Locomotives in 1 Train - Selling one results in Age of the other one Being 0
 -193	Inconsistent directory usage on Mac OS X
+-165	vehicle length not taken into account
 -153	Language crash with app renaming OSX
 -119	Clipping problems with vehicles on slopes
+- 89	Able to build railways/stations before engines become available
+- 65	short wagons bug
 - 51	Windows doesn't support CUSTOM_LANG_DIR
+- 47	Low rating calculation and cargo loading priority
+
+------------------------------------------------------------------------
+URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
+
+-1573339	0.4.8.dmg Crash with intel 64bit
+-1460218	0.4.7 normal industry bug (non_smooth)
+-1459262	Towns building too many roads way too long now
+-1458995	Another bug with smooth_economy
+-1393415	NPF & one-way sigs
+-1244842	Multiplayer interface bug (0.4.0.1)
+-1212267	station visited twice when servicing
+-1208170	Duplicate station names can be created
+-1116638	"More, but smaller changes" deficiency
+-1106356	re-offered prototypes
+
+Minor Bugs for 0.5.0
+------------------------------------------------------------------------
+URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
+
+-1461629	[r4180]Subsidy calculated wrong
+-1412031	fast forward scrolling is also fast forward :)
+-1387424	overtake insolvent company is to cheap
+-1382782	Loan interest calculated 'wrong'
+-1201284	permanent hilight in a depot
+-1185852	Scrollbars get arbitrarily small
+-1160732	little bug with transparency
+-1117731	Editor-StartingDate
+-1108046	game freezes
+-1102174	Bug if 3 people buy 25% shares in one company
+-1084620	Minor bug considering buses/trucks
+-1034310	color mauve in diagrams
+-1030661	It's possible to build a tunnel under oil wells
+- 987891	Large UFO destruction bug
+- 987883	Aircraft landing/taking off
+- 987880	company league table updating
+- 985924	aircraft taxi speed
--- a/landscape.c
+++ b/landscape.c
@@ -19,6 +19,7 @@
 #include "water_map.h"
 #include "tgp.h"
 #include "genworld.h"
+#include "heightmap.h"

 extern const TileTypeProcs
 	_tile_type_clear_procs,
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -1801,7 +1801,6 @@ STR_3804_WATER                                                  :Water
 STR_3805_COAST_OR_RIVERBANK                                     :Coast or riverbank
 STR_3806_SHIP_DEPOT                                             :Ship depot
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Can't build on water
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Must demolish canal first

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Save Game
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
@@ -236,7 +236,7 @@ STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFON
 STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Mina de Cobre
 STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Plantação de Frutas
 STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Plantação de Seringueiras
-STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Poço Artesiano
+STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Poço de Água
 STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Reservatório
 STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Serraria
 STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Floresta de Algodão Doce
@@ -732,7 +732,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Colocar
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Colocar farol
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Colocar transmissor
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Define área desértica.{} Pressione e segure CTRL para removê-la
-STR_CREATE_LAKE                                                 :{BLACK}Define área com água.{} Faz um canal, a menos se CTRL for pressionado ao nível do mar, neste caso inundará ao redor
 STR_0290_DELETE                                                 :{BLACK}Remover
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Remover esta cidade completamente
 STR_0292_SAVE_SCENARIO                                          :Salvar cenário
@@ -1805,7 +1804,6 @@ STR_3804_WATER                                                  :Água
 STR_3805_COAST_OR_RIVERBANK                                     :Costa ou margem
 STR_3806_SHIP_DEPOT                                             :Depósito naval
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Impossível construir na água
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Deve demolir o canal primeiro

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Salvar Jogo
@@ -1882,9 +1880,9 @@ STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT
 STR_482F_COST                                                   :{BLACK}Custo: {YELLOW}{CURRENCY}
 STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Impossível construir este tipo de indústria aqui...
 STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...a floresta só pode ser plantada acima do nível de neve
-STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{INDUSTRY} anuncia o fechamento!
-STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Problemas de abastecimento forçaram {INDUSTRY} a anunciar o fechamento!
-STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Falta de árvores nas proximidades forçaram {INDUSTRY} a anunciar o fechamento!
+STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{INDUSTRY} anuncia falência iminente!
+STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Problemas de abastecimento forçaram {INDUSTRY} a anunciar falência iminente!
+STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Falta de árvores nas proximidades forçaram {INDUSTRY} a anunciar falência iminente!
 STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} aumenta a produção!
 STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}Nova jazida de carvão encontrada em {INDUSTRY}!{}A expectativa é dobrar a produção!
 STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}Novas reservas de petróleo encontradas em {INDUSTRY}!{}A expectativa é dobrar a produção!
@@ -1893,7 +1891,7 @@ STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Infestação de insetos causa destruição em {INDUSTRY}!{}Produção diminui em 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...só pode ser colocado perto das bordas do mapa
 STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}A produção de {STRING} em {INDUSTRY} aumentou em {COMMA}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} em {INDUSTRY} diminuiu em {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} na {INDUSTRY} diminuiu em {COMMA}%!

 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Há um trem no túnel
--- a/lang/bulgarian.txt
+++ b/lang/bulgarian.txt
@@ -1803,7 +1803,6 @@ STR_3804_WATER                                                  :Вода
 STR_3805_COAST_OR_RIVERBANK                                     :Бряг или поречие
 STR_3806_SHIP_DEPOT                                             :Корабно депо
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Не може да бъде построено във водата
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Трябва да разрушиш каналът първо

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Запази играта
@@ -1829,7 +1828,7 @@ STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Заре
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} пречи
 STR_4801                                                        :{WHITE}{INDUSTRY}
 STR_4802_COAL_MINE                                              :Мина за въглища
-STR_4803_POWER_STATION                                          :Електроцентрала
+STR_4803_POWER_STATION                                          :
 STR_4804_SAWMILL                                                :Дъскорезница
 STR_4805_FOREST                                                 :Гора
 STR_4806_OIL_REFINERY                                           :Нефтена рафинерия
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -164,7 +164,7 @@ STR_TRANSLATED_BY                                               :{BLACK}  Traduc

 STR_00C5                                                        :{BLACK}{CROSS}
 STR_00C6                                                        :{SILVER}{CROSS}
-STR_00C7_QUIT                                                   :{WHITE}Surt
+STR_00C7_QUIT                                                   :{WHITE}Sortir
 STR_00C8_YES                                                    :{BLACK}Si
 STR_00C9_NO                                                     :{BLACK}No
 STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}?
@@ -213,7 +213,7 @@ STR_00F4_500M                                                   :{BLACK}{TINYFON
 STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}Trens
 STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Vehicles de carretera
 STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Vaixells
-STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Avions
+STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Aeronaus
 STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Rutes de Transport
 STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Mina de Carbó
 STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Central Tèrmica
@@ -328,15 +328,15 @@ STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}t
 STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t
 STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg

-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} ton{P a es}
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} ton{P a es}
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} tona{P "" s}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} tone{P "" s}
 STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg

 STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}gal
 STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}l
 STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³

-STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} galó{P "" ns}
+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} galó{P "" s}
 STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} litre{P "" s}
 STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

@@ -359,7 +359,7 @@ STR_015B_OPENTTD                                                :{WHITE}Quant a
 STR_015C_SAVE_GAME                                              :Desa el joc
 STR_015D_LOAD_GAME                                              :Carrega el joc
 STR_015E_QUIT_GAME                                              :Abandona el joc
-STR_015F_QUIT                                                   :Surt
+STR_015F_QUIT                                                   :Sortir
 STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur que vols abandonar aquest joc?
 STR_0161_QUIT_GAME                                              :{WHITE}Abandona el Joc
 STR_SORT_ORDER_TIP                                              :{BLACK}Selecciona ordre de classificació (descendent/ascendent)
@@ -440,7 +440,7 @@ STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Mostra l
 STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostra la llista de trens de l'empresa
 STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostra la llista de vehicles de l'empresa
 STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostra la llista de vaixells de l'empresa
-STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostra la llista d'avions de l'empresa
+STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostra la llista d'aeronaus de l'empresa
 STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Apropar-se
 STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Allunyar-se
 STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Construeix vies
@@ -458,7 +458,7 @@ STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Títol d
 STR_STICKY_BUTTON                                               :{BLACK}Marca aquesta finestra com a no eliminable pel 'Tanca totes les Finestres'
 STR_RESIZE_BUTTON                                               :{BLACK}Prem i arrossega per canviar el tamany de la finestra
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Prem aquí per anar a la carpeta per defecte actual de desa/carrega
-STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Enderroca edificis, etc. en un quadre de terreny
+STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Demolició d'edificis etc. en un quadre de terreny
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Rebaixa una cantonada del terreny
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Eleva una cantonada del terreny
 STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Barra de desplaçament - desplaça la llista amunt/avall
@@ -478,7 +478,7 @@ STR_AGE_RED                                                     :{RED}{COMMA} an
 ############ range for service numbers ends

 STR_019C_ROAD_VEHICLE                                           :Vehicle
-STR_019D_AIRCRAFT                                               :Avió
+STR_019D_AIRCRAFT                                               :Aeronau
 STR_019E_SHIP                                                   :Vaixell
 STR_019F_TRAIN                                                  :Tren
 STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} s'està envellint
@@ -600,7 +600,7 @@ STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Informa
 STR_MESSAGES_ALL                                                :{YELLOW}Adjust per tots els tipus de missatge (actiu/inactiu/resum)
 STR_MESSAGE_SOUND                                               :{YELLOW}Emetre so per als nous missatges resumits
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...massa lluny del destí previ
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Principals empreses en aconseguir el Nivell {NUM}{}({STRING} )
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Principals Empreses en asolir el Nivell {NUM}{}({STRING} )
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Taula de Lliga d'Empreses a {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
 STR_0213_BUSINESSMAN                                            :Empresari
@@ -735,9 +735,9 @@ STR_0290_DELETE                                                 :{BLACK}Esborra
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Esborra totalment aquesta població
 STR_0292_SAVE_SCENARIO                                          :Desa l'escenari
 STR_0293_LOAD_SCENARIO                                          :Carrega un escenari
-STR_0294_QUIT_EDITOR                                            :Surt de l'editor
+STR_0294_QUIT_EDITOR                                            :Sortir de l'editor
 STR_0295                                                        :
-STR_0296_QUIT                                                   :Surt
+STR_0296_QUIT                                                   :Sortir
 STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Desa l'escenari, carrega un escenari, abandona l'editor d'escenaris, sortir
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Carrega un Escenari
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Desa l'Escenari
@@ -745,7 +745,7 @@ STR_029A_PLAY_SCENARIO                                          :{BLACK}Juga un
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Juga un mapa d'alçades
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Comença un nou joc, utilitzant un mapa d'alçades com a terreny
 STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur que vols sortir d'aquest escenari ?
-STR_029C_QUIT_EDITOR                                            :{WHITE}Surt de l'Editor
+STR_029C_QUIT_EDITOR                                            :{WHITE}Sortir de l'Editor
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...només es pot construir en poblacions de més de 1200 hab.
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Retarda la data d'inici 1 any
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Avança la data d'inici 1 any
@@ -776,7 +776,7 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 STR_02C3_GAME_OPTIONS                                           :Opcions del Joc
 STR_02C5_DIFFICULTY_SETTINGS                                    :Paràmetres de dificultat
 STR_02C7_CONFIG_PATCHES                                         :Configura pedaços
-STR_NEWGRF_SETTINGS                                             :Extensions NewGRF
+STR_NEWGRF_SETTINGS                                             :Configuracions de Newgrf
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Mostra els noms de les poblacions
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Mostra els noms de les estacions
@@ -842,22 +842,22 @@ STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Seleccio
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Mostra les opcions del joc
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Mostra les opcions de dificultat
 STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Comença un joc nou, utilitzant un escenari personalitzat
-STR_0304_QUIT                                                   :{BLACK}Surt
-STR_0305_QUIT_OPENTTD                                           :{BLACK}Surt d'OpenTTD
+STR_0304_QUIT                                                   :{BLACK}Sortir
+STR_0305_QUIT_OPENTTD                                           :{BLACK}Sortir d'OpenTTD
 STR_0307_OPENTTD                                                :{WHITE}OpenTTD {REV}
 STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...només es pot construir en poblacions
 STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Selecciona l'estil de paisatge 'temperat'
 STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Selecciona l'estil de paisatge 'subàrtic'
 STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Selecciona l'estil de paisatge 'subtropical'
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Selecciona l'estil de paisatge 'toyland'
-STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Financia la construcció d'una nova indústria
+STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Patrocina la construcció d'una nova indústria

 ############ range for menu starts
 STR_INDUSTRY_DIR                                                :Directori d'indústries
-STR_0313_FUND_NEW_INDUSTRY                                      :Financia una nova indústria
+STR_0313_FUND_NEW_INDUSTRY                                      :Patrocina una nova indústria
 ############ range ends here

-STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Financia una nova indústria
+STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Patrocina una nova indústria
 STR_JUST_STRING                                                 :{STRING}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...només es pot construir en poblacions
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...només es pot construir en àrees de selva tropical
@@ -902,7 +902,7 @@ STR_TOWNNAME_CATALAN                                            :Català

 STR_CURR_GBP                                                    :Lliures (£)
 STR_CURR_USD                                                    :Dòlars ($)
-STR_CURR_EUR                                                    :Euro (€)
+STR_CURR_EUR                                                    :Euros (€)
 STR_CURR_YEN                                                    :Iens (¥)
 STR_CURR_ATS                                                    :Shillings Austríacs (ATS)
 STR_CURR_BEF                                                    :Francs Belgues (BEF)
@@ -910,7 +910,7 @@ STR_CURR_CHF                                                    :Francs Suissos
 STR_CURR_CZK                                                    :Corones Txeques (CZK)
 STR_CURR_DEM                                                    :Marcs Alemanys (DEM)
 STR_CURR_DKK                                                    :Corones Daneses (DKK)
-STR_CURR_ESP                                                    :Pesseta (ESP)
+STR_CURR_ESP                                                    :Peseta (ESP)
 STR_CURR_FIM                                                    :Marcs Finesos (FIM)
 STR_CURR_FRF                                                    :Franc (FRF)
 STR_CURR_GRD                                                    :Dracmes Gregues (GRD)
@@ -920,7 +920,7 @@ STR_CURR_ITL                                                    :Lires Italianes
 STR_CURR_NLG                                                    :Florins Holandesos (NLG)
 STR_CURR_NOK                                                    :Corones Noruegues (NOK)
 STR_CURR_PLN                                                    :Zloty Polac (PLN)
-STR_CURR_ROL                                                    :Leu Romanès (ROL)
+STR_CURR_ROL                                                    :Leu RomanÃšs (ROL)
 STR_CURR_RUR                                                    :Rubles Russos (RUR)
 STR_CURR_SIT                                                    :Eslovè Tolar (SIT)
 STR_CURR_SEK                                                    :Corones Sueques (SEK)
@@ -991,24 +991,24 @@ STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tren {CO
 STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tren {COMMA} té una ordre buida
 STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tren {COMMA} té ordres duplicades
 STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tren {COMMA} té una estació incorrecta en les ordres
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vehicle {COMMA} té massa poques ordres a la planificació
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vehicle {COMMA} té una ordre buida
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vehicle {COMMA} té ordres duplicades
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vehicle {COMMA} té una estació incorrecta en les ordres
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vehicle Rodat {COMMA} té massa poques ordres a la planificació
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vehicle Rodat {COMMA} té una ordre buida
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vehicle Rodat {COMMA} té ordres duplicades
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Vehicle Rodat {COMMA} té una estació incorrecta en les ordres
 STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Vaixell {COMMA} té massa poques ordres a la planificació
 STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Vaixell {COMMA} té una ordre buida
 STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Vaixell {COMMA} té ordres duplicades
 STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Vaixell {COMMA} té una estació incorrecta en les ordres
-STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}L'avió {COMMA} té massa poques ordres a la planificació
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}L'avió {COMMA} té una ordre buida
-STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}L'avió {COMMA} té ordres duplicades
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}L'avió {COMMA} té una estació incorrecta a les ordres
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aeronau {COMMA} té massa poques ordres a la planificació
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aeronau {COMMA} té una ordre buida
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aeronau {COMMA} has duplicate orders
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aeronau {COMMA} té una estació incorrecta en les ordres
 # end of order system

 STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenovació ha fallat al tren {COMMA} (límit de diners)
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenovació ha fallat a l'automòbil {COMMA} (límit de diners)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenovació ha fallat al vaixell {COMMA} (límit de diners)
-STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}L'autorenovació ha fallat en l'avió {COMMA} (límit de diners)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenovació ha fallat a l'aeronau {COMMA} (límit de diners)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}El tren {COMMA} és massa llarg després del canvi

 STR_CONFIG_PATCHES                                              :{BLACK}Configura Pedaços
@@ -1094,12 +1094,12 @@ STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Prefere

 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max trens per jugador: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max automòbils per jugador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max avions per jugador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Max aeronaus per jugador: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Max vaixells per jugador: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Desactiva trens per l'ordinador: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Desactiva automòbils per a l'ordinador: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactiva els avions per l'ordinador: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desactiva aeronaus per l'ordinador: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactiva vaixells per l'ordinador: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activa nova IA (alfa): {ORANGE}{STRING}
@@ -1109,8 +1109,8 @@ STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Interva
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Interval de manteniment per defecte dels trens: {ORANGE}desactivat
 STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Interval de manteniment per defecte dels automòbils: {ORANGE}{STRING} dies/%
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Interval de manteniment per defecte dels automòbils: {ORANGE}desactivat
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Interval de manteniment per defecte dels avions: {ORANGE}{STRING} dies/%
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Interval de manteniment per defecte dels avions: {ORANGE}desactivat
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Interval de manteniment per defecte de les aeronaus: {ORANGE}{STRING} dies/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Interval de manteniment per defecte de les aeronaus: {ORANGE}desactivat
 STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Interval de manteniment per defecte dels vaixells: {ORANGE}{STRING} dies/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Interval de manteniment per defecte dels vaixells: {ORANGE}desactivat
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactiva manteniment quan les avaries s'estableixen a cap: {ORANGE}{STRING}
@@ -1200,8 +1200,8 @@ STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Omple el
 STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}No es poden generar indústries...

 STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}Obre la barra d'eines del terreny per elevar/rebaixar nivell, plantar arbres, etc.
-STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Creació de paisatge
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivella el terreny
+STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Creant paisatge
+STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivell de terreny


 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbres de tipus aleatori
@@ -1239,21 +1239,21 @@ STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activa t
 STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Construeix Mina de Carbó
 STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Planta un Bosc
 STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Construeix una Plataforma Petrolífera
-STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Financia Granja
+STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Funda Granja
 STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Construeix una Mina de Coure
 STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Perfora per buscar Petroli
 STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Construeix una Mina d'Or
 STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Construeix una Mina de Diamants
 STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Construeix una Mina de Ferro
-STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Financia Plantació de Fruita
-STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Financia Plantació de Cautxú
-STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Financia Surtidor d'Aigua
+STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Funda Plantació de Fruita
+STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Funda Plantació de Cautxú
+STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Funda Surtidor d'Aigua
 STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Planta un Bosc de Cotó de Sucre
-STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Financia Granja de Piles
+STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Funda Granja de Piles
 STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}Perfora per buscar Cola
-STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP                             :{BLACK}Financia Fonts de Plàstic
+STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP                             :{BLACK}Funda Fonts de Plàstic
 STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}Construeix un Generador de Bombolles
-STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}Financia Cantera de Caramel
+STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}Funda Cantera de Caramel
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Construeix una Mina de Sucre

 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústries
@@ -1528,7 +1528,7 @@ STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Via de t
 STR_1007_ALREADY_BUILT                                          :{WHITE}...ja construit
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}S'ha de treure la via primer
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Construcció de Ferrocarril
-STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Construcció de Ferrocarril Elèctric
+STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Construcció de Via Electrificada
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Construcció de Monorail
 STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Construcció de Maglev
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Selecciona pont per la via
@@ -1540,7 +1540,7 @@ STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Aquí no
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Aquí no es poden treure les senyals...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Cotxeres de Tren
 STR_1015_RAILROAD_CONSTRUCTION                                  :Construcció de Ferrocarril
-STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Construcció de Ferrocarril Elèctric
+STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Contrucció de Via Electrificada
 STR_1016_MONORAIL_CONSTRUCTION                                  :Construcció de Monorail
 STR_1017_MAGLEV_CONSTRUCTION                                    :Construcció de Maglev
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Construeix via de tren
@@ -1663,19 +1663,19 @@ STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Accions
 STR_2046_SMALL_ADVERTISING_CAMPAIGN                             :Petita campanya de publicitat
 STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :Mitjana campanya de publicitat
 STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :Gran campanya de publicitat
-STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :Financia la reconstrucció dels carrers de la població
+STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :Patrocina la reconstrucció dels carrers de la població
 STR_204A_BUILD_STATUE_OF_COMPANY                                :Construeix una estàtua del propietari de l'empresa
-STR_204B_FUND_NEW_BUILDINGS                                     :Financia nous edificis
+STR_204B_FUND_NEW_BUILDINGS                                     :Patrocina nous edificis
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Compra els drets de transport en exclusiva
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Suborna les autoritats locals
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Subornar les autoritats locals
 STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Inicia una petita campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}  Cost: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Inicia una mitjana campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}  Cost: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Inicia una gran campanya de publicitat, per atraure més passatgers i càrregues als teus serveis de transport.{}  Cost: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Financia la reconstrucció de la xarxa local de carrers. Dificulta notablement el trànsit durant 6 mesos.{}  Cost: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Patrocina la reconstrucció de la xarxa local de carrers. Causa una notable distorsió del trànsit durant 6 mesos.{}  Cost: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Construeix una estatua en honor a la teva empresa.{} Cost: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financia la construcció de nous edificis comercials a la població.{}  Cost: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Patrocina la construcció de nous edificis comercials en la població.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compra per 1 any els drets exclusius de transport en la població. La autoritat local només permetrà utilitzar les instal·lacions de la teva empresa de transports als passatgers i les mercaderies.{} Cost: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Suborna les autoritats locals per incrementar el teu rati, a risc de greus penalitzacions si et pesquen!!.{}  Cost: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar les autoritats locals per incrementar el teu rati, a risc de greus penalitzacions si et pesquen!!.{}  Cost: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Caos de trànsit en  {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {COMPANY} porta 6 mesos de misèria als motoristes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -1773,7 +1773,7 @@ STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Seleccio
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
 STR_305E_RAILROAD_STATION                                       :Estació de Ferrocarril
-STR_305F_AIRCRAFT_HANGAR                                        :Hangar d'Avions
+STR_305F_AIRCRAFT_HANGAR                                        :Hangar d'Aeronaus
 STR_3060_AIRPORT                                                :Aeroport
 STR_3061_TRUCK_LOADING_AREA                                     :Àrea de càrrega de camions
 STR_3062_BUS_STATION                                            :Parada d'autobús
@@ -1801,7 +1801,6 @@ STR_3804_WATER                                                  :Aigua
 STR_3805_COAST_OR_RIVERBANK                                     :Costa o marge de riu
 STR_3806_SHIP_DEPOT                                             :Drassana
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...No es pot construir dins l'aigua
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Has de demolir el canal primer

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Desa el Joc
@@ -1947,9 +1946,9 @@ STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...ja é
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Sense Nom
 STR_SV_TRAIN_NAME                                               :Tren {COMMA}
-STR_SV_ROADVEH_NAME                                             :Vehicle {COMMA}
+STR_SV_ROADVEH_NAME                                             :Vehicle Rodat {COMMA}
 STR_SV_SHIP_NAME                                                :Vaixell {COMMA}
-STR_SV_AIRCRAFT_NAME                                            :Avió {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aeronau {COMMA}

 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_NORTH                                             :{STRING} Nort
@@ -2080,15 +2079,15 @@ STR_7010                                                        :{WHITE}{NUM}
 STR_7011_CONSTRUCTION                                           :{GOLD}Construcció
 STR_7012_NEW_VEHICLES                                           :{GOLD}Nous Vehicles
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Desp. de Circ. de Trens
-STR_7014_ROAD_VEH_RUNNING_COSTS                                 :{GOLD}Desp. de Circ. de Vehicles
-STR_7015_AIRCRAFT_RUNNING_COSTS                                 :{GOLD}Desp. de Circ. d'Avions
+STR_7014_ROAD_VEH_RUNNING_COSTS                                 :{GOLD}Desp. de Circ. de Vehicles Rodats
+STR_7015_AIRCRAFT_RUNNING_COSTS                                 :{GOLD}Desp. de Circ. d'Aeronaus
 STR_7016_SHIP_RUNNING_COSTS                                     :{GOLD}Desp. de Circ. de Vaixells
 STR_7017_PROPERTY_MAINTENANCE                                   :{GOLD}Manteniment de Propietats
 STR_7018_TRAIN_INCOME                                           :{GOLD}Ingressos de Tren
-STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Ingressos de Vehicles
-STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Ingressos d'Avions
+STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Ingressos de Vehicles Rodats
+STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Ingressos d'Aeronaus
 STR_701B_SHIP_INCOME                                            :{GOLD}Ingressos de Vaixells
-STR_701C_LOAN_INTEREST                                          :{GOLD}Interessos del Préstec
+STR_701C_LOAN_INTEREST                                          :{GOLD}Interessos del Prèstec
 STR_701D_OTHER                                                  :{GOLD}Altres
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
@@ -2122,7 +2121,7 @@ STR_7038_INAUGURATED                                            :{GOLD}Inaugurat
 STR_7039_VEHICLES                                               :{GOLD}Vehicles:
 STR_TRAINS                                                      :{WHITE}{COMMA} tren{P "" s}
 STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} automòbil{P "" s}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} avió{P "" ns}
+STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeronau{P "" s}
 STR_SHIPS                                                       :{WHITE}{COMMA} vaixell{P "" s}
 STR_7042_NONE                                                   :{WHITE}Cap
 STR_7043_FACE_SELECTION                                         :{WHITE}Selecció de cares
@@ -2251,29 +2250,29 @@ STR_8018_SH_40_ELECTRIC                                         :SH '40' (Elèct
 STR_8019_T_I_M_ELECTRIC                                         :'T.I.M.' (Elèctric)
 STR_801A_ASIASTAR_ELECTRIC                                      :'AsiaStar' (Elèctric)
 STR_801B_PASSENGER_CAR                                          :Vagó per Passatgers
-STR_801C_MAIL_VAN                                               :Vagó per Correu
+STR_801C_MAIL_VAN                                               :Furgó per Correu
 STR_801D_COAL_CAR                                               :Vagó per Carbó
 STR_801E_OIL_TANKER                                             :Tanc de Petroli
-STR_801F_LIVESTOCK_VAN                                          :Vagó per Bestiar
-STR_8020_GOODS_VAN                                              :Vagó de Mercaderies
-STR_8021_GRAIN_HOPPER                                           :Vagó per Gra
+STR_801F_LIVESTOCK_VAN                                          :Furgó per Bestiar
+STR_8020_GOODS_VAN                                              :Furgó de Mercaderies
+STR_8021_GRAIN_HOPPER                                           :Furgó per Gra
 STR_8022_WOOD_TRUCK                                             :Vagó per Fusta
 STR_8023_IRON_ORE_HOPPER                                        :Vagó per Mineral de Ferro
 STR_8024_STEEL_TRUCK                                            :Vagó per Acer
-STR_8025_ARMORED_VAN                                            :Vagó Blindat
-STR_8026_FOOD_VAN                                               :Vagó per Queviures
+STR_8025_ARMORED_VAN                                            :Furgó Blindat
+STR_8026_FOOD_VAN                                               :Furgó per Queviures
 STR_8027_PAPER_TRUCK                                            :Vagó per Paper
-STR_8028_COPPER_ORE_HOPPER                                      :Vagó per Mineral de Coure
+STR_8028_COPPER_ORE_HOPPER                                      :Furgó per Mineral de Coure
 STR_8029_WATER_TANKER                                           :Tanc d'Aigua
 STR_802A_FRUIT_TRUCK                                            :Vagó per Fruita
 STR_802B_RUBBER_TRUCK                                           :Vagó per Cautxú
 STR_802C_SUGAR_TRUCK                                            :Vagó per Sucre
-STR_802D_COTTON_CANDY_HOPPER                                    :Vagó per Cotó de Sucre
-STR_802E_TOFFEE_HOPPER                                          :Vagó per Caramels
-STR_802F_BUBBLE_VAN                                             :Vagó per Bombolles
+STR_802D_COTTON_CANDY_HOPPER                                    :Furgó per Cotó de Sucre
+STR_802E_TOFFEE_HOPPER                                          :Furgó per Caramels
+STR_802F_BUBBLE_VAN                                             :Furgó per Bombolles
 STR_8030_COLA_TANKER                                            :Tanc per Refresc
-STR_8031_CANDY_VAN                                              :Vagó per Dolços
-STR_8032_TOY_VAN                                                :Vagó per Joguines
+STR_8031_CANDY_VAN                                              :Furgó per Dolços
+STR_8032_TOY_VAN                                                :Furgó per Joguines
 STR_8033_BATTERY_TRUCK                                          :Vagó per Piles
 STR_8034_FIZZY_DRINK_TRUCK                                      :Vagó per Begudes Gasoses
 STR_8035_PLASTIC_TRUCK                                          :Vagó per Plàstic
@@ -2281,29 +2280,29 @@ STR_8036_X2001_ELECTRIC                                         :'X2001' (Elèct
 STR_8037_MILLENNIUM_Z1_ELECTRIC                                 :'Millennium Z1' (Elèctric)
 STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99
 STR_8039_PASSENGER_CAR                                          :Vagó per Passatgers
-STR_803A_MAIL_VAN                                               :Vagó per Correu
+STR_803A_MAIL_VAN                                               :Furgó per Correu
 STR_803B_COAL_CAR                                               :Vagó per Carbó
 STR_803C_OIL_TANKER                                             :Tanc de Petroli
-STR_803D_LIVESTOCK_VAN                                          :Vagó per Bestiar
-STR_803E_GOODS_VAN                                              :Vagó de Mercaderies
-STR_803F_GRAIN_HOPPER                                           :Vagó per Gra
+STR_803D_LIVESTOCK_VAN                                          :Furgó per Bestiar
+STR_803E_GOODS_VAN                                              :Furgó de Mercaderies
+STR_803F_GRAIN_HOPPER                                           :Furgó per Gra
 STR_8040_WOOD_TRUCK                                             :Vagó per Fusta
 STR_8041_IRON_ORE_HOPPER                                        :Vagó per Mineral de Ferro
 STR_8042_STEEL_TRUCK                                            :Vagó per Acer
-STR_8043_ARMORED_VAN                                            :Vagó Blindat
-STR_8044_FOOD_VAN                                               :Vagó per Queviures
+STR_8043_ARMORED_VAN                                            :Furgó Blindat
+STR_8044_FOOD_VAN                                               :Furgó per Queviures
 STR_8045_PAPER_TRUCK                                            :Vagó per Paper
-STR_8046_COPPER_ORE_HOPPER                                      :Vagó per Mineral de Coure
+STR_8046_COPPER_ORE_HOPPER                                      :Furgó per Mineral de Coure
 STR_8047_WATER_TANKER                                           :Tanc d'Aigua
 STR_8048_FRUIT_TRUCK                                            :Vagó per Fruita
 STR_8049_RUBBER_TRUCK                                           :Vagó per Cautxú
 STR_804A_SUGAR_TRUCK                                            :Vagó per Sucre
-STR_804B_COTTON_CANDY_HOPPER                                    :Vagó per Cotó de Sucre
-STR_804C_TOFFEE_HOPPER                                          :Vagó per Caramels
-STR_804D_BUBBLE_VAN                                             :Vagó per Bombolles
+STR_804B_COTTON_CANDY_HOPPER                                    :Furgó per Cotó de Sucre
+STR_804C_TOFFEE_HOPPER                                          :Furgó per Caramels
+STR_804D_BUBBLE_VAN                                             :Furgó per Bombolles
 STR_804E_COLA_TANKER                                            :Tanc per Refresc
-STR_804F_CANDY_VAN                                              :Vagó per Dolços
-STR_8050_TOY_VAN                                                :Vagó per Joguines
+STR_804F_CANDY_VAN                                              :Furgó per Dolços
+STR_8050_TOY_VAN                                                :Furgó per Joguines
 STR_8051_BATTERY_TRUCK                                          :Vagó per Piles
 STR_8052_FIZZY_DRINK_TRUCK                                      :Vagó per Begudes Gasoses
 STR_8053_PLASTIC_TRUCK                                          :Vagó per Plàstic
@@ -2313,29 +2312,29 @@ STR_8056_LEV3_PEGASUS_ELECTRIC                                  :Lev3 'Pegasus'
 STR_8057_LEV4_CHIMAERA_ELECTRIC                                 :Lev4 'Quimera' (Elèctric)
 STR_8058_WIZZOWOW_ROCKETEER                                     :Wizzowow Rocketeer
 STR_8059_PASSENGER_CAR                                          :Vagó per Passatgers
-STR_805A_MAIL_VAN                                               :Vagó per Correu
+STR_805A_MAIL_VAN                                               :Furgó per Correu
 STR_805B_COAL_CAR                                               :Vagó per Carbó
 STR_805C_OIL_TANKER                                             :Tanc de Petroli
-STR_805D_LIVESTOCK_VAN                                          :Vagó per Bestiar
-STR_805E_GOODS_VAN                                              :Vagó de Mercaderies
-STR_805F_GRAIN_HOPPER                                           :Vagó per Gra
+STR_805D_LIVESTOCK_VAN                                          :Furgó per Bestiar
+STR_805E_GOODS_VAN                                              :Furgó de Mercaderies
+STR_805F_GRAIN_HOPPER                                           :Furgó per Gra
 STR_8060_WOOD_TRUCK                                             :Vagó per Fusta
 STR_8061_IRON_ORE_HOPPER                                        :Vagó per Mineral de Ferro
 STR_8062_STEEL_TRUCK                                            :Vagó per Acer
-STR_8063_ARMORED_VAN                                            :Vagó Blindat
-STR_8064_FOOD_VAN                                               :Vagó per Queviures
+STR_8063_ARMORED_VAN                                            :Furgó Blindat
+STR_8064_FOOD_VAN                                               :Furgó per Queviures
 STR_8065_PAPER_TRUCK                                            :Vagó per Paper
-STR_8066_COPPER_ORE_HOPPER                                      :Vagó per Mineral de Coure
+STR_8066_COPPER_ORE_HOPPER                                      :Furgó per Mineral de Coure
 STR_8067_WATER_TANKER                                           :Tanc d'Aigua
 STR_8068_FRUIT_TRUCK                                            :Vagó per Fruita
 STR_8069_RUBBER_TRUCK                                           :Vagó per Cautxú
 STR_806A_SUGAR_TRUCK                                            :Vagó per Sucre
-STR_806B_COTTON_CANDY_HOPPER                                    :Vagó per Cotó de Sucre
-STR_806C_TOFFEE_HOPPER                                          :Vagó per Caramels
-STR_806D_BUBBLE_VAN                                             :Vagó per Bombolles
+STR_806B_COTTON_CANDY_HOPPER                                    :Furgó per Cotó de Sucre
+STR_806C_TOFFEE_HOPPER                                          :Furgó per Caramels
+STR_806D_BUBBLE_VAN                                             :Furgó per Bombolles
 STR_806E_COLA_TANKER                                            :Tanc per Refresc
-STR_806F_CANDY_VAN                                              :Vagó per Dolços
-STR_8070_TOY_VAN                                                :Vagó per Joguines
+STR_806F_CANDY_VAN                                              :Furgó per Dolços
+STR_8070_TOY_VAN                                                :Furgó per Joguines
 STR_8071_BATTERY_TRUCK                                          :Vagó per Piles
 STR_8072_FIZZY_DRINK_TRUCK                                      :Vagó per Begudes Gasoses
 STR_8073_PLASTIC_TRUCK                                          :Vagó per Plàstic
@@ -2358,9 +2357,9 @@ STR_8083_WIZZOWOW_MAIL_TRUCK                                    :Camió per Corr
 STR_8084_WITCOMBE_OIL_TANKER                                    :Cuba de Petroli Witcombe
 STR_8085_FOSTER_OIL_TANKER                                      :Cuba de Petroli Foster
 STR_8086_PERRY_OIL_TANKER                                       :Cuba de Petroli Perry
-STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Camió de Bestiar Talbott
-STR_8088_UHL_LIVESTOCK_VAN                                      :Vagó de Bestiar Uhl
-STR_8089_FOSTER_LIVESTOCK_VAN                                   :Camió de Bestiar Foster
+STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Furgó de Bestiar Talbott
+STR_8088_UHL_LIVESTOCK_VAN                                      :Furgó de Bestiar Uhl
+STR_8089_FOSTER_LIVESTOCK_VAN                                   :Furgó de Bestiar Foster
 STR_808A_BALOGH_GOODS_TRUCK                                     :Camió de Mercaderies
 STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Camió de Mercaderies
 STR_808C_GOSS_GOODS_TRUCK                                       :Camió de Mercaderies Goss
@@ -2483,7 +2482,7 @@ STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Missatge
 STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Acabem de dissenyar el nou {STRING} - estàs interessat en fer ús exclusiu d'aquest vehicle durant un any, per veure com va, abans del seu llançament mundial ?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :locomotora de tren
 STR_8103_ROAD_VEHICLE                                           :automòbil
-STR_8104_AIRCRAFT                                               :avió
+STR_8104_AIRCRAFT                                               :aeronau
 STR_8105_SHIP                                                   :vaixell
 STR_8106_MONORAIL_LOCOMOTIVE                                    :locomotora de monorail
 STR_8107_MAGLEV_LOCOMOTIVE                                      :locomotora de maglev
@@ -2530,8 +2529,8 @@ STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren mas
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Els trens només es poden modificar quan estan parats dins d'una cotxera
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trens

-STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nous Trens
-STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nous Trens de Via Electrificada
+STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nous Vehicles
+STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nous vehicles de Via Electrificada
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nous Trens Monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nous Trens Maglev
 STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Vehicles amb Vies
@@ -2546,10 +2545,10 @@ STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Fa una c
 STR_8820_RENAME                                                 :{BLACK}Reanomena
 STR_8823_SKIP                                                   :{BLACK}Salta
 STR_8824_DELETE                                                 :{BLACK}Esborra
-STR_8825_NON_STOP                                               :{BLACK}No paris
+STR_8825_NON_STOP                                               :{BLACK}Sense Parar
 STR_8826_GO_TO                                                  :{BLACK}Ves a
 STR_8827_FULL_LOAD                                              :{BLACK}Carrega
-STR_8828_UNLOAD                                                 :{BLACK}Descarreg
+STR_8828_UNLOAD                                                 :{BLACK}Descarrega
 STR_REFIT                                                       :{BLACK}Remodela
 STR_REFIT_TIP                                                   :{BLACK}Selecciona quin tipus de càrrega vols remodelar en aquesta ordre. Control + Clic per eliminar l'ordre de remodelar
 STR_REFIT_ORDER                                                 :(Remodela a {STRING})
@@ -2577,13 +2576,13 @@ STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Incapaç
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}No es pot parar/arrencar el tren...
 STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}dies{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
 STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}%{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
-STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - clica al tren per més informació
+STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - clica al tren per informació
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Construeix nous trens (es necessita cotxera)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trens - clica al tren per info., arrossega el vehicle per afegir/treure del tren
 STR_8840_BUILD_NEW_TRAIN_VEHICLE                                :{BLACK}Construeix un nou element de tren
 STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE                             :{BLACK}Arrossega l'element de tren fins aquí per vendre'l
 STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Centra la vista de la pantalla principal en la situació de la cotxera
-STR_8843_TRAIN_VEHICLE_SELECTION                                :{BLACK}Llista de selecció d'elements de tren - clica a l'element per més informació
+STR_8843_TRAIN_VEHICLE_SELECTION                                :{BLACK}Llista de selecció d'elements de tren - clica a l'element per informació
 STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Construeix l'element de tren seleccionat
 STR_8845_RENAME_TRAIN_VEHICLE_TYPE                              :{BLACK}Reanomena el tipus d'element del tren
 STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Acció sobre el tren actual - clica aquí per parar/arrencar el tren
@@ -2625,7 +2624,7 @@ STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}No es po
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Reanomena el tipus d'element del tren
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}No es pot reanomenar el tipus d'element del tren...
 STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Fer que l'ordre marcada forci al vehicle a volcar la càrrega
-STR_886F_TRANSFER                                               :{BLACK}Transf.
+STR_886F_TRANSFER                                               :{BLACK}Transfereix

 STR_TRAIN_STOPPING                                              :{RED}Parant
 STR_TRAIN_STOPPING_VEL                                          :{RED}Parant, a {VELOCITY}
@@ -2639,11 +2638,11 @@ STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nou {STR

 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automòbil en camí
-STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehicles
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehicles Rodats
 STR_9002                                                        :{WHITE}{VEHICLE}
-STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Cotxera de Vehicles
+STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Cotxera de Vehicles Rodats
 STR_9004_NEW_VEHICLES                                           :{BLACK}Nous Vehicles
-STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Nous Vehicles
+STR_9006_NEW_ROAD_VEHICLES                                      :{WHITE}Nous Vehicles Rodats
 STR_9007_BUILD_VEHICLE                                          :{BLACK}Construeix Vehicle
 STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}No es pot construir l'automòbil...
 STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalls)
@@ -2656,14 +2655,14 @@ STR_9012_CAPACITY                                               :{BLACK}Capacita
 STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...s'ha de parar dins d'una cotxera
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}No pots vendre l'automòbil...
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}No es pot parar/arrencar l'automòbil...
-STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vehicle {COMMA} esperant en cotxera
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vehicle Rodat {COMMA} esperant en cotxera
 STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Cap a la cotxera de {TOWN}.
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Cap a la cotxera de {TOWN}, a {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Revisió a la cotxera de {TOWN}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}No es pot enviar el vehicle a cotxera...
 STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Impossible trobar la cotxera local
-STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Automòbils - clica en un vehicle per més informació
+STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Automòbils - clica en un vehicle per informació
 STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Construeix nous automòbils (necessita una cotxera)
 STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Acció sobre el vehicle actual - clica aquí per parar/arrencar el vehicle
 STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Mostra les ordres dels vehicles
@@ -2671,11 +2670,11 @@ STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Centra l
 STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Envia el vehicle a cotxera
 STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Obliga al vehicle a tornar
 STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Mostra els detalls del vehicle
-STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Vehicles - clica en un vehicle per més informació
+STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Vehicles - clica en un vehicle per informació
 STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Construeix un nou automòbil
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Arrossega el vehicle fins aquí per vendre'l
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centra la pantalla principal en la situació de la cotxera
-STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Llista de selecció de Vehicles - clica en un vehicle per més informació
+STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Llista de selecció de Vehicles Rodats - clica en un vehicle per informació
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construeix l'automòbil seleccionat
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Velocitat: {VELOCITY}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {CARGO}

@@ -2684,8 +2683,8 @@ STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}No es po
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Anomena automòbil
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}Primer autobús arriba a {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}Primer camió arriba a {STATION}!
-STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident de Vehicle!{}El conductor mor en una bola de foc després de la colisió amb un tren
-STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident de Vehicle!{}{COMMA} moren en una bola de foc després d'una colisió amb un tren
+STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Accident de Vehicle Rodat!{}El conductor mor en una bola de foc després de la colisió amb un tren
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Accident de Vehicle Rodat!{}{COMMA} moren en una bola de foc després d'una colisió amb un tren
 STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}No es pot fer que el vehicle torni...
 STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}No es poden girar vehicles que estan formats per múltiples unitats
 STR_9034_RENAME                                                 :{BLACK}Reanomena
@@ -2709,7 +2708,7 @@ STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} D
 STR_9804_NEW_SHIPS                                              :{BLACK}Nous Vaixells
 STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Vaixells
 STR_9808_NEW_SHIPS                                              :{WHITE}Nous Vaixells
-STR_9809_BUILD_SHIP                                             :{BLACK}Construeix Vaixell
+STR_9809_BUILD_SHIP                                             :{BLACK}Construeix un Vaixell
 STR_CLONE_SHIP                                                  :{BLACK}Clona Vaixell
 STR_CLONE_SHIP_INFO                                             :{BLACK}Fa una còpia del vaixell. Control-Clic compartirà les ordres
 STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Fa una còpia del vaixell. Prem aquest botó i després en un vaixell dins o fora les drassanes. Control-Clic compartirà les ordres
@@ -2735,13 +2734,13 @@ STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisi
 STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Vaixell {COMMA} esperant en drassana
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Construeix un port
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Construeix una drassana (per construir i revisar vaixells)
-STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Vaixells - clica en un vaixell per més informació
+STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Vaixells - clica en un vaixell per informació
 STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Construeix un nou vaixell
 STR_9821_DRAG_SHIP_TO_HERE_TO_SELL                              :{BLACK}Arrossega el vaixell fins aquí per vendre'l
 STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centra la pantalla principal en la situació de la drassana
-STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Vaixells - clica en un vaixell per més informació
+STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Vaixells - clica en un vaixell per informació
 STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Construeix nous vaixells (necessites una drassana)
-STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Llista de selecció de Vaixells - clica en un vaixell per més informació
+STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}LLista de selecció de Vaixells - clica en un vaixell per informació
 STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Construeix el vaixell seleccionat
 STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Accions sobre el vaixell actual - clica aquí per parar/arrencar el vaixell
 STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Mostra les ordres del vaixell
@@ -2775,15 +2774,15 @@ SERVICE_AT_SHIP_DEPOT                                           :Manteniment a d
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeroports
 STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Aquí no es pot construir un aeroport...
-STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION} Hangar d'Avions
-STR_A003_NEW_AIRCRAFT                                           :{BLACK}Nou Avió
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clona Avió
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Fa una còpia de l'avió. Control-Clic compartirà les ordres
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Fa una còpia de l'avió. Prem aquest botó i després en un avió dins o fora l'hangar. Control-Clic compartirà les ordres
-STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nou Avió
-STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construeix Avió
-STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}No es pot construir l'avió...
-STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Avions
+STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION} Hangar d'Aeronaus
+STR_A003_NEW_AIRCRAFT                                           :{BLACK}Nova Aeronau
+STR_CLONE_AIRCRAFT                                              :{BLACK}Clona Aeronau
+STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Fa una còpia de l'aeronau. Control-Clic compartirà les ordres
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Fa una còpia de l'aeronau. Prem aquest botó i després en una aeronau dins o fora l'hangar. Control-Clic compartirà les ordres
+STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronau
+STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Construeix una Aeronau
+STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}No es pot construir l'aeronau...
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Aeronaus
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Ordres)
 STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalls)
@@ -2792,55 +2791,55 @@ STR_A00E_MAX_SPEED                                              :{BLACK}Max. vel
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Benefici enguany: {LTBLUE}{CURRENCY}  (darrer any: {CURRENCY})
 STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Rendibilitat: {LTBLUE}{COMMA}%  {BLACK}Avaries des de l'últim manteniment: {LTBLUE}{COMMA}
 STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Construït: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
-STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}No es pot enviar l'avió a l'hangar...
+STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}No es pot enviar l'aeronau a l'hangar...
 STR_HEADING_FOR_HANGAR                                          :{ORANGE}Cap a l'hangar de {STATION}.
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Cap a l'hangar de {STATION}, a {VELOCITY}
 STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Revisió a l'hangar de {STATION}
 STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Revisió a l'hangar de {STATION}, {VELOCITY}
-STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}L'avió {COMMA} està esperant a l'hangar
-STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Avió al camí
-STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}No es pot parar/arrencar l'avió...
-STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}L'avió està volant
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}L' aeronau {COMMA} esperant a l'hangar
+STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Aeronau en el camí
+STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}No es pot parar/arrencar l'aeronau...
+STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Aeronau en vol
 STR_A019_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{CARGO}, {CARGO}
 STR_A01A_CAPACITY                                               :{BLACK}Capacitat: {LTBLUE}{CARGO}
-STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}L'avió s'ha de parar a l'hangar
-STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}No es pot vendre l'avió...
+STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}L' aeronau s'ha de parar a l'hangar
+STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}No es pot vendre l' aeronau...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construcció d'Aeroport
 STR_A01E_BUILD_AIRPORT                                          :{BLACK}Construeix un aeroport
-STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Avió - clica sobre l'avió per més informació
-STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES                            :{BLACK}Construeix nous avions (necessites un aeroport amb hangar)
-STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Avió - clica sobre l'avió per més informació
-STR_A022_BUILD_NEW_AIRCRAFT                                     :{BLACK}Construeix nous avions
-STR_A023_DRAG_AIRCRAFT_TO_HERE_TO                               :{BLACK}Arrossega l'avió fins aquí per vendre'l
+STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Aeronau - clica en l'aeronau per informació
+STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES                            :{BLACK}Construeix noves aeronaus (necessites un aeroport amb hangar)
+STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT                             :{BLACK}Aeronau - clica en l' aeronau per informació
+STR_A022_BUILD_NEW_AIRCRAFT                                     :{BLACK}Construeix noves aeronaus
+STR_A023_DRAG_AIRCRAFT_TO_HERE_TO                               :{BLACK}Arrossega l'aeronau fins aquí per vendre-la
 STR_A024_CENTER_MAIN_VIEW_ON_HANGAR                             :{BLACK}Centra la pantalla principal en la situació de l'hangar
-STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Llista de selecció d'Avions - clica sobre l'avió per més informació
-STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Construeix l'avió seleccionat
-STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Accions sobre l'avió actual - clica aquí per parar/arrencar l'avió
-STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Mostra les ordres de l'avió
-STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centra la pantalla principal a la situació de l'avió
-STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Envia avió a l'hangar
-STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostra els detalls de l'avió
+STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Llista de selecció d'Aeronaus - clica en una aeronau per informació
+STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Construeix l'aeronau seleccionada
+STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Accions sobre l'aeronau actual - clica aquí per parar/arrencar l'aeronau
+STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Mostra les ordres de l'aeronau
+STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centra la pantalla principal a la situació de l'aeronau
+STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Envia aeronau a l'hangar
+STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostra els detalls de l'aeronau
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Velocitat: {VELOCITY}{}Capacitat: {COMMA} passatgers, {COMMA} sacs de correu{}Cost de Circulació: {CURRENCY}/any

-STR_A030_NAME_AIRCRAFT                                          :{WHITE}Anomena avió
-STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}No es pot anomenar l'avió...
-STR_A032_NAME_AIRCRAFT                                          :{BLACK}Anomena avió
-STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}El primer avió arriba a {STATION}!
+STR_A030_NAME_AIRCRAFT                                          :{WHITE}Anomena aeronau
+STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}No es pot anomenar aeronaus...
+STR_A032_NAME_AIRCRAFT                                          :{BLACK}Anomena aeronau
+STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebració popular . . .{}La primera aeronau arriba a {STATION}!
 STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Accident d'avió!{}{COMMA} moren en una bola de foc a {STATION}
-STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident d'aviació!{}L'avió s'ha quedat sense combustible, {COMMA} morts en l'accident!
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Accident d'aviació!{}Aeronau sense combustible, {COMMA} morts en una bola de foc!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Reanomena
-STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Reanomena tipus d'avió
-STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Reanomena tipus d'avió
-STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}No es pot reanomenar el tipus d'avió...
-STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Remodela avions per poder transportar diferents tipus de càrrega
+STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Reanomena tipus d'aeronau
+STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Reanomena tipus d'aeronau
+STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}No es pot reanomenar tipus d'aeronau...
+STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Remodela aeronaus per transportar diferent tipus de càrrega
 STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Remodela)
-STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Remodela avió
+STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Remodela aeronau
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona tipus de càrrega a transportar
-STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Remodela l'avió per poder transportar el tipus de càrrega seleccionat
+STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Remodela aeronau per transportar el tipus de càrrega seleccionat
 STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona el tipus de càrrega a transportar:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
-STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No es pot remodelar l'avió...
+STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No es pot remodelar l'aeronau...
 STR_GO_TO_AIRPORT_HANGAR                                        :Ves a l'hangar de {STATION}.
 SERVICE_AT_AIRPORT_HANGAR                                       :Manteniment en l'hangar de {STATION}.

@@ -2872,10 +2871,10 @@ STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Max. ing
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Entregat:
 STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Càrrega:
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Diner:
-STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Préstec:
+STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Prèstec:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Quantitat de vehicles. Inclou els automòbils, trens, vaixells i avions.
+STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Quantitat de vehicles. Inclou els automòbils, trens, vaixells i aeronaus.
 STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Quantitat de parts d'estacions. Cada part d'una estació es compta (ex. estació de tren, parada d'autobus, aeroport), encara que estigui connectada a una altra estació.
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}El benefici del vehicle amb els menors ingressos (de tots els vehicles més antics de 2 anys)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Quantitat de diners fets durant el mes amb el mínim benefici dels darrers 12 trimestres
@@ -2886,12 +2885,12 @@ STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Quantita
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Tens un prèstec elevat?
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total de punts sobre els punts possibles

-STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Extensions NewGRF
-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Extensions NewGRF
+STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Paràmetres NewGRF
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Configuracions de Newgrf
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplica els canvis
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Estableix els paràmetres
-STR_NEWGRF_TIP                                                  :{BLACK}Llista de totes les opcions de NewGRF que has instal·lat. Prem en un grup d'opcions per canviar els seus atributs.
-STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Ara no hi ha arxius de NewGRF instal·lats! Consulta el manual per a les instruccions d'instal·lació de nous gràfics.
+STR_NEWGRF_TIP                                                  :{BLACK}Llista de totes les opcions de Newgrf que has instal·lat. Prem en un grup d'opcions per canviar els seus atributs.
+STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Ara no hi ha arxius de Newgrf instal·lats! Consulta el manual per a les instruccions d'instal·lació de nous gràfics.
 STR_NEWGRF_FILENAME                                             :{BLACK}Nom d'arxiu: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}Id de GRF: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
@@ -2902,11 +2901,11 @@ STR_NEWGRF_ADD                                                  :{BLACK}Afegeix
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Afegeix un arxiu NewGRF a la llista
 STR_NEWGRF_REMOVE                                               :{BLACK}Treu
 STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Treu l'arxiu NewGRF seleccionat de la llista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Mou amunt
+STR_NEWGRF_MOVEUP                                               :{BLACK}Mou Amunt
 STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Mou amunt l'arxiu NewGRF seleccionat de la llista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mou avall
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mou Avall
 STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Mou avall l'arxiu NewGRF seleccionat de la llista
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Una llista d'arxius NewGRF que han estat instal·lats. Clica un arxiu per canviar els seus paràmetres
+STR_NEWGRF_FILE_TIP                                             :{BLACK}Una llista d'arxius NewGRF que ha estat instal·lada. Clica un arxiu per canviar els seus paràmetres
 STR_NEWGRF_PARAMETER                                            :{BLACK}Paràmetres: {SILVER}{STRING}
 STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Introdueix els paràmetres NewGRF
 STR_NEWGRF_NO_INFO                                              :{BLACK}No hi ha informació disponible
@@ -2944,13 +2943,13 @@ STR_SHIP                                                        :{BLACK}{SHIP}

 STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trens
 STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Vehicles
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Avions
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aeronaus
 STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Vaixells

-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostra tots els trens que tinguin aquesta estació en el seu itinerari
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostra tots els vehicles que tinguin aquesta estació en el seu itinerari
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostra tots els avions que tinguin aquest aeroport en el seu itinerari
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostra tots els vaixells que tinguin aquest port en el seu itinerari
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostra tots els trens que tinguin aquesta estació al seu itinerari
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostra tots els vehicles que tinguin aquesta estació al seu itinerari
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostra totes les aeronaus que tinguin aquest aeroport al seu itinerari
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostra tots els vaixells que tinguin aquest port al seu itinerari

 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordres compartides de {COMMA} Vehicle{P "" s}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostra tots els vehicles que tenen les mateixes ordres
@@ -2979,7 +2978,7 @@ STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vendre t
 STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Treure una llista de tots els trens amb aquesta cotxera en les seves ordres
 STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP                        :{BLACK}Treure una llista de tots els vehicles amb aquesta cotxera en les seves ordres
 STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Treure una llista de tots els vaixells amb aquesta drassana en les seves ordres
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Treu una llista de tots els avions amb algun hangar d'aquest aeroport en les seves ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Treu una llista de tots els avions amb algun hangar en aquest aeroport en les seves ordres

 STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autosubstitueix tots els trens de la cotxera
 STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Autosubstitueix tots els vehicles de la cotxera
@@ -3076,8 +3075,8 @@ STR_DATE                                                        :{BLACK}Data:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}No. de pobles:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. d'indústries:
 STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Mou la linia de neu un pas amunt
-STR_SNOW_LINE_DOWN                                              :{BLACK}Mou la linia de neu un pas avall
+STR_SNOW_LINE_UP                                                :{BLACK}Moure la linia de neu un pas amunt
+STR_SNOW_LINE_DOWN                                              :{BLACK}Moure la linia de neu un pas avall
 STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Canviar alçada de la linia de neu
 STR_START_DATE_QUERY_CAPT                                       :{WHITE}Canviar l'any inicial
 STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Alerta d'escala
@@ -3104,8 +3103,8 @@ STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generar
 STR_SE_RANDOM_LAND                                              :{WHITE}Terreny aleatori
 STR_SE_NEW_WORLD                                                :{BLACK}Crear nou escenari
 STR_SE_CAPTION                                                  :{WHITE}Tipus d'escenari
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Mou l'alçada del terreny pla un pas avall
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Mou l'alçada del terreny pla un pas amunt
+STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Moure l'alçada del terreny pla un pas avall
+STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Moure l'alçada del terreny pla un pas amunt
 STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Canvia alçada del terreny pla
 STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Alçada del terreny pla:
 STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}
@@ -3114,10 +3113,10 @@ STR_SMALLMAP_CENTER                                             :{BLACK}Centrar

 ########### String for new airports
 STR_SMALL_AIRPORT                                               :{BLACK}Petit
-STR_CITY_AIRPORT                                                :{BLACK}de Ciutat
+STR_CITY_AIRPORT                                                :{BLACK}Ciutadà
 STR_METRO_AIRPORT                                               :{BLACK}Metropolità
 STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Internacional
-STR_COMMUTER_AIRPORT                                            :{BLACK}Regional
+STR_COMMUTER_AIRPORT                                            :{BLACK}Viatjer
 STR_INTERCONTINENTAL_AIRPORT                                    :{BLACK}Intercontinental
 STR_HELIPORT                                                    :{BLACK}Heliport
 STR_HELIDEPOT                                                   :{BLACK}Helihangar
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -1030,7 +1030,7 @@ STR_TONS                                                        :tun
 STR_LITERS                                                      :litrů
 STR_ITEMS                                                       :kusů
 STR_CRATES                                                      :krabic
-STR_RES_OTHER                                                   :Jiné
+STR_RES_OTHER                                                   :jiné
 STR_NOTHING                                                     :

 STR_SMALL_RIGHT_ARROW                                           :{TINYFONT}{RIGHTARROW}
@@ -1123,7 +1123,7 @@ STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Nevidit
 STR_CONFIG_PATCHES_LAND_GENERATOR                               :{LTBLUE}Tvůrce krajiny: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :původní
 STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
-STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Maximální vzdálenost ropných rafinerií od okraje mapy: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Maximální vzdálenost ropných rafinerií od okraje mapy {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Výška sněhové čáry: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Členitost krajiny (jen TerraGenesis): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :velmi rovná
@@ -1859,7 +1859,6 @@ STR_3804_WATER                                                  :Voda
 STR_3805_COAST_OR_RIVERBANK                                     :Pobřeží nebo břeh
 STR_3806_SHIP_DEPOT                                             :Lodní depo
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}... nemohu stavět na vodě
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Nejprve je třeba zničit průplav

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Uložit hru
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -384,7 +384,7 @@ STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Værdi
 STR_SORT_BY_FACILITY                                            :Stationstype
 STR_SORT_BY_WAITING                                             :Værdi af ventende fragt
-STR_SORT_BY_RATING_MAX                                          :Fragtbedømmelse
+STR_SORT_BY_RATING_MAX                                          :Fragtrangering
 STR_ENGINE_SORT_ENGINE_ID                                       :Lokomotiv ID (klassisk)
 STR_ENGINE_SORT_COST                                            :Omkostning
 STR_ENGINE_SORT_POWER                                           :Drivmiddel
@@ -396,7 +396,7 @@ STR_NO_WAITING_CARGO                                            :{BLACK}Der er i
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vælg alle faciliteter
 STR_SELECT_ALL_TYPES                                            :{BLACK}Vælg alle lasttyper (inklusiv fragttyper, der ikke venter)
 STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgængelige tog
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgæn. vejkøretøjer
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgængelige vejkøretøjer
 STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgængelige skibe
 STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgængelige fly
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Se liste over tilgængelige designs for denne køretøjstype.
@@ -407,7 +407,7 @@ STR_SEND_TRAIN_TO_DEPOT                                         :Send til remise
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til værksted
 STR_SEND_SHIP_TO_DEPOT                                          :Send til skibsdok
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til hangar
-STR_SEND_FOR_SERVICING                                          :Send til eftersyn
+STR_SEND_FOR_SERVICING                                          :Send til service

 ############ range for months starts
 STR_0162_JAN                                                    :jan
@@ -457,11 +457,11 @@ STR_018B_CLOSE_WINDOW                                           :{BLACK}Luk vind
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Vinduestitel - træk her for at flytte vinduet
 STR_STICKY_BUTTON                                               :{BLACK}Marker dette vindue som ulukkeligt af 'Luk ALLE vinduer' tasten
 STR_RESIZE_BUTTON                                               :{BLACK}Klik og træk for at ændre vinduets størrelse
-STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik her for at gå til det nuværende standard gemme/hente bibliotek
+STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik her for at gå til det nuværende default gemme/hente bibliotek
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Nedriv bygninger osv. på et stykke land
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Sænk et hjørne af landet
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Hæv et hjørne af landet
-STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Scrollbar - scroller listen op/ned
+STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Scroll bar - scroller listen op/ned
 STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}Scroll bar - flytter listen mod venstre/højre
 STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}Vis landskabskonturer på kortet
 STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Vis køretøjer på kortet
@@ -590,7 +590,6 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomst
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomst af første køretøj til modstanderens station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Uheld / katastrofer
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Selskabsinformation
-STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Åbning / lukning af industrier
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Økonomiændringer
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Rådgivning / information om spillerens køretøjer
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nye køretøjer
@@ -637,7 +636,7 @@ STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industri
 STR_0231_ROAD_CONSTRUCTION                                      :{BLACK}Bygning af vej
 STR_0233_TOWN_GENERATION                                        :{WHITE}Bygenerering
 STR_0234_NEW_TOWN                                               :{BLACK}Ny by
-STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Opfør en ny by
+STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Byg en ny by
 STR_0236_CAN_T_BUILD_TOWN_HERE                                  :{WHITE}Kan ikke bygge en by her...
 STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...for tæt på kanten af kortet
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...for tæt på en anden by
@@ -684,41 +683,41 @@ STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}Sodavand
 STR_025F_BUBBLE_GENERATOR                                       :{BLACK}Boblegenerator
 STR_0260_TOFFEE_QUARRY                                          :{BLACK}Karamelbrud
 STR_0261_SUGAR_MINE                                             :{BLACK}Sukkermine
-STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Opfør Kulmine
-STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Opfør Kraftværk
-STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Opfør Savværk
+STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Byg Kulmine
+STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Byg Kraftværk
+STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Byg Savværk
 STR_0265_PLANT_FOREST                                           :{BLACK}Plant Skov
-STR_0266_CONSTRUCT_OIL_REFINERY                                 :{BLACK}Opfør Olieraffinaderi
-STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY                             :{BLACK}Opfør Boreplatform (Kan kun bygges tæt på kanten af kortet)
-STR_0268_CONSTRUCT_FACTORY                                      :{BLACK}Opfør Fabrik
-STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Opfør Stålværk
-STR_026A_CONSTRUCT_FARM                                         :{BLACK}Opfør Bondegård
-STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Opfør Jernmalmsmine
-STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Opfør Oliekilde
-STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Opfør Bank (Kan kun bygges i en by med mere end 1200 indbyggere)
-STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Opfør Papirmølle
-STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Opfør Fødevareindustri
-STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Opfør Trykkeri
-STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Opfør Guldmine
-STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Opfør Bank (Kan kun bygges i en by)
-STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Opfør Savværk (for at rydde regnskoven og producere træ)
+STR_0266_CONSTRUCT_OIL_REFINERY                                 :{BLACK}Byg Olieraffinaderi
+STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY                             :{BLACK}Byg Boreplatform (Kan kun bygges tæt på kanten af kortet)
+STR_0268_CONSTRUCT_FACTORY                                      :{BLACK}Byg Fabrik
+STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Byg Stålværk
+STR_026A_CONSTRUCT_FARM                                         :{BLACK}Byg Bondegård
+STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Byg Jernmalmsmine
+STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Byg Oliekilde
+STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Byg Bank (Kan kun bygges i en by med mere end 1200 indbyggere)
+STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Byg Papirmølle
+STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Byg Fødevareindustri
+STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Byg Trykkeri
+STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Byg Guldmine
+STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Byg Bank (Kan kun bygges i en by)
+STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Byg Træfabrik (for at rydde regnskoven og producere træ)
 STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}Plant Frugtplantage
 STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Plant Gummiplantage
-STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Opfør Vandværk
-STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Opfør Vandtårn (Kan kun bygges i byer)
-STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Opfør Diamantmine
-STR_0279_CONSTRUCT_COPPER_ORE_MINE                              :{BLACK}Opfør Kobbermalmsmine
+STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Byg Vandværk
+STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Byg Vandtårn (Kan kun bygges i byer)
+STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Byg Diamantmine
+STR_0279_CONSTRUCT_COPPER_ORE_MINE                              :{BLACK}Byg Kobbermalmsmine
 STR_027A_PLANT_COTTON_CANDY_FOREST                              :{BLACK}Plant Candyfloss-skov
-STR_027B_CONSTRUCT_CANDY_FACTORY                                :{BLACK}Opfør Slikfabrik
-STR_027C_CONSTRUCT_BATTERY_FARM                                 :{BLACK}Opfør Batterigård
-STR_027D_CONSTRUCT_COLA_WELLS                                   :{BLACK}Opfør Colabrønd
-STR_027E_CONSTRUCT_TOY_SHOP                                     :{BLACK}Opfør Legetøjsforretning
-STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}Opfør Legetøjsfabrik
-STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}Opfør Plastikspringvand
-STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}Opfør Sodavandsfabrik
-STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Opfør Boblegenerator
-STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Opfør Karamelbrud
-STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Opfør Sukkermine
+STR_027B_CONSTRUCT_CANDY_FACTORY                                :{BLACK}Byg Slikfabrik
+STR_027C_CONSTRUCT_BATTERY_FARM                                 :{BLACK}Byg Batterigård
+STR_027D_CONSTRUCT_COLA_WELLS                                   :{BLACK}Byg Colabrønd
+STR_027E_CONSTRUCT_TOY_SHOP                                     :{BLACK}Byg Legetøjsforretning
+STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}Byg Legetøjsfabrik
+STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}Byg Plastikspringvand
+STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}Byg Sodavandsfabrik
+STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Byg Boblegenerator
+STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Byg Karamelbrud
+STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Byg Sukkermine
 STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Kan ikke bygge {STRING} her...
 STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...det er nødvendigt at bygge en by først
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...kun en tilladt per by
@@ -730,7 +729,6 @@ 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_0290_DELETE                                                 :{BLACK}Slet
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slet denne by fuldstændigt
 STR_0292_SAVE_SCENARIO                                          :Gem scenarie
@@ -850,14 +848,14 @@ STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Vælg 't
 STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Vælg 'subarktisk' landskab
 STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Vælg 'subtropisk' landskab
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Vælg 'legetøjsland' landskab
-STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Finansiér opførelse af ny industri
+STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Financiér opførelse af ny industri

 ############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industrioversigt
-STR_0313_FUND_NEW_INDUSTRY                                      :Finansiér ny industri
+STR_0313_FUND_NEW_INDUSTRY                                      :Opfør ny industri
 ############ range ends here

-STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Finansiér ny industri
+STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Opfør ny industri
 STR_JUST_STRING                                                 :{STRING}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kan kun bygges i byer
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...kan kun bygges i regnskovsområder
@@ -989,15 +987,15 @@ STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT
 # DON'T ADD OR REMOVE LINES HERE
 STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Tog {COMMA} har for få ordrer i sin odreliste
 STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Tog {COMMA} har en ugyldig ordre
-STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tog {COMMA} har dobbelte ordrer
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Tog {COMMA} har dobbelt ordrer
 STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Tog {COMMA} har en ugyldig station i sin ordreliste
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Køretøj {COMMA} har for få ordrer i sin ordreliste
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Køretøj {COMMA} har for få ordrer i sin ruteplan
 STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Køretøj {COMMA} har en ugyldig ordre
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Køretøj {COMMA} har dobbelte ordrer
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Køretøj {COMMA} har dobbelt ordrer
 STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Køretøj {COMMA} har en ugyldig station i sin ordreliste
 STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Skib {COMMA} har for få ordrer i sin ordreliste
 STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Skib {COMMA} har en ugyldig ordre
-STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skib {COMMA} har dobbelte ordrer
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Skib {COMMA} har dobbelt ordrer
 STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Skib {COMMA} har en ugyldig havn i sin ordreliste
 STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Fly {COMMA} har for få ordrer i sin ordreliste
 STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Fly {COMMA} har en ugyldig ordre
@@ -1114,7 +1112,7 @@ STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Standar
 STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standard service interval for skibe: {ORANGE}{STRING} dage/%
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Standard service interval for skibe: {ORANGE}slået fra
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Slå service fra, når nedbrud er sat til ingen: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Aktiver hastighedsbegrænsning for vogne: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Aktiver hastigheds begrænsning for vogne: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Slå elektriske jernbaner fra: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Farvede nyheder dukker op i: {ORANGE}{STRING}
@@ -1208,7 +1206,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Træer a
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Placer træer af tilfældig type

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kan ikke bygge en kanal her...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Byg kanaler.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikke bygge en sluse her...
@@ -1228,33 +1225,33 @@ STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Træk lo
 STR_DRAG_DROP                                                   :{BLACK}Træk & slip
 STR_STATION_DRAG_DROP                                           :{BLACK}Byg en station vha. træk & slip
 STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Vælg hvilken stationstype, der skal vises
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vælg hvilken stationstype du vil bygge
+STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vælg hvilen stationstype du vil bygge

 STR_FAST_FORWARD                                                :{BLACK}Kør spillet hurtigere
 STR_MESSAGE_HISTORY                                             :{WHITE}Tidligere beskeder
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}En liste over seneste nyheder
+STR_MESSAGE_HISTORY_TIP                                         :{BLACK}En liste of seneste nyheder
 STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Slå alle fra
 STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Slå alle til

-STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Opfør Kulmine
+STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Byg Kulmine
 STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Plant Skov
-STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Opfør Boreplatform
-STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Opfør Bondegård
-STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Opfør Kobbermalmsmine
+STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Byg Boreplatform
+STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Opfør en bondegård
+STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Byg Kobbermalmsmine
 STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Bor efter olie
-STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Opfør Guldmine
-STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Opfør Diamantmine
-STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Opfør Jernmalmsmine
-STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Plant Frugtplantage
-STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Plant Gummiplantage
+STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Byg Guldmine
+STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Byg Diamandmine
+STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Byg Jernmalmsmine
+STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Opfør Frugtplantage
+STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Opfør Gummiplantage
 STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Opfør Vandforsyning
-STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Plant Candyfloss-skov
+STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Plant Candyfloss Skov
 STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Opfør Batterigård
 STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}Bor efter Cola
 STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP                             :{BLACK}Opfør Plastikspringvand
-STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}Opfør Boblegenerator
+STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}Byg Boblegenerator
 STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}Opfør Karamelbrud
-STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Opfør Sukkermine
+STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Byg Sukkermine

 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
 STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% transporteret)
@@ -1263,10 +1260,10 @@ STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUST

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

-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg toget til at køre med en anden lasttype
+STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg toget til at køre med en anden slags last
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Ombyg toget
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg den lasttype toget skal køre med
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Ombyg toget til at køre med den markerede lasttype
+STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg den slags last toget skal køre med
+STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Ombyg toget til at køre med den markerede slags last
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Kan ikke ombygge toget...
 STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervaller er i procent: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Skift produktion
@@ -1324,7 +1321,7 @@ STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start et

 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spillets navn:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Navnet vil blive vist til andre spillere i menuen, hvor man vælger netværksspil
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Sæt kodeord
+STR_NETWORK_SET_PASSWORD                                        :{BLACK}Set kodeord
 STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Beskyt dit spil med et kodeord hvis du ikke vil have fremmede med
 STR_NETWORK_SELECT_MAP                                          :{BLACK}Vælg et kort:
 STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Hvilket kort vil du spille?
@@ -1402,9 +1399,9 @@ STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Go
 STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Venter..
 STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Henter kort..
 STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Behandler data..
-STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Registrerer..
+STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Registere..

-STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Henter spil-info..
+STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Henter spil info..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter selskabsinfo..
 ############ End of leave-in-this-order
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} foran dig
@@ -1413,7 +1410,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 STR_NETWORK_DISCONNECT                                          :{BLACK}Afbryd forbindelse

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv det beløb, som du ønsker at give
-STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveren er beskyttet. Indtast kodeord
+STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveren er beskyttet. Skriv kodeordet
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Selskabet er beskyttet. Indtast kodeord
 STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klient liste

@@ -1426,7 +1423,7 @@ STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Netvær
 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_TIMEOUT                                         :{WHITE} Forbindelsen #{NUM} svare 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
@@ -1504,8 +1501,8 @@ STR_0800_COST                                                   :{TINYFONT}{RED}
 STR_0801_COST                                                   :{RED}Pris: {CURRENCY}
 STR_0802_INCOME                                                 :{TINYFONT}{GREEN}Indkomst: {CURRENCY}
 STR_0803_INCOME                                                 :{GREEN}Indkomst: {CURRENCY}
-STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Overført: {CURRENCY}
-STR_FEEDER                                                      :{YELLOW}Overført: {CURRENCY}
+STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Overfør: {CURRENCY}
+STR_FEEDER                                                      :{YELLOW}Overfør: {CURRENCY}
 STR_0805_ESTIMATED_COST                                         :{WHITE}Anslået Pris: {CURRENCY}
 STR_0807_ESTIMATED_INCOME                                       :{WHITE}Anslået Indkomst: {CURRENCY}
 STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Kan ikke hæve landet her...
@@ -1538,7 +1535,7 @@ STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Kan ikke
 STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Kan ikke bygge jernbane her...
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Kan ikke fjerne jernbane herfra...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Kan ikke fjerne signaler herfra...
-STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Retning af remise
+STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Retning for remise
 STR_1015_RAILROAD_CONSTRUCTION                                  :Jernbanekonstruktion
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Elektrisk jernbanekonstruktion
 STR_1016_MONORAIL_CONSTRUCTION                                  :Monorailkonstruktion
@@ -1556,15 +1553,15 @@ 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_PRESIGNALS                              :Jernbane med præ-signaler
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Jernbane med exit-signaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbane med kombi-signaler
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Jernbane med indkørselssignaler
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Jernbane med udkørselssignaler
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbane med kombinerede ind- og udkørselssignaler



 ##id 0x1800
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Det er nødvendigt at fjerne vejen først
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vejarbejde i gang
+STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vejarbejde er i gang
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Vejkonstruktion
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Vælg vejbro
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan ikke bygge vej her...
@@ -1663,19 +1660,19 @@ STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Handling
 STR_2046_SMALL_ADVERTISING_CAMPAIGN                             :Lille reklamekampagne
 STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :Mellem reklamekampagne
 STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :Stor reklamekampagne
-STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :Finansiér lokal vejfornyelse
+STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :Betal for lokal vejfornyelse
 STR_204A_BUILD_STATUE_OF_COMPANY                                :Byg en statue af selskabets ejer
-STR_204B_FUND_NEW_BUILDINGS                                     :Finansiér opførsel af nye bygninger
+STR_204B_FUND_NEW_BUILDINGS                                     :Betal for opførsel af nye bygninger
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Køb eksklusive transportrettigheder i byen
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Bestik de lokale myndigheder
 STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Start en lille reklamekampagne for at tiltrække flere passagerer og last til dine stationer.{}  Pris: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Start en mellem reklamekampagne, for at tiltrække flere passagerer og last til dine stationer.{}  Pris: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Start en stor reklamekampagne, for at tiltrække flere passagerer og last til dine stationer.{}  Pris: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Finansiér vejfornyelse i midtbyen. Forårsager stor forstyrrelse af vejnettet i de næste 6 måneder.{}  Pris: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Betal for vejfornyelse i midtbyen. Forårsager stor forstyrrelse af vejnettet i de næste 6 måneder.{}  Pris: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Byg en statue til ære for dit selskab.{} Pris: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finansiér opførelse af forretningsbygninger i byen.{}  Pris: {CURRENCY}
+STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Betal for opførelse af forretningsbygninger i byen.{}  Pris: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Køb et års eksklusive rettigheder til transport i byen. De lokale myndigheder vil kun tillade passagerer og last at bruge dine stationer.{} Prist: {CURRENCY}
-STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestik de lokale myndigheder til at hæve din bedømmelse, med risiko for en stor straf hvis det bliver opdaget.{}  Pris: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestik de lokale myndigheder til at hæve din bedømmelse, med sandsynlighed for en stor straf hvis det bliver opdaget.{}  Pris: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i byen {TOWN}!{}{}Vejfornyelse betalt af {COMPANY} forårsager 6 måneders kaos i trafikken!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -1793,15 +1790,14 @@ STR_STAT_CLASS_DFLT                                             :Standard statio
 STR_STAT_CLASS_WAYP                                             :Kontrolsteder

 ##id 0x3800
-STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Retning af skibsdok
+STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Skibsdok orientering
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...skal bygges på vand
 STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Kan ikke bygge en skibsdok her...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Vælg retning af skibsdok
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Vælg orientering af skibsdok
 STR_3804_WATER                                                  :Vand
 STR_3805_COAST_OR_RIVERBANK                                     :Kyst eller flodbred
 STR_3806_SHIP_DEPOT                                             :Skibsdok
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...kan ikke bygge på vand
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanal må fjernes først

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Gem spil
@@ -2120,7 +2116,7 @@ STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Tilbageb
 STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Direktør)
 STR_7038_INAUGURATED                                            :{GOLD}Indviet: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Køretøjer:
-STR_TRAINS                                                      :{WHITE}{COMMA} tog{P "" e}
+STR_TRAINS                                                      :{WHITE}{COMMA} tog
 STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} køretøj{P "" er}
 STR_AIRCRAFT                                                    :{WHITE}{COMMA} fly
 STR_SHIPS                                                       :{WHITE}{COMMA} skib{P "" e}
@@ -2533,7 +2529,7 @@ STR_881B_TRAINS                                                 :{WHITE}{COMPANY
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nye jernbanekøretøjer
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nyt Elektrisk lokomotiv
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nye monorailkøretøjer
-STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye magnetskinnekøretøjer
+STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye magnetskinne køretøjer
 STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Jernbanekøretøjer

 STR_881F_BUILD_VEHICLE                                          :{BLACK}Byg køretøj
@@ -2697,7 +2693,7 @@ STR_SERVICE_AT_ROADVEH_DEPOT                                    :Service i {TOWN

 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Ombyg vejkøretøj til at laste en anden type last
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Ombyg lastbil
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Ombyg vejkøretøjet til at laste den markerede type last
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Ombyg vejkøretøjet til at laste den markede type last
 STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan ikke ombygge vejkøretøj
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg lasttype som lastbilen skal transportere

@@ -2765,7 +2761,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Ombyg skibet
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vælg den slags last skibet skal sejle med
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Ombyg skibet til den markerede slags last
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vælg den lasttype der skal transporteres:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vælg den lasttype der skal sejles med:
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{CARGO}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikke ombygge skib...
 STR_9842_REFITTABLE                                             :(kan ombygges)
@@ -2947,7 +2943,7 @@ STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION
 STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Fly
 STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Skib{P "" e}

-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle toge, som har denne station i deres ruteplan
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle tog, som har denne station i deres ruteplan
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Vis alle køretøjer, som har denne station i deres ruteplan
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Vis alle fly, som har denne lufthavn i deres ruteplan
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Vis alle skibe, som har denne station i deres ruteplan
@@ -2997,7 +2993,7 @@ STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop uds
 STR_NOT_REPLACING                                               :{BLACK}Udskifter ikke
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Intet køretøj valgt
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vælg en køretøjstype, som du ønsker udskiftet
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vælg en køretøjstype, som du ønker benyttet i stedet for den type, du  har valgt i venste side
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vælg en køretøjstype, som du ønker at få i stedet for den type, du  har valgt i venste side
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Tryk for at stoppe udskiftningen at den køretøjstype, som du har valgt til venstre
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Tryk for at begynde at udskifte køretøjstypen til venstre med køretøjstypen til højre
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vælg den skinnetype, hvor du vil udskifte lokomotiver
@@ -3006,7 +3002,7 @@ STR_REPLACE_HELP                                                :{BLACK}Dette gi
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Fjern vogn: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Få autoudskift til at bevare længden af tog ved at fjerne vogne (startende fra fronten), hvis autoudskiftningen gør toget længere.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Udskifter: {ORANGE}{SKIP}{SKIP}{STRING}
-STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} EKSPERIMENTEL EGENSKAB {}Skift imellem lokomotiv- og vogn-udskiftningsvindue.{}Vognudskiftning vil kun finde sted hvis den nye vogn kan ændres til at transportere samme godstype som den gamle vogn. Dette bliver checket for hver vogn, når udskiftningen finder sted.
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} EKSPERIMENTEL EGENSKAB {}Skift imellem lokomotiv- og vogn-udskiftningsvindue.{}Vognudskiftning vil kun finde sted hvis den nye vogn kan ændres til at transportere samme godstype some den gamle vogn. Dette bliver checket for hver vogn, når udskiftningen finder sted.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Køretøjet kan ikke bygges

 STR_ENGINES                                                     :Lokomotiver
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -229,7 +229,7 @@ STR_0104_STEEL_MILL                                             :{BLACK}{TINYFON
 STR_0105_BANK                                                   :{BLACK}{TINYFONT}Bank
 STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Papierfabriek
 STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Goudmijn
-STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Voedselverwerkingsfabriek
+STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Voedselverwerkings fabriek
 STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Diamantmijn
 STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Kopermijn
 STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Fruitplantage
@@ -346,8 +346,8 @@ STR_UNITS_FORCE_SI                                              :{COMMA} kN

 ############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Winstgrafiek
-STR_0155_INCOME_GRAPH                                           :Inkomstengrafiek
-STR_0156_DELIVERED_CARGO_GRAPH                                  :Afgeleverde ladinggrafiek
+STR_0155_INCOME_GRAPH                                           :Inkomenstegrafiek
+STR_0156_DELIVERED_CARGO_GRAPH                                  :Afgeleverde lading-grafiek
 STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Prestatiegrafiek
 STR_0158_COMPANY_VALUE_GRAPH                                    :Bedrijfswaardegrafiek
 STR_0159_CARGO_PAYMENT_RATES                                    :Ladingsprijzen
@@ -355,7 +355,7 @@ STR_015A_COMPANY_LEAGUE_TABLE                                   :Bedrijfscompeti
 STR_PERFORMANCE_DETAIL_MENU                                     :Detail prestatiewaarde
 ############ range for menu ends

-STR_015B_OPENTTD                                                :{WHITE}Over OpenTTD
+STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Spel opslaan
 STR_015D_LOAD_GAME                                              :Spel laden
 STR_015E_QUIT_GAME                                              :Spel stoppen
@@ -394,7 +394,7 @@ STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Kracht/Operatie
 STR_ENGINE_SORT_CARGO_CAPACITY                                  :Vracht capaciteit
 STR_NO_WAITING_CARGO                                            :{BLACK}Er wacht geen vracht van enig type
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Kies alle faciliteiten
-STR_SELECT_ALL_TYPES                                            :{BLACK}Kies alle vrachttypen (inclusief niet wachtende vracht)
+STR_SELECT_ALL_TYPES                                            :{BLACK}Kies alle vracht typen (inclusief niet wachtende vracht)
 STR_AVAILABLE_TRAINS                                            :{BLACK}Beschikbare Treinen
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Beschikbare Voertuigen
 STR_AVAILABLE_SHIPS                                             :{BLACK}Beschikbare Schepen
@@ -403,10 +403,10 @@ STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Bekijk e
 STR_MANAGE_LIST                                                 :{BLACK}Beheer lijst
 STR_MANAGE_LIST_TIP                                             :{BLACK}Stuur instructies naar alle voertuigen in de lijst
 STR_REPLACE_VEHICLES                                            :Vervang voertuigen
-STR_SEND_TRAIN_TO_DEPOT                                         :Stuur naar depot
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stuur naar depot
-STR_SEND_SHIP_TO_DEPOT                                          :Stuur naar depot
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stuur naar hangar
+STR_SEND_TRAIN_TO_DEPOT                                         :Stuur naar Depot
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stuur naar Depot
+STR_SEND_SHIP_TO_DEPOT                                          :Stuur naar Depot
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stuur naar Hangar
 STR_SEND_FOR_SERVICING                                          :Stuur naar onderhoud

 ############ range for months starts
@@ -455,9 +455,9 @@ STR_0189                                                        :{BLACK}{SMALLDO
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Kan onderhoudsinterval niet aanpassen...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Sluit venster
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Vensternaam - sleep om venster te verplaatsen
-STR_STICKY_BUTTON                                               :{BLACK}Markeer dit venster als niet-sluitbaar door de 'Sluit alle vensters'-knop
+STR_STICKY_BUTTON                                               :{BLACK}Markeer dit venster als niet-verwijderbaar door de 'Sluit Alle Vensters' knop
 STR_RESIZE_BUTTON                                               :{BLACK}Klik en sleep om dit venster van grootte te veranderen
-STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik hier om naar de standaard bewaar/laadmap te gaan
+STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik hier om naar de standaard bewaar/laad directorie te gaan
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Sloop gebouwen etc. op een stuk land
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Verlaag een hoek van het land
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Verhoog een hoek van het land
@@ -870,7 +870,7 @@ STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Screensh
 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Koop land voor toekomstig gebruik
 STR_032F_AUTOSAVE                                               :{RED}AUTOSAVE
 STR_SAVING_GAME                                                 :{RED}*  *  SPEL WORDT OPGESLAGEN  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Opslaan van spel is nog bezig,{}Wacht tot dit voltooid is!
+STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Opslaan van spel is nog bezig,{}wacht tot dit voltooid is!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Kies 'Ezy Street style music' programma

 STR_0335_6                                                      :{BLACK}6
@@ -991,10 +991,10 @@ STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Trein {C
 STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trein {COMMA} heeft een lege opdracht
 STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trein {COMMA} heeft dubbele orders
 STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trein {COMMA} heeft een ongeldig station in de orders
-STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Wagen {COMMA} heeft te weinig orders in de orderlijst
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Wagen {COMMA} heeft lege order
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Wagen {COMMA} heeft dubbele orders
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Wagen {COMMA} heeft een ongeldig station in de orders
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Wegvoertuig {COMMA} heeft te weinig orders in de orderlijst
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Wegvoertuig {COMMA} heeft lege order
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Wegvoertuig {COMMA} heeft dubbele orders
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Wegvoertuig {COMMA} heeft een ongeldig station in de orders
 STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Schip {COMMA} heeft te weinig order is orderlijst
 STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Schip {COMMA} heeft lege order
 STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Schip {COMMA} heeft dubbele orders
@@ -1006,7 +1006,7 @@ STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Vliegtui
 # end of order system

 STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Automatisch vernieuwen mislukt bij trein {COMMA} (onvoldoende geld)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatisch vernieuwen mislukt bij wagen {COMMA} (onvoldoende geld)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatisch vernieuwen mislukt bij voertuig {COMMA} (onvoldoende geld)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automatisch vernieuwen mislukt bij schip {COMMA} (onvoldoende geld)
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatisch vernieuwen mislukt bij vliegtuig {COMMA} (onvoldoende geld)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Trein {COMMA} is te lang na het vervangen
@@ -1150,7 +1150,7 @@ STR_CONFIG_PATCHES_YAPF_RAIL                                    :{LTBLUE}Gebruik
 STR_TEMPERATE_LANDSCAPE                                         :gematigd landschap
 STR_SUB_ARCTIC_LANDSCAPE                                        :subarctisch landschap
 STR_SUB_TROPICAL_LANDSCAPE                                      :subtropisch landschap
-STR_TOYLAND_LANDSCAPE                                           :Speelgoedlandschap
+STR_TOYLAND_LANDSCAPE                                           :speelgoed landschap

 STR_CHEATS                                                      :{WHITE}Cheats
 STR_CHEATS_TIP                                                  :{BLACK}Keuzevakjes geven aan of je deze cheat al ooit gebruikt hebt.
@@ -1227,7 +1227,7 @@ STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Sleep lo

 STR_DRAG_DROP                                                   :{BLACK}Slepen
 STR_STATION_DRAG_DROP                                           :{BLACK}Bouw een station door te slepen
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Selecteer een stationtype
+STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Selecteer een station type
 STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Selecteer het type station om te bouwen

 STR_FAST_FORWARD                                                :{BLACK}Verhoog de spelsnelheid
@@ -1801,7 +1801,6 @@ STR_3804_WATER                                                  :Water
 STR_3805_COAST_OR_RIVERBANK                                     :Kust of rivierbed
 STR_3806_SHIP_DEPOT                                             :Scheepswerf
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Kan niet op water bouwen
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Het kanaal moet eerst verwijderd worden

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Spel Opslaan
@@ -1947,7 +1946,7 @@ STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...het i
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Geen naam
 STR_SV_TRAIN_NAME                                               :Trein {COMMA}
-STR_SV_ROADVEH_NAME                                             :Wagen {COMMA}
+STR_SV_ROADVEH_NAME                                             :Automobiel {COMMA}
 STR_SV_SHIP_NAME                                                :Schip {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Vliegtuig {COMMA}

@@ -2121,7 +2120,7 @@ STR_7037_PRESIDENT                                              :{WHITE}{PLAYERN
 STR_7038_INAUGURATED                                            :{GOLD}Gesticht: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Voertuigen:
 STR_TRAINS                                                      :{WHITE}{COMMA} trein{P "" en}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} wagen{P "" s}
+STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} wegvoertuig{P "" en}
 STR_AIRCRAFT                                                    :{WHITE}{COMMA} vliegtuig{P "" en}
 STR_SHIPS                                                       :{WHITE}{COMMA} sch{P ip epen}
 STR_7042_NONE                                                   :{WHITE}Geen
@@ -2508,9 +2507,9 @@ STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Ga non-stop naa
 STR_8810_GO_NON_STOP_TO_LOAD                                    :Ga non-stop naar {STATION} (Laden)
 STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ga non-stop naar {STATION} (Overladen en wacht tot vol geladen)
 STR_GO_TO_TRAIN_DEPOT                                           :Ga naar {TOWN} Trein Depot
-STR_SERVICE_AT_TRAIN_DEPOT                                      :Reparatie in {TOWN} treindepot
+STR_SERVICE_AT_TRAIN_DEPOT                                      :Reparatie in {TOWN} Treindepot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ga zonder tussenstop naar {TOWN} Treindepot
-STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Reparatie zonder tussentop in {TOWN} treindepot
+STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Reparatie zonder tussentop in {TOWN} Treindepot

 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Op weg naar {TOWN} Trein Depot
 STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Op weg naar {TOWN} Trein Depot, {VELOCITY}
@@ -2693,13 +2692,13 @@ STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernoem
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernoem wegvoertuigtype
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan wegvoertuigtype niet hernoemen...
 STR_9038_GO_TO_ROADVEH_DEPOT                                    :Ga naar {TOWN} Wegvoertuig Depot
-STR_SERVICE_AT_ROADVEH_DEPOT                                    :Repareren in {TOWN} wagendepot
+STR_SERVICE_AT_ROADVEH_DEPOT                                    :Repareren in {TOWN} Wegvoertuig Depot

 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Verbouw het wegvoertuig om een andere lading the vervoeren
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Verbouw wegvoertuig
 STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Verbouw wegvoertuig om geselecteerd vrachttype te vervoeren
 STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan wegvoertuig niet verbouwen
-STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecteer welk type vracht het wagen moet vervoeren
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecteer welk type vracht het wegvoertuig moet vervoeren

 ##id 0x9800
 STR_9800_DOCK_CONSTRUCTION                                      :Dokbouw
@@ -2923,8 +2922,8 @@ STR_NEWGRF_DISABLED                                             :{RED}Uitgeschak
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Bijbehorend bestand niet gevonden (compatibel GRF geladen)

 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Compatibele GRF(s) geladen voor ontbrekende bestanden
-STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missend(e) GRF bestand(en) zijn uitgeschakeld
-STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Er zijn missende GRF bestanden om het spel te laden
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Ontbrekende GRF bestand(en) zijn uitgeschakeld
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}GRF bestand(en) om dit spel te kunnen laden ontbreken

 STR_CURRENCY_WINDOW                                             :{WHITE}Aangepaste valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2942,13 +2941,13 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}

-STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trein{P "" en}
-STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Wagen{P "" s}
+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Treinen
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Wegvoertuigen
 STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Vliegtuigen
-STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Sch{P ip epen}
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Schepen

 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Geef alle wagens weer die dit station in hun opdrachtenlijst hebben
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Geef alle wegvoertuigen weer die dit station in hun opdrachtenlijst hebben
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Geef alle vliegtuigen weer die dit station in hun opdrachtenlijst hebben
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben

@@ -3059,7 +3058,7 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Alles behalve {

 ########### String for New Landscape Generator

-STR_GENERATE                                                    :{WHITE}Maak aan
+STR_GENERATE                                                    :{WHITE}Creeër
 STR_RANDOM                                                      :{BLACK}Willekeurig maken
 STR_RANDOM_HELP                                                 :{BLACK}Wijzig het willekeurige getal voor terrein creatie
 STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Wereld maken
@@ -3068,17 +3067,17 @@ STR_RANDOM_SEED_HELP                                            :{BLACK}Klik voo
 STR_LAND_GENERATOR                                              :{BLACK}Land generator:
 STR_TREE_PLACER                                                 :{BLACK}Bos algoritme:
 STR_HEIGHTMAP_ROTATION                                          :{BLACK}Aantal graden hoogtekaart:
-STR_TERRAIN_TYPE                                                :{BLACK}Terreintype:
+STR_TERRAIN_TYPE                                                :{BLACK}Terrein type:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Zee niveau:
-STR_SMOOTHNESS                                                  :{BLACK}Gladheid:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Hoogte van sneeuwlijn:
+STR_SMOOTHNESS                                                  :{BLACK}Vlakte:
+STR_SNOW_LINE_HEIGHT                                            :{BLACK}Sneeuwlijn hoogte:
 STR_DATE                                                        :{BLACK}Datum:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}Aantal steden:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Aantal Industrieën:
 STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
 STR_SNOW_LINE_UP                                                :{BLACK}Verschuif de sneeuwlijn één omhoog
 STR_SNOW_LINE_DOWN                                              :{BLACK}Verschuif de sneeuwlijn één naar beneden
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Verander hoogte van sneeuwlijn
+STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Verander sneeuwlijn hoogte
 STR_START_DATE_QUERY_CAPT                                       :{WHITE}Verander begin jaar
 STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Schaal waarschuwing
 STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Het aanpassen van de grootte van een bronkaar is niet aan te bevelen. Toch doorgaan?
@@ -3095,22 +3094,22 @@ STR_WORLD_GENERATION                                            :{BLACK}Wereld m
 STR_TREE_GENERATION                                             :{BLACK}Bos plaatsing
 STR_UNMOVABLE_GENERATION                                        :{BLACK}Onverplaatsbare generatie
 STR_CLEARING_TILES                                              :{BLACK}Ruig en
-STR_SETTINGUP_GAME                                              :{BLACK}Spel aan het configureren
+STR_SETTINGUP_GAME                                              :{BLACK}Spel aan het instellen
 STR_PREPARING_TILELOOP                                          :{BLACK}Bezig met vlakken
 STR_PREPARING_GAME                                              :{BLACK}Voorbereiden spel
 STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Deze aktie past de moeilijkheidsgraag aan naam custom
 STR_SE_FLAT_WORLD                                               :{WHITE}Vlak land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Genereer een vlakke kaart
+STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Genereer een platte kaart
 STR_SE_RANDOM_LAND                                              :{WHITE}Willekeurig land
-STR_SE_NEW_WORLD                                                :{BLACK}Maak nieuw scenario aan
-STR_SE_CAPTION                                                  :{WHITE}Scenariotype
+STR_SE_NEW_WORLD                                                :{BLACK}Creeër nieuw scenario
+STR_SE_CAPTION                                                  :{WHITE}Scenario type
 STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Maak de hoogte van plat land een lager
 STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Maak de hoogte van plat land een hoger
 STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Verander hoogte van vlak land
 STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Hoogte van platte grond:
 STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}

-STR_SMALLMAP_CENTER                                             :{BLACK}Centreer de kleine kaart op huidige positie
+STR_SMALLMAP_CENTER                                             :{BLACK}Centreerd de kleine kaart op heidige positie

 ########### String for new airports
 STR_SMALL_AIRPORT                                               :{BLACK}Klein
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -1801,7 +1801,6 @@ STR_3804_WATER                                                  :Water
 STR_3805_COAST_OR_RIVERBANK                                     :Coast or riverbank
 STR_3806_SHIP_DEPOT                                             :Ship depot
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Can't build on water
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Must demolish canal first

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Save Game
--- a/lang/esperanto.txt
+++ b/lang/esperanto.txt
@@ -591,7 +591,6 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Unua ve
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Unua veturilo atingas konkurantan stacion
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Akcidentoj / katastrofoj
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Kompaniaj informoj
-STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Malfermo / fermo de industrioj
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Ekonomiaj ŝanĝoj
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Konsiloj / informoj pri propraj veturiloj
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Novaj veturiloj
@@ -731,7 +730,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Metu rok
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Metu lumturon
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Metu transmitilon
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Difinu dezertan regionon.{}Premu kaj tenu CTRL por forigi ĝin
-STR_CREATE_LAKE                                                 :{BLACK}Difinu akvoregionon.{}Faru kanalon, krom se CTRL estas tenata marnivele, kiukaze ĝi anstataŭe transfluas al la ĉirkaŭo
 STR_0290_DELETE                                                 :{BLACK}Forigu
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Plene forigu ĉi tiun urbon
 STR_0292_SAVE_SCENARIO                                          :Konservu scenaron
@@ -991,7 +989,7 @@ STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT
 STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Trajno {COMMA} havas maltro da ordenoj enplane
 STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Trajno {COMMA} havas malplenan ordenon
 STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trajno {COMMA} havas duoblajn ordenojn
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trajno {COMMA} havas nevalidan stacion en la ordenoj
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trajnno {COMMA} havas nevalidan stacion en la ordenoj
 STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Vojveturilo {COMMA} havas maltro da ordenoj enplane
 STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Vojveturilo {COMMA} havas malplenan ordenon
 STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Vojveturilo {COMMA} havas duoblajn ordenojn
@@ -1209,7 +1207,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Arboj de
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Metu arbojn de hazardaj tipoj

 STR_CANT_BUILD_CANALS                                           :{WHITE}Ne povas konstrui kanalojn ĉi tie...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Konstruu kanalojn.
 STR_LANDINFO_CANAL                                              :Kanalo

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Ne povas konstrui kluzojn ĉi tie...
@@ -1385,7 +1382,7 @@ STR_NETWORK_REFRESH_TIP                                         :{BLACK}Refreŝi
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}KOMPANIAJ INFORMOJ

 STR_NETWORK_COMPANY_NAME                                        :{SILVER}Kompaninomo:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaŭguro:  {WHITE}{NUM}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Enaŭguro:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Kompanivaloro:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuna monstato:  {WHITE}{CURRENCY64}
 STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Lastjara enspezo:  {WHITE}{CURRENCY64}
@@ -2118,7 +2115,7 @@ STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Alklaku
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Grandigu prunton
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Repagu pruntparton
 STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Manaĝanto)
-STR_7038_INAUGURATED                                            :{GOLD}Inaŭgurita: {WHITE}{NUM}
+STR_7038_INAUGURATED                                            :{GOLD}Enaŭguris: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Veturiloj:
 STR_TRAINS                                                      :{WHITE}{COMMA} trajno{P "" j}
 STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} vojveturilo{P "" j}
--- a/lang/estonian.txt
+++ b/lang/estonian.txt
--- a/lang/finnish.txt
+++ b/lang/finnish.txt
@@ -47,7 +47,7 @@ STR_0027_COLA                                                   :Limsaa
 STR_0028_COTTON_CANDY                                           :Hattaraa
 STR_0029_BUBBLES                                                :Kuplia
 STR_002A_TOFFEE                                                 :Toffeeta
-STR_002B_BATTERIES                                              :Paristoja
+STR_002B_BATTERIES                                              :Pattereita
 STR_002C_PLASTIC                                                :Muovia
 STR_002D_FIZZY_DRINKS                                           :Sihijuomaa
 STR_002E                                                        :
@@ -203,7 +203,7 @@ STR_00EA_OWNERS                                                 :Omistajat
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Tie
 STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Rautatie
 STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Asemat/lentokentät/satamat
-STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Rakennukset/Teollisuus
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Rakennus
 STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Liikennevälineet
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100 m
 STR_00F1_200M                                                   :{BLACK}{TINYFONT}200 m
@@ -590,7 +590,6 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ensimm
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ensimmäinen ajoneuvo saapuu kilpailijan asemalle.
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Vahingot/onnettomuudet
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Yhtiön tiedot
-STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Avaa / tehtaiden sulkemiset
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Talouden muutokset
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Neuvoja/tietoja pelaajan ajoneuvoista
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Uudet ajoneuvot
@@ -730,7 +729,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Sijoita
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Sijoita majakka.
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Sijoita lähetin.
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Määrittele aavikon alue.{}Paina ja pidä pohjassa CTRL-nappia poistaaksesi aavikkoa.
-STR_CREATE_LAKE                                                 :{BLACK}Määrittele vesialue.{}Tee kanava, paitsi jos CTRL on alaspainettuna merenpinnalla. Tällöin meri laajenee ympäristöön.
 STR_0290_DELETE                                                 :{BLACK}Poista
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Poista tämä kaupunki kokonaan.
 STR_0292_SAVE_SCENARIO                                          :Tallenna skenaario
@@ -745,7 +743,7 @@ STR_029A_PLAY_SCENARIO                                          :{BLACK}Pelaa sk
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Pelaa korkeuskartta
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Aloita uusi peli, käyttäen korkeuskarttaa maastona
 STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Lopetetaanko skenaario?
-STR_029C_QUIT_EDITOR                                            :{WHITE}Sulje editori
+STR_029C_QUIT_EDITOR                                            :{WHITE}Sulje muokkain
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...voidaan rakentaa vain kaupunkeihin, joissa on yli 1200 asukasta.
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Siirrä aloituspäivää vuodella taaksepäin.
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Siirrä aloituspäivää vuodella eteenpäin.
@@ -820,12 +818,12 @@ STR_02E4                                                        :{BLACK}{SKIP}{S
 STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Mittayksiköiden valinta
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Ajoneuvot
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Valitse kummalla puolella tietä ajetaan.
+STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Valitse, kummalla puolella tietä ajetaan.
 STR_02E9_DRIVE_ON_LEFT                                          :Vasemmalla kaistalla
 STR_02EA_DRIVE_ON_RIGHT                                         :Oikealla kaistalla
 STR_02EB_TOWN_NAMES                                             :{BLACK}Kaupunkien nimet
 STR_02EC                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Valitse kaupunkien nimien tyyli.
+STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Valitse tyyli kaupunkien nimille.

 STR_02F4_AUTOSAVE                                               :{BLACK}Automaattitallennus
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -833,7 +831,7 @@ STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Valitse
 STR_02F7_OFF                                                    :Pois
 STR_02F8_EVERY_3_MONTHS                                         :Joka 3. kuukausi
 STR_02F9_EVERY_6_MONTHS                                         :Joka 6. kuukausi
-STR_02FA_EVERY_12_MONTHS                                        :Kerran vuodessa
+STR_02FA_EVERY_12_MONTHS                                        :Joka 12. kuukausi
 STR_02FB_START_A_NEW_GAME                                       :{BLACK}Aloita uusi peli.
 STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Lataa tallennettu peli.
 STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Luo oma pelimaailma/skenaario.
@@ -843,7 +841,7 @@ STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Näytä
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Näytä vaikeusasetukset.
 STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Aloita uusi peli käyttäen omaa skenaariota.
 STR_0304_QUIT                                                   :{BLACK}Sulje
-STR_0305_QUIT_OPENTTD                                           :{BLACK}Sulje OpenTTD.
+STR_0305_QUIT_OPENTTD                                           :{BLACK}Sulje "OpenTTD".
 STR_0307_OPENTTD                                                :{WHITE}OpenTTD {REV}
 STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...voidaan rakentaa vain kaupunkeihin.
 STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Valitse 'lauhkea' ilmasto.
@@ -864,7 +862,7 @@ STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...voida
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...voidaan rakentaa vain aavikkoalueisiin.
 STR_0319_PAUSED                                                 :{YELLOW}* *  TAUKO  *  *

-STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Kuvakaappaus tallennettu nimellä '{STRING}'.
+STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Kuvankaappaus tallennettu levyllä nimellä '{STRING}'.
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Kuvakaappaus epäonnistui!

 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Osta maata tulevaa käyttöä varten.
@@ -1208,7 +1206,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Sattuman
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Aseta sattumanvaraisia puita

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kanaalia ei voi rakentaa tähän...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Rakenna kanavia.
 STR_LANDINFO_CANAL                                              :Kanaali

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Sulkua ei voi rakentaa tähän...
@@ -1508,14 +1505,14 @@ STR_FEEDER_TINY                                                 :{TINYFONT}{YELL
 STR_FEEDER                                                      :{YELLOW}Siirrä: {CURRENCY}
 STR_0805_ESTIMATED_COST                                         :{WHITE}Arvioitu kustannus: {CURRENCY}
 STR_0807_ESTIMATED_INCOME                                       :{WHITE}Arvioitu tulo: {CURRENCY}
-STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Maata ei voi korottaa.
-STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Maata ei voi laskea.
+STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Maata ei voi korottaa...
+STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Maata ei voi madaltaa...
 STR_080A_ROCKS                                                  :Kalliota
 STR_080B_ROUGH_LAND                                             :Epätasaista maata
 STR_080C_BARE_LAND                                              :Paljasta maata
 STR_080D_GRASS                                                  :Ruohikkoa
 STR_080E_FIELDS                                                 :Peltoja
-STR_080F_SNOW_COVERED_LAND                                      :Lumen peittämää maata
+STR_080F_SNOW_COVERED_LAND                                      :Lumenpeittämää maata
 STR_0810_DESERT                                                 :Aavikkoa

 ##id 0x1000
@@ -1532,12 +1529,12 @@ STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Sähkör
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Yksiraiteisen rakentaminen
 STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}MagLevin rakentaminen
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Valitse rautatiesilta.
-STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Veturitallia ei voi rakentaa.
-STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Rautatieasemaa ei voi rakentaa.
-STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Opastinta ei voi rakentaa.
-STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Rautatietä ei voi rakentaa.
-STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Rautatietä ei voi poistaa.
-STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Opastinta ei voi poistaa tästä.
+STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Veturitallia ei voi rakentaa...
+STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Rautatieasemaa ei voi rakentaa...
+STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Opastinta ei voi rakentaa...
+STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Rautatietä ei voi rakentaa...
+STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Rautatietä ei voi poistaa tästä...
+STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Opastinta ei voi poistaa tästä...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Veturitallin suunta
 STR_1015_RAILROAD_CONSTRUCTION                                  :Rautatien rakentaminen
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Sähköradan rakentaminen
@@ -1567,25 +1564,25 @@ STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Tie pit
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Tietyöt ovat käynnissä.
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Tien rakentaminen
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Valitse maantiesilta
-STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Tietä ei voi rakentaa.
-STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Tietä ei voi poistaa.
-STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Autovarikon suunta
-STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Autovarikkoa ei voi rakentaa.
-STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Linja-autoasemaa ei voi rakentaa.
-STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Lastauslaituria ei voi rakentaa.
+STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Tietä ei voi rakentaa...
+STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Tietä ei voi poistaa tästä...
+STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Huoltoaseman suunta
+STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Huoltoasemaa ei voi rakentaa...
+STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Linja-autoasemaa ei voi rakentaa...
+STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Lastauslaituria ei voi rakentaa...
 STR_180A_ROAD_CONSTRUCTION                                      :Tien rakentaminen
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Rakenna tieosuus.
-STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Rakenna autovarikko (ajoneuvojen rakentamista ja huoltoa varten)
+STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Rakenna huoltoasema (ajoneuvojen rakentamista ja huoltoa varten)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Rakenna linja-autoasema
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Rakenna lastauslaituri
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Rakenna maantiesilta
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Rakenna maantietunneli
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Tien rakentaminen/siirtäminen päälle/pois
-STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Valitse autovarikon suunta.
+STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Valitse huoltoaseman suunta.
 STR_1814_ROAD                                                   :Tie
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Tie katuvaloilla
 STR_1816_TREE_LINED_ROAD                                        :Puilla reunustettu tie
-STR_1817_ROAD_VEHICLE_DEPOT                                     :Autovarikko
+STR_1817_ROAD_VEHICLE_DEPOT                                     :Huoltoasema
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Tasoristeys

 ##id 0x2000
@@ -1595,23 +1592,23 @@ STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
 STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
 STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Rakennus täytyy purkaa ensin.
+STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Rakennus täytyy tuhota ensin.
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Asukasluku: {ORANGE}{COMMA}{BLACK}  Taloja: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Nimeä kaupunki
-STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kaupungin nimeä ei voi vaihtaa.
+STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kaupunkia ei voi uudelleennimetä...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}: paikallisviranomaiset kieltäytyvät.
-STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Kaupunkien nimet - kaupungin valitseminen keskittää näkymän.
-STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Keskitä näkymä kaupungkiin.
+STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Kaupunkien nimet - napsauta nimeä keskittääksesi päänäkymän kaupunkiin.
+STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Keskitä päänäkymä kaupungin sijaintiin.
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Vaihda kaupungin nimeä.
 STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Matkustajia viime kuussa: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Postia viime kuussa: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200F_TALL_OFFICE_BLOCK                                      :Korkea toimistorakennus
 STR_2010_OFFICE_BLOCK                                           :Tomistorakennus
-STR_2011_SMALL_BLOCK_OF_FLATS                                   :Pientaloalue
+STR_2011_SMALL_BLOCK_OF_FLATS                                   :Pienasuntokortteli
 STR_2012_CHURCH                                                 :Kirkko
 STR_2013_LARGE_OFFICE_BLOCK                                     :Suuri toimistorakennus
-STR_2014_TOWN_HOUSES                                            :Kaupungintalot
+STR_2014_TOWN_HOUSES                                            :Kaupungin talot
 STR_2015_HOTEL                                                  :Hotelli
 STR_2016_STATUE                                                 :Patsas
 STR_2017_FOUNTAIN                                               :Suihkulähde
@@ -1629,14 +1626,14 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN}:
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Kuljetusyhtiön arvioinnit:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Tuet
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tarjotut tuet:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tarjolla olevat tuet:
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} välille {STRING}-{STRING}
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Ei mitään
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Käytetyt tuet-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} välille {STATION}-{STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, {DATE_SHORT} asti)
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tuki päättynyt:{}{}{STRING} väli {STRING} - {STRING} ei ole enää tuettu.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tuki päättynyt:{}{}{STRING} väli {STRING} - {STRING} ei sisällä enää tukia.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Tuki vedetty pois:{}{}{STRING} kuljetuspalvelu välille {STATION}-{STATION} ei ole enää tuettu.
 STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Tuki tarjottu:{}{}Ensimmäinen {STRING}kuljetus välillä {STRING} - {STRING} saa vuoden mittaisen tuen paikallisviranomaisilta!
 STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa 50{NBSP}% enemmän seuraavan vuoden ajan!
@@ -1644,22 +1641,22 @@ STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT
 STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa kolminkertaisesti seuraavan vuoden ajan!
 STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Tuki myönnetty yhtiölle {COMPANY}!{}{}{STRING}kuljetus välillä {STATION}-{STATION} tuottaa nelinkertaisesti seuraavan vuoden ajan!
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}: paikallisviranomaiset eivät salli toisen lentokentän rakentamista tähän kaupunkiin.
-STR_2036_COTTAGES                                               :Mökkejä
-STR_2037_HOUSES                                                 :Taloja
-STR_2038_FLATS                                                  :Asuntoja
-STR_2039_TALL_OFFICE_BLOCK                                      :Korkeita toimistorakennuksia
-STR_203A_SHOPS_AND_OFFICES                                      :Liikkeitä ja toimistoja
-STR_203B_SHOPS_AND_OFFICES                                      :Liikkeitä ja toimistoja
+STR_2036_COTTAGES                                               :Mökkiä
+STR_2037_HOUSES                                                 :Taloa
+STR_2038_FLATS                                                  :Asuntoa
+STR_2039_TALL_OFFICE_BLOCK                                      :Korkeata toimistorakennusta
+STR_203A_SHOPS_AND_OFFICES                                      :Kauppaa ja toimistoa
+STR_203B_SHOPS_AND_OFFICES                                      :Kauppaa ja toimistoa
 STR_203C_THEATER                                                :Teatteri
 STR_203D_STADIUM                                                :Stadion
-STR_203E_OFFICES                                                :Toimistoja
-STR_203F_HOUSES                                                 :Taloja
+STR_203E_OFFICES                                                :Toimistoa
+STR_203F_HOUSES                                                 :Taloa
 STR_2040_CINEMA                                                 :Elokuvateatteri
 STR_2041_SHOPPING_MALL                                          :Kauppakeskus
 STR_2042_DO_IT                                                  :{BLACK}Sijoita
 STR_2043_LIST_OF_THINGS_TO_DO_AT                                :{BLACK}Luettelo kaupungissa tehtävistä asioista - napsauta kohdetta saadaksesi lisätietoja.
 STR_2044_CARRY_OUT_THE_HIGHLIGHTED                              :{BLACK}Suorita valittu toiminto.
-STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Toiminnot:
+STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Saatavilla olevat toiminnot:
 STR_2046_SMALL_ADVERTISING_CAMPAIGN                             :Pieni mainoskampanja
 STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :Keskikokoinen mainoskampanja
 STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :Suuri mainoskampanja
@@ -1668,9 +1665,9 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Rakenna patsas
 STR_204B_FUND_NEW_BUILDINGS                                     :Rahoita uusia rakennuksia
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Osta yksinoikeudet kuljetuksiin
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Lahjo viranomaisia
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Käynnistä pieni mainoskampanja hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Käynnistä keskikokoinen mainoskampanja houkutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW}Käynnistä suuri mainoskampanja hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Tee aloite pienestä mainoskampanjasta hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Tee aloite keskikokoisesta mainoskampanjasta hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Tee aloite suuresta mainoskampanjasta hoikutellaksesi lisää matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
 STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Rahoita kaupungin tieverkon rakentamista. Aiheuttaa huomattavaa häiriötä tieliikenteessä kuuden kuukauden ajan.{}  Kustannus: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Rakenna patsas yhtiösi kunniaksi.{} Kustannus: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Rahoita uusien kaupparakennusten rakentamista kaupungissa.{}  Kustannus: {CURRENCY}
@@ -1695,15 +1692,15 @@ STR_LANDSCAPING                                                 :Maastonmuokkaus
 STR_2800_PLANT_TREES                                            :Istuta puita
 STR_2801_PLACE_SIGN                                             :Aseta kyltti
 STR_2802_TREES                                                  :{WHITE}Puita
-STR_2803_TREE_ALREADY_HERE                                      :{WHITE}...tässä on jo puu.
-STR_2804_SITE_UNSUITABLE                                        :{WHITE}...huono paikka.
-STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Puuta ei voi istuttaa.
+STR_2803_TREE_ALREADY_HERE                                      :{WHITE}...puu on jo tässä.
+STR_2804_SITE_UNSUITABLE                                        :{WHITE}...paikka sopimaton.
+STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Puuta ei voi istuttaa...
 STR_2806                                                        :{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...liian monta kylttiä.
-STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Kylttiä ei voi sijoittaa.
+STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Kylttiä ei voi sijoittaa...
 STR_280A_SIGN                                                   :Kyltti
 STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Muokkaa kyltin tekstiä.
-STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Kyltin nimeä ei voi muuttaa.
+STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Kyltin nimeä ei voi muuttaa...
 STR_280D_SELECT_TREE_TYPE_TO_PLANT                              :{BLACK}Valitse istutettava puutyyppi.
 STR_280E_TREES                                                  :Puita
 STR_280F_RAINFOREST                                             :Sademetsää
@@ -1716,19 +1713,19 @@ STR_3002_ORIENTATION                                            :{BLACK}Suunta
 STR_3003_NUMBER_OF_TRACKS                                       :{BLACK}Ratojen määrä
 STR_3004_PLATFORM_LENGTH                                        :{BLACK}Asemalaiturin pituus
 STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Liian lähellä toista rautatieasemaa.
-STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Liitä yhteen useampi asema/lastausalue.
-STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liian monta asemaa ja lastausaluetta kaupungissa.
-STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liian monta asemaa ja lastausaluetta.
+STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Liitä yhteen useampi kuin yksi olemassaoleva asema/lastausalue.
+STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liian monta asemaa/lastausaluetta kaupungissa.
+STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Liian monta asemaa/lastausaluetta.
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Liian monta linja-autopysäkkiä.
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Liian monta lastauslaituria.
-STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Liian lähellä toista asemaa tai lastausaluetta.
+STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Liian lähellä toista asemaa/lastausaluetta.
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Rautatieasema pitää tuhota ensin.
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Liian lähellä toista lentokenttää.
 STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Lentokenttä pitää tuhota ensin.

 STR_3030_RENAME_STATION_LOADING                                 :Nimeä asema/lastausalue
-STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Asemaa ei voi nimetä uudelleen.
+STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Asemaa ei voi nimetä uudelleen...
 STR_3032_RATINGS                                                :{BLACK}Arviot
 STR_3033_ACCEPTS                                                :{BLACK}Ottaa vastaan
 STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Paikallinen arvio kuljetuspalvelusta:
@@ -1739,24 +1736,24 @@ STR_3036_VERY_POOR                                              :Hyvin kehno
 STR_3037_POOR                                                   :Kehno
 STR_3038_MEDIOCRE                                               :Keskinkertainen
 STR_3039_GOOD                                                   :Hyvä
-STR_303A_VERY_GOOD                                              :Erittäin hyvä
+STR_303A_VERY_GOOD                                              :Oikein hyvä
 STR_303B_EXCELLENT                                              :Mainio
 STR_303C_OUTSTANDING                                            :Loistava
 ############ range for rating ends

 STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}{NBSP}%)
-STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} ei ota enää vastaan {STRING}.
-STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} ei ota enää vastaan {STRING} tai {STRING}.
+STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} ei enää ota vastaan {STRING}.
+STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} ei enää ota vastaan {STRING} tai {STRING}.
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} ottaa nyt vastaan {STRING}.
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} ottaa nyt vastaan {STRING} ja {STRING}.
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Linja-autoaseman suunta
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Lastauslaiturin suunta
-STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Linja-autoasema pitää purkaa ensin.
-STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Lastauslaituri pitää purkaa ensin.
+STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Linja-autoasema pitää tuhota ensin.
+STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Lastauslaituri pitää tuhota ensin.
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} asema{P "" a}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ei mitään -
-STR_304B_SITE_UNSUITABLE                                        :{WHITE}...huono paikka
+STR_304B_SITE_UNSUITABLE                                        :{WHITE}...paikka sopimaton.
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Liian lähellä toista satamaa.
 STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Satama pitää tuhota ensin.
 STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Valitse rautatieaseman suunta.
@@ -1769,7 +1766,7 @@ STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Näytä
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Muuta aseman nimi.
 STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Näytä luettelo vastaanotettavasta rahdista.
 STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Asemien nimet - napsauta nimeä keskittääksesi näkymän asemaan.
-STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Valitse lentokentän koko ja tyyppi.
+STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Valitse lentokentän koko/tyyppi.
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
 STR_305E_RAILROAD_STATION                                       :Rautatieasema
@@ -1785,7 +1782,7 @@ STR_3068_DOCK                                                   :{WHITE}Satama
 STR_3069_BUOY                                                   :Poiju
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...poiju on tiellä.
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...asema liian levittäytynyt.
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...epäsymmetriset asemat poissa käytöstä.
+STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...epäyhdenmukaiset asemat poissa käytöstä.
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Pidä CTRL painettuna valitaksesi enemmän kuin yhden tavaran

 STR_UNDEFINED                                                   :(määrittelemätön)
@@ -1793,15 +1790,14 @@ STR_STAT_CLASS_DFLT                                             :Oletusasema
 STR_STAT_CLASS_WAYP                                             :Rastit

 ##id 0x3800
-STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Telakan suunta
+STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Telakan suunn.
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...se pitää rakentaa veteen.
-STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Telakkaa ei voi rakentaa.
+STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Telakkaa ei voi rakentaa...
 STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Valitse telakan suunta
 STR_3804_WATER                                                  :Vettä
 STR_3805_COAST_OR_RIVERBANK                                     :Rannikko tai joenpenkka
 STR_3806_SHIP_DEPOT                                             :Telakka
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...veteen ei voi rakentaa.
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanava täytyy purkaa ensin

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Tallenna peli
@@ -1888,8 +1884,8 @@ STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY}: tuotanto vähenee 50{NBSP}%:lla.
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}{INDUSTRY}: hyönteisparvet aiheuttavat tuhoa!{}Tuotanto vähenee 50{NBSP}%:lla.
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...voidaan asettaa vain kartan reunoille.
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{1:INDUSTRY} tuottaa {0:STRING} {2:COMMA}{NBSP}% entistä enemmän!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{1:INDUSTRY} tuottaa {0:STRING} {2:COMMA}{NBSP}% entistä vähemmän!
+STR_INDUSTRY_PROD_GOUP                                          ::{BLACK}{BIGFONT}{1:INDUSTRY} tuottaa {0:STRING} {2:COMMA}{NBSP}% entistä enemmän!
+STR_INDUSTRY_PROD_GODOWN                                        ::{BLACK}{BIGFONT}{1:INDUSTRY} tuottaa {0:STRING} {2:COMMA}{NBSP}% entistä vähemmän!

 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Juna on tunnelissa.
@@ -2053,8 +2049,8 @@ STR_6832_6_MONTHS_AFTER_PLAYER                                  :6 kuukautta pel
 STR_6833_9_MONTHS_AFTER_PLAYER                                  :9 kuukautta pelaajan jälkeen
 STR_6834_AT_END_OF_LINE_AND_AT_STATIONS                         :Radan päässä ja asemilla
 STR_6835_AT_END_OF_LINE_ONLY                                    :Vain radan päässä
-STR_6836_OFF                                                    :Pois
-STR_6837_ON                                                     :Päällä
+STR_6836_OFF                                                    :Päällä
+STR_6837_ON                                                     :Pois
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Näytä pistetaulukko
 STR_6839_PERMISSIVE                                             :Salliva
 STR_683A_TOLERANT                                               :Suvaitseva
@@ -2193,7 +2189,6 @@ STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}Yhtiön {COMPANY} on ottanut haltuun {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...

-STR_LIVERY_DEFAULT                                              :Normaalit tunnusvärit
 STR_LIVERY_STEAM                                                :Höyryveturi
 STR_LIVERY_DIESEL                                               :Dieselveturi
 STR_LIVERY_ELECTRIC                                             :Sähköveturi
@@ -2633,9 +2628,7 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Raiteet eivät
 STR_TRAIN_NO_POWER                                              :{RED}Ei virtaa
 STR_TRAIN_START_NO_CATENARY                                     :Radasta puuttuu "catenary"; junaa ei voi käynnistää

-STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Uusi {STRING} on nyt saatavilla!
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Uusi {STRING} on nyt saatavilla! - {STRING}

 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Ajoneuvo tiellä.
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -250,7 +250,7 @@ STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFON
 STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Carrière de Caramel
 STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}Mine de Sucre
 STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Gare ferroviaire
-STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Aire de chargement
+STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Zone de Chargement
 STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Arrêt d'autobus
 STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Aéroport/Héliport
 STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Port maritime
@@ -882,7 +882,7 @@ STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Anglais (Origin
 STR_TOWNNAME_FRENCH                                             :Français
 STR_TOWNNAME_GERMAN                                             :Allemand
 STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :Anglais (Additionels)
-STR_TOWNNAME_LATIN_AMERICAN                                     :Latino-Americains
+STR_TOWNNAME_LATIN_AMERICAN                                     :Latino-Americain
 STR_TOWNNAME_SILLY                                              :Drôles
 STR_TOWNNAME_SWEDISH                                            :Suédois
 STR_TOWNNAME_DUTCH                                              :Hollandais
@@ -892,13 +892,13 @@ STR_TOWNNAME_SLOVAKISH                                          :Slovaques
 STR_TOWNNAME_NORWEGIAN                                          :Norvégiens
 STR_TOWNNAME_HUNGARIAN                                          :Hongrois
 STR_TOWNNAME_AUSTRIAN                                           :Autrichiens
-STR_TOWNNAME_ROMANIAN                                           :Roumains
+STR_TOWNNAME_ROMANIAN                                           :Roumain
 STR_TOWNNAME_CZECH                                              :Tchèques
-STR_TOWNNAME_SWISS                                              :Suisses
+STR_TOWNNAME_SWISS                                              :Suisse
 STR_TOWNNAME_DANISH                                             :Danois
 STR_TOWNNAME_TURKISH                                            :Turques
-STR_TOWNNAME_ITALIAN                                            :Italiens
-STR_TOWNNAME_CATALAN                                            :Catalans
+STR_TOWNNAME_ITALIAN                                            :Italien
+STR_TOWNNAME_CATALAN                                            :Catalan
 ############ end of townname region

 STR_CURR_GBP                                                    :Livre (£)
@@ -1283,14 +1283,14 @@ STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multijou
 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nom du joueur:
 STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ceci est le nom avec lequel les autres joueurs pourront vous identifier
 STR_NETWORK_CONNECTION                                          :{BLACK}Connexion :
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Choisir entre un jeu sur Internet ou sur réseau local
+STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Choisir entre un jeu Internet ou sur réseau local

 STR_NETWORK_START_SERVER                                        :{BLACK}Démarrer le serveur
 STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Démarre son propre serveur

 STR_NETWORK_GAME_NAME                                           :{BLACK}Nom
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nom de la partie
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Langue, version du serveur, etc.
+STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Langage, version du serveur, etc.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Cliquer sur une partie de la liste pour la sélectionner

 STR_NETWORK_FIND_SERVER                                         :{BLACK}Trouver un serveur
@@ -1337,7 +1337,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (publier)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 joueurs
+STR_NETWORK_0_PLAYERS                                           :0 joueur
 STR_NETWORK_1_PLAYERS                                           :1 joueur
 STR_NETWORK_2_PLAYERS                                           :2 joueurs
 STR_NETWORK_3_PLAYERS                                           :3 joueurs
@@ -1408,8 +1408,8 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) En
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Rapatriement des infos sur le jeu..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Rapatriement des infos sur la compagnie..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" s} avant vous
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} ko téléchargés
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" s} avant nous
+STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} ko déjà téléchargés

 STR_NETWORK_DISCONNECT                                          :{BLACK}Déconnecter

@@ -1421,7 +1421,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste de
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Aucun périphérique réseau trouvé ou programme compilé sans ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Aucune partie réseau n'a été trouvée
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Le serveur n'a pas répondu à la requête
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Echec de la connexion : NewGRF requis
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Echec de la connexion à cause de NewGRF différents
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} La synchronisation de la partie réseau a échouée.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} La connection de la partie réseau a été perdue.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} La sauvegarde serveur n'a pas pu être chargée.
@@ -1431,7 +1431,7 @@ STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} La conn
 STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Il y a eu une erreur de protocole et la connection est donc fermée.
 STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La révision de ce client ne correspond pas à celle du serveur.
 STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Mot de passe incorrect.
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Le serveur est complet
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Le serveur est plein
 STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Vous êtes bannis de ce serveur
 STR_NETWORK_ERR_KICKED                                          :{WHITE} Vous avez été exclu de la partie
 STR_NETWORK_ERR_CHEATER                                         :{WHITE} Tricher n'est pas autorisé sur ce serveur
@@ -1443,7 +1443,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :erreur de désy
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :chargement de la carte impossible
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connection perdue
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :erreur de protocole
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF requis
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF différents
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :non autorisé
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :paquet étrange reçu
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :révision incorrecte
@@ -1527,7 +1527,7 @@ STR_1003_ALREADY_AT_SEA_LEVEL                                   :{WHITE}Déjà a
 STR_1004_TOO_HIGH                                               :{WHITE}Trop élevé
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Aucuns rails convenables
 STR_1007_ALREADY_BUILT                                          :{WHITE}...déjà construit
-STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Vous devez d'abord enlever les rails
+STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Doit d'abord enlever les rails
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Construction de voie ferrée
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Construction de voie ferrée électrifiée
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Construction de Monorail
@@ -1539,7 +1539,7 @@ STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Impossib
 STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Impossible de construire des rails ici...
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Impossible de retirer les rails d'ici...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Impossible de retirer les signaux d'ici...
-STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Orientation du dépôt
+STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Orientation du Dépôt
 STR_1015_RAILROAD_CONSTRUCTION                                  :Construction de voie ferrée
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Construction de voie ferrée électrifiée
 STR_1016_MONORAIL_CONSTRUCTION                                  :Construction de Monorail
@@ -1557,14 +1557,14 @@ STR_1021_RAILROAD_TRACK                                         :Rails
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Dépôt ferroviaire
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...appartient à une autre compagnie
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Rails avec des signaux normaux
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Rails avec des signaux d'entrée
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Rails avec des pré-signaux
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Rails avec des signaux de sortie
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Rails avec des signaux combinés



 ##id 0x1800
-STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Vous devez d'abord retirer la route
+STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Doit d'abord retirer la route
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Route en travaux
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construction routière
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Choisir Pont Routier
@@ -1573,12 +1573,12 @@ STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Impossib
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientation du dépôt
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Impossible de construire un dépôt routier ici...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Impossible de construire un arrêt d'autobus...
-STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Impossible de construire une aire de chargement...
+STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Impossible de construire une station de camions...
 STR_180A_ROAD_CONSTRUCTION                                      :Construction routière
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Construire une section de route
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Construire un dépôt routier (pour construire et entretenir les véhicules routiers)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Construire un arrêt d'autobus
-STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construire une aire de chargement
+STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Construire une station de camions
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Construire un pont routier
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Construire un tunnel routier
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Basculer construire/détruire routes
@@ -1717,7 +1717,7 @@ STR_3002_ORIENTATION                                            :{BLACK}Orientat
 STR_3003_NUMBER_OF_TRACKS                                       :{BLACK}Nombre de voies
 STR_3004_PLATFORM_LENGTH                                        :{BLACK}Longueur du quai
 STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Trop près d'une autre gare
-STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Adjacent à plus d'une gare à la fois
+STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Ajouter une ou plusieurs gares
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Trop de gares dans cette ville
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Trop de gares
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Trop d'arrêts d'autobus
@@ -1752,14 +1752,14 @@ STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} accepte désormais: {STRING} et {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Arrêt d'autobus
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Station de camions
-STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Vous devez d'abord détruire l'arrêt d'autobus
-STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Vous devez d'abord détruire l'aire de chargement
-STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Station{P 2 "" s}
+STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Détruire d'abord l'arrêt d'autobus
+STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Détruisez d'abord la station
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Station{P "" s}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Aucun -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...l'endroit ne convient pas
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Trop près d'un autre port
-STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Vous devez d'abord détruire le port
+STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Détruisez d'abord le port
 STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Choisir l'orientation de la gare ferroviaire
 STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Choix du nombre de voies
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Choisir la longueur de la gare
@@ -1794,7 +1794,7 @@ STR_STAT_CLASS_DFLT                                             :Station par dé
 STR_STAT_CLASS_WAYP                                             :Points de passage

 ##id 0x3800
-STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientation du dépôt
+STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientation du dépot naval
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...doit être construit sur l'eau
 STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Impossible de construire le dépôt naval ici...
 STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Choisir l'orientation du dépôt naval
@@ -1802,7 +1802,6 @@ STR_3804_WATER                                                  :Eau
 STR_3805_COAST_OR_RIVERBANK                                     :Rivage ou berge
 STR_3806_SHIP_DEPOT                                             :Dépôt naval
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Impossible de construire sur l'eau
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Vous devez d'abord détruire le canal

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Sauvegarder la partie
@@ -1897,7 +1896,7 @@ STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Train da
 STR_5001_ROAD_VEHICLE_IN_TUNNEL                                 :{WHITE}Véhicule dans le tunnel
 STR_5003_ANOTHER_TUNNEL_IN_THE_WAY                              :{WHITE}Autre tunnel présent
 STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}Impossible de creuser pour faire déboucher le tunnel
-STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Vous devez d'abord démolir le tunnel
+STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Vous devez démolir le tunnel avant
 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Vous devez d'abord démolir le pont
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Impossible de commencer et de terminer au même endroit
 STR_5009_LEVEL_LAND_OR_WATER_REQUIRED                           :{WHITE}Crevasse ou eau requise sous le pont
@@ -2004,7 +2003,7 @@ STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Nombre
 STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Arrivée des concurents: {ORANGE}{STRING}
 STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Nombre de villes: {ORANGE}{STRING}
 STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Nombre d'industries: {ORANGE}{STRING}
-STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Emprunt initial maximum: {ORANGE}{CURRENCY}
+STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Prêt initial maximum: {ORANGE}{CURRENCY}
 STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Taux d'interêt initial: {ORANGE}{COMMA}%
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Coûts d'entretien: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Vitesse de développement des concurents: {ORANGE}{STRING}
@@ -2100,14 +2099,14 @@ STR_CURRCOMPACT                                                 :{CURRCOMPACT64}
 STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graphique du profit d'opération
 STR_7026_BANK_BALANCE                                           :{WHITE}Equilibre bancaire
-STR_7027_LOAN                                                   :{WHITE}Emprunt
+STR_7027_LOAN                                                   :{WHITE}Prêt
 STR_MAX_LOAN                                                    :{WHITE}Emprunt maximum :  {BLACK}{CURRENCY64}
 STR_7028                                                        :{BLACK}{CURRENCY64}
 STR_7029_BORROW                                                 :{BLACK}Emprunter {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Rembourser {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
 STR_702B_MAXIMUM_PERMITTED_LOAN                                 :{WHITE}...le prêt maximum est de {CURRENCY}
 STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Impossible d'emprunter plus...
-STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...emprunt déjà remboursé
+STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...Prêt déjà remboursé
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} nécessaires
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Impossible de rembourser...
 STR_INSUFFICIENT_FUNDS                                          :{WHITE}On ne peut pas distribuer de l'argent qui est emprunté à la banque...
@@ -2714,7 +2713,7 @@ STR_9809_BUILD_SHIP                                             :{BLACK}Construi
 STR_CLONE_SHIP                                                  :{BLACK}Copier Navire
 STR_CLONE_SHIP_INFO                                             :{BLACK}Effectuer la copie d'un navire. Ctrl-clic partagera les ordres
 STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Effectuer la copie d'un navire. Cliquer ici puis sur un navire dans ou hors d'un dépôt. Ctrl-clic partagera les ordres
-STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Le navire doit être arrêté au dépôt
+STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Navire doit être arrêté au dépôt
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Impossible de vendre navire...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Impossible de construire navire...
 STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Navire présent
@@ -2804,7 +2803,7 @@ STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Impossib
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}L'aéronef est en vol
 STR_A019_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{CARGO}, {CARGO}
 STR_A01A_CAPACITY                                               :{BLACK}Capacité: {LTBLUE}{CARGO}
-STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}L'aéronef doit être arrêté au hangar
+STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}Aéronef doit être arrêté au hangar
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Impossible de vendre l'aéronef...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Construction d'aéroport
 STR_A01E_BUILD_AIRPORT                                          :{BLACK}Construire un aéroport
@@ -2873,7 +2872,7 @@ STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Revenu m
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Livré :
 STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Cargo :
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Argent :
-STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Emprunt :
+STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Prêt :
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total :
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Nombre de véhicules. Ceci inclut les véhicules routiers, les trains, les navies et les aéronefs.
--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -294,7 +294,6 @@ STR_0140_NEW_GAME                                               :{BLACK}Nova Par
 STR_0141_LOAD_GAME                                              :{BLACK}Cargar Partida
 STR_SINGLE_PLAYER                                               :{BLACK}Un Xogador
 STR_MULTIPLAYER                                                 :{BLACK}Multixogador
-STR_SCENARIO_EDITOR                                             :{BLACK}Editor De Escenarios

 STR_64                                                          :64
 STR_128                                                         :128
@@ -388,7 +387,6 @@ STR_ENGINE_SORT_RUNNING_COST                                    :Coste Mantement
 STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Potencia/Coste Mantemento
 STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacidade De Carga
 STR_NO_WAITING_CARGO                                            :{BLACK}Non queda ningún tipo de carga en espera
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar tódolos edificios
 STR_MANAGE_LIST                                                 :{BLACK}Xestionar lista
 STR_REPLACE_VEHICLES                                            :Reemplazar Vehículos
 STR_SEND_TRAIN_TO_DEPOT                                         :Enviar o Depósito
@@ -723,6 +721,7 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Grabar e
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Cargar Escenario
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Grabar Escenario
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Xogar Escenario
+STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}¿Estás seguro de que desexas saír deste escenario?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Saír do Editor
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...só se pode construír en cidades con polo menos 1200 hab.
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Move-lo ano de comezo un ano hacia atrás
@@ -754,7 +753,7 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 STR_02C3_GAME_OPTIONS                                           :Opcións da Partida
 STR_02C5_DIFFICULTY_SETTINGS                                    :Configuración de Dificultade
 STR_02C7_CONFIG_PATCHES                                         :Configuración dos Parches
-STR_NEWGRF_SETTINGS                                             :Configuración NewGRF
+STR_NEWGRF_SETTINGS                                             :Configuración de Newgrf
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Amosar nomes de cidades
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Amosae nomes de estacións
@@ -1163,7 +1162,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Árbores
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Colocar árbores dun tipo aleatorio

 STR_CANT_BUILD_CANALS                                           :{WHITE}Non se pode construí-los canais aí...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Construir canais.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Non se pode construí-lo peche aí...
@@ -2555,7 +2553,6 @@ STR_TRAIN_STOPPING                                              :{RED}Parando
 STR_TRAIN_STOPPING_VEL                                          :{RED}Parando, {VELOCITY}
 STR_TRAIN_NO_POWER                                              :{RED}Sen enerxía

-STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}¡Novo {STRING} agora dispoñible!
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Haí un vehículo de estrada no camiño
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehículos de Estrada
@@ -2800,26 +2797,25 @@ STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Amount o
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Valor do préstamo que ten a compañía
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Puntos totais de puntos posibles

-STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Configuración NewGRF
-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Configuración NewGRF
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Configuración Newgrf
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplica-los cambios
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Conf. parámetros
-STR_NEWGRF_TIP                                                  :{BLACK}Unha lista de tódolos sets NewGRF que tes instalados. Pincha nun set para cambia-la configuración
+STR_NEWGRF_TIP                                                  :{BLACK}Unha lista de tódolos sets Newgrf que tes instalados. Pincha nun set para cambia-la configuración
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}¡Non hai ficheiros newgrf instalados! Consulta no manual as instruccións para instalar novos gráficos
 STR_NEWGRF_FILENAME                                             :{BLACK}Ficheiro: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}Suma MD5: {SILVER}{STRING}

 STR_NEWGRF_ADD                                                  :{BLACK}Engadir
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Engadir un novo arquivo NewGRF á lista
 STR_NEWGRF_REMOVE                                               :{BLACK}Eliminar
 STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Elimina-lo arquivo NewGRF seleccionado da lista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Subir
+STR_NEWGRF_MOVEUP                                               :{BLACK}Mover Arriba
 STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Move-lo arquivo NewGRF seleccionado arriba na lista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Baixar
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mover Abaixo
 STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Move-lo arquivo NewGRF seleccionado abaixo na lista
 STR_NEWGRF_PARAMETER                                            :{BLACK}Parámetros: {SILVER}{STRING}

+
 STR_NEWGRF_DISABLED                                             :{RED}Desactivado

 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda persoalizada
@@ -2926,7 +2922,6 @@ STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Xeració
 STR_RANDOM_SEED                                                 :{BLACK}Semilla Aleatoria:
 STR_RANDOM_SEED_HELP                                            :{BLACK}Pincha para introducir unha semilla
 STR_LAND_GENERATOR                                              :{BLACK}Xerador de terreo:
-STR_TREE_PLACER                                                 :{BLACK}Algoritmo para árbores:
 STR_TERRAIN_TYPE                                                :{BLACK}Tipo de terreo:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivel do mar:
 STR_SMOOTHNESS                                                  :{BLACK}Suavidade:
@@ -2947,9 +2942,7 @@ STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} /
 STR_WORLD_GENERATION                                            :{BLACK}Xeración do mundo
 STR_SETTINGUP_GAME                                              :{BLACK}Configurando partida
 STR_PREPARING_GAME                                              :{BLACK}Preparando partida
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Esta acción cambiou o nivel de dificultade a Personalizado
 STR_SE_FLAT_WORLD                                               :{WHITE}Terreo Chan
-STR_SE_RANDOM_LAND                                              :{WHITE}Terreo aleatorio
 STR_SE_NEW_WORLD                                                :{BLACK}Crear novo escenario
 STR_SE_CAPTION                                                  :{WHITE}Tipo de escenario
 STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}
@@ -2978,9 +2971,4 @@ STR_MEASURE_AREA                                                :{BLACK}Área: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lonxitude: {NUM}{}Diferencia de altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Área: {NUM} x {NUM}{}Diferencia de altura: {NUM} m

-############ Date formatting
-STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
-STR_DATE_SHORT                                                  :{STRING} {NUM}
-STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
-
 ########
--- a/lang/german.txt
+++ b/lang/german.txt
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -887,8 +887,8 @@ STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Mérték
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Közúti járművek
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Válaszd ki,az út melyik oldalán haladjanak a közúti járművek
-STR_02E9_DRIVE_ON_LEFT                                          :Balra hajtás
-STR_02EA_DRIVE_ON_RIGHT                                         :Jobbra hajtás
+STR_02E9_DRIVE_ON_LEFT                                          :Balra hajts
+STR_02EA_DRIVE_ON_RIGHT                                         :Jobbra hajts
 STR_02EB_TOWN_NAMES                                             :{BLACK}Városnevek
 STR_02EC                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}A városnevek stílusának kiválasztása
@@ -1867,7 +1867,6 @@ STR_3804_WATER                                                  :Víz
 STR_3805_COAST_OR_RIVERBANK                                     :Tenger- vagy folyópart
 STR_3806_SHIP_DEPOT                                             :Dokk
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...nem építhető vízen
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}A csatornát előbb le kell rombolni

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Játék mentése
--- a/lang/icelandic.txt
+++ b/lang/icelandic.txt
@@ -2947,17 +2947,6 @@ STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Sýna ö

 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Samnýttar skipanir {COMMA} {P farartækis farartækja}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Sýna öll farartæki sem deila þessari áætlun
-STR_SELL                                                        :{BLACK}Selja
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Þú ert í þann mund að selja öll farartækin.
-STR_ARE_YOU_SURE                                                :{BLACK}Ertu viss?
-STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Staðfestu að þú viljir selja allar lestirnar í skýlinu
-STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Staðfestu að þú viljir selja allar bifreiðarnar í skýlinu
-STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Staðfestu að þú viljir selja öll skipin í slippnum
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Staðfestu að þú viljir selja allar flugvélarnar í skýlinu
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Ekki selja allar lestirnar í skýlinu
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Ekki selja allar bifreiðarnar í skýlinu
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Ekki selja öll skipin í slippnum
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Ekki selja allar flugvélarnar í skýlinu

 ### depot strings

@@ -2976,13 +2965,24 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Skipta
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Skipta öllum skipum í slippnum sjálfvirkt út
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Skipta öllum flugvélum í skýlinu sjálfvirkt út

+STR_SELL                                                        :{BLACK}Selja
+STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Þú ert í þann mund að selja öll farartækin.
+STR_ARE_YOU_SURE                                                :{BLACK}Ertu viss?

 STR_VEHICLE_LIST_TRAIN_DEPOT                                    :{BLACK}{STRING} - {COMMA} Lest{P "" ir}
 STR_VEHICLE_LIST_ROADVEH_DEPOT                                  :{BLACK}{STRING} - {COMMA} Bifreið{P "" ar}
 STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING} - {COMMA} Skip
 STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} Flugvél{P "" ar}

+STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Staðfestu að þú viljir selja allar lestirnar í skýlinu
+STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Staðfestu að þú viljir selja allar bifreiðarnar í skýlinu
+STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Staðfestu að þú viljir selja öll skipin í slippnum
+STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Staðfestu að þú viljir selja allar flugvélarnar í skýlinu

+STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Ekki selja allar lestirnar í skýlinu
+STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Ekki selja allar bifreiðarnar í skýlinu
+STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Ekki selja öll skipin í slippnum
+STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Ekki selja allar flugvélarnar í skýlinu

 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Endurnýja {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Hefja skipti
--- a/lang/italian.txt
+++ b/lang/italian.txt
--- a/lang/japanese.txt
+++ b/lang/japanese.txt
@@ -1801,7 +1801,6 @@ STR_3804_WATER                                                  :水
 STR_3805_COAST_OR_RIVERBANK                                     :海岸または川岸
 STR_3806_SHIP_DEPOT                                             :造船所
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...水上に建設できません
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}先に運河を破壊しなければなりません

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}ゲームを保存
@@ -2122,8 +2121,8 @@ STR_7038_INAUGURATED                                            :{GOLD}開業日
 STR_7039_VEHICLES                                               :{GOLD}車両数：
 STR_TRAINS                                                      :{WHITE}列車{COMMA}本
 STR_ROAD_VEHICLES                                               :{WHITE}道路車両{COMMA}両
-STR_AIRCRAFT                                                    :{WHITE}飛行機{COMMA}台
-STR_SHIPS                                                       :{WHITE}船舶{COMMA}隻
+STR_AIRCRAFT                                                    :{WHITE}{COMMA}台の飛行機
+STR_SHIPS                                                       :{WHITE}{COMMA}隻の船舶
 STR_7042_NONE                                                   :{WHITE}なし
 STR_7043_FACE_SELECTION                                         :{WHITE}顔の選択
 STR_7044_MALE                                                   :{BLACK}男性
@@ -2707,7 +2706,7 @@ STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}埠頭
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}ここに埠頭が建設できません...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN}造船所
 STR_9804_NEW_SHIPS                                              :{BLACK}新規船舶
-STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - 船舶{COMMA}隻
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA}隻の船舶
 STR_9808_NEW_SHIPS                                              :{WHITE}新規船舶
 STR_9809_BUILD_SHIP                                             :{BLACK}船舶を購入
 STR_CLONE_SHIP                                                  :{BLACK}船舶をクローン
@@ -2783,7 +2782,7 @@ STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}飛行
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}新規飛行機
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}飛行機を購入
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}飛行機が購入できません...
-STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - 飛行機{COMMA}台
+STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA}台の飛行機
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE}（指令）
 STR_A00C_DETAILS                                                :{WHITE}{VEHICLE}（詳細）
@@ -2986,10 +2985,10 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}車庫
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}造船所内のすべての船舶を自動的に交換します
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}格納庫内のすべての飛行機を自動的に交換します

-STR_VEHICLE_LIST_TRAIN_DEPOT                                    :{BLACK}{STRING} - 列車{COMMA}本
-STR_VEHICLE_LIST_ROADVEH_DEPOT                                  :{BLACK}{STRING} - 道路車両{COMMA}両
-STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING} - 船舶{COMMA}隻
-STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - 飛行機{COMMA}台
+STR_VEHICLE_LIST_TRAIN_DEPOT                                    :{BLACK}{STRING} - {COMMA}本の列車
+STR_VEHICLE_LIST_ROADVEH_DEPOT                                  :{BLACK}{STRING} - {COMMA}両の道路車両
+STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING} - {COMMA}隻の船舶
+STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA}台の飛行機

 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING}を交換
 STR_REPLACE_VEHICLES_START                                      :{BLACK}車両の交換を開始
--- a/lang/korean.txt
+++ b/lang/korean.txt
@@ -46,7 +46,7 @@ STR_0025_TOYS                                                   :장난감
 STR_0026_CANDY                                                  :사탕
 STR_0027_COLA                                                   :콜라
 STR_0028_COTTON_CANDY                                           :솜사탕
-STR_0029_BUBBLES                                                :거품
+STR_0029_BUBBLES                                                :풍선껌
 STR_002A_TOFFEE                                                 :태피
 STR_002B_BATTERIES                                              :배터리
 STR_002C_PLASTIC                                                :플라스틱
@@ -78,7 +78,7 @@ STR_0045_TOY                                                    :장난감
 STR_0046_CANDY                                                  :사탕
 STR_0047_COLA                                                   :콜라
 STR_0048_COTTON_CANDY                                           :솜사탕
-STR_0049_BUBBLE                                                 :거품
+STR_0049_BUBBLE                                                 :풍선껌
 STR_004A_TOFFEE                                                 :태피
 STR_004B_BATTERY                                                :배터리
 STR_004C_PLASTIC                                                :플라스틱
@@ -110,7 +110,7 @@ STR_QUANTITY_TOYS                                               :장난감 {COMM
 STR_QUANTITY_SWEETS                                             :{COMMA} 자루의 사탕
 STR_QUANTITY_COLA                                               :{VOLUME}의 콜라
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT}의 솜사탕
-STR_QUANTITY_BUBBLES                                            :거품 {COMMA} 상자
+STR_QUANTITY_BUBBLES                                            :풍선껌 {COMMA} 상자
 STR_QUANTITY_TOFFEE                                             :{WEIGHT}의 태피
 STR_QUANTITY_BATTERIES                                          :배터리 {COMMA} 상자
 STR_QUANTITY_PLASTIC                                            :{VOLUME}의 플라스틱
@@ -246,7 +246,7 @@ STR_0114_TOY_SHOP                                               :{BLACK}{TINYFON
 STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}장난감 공장
 STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}플라스틱 분수
 STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}탄산음료 공장
-STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}거품 제조 공장
+STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}풍선껌 제조 공장
 STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}태피 채취장
 STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}설탕 광산
 STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}철도역
@@ -457,7 +457,7 @@ STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}점검
 STR_018B_CLOSE_WINDOW                                           :{BLACK}창닫기
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}창 제목 - 창을 움직이려면 여기를 드래그하세요
 STR_STICKY_BUTTON                                               :{BLACK}이 창을 '모든 창 닫기' 키로 닫을 수 없게 하기
-STR_RESIZE_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}땅의 모퉁이를 낮춥니다.
@@ -682,7 +682,7 @@ STR_025B_TOY_SHOP                                               :{BLACK}장난
 STR_025C_TOY_FACTORY                                            :{BLACK}장난감 공장
 STR_025D_PLASTIC_FOUNTAINS                                      :{BLACK}플라스틱 분수
 STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}탄산음료 공장
-STR_025F_BUBBLE_GENERATOR                                       :{BLACK}거품 제조 공장
+STR_025F_BUBBLE_GENERATOR                                       :{BLACK}풍선껌 제조 공장
 STR_0260_TOFFEE_QUARRY                                          :{BLACK}태피 채취장
 STR_0261_SUGAR_MINE                                             :{BLACK}설탕 광산
 STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}석탄 광산 건설
@@ -717,7 +717,7 @@ STR_027E_CONSTRUCT_TOY_SHOP                                     :{BLACK}장난
 STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}장난감 공장 건설
 STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}플라스틱 분수 건설
 STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}탄산음료 공장 건설
-STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}거품 제조 공장 건설
+STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}풍선껌 제조 공장 건설
 STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}태피 채취장 건설
 STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}설탕 광산 건설
 STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}{STRING}을/를 여기에 건설할 수 없습니다...
@@ -744,7 +744,7 @@ STR_0298_LOAD_SCENARIO                                          :{WHITE}시나
 STR_0299_SAVE_SCENARIO                                          :{WHITE}시나리오 저장하기
 STR_029A_PLAY_SCENARIO                                          :{BLACK}시나리오 플레이
 STR_PLAY_HEIGHTMAP                                              :{BLACK}DEM지형 플레이
-STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}DEM지형을 풍경으로 하여 게임을 시작합니다.
+STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}DEM지형을 풍경으로 하여 게임을 시작합
 STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}이 시나리오를 종료하시겠습니까?
 STR_029C_QUIT_EDITOR                                            :{WHITE}에디터 종료
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...1200명 이상의 도시에만 건설할 수 있습니다!
@@ -1253,7 +1253,7 @@ STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}솜사
 STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}배터리 농장에 투자합니다.
 STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}콜라 우물을 팝니다.
 STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP                             :{BLACK}플라스틱 분수에 투자합니다.
-STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}거품 제조 공장을 건설합니다.
+STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}풍선껌 제조 공장을 건설합니다.
 STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}태피 채취장에 투자합니다.
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}설탕 광산을 건설합니다.

@@ -1635,7 +1635,7 @@ STR_2027_FROM_TO                                                :{ORANGE}{1:STRI
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT}까지)
 STR_202A_NONE                                                   :{ORANGE}없음
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}이미 지급된 보조금:
-STR_202C_FROM_TO                                                :{ORANGE}{1:STATION}에서 {2:STATION}까지 {0:STRING} 수송{YELLOW} ({3:COMPANY}
+STR_202C_FROM_TO                                                :{ORANGE}{STRING}에서 {STATION}까지 {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, {DATE_SHORT}까지)
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}보조금 제공 계약 파기:{}{}{0:STRING}에서 {1:STRING}까지의 {2:STRING} 수송은 더이상 보조금을 지급하지 않습니다.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}보조금 제공 철회:{}{}{1:STATION}에서 {2:STATION}까지의 {0:STRING} 수송은 더이상 보조금을 지급하지 않습니다.
@@ -1802,7 +1802,6 @@ STR_3804_WATER                                                  :물
 STR_3805_COAST_OR_RIVERBANK                                     :해안 또는 강기슭
 STR_3806_SHIP_DEPOT                                             :정박소
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...물 위에 지을 수 없습니다
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}운하를 먼저 제거하십시오

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}게임 저장
@@ -1861,7 +1860,7 @@ STR_4820_TOY_SHOP                                               :장난감 가
 STR_4821_TOY_FACTORY                                            :장난감 공장
 STR_4822_PLASTIC_FOUNTAINS                                      :플라스틱 분수
 STR_4823_FIZZY_DRINK_FACTORY                                    :탄산음료 공장
-STR_4824_BUBBLE_GENERATOR                                       :거품 제조 공장
+STR_4824_BUBBLE_GENERATOR                                       :풍선껌 제조 공장
 STR_4825_TOFFEE_QUARRY                                          :태피 채취장
 STR_4826_SUGAR_MINE                                             :설탕 광산

@@ -2271,7 +2270,7 @@ STR_802B_RUBBER_TRUCK                                           :고무 수송
 STR_802C_SUGAR_TRUCK                                            :설탕 수송차량
 STR_802D_COTTON_CANDY_HOPPER                                    :솜사탕 수송차량
 STR_802E_TOFFEE_HOPPER                                          :태피 수송차량
-STR_802F_BUBBLE_VAN                                             :거품 수송차량
+STR_802F_BUBBLE_VAN                                             :풍선껌 수송차량
 STR_8030_COLA_TANKER                                            :콜라 탱크
 STR_8031_CANDY_VAN                                              :사탕 수송차량
 STR_8032_TOY_VAN                                                :장난감 수송차량
@@ -2301,7 +2300,7 @@ STR_8049_RUBBER_TRUCK                                           :고무 수송
 STR_804A_SUGAR_TRUCK                                            :설탕 수송차량
 STR_804B_COTTON_CANDY_HOPPER                                    :솜사탕
 STR_804C_TOFFEE_HOPPER                                          :태피 수송차량
-STR_804D_BUBBLE_VAN                                             :거품 수송차량
+STR_804D_BUBBLE_VAN                                             :풍선껌
 STR_804E_COLA_TANKER                                            :콜라 탱크
 STR_804F_CANDY_VAN                                              :사탕 수송차량
 STR_8050_TOY_VAN                                                :장난감 수송차량
@@ -2333,7 +2332,7 @@ STR_8069_RUBBER_TRUCK                                           :고무 수송
 STR_806A_SUGAR_TRUCK                                            :설탕 수송차량
 STR_806B_COTTON_CANDY_HOPPER                                    :솜사탕
 STR_806C_TOFFEE_HOPPER                                          :태피 수송차량
-STR_806D_BUBBLE_VAN                                             :거품 수송차량
+STR_806D_BUBBLE_VAN                                             :풍선껌
 STR_806E_COLA_TANKER                                            :콜라 탱크
 STR_806F_CANDY_VAN                                              :사탕 수송차량
 STR_8070_TOY_VAN                                                :장난감 수송차량
@@ -2425,9 +2424,9 @@ STR_80C5_WIZZOWOW_FIZZY_DRINK_TRUCK                             :Wizzowow 탄산
 STR_80C6_MIGHTYMOVER_PLASTIC_TRUCK                              :MightyMover 플라스틱 수송차
 STR_80C7_POWERNAUGHT_PLASTIC_TRUCK                              :Powernaught 플라스틱 수송차
 STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Wizzowow 플라스틱 수송차
-STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :MightyMover 거품 트럭
-STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Powernaught 거품 트럭
-STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Wizzowow 거품 트럭
+STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :MightyMover 풍선껌 트럭
+STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Powernaught 풍선껌 트럭
+STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Wizzowow 풍선껌 트럭
 STR_80CC_MPS_OIL_TANKER                                         :MPS 석유 탱크
 STR_80CD_CS_INC_OIL_TANKER                                      :CS-Inc. 석유 탱크
 STR_80CE_MPS_PASSENGER_FERRY                                    :MPS 여객선
@@ -2634,7 +2633,7 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :알맞지 않
 STR_TRAIN_NO_POWER                                              :{RED}기관차 없음
 STR_TRAIN_START_NO_CATENARY                                     :연결고리가 모자라 운행을 시작할 수 없습니다.

-STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}신형 {STRING} 이(가) 출시되었습니다!
+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}신형 {STRING} 자동차가 출시되었습니다!
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
 STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}신형 {STRING} 자동차가 출시되었습니다!  -  {STRING}

--- a/lang/norwegian_bokmal.txt
+++ b/lang/norwegian_bokmal.txt
@@ -590,7 +590,6 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomms
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankommst av første kjøretøy på motstanders stasjon
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Ulykker/katastrofer
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Firmainformasjon
-STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Åpninger / Stengninger av industrier
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Økonomiske endringer
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Råd/informasjon om spillers kjøretøy
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nye kjøretøy
@@ -730,7 +729,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Plasser
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Plasser fyrtårn
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plasser radiosender
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definer ørkenområde.{}Trykk og hold inne CTRL for å fjerne den
-STR_CREATE_LAKE                                                 :{BLACK}Definer vannområde.{}Lag en kanal, untatt hvis CTRL holdes nede på havnivå, hvor områdene vil fylles istedenfor
 STR_0290_DELETE                                                 :{BLACK}Slett
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slett denne byen fullstendig
 STR_0292_SAVE_SCENARIO                                          :Lagre scenario
@@ -1208,7 +1206,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Trær av
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plasser trær av tilfeldig type

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kan ikke bygge kanaler her...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Bygg kanaler.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikke bygge sluser her...
@@ -2632,9 +2629,6 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Inkompatible je
 STR_TRAIN_NO_POWER                                              :{RED}Ingen strøm
 STR_TRAIN_START_NO_CATENARY                                     :Dette sporet mangler et kjede, så toget kan ikke starte

-STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Ny {STRING} nå tilgjengelig!
-STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Ny {STRING} Nå tilgjengelig!  -  {STRING}

 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Kjøretøy i veien
--- a/lang/norwegian_nynorsk.txt
+++ b/lang/norwegian_nynorsk.txt
@@ -731,7 +731,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Plasser
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Plasser fyrtårn
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plasser radiosendar
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definer ørkenområde.{}Trykk og held inne CTRL for å fjerne det
-STR_CREATE_LAKE                                                 :{BLACK}Definer vassområde.{}Lag ein kanal. Viss CTRL er halde nede ved havnivå, vil vatnet i staden fløyme over omgivnadene
 STR_0290_DELETE                                                 :{BLACK}Slett
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Slett byen heilt
 STR_0292_SAVE_SCENARIO                                          :Lagre scenario
@@ -1448,7 +1447,7 @@ STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikkje autoriser
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottok merkeleg pakke
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :feil versjon
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :namnet er brukt av nokon andre
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :feil passord for til spelet
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :feil passord til spelet
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :feil spelar-id i DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :sparka ut av tenaren
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :freista å jukse
@@ -1802,7 +1801,6 @@ STR_3804_WATER                                                  :Vatn
 STR_3805_COAST_OR_RIVERBANK                                     :Kyst eller elvebreidd
 STR_3806_SHIP_DEPOT                                             :Skipsdepot
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Kan ikkje byggje på vatn
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Må fjerna kanal først

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Lagre spel
@@ -2771,7 +2769,7 @@ STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapas
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikkje bygge om skip...
 STR_9842_REFITTABLE                                             :(ombyggbart)
 STR_GO_TO_SHIP_DEPOT                                            :Seil til {TOWN} skipsdepot
-SERVICE_AT_SHIP_DEPOT                                           :Vedlikehald ved {TOWN} Skipsdepot
+SERVICE_AT_SHIP_DEPOT                                           :Vedlikehald ved {TOWN} skipsdepot

 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flyplassar
--- a/lang/polish.txt
+++ b/lang/polish.txt
@@ -132,7 +132,7 @@ STR_QUANTITY_COAL                                               :{WEIGHT} węgla
 STR_QUANTITY_MAIL                                               :{COMMA} pacz{P ka ki ek} poczty
 STR_QUANTITY_OIL                                                :{VOLUME} ropy
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} sztuk{P a i ""} żywca
-STR_QUANTITY_GOODS                                              :{COMMA} skrzy{P nia nie ń} towarów
+STR_QUANTITY_GOODS                                              :{COMMA} towarów
 STR_QUANTITY_GRAIN                                              :{WEIGHT} zboża
 STR_QUANTITY_WOOD                                               :{WEIGHT} drewna
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT} rudy żelaza
@@ -431,13 +431,13 @@ STR_SORT_BY_PROFIT_LAST_YEAR                                    :Zysk w ostatnim
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Zysk w tym roku
 STR_SORT_BY_AGE                                                 :Wiek
 STR_SORT_BY_RELIABILITY                                         :Niezawodność
-STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Całkowita pojemność typu ładunku
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Całkowita pojemność typu towaru
 STR_SORT_BY_MAX_SPEED                                           :Prędkość maks.
 STR_SORT_BY_MODEL                                               :Model
 STR_SORT_BY_VALUE                                               :Wartość
 STR_SORT_BY_FACILITY                                            :Typ stacji
-STR_SORT_BY_WAITING                                             :Wartość czekającego ładunku
-STR_SORT_BY_RATING_MAX                                          :Ocena ładunku
+STR_SORT_BY_WAITING                                             :Wartość czekającego towaru
+STR_SORT_BY_RATING_MAX                                          :Ocena towaru
 STR_ENGINE_SORT_ENGINE_ID                                       :ID pojazdu
 STR_ENGINE_SORT_COST                                            :Cena
 STR_ENGINE_SORT_POWER                                           :Moc
@@ -445,9 +445,9 @@ STR_ENGINE_SORT_INTRO_DATE                                      :Data wprowadzen
 STR_ENGINE_SORT_RUNNING_COST                                    :Koszty użytkowania
 STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Moc/Koszty użytkowania
 STR_ENGINE_SORT_CARGO_CAPACITY                                  :Pojemność
-STR_NO_WAITING_CARGO                                            :{BLACK}Nie ma żadnego czekającego ładunku
+STR_NO_WAITING_CARGO                                            :{BLACK}Nie ma żadnego czekającego towaru
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Zaznacz wszystkie typy stacji
-STR_SELECT_ALL_TYPES                                            :{BLACK}Zaznacz wszystkie typy ładunku (oraz brak czekającego ładunku)
+STR_SELECT_ALL_TYPES                                            :{BLACK}Zaznacz wszystkie typy towaru (oraz brak czekającego towaru)
 STR_AVAILABLE_TRAINS                                            :{BLACK}Dostępne Lokomotywy
 STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostępne Samochody
 STR_AVAILABLE_SHIPS                                             :{BLACK}Dostępne Statki
@@ -700,7 +700,7 @@ STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nie moż
 STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nie ma więcej miejsca na mapie
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Zwiększ rozmiar miasta
 STR_023C_EXPAND                                                 :{BLACK}Rozszerz
-STR_023D_RANDOM_TOWN                                            :{BLACK}Losowe miasto
+STR_023D_RANDOM_TOWN                                            :{BLACK}Dowolne miasto
 STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Budowanie miasta w losowym miejscu
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Tworzenie przedsiębiorstw
 STR_0240_COAL_MINE                                              :{BLACK}{G=f}Kopalnia Węgla
@@ -807,11 +807,11 @@ STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Zbuduj G
 STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Zbuduj Odkrywkę Toffi
 STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Zbuduj Kopalnię cukru
 STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Nie można tutaj wybudować: {STRING}...
-STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...należy najpierw wybudować miasto
+STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...najpierw trzeba wybudować miasto
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...dozwolone jedno na miasto
 STR_0288_PLANT_TREES                                            :{BLACK}Posadź drzewa
 STR_0289_PLACE_SIGN                                             :{BLACK}Umieść napis
-STR_028A_RANDOM_TREES                                           :{BLACK}Losowe drzewa
+STR_028A_RANDOM_TREES                                           :{BLACK}Dowolne drzewa
 STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}Pokryj krajobraz losowymi drzewami
 STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Umieść kamieniste tereny
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Umieść latarnię morską
@@ -1007,7 +1007,7 @@ STR_CURR_ITL                                                    :Lira włoska (I
 STR_CURR_NLG                                                    :Gulden holenderski (NLG)
 STR_CURR_NOK                                                    :Korona norweska (NOK)
 STR_CURR_PLN                                                    :Złoty polski (PLN)
-STR_CURR_ROL                                                    :Lej rumuński (ROL)
+STR_CURR_ROL                                                    :Lewy rumuńskie (ROL)
 STR_CURR_RUR                                                    :Rubel rosyjski (RUR)
 STR_CURR_SIT                                                    :Tolar słowenski (SIT)
 STR_CURR_SEK                                                    :Korona szwedzka (SEK)
@@ -1112,7 +1112,7 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Pozwól
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Realistyczne przyspieszenie pociągów: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zabroń pociągom i statkom skręcać o 90st: {ORANGE}{STRING} {LTBLUE} (wymaga NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Połącz stacje budowane jedna obok drugiej: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Opuść stację gdy dowolny ładunek jest pełny, przy 'Załadunku': {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Opuść stację gdy dowolny towar jest pełny, gdy 'Załadunek': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Użyj ulepszonego algorytmu załadunku: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Stopniowy załadunek pojazdów: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacja: {ORANGE}{STRING}
@@ -1142,7 +1142,7 @@ STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :tak, ale wykluc
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :wszystkich pojazdów
 STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Ostrzegaj, jeśli pociąg przynosi straty: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Pojazdy nigdy nie są wycofywane: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autoodnawianie pojazdów gdy stają się stare
+STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Autoodnowienie pojazdu gdy staje się stary
 STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Autoodnowienie następuje {ORANGE}{STRING}{LTBLUE} miesięcy przed/po maks. wieku
 STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Min. ilość pieniędzy potrzebna do autoodnowienia: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Czas trwania komunikatu o błędzie: {ORANGE}{STRING} sekund{P a y ""}
@@ -1171,7 +1171,7 @@ STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Wysoko
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks. wielkość stacji: {ORANGE}{STRING} {RED}Uwaga: Duże wartości spowalniają grę
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Automatycznie serwisuj helikoptery na lądowiskach: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Przyłącz okno narzędzi krajobrazu do okien środków transportu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Przewijaj obraz myszką w przeciwnym kierunku: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Przewijaj obraz myszka w przeciwnym kierunku: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Pokaż dymek z pomiarem podczas używania rożnych narzędzi: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Pokaż poboczne schematy koloru: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Żadne
@@ -1208,7 +1208,7 @@ STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Pojawia
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Data rozpoczęcia gry: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Data zakończenia gry: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Pozwól na łagodną ekonomię (więcej małych zmian)
-STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Pozwól kupować udziały w innych firmach
+STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Pozwól kupować odziały w innych firmach
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}W trakcie przeciągania ustaw sygnały co: {ORANGE}{STRING} kratk{P e i ek}
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozycja głównego paska narzędzi: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Z lewej strony
@@ -1350,10 +1350,10 @@ STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUST

 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zbyt blisko innego przedsiębiorstwa

-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa pociągu do przewozu innego typu ładunku
+STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa pociągu do przewozu innego typu towaru
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Przebudowa pociągu
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz jaki ładunek ma przewozić pociąg
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Przebuduj pociąg do przewozu zaznaczonego typu ładunku
+STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Przebuduj pociąg do przewozu zaznaczonego typu towaru
 STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nie można przebudować pociągu...
 STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Okres między serwisowaniami w procentach: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmiana produkcji
@@ -1371,8 +1371,8 @@ STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}To jest
 STR_NETWORK_CONNECTION                                          :{BLACK}Połączenie:
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Wybierz między grą w internecie a grą w sieci lokalnej

-STR_NETWORK_START_SERVER                                        :{BLACK}Uruchom serwer
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Uruchom własny serwer
+STR_NETWORK_START_SERVER                                        :{BLACK}Uruchomienie serwera
+STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Uruchomienie własnego serwera

 STR_NETWORK_GAME_NAME                                           :{BLACK}Nazwa
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nazwa gry
@@ -1440,7 +1440,7 @@ STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{S
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maksymalna ilość widzów:
 STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Ogranicz serwer do określonej ilości widzów
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Używany język:
+STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Wzywany język w grze:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Inni gracze będą poinformowani jaki język jest używany na serwerze
 STR_NETWORK_COMBO5                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_START_GAME                                          :{BLACK}Rozpocznij grę
@@ -1497,7 +1497,7 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Uzyskiwa
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" ów ów} chce się przyłączyć
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kB dotąd pobranych

-STR_NETWORK_DISCONNECT                                          :{BLACK}Rozłącz
+STR_NETWORK_DISCONNECT                                          :{BLACK}Rozłączony

 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Wprowadź ilość pieniędzy jaką chcesz przekazać
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serwer jest chroniony. Wprowadź hasło
@@ -1613,7 +1613,7 @@ STR_1003_ALREADY_AT_SEA_LEVEL                                   :{WHITE}Już na
 STR_1004_TOO_HIGH                                               :{WHITE}Zbyt wysoko
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Nieodpowiednie tory
 STR_1007_ALREADY_BUILT                                          :{WHITE}...już zbudowano
-STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Należy najpierw usunąć tory
+STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Najpierw trzeba usunąć tory
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Konstrukcja torowiska
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Konstrukcja elektryfikowanego torowiska
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Konstrukcja torowiska jednoszynowego
@@ -1625,7 +1625,7 @@ STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Nie moż
 STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Nie można tutaj ułożyć torów...
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Nie można stąd usunąć torów...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Nie można stąd usunąć sygnałów...
-STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Ukierunkowanie zajezdni
+STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Orientacja zajezdni
 STR_1015_RAILROAD_CONSTRUCTION                                  :Konstrukcja torowiska
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Konstrukcja elektryfikowanego torowiska
 STR_1016_MONORAIL_CONSTRUCTION                                  :Konstrukcja torowiska jednoszynowego
@@ -1638,31 +1638,31 @@ STR_101C_BUILD_RAILROAD_BRIDGE                                  :{BLACK}Budowa m
 STR_101D_BUILD_RAILROAD_TUNNEL                                  :{BLACK}Budowa tunelu kolejowego
 STR_101E_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Przełącz buduj/usuń dla torów i semaforów
 STR_101F_BRIDGE_SELECTION_CLICK                                 :{BLACK}Wybór mostu - klik na wybranym moście aby go zbudować
-STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Wybierz ukierunkowanie zajezdni kolejowej
-STR_1021_RAILROAD_TRACK                                         :Tory kolejowe
+STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Wybierz orientacje zajezdni kolejowej
+STR_1021_RAILROAD_TRACK                                         :Tory
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Zajezdnia kolejowa
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...teren jest własnością innej firmy
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Tory kolejowe ze zwykłą sygnalizacją
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Tory kolejowe z pre-sygnałami
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Tory kolejowe z exit-sygnałami
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Tory kolejowe z combo-sygnałami
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Tory kolejowe z sygnalizacją wyjsciową
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Tory kolejowe z sygnalizacja combo



 ##id 0x1800
-STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Należy najpierw usunąć drogę
+STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Trzeba najpierw usunąć drogę
 STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Trwają roboty drogowe
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Tworzenie dróg
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Wybierz most drogowy
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nie można tutaj zbudować drogi...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Nie można usunąć drogi z tego miejsca...
-STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Ukierunkowanie zajezdni samochodowej
+STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Orientacja zajezdni samochodowej
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Nie można tutaj zbudować zajezdni...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nie można zbudować przystanku...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nie można zbudować stacji ciężarówek...
 STR_180A_ROAD_CONSTRUCTION                                      :Budowa drogi
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Sekcja budowy dróg
-STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Zbuduj zajezdnię samochodową (do budowania i serwisowania pojazdów)
+STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Zbuduj zajezdnie samochodową (do budowania i serwisowania pojazdów)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Budowa przystanku
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Zbuduj stację załadunku ciężarówek
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Budowa mostu drogowego
@@ -1682,7 +1682,7 @@ STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
 STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
 STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
-STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Należy najpierw zburzyć budynek
+STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Budynek musi być najpierw zburzony
 STR_2005                                                        :{WHITE}{TOWN}
 STR_2006_POPULATION                                             :{BLACK}Populacja: {ORANGE}{COMMA}{BLACK}  Domów: {ORANGE}{COMMA}
 STR_2007_RENAME_TOWN                                            :Zmień nazwę miasta
@@ -1799,20 +1799,20 @@ STR_2810_CACTUS_PLANTS                                          :Kaktusy
 ##id 0x3000
 STR_3000_RAIL_STATION_SELECTION                                 :{WHITE}Wybór stacji
 STR_3001_AIRPORT_SELECTION                                      :{WHITE}Wybór lotniska
-STR_3002_ORIENTATION                                            :{BLACK}Ukierunkowanie
+STR_3002_ORIENTATION                                            :{BLACK}Orientacja
 STR_3003_NUMBER_OF_TRACKS                                       :{BLACK}Ilość peronów
 STR_3004_PLATFORM_LENGTH                                        :{BLACK}Długość peronu
 STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Zbyt blisko innej stacji
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Przylega do więcej niż jednej stacji
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Za dużo stacji w tym mieście
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Za duzo stacji
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Za dużo przystankow autobusowych
+STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Za dużo  wiele przystankow autobusowych
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Za dużo  wiele stacji załadunku ciężarówek
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Zbyt  blisko innej stacji
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
-STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Należy najpierw usunąc stację
+STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Najpierw musisz zniszczyć stację
 STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Zbyt blisko innego lotniska
-STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Należy najpierw usunąć lotnisko
+STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Najpierw  musisz zniszczyć lotnisko

 STR_3030_RENAME_STATION_LOADING                                 :Zmień nazwę stacji
 STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Nie można zmienić nazwy.
@@ -1836,25 +1836,25 @@ STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION
 STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} już nie akceptuje {STRING.d} ani {STRING.d}
 STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} już akceptuje {STRING}
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} już akceptuje {STRING} i {STRING}
-STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Ukierunkowanie przystanku
+STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Orientacja przystanku
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Orientacja st. załadunku
-STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Należy najpierw usunąć przystanek
-STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Należy najpierw usunąć stację załadunku ciężarówek
+STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Najpierw musisz zniszczyć przystanek
+STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Najpierw musisz zniszczyć stację załadunku ciężarówek
 STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Nic -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...niewłaściwe miejsce
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Zbyt blisko innego portu
-STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Należy najpierw usunąć port
-STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Wybierz ukierunkowanie stacji
+STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Najpierw musisz zniszczyć port
+STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Wybierz orientacje stacji
 STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Wybierz ilość peronów na stacji
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Wybierz długość stacji
-STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Wybierz ukierunkowanie przystanku
-STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Ukierunkowanie stacji załadunku ciężarówek
+STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Wybierz orientacje przystanku
+STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Orientacja stacji załadunku ciężarówek
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centruj główny widok na stacji
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Pokaż ocenę stacji
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Zmień nazwę stacji
-STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Pokaż listę akceptowanych ładunków
+STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Pokaż listę akceptowanych towarów
 STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Nazwa stacji - kliknij na nazwie aby wycentrować główny widok na stacji
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Wybierz wielkość/typ lotniska
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
@@ -1880,15 +1880,14 @@ STR_STAT_CLASS_DFLT                                             :Typowa stacja
 STR_STAT_CLASS_WAYP                                             :Pkt. kontrolne

 ##id 0x3800
-STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Ukierunkowanie stoczni
+STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientacja stoczni
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...musi być wybudowane na wodzie
 STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Nie można tutaj wybudować stoczni...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}wybierz ukierunkowanie stoczni
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}wybierz orientację stoczni
 STR_3804_WATER                                                  :Woda
 STR_3805_COAST_OR_RIVERBANK                                     :Wybrzeże lub brzeg rzeki
 STR_3806_SHIP_DEPOT                                             :Stocznia
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Nie można wybudować na wodzie
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Należy najpierw usunąć kanał

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Zapisz grę
@@ -1997,7 +1996,7 @@ STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Wyproduk
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% przetransportowano)
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centruj główny widok na przedsiębiorstwie
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Rozpoczęto budowę nowe{G go j go} {STRING.d} blisko {TOWN}!
-STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Now{G y a e} {STRING} został{G 0 "" a o} posadzon{G 0 y a e} blisko {TOWN}!
+STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Now{G y a e} {STRING} został{G "" a o} posadzon{G y a e} blisko {TOWN}!
 STR_482F_COST                                                   :{BLACK}Koszt: {YELLOW}{CURRENCY}
 STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Nie można tutaj wybudować tego przedsiębiorstwa...
 STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...las może być posadzony tylko powyżej linii śniegu
@@ -2019,8 +2018,8 @@ STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Pociąg
 STR_5001_ROAD_VEHICLE_IN_TUNNEL                                 :{WHITE}Samochód w tunelu
 STR_5003_ANOTHER_TUNNEL_IN_THE_WAY                              :{WHITE}Inny tunel na drodze
 STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}Nie można wydrążyć drugiego końca tunelu
-STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Należy najpierw usunąć tunel
-STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Należy najpierw usunąć most
+STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Trzeba najpierw zniszczyć tunel
+STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Trzeba najpierw zniszczyć most
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Nie można zaczynać i kończyć w tym samym miejscu
 STR_5009_LEVEL_LAND_OR_WATER_REQUIRED                           :{WHITE}Wymagany równy ląd lub woda pod mostem
 STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}Początek i koniec muszą być w jednej linii
@@ -2280,7 +2279,7 @@ STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Nie można kupić firmy...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Stawki za Ładunek
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dni w transporcie
-STR_7063_PAYMENT_FOR_DELIVERING                                 :{BLACK}{TINYFONT}Oplata za przewóz 10 jednostek (lub 10,000 litrów) ładunku na odległość 20 pól
+STR_7063_PAYMENT_FOR_DELIVERING                                 :{BLACK}{TINYFONT}Oplata za przewóz 10 jednostek (lub 10,000 litrów) towaru na odległość 20 pól
 STR_7064_TOGGLE_GRAPH_FOR_CARGO                                 :{BLACK}Przełącznik wykresu ładunku wł./wył.
 STR_7065                                                        :{BLACK}{TINYFONT}{STRING}
 STR_7066_ENGINEER                                               :Inżynier
@@ -2625,15 +2624,15 @@ STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Pociąg
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Idź do {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Idź do {STATION} (Przewieź i weź ładunek)
+STR_8807_GO_TO_TRANSFER                                         :Idź do {STATION} (Przewieź i weź towar)
 STR_8808_GO_TO_UNLOAD                                           :Idź do {STATION} (Wyładunek)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Idź do {STATION} (Przewieź i nie bierz ładunku)
+STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Idź do {STATION} (Przewieź i nie bierz towaru)
 STR_880A_GO_TO_LOAD                                             :Idź do {STATION} (Załadunek)
 STR_880B_GO_TO_TRANSFER_LOAD                                    :Idź do {STATION} (Przewieź i czekaj na pełen załadunek)
 STR_880C_GO_NON_STOP_TO                                         :Idź bez zatrzymywania do {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Idź bez zatrzymywania do {STATION} (Przewieź i weź ładunek)
+STR_880D_GO_TO_NON_STOP_TRANSFER                                :Idź bez zatrzymywania do {STATION} (Przewieź i weź towar)
 STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Idź bez zatrzymywania do {STATION} (Wyładunek)
-STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Idź bez zatrzymywania do {STATION} (Przewieź i nie bierz ładunku)
+STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Idź bez zatrzymywania do {STATION} (Przewieź i nie bierz towaru)
 STR_8810_GO_NON_STOP_TO_LOAD                                    :Idź bez zatrzymywania do {STATION} (Załadunek)
 STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Idź bez zatrzymywania do {STATION} (Przewieź i czekaj na pełen załadunek)
 STR_GO_TO_TRAIN_DEPOT                                           :Idź do zajezdni w {TOWN}
@@ -2680,7 +2679,7 @@ STR_8826_GO_TO                                                  :{BLACK}Idź do
 STR_8827_FULL_LOAD                                              :{BLACK}Załadunek
 STR_8828_UNLOAD                                                 :{BLACK}Wyładunek
 STR_REFIT                                                       :{BLACK}Przebuduj
-STR_REFIT_TIP                                                   :{BLACK}Wybierz do przewozu jakiego ładunku przebudować pojazd w tym zadaniu. CTRL+klik usuwa polecenie przebudowy
+STR_REFIT_TIP                                                   :{BLACK}Wybierz do przewozu jakiego towaru przebudować pojazd w tym zadaniu. CTRL+klik usuwa polecenie przebudowy
 STR_REFIT_ORDER                                                 :(Przebuduj na {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Polecenia)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Koniec poleceń - -
@@ -2724,7 +2723,7 @@ STR_884B_REVERSE_DIRECTION_OF_TRAIN                             :{BLACK}Odwróć
 STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Pokaż szczegóły pociągu
 STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Zwiększ okres między serwisowaniem
 STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Zmniejsz okres między serwisowaniem
-STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Pokaż szczegóły przewożonych ładunków
+STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Pokaż szczegóły przewożonych towarów
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Pokaż szczegóły pociągu
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Pokaż pojemność każdego wagonu
 STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Pokaż całkowitą pojemność pociągu, według typu ładunku
@@ -2753,7 +2752,7 @@ STR_8868_TRAIN_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT
 STR_8869_CAN_T_REVERSE_DIRECTION                                :{WHITE}Nie można odwrócić kierunku jazdy pociągu...
 STR_886A_RENAME_TRAIN_VEHICLE_TYPE                              :{WHITE}Zmiana nazwy typu pociągu
 STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Nie można zmienić nazwy typu pojazdu...
-STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Spraw by w zaznaczonym poleceniu pojazd był zmuszony do pozostawienia ładunku dla kolejnego pojazdu
+STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Spraw by w zaznaczonym poleceniu pojazd był zmuszony do pozostawienia towaru dla kolejnego pojazdu
 STR_886F_TRANSFER                                               :{BLACK}Przewieź

 STR_TRAIN_STOPPING                                              :{RED}Hamowanie
@@ -2824,9 +2823,9 @@ STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Nie moż
 STR_9038_GO_TO_ROADVEH_DEPOT                                    :Idź do zajezdni sam. w {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Serwisuj w zajezdni sam. w {TOWN}

-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa samochodu do przewozu innego typu ładunku
+STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Przebudowa samochodu do przewozu innego typu towaru
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Przebudowa samochodu
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Przebuduj samochód do przewozu zaznaczonego typu ładunku
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Przebuduj samochód do przewozu zaznaczonego typu towaru
 STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Nie można przebudować samochodu...
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz ładunek jaki ma przewozić ten samochód

@@ -2889,11 +2888,11 @@ STR_9836_RENAME                                                 :{BLACK}Zmień n
 STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Zmień nazwę typu statku
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Zmień nazwę typu statku
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Nie można zmienić nazwy typu statku...
-STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Przebudowa statku do przewozu innego typu ładunku
+STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Przebudowa statku do przewozu innego typu towaru
 STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Przebudowa)
 STR_983C_REFIT_SHIP                                             :{BLACK}Przebudowa statku
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz jaki ładunek ma przewozić statek
-STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Przebuduj statek do przewozu zaznaczonego typu ładunku
+STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Przebuduj statek do przewozu zaznaczonego typu towaru
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wybierz typ ładunku do przewozu:
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemność: {GOLD}{CARGO}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nie można przebudować statku...
@@ -2962,12 +2961,12 @@ STR_A037_RENAME                                                 :{BLACK}Zmień n
 STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Zmień nazwę typu samolotu
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Zmień nazwę typu samolotu
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Nie można zmienić nazwy typu samolotu...
-STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Przebudowa samolotu do przewozu innego typu ładunku
+STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Przebudowa samolotu do przewozu innego typu towaru
 STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Przebudowa)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Przebudowa samolotu
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Wybierz jaki ładunek ma przenosić samolot
-STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Przebuduj samolot do przewozu zaznaczonego typu ładunku
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wybierz typ ładunku do przewozu:
+STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Przebuduj samolot do przewozu zaznaczonego typu towaru
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Wybierz typ towaru do przewozu:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nowa pojemność: {GOLD}{STRING}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nie można przebudować samolotu...
 STR_GO_TO_AIRPORT_HANGAR                                        :Idź do hangaru na {STATION}
@@ -2999,7 +2998,7 @@ STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Min. zys
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Min. przychód:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Maks. przychód:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Przewieziono:
-STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Ładunek:
+STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Towar:
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Pieniądze:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Pożyczka:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Łącznie:
@@ -3009,8 +3008,8 @@ STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Liczba s
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Minimalny zysk spośród wszystkich pojazdów, które mają conajmniej 2 lata.
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Ilość pieniędzy zarobiona w miesiącu z najmniejszym zyskiem w ostatnich 12 kwartałach
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Ilość pieniędzy zarobiona w miesiącu z największym zyskiem w ostatnich 12 kwartałach
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Ilość ładunku przewiezionego w poprzednich 4 kwartałach
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Ilość rożnych typów ładunku przewiezionych w ostatnim kwartale
+STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Ilość towaru przewieziona w poprzednich 4 kwartałach
+STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Ilość rożnych towarów przewiezionych w ostatnim kwartale
 STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Ilość pieniędzy w ręku
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Wielkość pożyczki wziętej przez firmę
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Suma przyznanych punktów
@@ -3134,7 +3133,7 @@ STR_REPLACE_HELP                                                :{BLACK}Ta funkc
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Usunięcie wagonów: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Autowymiana zachowuje długość pociągu poprzez usuwanie wagonów (począwszy od początku), jeśli wymiana lokomotywy spowoduje wydłużenie pociągu.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zastępowanie: {ORANGE}{SKIP}{SKIP}{STRING}
-STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} EKSPERYMENTALNE NARZĘDZIE {}Przejdź pomiędzy oknami zamiany lokomotyw i wagonów.{}Wymiana wagonu nastąpi tylko jeśli nowy wagon może być przebudowany do przewożenia tego samego typu ładunku co poprzedni. Każdy wagon pociągu jest sprawdzany podczas procesu zamiany.
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} EKSPERYMENTALNE NARZEDZIE {}Przejdź pomiędzy oknami zamiany lokomotyw i wagonów.{}Wymiana wagonu nastąpi tylko jeśli nowy wagon może być przebudowany do przewożenia tego samego towaru co poprzedni. Każdy wagon pociągu jest sprawdzany podczas procesu zamiany.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Lokomotywa nie może być zbudowana

 STR_ENGINES                                                     :Lokomotywy
@@ -3163,7 +3162,7 @@ STR_ORDER_REFIT_FAILED                                          :{WHITE}Niepowod
 STR_RAIL_VEHICLES                                               :Kolej
 STR_ELRAIL_VEHICLES                                             :Kolej elektryczna
 STR_MONORAIL_VEHICLES                                           :Kolej jednoszynowa
-STR_MAGLEV_VEHICLES                                             :Kolej MagLev
+STR_MAGLEV_VEHICLES                                             :Kolej Maglev

 ############ End of list of rail types

@@ -3182,8 +3181,8 @@ STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Koszt: {
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Pojemność: {GOLD}{COMMA} pasażerów, {COMMA} paczek poczty
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Moc: {GOLD}+{POWER}{BLACK} Waga: {GOLD}+{WEIGHT_S}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Można przebudować na: {GOLD}
-STR_PURCHASE_INFO_ALL_TYPES                                     :Wszystkie typy ładunków
-STR_PURCHASE_INFO_ALL_BUT                                       :Wszystko oprócz {GOLD}
+STR_PURCHASE_INFO_ALL_TYPES                                     :Wszystkie typy towarów
+STR_PURCHASE_INFO_ALL_BUT                                       :Wszystko oprócz {GOLD}}

 ########### String for New Landscape Generator

@@ -3226,7 +3225,7 @@ STR_CLEARING_TILES                                              :{BLACK}Generowa
 STR_SETTINGUP_GAME                                              :{BLACK}Ustawianie gry
 STR_PREPARING_TILELOOP                                          :{BLACK}Uaktywnianie pól
 STR_PREPARING_GAME                                              :{BLACK}Przygotowywanie gry
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Zmieniono poziom trudności na "własny"
+STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Ta akcja zmieniła poziom trudności na "własny"
 STR_SE_FLAT_WORLD                                               :{WHITE}Płaski świat
 STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Stwórz płaski świat
 STR_SE_RANDOM_LAND                                              :{WHITE}Losowy teren
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -29,7 +29,7 @@ STR_0015_GRAIN                                                  :Cereais
 STR_0016_WOOD                                                   :Madeira
 STR_0017_IRON_ORE                                               :Minério de Ferro
 STR_0018_STEEL                                                  :Aço
-STR_0019_VALUABLES                                              :Bens Valiosos
+STR_0019_VALUABLES                                              :Valores
 STR_001A_COPPER_ORE                                             :Minério de Cobre
 STR_001B_MAIZE                                                  :Milho
 STR_001C_FRUIT                                                  :Fruta
@@ -385,7 +385,7 @@ STR_SORT_BY_VALUE                                               :Valor
 STR_SORT_BY_FACILITY                                            :Tipo de Estação
 STR_SORT_BY_WAITING                                             :Valor da carga em espera
 STR_SORT_BY_RATING_MAX                                          :Avaliação de carga
-STR_ENGINE_SORT_ENGINE_ID                                       :EngineID (ordernação clássica)
+STR_ENGINE_SORT_ENGINE_ID                                       :Ordenação clássica
 STR_ENGINE_SORT_COST                                            :Custo
 STR_ENGINE_SORT_POWER                                           :Potência
 STR_ENGINE_SORT_INTRO_DATE                                      :Data de Introdução
@@ -730,7 +730,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Colocar
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Colocar farol
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Colocar transmissor
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definir área de deserto.{}Manter a tecla CTRL pressionada para remover
-STR_CREATE_LAKE                                                 :{BLACK}Definir área de água.{}Construir um canal com a tecla CTRL numa área que não seja a do mar, senão inundar-se-iam as zonas circundantes
 STR_0290_DELETE                                                 :{BLACK}Apagar
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Apagar completamente esta cidade
 STR_0292_SAVE_SCENARIO                                          :Guardar cenário
@@ -1048,7 +1047,7 @@ STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Multipl

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir sempre aeroportos pequenos: {ORANGE}{STRING}

-STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Alertar em caso de perda do comboio: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Avisar quando comboios andam perdidos: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Analisar ordens dos veículos: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :Não
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :Sim, mas excluir veículos parados
@@ -1085,7 +1084,7 @@ STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Tamanho
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenção automática de helicópteros em heliportos: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Ligar ferramentas de paisagem com as de construção: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Ao deslizar com o rato, mover a vista na direcção oposta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Mostrar as medidas nas várias ferramentas de construção: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Mostrar medidas ao usar ferramentas de construção: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Mostrar estampagens da companhia: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Nenhum
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Própria companhia
@@ -1208,7 +1207,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Árvores
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Colocar árvores de tipo aleatório

 STR_CANT_BUILD_CANALS                                           :{WHITE}Não é possível construir canais aqui...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Construir canais.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Não é possível construir diques aqui...
@@ -1687,7 +1685,7 @@ STR_205C_PIGGY_BANK                                             :Mealheiro

 STR_INDUSTRY                                                    :{INDUSTRY}
 STR_TOWN                                                        :{TOWN}
-STR_INDUSTRY_FORMAT                                             :{1:STRING} de {0:TOWN}
+STR_INDUSTRY_FORMAT                                             :{TOWN} {STRING}
 STR_STATION                                                     :{STATION}

 ##id 0x2800
@@ -1801,7 +1799,6 @@ STR_3804_WATER                                                  :Água
 STR_3805_COAST_OR_RIVERBANK                                     :Costa ou margem
 STR_3806_SHIP_DEPOT                                             :Depósito naval
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Não é possível construir na água
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Precisa de demolir o canal primeiro

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Guardar Jogo
@@ -2214,7 +2211,7 @@ STR_LIVERY_SMALL_PLANE                                          :Aeronave de Peq
 STR_LIVERY_LARGE_PLANE                                          :Aeronave de Grandes Dimensões

 STR_LIVERY_GENERAL_TIP                                          :{BLACK}Exibir esquema de cores geral
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Exibir esquemas de cores dos comboios
+STR_LIVERY_TRAIN_TIP                                            :{BLACK}Exibir esquemas de cores dos combóios
 STR_LIVERY_ROADVEH_TIP                                          :{BLACK}Exibir esquemas de cores dos veículos de estrada
 STR_LIVERY_SHIP_TIP                                             :{BLACK}Exibir esquemas de cores dos navios
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Exibir esquema de cores da aeronave
@@ -2550,9 +2547,9 @@ STR_8825_NON_STOP                                               :{BLACK}Sem para
 STR_8826_GO_TO                                                  :{BLACK}Ir Para
 STR_8827_FULL_LOAD                                              :{BLACK}Carga
 STR_8828_UNLOAD                                                 :{BLACK}Descarga
-STR_REFIT                                                       :{BLACK}Converter
-STR_REFIT_TIP                                                   :{BLACK}Seleccionar o tipo de carga a converter nesta ordem. Pressionar Ctrl e botão-esquerdo do rato para remover instrução de conversão
-STR_REFIT_ORDER                                                 :(Converter para {STRING})
+STR_REFIT                                                       :{BLACK}Reconverter
+STR_REFIT_TIP                                                   :{BLACK}Escolha o tipo de carga para reconverter nesta ordem. Control click para remover a instrução de reconversão
+STR_REFIT_ORDER                                                 :(Reconverter para {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordens)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fim de Ordens - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
@@ -2770,7 +2767,7 @@ STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova cap
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Não é possível adaptar barco...
 STR_9842_REFITTABLE                                             :(adaptável)
 STR_GO_TO_SHIP_DEPOT                                            :Ir para o depósito naval de {TOWN}
-SERVICE_AT_SHIP_DEPOT                                           :Manutenção no estaleiro de {TOWN}
+SERVICE_AT_SHIP_DEPOT                                           :Manutenção no depósito de {TOWN}

 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Aeroportos
@@ -2970,12 +2967,12 @@ STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Não ven
 STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Não vender os navios no depósito
 STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Não vender as aeronaves no hangar

-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vender todos os comboios no depósito
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vender todos os combóios no depósito
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Vender todos os veículos no depósito
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vender todos os navios no depósito
 STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vender todos os aviões no hangar

-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Obter uma lista de todos os comboios em cujas ordens conste este depósito
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Obter uma lista de todos os combóios em cujas ordens conste este depósito
 STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP                        :{BLACK}Obter uma lista de todos os veículos em cujas ordens conste este depósito
 STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Obter uma lista de todos os navios em cujas ordens conste este depósito
 STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Obter uma lista de todas as aeronaves em cujas ordens conste um hangar deste aeroporto
@@ -3011,12 +3008,12 @@ STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Locomoti
 STR_ENGINES                                                     :Locomotivas
 STR_WAGONS                                                      :Vagões

-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os comboios no depósito
+STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os combóios no depósito
 STR_MASS_STOP_DEPOT_ROADVEH_TIP                                 :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os veículos no depósito
 STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os navios no depósito
 STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Pressione botão esquerdo do rato para imobilizar todas as aeronaves no hangar

-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Pressione botão esquerdo do rato para iniciar todos os comboios no depósito
+STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Pressione botão esquerdo do rato para iniciar todos os combóios no depósito
 STR_MASS_START_DEPOT_ROADVEH_TIP                                :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos de estrada no depósito
 STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Pressione botão esquerdo do rato para iniciar todos os navios no depósito
 STR_MASS_START_HANGAR_TIP                                       :{BLACK}Pressione botão esquerdo do rato para iniciar todas as aeronaves no hangar
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
--- a/lang/russian.txt
+++ b/lang/russian.txt
--- a/lang/simplified_chinese.txt
+++ b/lang/simplified_chinese.txt
@@ -360,7 +360,6 @@ STR_015C_SAVE_GAME                                              :保存游戏
 STR_015D_LOAD_GAME                                              :读取存档
 STR_015E_QUIT_GAME                                              :放弃游戏
 STR_015F_QUIT                                                   :退出
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}你确定要放弃当前的游戏吗？
 STR_0161_QUIT_GAME                                              :{WHITE}放弃游戏
 STR_SORT_ORDER_TIP                                              :{BLACK}选择排序方法 (降序/升序)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}选择排序标准
@@ -590,7 +589,6 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}玩家
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}对手车站的剪彩仪式
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}事故/灾难
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}公司信息
-STR_NEWS_OPEN_CLOSE                                             :{YELLOW}开启/关闭工业设施
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}经济变化
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}玩家车辆的状况报告
 STR_020C_NEW_VEHICLES                                           :{YELLOW}新的车辆类型
@@ -615,22 +613,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} 达到 '{STRING}' 的状态！
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} 在 {COMPANY} 达到 '{STRING}' 状态！
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}创建场景
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}场景编辑器
 STR_0223_LAND_GENERATION                                        :{WHITE}生成土地
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}随机地形
-STR_0227_RESET_LAND                                             :{BLACK}重置地形
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}增加要升高/降低的土地面积
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}减少要升高/降低的土地面积
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}随机生成土地
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}重置景观
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}重置景观
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}使用高度图
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}使用高度图
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}你确定要重置地形吗？
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}生成景观
 STR_022F_TOWN_GENERATION                                        :{BLACK}生成城镇
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}生成工业
@@ -730,7 +722,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}在地
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}放置灯塔
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}放置转播塔
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}定义沙漠区域。{}摁住 CTRL 可以去掉沙漠区域。
-STR_CREATE_LAKE                                                 :{BLACK}定义水域。{}修建运河，仅在CTRL被按下的情况下不会在海平面淹没周围的区域。
 STR_0290_DELETE                                                 :{BLACK}删除
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}完全删除这座城镇
 STR_0292_SAVE_SCENARIO                                          :保存场景
@@ -744,7 +735,6 @@ STR_0299_SAVE_SCENARIO                                          :{WHITE}保存
 STR_029A_PLAY_SCENARIO                                          :{BLACK}以场景开始游戏
 STR_PLAY_HEIGHTMAP                                              :{BLACK}以高度图开始游戏
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}以高度图决定的地形开始一个新游戏。
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}你确定要推出当前场景吗？
 STR_029C_QUIT_EDITOR                                            :{WHITE}推出编辑器
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}只能在人口超过 1200 的城镇建造……
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}将开始年份向前调整 1 年
@@ -1208,7 +1198,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}随机
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}种植随机类型的树木

 STR_CANT_BUILD_CANALS                                           :{WHITE}不能在这里兴建运河……
-STR_BUILD_CANALS_TIP                                            :{BLACK}修建运河。
 STR_LANDINFO_CANAL                                              :运河

 STR_CANT_BUILD_LOCKS                                            :{WHITE}不能在这里兴建船闸……
@@ -2956,20 +2945,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}显示

 ### depot strings

-STR_SELL                                                        :{BLACK}出售
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}你将出售车库/船坞/机库中的全部车辆/船只/飞机
-STR_ARE_YOU_SURE                                                :{BLACK}你确定吗？
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}确认你将要出售车库中的所有列车
-STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}确定你将要出售车库中的所有汽车
-STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}确定你要你将要出售船坞中的全部船只
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}确定你将要出售机库中的全部飞机
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}不要出售车库中的列车
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}不要出售车库中的汽车
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}不要出售船坞中的船只
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}不要出售机库中的飞机
-
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}出售车库中的所有列车
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}出售车库中的所有汽车
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}出售船坞中的所有船只
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -601,36 +601,36 @@ STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jukebox
 STR_01D3_SOUND_MUSIC                                            :Zvuk/Hudba
 STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Zobraz okno zvuku a hudby
 STR_01D5_ALL                                                    :{TINYFONT}Všetko
-STR_01D6_OLD_STYLE                                              :{TINYFONT}Starý štýl
-STR_01D7_NEW_STYLE                                              :{TINYFONT}Nový štýl
+STR_01D6_OLD_STYLE                                              :{TINYFONT}Stary styl
+STR_01D7_NEW_STYLE                                              :{TINYFONT}Novy styl
 STR_01D8_EZY_STREET                                             :{TINYFONT}Ezy Street
-STR_01D9_CUSTOM_1                                               :{TINYFONT}Vlastné 1
-STR_01DA_CUSTOM_2                                               :{TINYFONT}Vlastné 2
+STR_01D9_CUSTOM_1                                               :{TINYFONT}Vlastne 1
+STR_01DA_CUSTOM_2                                               :{TINYFONT}Vlastne 2
 STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Hlasitost hudby
 STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Hlasitost zvuk. efektov
 STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}MIN  '  '  ' '  '  '  MAX
-STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Predchádzajúca stopa
-STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Nasledujúca stopa
-STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Zastavit prehrávanie hudby
-STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Spustit prehrávanie hudby
-STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Tahat posúvace pre zmenu hlasitosti
+STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Predchadzajuca stopa
+STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Nasledujuca stopa
+STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Zastavit prehravanie hudby
+STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Spustit prehravanie hudby
+STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Tahat posuvace pre zmenu hlasitosti
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Stopa{SETX 88}Title
-STR_01E9_SHUFFLE                                                :{TINYFONT}Náhodne
+STR_01E9_SHUFFLE                                                :{TINYFONT}Nahodne
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
-STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Výber hudobného programu
+STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Vyber hudobneho programu
 STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
 STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA} "{STRING}"
-STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Císlo stopy
+STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Cislo stopy
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Zmazat
-STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Uložit
-STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Aktuálny program
-STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Vybrat 'Všetko'
+STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Ulozit
+STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Aktualny program
+STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Vybrat 'Vsetko'
 STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Vybrat 'Stary styl'
 STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Vybrat 'Novy styl'
 STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Vybrat 'Vlastny 1' (uzivatelom definovany) program
@@ -1865,7 +1865,6 @@ STR_3804_WATER                                                  :Voda
 STR_3805_COAST_OR_RIVERBANK                                     :Pobrezie alebo nabrezie
 STR_3806_SHIP_DEPOT                                             :Lodenica
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}... nemoze byt postavene na vode
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Najprv sa musí zbúrat kanál

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Ulozit hru
--- a/lang/slovenian.txt
+++ b/lang/slovenian.txt
@@ -772,7 +772,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Ustvari
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Postavi svetilnik
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Postavi oddajnik
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Določi območja puščave.{}Pritisni in drži CTRL za odstranitev
-STR_CREATE_LAKE                                                 :{BLACK}Določi področje vode.{}Naredi kanal, razen če je pritisnjen CTRL na morski gladini, ko bo poplavilo okolico.
 STR_0290_DELETE                                                 :{BLACK}Izbriši
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Popolnoma izbriši mesto
 STR_0292_SAVE_SCENARIO                                          :Shrani scenarij
@@ -1250,7 +1249,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Drevesa
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Postavi drevesa naključne vrste

 STR_CANT_BUILD_CANALS                                           :{WHITE}Ni mogoče zgraditi kanalov tukaj ...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Zgradi kanale.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Ni mogoče zgraditi zapornic tukaj ...
@@ -1844,7 +1842,6 @@ STR_3804_WATER                                                  :Voda
 STR_3805_COAST_OR_RIVERBANK                                     :Obala ali nabrežje
 STR_3806_SHIP_DEPOT                                             :Ladjedelnica
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE} ... Nemogoča gradnja na vodi
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Najprej moraš porušiti kanal

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Shrani igro
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -1007,7 +1007,7 @@ STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}La aeron
 # end of order system

 STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Auto renovar ha fallado con el tren {COMMA} (límite de dinero)
-STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Auto renovar ha fallado con el vehículo de carretera {COMMA} (límite de dinero)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}AAuto renovar ha fallado con el vehículo de carretera {COMMA} (límite de dinero)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Auto renovar ha fallado con el barco {COMMA} (límite de dinero)
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Auto renovar ha fallado con la aeronave {COMMA} (límite de dinero)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}El tren {COMMA} es demasiado largo tras el cambio
@@ -1541,7 +1541,7 @@ STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}No se pu
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}No se pueden retirar señales de aquí...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Orientación del depósito
 STR_1015_RAILROAD_CONSTRUCTION                                  :Construcción de ferrocarril
-STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Construcción línea eléctrica de ferrocarril
+STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Construcción Línea Eléctrica de Ferrocarril
 STR_1016_MONORAIL_CONSTRUCTION                                  :Construcción de monorraíl
 STR_1017_MAGLEV_CONSTRUCTION                                    :Construcción de maglev
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Construir tramo de ferrocarril
@@ -1802,7 +1802,6 @@ STR_3804_WATER                                                  :Agua
 STR_3805_COAST_OR_RIVERBANK                                     :Costa o rivera
 STR_3806_SHIP_DEPOT                                             :Astillero
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...No se puede construir sobre el agua
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Debes demoler el canal primero

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Guardar Juego
@@ -3033,7 +3032,7 @@ STR_ORDER_REFIT_FAILED                                          :{WHITE}La orden
 ############ Lists rail types

 STR_RAIL_VEHICLES                                               :Vehículos de rail
-STR_ELRAIL_VEHICLES                                             :Vehículos de Rail Eléctrico
+STR_ELRAIL_VEHICLES                                             :Vehícules de Rail Eléctrico
 STR_MONORAIL_VEHICLES                                           :Vehículos monorail
 STR_MAGLEV_VEHICLES                                             :Vehículos de Lev. Mag.

--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -1671,7 +1671,7 @@ STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Muta de lokala
 STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Starta en liten lokal reklamkampanj, för att attrahera fler passagerare och gods till dina tranporttjänster.{}  Kostnad: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Starta en mellanstor lokal reklamkampanj, för att attrahera fler passagerare och gods till dina tranporttjänster.{}  Kostnad: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Starta en stor lokal reklamkampanj, för att attrahera fler passagerare och gods till dina tranporttjänster.{}  Kostnad: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Bekosta ombyggnad av stadens vägnätverk. Orsakar ansenliga störningar för vägtrafik i upp till 6 månader.{}  Kostnad: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Bekosta ombyggnad av stadens vägnätverk. Orsakar ansenlig splittring för vägtrafik upp till 6 månader.{}  Kostnad: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Bygg en staty i ditt företags ära.{} Kostnad: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Bekosta uppbyggnad av nya kommersiella byggnader i staden.{}  Kostnad: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Köp 1 års exklusiv transporträttighet i staden. Stadens myndigheter kommer bara tillåta passagerare och gods till användning för ditt företags stationer.{} Kostnad: {CURRENCY}
@@ -1801,7 +1801,6 @@ STR_3804_WATER                                                  :Vatten
 STR_3805_COAST_OR_RIVERBANK                                     :Kust eller flodbank
 STR_3806_SHIP_DEPOT                                             :Skeppsdepå
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Kan inte bygga på vatten
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Måste först ta bort kanalen

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Spara spel
@@ -2631,7 +2630,7 @@ STR_TRAIN_STOPPING                                              :{RED}Stannar
 STR_TRAIN_STOPPING_VEL                                          :{RED}Stannar, {VELOCITY}
 STR_INCOMPATIBLE_RAIL_TYPES                                     :Fel järnvägstyp
 STR_TRAIN_NO_POWER                                              :{RED}Ingen Kraft
-STR_TRAIN_START_NO_CATENARY                                     :Detta spår saknar kedjekurva, så tåget kan inte starta
+STR_TRAIN_START_NO_CATENARY                                     :

 STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nya {STRING} är nu tillgänglig!
 STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
--- a/lang/traditional_chinese.txt
+++ b/lang/traditional_chinese.txt
--- a/lang/turkish.txt
+++ b/lang/turkish.txt
@@ -590,7 +590,6 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Oyuncun
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Rakibin durağına ilk aracın gelişi
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Kazalar / felaketler
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Şirket bilgisi
-STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Fabrika açılış/kapanışları
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Ekonomi değişimleri
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Oyuncunun araçlarıyla ilgili ögüt / bilgi
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Yeni araçlar
@@ -730,7 +729,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Haritaya
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Deniz feneri koy
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Verici koy
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Çöl yap, kaldırmak için CTRL'ye basılı tut
-STR_CREATE_LAKE                                                 :{BLACK}Su alanını belirle.{}Deniz seviyesinde CTRL tuşu basılı olmadığı sürece kanal yapar, basılıysa etraftakileri su altında bırakır
 STR_0290_DELETE                                                 :{BLACK}Sil
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Sehri tamamen sil
 STR_0292_SAVE_SCENARIO                                          :Kaydet
@@ -1208,7 +1206,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Rastgele
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Rastgele türde ağaçlar koy

 STR_CANT_BUILD_CANALS                                           :{WHITE}Buraya kanal yapılamaz...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Kanal yap.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Buraya kilit yapılamaz...
@@ -1801,7 +1798,6 @@ STR_3804_WATER                                                  :Su
 STR_3805_COAST_OR_RIVERBANK                                     :Sahil veya göl kenarı
 STR_3806_SHIP_DEPOT                                             :Tersane
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Suya yapılamaz
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Önce kanal kaldırılmalı

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Kaydet
@@ -2633,10 +2629,6 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Uyumsuz ray tü
 STR_TRAIN_NO_POWER                                              :{RED}Elektrik yok
 STR_TRAIN_START_NO_CATENARY                                     :Bu rayda elektrik olmadiği için bu tren çalışamaz

-STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}{STRING} artık kullanılabilir!
-STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
-STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}{STRING} artık kullanılabilir!  -  {STRING}
-
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Yolda araba var
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Arabalar
--- a/lang/ukrainian.txt
+++ b/lang/ukrainian.txt
@@ -299,7 +299,7 @@ STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
 STR_00CE_4                                                      :{BLACK}4
 STR_00CF_5                                                      :{BLACK}5
-STR_00D0_NOTHING                                                :нічого
+STR_00D0_NOTHING                                                :Нічого
 STR_00D1_DARK_BLUE                                              :Темно-синій
 STR_00D2_PALE_GREEN                                             :Світло-зелений
 STR_00D3_PINK                                                   :Рожевий
@@ -596,7 +596,7 @@ STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Пока
 STR_0195_SHOW_VEGETATION_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})
+STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Прибуток цього року: {CURRENCY} (минулого року: {CURRENCY})

 ############ range for service numbers starts
 STR_AGE                                                         :{COMMA} р{P ік оки оків} ({COMMA})
@@ -1108,7 +1108,7 @@ STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Немо
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Кінець наказів - -

 STR_TRAIN_IS_LOST                                               :{WHITE}Поїзд {COMMA} заблукав.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Поїзд {COMMA} торік приніс прибуток {CURRENCY}
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Поїзд {COMMA} приніс прибуток минулого року {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Європейська грошова одиниця!{}{}У вашій країні введено євро - єдину валюту для розрахунків!

 # Start of order review system.
@@ -1513,7 +1513,7 @@ STR_NETWORK_COMPANY_NAME                                        :{SILVER}Наз
 STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Засновано:  {WHITE}{NUM}
 STR_NETWORK_VALUE                                               :{SILVER}Вартість компанії:  {WHITE}{CURRENCY64}
 STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Поточний баланс:  {WHITE}{CURRENCY64}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Прибуток торік:  {WHITE}{CURRENCY64}
+STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Прибуток минулого року:  {WHITE}{CURRENCY64}
 STR_NETWORK_PERFORMANCE                                         :{SILVER}Продуктивність:  {WHITE}{NUM}

 STR_NETWORK_VEHICLES                                            :{SILVER}Транспорт:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
@@ -1927,7 +1927,6 @@ STR_3804_WATER                                                  :Вода
 STR_3805_COAST_OR_RIVERBANK                                     :Берег
 STR_3806_SHIP_DEPOT                                             :Корабельне депо
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Неможливо будувати на воді
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Спочатку потрібно прибрати канал

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Зберегти гру
@@ -2312,16 +2311,16 @@ STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT
 STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Керівник)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Компанії об'єдналися!
 STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} була викуплена {COMPANY} за {CURRENCY}!
-STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Ми шукаємо нового власника нашої компанії.{}{}Чи бажаєте Ви купити {COMPANY} за {CURRENCY}?
+STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Ми шукаємо нового власника нашої компанії.{}{}Ви бажаєте купити {COMPANY} за {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}БАНКРУТ!
-STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} була закрита кредиторами і все майно продане!
+STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} буде закрита кредиторами і все майно буде продане!
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Засновано нову компанію!
 STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} починає будівництво біля {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Неможливо купити компанію...
 STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Тарифи на доставку вантажів
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Днів у дорозі
 STR_7063_PAYMENT_FOR_DELIVERING                                 :{BLACK}{TINYFONT}Плата за доставку 10 одиниць (або 10,000 літрів) вантажу на відстань 20 квадратів
-STR_7064_TOGGLE_GRAPH_FOR_CARGO                                 :{BLACK}Вкл/відкл графік типів вантажу
+STR_7064_TOGGLE_GRAPH_FOR_CARGO                                 :{BLACK}Вкл/викл графік типів вантажу
 STR_7065                                                        :{BLACK}{TINYFONT}{STRING}
 STR_7066_ENGINEER                                               :Інженер
 STR_7067_TRAFFIC_MANAGER                                        :Регулювальник
@@ -2342,7 +2341,7 @@ STR_COMPANY_PASSWORD                                            :{BLACK}Паро
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Пароль захищає вашу компанію від приєднання інших гравців.
 STR_SET_COMPANY_PASSWORD                                        :Встановлення паролю
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}Світова економічна криза!{}{}Фінансисти очікують спад виробництва та попиту!
-STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Криза минула!{}{}Збільшення виробництва внаслідок стабілізації економіки надає впевненості підприємствам!
+STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Криза минула!{}{}Збільшення діяльності підніме промисловість коли економіка стабілізується!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Розмір вікна великий/малий
 STR_7076_COMPANY_VALUE                                          :{GOLD}Вартість компанії: {WHITE}{CURRENCY64}
 STR_7077_BUY_25_SHARE_IN_COMPANY                                :{BLACK}Купити 25% акцій компанії
@@ -2774,7 +2773,7 @@ STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Ціна
 STR_885C_BROKEN_DOWN                                            :{RED}Зламався
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Вік: {LTBLUE}{STRING}{BLACK}   Транспортні витрати: {LTBLUE}{CURRENCY}/рік
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Вага: {LTBLUE}{WEIGHT_S}  {BLACK}Потужність: {LTBLUE}{POWER}{BLACK} Макс. швидкість: {LTBLUE}{VELOCITY}
-STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Прибуток: {LTBLUE}{CURRENCY}  (торік: {CURRENCY})
+STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Прибуток: {LTBLUE}{CURRENCY}  (минулого року: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Надійність: {LTBLUE}{COMMA}%  {BLACK}Поломок після останнього техогляду: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Зупинений
 STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Неможливо проїхати сигнал - небезпечно...
--- a/lang/unfinished/afrikaans.txt
+++ b/lang/unfinished/afrikaans.txt
@@ -617,6 +617,7 @@ STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Verminde
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Ontwikkel lukraak land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Herstel landerye
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Herstel landerye
+STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Is jy seker jy wil alle speler-besittend eiendom verwyder?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landerye ontwikkeling
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stad ontwikkeling
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Nyweheid ontwikkeling
@@ -2795,6 +2796,7 @@ STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Outoverv

 STR_NOT_REPLACING                                               :{BLACK}Word nie vervang nie
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Geen voertuig gekies
+STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Enjin is nie boubaar nie

 STR_ENGINES                                                     :Enjine

--- a/lang/unfinished/croatian.txt
+++ b/lang/unfinished/croatian.txt
--- a/lang/unfinished/frisian.txt
+++ b/lang/unfinished/frisian.txt
@@ -1,6 +1,6 @@
 ##name Frisian
 ##ownname Frysk
-##isocode fy_NL
+##isocode fy

 ##id 0x0000
 STR_NULL                                                        :
@@ -232,10 +232,8 @@ STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARG
 STR_0140_NEW_GAME                                               :{BLACK}Nei Spul
 STR_0141_LOAD_GAME                                              :{BLACK}Laad Spul

-STR_64                                                          :64
 STR_128                                                         :128
 STR_256                                                         :256
-STR_512                                                         :512
 STR_1024                                                        :1024
 STR_2048                                                        :2048
 STR_0148_GAME_OPTIONS                                           :{BLACK}Spul Opsjes
@@ -1101,26 +1099,8 @@ STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}
 STR_482F_COST                                                   :{BLACK}Kostet: {YELLOW}{CURRENCY}

 ##id 0x5000
-STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Tunnel mat earst fuorthelle wurde
-STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Brêge mat earst fuorthelle wurde
-STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Begjin en ein kin net op itselde plak wêze
-STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}Begjin en ein mat yn ien lijn wêze
-STR_500D                                                        :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
-STR_5012_WOODEN                                                 :Hout
-STR_5013_CONCRETE                                               :Beton
-STR_5014_TUBULAR_STEEL                                          :Buis, Stiel
-STR_5015_CAN_T_BUILD_BRIDGE_HERE                                :{WHITE}Kin hjir gjin brêge bouwe...
-STR_5016_CAN_T_BUILD_TUNNEL_HERE                                :{WHITE}Kin hjir gjin tunnel bouwe...
-STR_5017_RAILROAD_TUNNEL                                        :Spoartunnel
-STR_501F_WOODEN_RAIL_BRIDGE                                     :Houten spoarbrêge
-STR_5020_CONCRETE_RAIL_BRIDGE                                   :Betonnen spoarbrêge

 ##id 0x5800
-STR_5800_OBJECT_IN_THE_WAY                                      :{WHITE}Objekt yn it paad
-STR_5801_TRANSMITTER                                            :Sendmast
-STR_5802_LIGHTHOUSE                                             :Fjoertoer
-STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Kin dit stikje lân net keapje...
-STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...it is al fan dy!


 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
@@ -1133,93 +1113,14 @@ STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...it is
 ##id 0x6800

 ############ range for difficulty levels starts
-STR_6801_EASY                                                   :{BLACK}Maklik
-STR_6802_MEDIUM                                                 :{BLACK}Gewoan
 ############ range for difficulty levels ends

 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksimum oantal tsjinstanders: {ORANGE}{COMMA}
-STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Tsjinstander begjint: {ORANGE}{STRING}
-STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Oantal stêden: {ORANGE}{STRING}
-STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Oantal yndustrieen: {ORANGE}{STRING}
-STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Konstruksjesnelhyd fan tsjinstanders: {ORANGE}{STRING}
-STR_6810_COST_OF_CONSTRUCTION                                   :{LTBLUE}Konstruksjekosten: {ORANGE}{STRING}
-STR_6811_TERRAIN_TYPE                                           :{LTBLUE}Terreinsoart: {ORANGE}{STRING}
-STR_6813_ECONOMY                                                :{LTBLUE}Ekonomy: {ORANGE}{STRING}
 ############ range for difficulty settings ends

 STR_26816_NONE                                                  :Gjin
-STR_6816_LOW                                                    :Leech
-STR_6817_NORMAL                                                 :Gewoan
-STR_6818_HIGH                                                   :Heech
-STR_6819                                                        :{BLACK}{SMALLLEFTARROW}
-STR_681A                                                        :{BLACK}{SMALLRIGHTARROW}
-STR_681B_VERY_SLOW                                              :Hiel dreech
-STR_681C_SLOW                                                   :Dreech
-STR_681D_MEDIUM                                                 :Gewoan
-STR_681E_FAST                                                   :Hurd
-STR_681F_VERY_FAST                                              :Hiel hurd
-STR_6820_LOW                                                    :Leech
-STR_6821_MEDIUM                                                 :Gewoan
-STR_6822_HIGH                                                   :Heech
-STR_6823_NONE                                                   :Gjin
-STR_6824_REDUCED                                                :Minder
-STR_6825_NORMAL                                                 :Gewoan
-STR_6826_X1_5                                                   :x1.5
-STR_6827_X2                                                     :x2
-STR_6828_X3                                                     :x3
-STR_6829_X4                                                     :x4
-STR_682A_VERY_FLAT                                              :Hiel Flak
-STR_682B_FLAT                                                   :Flak
-STR_682D_MOUNTAINOUS                                            :Bergachtich
-STR_682F_FLUCTUATING                                            :Wikseljend
-STR_6830_IMMEDIATE                                              :Fuortendaliks
-STR_6831_3_MONTHS_AFTER_PLAYER                                  :3 moannen nei spyler
-STR_6832_6_MONTHS_AFTER_PLAYER                                  :6 moannen nei spyler
-STR_6833_9_MONTHS_AFTER_PLAYER                                  :9 moannen nei spyler
-STR_6836_OFF                                                    :Ut
-STR_6837_ON                                                     :Oan

 ##id 0x7000
-STR_7000                                                        :
-STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
-STR_7002_PLAYER                                                 :(Spyler {COMMA})
-STR_7004_NEW_FACE                                               :{BLACK}Nei Gesicht
-STR_7005_COLOR_SCHEME                                           :{BLACK}Kleurenskema
-STR_7006_COLOR_SCHEME                                           :{GOLD}Kleurenskema:
-STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Nei Kleurenskema
-STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finansieen {BLACK}{PLAYERNAME}
-STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Utjeften/Ynkomsten
-STR_7010                                                        :{WHITE}{NUM}
-STR_7011_CONSTRUCTION                                           :{GOLD}Konstruksje
-STR_7018_TRAIN_INCOME                                           :{GOLD}Ynkomsten Treinen
-STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Ynkomsten Fleantúgen
-STR_701B_SHIP_INCOME                                            :{GOLD}Ynkomsten Skepen
-STR_701C_LOAN_INTEREST                                          :{GOLD}Rinte Liening
-STR_701D_OTHER                                                  :{GOLD}Oaren
-STR_701E                                                        :{BLACK}-{CURRENCY64}
-STR_701F                                                        :{BLACK}+{CURRENCY64}
-STR_7020_TOTAL                                                  :{WHITE}Totaal:
-STR_7021                                                        :{COMPANY}{PLAYERNAME}
-STR_7022_INCOME_GRAPH                                           :{WHITE}Ynkomsten Grafyk
-STR_7024                                                        :{COMMA}
-STR_7027_LOAN                                                   :{WHITE}Liening
-STR_7028                                                        :{BLACK}{CURRENCY64}
-STR_7029_BORROW                                                 :{BLACK}Lien {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
-STR_702A_REPAY                                                  :{BLACK}Betelje {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY} werom
-STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Kin net mear jild liene
-STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} nedich
-STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Kin liening net werombetelje
-STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Selektear nei gesicht foar de bedriuwslieder
-STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Lien mear jild
-STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Betelje in diel fan de liening werom
-STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Bedriuwslieder)
-STR_7038_INAUGURATED                                            :{GOLD}Oprjochte: {WHITE}{NUM}
-STR_7042_NONE                                                   :{WHITE}Gjin
-STR_7044_MALE                                                   :{BLACK}Man
-STR_7045_FEMALE                                                 :{BLACK}Frou
-STR_7046_NEW_FACE                                               :{BLACK}Nei Gesicht
-STR_704C_KEY                                                    :{BLACK}Kaai



@@ -1292,6 +1193,5 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}

 ############ Tooltip measurment

-############ Date formatting

 ########
--- a/lang/unfinished/greek.txt
+++ b/lang/unfinished/greek.txt
@@ -625,6 +625,8 @@ STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Μείω
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Δημιουργία τυχαίου εδάφους
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Επαναφορά τοπίου
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Επαναφορά Τοπίου
+STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Αφαίρεση όλων των ιδιοκτησιών παικτών από το χάρτη
+STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Είστε σίγουρος ότι θέλετε να αφαιρέσετε όλες τις ιδιοκτησίες παικτών;
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Δημιουργία τοπίου
 STR_022F_TOWN_GENERATION                                        :{BLACK}Δημιουργία πόλης
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Δημιουργία Βιομηχανίας
--- a/lang/unfinished/latvian.txt
+++ b/lang/unfinished/latvian.txt
@@ -5,24 +5,24 @@

 ##id 0x0000
 STR_NULL                                                        :
-STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Ārpus kartes robežām
-STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Pārāk tuvu kartes malai
-STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Nepietiek naudas - nepieciešami {CURRENCY}
+STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}A'rpus kartes robez'as
+STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Pa'ra'k tuvu kartes malai
+STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Nepietiek naudas - vajag {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY64}
 STR_0005                                                        :{RED}{CURRENCY64}
 STR_EMPTY                                                       :
-STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Zemei jābūt plakanai
-STR_0008_WAITING                                                :{BLACK}Gaidam: {WHITE}{STRING.a}
+STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Zemei ja'bu't plakanai
+STR_0008_WAITING                                                :{BLACK}Gaidam: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
-STR_000A_EN_ROUTE_FROM                                          :{WHITE}{CARGO}{YELLOW}  (ceļā no
+STR_000A_EN_ROUTE_FROM                                          :{WHITE}{CARGO}{YELLOW}  (cel'a' no
 STR_000B                                                        :{YELLOW}{STATION})
-STR_000C_ACCEPTS                                                :{BLACK}Pieņem: {WHITE}
-STR_000D_ACCEPTS                                                :{BLACK}Pieņem: {GOLD}
+STR_000C_ACCEPTS                                                :{BLACK}Pien'em: {WHITE}
+STR_000D_ACCEPTS                                                :{BLACK}Pien'em: {GOLD}
 STR_000E                                                        :
-STR_000F_PASSENGERS                                             :Pasažieri
+STR_000F_PASSENGERS                                             :Pasaz'ierus
 STR_0010_COAL                                                   :Ogles
-STR_0011_MAIL                                                   :Pasts
-STR_0012_OIL                                                    :Nafta
+STR_0011_MAIL                                                   :Pastu
+STR_0012_OIL                                                    :Naftu
 STR_0013_LIVESTOCK                                              :Liellopus
 STR_0014_GOODS                                                  :Preces
 STR_0015_GRAIN                                                  :Graudus
@@ -146,15 +146,12 @@ STR_ABBREV_TOFFEE                                               :{TINYFONT}CP
 STR_ABBREV_BATTERIES                                            :{TINYFONT}BT
 STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}BU
-STR_ABBREV_NONE                                                 :{TINYFONT}NAV
-STR_ABBREV_ALL                                                  :{TINYFONT}VISI
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Karte - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spe'les parametri
 STR_00B2_MESSAGE                                                :{YELLOW}Zin'ojums
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zin'ojums no {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Uzmanību!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Ta' nevar dari't....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}S'o laukumu nevar noli'dzina't....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Org'ìina'la's autortiesi'bas {COPYRIGHT} 1995 Chris Sawyer, Visas tiesi'bas rezerve'tas
@@ -287,15 +284,12 @@ STR_013D_INFORMATION                                            :{BLACK}Informa'
 STR_013E_CAPACITIES                                             :{BLACK}Ietilpi'ba
 STR_013E_TOTAL_CARGO                                            :{BLACK}Krava kopa'
 STR_013F_CAPACITY                                               :{BLACK}Ietilpi'ba: {LTBLUE}{CARGO}
-STR_CAPACITY_MULT                                               :{BLACK}Ietilpība: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Kope'ja' vilciena kravas ietilpi'ba:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Jauna spe'le
 STR_0141_LOAD_GAME                                              :{BLACK}Iela'de't spe'li
 STR_SINGLE_PLAYER                                               :{BLACK}Viens spe'le'ta'js
 STR_MULTIPLAYER                                                 :{BLACK}Daudz-spe'le'ta'ju
-STR_SCENARIO_EDITOR                                             :{BLACK}Scenāriju redaktors

 STR_64                                                          :64
 STR_128                                                         :128
@@ -312,26 +306,6 @@ STR_0151_MAP_OF_WORLD                                           :Pasaules karte
 STR_0152_TOWN_DIRECTORY                                         :Pilse'tu saraksts
 STR_0153_SUBSIDIES                                              :Subsi'dijas

-STR_UNITS_IMPERIAL                                              :Britu
-STR_UNITS_METRIC                                                :Metriska
-STR_UNITS_SI                                                    :SI
-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} jūdzes/h
-STR_UNITS_VELOCITY_METRIC                                       :{COMMA} km/h
-STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s
-STR_UNITS_POWER_IMPERIAL                                        :{COMMA} zs
-STR_UNITS_POWER_METRIC                                          :{COMMA} zs
-STR_UNITS_POWER_SI                                              :{COMMA} kW
-STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}t
-STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t
-STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg
-STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg
-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}galoni
-STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}l
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³
-STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
-STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ mārciņasf
-STR_UNITS_FORCE_METRIC                                          :{COMMA} tonnu spēks
-STR_UNITS_FORCE_SI                                              :{COMMA} kN
 ############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Pana'kumu grafiks
 STR_0155_INCOME_GRAPH                                           :Iena'kumu grafiks
@@ -368,34 +342,6 @@ STR_SORT_BY_AGE                                                 :Vecums
 STR_SORT_BY_RELIABILITY                                         :Dros'i'ba
 STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Kope'ja' ietilpi'ba pe'c kravas tipa
 STR_SORT_BY_MAX_SPEED                                           :maksima'lais a'trums
-STR_SORT_BY_MODEL                                               :Modelis
-STR_SORT_BY_VALUE                                               :Vērtība
-STR_SORT_BY_FACILITY                                            :Stacijas veids
-STR_SORT_BY_WAITING                                             :Gaidošās kravas vērtība
-STR_SORT_BY_RATING_MAX                                          :Kravas reitings
-STR_ENGINE_SORT_ENGINE_ID                                       :DzinējaID (klasiskais veids)
-STR_ENGINE_SORT_COST                                            :Izmaksas
-STR_ENGINE_SORT_POWER                                           :Jauda
-STR_ENGINE_SORT_INTRO_DATE                                      :Ieviešanas datums
-STR_ENGINE_SORT_RUNNING_COST                                    :Lietošanas izmaksas
-STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Jauda/lietošanas izmaksas
-STR_ENGINE_SORT_CARGO_CAPACITY                                  :Kravnesība
-STR_NO_WAITING_CARGO                                            :{BLACK}Neviena veida krava negaida
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Izvēlēties visu aprīkojumu
-STR_SELECT_ALL_TYPES                                            :{BLACK}Izvēlēties visus kravas veidus (ieskaitot, kas negaida)
-STR_AVAILABLE_TRAINS                                            :{BLACK}Pieejamie vilcieni
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Pieejamie transportlīdzekļi
-STR_AVAILABLE_SHIPS                                             :{BLACK}Pieejamie kuģi
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Pieejamās lidmašīnas
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Apskatīties visus vilcējus, kas pieejami šim transportlīdzekļu veidam.
-STR_MANAGE_LIST                                                 :{BLACK}Labot sarakstu
-STR_MANAGE_LIST_TIP                                             :{BLACK}Dot norādījumus visiem transportlīdzekļiem, kas ir šajā sarakstā
-STR_REPLACE_VEHICLES                                            :Nomainīt transportlīdzekļus
-STR_SEND_TRAIN_TO_DEPOT                                         :Sūtīt uz depo
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Sūtīt uz depo
-STR_SEND_SHIP_TO_DEPOT                                          :Sūtīt uz depo
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Sūtīt uz angāru
-STR_SEND_FOR_SERVICING                                          :Sūtīt uz apkalpošanu

 ############ range for months starts
 STR_0162_JAN                                                    :Jan
@@ -461,8 +407,8 @@ STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Iesle'gt
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}S'i' gada iena'kums: {CURRENCY} (paga'jus'aja' gada': {CURRENCY})

 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} gad{P s i u} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} gad{P s i u} ({COMMA})
+STR_AGE                                                         :{COMMA} gad{P s i} ({COMMA})
+STR_AGE_RED                                                     :{RED}{COMMA} gad{P s i} ({COMMA})
 ############ range for service numbers ends

 STR_019C_ROAD_VEHICLE                                           :Cel'u transporta li'dzeklis
@@ -562,7 +508,6 @@ STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Atzi'me'
 STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Dze'st tekos'o programmu (tikai 1.Specia'lo vai 2.Specia'lo)
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Saglaba't muzikas rez'i'mus
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Uzkliks'k'ini uz muzikas treku lai to pievienotu tekos'ajai programmai (1.Specia'lai vai 2.Specia'lai)
-STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Uzklikšķiniet uz dziemas, lai to izdzēstu no šībrīža programmas (tikai Pielāgotā1 un Pielāgotā2)
 STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Pa'rsle'gt muzikas saraksta sajauks'anu
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Para'di't muzikas saraksta atzi'me's'anas logu
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Uzkliks'k'ini uz servisa lai iecentre'tu skatu uz industriju vai pilse'tu
@@ -578,7 +523,6 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Spe'le'
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Sa'ncens'a stacija' ierodas pirmais transporta li'dzeklis
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Negadijumi / ava'rijas
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Kompa'nijas informa'cija
-STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Atvērt / aizvērt industrijas
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Ekonomijas izmain'as
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Padoms / informa'cija par spe'le'ta'ja transporta li'dzekl'iem
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Jaunie transporta li'dzekl'i
@@ -727,6 +671,7 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Saglaba'
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Iela'de't scena'riju
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Saglaba't scena'riju
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Spe'le't scena'riju
+STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Vai ju's ties'a'm ve'laties izbeigt s'o scena'riju?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Beigt redaktoru
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...atl'auts bu've't tikai pilse'ta's ar iedzi'vota'ju skaitu vismaz 1200
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Pa'rvietot starta datumu 1 gadu uz atpakal'u
@@ -753,7 +698,6 @@ STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Saglaba'
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Transporta li'dzekl'u dizaina nosaukumu izve'le
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Saglaba't specia'los transporta li'dzekl'a dizaina nosaukumus

-STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spe'les rez'i'mi
 STR_02C5_DIFFICULTY_SETTINGS                                    :Gru'ti'bas paka'pes
@@ -797,9 +741,7 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Kope't a
 STR_02E0_CURRENCY_UNITS                                         :{BLACK}Naudas vieni'bas
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
 STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Naudas vieni'bu izve'le
-STR_MEASURING_UNITS                                             :{BLACK}Mērvienības
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
-STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Mērvienību izvēle
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Cel'a satiksmes li'dzekl'i
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Braucama's cel'a puses izve'le
@@ -877,8 +819,6 @@ STR_TOWNNAME_ROMANIAN                                           :Ruma'nijas
 STR_TOWNNAME_CZECH                                              :C'ehijas
 STR_TOWNNAME_SWISS                                              :S'veices
 STR_TOWNNAME_DANISH                                             :Da'n'u
-STR_TOWNNAME_TURKISH                                            :Turku
-STR_TOWNNAME_ITALIAN                                            :Itāļu
 ############ end of townname region

 STR_CURR_GBP                                                    :Ma'rcin'as (£)
@@ -904,8 +844,6 @@ STR_CURR_PLN                                                    :Polijas zloti (
 STR_CURR_ROL                                                    :Ruma'nijas lejas (ROL)
 STR_CURR_RUR                                                    :Krievijas rubl'i (RUR)
 STR_CURR_SEK                                                    :Zviedru kronas (SEK)
-STR_CURR_YTL                                                    :Turcijas lira (YTL)
-STR_CURR_SKK                                                    :Slovākijas krona (SKK)

 STR_CURR_CUSTOM                                                 :Specia'la...

@@ -954,7 +892,6 @@ STR_CRATES                                                      :kastes
 STR_RES_OTHER                                                   :cits
 STR_NOTHING                                                     :

-STR_SMALL_RIGHT_ARROW                                           :{TINYFONT}{RIGHTARROW}
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nevar dali'ties ar uzdevumu sarakstu...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nevar kope't uzdevumu sarakstu...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Dali'to uzdevumu beigas - -
@@ -1024,7 +961,6 @@ STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Jauna'

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Vienme'r atl'aut mazas lidostas: {ORANGE}{STRING}

-STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Brīdināt, ja vilciens apmaldās: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Pa'rskati't transporta uzdevumus: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :Ne'
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :Ja', izn'emot transporta li'dzekl'us kas apsta'dina'ti
@@ -1037,297 +973,91 @@ STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Automa'
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Kl'u'das zin'ojuma ilgums: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Râdît pilsçtas iedzîvotâju skaitu pie pilsçtas nosaukuma: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Neredzami koki (ar caurspi'di'ga'm celtne'm): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Parasts
-STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sniega li'nijas augstums: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Reljefa raupjums (tikai TerraGenesis): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Ļoti līdzena
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Līdzena
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH                   :Nelīdzena
-STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Ļoti nelīdzena
-STR_CONFIG_PATCHES_TREE_PLACER                                  :{LTBLUE}Koku izvietošanas algoritms: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TREE_PLACER_NONE                             :Nav
-STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL                         :Parasts
-STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED                         :Uzlabots
-STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Pret pulksteņa radītaja virzienu
-STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :Pa pulksteņa radītaja virzienu
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maksima'lais staciju izkaisijums: {ORANGE}{STRING} {RED}Uzmani'bu: augsts li'menis pale'lina spe'li
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Apkalpots helikopterus heliportos automātiski: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Sasaitē ainavas rīkjoslu ar dzelzceļa/ceļa/ūdens/lidostu rīkjoslu: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Pretējš pārtīšana virziens: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Rādīt mērījumu rīkjoslu, kas tiek izmantoti dažādi celniecības rīki: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Parādīt kompānijas ģildes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LIVERIES_NONE                                :Nav
-STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Paša uzņēmums
-STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Visi uzņēmumi
-
-
-
-STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Iespējot jauno mākslīgo intelektu (alpha): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Atļaut mākslīgo intelektu daudzlietotāju režīmā (eksperimentāls): {ORANGE}{STRING}




-
-
-
-
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Noklusētais vilcienu apkalpošanas periods: {ORANGE}{STRING} dienas/%
-STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Noklusētais vilcienu apkalpošanas periods: {ORANGE}atspējots
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Noklusētais autotransporta apkalpošanas periods: {ORANGE}{STRING} dienas/%
-STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Noklusētais autotransporta apkalpošanas periods: {ORANGE}atspējots
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Noklusētais lidaparātu apkalpošanas periods: {ORANGE}{STRING} dienas/%
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Noklusētais lidaparātu apkalpošanas periods: {ORANGE}atspējots
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Noklusētais kuģu apkalpošanas periods: {ORANGE}{STRING} dienas/%
-STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Noklusētais kuģu apkalpošanas periods: {ORANGE}atspējots
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Aizliedz servisu kad saboja's'ana's izsle'gta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Ieslēgt vagonu ātruma ierobežojumus: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Izslēgt eletrificēto dzelzceļu: {ORANGE}{STRING}

-STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Krāsainās savīs parādās: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Sākuma gads: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Nobeidz spe'li: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Ieslēgt lēzenas izmaiņas ekonomikā
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Atïauj akciju pirkðanu no citâm kompânijâm
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Kads velk, izvietot semaforus katras: {ORANGE}{STRING} šūnas
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Galvenās rīkjoslas izvietojums: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Pa kreisi
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Centrâ
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Pa labi
-STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Logu pielipšanas rādiuss: {ORANGE}{STRING} px
-STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Logu pielipšanas rādiuss: {ORANGE}atspējots

-STR_CONFIG_PATCHES_GUI                                          :{BLACK}Saskarne
-STR_CONFIG_PATCHES_CONSTRUCTION                                 :{BLACK}Būvniecība
-STR_CONFIG_PATCHES_VEHICLES                                     :{BLACK}Transportlīdzekļi
 STR_CONFIG_PATCHES_STATIONS                                     :{BLACK}Stacijas
-STR_CONFIG_PATCHES_ECONOMY                                      :{BLACK}Ekonomika
-STR_CONFIG_PATCHES_AI                                           :{BLACK}Pretiniekis

-STR_CONFIG_PATCHES_DISABLED                                     :atspējots
 STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}

-STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Mainīt iestatījuma vērtību
-STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Daži vai visi apkalpošanas intervāli ir nesavietojami ar izvēlētajiem iestatījumiem! Der 5-90% un 30-800 dienas
-STR_CONFIG_PATCHES_YAPF_SHIPS                                   :{LTBLUE}Izmantot YAPF kuģiem: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_YAPF_ROAD                                    :{LTBLUE}Izmantot YAPF autotransportam: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_YAPF_RAIL                                    :{LTBLUE}Izmantot YAPF vilcieniem: {ORANGE}{STRING}

-STR_TEMPERATE_LANDSCAPE                                         :Mērenais klimats
-STR_SUB_ARCTIC_LANDSCAPE                                        :Subarktiskais klimats
-STR_SUB_TROPICAL_LANDSCAPE                                      :Subtropiskais klimats
-STR_TOYLAND_LANDSCAPE                                           :Rotaļlietu zeme

-STR_CHEATS                                                      :{WHITE}Blēdības
-STR_CHEATS_TIP                                                  :{BLACK}Izvēlas rūtiņas norāda uz to, vai esat jau izmantojis šo blēdību
-STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tuneļi drīkst krutoties: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Būvniecības pauzes režīmā: {ORANGE}{STRING}
-STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Reaktīvās lidmašīnas neavarēs (bieži) mazajās lidostās: {ORANGE} {STRING}
-STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Klimata maiņa: {ORANGE} {STRING}
-STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Datuma maiņa: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}L'auj izmaini't produktu ve'rti'bas: {ORANGE}{STRING}

-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Ceļā uz {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Ceļā uz {WAYPOINT}, {VELOCITY}

 STR_GO_TO_WAYPOINT                                              :Caur {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Brauc caur {WAYPOINT} bez apstāšanās

-STR_WAYPOINTNAME_CITY                                           :Kontrolpunkts {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolpunkts {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Kontrolpunkts

-STR_WAYPOINT                                                    :{WHITE}Kontrolpunkts
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Izvēlaties kontrolpunkta veidu

 STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
 STR_WAYPOINT_RAW                                                :{WAYPOINT}
-STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Labot kontrolpunkta nosaukumu

-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nevar pārsaukt kontrolpunktu...
-STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}Pārvērst sliedes par kontrolpunktu
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Nevar šeit uzbūvēt vilcienu kontrolpunktu...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nevar šeit noņemt vilcienu kontrolpunktu...

-STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Būvē dzelzceļu izmantojot Autosliežu režīmu

-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...šajā scenārijā nav pilsētu

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

-STR_LANDSCAPING_TOOLBAR_TIP                                     :{BLACK}Atvērt aiznavas rīkjoslu, lai mainīt zemes līmeni, stādīt kokus utt.
-STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Ainava
 STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Izlidzinât zemi


-STR_TREES_RANDOM_TYPE                                           :{BLACK}Nejauši izvēlēta veida koki
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Nejauši izveitot kokus

-STR_CANT_BUILD_CANALS                                           :{WHITE}Nedrīkst šeit būvēt kanālus...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Būvēt kanālus. Nospiediet CTRL, lai izvietotu jūras šūnas (tikai jūras līmenī)
 STR_LANDINFO_CANAL                                              :Kanals

-STR_CANT_BUILD_LOCKS                                            :{WHITE}Nevar šeit būvet slūžas
-STR_BUILD_LOCKS_TIP                                             :{BLACK}Būvēt slūžas
-STR_LANDINFO_LOCK                                               :Slūžas

 STR_BUOY_IS_IN_USE                                              :{WHITE}...boja jau tiek lietota!

-STR_LANDINFO_COORDS                                             :{BLACK}Koordinātes: {LTBLUE}{NUM}x{NUM} ({STRING})

-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nevar novākt daļu stacijas
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Nevar pārveidot sliežu veidu šeit...
-STR_CONVERT_RAIL_TIP                                            :{BLACK}Pārveidot/uzlabot sliežu veidu

-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Pārvēlciet šeit vilciena lokomotīvi, lai pārdotu visu vilcienu

-STR_DRAG_DROP                                                   :{BLACK}Vilkt un nomest
-STR_STATION_DRAG_DROP                                           :{BLACK}Būvēt staciju izmantojot "vilkt un nomest"
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Izvēlaties, kādu stacijas klasi rādīt
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Izvēlaties, kādu stacijas veidu būvēt

-STR_FAST_FORWARD                                                :{BLACK}Paātrināta spēle
-STR_MESSAGE_HISTORY                                             :{WHITE}Ziņojumu vēsture
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Neseno ziņu saraksts
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Atspējot visu
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Iespējot visu

-STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Būvēt ogļu raktuvi
-STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Stādīt kokaudzētavu
-STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Būvēt naftas atradni
-STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Būvēt fermu
-STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Būvēt vara rūdas raktuvi
-STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Veikt naftas urbumu
-STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Būvēt zelta raktuvi
-STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Būvēt dimantu raktuvi
-STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Būvēt dzelzs rūdas raktuvi
-STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Finansēt augļu koku plantāciju
-STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Finansēt gumijkoku plantāciju
-STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Finansēt ūdens ieguvi
-STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Stādīt konfekšpūku mežu
-STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Finansēt bateriju fermu
-STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}Veikt kolas urbumus
-STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP                             :{BLACK}Finansēt plastmasas strūklakas
-STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}Būvēt burbuļu ģenerātoru
-STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}Finansēt Toffee raktuves
-STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Būvēt cukura raktuves

 STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrîjas
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}){YELLOW} ({COMMA}% pārvadāti)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}/{CARGO}){YELLOW} ({COMMA}%/{COMMA}% pārvadāti)
 STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}

-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...pārāk tuvu citai industrijai

-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Pielāgot vilcienu citas kravas pārvadāšanai
-STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Pārbūvēt vilcienu
-STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Izvēlaties kravas veidu, ko pārvadāt ar vilcienu
-STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Pārbūvēt vilcienu izceltā kravas veida pārvadāšanai
-STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Nevar pārbūvēt vilcienu...
-STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Apkalpošanas intervāls procentos: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Maini't produkciju

-TEMP_AI_IN_PROGRESS                                             :{WHITE}Laipni lūgti jaunā MI izstrādē. Ja jums rodas kādas problēmas, tad sataisiet ekrānuzņēmumu un publicējiet to forumā.
-TEMP_AI_ACTIVATED                                               :{WHITE}Brīdinājums: jaunais MI ir joprojām alfa stadijā! Šobrīd darbojas tikai autotransports!
-TEMP_AI_MULTIPLAYER                                             :{WHITE}Brīdinājums: realizācija joprojām ir eksperimentāla (izmantojot jauno MI). Lūdzu, ziņojiet par problēmām uz truelight@openttd.org.

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

-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Vairāk spēlētāju režīms

 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spelçtâja vârds:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Šis vārds, pēc kura jūs pazīs citi spēlētāji
-STR_NETWORK_CONNECTION                                          :{BLACK}Savienojums:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Izvēlaties starp spēli caur internetu vai spēli lokālajā tīklā

-STR_NETWORK_START_SERVER                                        :{BLACK}Palaist serveri
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Palaist jūsu personīgo serveri

 STR_NETWORK_GAME_NAME                                           :{BLACK}Vârds
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Spēles nosaukums
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Valoda, servera versija utt.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Noklikšķiniet uz spēles sarakstā, lai to izvēlētos

-STR_NETWORK_FIND_SERVER                                         :{BLACK}Atrast serveri
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Meklēt serveri tīklā
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Pievienot serveri
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Pievieno serveri sarakstam, kurš vienmēr tiks pārbaudīts, vai tajā nav palaistas spēles.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Ievadiet servera adresi

-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienti
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienti tiešsaitē / Maksimālais klientu skaits{}Uzņēmumi tiešsaistē / Maksimālais uzņēmumu skaits
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPĒLES INFORMĀCIJA
 STR_ORANGE                                                      :{ORANGE}{STRING}
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
 STR_NETWORK_LANGUAGE                                            :{SILVER}Valoda:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartes izmērs:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Servera izmērs:  {WHITE}{STRING}
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Servera adrese:  {WHITE}{STRING} : {NUM}
-STR_NETWORK_START_DATE                                          :{SILVER}Sākuma datums:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Šībrīža datums:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Aizsargāts ar paroli!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVERIS NAV TIEŠSAISTĒ
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVERIS IR PILNS
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIJU NESAKRITĪBA
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF NESAKRITĪBA
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Pievienoties spēlei


-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Sākt jaunu vairākspēlētāju spēli

-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spēles nosaukums:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Spēles nosaukums, kas tiks attēlots citiem spēlētajiem vairākspēlētāju spēļu izvēlnē
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Uzstādīt paroli
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Aizsargā jūsu spēli ar paroli, ja jūs nevēlaties, lai tā būtu publiski pieejama
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Izvēlaties karti:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Kuru karti jūs vēlaties spēlēt?
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maks. klientu sk.:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Izvēlaties maksimālo klientu skaitu. Ne visiem slotiem ir jābūt aizpildītiem
+
 STR_NETWORK_COMBO1                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LAN                                                 :LAN
 STR_NETWORK_INTERNET                                            :Internets
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internets
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internets (reklamēt)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 spēlētāju
-STR_NETWORK_1_PLAYERS                                           :1 spēlētājs
 STR_NETWORK_2_PLAYERS                                           :2 clienti
-STR_NETWORK_3_PLAYERS                                           :3 spēlētāji
-STR_NETWORK_4_PLAYERS                                           :4 spēlētāji
-STR_NETWORK_5_PLAYERS                                           :5 spēlētāji
-STR_NETWORK_6_PLAYERS                                           :6 spēlētāji
-STR_NETWORK_7_PLAYERS                                           :7 spēlētāji
-STR_NETWORK_8_PLAYERS                                           :8 spēlētāji
-STR_NETWORK_9_PLAYERS                                           :9 spēlētāji
-STR_NETWORK_10_PLAYERS                                          :10 spēlētāji
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks. uzņēmumu sk.:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Ierobežo serveri noteiktam uzņēmumu daudzumam
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks. novērotāju sk.:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Ierobēžo serveri noteiktam novērotāju skaitam
-STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Valodu, kurā runā:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Citi lietotāji zinās, kurā valodā tiek runāts uz servera
-STR_NETWORK_COMBO5                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_START_GAME                                          :{BLACK}Sakt spçli
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Sāk jaunu tīkla spēli ar nejaušu karti vai scenāriju
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Ielādēt spēli
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Atsākt iepriekš saglabātu vairākspēlētāju spēli (esi pārliecināts, ka atsākat kā pareizs spēlētājs)

 ############ Leave those lines in this order!!
-STR_NETWORK_LANG_ANY                                            :Jebkurā
 STR_NETWORK_LANG_ENGLISH                                        :Angïu
-STR_NETWORK_LANG_GERMAN                                         :Vācu
-STR_NETWORK_LANG_FRENCH                                         :Franču
 ############ End of leave-in-this-order


@@ -1424,76 +1154,27 @@ STR_STATION                                                     :{STATION}
 STR_2806                                                        :{WHITE}{STRING}
 STR_280A_SIGN                                                   :Zîme
 STR_280E_TREES                                                  :Koki
-STR_280F_RAINFOREST                                             :Lietus meži
-STR_2810_CACTUS_PLANTS                                          :Kaktusu plantācijas

 ##id 0x3000
-STR_3000_RAIL_STATION_SELECTION                                 :{WHITE}Dzelzceļa stacijas izvēle
-STR_3001_AIRPORT_SELECTION                                      :{WHITE}Lidostas izvēle
-STR_3002_ORIENTATION                                            :{BLACK}Virziens
-STR_3003_NUMBER_OF_TRACKS                                       :{BLACK}Mašīnu skaits
-STR_3004_PLATFORM_LENGTH                                        :{BLACK}Platformas garums
-STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}Pārāk tuvu citai dzelzceļa stacijai
-STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}Pārāk daudz staciju/iekrašanas zonu šajā pilsētā
-STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}Pārāk daudz stacijas/iekraušanas zonas
 STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}Pa'ra'k daudz autobusa pieturu
 STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}pa'ra'k daudz kravas auto staciju
-STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Pārāk tuvu citai stacijai/iekraušanas zonai
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
-STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Jānojauc dzelzsceļa stacija vispirms
-STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT                           :{WHITE}Pārāk tuvu citai lidostai
-STR_300E_MUST_DEMOLISH_AIRPORT_FIRST                            :{WHITE}Vispirms jānosauc lidosta

-STR_3030_RENAME_STATION_LOADING                                 :Pārsaukt staciju/iekraušanas zonu
-STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Nevar pārsaukt staciju...
 STR_3032_RATINGS                                                :{BLACK}Reitingi
-STR_3033_ACCEPTS                                                :{BLACK}Pieņem
-STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Vietējais transporta pakalpojumu reitings:

 ############ range for rating starts
-STR_3035_APPALLING                                              :Drausmīgs
-STR_3036_VERY_POOR                                              :Ļoti vājš
-STR_3037_POOR                                                   :Vājš
-STR_3038_MEDIOCRE                                               :Viduvējs
-STR_3039_GOOD                                                   :Labs
-STR_303A_VERY_GOOD                                              :Ļoti labs
-STR_303B_EXCELLENT                                              :Lielisks
-STR_303C_OUTSTANDING                                            :Perfekts
 ############ range for rating ends

 STR_303D                                                        :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
-STR_303E_NO_LONGER_ACCEPTS                                      :{WHITE}{STATION} vairs nepieņem {STRING}
-STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} vairs nepieņem {STRING} vai {STRING}
-STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION} pieņem {STRING}
-STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} pieņem {STRING} un {STRING}
-STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Autoostas virziens
-STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Virpirms jānojauc autoosta
-STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stacij{P a s u}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
-STR_304A_NONE                                                   :{YELLOW}- Nav -
-STR_304B_SITE_UNSUITABLE                                        :{WHITE}...vieta nav piemērota
-STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Pārāk tuvu citam dokam
-STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Vispirms jānojauc doks
-STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Izvēlaties dzelzsceļa stacijas virzienu
-STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Izvēlaties platformu skaitu dzelzsceļa stacijai
-STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Izvēlaties autoostas virzienu
-STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centrēt galveno skatījumu uz stacijas atrašanās vietu
-STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Parādīt stacijas reitingu
-STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Mainīt stacijas nosaukumu
-STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Rādīt pieņemamās kravas sarakstu
-STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Staciju nosaukumi - uzklišķiniet uz nosaukuma, lai centrētu galveno skatījumu uz staciju
-STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Izvēlaties lidostas izmēru/veidu
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_305E_RAILROAD_STATION                                       :Dzelzsceļa stacija
-STR_305F_AIRCRAFT_HANGAR                                        :Lidaparātu angārs
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION} {STATIONFEATURES}
 STR_3060_AIRPORT                                                :Lidosta
 STR_3062_BUS_STATION                                            :Autoosta
 STR_3063_SHIP_DOCK                                              :Osta
 STR_3068_DOCK                                                   :{WHITE}Osta
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...neregula'ras stacijas nav atl'autas

-STR_UNDEFINED                                                   :(nedefinēta rinda)
 ##id 0x3800
 STR_3804_WATER                                                  :Ûdens

@@ -1505,37 +1186,13 @@ STR_4801                                                        :{WHITE}{INDUSTR
 STR_4804_SAWMILL                                                :Gateris
 STR_4805_FOREST                                                 :Mežs
 STR_480B_FARM                                                   :Ferma
-STR_480D_OIL_WELLS                                              :Naftas urbumi
-STR_480E_BANK                                                   :Banka
-STR_480F_FOOD_PROCESSING_PLANT                                  :Ēdiena apstrādes fabrika
-STR_4810_PAPER_MILL                                             :Papirfabrika
-STR_4811_GOLD_MINE                                              :Zelta raktuves
 STR_4812_BANK                                                   :Banka
-STR_4813_DIAMOND_MINE                                           :Dimantu raktuves
-STR_4814_IRON_ORE_MINE                                          :Dzelzs rūdas raktuves
-STR_4815_FRUIT_PLANTATION                                       :Augļu plantācija
-STR_4816_RUBBER_PLANTATION                                      :Gumijkoka plantācija
-STR_4817_WATER_SUPPLY                                           :Ūdens ieguve
-STR_4818_WATER_TOWER                                            :Ūdens tornis
 STR_4819_FACTORY                                                :Rûpnîca
-STR_481A_FARM                                                   :Ferma
-STR_481B_LUMBER_MILL                                            :Kokzāģētava
-STR_481D_CANDY_FACTORY                                          :Saldumu fabrika
-STR_481F_COLA_WELLS                                             :Kolas urbumi
-STR_4820_TOY_SHOP                                               :Rotaļlietu veikals
-STR_4821_TOY_FACTORY                                            :Rotaļlietu fabrika
-STR_4822_PLASTIC_FOUNTAINS                                      :Plastmasas strūklakas
-STR_4824_BUBBLE_GENERATOR                                       :Burbuļu ģenerātors
-STR_4826_SUGAR_MINE                                             :Cukura raktuve

 ############ range for requires starts
-STR_4827_REQUIRES                                               :{BLACK}Nepieciešams: {YELLOW}{STRING}
-STR_4828_REQUIRES                                               :{BLACK}Nepieciešams: {YELLOW}{STRING}, {STRING}
-STR_4829_REQUIRES                                               :{BLACK}Nepieciešams: {YELLOW}{STRING}, {STRING}, {STRING}
 ############ range for requires ends


-STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produkcija iepriekšēja mēnesī:
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Vilciens tunelî
 STR_500D                                                        :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
@@ -1552,44 +1209,18 @@ STR_SV_EMPTY                                                    :
 STR_SV_TRAIN_NAME                                               :Vilciens {COMMA}

 STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_AIRPORT                                           :{STRING} Lidosta
-STR_SV_STNAME_MINES                                             :{STRING} Raktuves
-STR_SV_STNAME_DOCKS                                             :{STRING} Doki
-STR_SV_STNAME_BUOY_1                                            :{STRING} Boja 1
-STR_SV_STNAME_BUOY_2                                            :{STRING} Boja 2
-STR_SV_STNAME_BUOY_3                                            :{STRING} Boja 3
-STR_SV_STNAME_BUOY_4                                            :{STRING} Boja 4
-STR_SV_STNAME_BUOY_5                                            :{STRING} Boja 5
-STR_SV_STNAME_BUOY_6                                            :{STRING} Boja 6
-STR_SV_STNAME_BUOY_7                                            :{STRING} Boja 7
-STR_SV_STNAME_BUOY_8                                            :{STRING} Boja 8
-STR_SV_STNAME_BUOY_9                                            :{STRING} Boja 9
 STR_SV_STNAME_FOREST                                            :{STRING} Mežs

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

 ##id 0x6800
-STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Grūtības līmenis
 STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Saglabât

 ############ range for difficulty levels starts
 STR_6801_EASY                                                   :{BLACK}Viegls
-STR_6802_MEDIUM                                                 :{BLACK}Vidējs
-STR_6803_HARD                                                   :{BLACK}Grūts
-STR_6804_CUSTOM                                                 :{BLACK}Pielāgots
 ############ range for difficulty levels ends

 ############ range for difficulty settings starts
-STR_6805_MAXIMUM_NO_COMPETITORS                                 :{LTBLUE}Maksimāls pretinieku daudzums: {ORANGE}{COMMA}
-STR_6806_COMPETITOR_START_TIME                                  :{LTBLUE}Pretinieku sākuma laiks: {ORANGE}{STRING}
-STR_6807_NO_OF_TOWNS                                            :{LTBLUE}Pilsētu skaits: {ORANGE}{STRING}
-STR_6808_NO_OF_INDUSTRIES                                       :{LTBLUE}Industriju skaits: {ORANGE}{STRING}
-STR_6809_MAXIMUM_INITIAL_LOAN_000                               :{LTBLUE}Maksimāls sākotnējais kredīts: {ORANGE}{CURRENCY}
-STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Sākotnējā kredīta likme: {ORANGE}{COMMA}%
-STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Transportlīdzekļu lietošanas izdevumi: {ORANGE}{STRING}
-STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Pretinieku būvniecības ātrums: {ORANGE}{STRING}
-STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Pretinieku inteliģence: {ORANGE}{STRING}
-STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Transportlīdzekļu lūšana: {ORANGE}{STRING}
 ############ range for difficulty settings ends

 STR_6819                                                        :{BLACK}{SMALLLEFTARROW}
@@ -1609,19 +1240,9 @@ STR_7005_COLOR_SCHEME                                           :{BLACK}Krasas s
 STR_7006_COLOR_SCHEME                                           :{GOLD}Krasas shçma:
 STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Jaunâ Krasas shçma
 STR_7010                                                        :{WHITE}{NUM}
-STR_7014_ROAD_VEH_RUNNING_COSTS                                 :{GOLD}Ceļa transp. lietošanas izmaksas
-STR_7015_AIRCRAFT_RUNNING_COSTS                                 :{GOLD}Lidaparātu lietošanas izmaksas
-STR_7016_SHIP_RUNNING_COSTS                                     :{GOLD}Kuģu lietošanas izmaksas
-STR_7017_PROPERTY_MAINTENANCE                                   :{GOLD}Īpašumu apkalpošana
-STR_7018_TRAIN_INCOME                                           :{GOLD}Vilcienu ienākumi
-STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Ceļu transportlīdzekļu ienākumi
-STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Lidaparātu ienākumi
-STR_701B_SHIP_INCOME                                            :{GOLD}Kuģu ienākumi
-STR_701C_LOAN_INTEREST                                          :{GOLD}Kredīta likme
 STR_701D_OTHER                                                  :{GOLD}Citi
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
-STR_7020_TOTAL                                                  :{WHITE}Kopā:
 STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_CURRCOMPACT                                                 :{CURRCOMPACT64}
 STR_7024                                                        :{COMMA}
@@ -1737,8 +1358,8 @@ STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut Helic
 STR_8104_AIRCRAFT                                               :lidmaðîna

 ##id 0x8800
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8807_GO_TO_TRANSFER                                         :Uz {STATION} (Pa'rvest un pan'emt kravu)
 STR_8808_GO_TO_UNLOAD                                           :Uz {STATION} (Nokraut)
 STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Uz {STATION} (Pa'rvest un atsta't tuks'u)
@@ -1781,7 +1402,6 @@ STR_980F                                                        :{WHITE}{VEHICLE
 STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Uzbûvet jauno kuìi

 STR_9836_RENAME                                                 :{BLACK}Pârsaukt
-SERVICE_AT_SHIP_DEPOT                                           :Apkalpošana {TOWN} kuģubūvētavā

 ##id 0xA000
 STR_A00A                                                        :{WHITE}{VEHICLE}
@@ -1790,7 +1410,7 @@ STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Pârsaukt
 STR_GO_TO_AIRPORT_HANGAR                                        :Uz {STATION} Angâru
-SERVICE_AT_AIRPORT_HANGAR                                       :Apkalpošana {STATION} angārā
+SERVICE_AT_AIRPORT_HANGAR                                       :Serviss  {STATION} Angarâ

 ##id 0xB000

@@ -1820,9 +1440,10 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Kuìi


-STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Nomainīt {STRING}
-STR_REPLACE_VEHICLES_START                                      :{BLACK}Sākt transportlīdzkļu nomaiņu
-STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Pārtraukt transportlīdzekļu nomaiņu
+STR_REPLACE_VEHICLES                                            :{BLACK}Nomaini transporta lîdzekïus
+STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Nomaini transporta lîdzekïus
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Sâc nomainît transporta lîdzekïus
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Pârtrauc nomainît transporta lîdzekïus
 STR_NOT_REPLACING                                               :{BLACK}Netiks nomainîts
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Neviens transporta lîdzeklis nebija izvçlçts
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Izvçlies lokomatîves tipu kuru tu gribi nomainît
--- a/main_gui.c
+++ b/main_gui.c
@@ -53,20 +53,6 @@ static int _scengen_town_size = 2; // depress medium-sized towns per default
 extern void GenerateIndustries(void);
 extern bool GenerateTowns(void);

-void CcGiveMoney(bool success, TileIndex tile, uint32 p1, uint32 p2)
-{
-#ifdef ENABLE_NETWORK
-	char msg[20];
-	if (!success) return;
-	/* Inform the player of this action */
-	snprintf(msg, sizeof(msg), "%d", p1);
-	if (!_network_server) {
-		SEND_COMMAND(PACKET_CLIENT_CHAT)(NETWORK_ACTION_GIVE_MONEY, DESTTYPE_TEAM, p2, msg);
-	} else {
-		NetworkServer_HandleChat(NETWORK_ACTION_GIVE_MONEY, DESTTYPE_TEAM, p2, msg, NETWORK_SERVER_INDEX);
-	}
-#endif /* ENABLE_NETWORK */
-}

 void HandleOnEditText(WindowEvent *e)
 {
@@ -88,12 +74,22 @@ void HandleOnEditText(WindowEvent *e)
 #ifdef ENABLE_NETWORK
 	case 3: { /* Give money, you can only give money in excess of loan */
 		const Player *p = GetPlayer(_current_player);
-		int32 money = min(p->money64 - p->current_loan, (int64)(atoi(e->we.edittext.str) / _currency->rate));
+		int32 money = min(p->money64 - p->current_loan, atoi(e->we.edittext.str) / _currency->rate);
+		char msg[20];

 		money = clamp(money, 0, 20000000); // Clamp between 20 million and 0

 		// Give 'id' the money, and substract it from ourself
-		DoCommandP(0, money, id, CcGiveMoney, CMD_GIVE_MONEY | CMD_MSG(STR_INSUFFICIENT_FUNDS));
+		if (!DoCommandP(0, money, id, NULL, CMD_GIVE_MONEY | CMD_MSG(STR_INSUFFICIENT_FUNDS))) break;
+
+		// Inform the player of this action
+		snprintf(msg, sizeof(msg), "%d", money);
+
+		if (!_network_server) {
+			SEND_COMMAND(PACKET_CLIENT_CHAT)(NETWORK_ACTION_GIVE_MONEY, DESTTYPE_TEAM, id, msg);
+		} else {
+			NetworkServer_HandleChat(NETWORK_ACTION_GIVE_MONEY, DESTTYPE_TEAM, id, msg, NETWORK_SERVER_INDEX);
+		}
 		break;
 	}
 #endif /* ENABLE_NETWORK */
@@ -1068,7 +1064,7 @@ static void CommonRaiseLowerBigLand(TileIndex tile, int mode)
 		StringID msg =
 			mode ? STR_0808_CAN_T_RAISE_LAND_HERE : STR_0809_CAN_T_LOWER_LAND_HERE;

-		DoCommandP(tile, 8, (uint32)mode, CcTerraform, CMD_TERRAFORM_LAND | CMD_MSG(msg));
+		DoCommandP(tile, 8, (uint32)mode, CcTerraform, CMD_TERRAFORM_LAND | CMD_AUTO | CMD_MSG(msg));
 	} else {
 		SndPlayTileFx(SND_1F_SPLAT, tile);

@@ -1095,7 +1091,7 @@ static void CommonRaiseLowerBigLand(TileIndex tile, int mode)

 		BEGIN_TILE_LOOP(tile2, sizex, sizey, tile) {
 			if (TileHeight(tile2) == h) {
-				DoCommandP(tile2, 8, (uint32)mode, NULL, CMD_TERRAFORM_LAND);
+				DoCommandP(tile2, 8, (uint32)mode, NULL, CMD_TERRAFORM_LAND | CMD_AUTO);
 			}
 		} END_TILE_LOOP(tile2, sizex, sizey, tile)
 	}
@@ -1805,7 +1801,7 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
 		case WKC_F7: ShowPlayerStations(_local_player); break;
 		case WKC_F8: ShowPlayerFinances(_local_player); break;
 		case WKC_F9: ShowPlayerCompany(_local_player); break;
-		case WKC_F10: ShowOperatingProfitGraph(); break;
+		case WKC_F10:ShowOperatingProfitGraph(); break;
 		case WKC_F11: ShowCompanyLeagueTable(); break;
 		case WKC_F12: ShowBuildIndustryWindow(); break;
 		case WKC_SHIFT | WKC_F1: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Train); break;
@@ -1817,7 +1813,7 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
 		case WKC_SHIFT | WKC_F7: ShowBuildRailToolbar(_last_built_railtype, -1); break;
 		case WKC_SHIFT | WKC_F8: ShowBuildRoadToolbar(); break;
 		case WKC_SHIFT | WKC_F9: ShowBuildDocksToolbar(); break;
-		case WKC_SHIFT | WKC_F10: ShowBuildAirToolbar(); break;
+		case WKC_SHIFT | WKC_F10:ShowBuildAirToolbar(); break;
 		case WKC_SHIFT | WKC_F11: ShowBuildTreesToolbar(); break;
 		case WKC_SHIFT | WKC_F12: ShowMusicWindow(); break;
 		case WKC_CTRL  | 'S': MenuClickSmallScreenshot(); break;
@@ -1864,10 +1860,9 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
 		break;
 	}

-		case WE_MESSAGE: {
-			Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0);
-			if (w2 != NULL) HandleZoomMessage(w, w2->viewport, 17, 18);
-		} break;
+		case WE_MESSAGE:
+			HandleZoomMessage(w, FindWindowById(WC_MAIN_WINDOW, 0)->viewport, 17, 18);
+			break;
 	}
 }

@@ -2013,7 +2008,7 @@ static void ScenEditToolbarWndProc(Window *w, WindowEvent *e)

 	case WE_KEYPRESS:
 		switch (e->we.keypress.keycode) {
-			case WKC_F1: case WKC_PAUSE: ToolbarPauseClick(w); break;
+			case WKC_F1: ToolbarPauseClick(w); break;
 			case WKC_F2: ShowGameOptions(); break;
 			case WKC_F3: MenuClickSaveLoad(0); break;
 			case WKC_F4: ToolbarScenGenLand(w); break;
--- a/misc_cmd.c
+++ b/misc_cmd.c
@@ -187,7 +187,7 @@ int32 CmdChangeCompanyName(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	StringID str;
 	Player *p;

-	if (_cmd_text == NULL || _cmd_text[0] == '\0') return CMD_ERROR;
+	if (_cmd_text[0] == '\0') return CMD_ERROR;

 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -30,7 +30,6 @@
 #include "tgp.h"
 #include "settings.h"
 #include "date.h"
-#include "fileio.h"

 #include "fios.h"
 /* Variables to display file lists */
@@ -213,16 +212,16 @@ static const char *credits[] = {
 	"  Loïc Guilloux (glx) - In training, not yet specialized",
 	"  Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)",
 	"  Attila Bán (MiHaMiX) - WebTranslator, Nightlies, Wiki and bugtracker host",
-	"  Owen Rudge (orudge) - Forum host, OS/2 port",
 	"  Peter Nelson (peter1138) - Spiritual descendant from newgrf gods",
 	"  Remko Bijker (Rubidium) - THE desync hunter",
 	"  Christoph Mallon (Tron) - Programmer, code correctness police",
-	"  Patric Stout (TrueLight) - Coder, network guru, SVN-, MS- and website host",
+	"  Patric Stout (TrueLight) - Coder, network guru, SVN- and website host",
 	"",
 	"Retired Developers:",
 	"  Ludvig Strigeus (ludde) - OpenTTD author, main coder (0.1 - 0.3.3)",
 	"  Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)",
 	"  Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3.0 - 0.3.6)",
+	"  Owen Rudge (orudge) - Forum- and masterserver host, OS/2 port (0.1 - 0.4.8)",
 	"",
 	"Special thanks go out to:",
 	"  Josef Drexler - For his great work on TTDPatch",
@@ -384,7 +383,7 @@ static void BuildTreesWndProc(Window *w, WindowEvent *e)
 	case WE_PLACE_MOUSEUP:
 		if (e->we.place.pt.x != -1) {
 			DoCommandP(e->we.place.tile, _tree_to_plant, e->we.place.starttile, NULL,
-				CMD_PLANT_TREE | CMD_MSG(STR_2805_CAN_T_PLANT_TREE_HERE));
+				CMD_PLANT_TREE | CMD_AUTO | CMD_MSG(STR_2805_CAN_T_PLANT_TREE_HERE));
 		}
 		break;

@@ -1338,7 +1337,6 @@ static void GenerateFileName(void)
 	SetDParam(1, p->name_2);
 	SetDParam(2, _date);
 	GetString(_edit_str_buf, STR_4004, lastof(_edit_str_buf));
-	SanitizeFilename(_edit_str_buf);
 }

 extern void StartupEngines(void);
--- a/music/win32_m.c
+++ b/music/win32_m.c
@@ -12,7 +12,6 @@ static struct {
 	bool playing;
 	int new_vol;
 	HANDLE wait_obj;
-	HANDLE thread;
 	UINT_PTR devid;
 	char start_song[260];
 } _midi;
@@ -87,6 +86,8 @@ static bool MidiIntIsSongPlaying(void)

 static DWORD WINAPI MidiThread(LPVOID arg)
 {
+	_midi.wait_obj = CreateEvent(NULL, FALSE, FALSE, NULL);
+
 	do {
 		char *s;
 		int vol;
@@ -103,7 +104,9 @@ static DWORD WINAPI MidiThread(LPVOID arg)
 			s[0] = '\0';

 			// Delay somewhat in case we don't manage to play.
-			if (!_midi.playing) WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 5000);
+			if (!_midi.playing) {
+				Sleep(5000);
+			}
 		}

 		if (_midi.stop_song && _midi.playing) {
@@ -118,13 +121,14 @@ static DWORD WINAPI MidiThread(LPVOID arg)
 		WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 1000);
 	} while (!_midi.terminate);

-	MidiIntStopSong();
+	DeleteObject(_midi.wait_obj);
 	return 0;
 }

 static const char *Win32MidiStart(const char * const *parm)
 {
 	MIDIOUTCAPS midicaps;
+	DWORD threadId;
 	UINT nbdev;
 	UINT_PTR dev;
 	char buf[16];
@@ -144,8 +148,8 @@ static const char *Win32MidiStart(const char * const *parm)
 		}
 	}

-	if (NULL == (_midi.wait_obj = CreateEvent(NULL, FALSE, FALSE, NULL))) return "Failed to create event";
-	if (NULL == (_midi.thread = CreateThread(NULL, 8192, MidiThread, 0, 0, NULL))) return "Failed to create thread";
+	if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL)
+		return "Failed to create thread";

 	return NULL;
 }
@@ -154,9 +158,6 @@ static void Win32MidiStop(void)
 {
 	_midi.terminate = true;
 	SetEvent(_midi.wait_obj);
-	WaitForMultipleObjects(1, &_midi.thread, true, INFINITE);
-	CloseHandle(_midi.wait_obj);
-	CloseHandle(_midi.thread);
 }

 const HalMusicDriver _win32_music_driver = {
--- a/namegen.c
+++ b/namegen.c
@@ -281,7 +281,7 @@ static byte MakeFinnishTownName(char *buf, uint32 seed, const char *last)
 	if (SeedChance(0, 15, seed) >= 10) {
 		strecat(buf, name_finnish_real[SeedChance(2, lengthof(name_finnish_real), seed)], last);
 	} else if (SeedChance(0, 15, seed) >= 5) {
-		// A two-part name by combining one of name_finnish_1 + "la"/"lä"
+		// A two-part name by combining one of name_finnish_1 + "la"/"l<EFBFBD>"
 		// The reason for not having the contents of name_finnish_{1,2} in the same table is
 		// that the ones in name_finnish_2 are not good for this purpose.
 		uint sel = SeedChance( 0, lengthof(name_finnish_1), seed);
@@ -295,7 +295,7 @@ static byte MakeFinnishTownName(char *buf, uint32 seed, const char *last)
 		{
 			strecat(buf, "la", last);
 		} else {
-			strecat(buf, "lä", last);
+			strecat(buf, "l<EFBFBD>", last);
 		}
 	} else {
 		// A two-part name by combining one of name_finnish_{1,2} + name_finnish_3.
--- a/network.c
+++ b/network.c
@@ -7,7 +7,7 @@
 	extern const char _openttd_revision[];
 #elif defined(WITH_REV_HACK)
 	#define WITH_REV
-	const char _openttd_revision[] = "0.5.3";
+	const char _openttd_revision[] = "0.5.1-RC1";
 #else
 	const char _openttd_revision[] = NOREV_STRING;
 #endif
@@ -1397,13 +1397,11 @@ void NetworkStartUp(void)
 		byte cl_max = _network_game_info.clients_max;
 		byte cp_max = _network_game_info.companies_max;
 		byte sp_max = _network_game_info.spectators_max;
-		byte s_lang = _network_game_info.server_lang;

 		memset(&_network_game_info, 0, sizeof(_network_game_info));
 		_network_game_info.clients_max = cl_max;
 		_network_game_info.companies_max = cp_max;
 		_network_game_info.spectators_max = sp_max;
-		_network_game_info.server_lang = s_lang;
 	}

 	// Let's load the network in windows
--- a/network_client.c
+++ b/network_client.c
@@ -183,7 +183,7 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_CHAT)(NetworkAction action, DestType
 	// Data:
 	//    uint8:  ActionID (see network_data.h, NetworkAction)
 	//    uint8:  Destination Type (see network_data.h, DestType);
-	//    uint16: Destination Player
+	//    uint8:  Destination Player (1..MAX_PLAYERS)
 	//    String: Message (max MAX_TEXT_MSG_LEN)
 	//

@@ -191,7 +191,7 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_CHAT)(NetworkAction action, DestType

 	NetworkSend_uint8(p, action);
 	NetworkSend_uint8(p, type);
-	NetworkSend_uint16(p, dest);
+	NetworkSend_uint8(p, dest);
 	NetworkSend_string(p, msg);
 	NetworkSend_Packet(p, MY_CLIENT);
 }
--- a/network_data.c
+++ b/network_data.c
@@ -429,24 +429,34 @@ void NetworkAddCommandQueue(NetworkClientState *cs, CommandPacket *cp)
 // Prepare a DoCommand to be send over the network
 void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback)
 {
-	CommandPacket c;
+	CommandPacket *c = malloc(sizeof(CommandPacket));
+	byte temp_callback;

-	c.player = _local_player;
-	c.next = NULL;
-	c.tile = tile;
-	c.p1 = p1;
-	c.p2 = p2;
-	c.cmd = cmd;
-	c.callback = 0;
+	c->player = _local_player;
+	c->next = NULL;
+	c->tile = tile;
+	c->p1 = p1;
+	c->p2 = p2;
+	c->cmd = cmd;
+	c->callback = 0;

-	while (c.callback < _callback_table_count && _callback_table[c.callback] != callback)
-		c.callback++;
-	if (c.callback == _callback_table_count) {
+	temp_callback = 0;
+
+	while (temp_callback < _callback_table_count && _callback_table[temp_callback] != callback)
+		temp_callback++;
+	if (temp_callback == _callback_table_count) {
 		DEBUG(net, 0) ("[NET] Unknown callback. (Pointer: %p) No callback sent.", callback);
-		c.callback = 0; /* _callback_table[0] == NULL */
+		temp_callback = 0; /* _callback_table[0] == NULL */
 	}

-	ttd_strlcpy(c.text, (_cmd_text != NULL) ? _cmd_text : "", lengthof(c.text));
+	if (_network_server) {
+		// We are the server, so set the command to be executed next possible frame
+		c->frame = _frame_counter_max + 1;
+	} else {
+		c->frame = 0; // The client can't tell which frame, so just make it 0
+	}
+
+	ttd_strlcpy(c->text, (_cmd_text != NULL) ? _cmd_text : "", lengthof(c->text));

 	if (_network_server) {
 		// If we are the server, we queue the command in our 'special' queue.
@@ -454,38 +464,30 @@ void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, Comma
 		//   client on the server can do everything 1 tick faster than others.
 		//   So to keep the game fair, we delay the command with 1 tick
 		//   which gives about the same speed as most clients.
-		// Only the server gets the callback, because clients should not get them
-
-		// We are the server, so set the command to be executed next possible frame
-
 		NetworkClientState *cs;
-		CommandPacket *new_cp = malloc(sizeof(CommandPacket));

-		c.frame = _frame_counter_max + 1;
-		*new_cp = c;
+		// And we queue it for delivery to the clients
+		FOR_ALL_CLIENTS(cs) {
+			if (cs->status > STATUS_AUTH) NetworkAddCommandQueue(cs, c);
+		}

+		// Only the server gets the callback, because clients should not get them
+		c->callback = temp_callback;
 		if (_local_command_queue == NULL) {
-			_local_command_queue = new_cp;
+			_local_command_queue = c;
 		} else {
 			// Find last packet
 			CommandPacket *cp = _local_command_queue;
 			while (cp->next != NULL) cp = cp->next;
-			cp->next = new_cp;
-		}
-
-		c.callback = 0;
-
-		// And we queue it for delivery to the clients
-		FOR_ALL_CLIENTS(cs) {
-			if (cs->status > STATUS_AUTH) NetworkAddCommandQueue(cs, &c);
+			cp->next = c;
 		}

 		return;
 	}

 	// Clients send their command to the server and forget all about the packet
-	c.frame = 0;
-	SEND_COMMAND(PACKET_CLIENT_COMMAND)(&c);
+	c->callback = temp_callback;
+	SEND_COMMAND(PACKET_CLIENT_COMMAND)(c);
 }

 // Execute a DoCommand we received from the network
--- a/network_gui.c
+++ b/network_gui.c
@@ -731,6 +731,7 @@ static void NetworkStartServerWindowWndProc(Window *w, WindowEvent *e)
 			if (HandleEditBoxKey(w, &WP(w, network_ql_d).q, 3, e) == 1) break; // enter pressed

 			ttd_strlcpy(_network_server_name, WP(w, network_ql_d).q.text.buf, sizeof(_network_server_name));
+			UpdateTextBufferSize(&WP(w, network_ql_d).q.text);
 		}
 		break;

@@ -1032,8 +1033,7 @@ enum {

 static const Widget _client_list_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                 STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   237,     0,    13, STR_NETWORK_CLIENT_LIST,  STR_018C_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,   RESIZE_NONE,    14,   238,   249,     0,    13, STR_NULL,                 STR_STICKY_BUTTON},
+{    WWT_CAPTION,   RESIZE_NONE,    14,    11,   249,     0,    13, STR_NETWORK_CLIENT_LIST,  STR_018C_WINDOW_TITLE_DRAG_THIS},

 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   249,    14,    14 + CLNWND_ROWSIZE + 1, 0x0, STR_NULL},
 {   WIDGETS_END},
@@ -1047,7 +1047,7 @@ static const Widget _client_list_popup_widgets[] = {
 static WindowDesc _client_list_desc = {
 	WDP_AUTO, WDP_AUTO, 250, 1,
 	WC_CLIENT_LIST,0,
-	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_client_list_widgets,
 	ClientListWndProc
 };
@@ -1143,7 +1143,7 @@ static bool CheckClientListHeight(Window *w)
 	if (w->height != CLNWND_OFFSET + num + 1) {
 		// XXX - magic unfortunately; (num + 2) has to be one bigger than heigh (num + 1)
 		SetWindowDirty(w);
-		w->widget[3].bottom = w->widget[3].top + num + 2;
+		w->widget[2].bottom = w->widget[2].top + num + 2;
 		w->height = CLNWND_OFFSET + num + 1;
 		SetWindowDirty(w);
 		return false;
@@ -1479,7 +1479,7 @@ void ShowJoinStatusWindowAfterJoin(void)
 	AllocateWindowDesc(&_network_join_status_window_desc);
 }

-static void SendChat(const char *buf, DestType type, int dest)
+static void SendChat(const char *buf, DestType type, byte dest)
 {
 	if (buf[0] == '\0') return;
 	if (!_network_server) {
@@ -1543,7 +1543,7 @@ static char *ChatTabCompletionFindText(char *buf)
 static void ChatTabCompletion(Window *w)
 {
 	static char _chat_tab_completion_buf[lengthof(_edit_str_buf)];
-	Textbuf *tb = &WP(w, chatquerystr_d).text;
+	Textbuf *tb = &WP(w, querystr_d).text;
 	uint len, tb_len;
 	uint item;
 	char *tb_buf, *pre_buf;
@@ -1601,7 +1601,7 @@ static void ChatTabCompletion(Window *w)
 			}

 			/* Update the textbuffer */
-			UpdateTextBufferSize(&WP(w, chatquerystr_d).text);
+			UpdateTextBufferSize(&WP(w, querystr_d).text);

 			SetWindowDirty(w);
 			free(pre_buf);
@@ -1615,17 +1615,17 @@ static void ChatTabCompletion(Window *w)
 		_chat_tab_completion_active = false;

 		/* Update the textbuffer */
-		UpdateTextBufferSize(&WP(w, chatquerystr_d).text);
+		UpdateTextBufferSize(&WP(w, querystr_d).text);

 		SetWindowDirty(w);
 	}
 	free(pre_buf);
 }

-/*
- * uses chatquerystr_d WP macro
- * uses chatquerystr_d->caption to store type of chat message (Private/Team/All)
- */
+/* uses querystr_d WP macro
+ * uses querystr_d->caption to store
+ * - type of chat message (Private/Team/All) in bytes 0-7
+ * - destination of chat message in the case of Team/Private in bytes 8-15 */
 static void ChatWindowWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
@@ -1644,8 +1644,8 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e)

 		DrawWindowWidgets(w);

-		assert(WP(w, chatquerystr_d).caption < lengthof(chat_captions));
-		msg = chat_captions[WP(w, chatquerystr_d).caption];
+		assert(GB(WP(w, querystr_d).caption, 0, 8) < lengthof(chat_captions));
+		msg = chat_captions[GB(WP(w, querystr_d).caption, 0, 8)];
 		DrawStringRightAligned(w->widget[2].left - 2, w->widget[2].top + 1, msg, 16);
 		DrawEditBox(w, &WP(w, querystr_d), 2);
 	} break;
@@ -1653,9 +1653,9 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e)
 	case WE_CLICK:
 		switch (e->we.click.widget) {
 			case 3: { /* Send */
-				DestType type = (DestType)WP(w, chatquerystr_d).caption;
-				int dest = WP(w, chatquerystr_d).dest;
-				SendChat(WP(w, chatquerystr_d).text.buf, type, dest);
+				DestType type = GB(WP(w, querystr_d).caption, 0, 8);
+				byte dest = GB(WP(w, querystr_d).caption, 8, 8);
+				SendChat(WP(w, querystr_d).text.buf, type, dest);
 			} /* FALLTHROUGH */
 			case 0: /* Cancel */ DeleteWindow(w); break;
 		}
@@ -1672,9 +1672,9 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e)
 			_chat_tab_completion_active = false;
 			switch (HandleEditBoxKey(w, &WP(w, querystr_d), 2, e)) {
 				case 1: { /* Return */
-				DestType type = (DestType)WP(w, chatquerystr_d).caption;
-				int dest = WP(w, chatquerystr_d).dest;
-				SendChat(WP(w, chatquerystr_d).text.buf, type, dest);
+				DestType type = GB(WP(w, querystr_d).caption, 0, 8);
+				byte dest = GB(WP(w, querystr_d).caption, 8, 8);
+				SendChat(WP(w, querystr_d).text.buf, type, dest);
 			} /* FALLTHROUGH */
 				case 2: /* Escape */ DeleteWindow(w); break;
 			}
@@ -1704,7 +1704,7 @@ static const WindowDesc _chat_window_desc = {
 	ChatWindowWndProc
 };

-void ShowNetworkChatQueryWindow(DestType type, int dest)
+void ShowNetworkChatQueryWindow(DestType type, byte dest)
 {
 	Window *w;

@@ -1716,12 +1716,11 @@ void ShowNetworkChatQueryWindow(DestType type, int dest)
 	w = AllocateWindowDesc(&_chat_window_desc);

 	LowerWindowWidget(w, 2);
-	WP(w, chatquerystr_d).caption   = type; // Misuse of caption
-	WP(w, chatquerystr_d).dest      = dest;
-	WP(w, chatquerystr_d).afilter   = CS_ALPHANUMERAL;
-	WP(w, chatquerystr_d).wnd_class = WC_MAIN_TOOLBAR;
-	WP(w, chatquerystr_d).wnd_num   = 0;
-	InitializeTextBuffer(&WP(w, chatquerystr_d).text, _edit_str_buf, lengthof(_edit_str_buf), 0);
+	WP(w,querystr_d).caption = GB(type, 0, 8) | (dest << 8); // Misuse of caption
+	WP(w,querystr_d).wnd_class = WC_MAIN_TOOLBAR;
+	WP(w,querystr_d).wnd_num = 0;
+	WP(w,querystr_d).afilter = CS_ALPHANUMERAL;
+	InitializeTextBuffer(&WP(w, querystr_d).text, _edit_str_buf, lengthof(_edit_str_buf), 0);
 }

 #endif /* ENABLE_NETWORK */
--- a/network_gui.h
+++ b/network_gui.h
@@ -9,7 +9,7 @@

 void ShowNetworkNeedPassword(NetworkPasswordType npt);
 void ShowNetworkGiveMoneyWindow(byte player); // PlayerID
-void ShowNetworkChatQueryWindow(DestType type, int dest);
+void ShowNetworkChatQueryWindow(DestType type, byte dest);
 void ShowJoinStatusWindowAfterJoin(void);
 void ShowNetworkGameWindow(void);
 void ShowClientList(void);
@@ -17,7 +17,7 @@ void ShowClientList(void);
 #else /* ENABLE_NETWORK */
 /* Network function stubs when networking is disabled */

-static inline void ShowNetworkChatQueryWindow(byte desttype, int dest) {}
+static inline void ShowNetworkChatQueryWindow(byte desttype, byte dest) {}
 static inline void ShowClientList(void) {}
 static inline void ShowJoinStatusWindowAfterJoin(void) {}
 static inline void ShowNetworkGameWindow(void) {}
--- a/network_server.c
+++ b/network_server.c
@@ -823,11 +823,6 @@ static bool CheckCommandFlags(const CommandPacket *cp, const NetworkClientInfo *
 		return false;
 	}

-	if (cp->cmd != CMD_PLAYER_CTRL && !IsValidPlayer(cp->player) && ci->client_index != NETWORK_SERVER_INDEX) {
-		IConsolePrintF(_icolour_err, "WARNING: spectator issueing command from client %d (IP: %s), kicking...", ci->client_index, GetPlayerIP(ci));
-		return false;
-	}
-
 	return true;
 }

@@ -840,7 +835,8 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
 	NetworkClientState *new_cs;
 	const NetworkClientInfo *ci;
 	byte callback;
-	CommandPacket *cp;
+
+	CommandPacket *cp = malloc(sizeof(CommandPacket));

 	// The client was never joined.. so this is impossible, right?
 	//  Ignore the packet, give the client a warning, and close his connection
@@ -849,7 +845,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
 		return;
 	}

-	cp = malloc(sizeof(CommandPacket));
 	cp->player = NetworkRecv_uint8(cs, p);
 	cp->cmd    = NetworkRecv_uint32(cs, p);
 	cp->p1     = NetworkRecv_uint32(cs, p);
@@ -859,10 +854,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)

 	callback = NetworkRecv_uint8(cs, p);

-	if (cs->has_quit) {
-		free(cp);
-		return;
-	}
+	if (cs->has_quit) return;

 	ci = DEREF_CLIENT_INFO(cs);

@@ -870,13 +862,11 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
 	if (!IsValidCommand(cp->cmd)) {
 		IConsolePrintF(_icolour_err, "WARNING: invalid command from client %d (IP: %s).", ci->client_index, GetPlayerIP(ci));
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_NOT_EXPECTED);
-		free(cp);
 		return;
 	}

 	if (!CheckCommandFlags(cp, ci)) {
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_KICKED);
-		free(cp);
 		return;
 	}

@@ -888,7 +878,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
 		IConsolePrintF(_icolour_err, "WARNING: player %d (IP: %s) tried to execute a command as player %d, kicking...",
 		               ci->client_playas + 1, GetPlayerIP(ci), cp->player + 1);
 		SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_PLAYER_MISMATCH);
-		free(cp);
 		return;
 	}

@@ -900,7 +889,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
 	if (cp->cmd == CMD_PLAYER_CTRL) {
 		if (cp->p1 != 0) {
 			SEND_COMMAND(PACKET_SERVER_ERROR)(cs, NETWORK_ERROR_CHEATER);
-			free(cp);
 			return;
 		}

@@ -1131,7 +1119,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_CHAT)
 {
 	NetworkAction action = NetworkRecv_uint8(cs, p);
 	DestType desttype = NetworkRecv_uint8(cs, p);
-	int dest = NetworkRecv_uint16(cs, p);
+	int dest = NetworkRecv_uint8(cs, p);
 	char msg[MAX_TEXT_MSG_LEN];

 	NetworkRecv_string(cs, p, msg, MAX_TEXT_MSG_LEN);
--- a/newgrf.c
+++ b/newgrf.c
@@ -1626,7 +1626,6 @@ static const SpriteGroup* CreateGroupFromGroupID(byte feature, byte setid, byte

 	if (feature != _cur_grffile->spriteset_feature) {
 		grfmsg(GMS_WARN, "NewSpriteGroup(0x%02X:0x%02X): Sprite set feature 0x%02X does not match action feature 0x%02X, skipping.",
-				setid, type,
 				_cur_grffile->spriteset_feature, feature);
 		return NULL;
 	}
@@ -2097,73 +2096,79 @@ static void FeatureNewName(byte *buf, int len)

 		len -= (int)name_length;

-		DEBUG(grf, 8) ("FeatureNewName: %d <- %s", id, name);
+		if (name_length == 1) {
+			DEBUG(grf, 7) ("FeatureNewName: Can't add empty name");
+		} else if (name_length > 127) {
+			DEBUG(grf, 7) ("FeatureNewName: Too long a name (%d)", name_length);
+		} else {
+			DEBUG(grf, 8) ("FeatureNewName: %d <- %s", id, name);

-		switch (feature) {
-			case GSF_TRAIN:
-			case GSF_ROAD:
-			case GSF_SHIP:
-			case GSF_AIRCRAFT: {
-				if (id < TOTAL_NUM_ENGINES) {
-					StringID string = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_8000_KIRBY_PAUL_TANK_STEAM + id);
-					SetCustomEngineName(id, string);
-				} else {
-					AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, id);
+			switch (feature) {
+				case GSF_TRAIN:
+				case GSF_ROAD:
+				case GSF_SHIP:
+				case GSF_AIRCRAFT: {
+					if (id < TOTAL_NUM_ENGINES) {
+						StringID string = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_8000_KIRBY_PAUL_TANK_STEAM + id);
+						SetCustomEngineName(id, string);
+					} else {
+						AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, id);
+					}
+					break;
 				}
-				break;
-			}

-			default:
-				switch (GB(id, 8, 8)) {
-					case 0xC4: /* Station class name */
-						if (_cur_grffile->stations == NULL || _cur_grffile->stations[GB(id, 0, 8)] == NULL) {
-							grfmsg(GMS_WARN, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring.", GB(id, 0, 8));
-						} else {
-							StationClassID sclass = _cur_grffile->stations[GB(id, 0, 8)]->sclass;
-							SetStationClassName(sclass, AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED));
-						}
-						break;
+				default:
+					switch (GB(id, 8, 8)) {
+						case 0xC4: /* Station class name */
+							if (_cur_grffile->stations == NULL || _cur_grffile->stations[GB(id, 0, 8)] == NULL) {
+								grfmsg(GMS_WARN, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring.", GB(id, 0, 8));
+							} else {
+								StationClassID sclass = _cur_grffile->stations[GB(id, 0, 8)]->sclass;
+								SetStationClassName(sclass, AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED));
+							}
+							break;

-					case 0xC5: /* Station name */
-						if (_cur_grffile->stations == NULL || _cur_grffile->stations[GB(id, 0, 8)] == NULL) {
-							grfmsg(GMS_WARN, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring.", GB(id, 0, 8));
-						} else {
-							_cur_grffile->stations[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
-						}
-						break;
+						case 0xC5: /* Station name */
+							if (_cur_grffile->stations == NULL || _cur_grffile->stations[GB(id, 0, 8)] == NULL) {
+								grfmsg(GMS_WARN, "FeatureNewName: Attempt to name undefined station 0x%X, ignoring.", GB(id, 0, 8));
+							} else {
+								_cur_grffile->stations[GB(id, 0, 8)]->name = AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
+							}
+							break;

-					case 0xC9:
-					case 0xD0:
-					case 0xDC:
-						AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
-						break;
+						case 0xC9:
+						case 0xD0:
+						case 0xDC:
+							AddGRFString(_cur_grffile->grfid, id, lang, new_scheme, name, STR_UNDEFINED);
+							break;

-					default:
-						DEBUG(grf, 7) ("FeatureNewName: Unsupported ID (0x%04X)", id);
-						break;
-				}
-				break;
+						default:
+							DEBUG(grf, 7) ("FeatureNewName: Unsupported ID (0x%04X)", id);
+							break;
+					}
+					break;

 #if 0
-			case GSF_CANAL :
-			case GSF_BRIDGE :
-			case GSF_TOWNHOUSE :
-				AddGRFString(_cur_spriteid, id, lang, name);
-				switch (GB(id, 8,8)) {
-					case 0xC9: /* House name */
-					default:
-						DEBUG(grf, 7) ("FeatureNewName: Unsupported ID (0x%04X)", id);
-				}
-				break;
+				case GSF_CANAL :
+				case GSF_BRIDGE :
+				case GSF_TOWNHOUSE :
+					AddGRFString(_cur_spriteid, id, lang, name);
+					switch (GB(id, 8,8)) {
+						case 0xC9: /* House name */
+						default:
+							DEBUG(grf, 7) ("FeatureNewName: Unsupported ID (0x%04X)", id);
+					}
+					break;

-			case GSF_INDUSTRIES :
-			case 0x48 :   /* for generic strings */
-				AddGRFString(_cur_spriteid, id, lang, name);
-				break;
-			default :
-				DEBUG(grf,7) ("FeatureNewName: Unsupported feature (0x%02X)", feature);
-				break;
+				case GSF_INDUSTRIES :
+				case 0x48 :   /* for generic strings */
+					AddGRFString(_cur_spriteid, id, lang, name);
+					break;
+				default :
+					DEBUG(grf,7) ("FeatureNewName: Unsupported feature (0x%02X)", feature);
+					break;
 #endif
+			}
 		}
 	}
 }
@@ -3500,7 +3505,7 @@ static void ResetNewGRFData(void)
 	ResetPriceBaseMultipliers();

 	/* Reset the curencies array */
-	ResetCurrencies(false);
+	ResetCurrencies();

 	// Reset station classes
 	ResetStationClasses();
--- a/newgrf_engine.c
+++ b/newgrf_engine.c
@@ -290,8 +290,6 @@ static byte MapAircraftMovementState(const Vehicle *v)
 	const Station *st = GetStation(v->u.air.targetairport);
 	byte amdflag = GetAirportMovingData(st->airport_type, v->u.air.pos)->flag;

-	if (st->airport_tile == 0) return AMS_TTDP_FLIGHT_TO_TOWER;
-
 	switch (v->u.air.state) {
 		case HANGAR:
 			/* The international airport is a special case as helicopters can land in
--- a/newgrf_spritegroup.c
+++ b/newgrf_spritegroup.c
@@ -118,10 +118,10 @@ static inline usize EvalAdjust_ ## size(const DeterministicSpriteGroupAdjust *ad
 		case DSGA_OP_SMAX: return max(last_value, value); \
 		case DSGA_OP_UMIN: return min((usize)last_value, (usize)value); \
 		case DSGA_OP_UMAX: return max((usize)last_value, (usize)value); \
-		case DSGA_OP_SDIV: return value == 0 ? last_value : last_value / value; \
-		case DSGA_OP_SMOD: return value == 0 ? last_value : last_value % value; \
-		case DSGA_OP_UDIV: return value == 0 ? (usize)last_value : (usize)last_value / (usize)value; \
-		case DSGA_OP_UMOD: return value == 0 ? (usize)last_value : (usize)last_value % (usize)value; \
+		case DSGA_OP_SDIV: return last_value / value; \
+		case DSGA_OP_SMOD: return last_value % value; \
+		case DSGA_OP_UDIV: return (usize)last_value / (usize)value; \
+		case DSGA_OP_UMOD: return (usize)last_value % (usize)value; \
 		case DSGA_OP_MUL:  return last_value * value; \
 		case DSGA_OP_AND:  return last_value & value; \
 		case DSGA_OP_OR:   return last_value | value; \
--- a/newgrf_text.c
+++ b/newgrf_text.c
@@ -95,7 +95,7 @@ const iso_grf iso_codes[] = {
 	{"es_ES", GRFLX_SPANISH},
 	{"af_ZA", GRFLX_AFRIKAANS},
 	{"hr_HR", GRFLX_CROATIAN},
-	{"cs_CZ", GRFLX_CZECH},
+	{"cs_CS", GRFLX_CZECH},
 	{"ca_ES", GRFLX_CATALAN},
 	{"da_DA", GRFLX_DANISH},
 	{"nl_NL", GRFLX_DUTCH},
@@ -404,7 +404,7 @@ void SetCurrentGrfLangID(const char *iso_name)
 	for (i=0; i < lengthof(iso_codes); i++) {
 		if (strncmp(iso_codes[i].code, iso_name, strlen(iso_codes[i].code)) == 0) {
 			/* We found a match, so let's use it. */
-			ret = iso_codes[i].grfLangID;
+			ret = i;
 			break;
 		}
 	}
--- a/news_gui.c
+++ b/news_gui.c
@@ -602,7 +602,6 @@ static void DrawNewsString(int x, int y, uint16 color, const NewsItem *ni, uint
 	const char *ptr;
 	char *dest;
 	StringID str;
-	WChar c_last;

 	if (ni->display_mode == 3) {
 		str = _get_news_string_callback[ni->callback](ni);
@@ -616,21 +615,15 @@ static void DrawNewsString(int x, int y, uint16 color, const NewsItem *ni, uint
 	 * from it such as big fonts, etc. */
 	ptr  = buffer;
 	dest = buffer2;
-	c_last = '\0';
 	for (;;) {
 		WChar c = Utf8Consume(&ptr);
 		if (c == 0) break;
-		/* Make a space from a newline, but ignore multiple newlines */
-		if (c == '\n' && c_last != '\n') {
-			dest[0] = ' ';
-			dest++;
-		} else if (c == '\r') {
+		if (c == '\r') {
 			dest[0] = dest[1] = dest[2] = dest[3] = ' ';
 			dest += 4;
 		} else if (IsPrintable(c)) {
 			dest += Utf8Encode(dest, c);
 		}
-		c_last = c;
 	}

 	*dest = '\0';
--- a/npf.c
+++ b/npf.c
@@ -868,13 +868,7 @@ NPFFoundTargetData NPFRouteToDepotTrialError(TileIndex tile, Trackdir trackdir,

 void InitializeNPF(void)
 {
-	static bool first_init = true;
-	if (first_init) {
-		first_init = false;
-		init_AyStar(&_npf_aystar, NPFHash, NPF_HASH_SIZE);
-	} else {
-		AyStarMain_Clear(&_npf_aystar);
-	}
+	init_AyStar(&_npf_aystar, NPFHash, NPF_HASH_SIZE);
 	_npf_aystar.loops_per_tick = 0;
 	_npf_aystar.max_path_cost = 0;
 	//_npf_aystar.max_search_nodes = 0;
--- a/oldloader.c
+++ b/oldloader.c
@@ -19,7 +19,6 @@
 #include "network.h"
 #include "ai/ai.h"
 #include "date.h"
-#include "bridge_map.h"

 enum {
 	HEADER_SIZE = 49,
@@ -345,9 +344,6 @@ static void FixOldVehicles(void)
 	FOR_ALL_VEHICLES(v) {
 		Vehicle *u;

-		/* We haven't used this bit for stations for ages */
-		if (v->type == VEH_Road) CLRBIT(v->u.road.state, 2);
-
 		FOR_ALL_VEHICLES_FROM(u, v->index + 1) {
 			/* If a vehicle has the same orders, add the link to eachother
 			 * in both vehicles */
@@ -1515,7 +1511,6 @@ static bool LoadOldMain(LoadgameState *ls)

 	for (i = 0; i < OLD_MAP_SIZE; i ++) {
 		switch (GetTileType(i)) {
-			case MP_STATION: _m[i].m4 = 0; break; // We don't understand this grf mapping (yet)
 			case MP_RAILWAY:
 				/* We save presignals different from TTDPatch, convert them */
 				if (GetRailTileType(i) == RAIL_TILE_SIGNALS) {
--- a/openttd.c
+++ b/openttd.c
@@ -25,7 +25,6 @@
 #include "station_map.h"
 #include "town_map.h"
 #include "tunnel_map.h"
-#include "water_map.h"
 #include "vehicle.h"
 #include "viewport.h"
 #include "window.h"
@@ -420,11 +419,6 @@ int ttd_main(int argc, char *argv[])
 	if (startyear != INVALID_YEAR) _patches_newgame.starting_year = startyear;
 	if (generation_seed != GENERATE_NEW_SEED) _patches_newgame.generation_seed = generation_seed;

-	/* The width and height must be at least 1 pixel, this
-	 * way all internal drawing routines work correctly. */
-	if (_cur_resolution[0] == 0) _cur_resolution[0] = 1;
-	if (_cur_resolution[1] == 0) _cur_resolution[1] = 1;
-
 	if (_dedicated_forks && !dedicated) _dedicated_forks = false;

 	// enumerate language files
@@ -1248,8 +1242,8 @@ bool AfterLoadGame(void)
 	// If Load Scenario / New (Scenario) Game is used,
 	//  a player does not exist yet. So create one here.
 	// 1 exeption: network-games. Those can have 0 players
-	//   But this exeption is not true for non dedicated network_servers! */
-	if (!_players[0].is_active && (!_networking || (_networking && _network_server && !_network_dedicated)))
+	//   But this exeption is not true for network_servers!
+	if (!_players[0].is_active && (!_networking || (_networking && _network_server)))
 		DoStartupNewPlayer(false);

 	DoZoomInOutWindow(ZOOM_NONE, w); // update button status
@@ -1593,42 +1587,13 @@ bool AfterLoadGame(void)
 		SettingsDisableElrail(_patches.disable_elrails);
 	}

-	if (CheckSavegameVersion(41)) {
-		Vehicle *v;
-		FOR_ALL_VEHICLES(v) {
-			if (IsBridgeTile(v->tile) && IsBridgeRamp(v->tile) &&
-					(v->z_pos & (TILE_HEIGHT - 1)) == (TILE_HEIGHT - 1)) {
-				/* Under some circumstances the trains going up a ramp can be one
-				* pixel too low when they enter the bridge. This causes the train
-				* to "disappear" under the bridge, which causes the train to
-				* break into two pieces and crash slightly later.
-				*
-				* This "hack" will make the trains on those positions on the
-				* ramps run one pixel higher. This offset will be automatically
-				* "fixed" when it enters the bridge middle parts or when it
-				* drives down the ramp of the bridge.
-				*/
-				v->z_pos++;
-			}
-		}
-	}
-
 	/* Buoys do now store the owner of the previous water tile, which can never
 	 * be OWNER_NONE. So replace OWNER_NONE with OWNER_WATER. */
 	if (CheckSavegameVersion(46)) {
-		TileIndex t;
 		Station *st;
 		FOR_ALL_STATIONS(st) {
 			if (IsBuoy(st) && IsTileOwner(st->xy, OWNER_NONE)) SetTileOwner(st->xy, OWNER_WATER);
 		}
-
-		/* Locks/shiplifts in very old savegames had OWNER_WATER as owner */
-		for (t = 0; t < MapSize(); t++) {
-			if (IsTileType(t, MP_WATER) && GetWaterTileType(t) == WATER_LOCK &&
-					GetTileOwner(t) == OWNER_WATER) {
-				SetTileOwner(t, OWNER_NONE);
-			}
-		}
 	}

 	if (CheckSavegameVersion(7)) {
@@ -1646,13 +1611,6 @@ bool AfterLoadGame(void)
 		}
 	}

-	{
-		Vehicle *v;
-		FOR_ALL_VEHICLES(v) {
-			if (v->type == VEH_Road && v->u.road.state >= 250) SETBIT(v->u.road.state, 2);
-		}
-	}
-
 	return true;
 }

--- a/order_cmd.c
+++ b/order_cmd.c
@@ -463,8 +463,6 @@ static void RemoveSharedOrderVehicleList(Vehicle *v)
 {
 	WindowClass window_class;

-	assert(v->orders != NULL);
-
 	switch (v->type) {
 		default: NOT_REACHED();
 		case VEH_Train:    window_class = WC_TRAINS_LIST;   break;
@@ -1163,7 +1161,7 @@ void DeleteVehicleOrders(Vehicle *v)

 		/* If we are the only one left in the Shared Order Vehicle List,
 		 *  remove it, as we are no longer a Shared Order Vehicle */
-		if (u->prev_shared == NULL && u->next_shared == NULL && u->orders != NULL) RemoveSharedOrderVehicleList(u);
+		if (u->prev_shared == NULL && u->next_shared == NULL) RemoveSharedOrderVehicleList(u);

 		/* We only need to update this-one, because if there is a third
 		 *  vehicle which shares the same order-list, nothing will change. If
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,57 +1,3 @@
-openttd (0.5.3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat, 15 Sep 2007 13:30:00 +0100
-
-openttd (0.5.3~rc3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 30 Aug 2007 23:30:00 +0100
-
-openttd (0.5.3~rc2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Sat,  7 Jul 2007 20:05:00 +0100
-
-openttd (0.5.3~rc1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 28 Jun 2007 18:00:00 +0100
-
-openttd (0.5.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 29 May 2007 20:00:00 +0100
-
-openttd (0.5.2~rc1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 16 May 2007 23:35:39 +0100
-
-openttd (0.5.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 20 Apr 2007 21:45:32 +0100
-
-openttd (0.5.1~rc3-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Tue, 17 Apr 2007 22:00:46 +0100
-
-openttd (0.5.1~rc2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 23 Mar 2007 23:45:46 +0100
-
 openttd (0.5.1~rc1-1) unstable; urgency=low

  * New upstream release.
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -1,6 +1,6 @@
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.5.3"  ; Define application version
-!define INSTALLERVERSION 38 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPVERSION "0.5.1"  ; Define application version
+!define INSTALLERVERSION 29 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!

 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
@@ -81,7 +81,6 @@ Page custom ShowWarningsPage
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT DisableBack

 !insertmacro MUI_PAGE_FINISH
 !insertmacro MUI_UNPAGE_CONFIRM
@@ -355,30 +354,26 @@ NoCD:
 hasCD:
 FunctionEnd

-;----------------------------------------------------------------------------------
-; Disable the "Back" button on finish page if the installer is run on Win9x systems
-Function DisableBack
-	Call GetWindowsVersion
-	Pop $R0
-	StrCmp $R0 "win9x" 0 WinNT
-	!insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "Settings" "BackEnabled" "0"
-WinNT:
-	ClearErrors
-FunctionEnd
-
-;----------------------------------------------------------------------------------
-; Custom page function to show notices for running OpenTTD (only for win32 systems)
+;---------------------------------------------------------------------
+; Custom page function to show notices for running OpenTTD
 ; We have extracted this custom page as Notice in the .onInit function
 Function ShowWarningsPage
-	Call GetWindowsVersion
-	Pop $R0
-	; Don't show the UNICODE notice if the installer is run on Win9x systems
-	StrCmp $R0 "win9x" 0 WinNT
-	Abort
-WinNT:
 	!insertmacro MUI_HEADER_TEXT "Installation Complete" "Important notices for OpenTTD usage."
 	!insertmacro MUI_INSTALLOPTIONS_EXTRACT_AS "notice.ini" "Notice"
 	!insertmacro MUI_INSTALLOPTIONS_INITDIALOG "Notice"
+
+	Call GetWindowsVersion
+	Pop $R0
+
+	; Hide the MSLU text if the installer is not run on Win9x systems
+	StrCmp $R0 "winnt" 0 Win9x
+	!insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 1" "HWND" ; MSLU groupbox
+	ShowWindow $R1 0
+	!insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 2" "HWND" ; MSLU text
+	ShowWindow $R1 0
+	!insertmacro MUI_INSTALLOPTIONS_READ $R1 "Notice" "Field 3" "HWND" ; MSLU link
+	ShowWindow $R1 0
+Win9x:
 	ClearErrors
 	!insertmacro MUI_INSTALLOPTIONS_SHOW
 FunctionEnd
--- a/os/win32/installer/notice.ini
+++ b/os/win32/installer/notice.ini
@@ -1,17 +1,41 @@
 ; Ini file generated by the HM NIS Edit IO designer.
 [Settings]
-NumFields=3
-CancelEnabled=0
+NumFields=6

 [Field 1]
 Type=Groupbox
+Text=Notice for Windows 9x/ME users!
+Left=8
+Right=292
+Top=80
+Bottom=138
+
+[Field 2]
+Type=Label
+Text=OpenTTD will not work without the Microsoft Layer for Unicode installed.\r\nDue to licensing issues we cannot bundle this file with the installer. Please download MSLU from the Microsoft website and extract UnicoWS.dll to the same directory as the openttd executabe.
+Left=13
+Right=284
+Top=91
+Bottom=127
+
+[Field 3]
+Type=Link
+Text=Microsoft Layer for Unicode
+State=http://www.microsoft.com/downloads/details.aspx?FamilyId=73BA7BD7-ED06-4F0D-80A4-2A7EEAEE17E2&displaylang=en
+Left=197
+Right=284
+Top=127
+Bottom=135
+
+[Field 4]
+Type=Groupbox
 Text=UNICODE support
 Left=8
 Right=292
 Top=0
 Bottom=75

-[Field 2]
+[Field 5]
 Type=Label
 Text=This version of OpenTTD has support for UNICODE, allowing users to use non-ASCII character sets such as Russian or Japanese.\r\nSelecting such a language will result in an unusable and garbled interface. You will need to specify a font that has support for these characters in openttd.cfg, or alternatively use an appropiate grf file.\r\n\r\nFor more information please refer to the readme or the wiki.
 Left=13
@@ -19,7 +43,7 @@ Right=284
 Top=9
 Bottom=65

-[Field 3]
+[Field 6]
 Type=Link
 Text=OpenTTD wiki
 Left=238
--- a/os2.c
+++ b/os2.c
@@ -1,4 +1,5 @@
 /* $Id$ */
+
 #include "stdafx.h"
 #include "openttd.h"
 #include "variables.h"
@@ -40,8 +41,6 @@ void FiosGetDrives(void)
 	_dos_getdrive(&save); // save original drive
 #else
 	save = _getdrive(); // save original drive
-	char wd[MAX_PATH];
-	getcwd(wd, MAX_PATH);
 	total = 'z';
 #endif

@@ -53,7 +52,7 @@ void FiosGetDrives(void)
 	for (disk = 'A';; disk++) {
 		_chdrive(disk);
 #endif
-		if (disk >= total)  break;
+		if (disk >= total) return;

 #ifndef __INNOTEK_LIBC__
 		_dos_getdrive(&disk2);
@@ -78,9 +77,8 @@ void FiosGetDrives(void)
 #ifndef __INNOTEK_LIBC__
 	_dos_setdrive(save, &total);
 #else
-	chdir(wd);
+	_chdrive(save);
 #endif
-
 }

 bool FiosGetDiskFreeSpace(const char *path, uint32 *tot)
@@ -116,7 +114,6 @@ bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb
 	char filename[MAX_PATH];

 	snprintf(filename, lengthof(filename), "%s" PATHSEP "%s", path, ent->d_name);
-
 	return stat(filename, sb) == 0;
 }

@@ -137,7 +134,7 @@ static void ChangeWorkingDirectory(char *exe)
 	}
 }

-void ShowInfo(const char *str)
+void ShowInfo(const unsigned char *str)
 {
 	HAB hab;
 	HMQ hmq;
@@ -196,12 +193,11 @@ void DeterminePaths(void)
 	{
 		const char *homedir = getenv("HOME");

-#ifndef __KLIBC__
 		if (homedir == NULL) {
 			const struct passwd *pw = getpwuid(getuid());
 			if (pw != NULL) homedir = pw->pw_dir;
 		}
-#endif
+
 		_paths.personal_dir = str_fmt("%s" PATHSEP "%s", homedir, PERSONAL_DIR);
 	}

@@ -213,7 +209,6 @@ void DeterminePaths(void)
 	// check if absolute or relative path
 	s = strchr(_paths.personal_dir, PATHSEPCHAR);

-#ifndef __KLIBC__
 	// add absolute path
 	if (s == NULL || _paths.personal_dir != s) {
 		getcwd(_paths.personal_dir, MAX_PATH);
@@ -221,15 +216,14 @@ void DeterminePaths(void)
 		*s++ = PATHSEPCHAR;
 		ttd_strlcpy(s, PERSONAL_DIR, MAX_PATH);
 	}
-#endif
+
 #endif /* defined(USE_HOMEDIR) */

 	s = strchr(_paths.personal_dir, 0);

-#ifndef __KLIBC__
 	// append a / ?
 	if (s[-1] != PATHSEPCHAR) strcpy(s, PATHSEP);
-#endif
+
 	_paths.save_dir = str_fmt("%ssave", _paths.personal_dir);
 	_paths.autosave_dir = str_fmt("%s" PATHSEP "autosave", _paths.save_dir);
 	_paths.scenario_dir = str_fmt("%sscenario", _paths.personal_dir);
--- a/ottdres.rc
+++ b/ottdres.rc
@@ -65,8 +65,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,2,0
- PRODUCTVERSION 0,5,2,0
+ FILEVERSION 0,5,0,0
+ PRODUCTVERSION 0,5,0,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -84,14 +84,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", "0.5.3\0"
+            VALUE "FileVersion", "0.5.1-RC1\0"
            VALUE "InternalName", "openttd\0"
            VALUE "LegalCopyright", "Copyright <20> OpenTTD Developers 2002-2007. All Rights Reserved.\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "openttd.exe\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "OpenTTD\0"
-            VALUE "ProductVersion", "0.5.3.0\0"
+            VALUE "ProductVersion", "0.0.0.0\0"
            VALUE "SpecialBuild", "-\0"
        END
    END
--- a/pathfind.c
+++ b/pathfind.c
@@ -251,13 +251,31 @@ const byte _ffb_64[128] = {
 48, 56, 56, 58, 56, 60, 60, 62,
 };

-static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction);
-
-/** Most code of the "Normal" case of TPF Mode 1; for signals special tricks
- * have to be done, but those happen in TPFMode1; this is just to prevent
- * gotos ;). */
-static inline void TPFMode1_NormalCase(TrackPathFinder* tpf, TileIndex tile, TileIndex tile_org, DiagDirection direction)
+static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
 {
+	uint bits;
+	int i;
+	RememberData rd;
+	TileIndex tile_org = tile;
+
+	// check if the old tile can be left at that direction
+	if (tpf->tracktype == TRANSPORT_ROAD) {
+		// road stops and depots now have a track (r4419)
+		// don't enter road stop from the back
+		if (IsRoadStopTile(tile) && GetRoadStopDir(tile) != direction) return;
+		// don't enter road depot from the back
+		if (IsTileDepotType(tile, TRANSPORT_ROAD) && GetRoadDepotDirection(tile) != direction) return;
+	}
+
+	if (IsTunnelTile(tile)) {
+		if (GetTunnelDirection(tile) != direction ||
+				GetTunnelTransportType(tile) != tpf->tracktype) {
+			return;
+		}
+		tile = SkipToEndOfTunnel(tpf, tile, direction);
+	}
+	tile += TileOffsByDiagDir(direction);
+
 	/* Check in case of rail if the owner is the same */
 	if (tpf->tracktype == TRANSPORT_RAIL) {
 		// don't enter train depot from the back
@@ -284,46 +302,11 @@ static inline void TPFMode1_NormalCase(TrackPathFinder* tpf, TileIndex tile, Til
 	/* Check if the new tile is a tunnel or bridge head and that the direction
 	 * and transport type match */
 	if (IsTileType(tile, MP_TUNNELBRIDGE) && IsTunnel(tile)) {
-		if (GetTunnelTransportType(tile) != tpf->tracktype) {
-			return;
-		}
-		/* Only skip through the tunnel if heading inwards. We can
-		 * be headed outwards if our starting position was in a
-		 * tunnel and we're pathfinding backwards */
-		if (GetTunnelDirection(tile) == direction) {
-			tile = SkipToEndOfTunnel(tpf, tile, direction);
-		} else if (GetTunnelDirection(tile) != ReverseDiagDir(direction)) {
-			/* We don't support moving through the sides of a tunnel
-			 * entrance :-) */
-			return;
-		}
-	}
-}
-
-static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection direction)
-{
-	uint bits;
-	int i;
-	RememberData rd;
-	TileIndex tile_org = tile;
-
-	// check if the old tile can be left at that direction
-	if (tpf->tracktype == TRANSPORT_ROAD) {
-		// road stops and depots now have a track (r4419)
-		// don't enter road stop from the back
-		if (IsRoadStopTile(tile) && GetRoadStopDir(tile) != direction) return;
-		// don't enter road depot from the back
-		if (IsTileDepotType(tile, TRANSPORT_ROAD) && GetRoadDepotDirection(tile) != direction) return;
-	}
-
-	if (IsTunnelTile(tile)) {
 		if (GetTunnelDirection(tile) != direction ||
 				GetTunnelTransportType(tile) != tpf->tracktype) {
 			return;
 		}
-		tile = SkipToEndOfTunnel(tpf, tile, direction);
 	}
-	tile += TileOffsByDiagDir(direction);

 	tpf->rd.cur_length++;

@@ -353,8 +336,6 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
 		}
 	}

-	TPFMode1_NormalCase(tpf, tile, tile_org, direction);
-
 	/* the next is only used when signals are checked.
 	 * seems to go in 2 directions simultaneously */

--- a/player_gui.c
+++ b/player_gui.c
@@ -825,7 +825,7 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e)
 			break;

 		case WE_PLACE_OBJ:
-			if (DoCommandP(e->we.place.tile, 0, 0, NULL, CMD_BUILD_COMPANY_HQ | CMD_NO_WATER | CMD_MSG(STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS)))
+			if (DoCommandP(e->we.place.tile, 0, 0, NULL, CMD_BUILD_COMPANY_HQ | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS)))
 				ResetObjectToPlace();
 				w->widget[PCW_WIDGET_BUILD_VIEW_HQ].type = WWT_PUSHTXTBTN; // this button can now behave as a normal push button
 				RaiseWindowButtons(w);
--- a/players.c
+++ b/players.c
@@ -838,9 +838,7 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 		 * _local_player/_network_playas: what they play as
 		 * cid = requested company/player of joining client */
 		Player *p;
-#ifdef ENABLE_NETWORK
 		uint16 cid = p2; // ClientID
-#endif /* ENABLE_NETWORK */

 		/* This command is only executed in a multiplayer game */
 		if (!_networking) return CMD_ERROR;
@@ -863,16 +861,18 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 				NetworkClientInfo *ci = &_network_client_info[cid];
 				ci->client_playas = PLAYER_SPECTATOR;
 				NetworkUpdateClientInfo(ci->client_index);
-			} else if (_local_player == PLAYER_SPECTATOR) {
-				_network_playas = PLAYER_SPECTATOR;
-			}
+			} else
 #endif /* ENABLE_NETWORK */
+			{
+				_network_playas = PLAYER_SPECTATOR;
+				SetLocalPlayer(PLAYER_SPECTATOR);
+			}
 			break;
 		}

 		/* This is the joining client who wants a new company */
-		if (_local_player != _network_playas && _network_playas == p->index) {
-			assert(_local_player == PLAYER_SPECTATOR);
+		if (_local_player != _network_playas) {
+			assert(_local_player == PLAYER_SPECTATOR && _network_playas == p->index);
 			SetLocalPlayer(p->index);
 			MarkWholeScreenDirty();
 		}
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -187,7 +187,7 @@ uint GetRailFoundation(Slope tileh, TrackBits bits)
 static uint32 CheckRailSlope(Slope tileh, TrackBits rail_bits, TrackBits existing, TileIndex tile)
 {
 	if (IsSteepSlope(tileh)) {
-		if (_patches.build_on_slopes && existing == 0) {
+		if (existing == 0) {
 			TrackBits valid = TRACK_BIT_CROSS | (HASBIT(1 << SLOPE_STEEP_W | 1 << SLOPE_STEEP_E, tileh) ? TRACK_BIT_VERT : TRACK_BIT_HORZ);
 			if (valid & rail_bits) return _price.terraform;
 		}
@@ -201,17 +201,20 @@ static uint32 CheckRailSlope(Slope tileh, TrackBits rail_bits, TrackBits existin
 		}

 		// no special foundation
-		if ((~_valid_tileh_slopes[0][tileh] & rail_bits) == 0) {
+		if ((~_valid_tileh_slopes[0][tileh] & rail_bits) == 0)
 			return 0;
-		} else if (!_patches.build_on_slopes || _is_old_ai_player) {
-			return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
-		}

 		if ((~_valid_tileh_slopes[1][tileh] & rail_bits) == 0 || ( // whole tile is leveled up
 					(rail_bits == TRACK_BIT_X || rail_bits == TRACK_BIT_Y) &&
 					(tileh == SLOPE_W || tileh == SLOPE_S || tileh == SLOPE_E || tileh == SLOPE_N)
 				)) { // partly up
-			return (existing != 0) ? 0 : _price.terraform;
+			if (existing != 0) {
+				return 0;
+			} else if (!_patches.build_on_slopes || _is_old_ai_player) {
+				return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
+			} else {
+				return _price.terraform;
+			}
 		}
 	}
 	return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
@@ -269,7 +272,7 @@ int32 CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 		case MP_RAILWAY:
 			if (!CheckTrackCombination(tile, trackbit, flags) ||
-					!EnsureNoVehicleOnGround(tile)) {
+					!EnsureNoVehicle(tile)) {
 				return CMD_ERROR;
 			}
 			if (!IsTileOwner(tile, _current_player) ||
@@ -304,7 +307,7 @@ int32 CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 			}
 #undef M

-			if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
+			if (!EnsureNoVehicle(tile)) return CMD_ERROR;

 			if (GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
 				if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
@@ -381,7 +384,7 @@ int32 CmdRemoveSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 			if (!IsLevelCrossing(tile) ||
 					GetCrossingRailBits(tile) != trackbit ||
 					(_current_player != OWNER_WATER && !CheckTileOwnership(tile)) ||
-					!EnsureNoVehicleOnGround(tile)) {
+					!EnsureNoVehicle(tile)) {
 				return CMD_ERROR;
 			}

@@ -396,7 +399,7 @@ int32 CmdRemoveSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 			if (!IsPlainRailTile(tile) ||
 					(_current_player != OWNER_WATER && !CheckTileOwnership(tile)) ||
-					!EnsureNoVehicleOnGround(tile)) {
+					!EnsureNoVehicle(tile)) {
 				return CMD_ERROR;
 			}

@@ -651,7 +654,7 @@ int32 CmdBuildSingleSignal(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 	sigvar = HASBIT(p1, 3) ? SIG_SEMAPHORE : SIG_ELECTRIC;
 	pre_signal = HASBIT(p1, 3);

-	if (!ValParamTrackOrientation(track) || !IsTileType(tile, MP_RAILWAY) || !EnsureNoVehicleOnGround(tile))
+	if (!ValParamTrackOrientation(track) || !IsTileType(tile, MP_RAILWAY) || !EnsureNoVehicle(tile))
 		return CMD_ERROR;

 	/* Protect against invalid signal copying */
@@ -830,7 +833,7 @@ int32 CmdRemoveSingleSignal(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 	if (!ValParamTrackOrientation(track) ||
 			!IsTileType(tile, MP_RAILWAY) ||
-			!EnsureNoVehicleOnGround(tile) ||
+			!EnsureNoVehicle(tile) ||
 			!HasSignalOnTrack(tile, track)) {
 		return CMD_ERROR;
 	}
@@ -871,23 +874,14 @@ int32 CmdRemoveSignalTrack(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 typedef int32 DoConvertRailProc(TileIndex tile, RailType totype, bool exec);

-/**
- * Switches the rail type.
- * Railtypes are stored on a per-tile basis, not on a per-track basis, so
- * all the tracks in the given tile will be converted.
- * @param tile        The tile on which the railtype is to be convert.
- * @param totype      The railtype we want to convert to
- * @param exec        Switches between test and execute mode
- * @return            The cost and state of the operation
- * @retval CMD_ERROR  An error occured during the operation.
- */
 static int32 DoConvertRail(TileIndex tile, RailType totype, bool exec)
 {
 	if (!CheckTileOwnership(tile)) return CMD_ERROR;

-	if (GetRailType(tile) == totype) return CMD_ERROR;
+	if (!EnsureNoVehicle(tile) && (!IsCompatibleRail(GetRailType(tile), totype) || IsPlainRailTile(tile))) return CMD_ERROR;

-	if (!EnsureNoVehicleOnGround(tile) && (!IsCompatibleRail(GetRailType(tile), totype) || IsPlainRailTile(tile))) return CMD_ERROR;
+	// tile is already of requested type?
+	if (GetRailType(tile) == totype) return CMD_ERROR;

 	// 'hidden' elrails can't be downgraded to normal rail when elrails are disabled
 	if (_patches.disable_elrails && totype == RAILTYPE_RAIL && GetRailType(tile) == RAILTYPE_ELECTRIC) return CMD_ERROR;
@@ -990,7 +984,7 @@ static int32 RemoveTrainDepot(TileIndex tile, uint32 flags)
 	if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER)
 		return CMD_ERROR;

-	if (!EnsureNoVehicleOnGround(tile))
+	if (!EnsureNoVehicle(tile))
 		return CMD_ERROR;

 	if (flags & DC_EXEC) {
--- a/Show More
+++ b/Show More