(svn r9978) -Release 0.5.2.

(svn r9977) [0.5] -Prepare 0.5 branch for release of 0.5.2.
(svn r9968) [0.5] -Backport from trunk (r9966):
2026-07-16 07:39:52 +00:00 · 2007-05-29 18:13:06 +00:00 · 2007-05-29 18:02:14 +00:00 · 2007-05-28 22:11:42 +00:00 · 2007-05-17 19:47:04 +00:00 · 2007-05-17 15:04:28 +00:00
121 changed files with 5500 additions and 4005 deletions
@@ -268,14 +268,7 @@ ENDIAN_CHECK=endian_check$(EXE)
 STRGEN=strgen/strgen$(EXE)
 OSXAPP="OpenTTD.app"

-ifdef RELEASE
-REV:=$(RELEASE)
-else
-ifeq ($(shell if test -d .svn; then echo 1; fi), 1)
-REV_MODIFIED := $(shell svnversion . | sed -n 's/.*\(M\).*/\1/p' )
-REV := $(shell LC_ALL=C svn info | awk '/^URL:.*branch/ { BRANCH="-"a[split($$2, a, "/")] } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }')
-endif
-endif
+REV := 0.5.2

 # define flag to use for -lrt (some OSes overwrites this later for compatibility)
 ifndef LRT
@@ -949,36 +942,31 @@ lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt
 ifdef MORPHOS

 release: all
-	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha"
+	$(Q)rm -fr "/t/openttd-$(REV)-morphos.lha"
 	$(Q)mkdir -p "/t/"
-	$(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"
+	$(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"
 	@echo "Release archive can be found in RAM:t/ now."

 .PHONY: release
@@ -459,7 +459,10 @@ static Town *AiFindRandomTown(void)

 static Industry *AiFindRandomIndustry(void)
 {
-	return GetRandomIndustry();
+	int num = RandomRange(GetMaxIndustryIndex());
+	if (IsValidIndustry(GetIndustry(num))) return GetIndustry(num);
+
+	return NULL;
 }

 static void AiFindSubsidyIndustryRoute(FoundRoute *fr)
@@ -3835,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 = p->index;
+			_current_player = best_pl->index;
 			DoCommand(0, old_p, 0, DC_EXEC, CMD_BUY_COMPANY);
 			_current_player = old_p;
 		}
@@ -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,                   5 }, // 59 Accelerate to end of runway2
+	{  136,  152, AMED_EXACTPOS,                   1 }, // 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
@@ -1,3 +1,96 @@
+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: 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)
+- 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)
+
+
 0.5.0 (2007-02-27)
 ------------------------------------------------------------------------
 - Feature: Add the ability to load newer TTDP games (the tile information for coasts has changed) (r8738)
@@ -1294,7 +1387,6 @@

 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
@@ -1307,7 +1399,6 @@

 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
@@ -1368,7 +1459,6 @@

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

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

 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
@@ -1441,7 +1529,6 @@

 0.1.1 (2004-03-14)
 ------------------------------------------------------------------------
-
 - Preliminary presignal support
 - Added external MIDI driver for unix version (by robertnorris)
 - Added DirectMusic driver for Win32 version
@@ -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()) {
+	if (tile >= MapSize() || IsTileType(tile, MP_VOID)) {
 		_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()) {
+	if (tile >= MapSize() || IsTileType(tile, MP_VOID)) {
 		_cmd_text = NULL;
 		return false;
 	}
@@ -529,6 +529,7 @@ DEF_CONSOLE_CMD(ConStatus)
 {
 	static const char* const stat_str[] = {
 		"inactive",
+		"authorizing",
 		"authorized",
 		"waiting",
 		"loading map",
@@ -1215,16 +1216,20 @@ 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)",
-			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]);
+		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" : "");
 	}

 	return true;
@@ -1401,6 +1406,19 @@ 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;
@@ -1481,6 +1499,7 @@ void IConsoleStdLibRegister(void)
 	IConsoleCmdRegister("pwd",          ConPrintWorkingDirectory);
 	IConsoleCmdRegister("clear",        ConClearBuffer);
 	IConsoleCmdRegister("patch",        ConPatch);
+	IConsoleCmdRegister("list_patches", ConListPatches);

 	IConsoleAliasRegister("dir",      "ls");
 	IConsoleAliasRegister("del",      "rm %+");
@@ -153,12 +153,17 @@ void CheckSwitchToEuro(void)
 }

 /**
- * Called only from newgrf.c.  Will fill _currency_specs array with
+ * Will fill _currency_specs array with
 * default values from origin_currency_specs
- **/
-void ResetCurrencies(void)
+ * 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)
 {
-	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs));
+	memcpy(&_currency_specs, &origin_currency_specs, sizeof(origin_currency_specs) - (preserve_custom ? sizeof(_custom_currency) : 0));
 }

 /**
@@ -168,7 +173,7 @@ void ResetCurrencies(void)
 StringID* BuildCurrencyDropdown(void)
 {
 	/* Allow room for all currencies, plus a terminator entry */
-	static StringID names[CUSTOM_CURRENCY_ID];
+	static StringID names[NUM_CURRENCY + 1];
 	uint i;

 	/* Add each name */
@@ -38,7 +38,7 @@ extern CurrencySpec _currency_specs[NUM_CURRENCY];

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

@@ -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, _ctrl_pressed, CcBuildCanal, CMD_BUILD_CANAL | CMD_AUTO | 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;
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd February 27, 2007
+.Dd May 29, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
@@ -246,6 +246,41 @@ 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
@@ -338,30 +373,46 @@ 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();
 }

+static void ChangeNetworkOwner(PlayerID current_player, PlayerID new_player)
+{
+#ifdef ENABLE_NETWORK
+	NetworkClientState *cs;
+	NetworkClientInfo *ci;
+	if (!_networking) return;
+
+	if (current_player == _local_player) {
+		_network_playas = new_player;
+		SetLocalPlayer(new_player);
+	}
+
+	if (!_network_server) return;
+
+	/* The server has to handle all administrative issues, for example
+	* updating and notifying all clients of what has happened */
+	ci = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX);
+
+	/* The server has just changed from player */
+	if (current_player == ci->client_playas) {
+		ci->client_playas = new_player;
+		NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
+	}
+
+	/* Find all clients that were in control of this company, and mark them as new_player */
+	FOR_ALL_CLIENTS(cs) {
+		ci = DEREF_CLIENT_INFO(cs);
+		if (current_player == ci->client_playas) {
+			ci->client_playas = new_player;
+			NetworkUpdateClientInfo(ci->client_index);
+		}
+	}
+#endif /* ENABLE_NETWORK */
+}
+
 static void PlayersCheckBankrupt(Player *p)
 {
 	PlayerID owner;
@@ -419,35 +470,9 @@ static void PlayersCheckBankrupt(Player *p)
 					p->bankrupt_asked = 0xFF;
 					p->bankrupt_timeout = 0x456;
 					break;
-				} else if (owner == _local_player) {
-					_network_playas = PLAYER_SPECTATOR;
-					SetLocalPlayer(PLAYER_SPECTATOR);
 				}

-#ifdef ENABLE_NETWORK
-				/* The server has to handle all administrative issues, for example
-				 * updating and notifying all clients of what has happened */
-				if (_network_server) {
-					const NetworkClientState *cs;
-					NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX);
-
-					/* The server has just gone belly-up, mark it as spectator */
-					if (owner == ci->client_playas) {
-						ci->client_playas = PLAYER_SPECTATOR;
-						NetworkUpdateClientInfo(NETWORK_SERVER_INDEX);
-					}
-
-					/* Find all clients that were in control of this company,
-					 * and mark them as spectator; broadcast this message to everyone */
-					FOR_ALL_CLIENTS(cs) {
-						ci = DEREF_CLIENT_INFO(cs);
-						if (ci->client_playas == owner) {
-							ci->client_playas = PLAYER_SPECTATOR;
-							NetworkUpdateClientInfo(ci->client_index);
-						}
-					}
-				}
-#endif /* ENABLE_NETWORK */
+				ChangeNetworkOwner(owner, PLAYER_SPECTATOR);
 			}

 			/* Remove the player */
@@ -1572,6 +1597,7 @@ static void DoAcquireCompany(Player *p)

 	// original code does this a little bit differently
 	pi = p->index;
+	ChangeNetworkOwner(pi, _current_player);
 	ChangeOwnershipOfPlayerItems(pi, _current_player);

 	if (p->bankrupt_value == 0) {
@@ -1685,12 +1711,16 @@ 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((PlayerID)p1) || _networking) return CMD_ERROR;
+	if (!IsValidPlayer(pid) || _networking) return CMD_ERROR;
+
+	/* Do not allow players to take over themselves */
+	if (pid == _current_player) return CMD_ERROR;

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

 	if (!p->is_ai) return CMD_ERROR;

@@ -133,7 +133,7 @@ static void AdjustTileh(TileIndex tile, Slope *tileh)
 {
 	if (IsTileType(tile, MP_TUNNELBRIDGE)) {
 		if (IsTunnel(tile)) {
-			*tileh = SLOPE_FLAT;
+			*tileh = SLOPE_STEEP; /* XXX - Hack to make tunnel entrances to always have a pylon */
 		} else {
 			if (IsBridgeRamp(tile)) {
 				if (*tileh != SLOPE_FLAT) {
@@ -294,12 +294,24 @@ static void DrawCatenaryRailway(const TileInfo *ti)
 	/* Drawing of pylons is finished, now draw the wires */
 	for (t = 0; t < TRACK_END; t++) {
 		if (HASBIT(trackconfig[TS_HOME], t)) {
+			byte PCPconfig;
+			const SortableSpriteStruct *sss;
+			int tileh_selector;

-			byte PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
+			if (IsTunnelTile(ti->tile)) {
+				const SortableSpriteStruct* sss = &CatenarySpriteData_Tunnel[GetTunnelDirection(ti->tile)];
+
+				AddSortableSpriteToDraw(
+					sss->image, ti->x + sss->x_offset, ti->y + sss->y_offset,
+					sss->x_size, sss->y_size, sss->z_size,
+					GetTileZ(ti->tile) + sss->z_offset
+				);
+				break;
+			}
+			PCPconfig = HASBIT(PCPstatus, PCPpositions[t][0]) +
 				(HASBIT(PCPstatus, PCPpositions[t][1]) << 1);

-			const SortableSpriteStruct *sss;
-			int tileh_selector = !(tileh[TS_HOME] % 3) * tileh[TS_HOME] / 3; /* tileh for the slopes, 0 otherwise */
+			tileh_selector = !(tileh[TS_HOME] % 3) * tileh[TS_HOME] / 3; /* tileh for the slopes, 0 otherwise */

 			assert(PCPconfig != 0); /* We have a pylon on neither end of the wire, that doesn't work (since we have no sprites for that) */
 			assert(!IsSteepSlope(tileh[TS_HOME]));
@@ -367,7 +379,7 @@ void DrawCatenary(const TileInfo *ti)

 	switch (GetTileType(ti->tile)) {
 		case MP_RAILWAY:
-			if (IsRailDepot(ti->tile)) {
+			if ( IsRailDepot(ti->tile)) {
 				const SortableSpriteStruct* sss = &CatenarySpriteData_Depot[GetRailDepotDirection(ti->tile)];

 				AddSortableSpriteToDraw(
@@ -332,15 +332,7 @@ static void NewVehicleAvailable(Engine *e)
 		}
 	}

-	if (index < NUM_TRAIN_ENGINES) {
-		AddNewsItem(index, NEWS_FLAGS(NM_CALLBACK, 0, NT_NEW_VEHICLES, DNC_TRAINAVAIL), 0, 0);
-	} else if (index < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES) {
-		AddNewsItem(index, NEWS_FLAGS(NM_CALLBACK, 0, NT_NEW_VEHICLES, DNC_ROADAVAIL), 0, 0);
-	} else if (index < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES) {
-		AddNewsItem(index, NEWS_FLAGS(NM_CALLBACK, 0, NT_NEW_VEHICLES, DNC_SHIPAVAIL), 0, 0);
-	} else {
-		AddNewsItem(index, NEWS_FLAGS(NM_CALLBACK, 0, NT_NEW_VEHICLES, DNC_AIRCRAFTAVAIL), 0, 0);
-	}
+	AddNewsItem(index, NEWS_FLAGS(NM_CALLBACK, 0, NT_NEW_VEHICLES, DNC_VEHICLEAVAIL), 0, 0);
 }

 void EnginesMonthlyLoop(void)
@@ -422,6 +414,12 @@ 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;
 }

@@ -14,26 +14,25 @@
 #include "news.h"
 #include "variables.h"
 #include "newgrf_engine.h"
+#include "vehicle.h"


 static StringID GetEngineCategoryName(EngineID engine)
 {
-	if (engine < NUM_TRAIN_ENGINES) {
-		switch (GetEngine(engine)->railtype) {
-			case RAILTYPE_RAIL:     return STR_8102_RAILROAD_LOCOMOTIVE;
-			case RAILTYPE_ELECTRIC: return STR_8102_RAILROAD_LOCOMOTIVE;
-			case RAILTYPE_MONO:     return STR_8106_MONORAIL_LOCOMOTIVE;
-			case RAILTYPE_MAGLEV:   return STR_8107_MAGLEV_LOCOMOTIVE;
-		}
+	switch (GetEngine(engine)->type) {
+		default: NOT_REACHED();
+		case VEH_Road:              return STR_8103_ROAD_VEHICLE;
+		case VEH_Aircraft:          return STR_8104_AIRCRAFT;
+		case VEH_Ship:              return STR_8105_SHIP;
+		case VEH_Train:
+			switch (GetEngine(engine)->railtype) {
+				default: NOT_REACHED();
+				case RAILTYPE_RAIL:     return STR_8102_RAILROAD_LOCOMOTIVE;
+				case RAILTYPE_ELECTRIC: return STR_8102_RAILROAD_LOCOMOTIVE;
+				case RAILTYPE_MONO:     return STR_8106_MONORAIL_LOCOMOTIVE;
+				case RAILTYPE_MAGLEV:   return STR_8107_MAGLEV_LOCOMOTIVE;
+			}
 	}
-
-	if (engine < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES)
-		return STR_8103_ROAD_VEHICLE;
-
-	if (engine < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES)
-		return STR_8105_SHIP;
-
-	return STR_8104_AIRCRAFT;
 }

 static const Widget _engine_preview_widgets[] = {
@@ -59,10 +58,10 @@ static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw);
 static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw);

 static const DrawEngineInfo _draw_engine_list[4] = {
-	{DrawTrainEngine,DrawTrainEngineInfo},
-	{DrawRoadVehEngine,DrawRoadVehEngineInfo},
-	{DrawShipEngine,DrawShipEngineInfo},
-	{DrawAircraftEngine,DrawAircraftEngineInfo},
+	{ DrawTrainEngine,    DrawTrainEngineInfo    },
+	{ DrawRoadVehEngine,  DrawRoadVehEngineInfo  },
+	{ DrawShipEngine,     DrawShipEngineInfo     },
+	{ DrawAircraftEngine, DrawAircraftEngineInfo },
 };

 static void EnginePreviewWndProc(Window *w, WindowEvent *e)
@@ -80,10 +79,7 @@ static void EnginePreviewWndProc(Window *w, WindowEvent *e)

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

-		(dei = _draw_engine_list,engine < NUM_TRAIN_ENGINES) ||
-		(dei++,engine < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES) ||
-		(dei++,engine < NUM_TRAIN_ENGINES + NUM_ROAD_ENGINES + NUM_SHIP_ENGINES) ||
-		(dei++, true);
+		dei = &_draw_engine_list[GetEngine(engine)->type - VEH_Train];

 		width = w->width;
 		dei->engine_proc(width >> 1, 100, engine, 0);
@@ -139,35 +135,6 @@ static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
 	DrawStringMultiCenter(x, y, STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER, maxw);
 }

-void DrawNewsNewTrainAvail(Window *w)
-{
-	EngineID engine;
-
-	DrawNewsBorder(w);
-
-	engine = WP(w,news_d).ni->string_id;
-	SetDParam(0, GetEngineCategoryName(engine));
-	DrawStringMultiCenter(w->width >> 1, 20, STR_8859_NEW_NOW_AVAILABLE, w->width - 2);
-
-	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);
-
-	SetDParam(0, GetCustomEngineName(engine));
-	DrawStringMultiCenter(w->width >> 1, 57, STR_885A, w->width - 2);
-
-	DrawTrainEngine(w->width >> 1, 88, engine, 0);
-	GfxFillRect(25, 56, w->width - 56, 112, 0x323 | USE_COLORTABLE);
-	DrawTrainEngineInfo(engine, w->width >> 1, 129, w->width - 52);
-}
-
-StringID GetNewsStringNewTrainAvail(const NewsItem *ni)
-{
-	EngineID engine = ni->string_id;
-	SetDParam(0, STR_8859_NEW_NOW_AVAILABLE);
-	SetDParam(1, GetEngineCategoryName(engine));
-	SetDParam(2, GetCustomEngineName(engine));
-	return STR_02B6;
-}
-
 static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw)
 {
 	const AircraftVehicleInfo *avi = AircraftVehInfo(engine);
@@ -180,33 +147,6 @@ static void DrawAircraftEngineInfo(EngineID engine, int x, int y, int maxw)
 	DrawStringMultiCenter(x, y, STR_A02E_COST_MAX_SPEED_CAPACITY, maxw);
 }

-void DrawNewsNewAircraftAvail(Window *w)
-{
-	EngineID engine;
-
-	DrawNewsBorder(w);
-
-	engine = WP(w,news_d).ni->string_id;
-
-	DrawStringMultiCenter(w->width >> 1, 20, STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE, w->width - 2);
-	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);
-
-	SetDParam(0, GetCustomEngineName(engine));
-	DrawStringMultiCenter(w->width >> 1, 57, STR_A02D, w->width - 2);
-
-	DrawAircraftEngine(w->width >> 1, 93, engine, 0);
-	GfxFillRect(25, 56, w->width - 56, 110, 0x323 | USE_COLORTABLE);
-	DrawAircraftEngineInfo(engine, w->width >> 1, 131, w->width - 52);
-}
-
-StringID GetNewsStringNewAircraftAvail(const NewsItem *ni)
-{
-	EngineID engine = ni->string_id;
-	SetDParam(0, STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE);
-	SetDParam(1, GetCustomEngineName(engine));
-	return STR_02B6;
-}
-
 static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw)
 {
 	const RoadVehicleInfo *rvi = RoadVehInfo(engine);
@@ -220,32 +160,6 @@ static void DrawRoadVehEngineInfo(EngineID engine, int x, int y, int maxw)
 	DrawStringMultiCenter(x, y, STR_902A_COST_SPEED_RUNNING_COST, maxw);
 }

-void DrawNewsNewRoadVehAvail(Window *w)
-{
-	EngineID engine;
-
-	DrawNewsBorder(w);
-
-	engine = WP(w,news_d).ni->string_id;
-	DrawStringMultiCenter(w->width >> 1, 20, STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE, w->width - 2);
-	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);
-
-	SetDParam(0, GetCustomEngineName(engine));
-	DrawStringMultiCenter(w->width >> 1, 57, STR_9029, w->width - 2);
-
-	DrawRoadVehEngine(w->width >> 1, 88, engine, 0);
-	GfxFillRect(25, 56, w->width - 56, 112, 0x323 | USE_COLORTABLE);
-	DrawRoadVehEngineInfo(engine, w->width >> 1, 129, w->width - 52);
-}
-
-StringID GetNewsStringNewRoadVehAvail(const NewsItem *ni)
-{
-	EngineID engine = ni->string_id;
-	SetDParam(0, STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE);
-	SetDParam(1, GetCustomEngineName(engine));
-	return STR_02B6;
-}
-
 static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw)
 {
 	const ShipVehicleInfo *svi = ShipVehInfo(engine);
@@ -257,29 +171,30 @@ static void DrawShipEngineInfo(EngineID engine, int x, int y, int maxw)
 	DrawStringMultiCenter(x, y, STR_982E_COST_MAX_SPEED_CAPACITY, maxw);
 }

-void DrawNewsNewShipAvail(Window *w)
+StringID GetNewsStringNewVehicleAvail(const NewsItem *ni)
+ {
+	EngineID engine = ni->string_id;
+	SetDParam(0, GetEngineCategoryName(engine));
+	SetDParam(1, GetCustomEngineName(engine));
+	return STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE;
+}
+
+void DrawNewsNewVehicleAvail(Window *w)
 {
-	EngineID engine;
+	EngineID engine = WP(w, news_d).ni->string_id;
+	const DrawEngineInfo *dei = &_draw_engine_list[GetEngine(engine)->type - VEH_Train];

 	DrawNewsBorder(w);

-	engine = WP(w,news_d).ni->string_id;
+	SetDParam(0, GetEngineCategoryName(engine));
+	DrawStringMultiCenter(w->width >> 1, 20, STR_NEW_VEHICLE_NOW_AVAILABLE, w->width - 2);

-	DrawStringMultiCenter(w->width >> 1, 20, STR_982C_NEW_SHIP_NOW_AVAILABLE, w->width - 2);
 	GfxFillRect(25, 56, w->width - 25, w->height - 2, 10);

 	SetDParam(0, GetCustomEngineName(engine));
-	DrawStringMultiCenter(w->width >> 1, 57, STR_982D, w->width - 2);
+	DrawStringMultiCenter(w->width >> 1, 57, STR_NEW_VEHICLE_TYPE, w->width - 2);

-	DrawShipEngine(w->width >> 1, 93, engine, 0);
-	GfxFillRect(25, 56, w->width - 56, 110, 0x323 | USE_COLORTABLE);
-	DrawShipEngineInfo(engine, w->width >> 1, 131, w->width - 52);
-}
-
-StringID GetNewsStringNewShipAvail(const NewsItem *ni)
-{
-	EngineID engine = ni->string_id;
-	SetDParam(0, STR_982C_NEW_SHIP_NOW_AVAILABLE);
-	SetDParam(1, GetCustomEngineName(engine));
-	return STR_02B6;
+	dei->engine_proc(w->width >> 1, 88, engine, 0);
+	GfxFillRect(25, 56, w->width - 56, 112, 0x323 | USE_COLORTABLE);
+	dei->info_proc(engine, w->width >> 1, 129, w->width - 52);
 }
@@ -17,6 +17,7 @@
 #include <sys/stat.h>

 #ifdef WIN32
+# include <tchar.h>
 # include <io.h>
 #else
 # include <unistd.h>
@@ -32,6 +33,7 @@ static int _fios_count, _fios_alloc;
 /* OS-specific functions are taken from their respective files (win32/unix/os2 .c) */
 extern bool FiosIsRoot(const char *path);
 extern bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb);
+extern bool FiosIsHiddenFile(const struct dirent *ent);
 extern void FiosGetDrives(void);
 extern bool FiosGetDiskFreeSpace(const char *path, uint32 *tot);

@@ -169,8 +171,8 @@ void FiosMakeSavegameName(char *buf, const char *name, size_t size)
 	snprintf(buf, size, "%s" PATHSEP "%s%s", _fios_path, name, extension);
 }

-#if defined(WIN32) || defined(WIN64)
-# define unlink _wunlink
+#if defined(WIN32)
+# define unlink _tunlink
 #endif

 bool FiosDelete(const char *name)
@@ -218,7 +220,8 @@ static FiosItem *FiosGetFileList(int mode, fios_getlist_callback_proc *callback_

 			/* found file must be directory, but not '.' or '..' */
 			if (FiosIsValidFile(_fios_path, dirent, &sb) && (sb.st_mode & S_IFDIR) &&
-				strcmp(d_name, ".") != 0 && strcmp(d_name, "..") != 0) {
+					(!FiosIsHiddenFile(dirent) || strncasecmp(d_name, PERSONAL_DIR, strlen(d_name)) == 0) &&
+					strcmp(d_name, ".") != 0 && strcmp(d_name, "..") != 0) {
 				fios = FiosAlloc();
 				fios->type = FIOS_TYPE_DIR;
 				fios->mtime = 0;
@@ -250,7 +253,7 @@ static FiosItem *FiosGetFileList(int mode, fios_getlist_callback_proc *callback_
 			byte type;
 			ttd_strlcpy(d_name, FS2OTTD(dirent->d_name), sizeof(d_name));

-			if (!FiosIsValidFile(_fios_path, dirent, &sb) || !(sb.st_mode & S_IFREG)) continue;
+			if (!FiosIsValidFile(_fios_path, dirent, &sb) || !(sb.st_mode & S_IFREG) || FiosIsHiddenFile(dirent)) continue;

 			/* File has no extension, skip it */
 			if ((t = strrchr(d_name, '.')) == NULL) continue;
@@ -57,7 +57,7 @@ int CDECL compare_FiosItems(const void *a, const void *b);
 typedef struct DIR DIR;

 typedef struct dirent { // XXX - only d_name implemented
-	wchar_t *d_name; /* name of found file */
+	TCHAR *d_name; /* name of found file */
 	/* little hack which will point to parent DIR struct which will
 	 * save us a call to GetFileAttributes if we want information
 	 * about the file (for example in function fio_bla */
@@ -70,14 +70,14 @@ struct DIR {
 	 * note: having only one global instance is not possible because
 	 * multiple independent opendir/readdir sequences must be supported. */
 	dirent ent;
-	WIN32_FIND_DATAW fd;
+	WIN32_FIND_DATA fd;
 	/* since opendir calls FindFirstFile, we need a means of telling the
 	 * first call to readdir that we already have a file.
 	 * that's the case iff this is true */
 	bool at_first_entry;
 };

-DIR *opendir(const wchar_t *path);
+DIR *opendir(const TCHAR *path);
 struct dirent *readdir(DIR *d);
 int closedir(DIR *d);
 #else
@@ -144,10 +144,10 @@ static FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)


 folder_error:
-#if defined(UNICODE)
-	free(font_path);
-#endif
 registry_no_font_found:
+#if defined(UNICODE)
+	free(font_namep);
+#endif
 	RegCloseKey(hKey);
 	return err;
 }
@@ -270,7 +270,7 @@ static int TruncateString(char *str, int maxw)
 			if (w >= maxw) {
 				// string got too big... insert dotdotdot
 				ddd_pos[0] = ddd_pos[1] = ddd_pos[2] = '.';
-				ddd_pos[3] = 0;
+				ddd_pos[3] = '\0';
 				return ddd_w;
 			}
 		} else {
@@ -410,11 +410,12 @@ uint32 FormatStringLinebreaks(char *str, int maxw)
 	for (;;) {
 		char *last_space = NULL;
 		int w = 0;
+		char *s;

 		for (;;) {
 			WChar c = Utf8Consume((const char **)&str);
 			/* whitespace is where we will insert the line-break */
-			if (c == ' ') last_space = str;
+			if (IsWhitespace(c)) last_space = str;

 			if (IsPrintable(c)) {
 				w += GetCharacterWidth(size, c);
@@ -425,7 +426,7 @@ uint32 FormatStringLinebreaks(char *str, int maxw)
 				 * 2. In all other cases force a linebreak at the last seen whitespace */
 				if (w > maxw) {
 					if (last_space == NULL) {
-						str[-1] = '\0';
+						*Utf8PrevChar(str) = '\0';
 						return num + (size << 16);
 					}
 					str = last_space;
@@ -443,9 +444,17 @@ uint32 FormatStringLinebreaks(char *str, int maxw)
 			}
 		}
 end_of_inner_loop:
-		/* string didn't fit on line, so 'dummy' terminate and increase linecount */
+		/* String didn't fit on line (or a '\n' was encountered), so 'dummy' terminate
+		 * and increase linecount. We use Utf8PrevChar() as also non 1 char long
+		 * whitespace seperators are supported */
 		num++;
-		str[-1] = '\0';
+		s = Utf8PrevChar(str);
+		*s++ = '\0';
+
+		/* In which case (see above) we will shift remainder to left and close the gap */
+		if (str - s >= 1) {
+			for (; str[-1] != '\0';) *s++ = *str++;
+		}
 	}
 }

@@ -29,7 +29,7 @@ static inline byte RGBToGrayscale(byte red, byte green, byte blue)

 #ifdef WITH_PNG

-#include "png.h"
+#include <png.h>

 /**
 * The PNG Heightmap loader.
@@ -1653,7 +1653,7 @@ static void ExtChangeIndustryProduction(Industry *i)
 		SetDParam(0, i->index);
 		AddNewsItem(
 			indspec->closure_text,
-			NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_ECONOMY, 0),
+			NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_OPENCLOSE, 0),
 			i->xy + TileDiffXY(1, 1), 0
 		);
 	}
@@ -1735,7 +1735,7 @@ static void MaybeNewIndustry(uint32 r)
 	AddNewsItem(
 		(type != IT_FOREST && type != IT_FRUIT_PLANTATION && type != IT_RUBBER_PLANTATION && type != IT_COTTON_CANDY) ?
 			STR_482D_NEW_UNDER_CONSTRUCTION : STR_482E_NEW_BEING_PLANTED_NEAR,
-		NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_ECONOMY,0), i->xy, 0
+		NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_OPENCLOSE,0), i->xy, 0
 	);
 }

@@ -1803,7 +1803,7 @@ static void ChangeIndustryProduction(Industry *i)

 	if (str != STR_NULL) {
 		SetDParam(0, i->index);
-		AddNewsItem(str, NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_ECONOMY, 0), i->xy + TileDiffXY(1, 1), 0);
+		AddNewsItem(str, NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, str == indspec->closure_text ? NT_OPENCLOSE : NT_ECONOMY, 0), i->xy + TileDiffXY(1, 1), 0);
 	}
 }

@@ -553,26 +553,30 @@ static int CDECL GeneralIndustrySorter(const void *a, const void *b)
 	return r;
 }

+/**
+ * Makes a sorted industry list.
+ * When there are no industries, the list has to be made. This so when one
+ * starts a new game without industries after playing a game with industries
+ * the list is not populated with invalid industries from the previous game.
+ */
 static void MakeSortedIndustryList(void)
 {
 	const Industry* i;
 	int n = 0;

-	/* Don't attempt a sort if there are no industries */
-	if (GetNumIndustries() == 0) return;
-
 	/* Create array for sorting */
 	_industry_sort = realloc((void *)_industry_sort, (GetMaxIndustryIndex() + 1) * sizeof(_industry_sort[0]));
-	if (_industry_sort == NULL)
-		error("Could not allocate memory for the industry-sorting-list");
+	if (_industry_sort == NULL) error("Could not allocate memory for the industry-sorting-list");

-	FOR_ALL_INDUSTRIES(i) _industry_sort[n++] = i;
+	/* Don't attempt a sort if there are no industries */
+	if (GetNumIndustries() != 0) {
+		FOR_ALL_INDUSTRIES(i) _industry_sort[n++] = i;
+		qsort((void*)_industry_sort, n, sizeof(_industry_sort[0]), GeneralIndustrySorter);
+	}

 	_num_industry_sort = n;
 	_last_industry = NULL; // used for "cache"

-	qsort((void*)_industry_sort, n, sizeof(_industry_sort[0]), GeneralIndustrySorter);
-
 	DEBUG(misc, 1) ("Resorting Industries list...");
 }

@@ -64,6 +64,10 @@ 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. */
+		if (2 <= e->we.click.widget && e->we.click.widget <= 6) _is_network_server = false;
+
 		switch (e->we.click.widget) {
 		case 2: ShowGenerateLandscape(); break;
 		case 3: ShowSaveLoadDialog(SLD_LOAD_GAME); break;
@@ -15,48 +15,42 @@ 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.0
+Bugs for 0.5.2
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org

-601	airports can't get flooded when they have planes in them
-599	reloaded game lost company passwords
-595	Sort by max cargo rating does not sort correctly
-594	terraforming wipes out canals
+-735	Plural rule not expanded correctly when non-numeric placeholder uses
+-716	Train Crash in Depot
+-674	Map signs allow less nonenglish characters than english ones
+-669	Docks/Airports/RV Stations can be built without available vehicles
+-646	AI builds useless stations
+-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
-578	No loading at my industrial centre
-574	Open TTD overiding Power Warnings
-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	[0.5.0 RC3] Inflation overflow
+-546	Overflows due to inflation
 -540	Planes vanished when offered exclusive
 -539	Trains can cash the same cargo multiple times
-529	newairport's sprite issue
 -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.
-459	Merging is buggy
 -458	Crash when changing Resolution on Mac OS X (x86)
-450	GUI selecting disabled numbers (newstations)
 -442	Alt-tab behaviour flawed whilst full screen (win32)
-441	Transparent stuff
 -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
-404	Cargo never delivered to station after bribe and before first pickup
 -365	Blimp Stuck at airport
 -362	Changing signal type affects whole square
-357	CPU spikes in game
 -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
@@ -65,12 +59,11 @@ URL: http://bugs.openttd.org
 -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
+-165	Vehicle length not taken into account
 -153	Language crash with app renaming OSX
 -119	Clipping problems with vehicles on slopes
-115	inactive logins do not get auto kicked
 - 89	Able to build railways/stations before engines become available
- 65	short wagons bug
+- 65	Short wagons bug
 - 51	Windows doesn't support CUSTOM_LANG_DIR
 - 47	Low rating calculation and cargo loading priority

@@ -82,30 +75,25 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 -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
+-1212267	Station visited twice when servicing
 -1208170	Duplicate station names can be created
 -1116638	"More, but smaller changes" deficiency
-1106356	re-offered prototypes
+-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
+-1412031	Fast forward scrolling is also fast forward :)
 -1382782	Loan interest calculated 'wrong'
-1201284	permanent hilight in a depot
+-1201284	Permanent hilight in a depot
 -1185852	Scrollbars get arbitrarily small
-1160732	little bug with transparency
-1117731	Editor-StartingDate
-1108046	game freezes
+-1160732	Little bug with transparency
+-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
+-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
+- 987880	Company league table updating
+- 985924	Aircraft taxi speed
@@ -590,6 +590,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival of first vehicle at competitor's station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / disasters
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Company information
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Open / close of industries
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Economy changes
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Advice / information on player's vehicles
 STR_020C_NEW_VEHICLES                                           :{YELLOW}New vehicles
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Place ro
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Place lighthouse
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Place transmitter
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Define desert area.{}Press and hold CTRL to remove it
-STR_CREATE_LAKE                                                 :{BLACK}Define water area.{}It will flood its surroundings if at sea level
+STR_CREATE_LAKE                                                 :{BLACK}Define water area.{}Make a canal, unless CTRL is held down at sea level, when it will flood the surroundings instead
 STR_0290_DELETE                                                 :{BLACK}Delete
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Delete this town completely
 STR_0292_SAVE_SCENARIO                                          :Save scenario
@@ -1207,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Trees of
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Place trees of random type

 STR_CANT_BUILD_CANALS                                           :{WHITE}Can't build canals here...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Build canals
+STR_BUILD_CANALS_TIP                                            :{BLACK}Build canals.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Can't build locks here...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Insert a
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Make the highlighted order force the vehicle to wait for a full load
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Make the highlighted order force the vehicle to unload
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY}  Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
@@ -2633,6 +2632,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Incompatible ra
 STR_TRAIN_NO_POWER                                              :{RED}No power
 STR_TRAIN_START_NO_CATENARY                                     :This track lacks catenary, so the train can't start

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}New {STRING} now available!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}New {STRING} now available!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Road Vehicle{P "" s}
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Drag roa
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Center main view on road vehicle depot location
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Road vehicle selection list - click on vehicle for information
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Build the highlighted road vehicle
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}New road vehicle now available!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Speed: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name road vehicle
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Show shi
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Center main view on ship's location
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Send ship to depot
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Show ship details
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}New ship now available!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}Name ship

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Show air
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Center main view on aircraft's location
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Send aircraft to hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Show aircraft details
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}New aircraft now available!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA} passengers, {COMMA} bags of mail{}Running Cost: {CURRENCY}/yr

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Name aircraft
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}You are about to make changes to a running game; this can crash OpenTTD.{}Are you absolutely sure about this?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Add
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Add a NewGRF file to the list
 STR_NEWGRF_REMOVE                                               :{BLACK}Remove
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Length: {NUM}{}Height difference: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Height difference: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -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 de Água
+STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Poço Artesiano
 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
@@ -592,6 +592,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do primeiro veículo à estação de um oponente
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Acidentes / desastres
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informações da empresa
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Abrir / fechar industrias
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Alterações econômicas
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Avisos / informações dos veículos do jogador
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Novos veículos
@@ -731,7 +732,7 @@ 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 de água.{} Ela irá inundar quando no nível do mar
+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
@@ -940,11 +941,11 @@ STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Selecion

 STR_OPTIONS_RES                                                 :{BLACK}Resolução da tela
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_RES_TIP                                             :{BLACK}Selecione a resolução de tela que deseja utilizar
+STR_OPTIONS_RES_TIP                                             :{BLACK}Selecionar a resolução da tela que deseja utilizar

 STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Formato da foto
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Selecione o formato de foto que deseja utilizar
+STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Selecionar o formato de foto que deseja utilizar

 STR_AUTOSAVE_1_MONTH                                            :A cada mês
 STR_AUTOSAVE_FAILED                                             :{WHITE}Falha ao salvar automaticamente
@@ -1209,7 +1210,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Árvores
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plantar árvores de tipo aleatório

 STR_CANT_BUILD_CANALS                                           :{WHITE}Impossível construir canais aqui...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Construir canais
+STR_BUILD_CANALS_TIP                                            :{BLACK}Construir canais.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Impossível construir eclusas aqui...
@@ -1891,7 +1892,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} na {INDUSTRY} diminuiu em {COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}A produção de {STRING} em {INDUSTRY} diminuiu em {COMMA}%!

 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Há um trem no túnel
@@ -2220,9 +2221,9 @@ STR_LIVERY_TRAIN_TIP                                            :{BLACK}Exibir e
 STR_LIVERY_ROADVEH_TIP                                          :{BLACK}Exibir os esquemas de cor de automóveis
 STR_LIVERY_SHIP_TIP                                             :{BLACK}Exibir esquemas de cor de embarcação
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Exibir esquemas de cor de aviões
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Seleciona a cor principal para o esquema selecionado
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Seleciona a cor secundária para o esquema selecionado
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Selecione um esquema a mudar, ou múltiplos esquemas com CTRL+clique. Marque a opção para utilizar o esquema
+STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Escolha a cor principal para o esquema selecionado
+STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Escolha a cor secundária para o esquema selecionado
+STR_LIVERY_PANEL_TIP                                            :{BLACK}Selecionar um esquema de cores para mudar, ou múltiplos esquemas com CTRL+clique. Marque a opção para utilizar o esquema

 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (Vapor)
@@ -2553,7 +2554,7 @@ STR_8826_GO_TO                                                  :{BLACK}Ir Para
 STR_8827_FULL_LOAD                                              :{BLACK}Carga
 STR_8828_UNLOAD                                                 :{BLACK}Descarga
 STR_REFIT                                                       :{BLACK}Readaptar
-STR_REFIT_TIP                                                   :{BLACK}Selecione a adaptação na ordem atual. CTRL + Clique para remover a instrução
+STR_REFIT_TIP                                                   :{BLACK}Selecionar a adaptação na ordem atual. CTRL + Clique para remover a instrução
 STR_REFIT_ORDER                                                 :(Readaptar para {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordens)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fim de Ordens - -
@@ -2609,8 +2610,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Inserir
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A ordem selecionada fará com que o veículo espere carregar completamente
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A ordem selecionada forçará o veículo a descarregar
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nov{G o a} {STRING} agora disponível!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Quebrado
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
@@ -2637,6 +2636,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipo de ferrovi
 STR_TRAIN_NO_POWER                                              :{RED}Sem força
 STR_TRAIN_START_NO_CATENARY                                     :Essa linha não tem energia, portanto o trem não parte

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Novo {STRING} agora disponível!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Novo {STRING} agora disponível!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automóvel no caminho
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Automóve{P l is}
@@ -2677,8 +2680,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Arraste
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centrar visualização na localização da garagem
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista de automóveis - clique num automóvel para informações
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construir o veículo selecionado
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novo automóvel agora disponível!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Custo: {CURRENCY}{}Velocidade: {VELOCITY}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renomear automóvel
@@ -2750,8 +2751,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Exibir o
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrar visualização na localização da embarcação
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Enviar embarcação para o depósito. CTRL+clique fará apenas manutenção
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Exibir detalhes da embarcação
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nova embarcação agora disponível!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {CARGO}{}Custo de circulação: {CURRENCY}/ano
 STR_982F_NAME_SHIP                                              :{BLACK}Renomear embarcação

@@ -2824,8 +2823,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Exibir o
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrar visualização na localização da aeronave
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Enviar aeronave para o hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Exibir detalhes da aeronave
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nova aeronave agora disponível!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA} passageiros, {COMMA} sacos de correio{}Custo de circulação: {CURRENCY}/ano

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Renomear aeronave
@@ -2903,6 +2900,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}SomaMD5 (verf. de segurança): {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Você está prestes a efetuar alterações neste jogo atual; isto pode danificar o OpenTTD. {}Tem absoluta certeza que deseja fazer isto?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Adicionar
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Adiciona um NewGRF à lista
 STR_NEWGRF_REMOVE                                               :{BLACK}Remover
@@ -3001,11 +2999,11 @@ STR_REPLACE_VEHICLES_START                                      :{BLACK}Iniciar
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar Substituição
 STR_NOT_REPLACING                                               :{BLACK}Não substituindo
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nenhum veículo selecionado
-STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Selecione o tipo de motor para substituir
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Selecione o novo tipo de motor para substituir o que selecionou à esquerda
+STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Selecionar o tipo de motor para substituir
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Selecionar o novo tipo de motor para substituir o que selecionou à esquerda
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Pressione para parar a subsituição do tipo de motor que selecionou à esquerda
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Pressione para iniciar a substituição do tipo de motor que selecionou à esquerda, com o tipo de motor selecionado à direita
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Selecione o tipo de carga para o qual deseja efetuar a substituição dos motores
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Escolha o tipo de carga para o qual deseja efetuar a substituição dos motores
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Exibe o tipo de motor que substituirá o que está selecionado à esquerda, se algum
 STR_REPLACE_HELP                                                :{BLACK}Permite substituir um tipo de motor por outro tipo, quando trens do tipo original entram num depósito
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Remoção de vagões: {ORANGE}{SKIP}{STRING}
@@ -3140,4 +3138,10 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Comprimento: {NUM}{}Diferença de Altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Diferença de altura: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -592,6 +592,7 @@ 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}Нови превозни средства
@@ -731,7 +732,7 @@ 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}Посочване на водна зона.{}Ще наводни съседните ако са на морското ниво
+STR_CREATE_LAKE                                                 :{BLACK}Определи водна площ.{}Построи канал, освем когато CTRL е натиснат на морско ниво, когато ще наводни околната среда в замяна
 STR_0290_DELETE                                                 :{BLACK}Изтрий
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Премахни напълно града
 STR_0292_SAVE_SCENARIO                                          :Запис на сценарий
@@ -1209,7 +1210,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Дърв
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Постави дървета от произволен тип

 STR_CANT_BUILD_CANALS                                           :{WHITE}Тук не може да се строят канали...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Строене на канали. Натиснете CTRL за да поставите морска плочка (само на нивото на морето).
+STR_BUILD_CANALS_TIP                                            :{BLACK}Построи канал.
 STR_LANDINFO_CANAL                                              :Канал

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Тук не може да се строят шлюзове...
@@ -1827,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                                           :Нефтена рафинерия
@@ -2607,8 +2608,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Доба
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Изчакай на избраното назначение до пълно зареждане с товар
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Разтоварва на избраното назначение целия товар
 STR_SERVICE_HINT                                                :{BLACK}Пропусни освен ако е необходим ремонт
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Нов {STRING} вече е достъпен!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Цена: {CURRENCY} Тегло: {WEIGHT_S}{}Скорост: {VELOCITY}  Мощност: {POWER}{}Разход: {CURRENCY}/г.{}Капацитет: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Развален
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Възраст: {LTBLUE}{STRING}{BLACK}   Оперативни разходи: {LTBLUE}{CURRENCY}/г.
@@ -2635,6 +2634,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Несъвме
 STR_TRAIN_NO_POWER                                              :{RED}Няма мощност
 STR_TRAIN_START_NO_CATENARY                                     :Влака не може да тръгне, защото ЖП линията няма catenary

+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}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Кола на пътя
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Кол{P а и}
@@ -2675,8 +2678,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Прем
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Фокусирай общия план върху местонахождението на МПС-депото
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Списък с избор на МПС-та - натисни върху МПС за информация
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Купи посоченото МПС
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Ново МПС излезе на пазара!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Цена: {CURRENCY}{}Скорост: {VELOCITY}{}Оперативен разход: {CURRENCY}/год{}Вместимост: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Преименувай МПС-то
@@ -2748,8 +2749,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Пока
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Фокусирай общия план върху местонахождението на кораба
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Прати кораба в депото
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Покажи детайлите за кораба
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Нов кораб излезе на пазара!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Макс. Скорост: {VELOCITY}{}Вместимост: {CARGO}{}Разход: {CURRENCY}/год.
 STR_982F_NAME_SHIP                                              :{BLACK}Наименувай кораба

@@ -2822,8 +2821,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Марш
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Центриране на главния прозорец върху самолета
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Изпращане на самолета в хангар
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Информация за самолета
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Нов самолет е достъпен!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Цена: {CURRENCY} Макс. скорост: {VELOCITY}{}Капацитет: {COMMA} пътника, {COMMA} чувала поща{}Разход: {CURRENCY}/г.

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Име на самолет
@@ -2901,6 +2898,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 сума: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}На път си да извършиш промени в активна игра; това може да крашне OpenTTD.{}Напълно ли си сигурен в това?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Добави
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Добавяне на NewGRF файл към списъка
 STR_NEWGRF_REMOVE                                               :{BLACK}Махни
@@ -3138,4 +3136,10 @@ STR_MEASURE_AREA                                                :{BLACK}Площ
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Дължина: {NUM}{}Разлика във височината: {NUM} м
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Площ: {NUM} x {NUM}{}Разлика във височината: {NUM} м

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -590,6 +590,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arribad
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arribada del 1er. vehicle a una estació competidora
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / desastres
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informació de l'Empresa
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Obrir / tancar d'indústries
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Canvis de l'Economia
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Avisos / informació dels teus vehicles
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nous vehicles
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Situa à
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Situa un far
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Situa un repetidor
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Defineix àrea de desert.{}Prem i mantingues la tecla CTRL per treure'l
-STR_CREATE_LAKE                                                 :{BLACK}Defineix àrea d'aigua.{}Inundarà els voltants si és a nivell del mar
+STR_CREATE_LAKE                                                 :{BLACK}Defineix l'area d'aigua.{}Fa un canal, excepte si CTRL està apretat al nivell del mar, llavors s'inundaran els voltants
 STR_0290_DELETE                                                 :{BLACK}Esborra
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Esborra totalment aquesta població
 STR_0292_SAVE_SCENARIO                                          :Desa l'escenari
@@ -1207,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbres d
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Situar arbres de tipus aleatori

 STR_CANT_BUILD_CANALS                                           :{WHITE}Aquí no es poden construir canals...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Construeix canals
+STR_BUILD_CANALS_TIP                                            :{BLACK}Construir canals.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Aquí no es pot construir una resclosa...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Afegeix
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Fer que en l'ordre seleccionada s'esperi a que l'element tingui càrrega total
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Obliga en l'ordre seleccionada a descarregar l'element
 STR_SERVICE_HINT                                                :{BLACK}Saltar l'ordre a menys que es necessiti manteniment
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nova {STRING} disponible!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Pes: {WEIGHT_S}{}Velocitat: {VELOCITY}  Potència: {POWER}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Avariat
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edat: {LTBLUE}{STRING}{BLACK}   Cost de Circulació: {LTBLUE}{CURRENCY}/any
@@ -2633,6 +2632,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipus de rail i
 STR_TRAIN_NO_POWER                                              :{RED}Sense energia
 STR_TRAIN_START_NO_CATENARY                                     :Aquesta via no té catenària, el tren no pot arrencar

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nou {STRING} disponible!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nou {STRING} disponible!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automòbil en camí
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehicles Rodats
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Arrosseg
 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 Rodats - clica en un vehicle per informació
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construeix l'automòbil seleccionat
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nou automòbil disponible!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Velocitat: {VELOCITY}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Anomena automòbil
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Mostra l
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centra la pantalla principal en la situació del vaixell
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Envia el vaixell a la drassana. CTRL+Clic per només revisió
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostra els detalls del vaixell
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nou vaixell disponible!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Velocitat: {VELOCITY}{}Capacitat: {CARGO}{}Cost de Circulació: {CURRENCY}/any
 STR_982F_NAME_SHIP                                              :{BLACK}Anomena vaixell

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Mostra l
 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_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nova aeronau disponible!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 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 aeronau
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}Id de GR
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Estàs a punt de fer canvis en un joc actiu; això pot fer que OpenTTD es pengi.{}Estàs completament segur que vols fer-los?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Afegeix
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Afegeix un arxiu NewGRF a la llista
 STR_NEWGRF_REMOVE                                               :{BLACK}Treu
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Àrea: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Llargada: {NUM}{}Diferència d'alçada: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Àrea: {NUM} x {NUM}{}Diferència d'alçada: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -3,7 +3,7 @@
 ##isocode cs_CS
 ##plural 6
 ##case nom gen dat acc voc loc ins big
-##gender m f n
+##gender f m n

 ##id 0x0000
 STR_NULL                                                        :
@@ -443,13 +443,13 @@ STR_SORT_BY_VALUE                                               :hodnoty
 STR_SORT_BY_FACILITY                                            :druhu stanice
 STR_SORT_BY_WAITING                                             :množství čekajícího nákladu
 STR_SORT_BY_RATING_MAX                                          :hodnocení přepravy
-STR_ENGINE_SORT_ENGINE_ID                                       :ID lokomotivy (klasické pořadí)
-STR_ENGINE_SORT_COST                                            :Cena
-STR_ENGINE_SORT_POWER                                           :Výkon
-STR_ENGINE_SORT_INTRO_DATE                                      :Datum uvedení na trh
-STR_ENGINE_SORT_RUNNING_COST                                    :Provozní náklady
-STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Výkon/Provozní náklady
-STR_ENGINE_SORT_CARGO_CAPACITY                                  :Přepravní kapacita
+STR_ENGINE_SORT_ENGINE_ID                                       :ID vozu (klasické pořadí)
+STR_ENGINE_SORT_COST                                            :ceny
+STR_ENGINE_SORT_POWER                                           :výkonu
+STR_ENGINE_SORT_INTRO_DATE                                      :data uvedení na trh
+STR_ENGINE_SORT_RUNNING_COST                                    :provozních nákladů
+STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :výkonu/provozních nákladů
+STR_ENGINE_SORT_CARGO_CAPACITY                                  :přepravní kapacity
 STR_NO_WAITING_CARGO                                            :{BLACK}Nečeká žádná komodita jakéhokoli druhu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Označit všechny druhy stanic
 STR_SELECT_ALL_TYPES                                            :{BLACK}Označit všechny druhy komodit (včetne žádného čekajícího nákladu)
@@ -648,6 +648,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Příje
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Příjezd prvního vozidla do konkurenční stanice
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Nehody / katastrofy
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informace o společnosti
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Otevření / zavření továren
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Změny v ekonomice
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Rady / informace o hráčových vozidlech
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nový dopravní prostředek
@@ -787,7 +788,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Umístit
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Umístit maják
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Umístit vysílač
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Vytvořit pouštní oblast{}Stiskem CTRL ji odstraníš
-STR_CREATE_LAKE                                                 :{BLACK}Vytvořit vodní plochu.{}Sousední dílky se zaplaví také, pokud jsou na úrovni moře
+STR_CREATE_LAKE                                                 :{BLACK}Vytvořit vodní plochu.{}Pokud není držen CTRL, vytvoří se na úrovni moře průplav; v opačném případě se zaplaví ostatní dílky
 STR_0290_DELETE                                                 :{BLACK}Smaž
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Smazat celé toto město
 STR_0292_SAVE_SCENARIO                                          :Uložit mapu
@@ -1265,7 +1266,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Různé
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Umístit nahodné stromy

 STR_CANT_BUILD_CANALS                                           :{WHITE}Zde nemohu postavit průplav...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Stavět průplav. Podržením CTRL můžete vytvořit vodní plochu (pouze na úrovni moře).
+STR_BUILD_CANALS_TIP                                            :{BLACK}Vytvořit průplav
 STR_LANDINFO_CANAL                                              :Průplav

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Zde nemohu postavit zdymadlo...
@@ -1695,7 +1696,7 @@ STR_202C_FROM_TO                                                :{ORANGE}{STRING
 STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Nabídka dotace přepravy vypršela:{}{}Dotace dopravy {STRING.gen} z{NBSP}{STRING} do {STRING} nebude dále nabízena.
 STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Ukončení dotování dopravy:{}{}Dotace pro {STRING} z{NBSP}{STATION} do {STATION} již nebude dále poskytována.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nabídka dotace:{}{}Doprava {STRING} z{NBSP}{STRING} do {STRING} bude jeden rok dotována místní správou!
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nabídka dotace:{}{}Doprava {STRING.gen} z{NBSP}{STRING} do {STRING} bude jeden rok dotována místní správou!
 STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace přidělena společnosti {COMPANY}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet 150 % normální ceny.
 STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace přidělena společnosti {COMPANY}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet dvojnásobek normální ceny!
 STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace přidělena společnosti {COMPANY}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet trojnásobek normální ceny!
@@ -2306,60 +2307,60 @@ STR_8017_SH_30_ELECTRIC                                         :SH '30' (elektr
 STR_8018_SH_40_ELECTRIC                                         :SH '40' (elektrická)
 STR_8019_T_I_M_ELECTRIC                                         :'T.I.M.' (elektrická)
 STR_801A_ASIASTAR_ELECTRIC                                      :'AsiaStar' (elektrická)
-STR_801B_PASSENGER_CAR                                          :Osobní vagon pro cestující
+STR_801B_PASSENGER_CAR                                          :Osobní vagon
 STR_801C_MAIL_VAN                                               :Poštovní vagon
 STR_801D_COAL_CAR                                               :Vagon na uhlí
 STR_801E_OIL_TANKER                                             :Cisternový vagon na ropu
-STR_801F_LIVESTOCK_VAN                                          :Vagon pro dobytek
-STR_8020_GOODS_VAN                                              :Vagon na zboží
-STR_8021_GRAIN_HOPPER                                           :Vagon na zrní
+STR_801F_LIVESTOCK_VAN                                          :Krytý vůz na dobytek
+STR_8020_GOODS_VAN                                              :Krytý vůz na zboží
+STR_8021_GRAIN_HOPPER                                           :Násypný vůz na zrní
 STR_8022_WOOD_TRUCK                                             :Vagon na dřevo
-STR_8023_IRON_ORE_HOPPER                                        :Vagon na železnou rudu
+STR_8023_IRON_ORE_HOPPER                                        :Násypný vůz na železnou rudu
 STR_8024_STEEL_TRUCK                                            :Vagon na ocel
-STR_8025_ARMORED_VAN                                            :Vagon na ceniny
-STR_8026_FOOD_VAN                                               :Vagon na jídlo
+STR_8025_ARMORED_VAN                                            :Krytý vůz na ceniny
+STR_8026_FOOD_VAN                                               :Krytý vůz na jídlo
 STR_8027_PAPER_TRUCK                                            :Vagon na papír
-STR_8028_COPPER_ORE_HOPPER                                      :Vagon na měděnou rudu
+STR_8028_COPPER_ORE_HOPPER                                      :Násypný vůz na měděnou rudu
 STR_8029_WATER_TANKER                                           :Cisternový vagon na vodu
 STR_802A_FRUIT_TRUCK                                            :Vagon na ovoce
 STR_802B_RUBBER_TRUCK                                           :Vagon na kaučuk
 STR_802C_SUGAR_TRUCK                                            :Vagon na cukr
-STR_802D_COTTON_CANDY_HOPPER                                    :Vagon na cukrovou vatu
-STR_802E_TOFFEE_HOPPER                                          :Vagon na karamel
-STR_802F_BUBBLE_VAN                                             :Vagon na bubliny
+STR_802D_COTTON_CANDY_HOPPER                                    :Násypný vůz na cukrovou vatu
+STR_802E_TOFFEE_HOPPER                                          :Násypný vůz na karamel
+STR_802F_BUBBLE_VAN                                             :Krytý vůz na bubliny
 STR_8030_COLA_TANKER                                            :Cisternový vagon na kolu
-STR_8031_CANDY_VAN                                              :Vagon na bonbony
-STR_8032_TOY_VAN                                                :Vagon na hračky
+STR_8031_CANDY_VAN                                              :Krytý vůz na bonbony
+STR_8032_TOY_VAN                                                :Krytý vůz na hračky
 STR_8033_BATTERY_TRUCK                                          :Vagon na baterie
 STR_8034_FIZZY_DRINK_TRUCK                                      :Vagon na limonády
 STR_8035_PLASTIC_TRUCK                                          :Vagon na plast
 STR_8036_X2001_ELECTRIC                                         :'X2001' (elektrická)
 STR_8037_MILLENNIUM_Z1_ELECTRIC                                 :'Millennium Z1' (elektrická)
 STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99
-STR_8039_PASSENGER_CAR                                          :Osobní vagon pro cestující
+STR_8039_PASSENGER_CAR                                          :Osobní vagon
 STR_803A_MAIL_VAN                                               :Poštovní vagon
 STR_803B_COAL_CAR                                               :Vagon na uhlí
 STR_803C_OIL_TANKER                                             :Cisternový vagon na ropu
-STR_803D_LIVESTOCK_VAN                                          :Vagon pro dobytek
-STR_803E_GOODS_VAN                                              :Vagon na zboží
-STR_803F_GRAIN_HOPPER                                           :Vagon na zrní
+STR_803D_LIVESTOCK_VAN                                          :Krytý vůz na dobytek
+STR_803E_GOODS_VAN                                              :Krytý vůz na zboží
+STR_803F_GRAIN_HOPPER                                           :Násypný vůz na zrní
 STR_8040_WOOD_TRUCK                                             :Vagon na dřevo
-STR_8041_IRON_ORE_HOPPER                                        :Vagon na železnou rudu
+STR_8041_IRON_ORE_HOPPER                                        :Násypný vůz na železnou rudu
 STR_8042_STEEL_TRUCK                                            :Vagon na ocel
-STR_8043_ARMORED_VAN                                            :Vagon na ceniny
-STR_8044_FOOD_VAN                                               :Vagon na jídlo
+STR_8043_ARMORED_VAN                                            :Krytý vůz na ceniny
+STR_8044_FOOD_VAN                                               :Krytý vůz na jídlo
 STR_8045_PAPER_TRUCK                                            :Vagon na papír
-STR_8046_COPPER_ORE_HOPPER                                      :Vagon na měděnou rudu
+STR_8046_COPPER_ORE_HOPPER                                      :Násypný vůz na měděnou rudu
 STR_8047_WATER_TANKER                                           :Cisternový vagon na vodu
 STR_8048_FRUIT_TRUCK                                            :Vagon na ovoce
 STR_8049_RUBBER_TRUCK                                           :Vagon na kaučuk
 STR_804A_SUGAR_TRUCK                                            :Vagon na cukr
-STR_804B_COTTON_CANDY_HOPPER                                    :Vagon na cukrovou vatu
-STR_804C_TOFFEE_HOPPER                                          :Vagon na karamel
-STR_804D_BUBBLE_VAN                                             :Vagon na bubliny
+STR_804B_COTTON_CANDY_HOPPER                                    :Násypný vůz na cukrovou vatu
+STR_804C_TOFFEE_HOPPER                                          :Násypný vůz na karamel
+STR_804D_BUBBLE_VAN                                             :Krytý vůz na bubliny
 STR_804E_COLA_TANKER                                            :Cisternový vagon na kolu
-STR_804F_CANDY_VAN                                              :Vagon na bonbony
-STR_8050_TOY_VAN                                                :Vagon na hračky
+STR_804F_CANDY_VAN                                              :Krytý vůz na bonbony
+STR_8050_TOY_VAN                                                :Krytý vůz na hračky
 STR_8051_BATTERY_TRUCK                                          :Vagon na baterie
 STR_8052_FIZZY_DRINK_TRUCK                                      :Vagon na limonády
 STR_8053_PLASTIC_TRUCK                                          :Vagon na plast
@@ -2368,132 +2369,132 @@ STR_8055_LEV2_CYCLOPS_ELECTRIC                                  :Lev2 'Cyclops'
 STR_8056_LEV3_PEGASUS_ELECTRIC                                  :Lev3 'Pegasus' (elektrická)
 STR_8057_LEV4_CHIMAERA_ELECTRIC                                 :Lev4 'Chimaera' (elektrická)
 STR_8058_WIZZOWOW_ROCKETEER                                     :Wizzowow Rocketeer
-STR_8059_PASSENGER_CAR                                          :Osobní vagon pro cestující
+STR_8059_PASSENGER_CAR                                          :Osobní vagon
 STR_805A_MAIL_VAN                                               :Poštovní vagon
 STR_805B_COAL_CAR                                               :Vagon na uhlí
 STR_805C_OIL_TANKER                                             :Cisternový vagon na ropu
-STR_805D_LIVESTOCK_VAN                                          :Vagon pro dobytek
-STR_805E_GOODS_VAN                                              :Vagon na zboží
-STR_805F_GRAIN_HOPPER                                           :Vagon na zrní
+STR_805D_LIVESTOCK_VAN                                          :Krytý vůz na dobytek
+STR_805E_GOODS_VAN                                              :Krytý vůz na zboží
+STR_805F_GRAIN_HOPPER                                           :Násypný vůz na zrní
 STR_8060_WOOD_TRUCK                                             :Vagon na dřevo
-STR_8061_IRON_ORE_HOPPER                                        :Vagon na železnou rudu
+STR_8061_IRON_ORE_HOPPER                                        :Násypný vůz na železnou rudu
 STR_8062_STEEL_TRUCK                                            :Vagon na ocel
-STR_8063_ARMORED_VAN                                            :Vagon na ceniny
-STR_8064_FOOD_VAN                                               :Vagon na jídlo
+STR_8063_ARMORED_VAN                                            :Krytý vůz na ceniny
+STR_8064_FOOD_VAN                                               :Krytý vůz na jídlo
 STR_8065_PAPER_TRUCK                                            :Vagon na papír
-STR_8066_COPPER_ORE_HOPPER                                      :Vagon na měděnou rudu
+STR_8066_COPPER_ORE_HOPPER                                      :Násypný vůz na měděnou rudu
 STR_8067_WATER_TANKER                                           :Cisternový vagon na vodu
 STR_8068_FRUIT_TRUCK                                            :Vagon na ovoce
 STR_8069_RUBBER_TRUCK                                           :Vagon na kaučuk
 STR_806A_SUGAR_TRUCK                                            :Vagon na cukr
-STR_806B_COTTON_CANDY_HOPPER                                    :Vagon na cukrovou vatu
-STR_806C_TOFFEE_HOPPER                                          :Vagon na karamel
-STR_806D_BUBBLE_VAN                                             :Vagon na bubliny
+STR_806B_COTTON_CANDY_HOPPER                                    :Násypný vůz na cukrovou vatu
+STR_806C_TOFFEE_HOPPER                                          :Násypný vůz na karamel
+STR_806D_BUBBLE_VAN                                             :Krytý vůz na bubliny
 STR_806E_COLA_TANKER                                            :Cisternový vagon na kolu
-STR_806F_CANDY_VAN                                              :Vagon na bonbony
-STR_8070_TOY_VAN                                                :Vagon na hračky
+STR_806F_CANDY_VAN                                              :Krytý vůz na bonbony
+STR_8070_TOY_VAN                                                :Krytý vůz na hračky
 STR_8071_BATTERY_TRUCK                                          :Vagon na baterie
 STR_8072_FIZZY_DRINK_TRUCK                                      :Vagon na limonády
 STR_8073_PLASTIC_TRUCK                                          :Vagon na plast
-STR_8074_MPS_REGAL_BUS                                          :MPS Regal Bus
-STR_8075_HEREFORD_LEOPARD_BUS                                   :Hereford Leopard Bus
-STR_8076_FOSTER_BUS                                             :Foster Bus
-STR_8077_FOSTER_MKII_SUPERBUS                                   :Foster MkII Superbus
-STR_8078_PLODDYPHUT_MKI_BUS                                     :Ploddyphut MkI Bus
-STR_8079_PLODDYPHUT_MKII_BUS                                    :Ploddyphut MkII Bus
-STR_807A_PLODDYPHUT_MKIII_BUS                                   :Ploddyphut MkIII Bus
-STR_807B_BALOGH_COAL_TRUCK                                      :Balogh vůz na uhlí
-STR_807C_UHL_COAL_TRUCK                                         :Uhl vůz na uhlí
-STR_807D_DW_COAL_TRUCK                                          :DW vůz na uhlí
-STR_807E_MPS_MAIL_TRUCK                                         :MPS poštovní vůz
-STR_807F_REYNARD_MAIL_TRUCK                                     :Reynard poštovní vůz
-STR_8080_PERRY_MAIL_TRUCK                                       :Perry poštovní vůz
-STR_8081_MIGHTYMOVER_MAIL_TRUCK                                 :MightyMover poštovní vůz
-STR_8082_POWERNAUGHT_MAIL_TRUCK                                 :Powernaught poštovní vůz
-STR_8083_WIZZOWOW_MAIL_TRUCK                                    :Wizzowow poštovní vůz
-STR_8084_WITCOMBE_OIL_TANKER                                    :Witcombe cisterna na ropu
-STR_8085_FOSTER_OIL_TANKER                                      :Foster cisterna na ropu
-STR_8086_PERRY_OIL_TANKER                                       :Perry cisterna na ropu
-STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Talbott vůz na dobytek
-STR_8088_UHL_LIVESTOCK_VAN                                      :Uhl vůz na dobytek
-STR_8089_FOSTER_LIVESTOCK_VAN                                   :Foster vůz na dobytek
-STR_808A_BALOGH_GOODS_TRUCK                                     :Balogh vůz na zboží
-STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Craighead vůz na zboží
-STR_808C_GOSS_GOODS_TRUCK                                       :Goss vůz na zboží
-STR_808D_HEREFORD_GRAIN_TRUCK                                   :Hereford vůz na zrní
-STR_808E_THOMAS_GRAIN_TRUCK                                     :Thomas vůz na zrní
-STR_808F_GOSS_GRAIN_TRUCK                                       :Goss vůz na zrní
-STR_8090_WITCOMBE_WOOD_TRUCK                                    :Witcombe vůz na dřevo
-STR_8091_FOSTER_WOOD_TRUCK                                      :Foster vůz na dřevo
-STR_8092_MORELAND_WOOD_TRUCK                                    :Moreland vůz na dřevo
-STR_8093_MPS_IRON_ORE_TRUCK                                     :MPS vůz na železnou rudu
-STR_8094_UHL_IRON_ORE_TRUCK                                     :Uhl vůz na železnou rudu
-STR_8095_CHIPPY_IRON_ORE_TRUCK                                  :Chippy vůz na železnou rudu
-STR_8096_BALOGH_STEEL_TRUCK                                     :Balogh vůz na ocel
-STR_8097_UHL_STEEL_TRUCK                                        :Uhl vůz na ocel
-STR_8098_KELLING_STEEL_TRUCK                                    :Kelling vůz na ocel
-STR_8099_BALOGH_ARMORED_TRUCK                                   :Balogh obrněný vůz
-STR_809A_UHL_ARMORED_TRUCK                                      :Uhl obrněný vůz
-STR_809B_FOSTER_ARMORED_TRUCK                                   :Foster obrněný vůz
-STR_809C_FOSTER_FOOD_VAN                                        :Foster vůz na jídlo
-STR_809D_PERRY_FOOD_VAN                                         :Perry vůz na jídlo
-STR_809E_CHIPPY_FOOD_VAN                                        :Chippy vůz na jídlo
-STR_809F_UHL_PAPER_TRUCK                                        :Uhl vůz na papír
-STR_80A0_BALOGH_PAPER_TRUCK                                     :Balogh vůz na papír
-STR_80A1_MPS_PAPER_TRUCK                                        :MPS vůz na papír
-STR_80A2_MPS_COPPER_ORE_TRUCK                                   :MPS vůz na měděnou rudu
-STR_80A3_UHL_COPPER_ORE_TRUCK                                   :Uhl vůz na měděnou rudu
-STR_80A4_GOSS_COPPER_ORE_TRUCK                                  :Goss vůz na měděnou rudu
-STR_80A5_UHL_WATER_TANKER                                       :Uhl cisterna na vodu
-STR_80A6_BALOGH_WATER_TANKER                                    :Balogh cisterna na vodu
-STR_80A7_MPS_WATER_TANKER                                       :MPS cisterna na vodu
-STR_80A8_BALOGH_FRUIT_TRUCK                                     :Balogh vůz na ovoce
-STR_80A9_UHL_FRUIT_TRUCK                                        :Uhl vůz na ovoce
-STR_80AA_KELLING_FRUIT_TRUCK                                    :Kelling vůz na ovoce
-STR_80AB_BALOGH_RUBBER_TRUCK                                    :Balogh vůz na kaučuk
-STR_80AC_UHL_RUBBER_TRUCK                                       :Uhl vůz na kaučuk
-STR_80AD_RMT_RUBBER_TRUCK                                       :RMT vůz na kaučuk
-STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :MightyMover vůz na cukr
-STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Powernaught vůz na cukr
-STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Wizzowow vůz na cukr
-STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :MightyMover cisterna na kolu
-STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Powernaught cisterna na kolu
-STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Wizzowow cisterna na kolu
-STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :MightyMover vůz na cukrovou vatu
-STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Powernaught vůz na cukrovou vatu
-STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Wizzowow vůz na cukrovou vatu
-STR_80B7_MIGHTYMOVER_TOFFEE_TRUCK                               :MightyMover vůz na karamel
-STR_80B8_POWERNAUGHT_TOFFEE_TRUCK                               :Powernaught vůz na karamel
-STR_80B9_WIZZOWOW_TOFFEE_TRUCK                                  :Wizzowow vůz na karamel
-STR_80BA_MIGHTYMOVER_TOY_VAN                                    :MightyMover vůz na hračky
-STR_80BB_POWERNAUGHT_TOY_VAN                                    :Powernaught vůz na hračky
-STR_80BC_WIZZOWOW_TOY_VAN                                       :Wizzowow vůz na hračky
-STR_80BD_MIGHTYMOVER_CANDY_TRUCK                                :MightyMover vůz na bonbony
-STR_80BE_POWERNAUGHT_CANDY_TRUCK                                :Powernaught vůz na bonbony
-STR_80BF_WIZZOWOW_CANDY_TRUCK                                   :Wizzowow vůz na bonbony
-STR_80C0_MIGHTYMOVER_BATTERY_TRUCK                              :MightyMover vůz na baterie
-STR_80C1_POWERNAUGHT_BATTERY_TRUCK                              :Powernaught vůz na baterie
-STR_80C2_WIZZOWOW_BATTERY_TRUCK                                 :Wizzowow vůz na baterie
-STR_80C3_MIGHTYMOVER_FIZZY_DRINK                                :MightyMover vůz na limonády
-STR_80C4_POWERNAUGHT_FIZZY_DRINK                                :Powernaught vůz na limonády
-STR_80C5_WIZZOWOW_FIZZY_DRINK_TRUCK                             :Wizzowow vůz na limonády
-STR_80C6_MIGHTYMOVER_PLASTIC_TRUCK                              :MightyMover vůz na plast
-STR_80C7_POWERNAUGHT_PLASTIC_TRUCK                              :Powernaught vůz na plast
-STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Wizzowow vůz na plast
-STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :MightyMover vůz na bubliny
-STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Powernaught vůz na bubliny
-STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Wizzowow vůz na bubliny
-STR_80CC_MPS_OIL_TANKER                                         :MPS ropný tanker
-STR_80CD_CS_INC_OIL_TANKER                                      :CS-Inc. ropný tanker
-STR_80CE_MPS_PASSENGER_FERRY                                    :MPS trajekt pro cestující
-STR_80CF_FFP_PASSENGER_FERRY                                    :FFP trajekt pro cestující
-STR_80D0_BAKEWELL_300_HOVERCRAFT                                :Bakewell 300 vznášedlo
-STR_80D1_CHUGGER_CHUG_PASSENGER                                 :Chugger-Chug trajekt pro cestující
-STR_80D2_SHIVERSHAKE_PASSENGER_FERRY                            :Shivershake trajekt pro cestující
-STR_80D3_YATE_CARGO_SHIP                                        :Yate nákladní loď
-STR_80D4_BAKEWELL_CARGO_SHIP                                    :Bakewell nákladní loď
-STR_80D5_MIGHTYMOVER_CARGO_SHIP                                 :Mightymover nákladní loď
-STR_80D6_POWERNAUT_CARGO_SHIP                                   :Powernaut nákladní loď
+STR_8074_MPS_REGAL_BUS                                          :Autobus MPS Regal
+STR_8075_HEREFORD_LEOPARD_BUS                                   :Autobus Hereford Leopard
+STR_8076_FOSTER_BUS                                             :Autobus Foster
+STR_8077_FOSTER_MKII_SUPERBUS                                   :Autobus Foster MkII Superbus
+STR_8078_PLODDYPHUT_MKI_BUS                                     :Autobus Ploddyphut MkI
+STR_8079_PLODDYPHUT_MKII_BUS                                    :Autobus Ploddyphut MkII
+STR_807A_PLODDYPHUT_MKIII_BUS                                   :Autobus Ploddyphut MkIII
+STR_807B_BALOGH_COAL_TRUCK                                      :Vůz na uhlí Balogh
+STR_807C_UHL_COAL_TRUCK                                         :Vůz na uhlí Uhl
+STR_807D_DW_COAL_TRUCK                                          :Vůz na uhlí DW
+STR_807E_MPS_MAIL_TRUCK                                         :Poštovní vůz MPS
+STR_807F_REYNARD_MAIL_TRUCK                                     :Poštovní vůz Reynard
+STR_8080_PERRY_MAIL_TRUCK                                       :Poštovní vůz Perry
+STR_8081_MIGHTYMOVER_MAIL_TRUCK                                 :Poštovní vůz MightyMover
+STR_8082_POWERNAUGHT_MAIL_TRUCK                                 :Poštovní vůz Powernaught
+STR_8083_WIZZOWOW_MAIL_TRUCK                                    :Poštovní vůz Wizzowow
+STR_8084_WITCOMBE_OIL_TANKER                                    :Cisterna na ropu Witcombe
+STR_8085_FOSTER_OIL_TANKER                                      :Cisterna na ropu Foster
+STR_8086_PERRY_OIL_TANKER                                       :Cisterna na ropu Perry
+STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Vůz na dobytek Talbott
+STR_8088_UHL_LIVESTOCK_VAN                                      :Vůz na dobytek Uhl
+STR_8089_FOSTER_LIVESTOCK_VAN                                   :Vůz na dobytek Foster
+STR_808A_BALOGH_GOODS_TRUCK                                     :Vůz na zboží Balogh
+STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Vůz na zboží Craighead
+STR_808C_GOSS_GOODS_TRUCK                                       :Vůz na zboží Goss
+STR_808D_HEREFORD_GRAIN_TRUCK                                   :Vůz na zrní Hereford
+STR_808E_THOMAS_GRAIN_TRUCK                                     :Vůz na zrní Thomas
+STR_808F_GOSS_GRAIN_TRUCK                                       :Vůz na zrní Goss
+STR_8090_WITCOMBE_WOOD_TRUCK                                    :Vůz na dřevo Witcombe
+STR_8091_FOSTER_WOOD_TRUCK                                      :Vůz na dřevo Foster
+STR_8092_MORELAND_WOOD_TRUCK                                    :Vůz na dřevo Moreland
+STR_8093_MPS_IRON_ORE_TRUCK                                     :Vůz na železnou rudu MPS
+STR_8094_UHL_IRON_ORE_TRUCK                                     :Vůz na železnou rudu Uhl
+STR_8095_CHIPPY_IRON_ORE_TRUCK                                  :Vůz na železnou rudu Chippy
+STR_8096_BALOGH_STEEL_TRUCK                                     :Vůz na ocel Balogh
+STR_8097_UHL_STEEL_TRUCK                                        :Vůz na ocel Uhl
+STR_8098_KELLING_STEEL_TRUCK                                    :Vůz na ocel Kelling
+STR_8099_BALOGH_ARMORED_TRUCK                                   :Obrněný vůz Balogh
+STR_809A_UHL_ARMORED_TRUCK                                      :Obrněný vůz Uhl
+STR_809B_FOSTER_ARMORED_TRUCK                                   :Obrněný vůz Foster
+STR_809C_FOSTER_FOOD_VAN                                        :Vůz na jídlo Foster
+STR_809D_PERRY_FOOD_VAN                                         :Vůz na jídlo Perry
+STR_809E_CHIPPY_FOOD_VAN                                        :Vůz na jídlo Chippy
+STR_809F_UHL_PAPER_TRUCK                                        :Vůz na papír Uhl
+STR_80A0_BALOGH_PAPER_TRUCK                                     :Vůz na papír Balogh
+STR_80A1_MPS_PAPER_TRUCK                                        :Vůz na papír MPS
+STR_80A2_MPS_COPPER_ORE_TRUCK                                   :Vůz na měděnou rudu MPS
+STR_80A3_UHL_COPPER_ORE_TRUCK                                   :Vůz na měděnou rudu Uhl
+STR_80A4_GOSS_COPPER_ORE_TRUCK                                  :Vůz na měděnou rudu Goss
+STR_80A5_UHL_WATER_TANKER                                       :Cisterna na vodu Uhl
+STR_80A6_BALOGH_WATER_TANKER                                    :Cisterna na vodu Balogh
+STR_80A7_MPS_WATER_TANKER                                       :Cisterna na vodu MPS
+STR_80A8_BALOGH_FRUIT_TRUCK                                     :Vůz na ovoce Balogh
+STR_80A9_UHL_FRUIT_TRUCK                                        :Vůz na ovoce Uhl
+STR_80AA_KELLING_FRUIT_TRUCK                                    :Vůz na ovoce Kelling
+STR_80AB_BALOGH_RUBBER_TRUCK                                    :Vůz na kaučuk Balogh
+STR_80AC_UHL_RUBBER_TRUCK                                       :Vůz na kaučuk Uhl
+STR_80AD_RMT_RUBBER_TRUCK                                       :Vůz na kaučuk RMT
+STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :Vůz na cukr MightyMover
+STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Vůz na cukr Powernaught
+STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Vůz na cukr Wizzowow
+STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :Cisterna na kolu MightyMover
+STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Cisterna na kolu Powernaught
+STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Cisterna na kolu Wizzowow
+STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :Vůz na cukrovou vatu MightyMover
+STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Vůz na cukrovou vatu Powernaught
+STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Vůz na cukrovou vatu Wizzowow
+STR_80B7_MIGHTYMOVER_TOFFEE_TRUCK                               :Vůz na karamel MightyMover
+STR_80B8_POWERNAUGHT_TOFFEE_TRUCK                               :Vůz na karamel Powernaught
+STR_80B9_WIZZOWOW_TOFFEE_TRUCK                                  :Vůz na karamel Wizzowow
+STR_80BA_MIGHTYMOVER_TOY_VAN                                    :Vůz na hračky MightyMover
+STR_80BB_POWERNAUGHT_TOY_VAN                                    :Vůz na hračky Powernaught
+STR_80BC_WIZZOWOW_TOY_VAN                                       :Vůz na hračky Wizzowow
+STR_80BD_MIGHTYMOVER_CANDY_TRUCK                                :Vůz na bonbony MightyMover
+STR_80BE_POWERNAUGHT_CANDY_TRUCK                                :Vůz na bonbony Powernaught
+STR_80BF_WIZZOWOW_CANDY_TRUCK                                   :Vůz na bonbony Wizzowow
+STR_80C0_MIGHTYMOVER_BATTERY_TRUCK                              :Vůz na baterie MightyMover
+STR_80C1_POWERNAUGHT_BATTERY_TRUCK                              :Vůz na baterie Powernaught
+STR_80C2_WIZZOWOW_BATTERY_TRUCK                                 :Vůz na baterie Wizzowow
+STR_80C3_MIGHTYMOVER_FIZZY_DRINK                                :Vůz na limonády MightyMover
+STR_80C4_POWERNAUGHT_FIZZY_DRINK                                :Vůz na limonády Powernaught
+STR_80C5_WIZZOWOW_FIZZY_DRINK_TRUCK                             :Vůz na limonády Wizzowow
+STR_80C6_MIGHTYMOVER_PLASTIC_TRUCK                              :Vůz na plast MightyMover
+STR_80C7_POWERNAUGHT_PLASTIC_TRUCK                              :Vůz na plast Powernaught
+STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Vůz na plast Wizzowow
+STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :Vůz na bubliny MightyMover
+STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Vůz na bubliny Powernaught
+STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Vůz na bubliny Wizzowow
+STR_80CC_MPS_OIL_TANKER                                         :Ropný tanker MPS
+STR_80CD_CS_INC_OIL_TANKER                                      :Ropný tanker CS-Inc.
+STR_80CE_MPS_PASSENGER_FERRY                                    :Trajekt pro cestující MPS
+STR_80CF_FFP_PASSENGER_FERRY                                    :Trajekt pro cestující FFP
+STR_80D0_BAKEWELL_300_HOVERCRAFT                                :Vznášedlo Bakewell 300
+STR_80D1_CHUGGER_CHUG_PASSENGER                                 :Trajekt pro cestující Chugger-Chug
+STR_80D2_SHIVERSHAKE_PASSENGER_FERRY                            :Trajekt pro cestující Shivershake
+STR_80D3_YATE_CARGO_SHIP                                        :Nákladní loď Yate
+STR_80D4_BAKEWELL_CARGO_SHIP                                    :Nákladní loď Bakewell
+STR_80D5_MIGHTYMOVER_CARGO_SHIP                                 :Nákladní loď Mightymover
+STR_80D6_POWERNAUT_CARGO_SHIP                                   :Nákladní loď Powernaut
 STR_80D7_SAMPSON_U52                                            :Sampson U52
 STR_80D8_COLEMAN_COUNT                                          :Coleman Count
 STR_80D9_FFP_DART                                               :FFP Dart
@@ -2532,23 +2533,23 @@ STR_80F9_PLODDYPHUT_500                                         :Ploddyphut 500
 STR_80FA_FLASHBANG_X1                                           :Flashbang X1
 STR_80FB_JUGGERPLANE_M1                                         :Juggerplane M1
 STR_80FC_FLASHBANG_WIZZER                                       :Flashbang Wizzer
-STR_80FD_TRICARIO_HELICOPTER                                    :Vrtulník Tricairo
+STR_80FD_TRICARIO_HELICOPTER                                    :Vrtulník Tricario
 STR_80FE_GURU_X2_HELICOPTER                                     :Vrtulník Guru X2
 STR_80FF_POWERNAUT_HELICOPTER                                   :Vrtulník Powernaut
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Zpráva od výrobce dopravních prostředků
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Právě jsme vyvinuli nov{G ý ou é} {STRING.acc}. Měl byste zájem o roční výhradní právo na používání tohoto prostředku, aby byl otestován před uvedením na trh?
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Právě jsme vyvinuli nov{G ou ý é} {STRING.acc}. Měl byste zájem o roční výhradní právo na používání tohoto prostředku, aby byl otestován před uvedením na trh?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :{G=f}lokomotiva
 STR_8102_RAILROAD_LOCOMOTIVE.acc                                :{G=f}lokomotivu
-STR_8102_RAILROAD_LOCOMOTIVE.dat                                :{G=f}lokomotivu
+STR_8102_RAILROAD_LOCOMOTIVE.dat                                :
 STR_8103_ROAD_VEHICLE                                           :{G=n}silniční vozidlo
 STR_8104_AIRCRAFT                                               :{G=n}letadlo
 STR_8105_SHIP                                                   :{G=f}loď
 STR_8106_MONORAIL_LOCOMOTIVE                                    :{G=f}lokomotiva pro monorail
 STR_8106_MONORAIL_LOCOMOTIVE.acc                                :{G=f}lokomotivu pro monorail
-STR_8106_MONORAIL_LOCOMOTIVE.dat                                :{G=f}lokomotivu pro monorail
+STR_8106_MONORAIL_LOCOMOTIVE.dat                                :
 STR_8107_MAGLEV_LOCOMOTIVE                                      :{G=f}lokomotiva Maglev
 STR_8107_MAGLEV_LOCOMOTIVE.acc                                  :{G=f}lokomotivu Maglev
-STR_8107_MAGLEV_LOCOMOTIVE.dat                                  :{G=f}lokomotivu Maglev
+STR_8107_MAGLEV_LOCOMOTIVE.dat                                  :

 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}Železniční depo {TOWN}
@@ -2669,8 +2670,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Vložit
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Označený příkaz provádět do plného naložení
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Označený příkaz vyloží vozidlo
 STR_SERVICE_HINT                                                :{BLACK}Přeskoč tento cíl, pokud není potřeba pravidelná údržba
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Další {STRING} je k dispozici!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rychlost: {VELOCITY}  Výkon: {POWER}{}Cena provozu: {CURRENCY} ročně{}Kapacita: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Porucha
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Stáří: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} ročně
@@ -2697,6 +2696,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Neslučitelné
 STR_TRAIN_NO_POWER                                              :{RED}Bez proudu
 STR_TRAIN_START_NO_CATENARY                                     :Tato trať není elektrifikována, vlak nemůže odjet

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nov{G á ý é} {STRING} k dispozici!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nov{G á ý é} {STRING} k dispozici!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Silniční vozidlo v cestě
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} silniční{P "" "" ch} vozid{P lo la el}
@@ -2737,8 +2740,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Přesuň
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Nastav pohled na garáž
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Seznam silničních vozidel - klepni na vozidlo pro informace
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Koupit označené vozidlo
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nové silniční vozidlo je k dispozici!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Rychlost: {VELOCITY}{}Cena provozu: {CURRENCY} ročně{}Kapacita: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Přejmenovat silniční vozidlo
@@ -2810,8 +2811,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Ukázat
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Nastavit pohled na loď
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Poslat loď do doku
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Ukázat detaily lodi
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nová loď je k dispozici!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO}{}Cena provozu: {CURRENCY} ročně
 STR_982F_NAME_SHIP                                              :{BLACK}Přejmenovat loď

@@ -2884,8 +2883,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Ukázat
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Nastavit pohled na letadlo
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Poslat letadlo do hangáru
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Ukázat detaily letadla
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nové letadlo je k dispozici!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {COMMA} cestující{P "" "" ch}, {COMMA} balík{P "" y ů} pošty{}Cena provozu: {CURRENCY} ročně

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Přejmenovat letadlo
@@ -2963,6 +2960,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Právě se chystáš změnit nastavení grafik za běžící hry; může to shodit OpenTTD.{}Jsi si s tím opravdu jist/a?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Přidat
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Přidat NewGRF soubor do seznamu
 STR_NEWGRF_REMOVE                                               :{BLACK}Odebrat
@@ -3200,4 +3198,10 @@ STR_MEASURE_AREA                                                :{BLACK}Oblast:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Délka: {NUM}{}Výškový rozdíl: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Oblast: {NUM} x {NUM}{}Výškový rozdíl: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -590,6 +590,7 @@ 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
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Placér
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Placér fyrtårn
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Placér sender
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definer ørkenområde.{}Hold CTRL nede for at fjerne det
-STR_CREATE_LAKE                                                 :{BLACK}Definer vandområde.{}Vil oversvømme nærlæggende land i samme plan
+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
@@ -1207,7 +1208,7 @@ 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_BUILD_CANALS_TIP                                            :{BLACK}Byg kanaler.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikke bygge en sluse her...
@@ -1503,8 +1504,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ør: {CURRENCY}
-STR_FEEDER                                                      :{YELLOW}Overfør: {CURRENCY}
+STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Overført: {CURRENCY}
+STR_FEEDER                                                      :{YELLOW}Overført: {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...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Indsæt
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Få den markerede ordre til at tvinge toget til at vente på en fuld last
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Få den markerede ordre til at tvinge toget til at aflæsse
 STR_SERVICE_HINT                                                :{BLACK}Spring denne ordre over medmindre der er behov for service
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Ny {STRING} tilgængelig nu!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Pris: {CURRENCY} Vægt: {WEIGHT_S}{}Hastighed: {VELOCITY}  Styrke: {POWER}{}Driftsomkostninger: {CURRENCY}/år{}Kapacitet: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Gået i stykker
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftsomkostninger: {LTBLUE}{CURRENCY}/år
@@ -2633,6 +2632,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Skinnetyperne p
 STR_TRAIN_NO_POWER                                              :{RED}Ingen strøm
 STR_TRAIN_START_NO_CATENARY                                     :Toget kan ikke køre, fordi sporet ikke har køreledninger

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Ny {STRING} er nu tilgængelig!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Ny {STRING} er nu tilgængelig!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Køretøj i vejen
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Køretøj{P "" er}
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Træk k
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centrer skærmen over værkstedets lokalitet
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Liste over køretøjstyper - klik på køretøj for information
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Byg det markerede køretøj
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nyt vejkøretøj er tilgængeligt!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Pris: {CURRENCY}{}Hastighed: {VELOCITY}{}Driftsomkostninger: {CURRENCY}/år{}Kapacitet: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Giv køretøjet et navn
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Vis skib
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrer skærmen over skibets lokalitet
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Send skibet til dok. CTRL+klik vil kun servicere
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Vis detaljer omkring skibet
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nyt skib er tilgængeligt!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pris: {CURRENCY} Maks. hastighed: {VELOCITY}{}Kapacitet: {CARGO}{}Driftsomkostninger: {CURRENCY}/år
 STR_982F_NAME_SHIP                                              :{BLACK}Giv skibet et navn

@@ -2765,7 +2764,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 sejles med:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vælg den lasttype der skal transporteres:
 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)
@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Vis flye
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrer skærmen over flyets lokalitet
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Send flyet til en hangar. CTRL+klik vil kun servicere
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Vis detaljet omkring flyet
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nyt fly tilgængeligt!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pris: {CURRENCY} Maks. hastighed: {VELOCITY}{}Kapacitet: {COMMA} passagerer, {COMMA} sække post{}Driftsomkostninger: {CURRENCY}/år

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Navngiv flyet
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du er ved at ændre et igangværende spil; dette kan få OpenTTD til at gå ned.{}Er du helt sikker på at du vil fortsætte?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Tilføj
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Tilføj et NewGRF sæt til listen
 STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Areal: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Længde: {NUM}{}Højdeforskel: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Areal: {NUM} x {NUM}{}Højdeforskel: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -590,6 +590,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Eerste
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Eerste voertuig bij concurrerend station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Ongelukken/rampen
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Bedrijfsinformatie
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Openen / sluiten van industrieën
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Veranderingen in de economie
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Advies/informatie over voertuigen van de speler
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nieuwe voertuigen
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Plaats s
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Plaats vuurtoren
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plaats radiomast
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definieer woestijn gebied.{}Gebruik CTRL om het te verwijderen
-STR_CREATE_LAKE                                                 :{BLACK}Definieer watergebied.{}Het zal de omgeving overstromen als deze op zeeniveau ligt
+STR_CREATE_LAKE                                                 :{BLACK}Definiëer water gebied.{}Maak een kanaal, tenzij CTRL wordt vastgehouden op zee niveau, dan zal de omgeving overstromen
 STR_0290_DELETE                                                 :{BLACK}Verwijder
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Verwijder deze hele stad
 STR_0292_SAVE_SCENARIO                                          :Scenario opslaan
@@ -1207,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Willekeu
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plant bomen van willekeurig type

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kan hier geen kanaal bouwen...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Bouw kanaal
+STR_BUILD_CANALS_TIP                                            :{BLACK}Bouw kanalen.
 STR_LANDINFO_CANAL                                              :Kanaal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan hier geen sluis bouwen...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Voeg een
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Zorg dat de geselecteerde order het voertuig forceert te wachten voor een volledige belading
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Zorg dat de geselecteerde order het voertuig forceert uit te laden
 STR_SERVICE_HINT                                                :{BLACK}Sla deze order over tenzij een reparatie nodig is
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nieuwe {STRING} nu beschikbaar!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Prijs: {CURRENCY} Gewicht: {WEIGHT_S}{}Snelheid: {VELOCITY}  Kracht: {POWER}{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Kapot
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Brandstofkosten: {LTBLUE}{CURRENCY}/jr
@@ -2633,6 +2632,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :spoortypes niet
 STR_TRAIN_NO_POWER                                              :{RED}Geen stroom
 STR_TRAIN_START_NO_CATENARY                                     :Er is geen bovenleiding, de trein kan niet starten

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nieuw {STRING} nu beschikbaar!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nieuw {STRING} nu beschikbaar!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Wegvoertuig in de weg
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Wegvoertuigen
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Sleep ee
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centreer hoofdscherm op wegvoertuigs depot lokatie
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Wegvoertuig selectie lijst - klik op voertuig voor informatie
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bouw het geselecteerde wegvoertuig
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nieuw wegvoertuig nu beschikbaar!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Prijs: {CURRENCY}{}Snelheid: {VELOCITY}{}Brandstofkosten: {CURRENCY}/jr{}Capaciteit: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Hernoem wegvoertuig
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Laat ord
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centreer hoofdbeeld op de lokatie van dit schip
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Stuur schip naar depot
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Laat details van schip zien
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nieuw schip nu beschikbaar!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prijs: {CURRENCY} Max. snelheid: {VELOCITY}{}Capaciteit: {CARGO}{}Brandstofkosten: {CURRENCY}/jr
 STR_982F_NAME_SHIP                                              :{BLACK}Hernoem schip

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Laat vli
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centreer hoofdbeeld op de vliegtuiglokatie
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Stuur vliegtuig naar hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Laat vliegtuigdetails zien
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nieuw vliegtuig nu beschikbaar!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prijs: {CURRENCY} Max. snelheid: {VELOCITY}{}Capaciteit: {COMMA} passagiers, {COMMA} zakken post{}Brandstofkosten: {CURRENCY}/jr

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Hernoem vliegtuig
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Je staat op het punt om wijzigingen te maken aan een lopend spel; dit dan OpenTTD laten crashen.{}Weet je het heel zeker?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Toevoegen
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Voeg een NewGRF bestand toe aan te lijst
 STR_NEWGRF_REMOVE                                               :{BLACK}Verwijderen
@@ -3060,7 +3058,7 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Alles behalve {

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

-STR_GENERATE                                                    :{WHITE}Creeër
+STR_GENERATE                                                    :{WHITE}Maak aan
 STR_RANDOM                                                      :{BLACK}Willekeurig maken
 STR_RANDOM_HELP                                                 :{BLACK}Wijzig het willekeurige getal voor terrein creatie
 STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Wereld maken
@@ -3096,14 +3094,14 @@ 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 instellen
+STR_SETTINGUP_GAME                                              :{BLACK}Spel aan het configureren
 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 platte kaart
 STR_SE_RANDOM_LAND                                              :{WHITE}Willekeurig land
-STR_SE_NEW_WORLD                                                :{BLACK}Creeër nieuw scenario
+STR_SE_NEW_WORLD                                                :{BLACK}Maak nieuw scenario aan
 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
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Gebied:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengte: {NUM}{}Hoogte verschil: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Gebied: {NUM} x {NUM}{}Hoogte verschil: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -590,6 +590,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival of first vehicle at competitor's station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / disasters
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Company information
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Open / close of industries
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Economy changes
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Advice / information on player's vehicles
 STR_020C_NEW_VEHICLES                                           :{YELLOW}New vehicles
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Place ro
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Place lighthouse
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Place transmitter
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Define desert area.{}Press and hold CTRL to remove it
-STR_CREATE_LAKE                                                 :{BLACK}Define water area.{}It will flood its surroundings if at sea level
+STR_CREATE_LAKE                                                 :{BLACK}Define water area.{}Make a canal, unless CTRL is held down at sea level, when it will flood the surroundings instead
 STR_0290_DELETE                                                 :{BLACK}Delete
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Delete this town completely
 STR_0292_SAVE_SCENARIO                                          :Save scenario
@@ -1207,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Trees of
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Place trees of random type

 STR_CANT_BUILD_CANALS                                           :{WHITE}Can't build canals here...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Build canals. Press CTRL to place sea tiles (at sea-level only.)
+STR_BUILD_CANALS_TIP                                            :{BLACK}Build canals.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Can't build locks here...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Insert a
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Make the highlighted order force the vehicle to wait for a full load
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Make the highlighted order force the vehicle to unload
 STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}New {STRING} now available!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY}  Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Broken down
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
@@ -2633,6 +2632,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Incompatible ra
 STR_TRAIN_NO_POWER                                              :{RED}No power
 STR_TRAIN_START_NO_CATENARY                                     :This track lacks catenary, so the train can't start

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}New {STRING} now available!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}New {STRING} now available!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Road vehicle in the way
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Road Vehicle{P "" s}
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Drag roa
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centre main view on road vehicle depot location
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Road vehicle selection list - click on vehicle for information
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Build the highlighted road vehicle
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}New road vehicle now available!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cost: {CURRENCY}{}Speed: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name road vehicle
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Show shi
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centre main view on ship's location
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Send ship to depot. CTRL+click will only service
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Show ship details
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}New ship now available!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}Name ship

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Show air
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centre main view on aircraft's location
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Send aircraft to hangar. CTRL+click will only service
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Show aircraft details
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}New aircraft now available!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {COMMA} passengers, {COMMA} bags of mail{}Running Cost: {CURRENCY}/yr

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Name aircraft
@@ -3136,4 +3133,9 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Length: {NUM}{}Height difference: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Height difference: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
@@ -591,6 +591,7 @@ 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
@@ -730,7 +731,7 @@ 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.{}Inundos la ĉirkaŭon se marnivele
+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
@@ -990,7 +991,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}Trajnno {COMMA} havas nevalidan stacion en la ordenoj
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trajno {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
@@ -1208,7 +1209,7 @@ 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. Premu CTRL por meti mar-kvadratojn (nur marnivele.)
+STR_BUILD_CANALS_TIP                                            :{BLACK}Konstruu kanalojn.
 STR_LANDINFO_CANAL                                              :Kanalo

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Ne povas konstrui kluzojn ĉi tie...
@@ -1384,7 +1385,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}Enaŭguro:  {WHITE}{NUM}
+STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaŭ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}
@@ -2117,7 +2118,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}Enaŭguris: {WHITE}{NUM}
+STR_7038_INAUGURATED                                            :{GOLD}Inaŭgurita: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Veturiloj:
 STR_TRAINS                                                      :{WHITE}{COMMA} trajno{P "" j}
 STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} vojveturilo{P "" j}
@@ -2606,8 +2607,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Enigu no
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}La elektita ordeno igu la veturilon atendi ĝis plena ŝarĝo
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}La elektita ordeno igu la veturilon deŝarĝi
 STR_SERVICE_HINT                                                :{BLACK}Transsaltu ordenon ĝis prizorgo necesos
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nova {STRING} nun haveblas!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kosto: {CURRENCY} Pezo: {WEIGHT_S}{}Rapideco: {VELOCITY}  Forto: {POWER}{}Irkosto: po {CURRENCY} jare{}Kapablo: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Rompite
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aĝo: {LTBLUE}{STRING}{BLACK}   Irkosto: {LTBLUE}po {CURRENCY} jare
@@ -2634,6 +2633,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Neinterŝanĝeb
 STR_TRAIN_NO_POWER                                              :{RED}Senforte
 STR_TRAIN_START_NO_CATENARY                                     :Mankas ĉi-trake supera elektro, do la trajno ne povas starti

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nova {STRING} nun haveblas!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nova {STRING} nun haveblas!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vojveturilo okupas la lokon
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vojveturilo{P "" j}
@@ -2674,8 +2677,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Tiru voj
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centre vidu vojveturilan deponejon en la ĉefvido
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Vojveturilelektan liston - alklaku veturilon por informoj
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Kreu la elektitan vojveturilon
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nova vojveturilo nun haveblas!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kosto: {CURRENCY}{}Rapideco: {VELOCITY}{}Irkosto: po {CURRENCY} jare{}Kapablo: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nomu vojveturilon
@@ -2747,8 +2748,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Montru
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centre vidu ŝipon en ĉefvido
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Sendu ŝipon al deponejo. CTRL+klako nur prizorgos
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Montru ŝipajn detalojn
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nova ŝipo nun haveblas!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosto: {CURRENCY} Maksimuma rapideco: {VELOCITY}{}Kapablo: {CARGO}{}Irkosto: po {CURRENCY} jare
 STR_982F_NAME_SHIP                                              :{BLACK}Nomu ŝipon

@@ -2821,8 +2820,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Montru a
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centre vidu aviadilon en la ĉefvido
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Sendu aviadilon al hangaro. CTRL+klako nur prizorgos
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Montru aviadilajn detalojn
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nova aviadilo nun haveblas!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosto: {CURRENCY} Maksimuma rapideco: {VELOCITY}{}Kapablo: {COMMA} pasaĝeroj, {COMMA} sakoj da poŝto{}Irkosto: po {CURRENCY} jare

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nomu aviadilon
@@ -2900,6 +2897,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vi ĉi tiel ŝanĝos al kuranta ludo; tio povas kraŝigi la ludon.{}Ĉu vi nepre volas fari tion?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Aldonu
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Aldonu NewGRF-dosieron al la listo
 STR_NEWGRF_REMOVE                                               :{BLACK}Forviŝu
@@ -3138,4 +3136,10 @@ STR_MEASURE_AREA                                                :{BLACK}Regiono:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Longo: {NUM}{}Altecdiferenco: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Regiono: {NUM} x {NUM}{}Altecdiferenco: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -690,6 +690,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Mängij
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Konkurendi jaama saabus esimene veovahend
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Õnnetused / katastroofid
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Ettevõtte teave
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Ava / sulge tööstuseid
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Muutused majanduses
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Soovitused ja teated mängija veovahendite kohta
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Uued veovahendid
@@ -733,7 +734,7 @@ STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Oled sa
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Maastiku loomine
 STR_022F_TOWN_GENERATION                                        :{BLACK}Linnade loomine
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Tööstuste loomine
-STR_0231_ROAD_CONSTRUCTION                                      :{BLACK}Teede ehitamine
+STR_0231_ROAD_CONSTRUCTION                                      :{BLACK}Teeehitus
 STR_0233_TOWN_GENERATION                                        :{WHITE}Linnade loomine
 STR_0234_NEW_TOWN                                               :{BLACK}Uus linn
 STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Ehita uus linn
@@ -794,12 +795,12 @@ STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Ehita te
 STR_026A_CONSTRUCT_FARM                                         :{BLACK}Raja farm
 STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Ehita rauamaagikaevandus
 STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Ehita naftapuuraugud
-STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Ehita pank (seda saab ehitada vaid linnadesse, mille rahvastikuarv ületab 1200)
+STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Ehita pank (saab ehitada vaid linnadesse, mille rahvastikuarv ületab 1200)
 STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Ehita paberitehas
 STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Ehita toidutööstus
 STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Ehita trükikoda
 STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Ehita kullakaevandus
-STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Ehita pank (seda saab vaid linnadesse ehitada)
+STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Ehita pank (saab vaid linnadesse ehitada)
 STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Ehita saeveski (vihmametsade puhustamiseks ja puidu tootmiseks)
 STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}Istuta puuviljaistandus
 STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Istuta kummipuuistandus
@@ -829,7 +830,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Loo maas
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Ehita tuletorn
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Paigalda saatjamast
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Loo kõrbealad.{}Eemaldamiseks klõpsa hoides all CTRL nuppu
-STR_CREATE_LAKE                                                 :{BLACK}Märgi vee ala.{}See uputab kogu läheduse kui on mereveetasemel
+STR_CREATE_LAKE                                                 :{BLACK}Määratle veealad.{}Ehita kanal. CTRL-klahvi all hoides ujutab ümbruskonna üle.
 STR_0290_DELETE                                                 :{BLACK}Kustuta
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Hävita see linn täielikult
 STR_0292_SAVE_SCENARIO                                          :Salvesta kaart
@@ -1307,7 +1308,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Suvalise
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Istutab suvalisi puid

 STR_CANT_BUILD_CANALS                                           :{WHITE}Siia ei saa kanaleid ehitada...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Kanali ehitamine. Veeruutude ehitamiseks vajuta CTRL (ainult merepinna kõrgusel)
+STR_BUILD_CANALS_TIP                                            :{BLACK}Ehita kanaleid.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Siia ei saa lüüse ehitada...
@@ -2489,7 +2490,7 @@ STR_80A4_GOSS_COPPER_ORE_TRUCK                                  :Goss vasemaagiv
 STR_80A5_UHL_WATER_TANKER                                       :Uhl veeveok
 STR_80A6_BALOGH_WATER_TANKER                                    :Balogh veeveok
 STR_80A7_MPS_WATER_TANKER                                       :MPS veeveok
-STR_80A8_BALOGH_FRUIT_TRUCK                                     :Balogh veeveok
+STR_80A8_BALOGH_FRUIT_TRUCK                                     :Balogh puuviljaveok
 STR_80A9_UHL_FRUIT_TRUCK                                        :Uhl puuviljaveok
 STR_80AA_KELLING_FRUIT_TRUCK                                    :Kelling puuviljaveok
 STR_80AB_BALOGH_RUBBER_TRUCK                                    :Balogh kummiveok
@@ -2619,7 +2620,7 @@ STR_INVALID_ORDER                                               :{RED} (Ebasobiv

 STR_UNKNOWN_DESTINATION                                         :tundmatu sihtpunkt
 STR_8812_EMPTY                                                  :{LTBLUE}Tühi
-STR_8813_FROM                                                   :{LTBLUE}{CARGO} {STATION}'st
+STR_8813_FROM                                                   :{LTBLUE}{CARGO} jaamast {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} jaamast {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Rong {COMMA} ootab depoos
 STR_8815_NEW_VEHICLES                                           :{BLACK}Uus rong
@@ -2705,8 +2706,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Lisa uus
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Sunni valitud käsu juures oodata täis laadingut
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Sunni valitud käsu juures maha laadida.
 STR_SERVICE_HINT                                                :{BLACK}Jäta see käsk vahele, kui teenindust ei vajata
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Uus {STRING} on nüüd olemas!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Maksumus: {CURRENCY} Mass: {WEIGHT_S}{}Kiirus: {VELOCITY}  Võimsus: {POWER}{}Kulu: {CURRENCY}/aastas{}Mahutus: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Lagunes
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK}   Kulud: {LTBLUE}{CURRENCY}/aastas
@@ -2733,6 +2732,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Ühildamatud ra
 STR_TRAIN_NO_POWER                                              :{RED}Vool puudub
 STR_TRAIN_START_NO_CATENARY                                     :Selle raja ahel puudub, rong ei saa sõitu alustada

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Uus {STRING} saadaval!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Uus {STRING} saadaval!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Maanteesõiduk on teel ees
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} maanteesõiduk{P "" it}
@@ -2773,8 +2776,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Et müü
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Vii vaade garaaþi asukohale
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Nimekiri maanteesõidukitest - maanteesõiduki kohta info saamiseks vajuta sellele
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Ehita valitud maanteesõiduk
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Uus maanteesõiduk on nüüdsest saadaval!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Hind: {CURRENCY}{}Kiirus: {VELOCITY}{}Hoolduskulud: {CURRENCY}/aastas{}Mahutavus: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nimeta maanteeveok ümber
@@ -2846,8 +2847,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Näita l
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Vii vaade laeva asukohale
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Saada laev paadikuuri
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Näita laeva detaile
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Uus laev on nüüdsest saadaval!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Hind: {CURRENCY} Maks. Kiirus: {VELOCITY}{}Mahutavus: {CARGO}{}Hoolduskulud: {CURRENCY}/aasta
 STR_982F_NAME_SHIP                                              :{BLACK}Anna laevale nimi

@@ -2920,8 +2919,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Näita l
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Vii peavaade lennukile
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Saada lennuk angaari
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Näita lennuki detaile
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Uus lennuk on saadaval!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Hind: {CURRENCY} Maks. kiirus: {VELOCITY}{}Mahutavus: {COMMA} reisijat, {COMMA} kotti kirju{}Hoolduskulud: {CURRENCY}/aastas

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Anna lennukile nimi
@@ -2999,6 +2996,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Sa oled tegemas muudatusi töötavasse mängu; see võib OpenTTD kokku jooksutada.{}Kas sa oled täielikult veendunud selles?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Lisa
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Lisa nimekirja NewGRF fail
 STR_NEWGRF_REMOVE                                               :{BLACK}Eemalda
@@ -3235,4 +3233,10 @@ STR_MEASURE_AREA                                                :{BLACK}Pindala:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Pikkus: {NUM}{}Kürguste erinevusj: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Pindala: {NUM} x {NUM}{}Kõrguste erinevus: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -47,7 +47,7 @@ STR_0027_COLA                                                   :Limsaa
 STR_0028_COTTON_CANDY                                           :Hattaraa
 STR_0029_BUBBLES                                                :Kuplia
 STR_002A_TOFFEE                                                 :Toffeeta
-STR_002B_BATTERIES                                              :Pattereita
+STR_002B_BATTERIES                                              :Paristoja
 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}Rakennus
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Rakennukset/Teollisuus
 STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Liikennevälineet
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100 m
 STR_00F1_200M                                                   :{BLACK}{TINYFONT}200 m
@@ -590,6 +590,7 @@ 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
@@ -729,7 +730,7 @@ 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 veden alue.{}Vesi tulvii ympäröivään maastoon, jos se on merenpinnan tasolla.
+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
@@ -744,7 +745,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 muokkain
+STR_029C_QUIT_EDITOR                                            :{WHITE}Sulje editori
 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.
@@ -819,12 +820,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 tyyli kaupunkien nimille.
+STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Valitse kaupunkien nimien tyyli.

 STR_02F4_AUTOSAVE                                               :{BLACK}Automaattitallennus
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -832,7 +833,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                                        :Joka 12. kuukausi
+STR_02FA_EVERY_12_MONTHS                                        :Kerran vuodessa
 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.
@@ -842,7 +843,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.
@@ -863,7 +864,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}Kuvankaappaus tallennettu levyllä nimellä '{STRING}'.
+STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Kuvakaappaus tallennettu nimellä '{STRING}'.
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Kuvakaappaus epäonnistui!

 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Osta maata tulevaa käyttöä varten.
@@ -1207,7 +1208,7 @@ 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 kanaali
+STR_BUILD_CANALS_TIP                                            :{BLACK}Rakenna kanavia.
 STR_LANDINFO_CANAL                                              :Kanaali

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Sulkua ei voi rakentaa tähän...
@@ -1507,14 +1508,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 madaltaa...
+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_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                                      :Lumenpeittämää maata
+STR_080F_SNOW_COVERED_LAND                                      :Lumen peittämää maata
 STR_0810_DESERT                                                 :Aavikkoa

 ##id 0x1000
@@ -1531,12 +1532,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 tästä...
-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.
+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
@@ -1566,25 +1567,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 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_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_180A_ROAD_CONSTRUCTION                                      :Tien rakentaminen
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Rakenna tieosuus.
-STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Rakenna huoltoasema (ajoneuvojen rakentamista ja huoltoa varten)
+STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Rakenna autovarikko (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 huoltoaseman suunta.
+STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Valitse autovarikon 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                                     :Huoltoasema
+STR_1817_ROAD_VEHICLE_DEPOT                                     :Autovarikko
 STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Tasoristeys

 ##id 0x2000
@@ -1594,23 +1595,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 tuhota ensin.
+STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Rakennus täytyy purkaa 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}Kaupunkia ei voi uudelleennimetä...
+STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kaupungin nimeä ei voi vaihtaa.
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN}: paikallisviranomaiset kieltäytyvät.
-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_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_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                                   :Pienasuntokortteli
+STR_2011_SMALL_BLOCK_OF_FLATS                                   :Pientaloalue
 STR_2012_CHURCH                                                 :Kirkko
 STR_2013_LARGE_OFFICE_BLOCK                                     :Suuri toimistorakennus
-STR_2014_TOWN_HOUSES                                            :Kaupungin talot
+STR_2014_TOWN_HOUSES                                            :Kaupungintalot
 STR_2015_HOTEL                                                  :Hotelli
 STR_2016_STATUE                                                 :Patsas
 STR_2017_FOUNTAIN                                               :Suihkulähde
@@ -1628,14 +1629,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}Tarjolla olevat tuet:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tarjotut 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 sisällä enää tukia.
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tuki päättynyt:{}{}{STRING} väli {STRING} - {STRING} ei ole enää tuettu.
 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!
@@ -1643,22 +1644,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ö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_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_203C_THEATER                                                :Teatteri
 STR_203D_STADIUM                                                :Stadion
-STR_203E_OFFICES                                                :Toimistoa
-STR_203F_HOUSES                                                 :Taloa
+STR_203E_OFFICES                                                :Toimistoja
+STR_203F_HOUSES                                                 :Taloja
 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}Saatavilla olevat toiminnot:
+STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Toiminnot:
 STR_2046_SMALL_ADVERTISING_CAMPAIGN                             :Pieni mainoskampanja
 STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :Keskikokoinen mainoskampanja
 STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :Suuri mainoskampanja
@@ -1667,9 +1668,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} 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_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_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}
@@ -1694,15 +1695,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}...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_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_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ää
@@ -1715,19 +1716,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 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_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_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/lastausaluetta.
+STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}Liian lähellä toista asemaa tai 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:
@@ -1738,24 +1739,24 @@ STR_3036_VERY_POOR                                              :Hyvin kehno
 STR_3037_POOR                                                   :Kehno
 STR_3038_MEDIOCRE                                               :Keskinkertainen
 STR_3039_GOOD                                                   :Hyvä
-STR_303A_VERY_GOOD                                              :Oikein hyvä
+STR_303A_VERY_GOOD                                              :Erittäin 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 enää ota vastaan {STRING}.
-STR_303F_NO_LONGER_ACCEPTS_OR                                   :{WHITE}{STATION} ei enää ota vastaan {STRING} tai {STRING}.
+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_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ää tuhota ensin.
-STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Lastauslaituri pitää tuhota ensin.
+STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Linja-autoasema pitää purkaa ensin.
+STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Lastauslaituri pitää purkaa 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}...paikka sopimaton.
+STR_304B_SITE_UNSUITABLE                                        :{WHITE}...huono paikka
 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.
@@ -1768,7 +1769,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/tyyppi.
+STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Valitse lentokentän koko ja tyyppi.
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
 STR_305E_RAILROAD_STATION                                       :Rautatieasema
@@ -1784,7 +1785,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äyhdenmukaiset asemat poissa käytöstä.
+STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...epäsymmetriset 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)
@@ -1792,9 +1793,9 @@ STR_STAT_CLASS_DFLT                                             :Oletusasema
 STR_STAT_CLASS_WAYP                                             :Rastit

 ##id 0x3800
-STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Telakan suunn.
+STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Telakan suunta
 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
@@ -1886,8 +1887,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.
@@ -2191,6 +2192,7 @@ 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
@@ -2604,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Lisää
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Aseta korostettu pysähdys pakottamaan ajoneuvon odottamaan täyttä lastausta.
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Aseta korostettu pysähdys pakottamaan ajoneuvo odottamaan purkua.
 STR_SERVICE_HINT                                                :{BLACK}Ohita tämä määräys, ellei palvelua tarvita.
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Uusi {STRING} saatavilla!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kulu: {CURRENCY} Paino: {WEIGHT_S}{}Nopeus: {VELOCITY}  Teho: {POWER}{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Rikki
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/vuosi
@@ -2632,6 +2632,10 @@ 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ä.
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} ajoneuvoa
@@ -2672,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Vedä aj
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Keskitä päänäkymä huoltoaseman sijaintiin.
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Ajoneuvon valintalista - napsauta ajoneuvoa saadaksesi tietoja.
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Rakenna valittu ajoneuvo.
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Uusi ajoneuvo on saatavilla!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kulu: {CURRENCY}{}Nopeus: {VELOCITY}{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nimeä ajoneuvo
@@ -2745,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Näytä
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Keskitä näkymä laivan sijaintiin.
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Lähetä laiva telakalle.
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Näytä laivan tiedot.
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Uusi laiva saatavilla!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kulu: {CURRENCY} Huippunopeus: {VELOCITY}{}Kapasiteetti: {CARGO}{}Käyttökustannukset: {CURRENCY}/vuosi
 STR_982F_NAME_SHIP                                              :{BLACK}Nimeä laiva

@@ -2819,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Näytä
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Keskitä näkymä lentokoneen sijaintiin.
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Lähetä lentokone lentokonehalliin.
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Näytä lentokoneen tiedot.
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Uusi lentokone saatavilla!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kulu: {CURRENCY} Huippunopeus: {VELOCITY}{}Kapasiteetti: {COMMA} matkustajaa, {COMMA} säkkiä postia{}Käyttökustannus: {CURRENCY}/vuosi

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nimeä lentokone
@@ -2898,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5-summa: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Olet tekemässä muutoksia käynnissä olevaan peliin. OpenTTD voi kaatua.{}Oletko varma?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Lisää
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Lisää NewGRF-tiedosto listaan
 STR_NEWGRF_REMOVE                                               :{BLACK}Poista
@@ -3135,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Pinta-al
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Pituus: {NUM}{}Korkeusero: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Pinta-ala: {NUM} x {NUM}{}Korkeusero: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -591,6 +591,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}1er vé
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}1er véhicule dans la station d'un competiteur
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / désastres
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informations corporatives
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Ouvertures/fermetures d'industries
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Changements économiques
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Conseils / information sur les véhicules du joueur
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nouveaux véhicules
@@ -730,7 +731,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Placer d
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Placer un Phare
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Placer un Transmetteur
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Définir une zone désertique.{}Garder Ctrl enfoncé pour retrait
-STR_CREATE_LAKE                                                 :{BLACK}Définir une zone d'eau.{}Inondera ses abords si au niveau de la mer
+STR_CREATE_LAKE                                                 :{BLACK}Définir une zone d'eau.{}Construit un canal, si Ctrl est enfoncé au niveau de la mer, le voisinage sera innondé.
 STR_0290_DELETE                                                 :{BLACK}Supprimer
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Supprimer complètement cette ville
 STR_0292_SAVE_SCENARIO                                          :Sauvegarder scénario
@@ -1043,7 +1044,7 @@ STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Mise en
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Défiler la vue horizontalement avec le pointeur: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permettre la corruption de la municipalité: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Gares non uniformes: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nouvelle recherche de chemin globale (NPF, écrase NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nouvelle recherche de chemin global (NPF, écrase NTP): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Multiplier le poid pour les trains fret (simule des trains lourds): {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Toujours permettre les petits aéroports: {ORANGE}{STRING}
@@ -1208,7 +1209,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Au hasar
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Planter des arbres de types choisis au hasard

 STR_CANT_BUILD_CANALS                                           :{WHITE}Impossible de construire un canal ici...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Construire des canaux. Appuyer sur Ctrl pour placer de l'eau non canalisée (seulement au niveau de la mer).
+STR_BUILD_CANALS_TIP                                            :{BLACK}Construire des canaux.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Impossible de construire un écluse ici...
@@ -1282,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 Internet ou sur réseau local
+STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Choisir entre un jeu sur 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}Langage, version du serveur, etc.
+STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Langue, 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
@@ -1336,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 joueur
+STR_NETWORK_0_PLAYERS                                           :0 joueurs
 STR_NETWORK_1_PLAYERS                                           :1 joueur
 STR_NETWORK_2_PLAYERS                                           :2 joueurs
 STR_NETWORK_3_PLAYERS                                           :3 joueurs
@@ -1407,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 nous
-STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} ko déjà téléchargés
+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_DISCONNECT                                          :{BLACK}Déconnecter

@@ -1420,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 à cause de NewGRF différents
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Echec de la connexion : NewGRF requis
 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.
@@ -1430,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 plein
+STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Le serveur est complet
 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
@@ -1442,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 différents
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF requis
 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
@@ -1716,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}Ajouter une ou plusieurs gares
+STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Adjacent à plus d'une gare à la fois
 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
@@ -1878,8 +1879,8 @@ STR_482F_COST                                                   :{BLACK}Prix: {Y
 STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Impossible de construire cette industrie ici...
 STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...les forêts ne peuvent pas être plantées sur de la neige
 STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{INDUSTRY} annonce une fermeture imminente!
-STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Des problèmes d'approvisionnement forcent {INDUSTRY} à fermer bientôt!
-STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Le manque d'arbres proches force {INDUSTRY} à fermer bientôt!
+STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Des problèmes d'approvisionnement obligent {INDUSTRY} à fermer bientôt!
+STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Le manque d'arbres proches oblige {INDUSTRY} à fermer bientôt!
 STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} augmente la production!
 STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}Nouveau filon de charbon trouvé à {INDUSTRY}!{}La production devrait doubler!
 STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}Nouveaux gisements pétrolifères découverts à {INDUSTRY}!{}La production devrait doubler!
@@ -2138,7 +2139,7 @@ STR_704D_SHOW_KEY_TO_GRAPHS                                     :{BLACK}Affiche
 STR_704E_KEY_TO_COMPANY_GRAPHS                                  :{WHITE}Légende du graphique des compagnies
 STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY                           :{BLACK}Cliquer ici pour activer/désactiver l'affichage de la compagnie
 STR_7050_UNITS_OF_CARGO_DELIVERED                               :{WHITE}Cargaison livrée
-STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Historique de performace (performance max=1000)
+STR_7051_COMPANY_PERFORMANCE_RATINGS                            :{WHITE}Historique de performance (performance max=1000)
 STR_7052_COMPANY_VALUES                                         :{WHITE}Valeur de la compagnie
 STR_7053_COMPANY_LEAGUE_TABLE                                   :{WHITE}Classement des compagnies
 STR_7054                                                        :{WHITE}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME} '{STRING}'
@@ -2606,8 +2607,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Insérer
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Forcer le véhicule à attendre un chargement complet pour l'ordre sélectionné
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Forcer le véhicule à attendre un déchargement complet pour l'ordre sélectionné
 STR_SERVICE_HINT                                                :{BLACK}Sauter cet ordre tant qu'aucun entretien n'est requis
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nouv{G eau el elle} {STRING} disponible!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Prix: {CURRENCY} Poids: {WEIGHT_S}{}Vitesse: {VELOCITY}  Puissance: {POWER}{}Coût d'entretien: {CURRENCY}/an{}Capacité: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}En panne
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
@@ -2634,6 +2633,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Types de rail i
 STR_TRAIN_NO_POWER                                              :{RED}Pas de puissance
 STR_TRAIN_START_NO_CATENARY                                     :Cette voie n'a pas de caténaire, le train ne peut pas démarrer

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nouv{G eau el elle} {STRING} disponible!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nouv{G eau el elle} {STRING} disponible!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Véhicule Routier présent
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Véhicule{P "" s} routier{P "" s}
@@ -2674,8 +2677,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Glisser
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centre la vue sur le dépôt
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Choix du véhicule - cliquer sur un véhicule pour obtenir des informations
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construire le véhicule sélectionné
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nouveau véhicule disponible!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Prix: {CURRENCY}{}Vitesse: {VELOCITY}{}Coût d'entretien: {CURRENCY}/an{}Capacité: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renommer le véhicule
@@ -2747,8 +2748,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Afficher
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrer la vue sur l'emplacement du navire
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Envoyer le navire au dépôt. Ctrl-clic pour entretien seul
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afficher détails du navire
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nouveau navire maintenant disponible!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prix: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {CARGO}{}Coût d'entretien: {CURRENCY}/an
 STR_982F_NAME_SHIP                                              :{BLACK}Nommer navire

@@ -2821,8 +2820,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Afficher
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrer la vue principale sur l'emplacement de l'aéronef
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Envoyer l'aéronef au hangar. Ctrl-clic pour entretien seul
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afficher détails de l'aéronef
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nouvel aéronef maintenant disponible!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Prix: {CURRENCY}    Vitesse max.: {VELOCITY}{}Capacité: {COMMA} passagers, {COMMA} sacs de courrier{}Coût d'entretien: {CURRENCY}/an

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nommer l'aéronef
@@ -2849,10 +2846,10 @@ SERVICE_AT_AIRPORT_HANGAR                                       :Entretien au ha

 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}Désastre impliquant un Zeppelin à {STATION}!
-STR_B001_ROAD_VEHICLE_DESTROYED                                 :{BLACK}{BIGFONT}Véhicule routier détruit dans use collision avec un 'OVNI'!
+STR_B001_ROAD_VEHICLE_DESTROYED                                 :{BLACK}{BIGFONT}Un véhicule routier est détruit dans une collision avec un 'OVNI'!
 STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT}Explosion d'une raffinerie pétrolière près de {TOWN}!
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Usine détruite dans des circonstances suspectes près de {TOWN}!
-STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Un 'OVNI' attérit près de {TOWN}!
+STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}Un 'OVNI' a été découvert près de {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Affaissement d'une veine de charbon entraîne la desctruction de la mine de {TOWN}!
 STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Inondations!{}Au moins {COMMA} présumé{P "" s} manquant{P "" s} ou mort{P "" s} après des inondations meurtrières!

@@ -2900,6 +2897,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vous êtes sur le point de faire des changements dans une partie en cours; cela peut faire planter OpenTTD.{}Etes-vous absolument sûr ?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Ajouter
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Ajouter un fichier NewGRF à la liste
 STR_NEWGRF_REMOVE                                               :{BLACK}Retirer
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Région:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Longueur: {NUM}{}Ecart d'altitude: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Région: {NUM} x {NUM}{}Ecart d'altitude: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}/{STRING}/{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -710,7 +710,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Colocar
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Colocar faro
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Colocar transmisor
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definir área de deserto
-STR_CREATE_LAKE                                                 :{BLACK}Definir área de auga.{}Inundará os arredores se está a nivel do mar
 STR_0290_DELETE                                                 :{BLACK}Borrar
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Borrar completamente esta cidade
 STR_0292_SAVE_SCENARIO                                          :Grabar Escenario
@@ -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}Construír canais
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Non se pode construí-lo peche aí...
@@ -2532,8 +2530,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Insertar
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A orde seleccionada forzará o vehículo a esperar ata que a carga estea completa
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A orde seleccionada forzará o vehículo a descargar
 STR_SERVICE_HINT                                                :{BLACK}saltar esta orde a non ser que sexa necesario o servicio
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}¡Nov@ {STRING} dispoñible!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Coste: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potencia: {POWER}{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Roto
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Coste de Mantemento: {LTBLUE}{CURRENCY}/ano
@@ -2597,8 +2593,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Arrastra
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centra-la vista principal na situación do depósito de vehículos de estrada
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista de selección de vehículos de estrada - pincha nun vehículo para máis información
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construí-lo vehículo de estrada seleccionado
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}¡Novo vehículo de estrada dispoñible!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Coste: {CURRENCY}{}Velocidade: {VELOCITY}{}Coste de Mantemento: {CURRENCY}/ano{}Capacidade: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renomear vehículo de estrada
@@ -2668,8 +2662,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Mostra-l
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centra-la vista principal na situación do barco
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Envia-lo barco o depósito
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostra-los detalles do barco
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}¡Novo barco dispoñible!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidade Máx: {VELOCITY}{}Capacidade: {CARGO}{}Coste de Mantemento: {CURRENCY}/ano
 STR_982F_NAME_SHIP                                              :{BLACK}Renomear barco

@@ -2742,8 +2734,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Mostra-l
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centra-la vista principal na situación da aeronave
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Envia-la aeronave ó hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostra-los detalles da aeronave
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}¡Nova aeronave dispoñible!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA} pasaxeiros, {COMMA} sacos de correo{}Coste de Mantemento: {CURRENCY}/ano

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Cambia-lo nome da aeronave
@@ -2932,6 +2922,7 @@ 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:
@@ -2952,7 +2943,9 @@ 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}
@@ -2981,4 +2974,9 @@ 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}
+
 ########
@@ -591,6 +591,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs in einer Station eines Gegners
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Unfälle / Katastrophen
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Firmendaten
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Öffnen und Schließen von Industrien
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Änderungen der Wirtschaftslage
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Rat / Informationen zu Fahrzeugen des Spielers
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Neue Fahrzeuge
@@ -730,7 +731,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Felsige
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Leuchtturm errichten
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Sender errichten
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Lege Wüstengebiet an.{}STRG drücken zum entfernen
-STR_CREATE_LAKE                                                 :{BLACK}Gebiet fluten.{}Auf Meereshöhe entsteht ein Gewässer
+STR_CREATE_LAKE                                                 :{BLACK}Wasser erzeugen.{}Baut einen Kanal. Bei gedrückter Strg.-Taste wird ein Wasserfeld erzeugt, das umliegendes Land flutet.
 STR_0290_DELETE                                                 :{BLACK}Löschen
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Diese Stadt vollständig löschen
 STR_0292_SAVE_SCENARIO                                          :Szenario speichern
@@ -1208,7 +1209,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Zufälli
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Zufällige Baumart pflanzen

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kann hier keinen Kanal bauen...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Kanal bauen
+STR_BUILD_CANALS_TIP                                            :{BLACK}Kanalbau.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kann hier keine Schleuse bauen...
@@ -2606,8 +2607,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Füge ei
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Der markierte Auftrag wird nur nach voller Beladung ausgeführt
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Beim markierten Auftrag wird die volle Entladung veranlasst
 STR_SERVICE_HINT                                                :{BLACK}Überspringe diesen Auftrag, sofern keine Wartung benötigt wird
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Neue {STRING} ist jetzt verfügbar!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kosten: {CURRENCY}   Gewicht: {WEIGHT_S}{}Geschwindigk.: {VELOCITY} Leistung: {POWER}{}Betriebskosten: {CURRENCY}/Jahr{}Kapazität: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Panne
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}  Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
@@ -2634,6 +2633,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :inkompatible Gl
 STR_TRAIN_NO_POWER                                              :{RED}Keine Energie
 STR_TRAIN_START_NO_CATENARY                                     :Wegen fehlender Oberleitung kann der Zug nicht starten.

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Neue{G r "" s} {STRING} jetzt erhältlich!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Neue{G r "" s} {STRING} jetzt erhältlich!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Fahrzeug ist im Weg
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Fahrzeug{P "" e}
@@ -2674,8 +2677,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Ziehe Fa
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Ansicht auf das Fahrzeugdepot zentrieren
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Fahrzeugauswahlliste - Klicke auf ein Fahrzeug für Einzelheiten
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Baue das ausgewählte Fahrzeug
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Neues Fahrzeug jetzt erhältlich!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kosten: {CURRENCY}{}Geschwindigk.: {VELOCITY}{}Betriebskosten: {CURRENCY}/Jahr{}Ladevermögen: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name des Fahrzeuges
@@ -2747,8 +2748,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Aufträg
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Anzeige auf das Schiff zentrieren
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Schicke das Schiff zur Werft
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Zeige Einzelheiten des Schiffes
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Neues Schiff ist erhältlich!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosten: {CURRENCY}  Höchstgeschwindigk.: {VELOCITY}{}Kapazität: {CARGO}{}Betriebskosten: {CURRENCY}/Jahr
 STR_982F_NAME_SHIP                                              :{BLACK}Schiffsname

@@ -2821,8 +2820,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Zeige Au
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Ansicht auf das Flugzeug zentrieren
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Schicke das Flugzeug in den Hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Zeige Einzelheiten des Flugzeuges
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Neues Flugzeug ist jetzt verfügbar!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kosten: {CURRENCY}  Höchstgeschwindigk.: {VELOCITY}{}Kapazität: {COMMA} Passagiere, {COMMA} Postsäcke{}Betriebskosten: {CURRENCY}/Jahr

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Flugzeugname
@@ -2900,6 +2897,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5-Summe: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du bist dabei Änderungen während eines laufenden Spiels zu machen. Dies kann zum Absturz von OpenTTD führen.{}Bist du Dir wirklich sicher?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Hinzufügen
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Füge eine neue NewGRF Datei zu Liste hinzu
 STR_NEWGRF_REMOVE                                               :{BLACK}Entfernen
@@ -3137,4 +3135,10 @@ STR_MEASURE_AREA                                                :{BLACK}Gebiet:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Länge: {NUM}{}Höhenunterschied: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Gebiet: {NUM} x {NUM}{}Höhenunterschied: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -656,6 +656,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Első j
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Első jármű megérkezése az ellenfél megállójába
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Balesetek / természeti csapások
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Céginformációk
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Ipari létesítmények létrejötte / bezárása
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Gazdasági változások
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Tanácsok / információk a játékos járműveiről
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Új járművek
@@ -795,7 +796,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Sziklás
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Világítótorony építése
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Rádióadó építése
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Sivatagot hoz létre.{}Nyomj CTRL-t az eltávolításához
-STR_CREATE_LAKE                                                 :{BLACK}Vizet hoz létre.{}A tengerszinten lévő elemeket elárasztja
+STR_CREATE_LAKE                                                 :{BLACK}Vizi terület definiálása.{}Csatornát készít, kivéve ha tengerszinten CTRL-t lenyomva hívod meg, ekkor elárasztja a területet
 STR_0290_DELETE                                                 :{BLACK}Töröl
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}A város teljes eltüntetése
 STR_0292_SAVE_SCENARIO                                          :Pálya mentése
@@ -1273,7 +1274,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Véletle
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Véletlenszerűen kiválasztott fákat helyez el

 STR_CANT_BUILD_CANALS                                           :{WHITE}Nem lehet csatornát építeni ide...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Csatorna építése. Nyomj CTRL-t hogy tengert csinálj (tengerszinten csak).
+STR_BUILD_CANALS_TIP                                            :{BLACK}Csatorna építése (vagy rosszabb esetben terület elárasztása!)
 STR_LANDINFO_CANAL                                              :Csatorna

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Nem lehet zsilipet építeni ide...
@@ -2708,8 +2709,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Új cél
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A kijelölt célponton meg kell várni, amíg telerakják a járművet
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A kijelölt célponton le kell pakolni a rakományt
 STR_SERVICE_HINT                                                :{BLACK}Célpont kihagyása, ha javítás szükséges
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Új {STRING} használható!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Ár: {CURRENCY}    Súly: {WEIGHT_S}{}Sebesség: {VELOCITY}    Teljesítmény: {POWER}{}Működtetési költség: {CURRENCY}/év{}Kapacitás: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Lerobbant
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Működtetési költség: {LTBLUE}{CURRENCY}/év
@@ -2736,6 +2735,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :inkompatibilis
 STR_TRAIN_NO_POWER                                              :{RED}Nincs áram
 STR_TRAIN_START_NO_CATENARY                                     :Ennek a sínnek nincs felsővezetéke, a vonat nem tud indulni

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Új {STRING} elérhető!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Új {STRING} elérhető!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Közúti jármű van az útban
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} közúti járművei - {COMMA}
@@ -2776,8 +2779,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Dobj ide
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}A fő nézetet a garázsra állítja
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Közúti jármű kiválasztása - kattints egy járműre az adataihoz
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}A kijelölt közúti jármű megvétele
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Új közúti jármű használható!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Ár: {CURRENCY}{}Sebesség: {VELOCITY}{}Működtetési költség: {CURRENCY}/év{}Kapacitás: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Közúti jármű átnevezése
@@ -2849,8 +2850,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}A hajó
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}A fő nézetet a hajóra állítja
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Dokkba küldi a hajót
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}A hajó adatai
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Új hajó használható!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ár: {CURRENCY}    Végsebesség: {VELOCITY}{}Kapacitás: {CARGO}{}Működtetési költség: {CURRENCY}/év
 STR_982F_NAME_SHIP                                              :{BLACK}Hajó átnevezése

@@ -2923,8 +2922,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}A repül
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}A fő nézetet a repülőgépre állítja
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Hangárba küldi a repülőgépet
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}A repülőgép adatai
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Új repülőgép használható!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ár: {CURRENCY}    Végsebesség: {VELOCITY}{}Kapacitás: {COMMA} utas, {COMMA} csomag levél{}Működtetési költség: {CURRENCY}/év

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Repülőgép átnevezése
@@ -3002,6 +2999,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Te éppen a jelenleg futó játékot akarod megváltoztatni; ettől elszállhat az OpenTTD.{}Teljesen biztos vagy benne, hogy ezt akarod?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Hozzáad
 STR_NEWGRF_ADD_TIP                                              :{BLACK}A NewGRF-et hozzáadja a listához
 STR_NEWGRF_REMOVE                                               :{BLACK}Eltávolít
@@ -3238,4 +3236,10 @@ STR_MEASURE_AREA                                                :{BLACK}Terület
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Távolság: {NUM}{}Magasságkülönbség: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Terület: {NUM} x {NUM}{}Magasságkülönbség: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -730,7 +730,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Setja kl
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Setja vita
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Setja sendi
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Afmarkaðu eyðimörk.{}Smelltu og haltu CTRL til að fjarlægja hana
-STR_CREATE_LAKE                                                 :{BLACK}Afmarkaðu vantssvæði.{}Það mun flæða yfir aðlægt svæði ef það er við sjávarmál
 STR_0290_DELETE                                                 :{BLACK}Eyða
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Eyða þessum bæ algjörlega
 STR_0292_SAVE_SCENARIO                                          :Vista kort
@@ -1208,7 +1207,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Tré af
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Gróðursetja tré af handahófskenndri gerð

 STR_CANT_BUILD_CANALS                                           :{WHITE}Ekki hægt að grafa skipaskurð hér...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Grafa skipaskurð
 STR_LANDINFO_CANAL                                              :Skipaskurður

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Ekki hægt að gera skurðgátt hér
@@ -2606,8 +2604,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Skeyta i
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Neyða lest til að bíða eftir fullum farmi í valdri skipun
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Neyða lest til að afferma sig í valdri skipun
 STR_SERVICE_HINT                                                :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Ný {STRING} er nú fáanleg!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Verð: {CURRENCY} Þyngd: {WEIGHT_S}{}Hraði: {VELOCITY}  Afl: {POWER}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Bilaður
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY} á ári
@@ -2674,8 +2670,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Dragðu
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Miðja aðalsjónarhorn á bifreiðaskýli
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Bifreiðalisti - ýttu á bifreið fyrir nánari upplýsingar
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Smíða valda bifreið
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Ný bifreið fáanleg!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Verð: {CURRENCY}{}Hraði: {VELOCITY}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nefna bifreið
@@ -2747,8 +2741,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Sýna sk
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Miðja aðalsjónarhorn á staðsetningu skips
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Senda skipið í slipp
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Sýna nánari upplýsingar um skip
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nýtt skip fáanlegt!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {CARGO}{}Rekstrarkostnaður: {CURRENCY}á ári
 STR_982F_NAME_SHIP                                              :{BLACK}Nefna skip

@@ -2821,8 +2813,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Sýna sk
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Miðja aðalsjónarhorn á flugvélina
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Senda flugvélina i flugskýli
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Sýna nánari upplýsingar um skip
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Ný flugvél nú fáanleg!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {COMMA} farþegar, {COMMA} pokar af pósti{}Rekstrarkostnaður: {CURRENCY}á ári

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nefna flugvélina
@@ -2900,6 +2890,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF eink
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 summa: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Þú ert í þann mund að eiga við leik í gangi, við það gæti OpenTTD hrunið.{}Ertu viss um að þú viljir halda áfram?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Bæta við
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Bæta NewGRF skrá við listann
 STR_NEWGRF_REMOVE                                               :{BLACK}Fjarlægja
@@ -3137,4 +3128,6 @@ STR_MEASURE_AREA                                                :{BLACK}Svæði:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengd: {NUM}{}Hæðarmunur {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Svæði: {NUM} x {NUM}{}Hæðarmunur: {NUM} m

+############ Date formatting
+
 ########
@@ -590,6 +590,7 @@ 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}車両の新登場
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}土地
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}灯台を建設します
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}送信機を建設します
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}砂漠を作成します。{}Control+クリックすると消去します
-STR_CREATE_LAKE                                                 :{BLACK}湖を作成します。{}海水位の場合は周辺地域を水浸します
+STR_CREATE_LAKE                                                 :{BLACK}。水を作成します。{}通常の使用時に運河を建設します。Controlをクリックすると、海水位にある地域が浸水できます。
 STR_0290_DELETE                                                 :{BLACK}破壊
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}この町を完全に破壊します
 STR_0292_SAVE_SCENARIO                                          :シナリオを保存
@@ -1207,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}ラン
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}ランドムな木を植林します

 STR_CANT_BUILD_CANALS                                           :{WHITE}ここに運河が建設できません...
-STR_BUILD_CANALS_TIP                                            :{BLACK}運河を建設します。Control+クリックすると海のタイルも建設できます（海水位にのみ）
+STR_BUILD_CANALS_TIP                                            :{BLACK}運河を建設します
 STR_LANDINFO_CANAL                                              :運河

 STR_CANT_BUILD_LOCKS                                            :{WHITE}ここに水門が建設できません...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}選択
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}選択した指令に全負荷まで待つことを強制します
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}選択した指令に降ろすことを強制します
 STR_SERVICE_HINT                                                :{BLACK}修理が必要でないとこの指令をスキップ
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}{STRING}が新登場！
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}価格：{CURRENCY}　重量：{WEIGHT_S}{}最大速度：{VELOCITY}　出力：{POWER}{}運転費：一年間{CURRENCY}{}容量：{CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}故障
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}使用年数：{LTBLUE}{STRING}{BLACK}　運転費：{LTBLUE}1年間に{CURRENCY}
@@ -2633,6 +2632,10 @@ 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_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}{STRING}が新登場！ー{STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}道路車両があります
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - 道路車両{COMMA}両
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}販売
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}主の画面を車庫の場所に移動します
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}道路車両のリスト - 情報を見るには車両をクリックします
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}選択した道路車両を購入します
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}新しい道路車両が新登場！
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}価格：{CURRENCY}{}最大速度：{VELOCITY}{}運転費：一年間{CURRENCY}{}容量：{CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}道路車両を名付ける
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}船舶
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}主の画面を船舶の場所に移動します
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}船舶を造船所へ回送します。Contorl+クリックすると修理のみをします
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}船舶の情報を表示
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}新しい船舶が新登場！
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}価格：{CURRENCY}　最大速度：{VELOCITY}{}容量：{CARGO}{}運転費：一年間{CURRENCY}
 STR_982F_NAME_SHIP                                              :{BLACK}船舶を名付ける

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}飛行
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}主の画面を飛行機の場所に移動します
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}飛行機を格納庫へ回送します。Control+クリックすると修理のみします
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}飛行機の情報を表示
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}新しい飛行機が新登場！
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}価格：{CURRENCY}　最大速度：{VELOCITY}{}容量：{COMMA}人の乗客、{COMMA}袋の郵便袋{}運転費：一年間{CURRENCY}

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}飛行機を名付ける
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum：{SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}実行中のゲームに変更を適用して、クラッシュのリスクがあります。{}続けてもよろしいですか？

+
 STR_NEWGRF_ADD                                                  :{BLACK}追加
 STR_NEWGRF_ADD_TIP                                              :{BLACK}NewGRFファイルをリストに追加します
 STR_NEWGRF_REMOVE                                               :{BLACK}削除
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}地域
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}長さ：{NUM}{}高さの違い：{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}地域：{NUM} x {NUM}{}高さの違い：{NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{2:NUM}-{1:STRING}-{0:STRING}
+STR_DATE_SHORT                                                  :{1:NUM}年{0:STRING}
+STR_DATE_LONG                                                   :{2:NUM}年{1:STRING}{0:STRING}
+
 ########
+
@@ -591,6 +591,7 @@ 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}새로운 차량
@@ -730,7 +731,7 @@ 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}물을 지정합니다.{}해수면에 둘러싸이면 물로 채워질 것입니다.
+STR_CREATE_LAKE                                                 :{BLACK}수면 지역을 정의하세요.{}바다 높이에서 CTRL이 눌려 있지 않으면, 운하를 만들때 침수할 것입니다.
 STR_0290_DELETE                                                 :{BLACK}삭제
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}이 도시를 완전히 삭제
 STR_0292_SAVE_SCENARIO                                          :시나리오 저장
@@ -743,8 +744,8 @@ 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_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}이 시나리오를 종료하시겠습니까?
+STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}DEM지형을 풍경으로 하여 게임을 시작합니다.
 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 +1209,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}무작
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}모든 종류의 나무를 무작위로 심습니다.

 STR_CANT_BUILD_CANALS                                           :{WHITE}여기에 운하를 건설할 수 없습니다...
-STR_BUILD_CANALS_TIP                                            :{BLACK}운하를 건설합니다. CTRL키를 눌러 바다 타일을 건설하십시오 (해수면 높이에서만)
+STR_BUILD_CANALS_TIP                                            :{BLACK}운하 만들기
 STR_LANDINFO_CANAL                                              :운하

 STR_CANT_BUILD_LOCKS                                            :{WHITE}여기에 갑문을 지을 수 없습니다...
@@ -2606,8 +2607,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}선택
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}선택된 경로에서 모든 화물을 가득 싣도록 변경합니다.
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}선택된 경로에서 모든 화물을 전부 내리도록 변경합니다.
 STR_SERVICE_HINT                                                :{BLACK}점검이 필요하면 이 경로를 건너뜁니다.
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}새로운 {STRING}을/를 이제 사용할 수 있습니다!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}가격: {CURRENCY} 무게: {WEIGHT_S}{}속도: {VELOCITY}  힘: {POWER}{}운행비용: {CURRENCY}/년{}수송량: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}고장
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}수명: {LTBLUE}{STRING}{BLACK}   운행비용: {LTBLUE}{CURRENCY}/년
@@ -2634,6 +2633,10 @@ 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_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}신형 {STRING} 자동차가 출시되었습니다!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}중간에 자동차가 있습니다.
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA}대의 자동차
@@ -2674,8 +2677,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}자동
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}이 차고가 있는 곳으로 이동
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}자동차 선택 목록 - 차량 정보를 보려면 클릭
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}선택한 자동차 만들기
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}새로운 자동차를 이제 사용할 수 있습니다!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}가격: {CURRENCY}{}속력: {VELOCITY}{}운행비용: {CURRENCY}/년{}수송량: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}자동차 이름 지정
@@ -2747,8 +2748,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}선박
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}이 선박이 있는 곳으로 이동합니다
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}선박을 정박소로 보냅니다. CTRL+클릭하면 점검만 합니다.
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}선박 상세정보 보기
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}새로운 선박을 이제 사용할 수 있습니다!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}가격: {CURRENCY} 최고속력: {VELOCITY}{}수송량: {CARGO}{}운행비용: {CURRENCY}/년
 STR_982F_NAME_SHIP                                              :{BLACK}선박 이름 지정

@@ -2821,8 +2820,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}항공
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}이 항공기가 있는 곳으로 이동
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}항공기를 격납고로 보냅니다. CTRL+클릭하면 점검만 합니다
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}항공기 상세정보 보기
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}새로운 항공기를 이제 사용할 수 있습니다!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}가격: {CURRENCY} 최고속력: {VELOCITY}{}수송량: 승객 {COMMA}명, 우편 {COMMA}가방{}운행비용: {CURRENCY}/년

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}항공기 이름 지정
@@ -2900,6 +2897,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}게임이 진행중인데 설정을 변경하려고 하면 게임과 충돌할 수도 있습니다.{}정말로 설정을 변경하시겠습니까?

+
 STR_NEWGRF_ADD                                                  :{BLACK}추가
 STR_NEWGRF_ADD_TIP                                              :{BLACK}NewGRF 파일을 목록에 추가
 STR_NEWGRF_REMOVE                                               :{BLACK}제거
@@ -3137,4 +3135,10 @@ STR_MEASURE_AREA                                                :{BLACK}넓이:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}길이: {NUM}{}고도차: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}넓이: {NUM} x {NUM}{}고도차: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -757,7 +757,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Sukurti
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Statyti švyturį
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Statyti siųstuvą
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Nurodyti dykumos plotus{}Laikant nuspaustą VALD (CTRL) galima ją pašalinti
-STR_CREATE_LAKE                                                 :{BLACK}Pazymeti kaip vandeni, aplinkines zemes bus uztvindytos, jei bus juros lygyje
 STR_0290_DELETE                                                 :{BLACK}Šalinti
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Šalinti šį miestą
 STR_0292_SAVE_SCENARIO                                          :Išsaugoti scenarijų
@@ -1235,7 +1234,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Atsitikt
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Sodina atsitiktinės rūšies medžius

 STR_CANT_BUILD_CANALS                                           :{WHITE}Neimanoma cia iskasti kanalu...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Kasti kanalus
 STR_LANDINFO_CANAL                                              :Kanalas

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Neimanoma cia irengti sliuzu...
@@ -2633,8 +2631,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Iterpti
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Pazymetoje stoteleje laukti, kol transporto priemone pilnai pasikraus
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Iskrauti krovini pazymetoje stoteleje
 STR_SERVICE_HINT                                                :{BLACK}Nevykdyti sios uzduoties iki tol, kol nereikes remonto
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}{STRING} jau išrastas!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kaina: {CURRENCY} Svoris: {WEIGHT_S}{}Greitis: {VELOCITY}  Galia: {POWER}{}Eksplotacijos išlaidos: {CURRENCY}/metus{}Talpa: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Sugedo
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Amzius: {LTBLUE}{STRING}{BLACK}   Eksploatacijos islaidos: {LTBLUE}{CURRENCY}/met
@@ -2701,8 +2697,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Nutempk
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Rodyti automobiliu garaza ekrano centre
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Automobiliu pasirinkimo sarasas - paspausk ant automobilio jei nori detalesnes informacijos
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Isigyti pazymeta automobili
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Atsirado naujas automobilis!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kaina: {CURRENCY}{}Greitis: {VELOCITY}{}Eksploatavimo kaina: {CURRENCY}/met{}Talpa: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Pavadinti automobili
@@ -2774,8 +2768,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Rodyti l
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Rodyti laiva ekrano centre
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Nukreipti laiva i depa
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Rodyti laivo informacija
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Atsirado naujas laivas!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kainuoja: {CURRENCY} Maks. Greitis: {VELOCITY}{}Talpa: {CARGO}{}Vaziavimo kaina: {CURRENCY}/m
 STR_982F_NAME_SHIP                                              :{BLACK}Laivo vardas

@@ -2848,8 +2840,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Rodyti l
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Rodyti lektuva ektrano centre
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Siusti lektuva i angara
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Rodyti lektuvo informacija
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Atsirado naujas lektuvas!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kaina: {CURRENCY} Maks. greitis: {VELOCITY}{}Talpa: {COMMA} keleiviu, {COMMA} pasto maisail{}Eksploatacijos islaidos: {CURRENCY}/met.

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Pervardinti lektuva
@@ -590,6 +590,7 @@ 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
@@ -729,7 +730,7 @@ 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.{}Det vil oversvømme området rundt hvis det er på sjønivå
+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
@@ -1207,7 +1208,7 @@ 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. Trykk CTRL for å plassere sjøområder (kun på havnivå).
+STR_BUILD_CANALS_TIP                                            :{BLACK}Bygg kanaler.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikke bygge sluser her...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Sett inn
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Fyll alltid kjøretøyet ved valgte stasjon
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Tøm alltid kjøretøyet ved valgte stasjon
 STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren med mindre vedlikehold trengs.
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} er nå tilgjengelig!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Koster: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Havarert
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftkostnad: {LTBLUE}{CURRENCY}/år
@@ -2633,6 +2632,10 @@ 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
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} kjøretøy
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Dra kjø
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Vis hvor garasjen ligger
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Kjøretøyliste - trykk på kjøretøy for mer informasjon
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bygg det valgte kjøretøyet
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nytt kjøretøy er nå tilgjengelig!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koster: {CURRENCY}{}Fart: {VELOCITY}{}Driftkostnader: {CURRENCY}/år{}Kapasitet: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Navngi kjøretøy
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Vis skip
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Vis skipets gjeldende posisjon
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Send skipet til depotet
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Vis detaljer om skipet
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nytt skip er nå tilgjengelig!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koster: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {CARGO}{}Driftkostnader: {CURRENCY}/år
 STR_982F_NAME_SHIP                                              :{BLACK}Navngi skip

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Vis flye
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Vis flyets gjeldende posisjon
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Send fly til hangar. CTRL-klikk for kun å utføre vedlikehold
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Vis detaljer om flyet
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nytt fly er nå tilgjengelig
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koster: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {COMMA} passasjerer, {COMMA} sekker post {}Driftkostnader: {CURRENCY}/år

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Navngi fly
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du er i ferd med å gjøre forandringer i et kjørende spill; Dette kan krasje OpenTTD.{}Er du helt sikker på at du vil gjøre dette?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Legg til
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Legg en ny NewGRF-fil til listen
 STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Område:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengde: {NUM}{}Høydeforskjell: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Område: {NUM} x {NUM}{}Høydeforskjell: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -591,6 +591,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Første
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Første køyretøy kjem fram på stasjonen til motstandaren
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Ulykker/katastrofar
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Firma informasjon
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Opning / stenging av industriar
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Økonomiske endringar
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Råd/informasjon om køyretøya til spelaren
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nye køyretøy
@@ -730,7 +731,7 @@ 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.{}Det vil fløyme landa rundt dersom det er på høgd med sjøen.
+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
@@ -1208,7 +1209,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Tre av t
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plasser tre av tilfeldig type

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kan ikkje byggje kanalar her...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Bygg kanalar. Trykk CTRL for å plassere sjøområde (kun på havnivå)
+STR_BUILD_CANALS_TIP                                            :{BLACK}Lag kanalar
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikkje byggje sluser her...
@@ -1317,7 +1318,7 @@ STR_NETWORK_SERVER_FULL                                         :{SILVER}TENAREN
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}DU HAR EIN ANNAN VERSJON ENN TENAREN
 STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF PASSAR IKKJE

-STR_NETWORK_JOIN_GAME                                           :{BLACK}Ver med på spel
+STR_NETWORK_JOIN_GAME                                           :{BLACK}Bli med på spel


 STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start eit nytt fleirspelarspel
@@ -1447,7 +1448,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 til spelet
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :feil passord for 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
@@ -2606,8 +2607,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Sett inn
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Alltid fyll køyretøyet ved den valde stasjonen
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Alltid tøm køyretøyet ved den valde stasjonen
 STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren dersom ikkje vedlikehald trengst
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} er no tilgjengeleg!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kostnad: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftskostnader: {CURRENCY}/år{}Kapasitet: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Havarert
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftskostnad: {LTBLUE}{CURRENCY}/år
@@ -2634,6 +2633,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Jernbanetypane
 STR_TRAIN_NO_POWER                                              :{RED}Ingen straum
 STR_TRAIN_START_NO_CATENARY                                     :Dette sporet manglar eit kjede, så toget kan ikkje starte

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Ny {STRING}type er tilgjengeleg!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Ny {STRING}type er tilgjengeleg!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Køyretøy i vegen
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} køyretøy
@@ -2674,8 +2677,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Dra køy
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Vis kvar garasjen ligg
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Køyretøyliste - trykk på køyretøy for meir informasjon
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bygg det valde køyretøyet
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nytt køyretøy er no tilgjengeleg!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kostnad: {CURRENCY}{}Fart: {VELOCITY}{}Driftskostnader: {CURRENCY}/år{}Kapasitet: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Namngje køyretøy
@@ -2747,8 +2748,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Vis ordr
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Vis skipet sin gjeldande posisjon
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Send skipet til depotet. CTRL-klikk for å berre sende til vedlikehald
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Vis detaljar om skipet
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nytt skip er no tilgjengeleg!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {CARGO}{}Driftskostnader: {CURRENCY}/år
 STR_982F_NAME_SHIP                                              :{BLACK}Namngje skip

@@ -2771,7 +2770,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
@@ -2821,8 +2820,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Vis ordr
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Vis flyet sin gjeldande posisjon
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Send fly til hangar. CTRL-klikk for å berre utføre vedlikehald
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Vis detaljar om flyet
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nytt fly er no tilgjengeleg
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Maks. fart: {VELOCITY}{}Kapasitet: {COMMA} passasjerar, {COMMA} sekkar post {}Driftskostnadar: {CURRENCY}/år

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Namngje fly
@@ -2900,6 +2897,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du er i ferd med å gjere forandringar i eit spel som er i gang.  Det kan få OpenTTD til å krasje.  Er du heilt sikker på at du vil gjere dette?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Legg til
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Legg ei ny NewGRF-fil til lista
 STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
@@ -3137,4 +3135,10 @@ STR_MEASURE_AREA                                                :{BLACK}Område:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengd: {NUM}{}Høgdeskilnad: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Område: {NUM} x {NUM}{}Høgdeskilnad: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -275,7 +275,7 @@ STR_0100_FACTORY                                                :{BLACK}{TINYFON
 STR_0100_FACTORY.d                                              :{BLACK}{TINYFONT}{G=f}Fabryki
 STR_0101_PRINTING_WORKS                                         :{BLACK}{TINYFONT}{G=f}Drukarnia
 STR_0101_PRINTING_WORKS.d                                       :{BLACK}{TINYFONT}{G=f}Drukarnii
-STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}{G=m}Pole naftowe
+STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}{G=m}Pole Naftowe
 STR_0102_OIL_WELLS.d                                            :{BLACK}{TINYFONT}{G=m}Pola naftowego
 STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}{G=f}Kopalnia rudy żelaza
 STR_0104_STEEL_MILL                                             :{BLACK}{TINYFONT}{G=f}Huta
@@ -643,6 +643,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Przybyc
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Przybycie pierwszego pojazdu do stacji przeciwnika
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Wypadki / klęski
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informacja firmy
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Otwarcie / zamknięcie przedsiębiorstw
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Zmiany ekonomiczne
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Porady / informacje o pojazdach gracza
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nowe pojazdy
@@ -780,7 +781,7 @@ STR_0268_CONSTRUCT_FACTORY                                      :{BLACK}Zbuduj F
 STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Zbuduj Hutę
 STR_026A_CONSTRUCT_FARM                                         :{BLACK}Zbuduj Farmę
 STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Zbuduj Kopalnię Rudy Żelaza
-STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Zbuduj Pole naftowe
+STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Zbuduj Pole Naftowe
 STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Zbuduj Bank (Można zbudować tylko w miastach z populacją wiekszą niż 1200)
 STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Zbuduj Zakłady Papiernicze
 STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Zbuduj Przetwórnię Żywności
@@ -816,7 +817,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Umieść
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Umieść latarnię morską
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Umieść nadajnik
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definiuj obszar pustyni.{}Wciśnij i trzymaj CTRL by usunąć
-STR_CREATE_LAKE                                                 :{BLACK}Definiuj akwen wodny.{}Okolice będą zalane jeśli są na poziomie morza
+STR_CREATE_LAKE                                                 :{BLACK}Stwórz akwen wodny.{}Tworzy kanał, chyba że przyrzymany jest CTRL na poziomie morza, wtedy pobliski teren zostanie zatopiony
 STR_0290_DELETE                                                 :{BLACK}Skasuj
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Skasuj to miasto
 STR_0292_SAVE_SCENARIO                                          :Zapisz scenariusz
@@ -1294,7 +1295,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Drzewa r
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Sadzenie drzew rożnych rodzajów

 STR_CANT_BUILD_CANALS                                           :{WHITE}Nie można tutaj wybudować kanału...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Buduj kanały
+STR_BUILD_CANALS_TIP                                            :{BLACK}Buduj kanały.
 STR_LANDINFO_CANAL                                              :Kanał

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Nie można tutaj wybudować śluzy...
@@ -1503,7 +1504,7 @@ STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serwer j
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma jest chroniona. Wprowadź hasło
 STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista klientów

-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Brak interface'u sieciowego lub skompilowane bez opcji ENABLE_NETWORK
+STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Brak interface'u sieciowego lub skompilowano bez opcji ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nie można znaleźć żadnej gry w sieci
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Serwer nie odpowiada
 STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}  Nie można było połączyć z powodu niezgodności NewGRF
@@ -1745,7 +1746,7 @@ STR_2041_SHOPPING_MALL                                          :Centrum handlow
 STR_2042_DO_IT                                                  :{BLACK}Wykonaj
 STR_2043_LIST_OF_THINGS_TO_DO_AT                                :{BLACK}Lista rzeczy do zrobienia w tym mieście - klik po więcej detali
 STR_2044_CARRY_OUT_THE_HIGHLIGHTED                              :{BLACK}Wykonaj podświetloną akcję z poniższej listy
-STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Możliwe działanie:
+STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Możliwe działania:
 STR_2046_SMALL_ADVERTISING_CAMPAIGN                             :Mała kampania reklamowa
 STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :Średnia kampania reklamowa
 STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :Duża kampania reklamowa
@@ -2086,7 +2087,7 @@ STR_SV_STNAME_WOODS                                             :{STRING} Las
 STR_SV_STNAME_LAKESIDE                                          :{STRING} Jezioro
 STR_SV_STNAME_EXCHANGE                                          :{STRING} Wymiana
 STR_SV_STNAME_AIRPORT                                           :Lotnisko {STRING}
-STR_SV_STNAME_OILFIELD                                          :{STRING} Pole naftowe
+STR_SV_STNAME_OILFIELD                                          :{STRING} Platforma Wiertnicza
 STR_SV_STNAME_MINES                                             :{STRING} Kopalnia
 STR_SV_STNAME_DOCKS                                             :{STRING} Port
 STR_SV_STNAME_BUOY_1                                            :{STRING} Boja 1
@@ -2482,7 +2483,7 @@ STR_8086_PERRY_OIL_TANKER                                       :Cysterna Perry
 STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Ciężarówka na żywiec Talbott
 STR_8088_UHL_LIVESTOCK_VAN                                      :Ciężarówka na żywiec Uhl
 STR_8089_FOSTER_LIVESTOCK_VAN                                   :Ciężarówka na żywiec Foster
-STR_808A_BALOGH_GOODS_TRUCK                                     :Ciężarówka towarowy Balogh
+STR_808A_BALOGH_GOODS_TRUCK                                     :Ciężarówka towarowa Balogh
 STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Ciężarówka towarowa Craighead
 STR_808C_GOSS_GOODS_TRUCK                                       :Ciężarówka towarowa Goss
 STR_808D_HEREFORD_GRAIN_TRUCK                                   :Ciężarówka na ziarno Hereford
@@ -2520,7 +2521,7 @@ STR_80AC_UHL_RUBBER_TRUCK                                       :Ciężarówka n
 STR_80AD_RMT_RUBBER_TRUCK                                       :Ciężarówka na kauczuk RMT
 STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :Ciężarówka na cukier MightyMover
 STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Ciężarówka na cukier Powernaught
-STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Ciężarówka do cukier Wizzowow
+STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Ciężarówka na cukier Wizzowow
 STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :Cysterna na Colę MightyMover
 STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Cysterna na Colę Powernaught
 STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Cysterna na Colę Wizzowow
@@ -2734,8 +2735,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Wstaw no
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Spraw aby zaznaczone polecenie zmusiło pojazd do czekania na pełny załadunek
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Spraw aby zaznaczone polecenie zmusiło pojazd do wyładunku
 STR_SERVICE_HINT                                                :{BLACK}Pomiń to polecenie jesli serwis nie jest wymagany
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Dostępna nowa {STRING}!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Koszt: {CURRENCY} Waga: {WEIGHT_S}{}Prędkość: {VELOCITY}  Moc: {POWER}{}Utrzymanie: {CURRENCY}/rok{}Pojemność: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Awaria
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Utrzymanie: {LTBLUE}{CURRENCY}/rok
@@ -2762,6 +2761,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Niezgodne typy
 STR_TRAIN_NO_POWER                                              :{RED}Brak zasilania
 STR_TRAIN_START_NO_CATENARY                                     :Ta trasa nie jest zelektryfikowana, wiec pociąg nie wystartuje

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Dostępn{G y a e} now{G y a e} {STRING}!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Dostępn{G y a e} now{G y a e} {STRING} - {STRING}!
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Samochód na drodze
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Samoch{P ód ody odów}
@@ -2802,8 +2805,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Przecią
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centruj główne okno na pozycji zajezdni samochodowej
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista wyboru samochodów - klik na pojeździe po więcej informacji
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Zbuduj wybrany samochód
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Dostępny nowy samochód!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koszt: {CURRENCY}{}Prędkość: {VELOCITY}{}Utrzymanie: {CURRENCY}/rok{}Pojemność: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nazwij samochód
@@ -2875,8 +2876,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Pokaż p
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centruj główne okno na pozycji statku
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Wyślij statek do stoczni
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Pokaż szczegóły statku
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Dostępny nowy statek!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koszt: {CURRENCY} Max. Prędkość: {VELOCITY}{}Pojemność: {CARGO}{}Utrzymanie: {CURRENCY}/rok
 STR_982F_NAME_SHIP                                              :{BLACK}Nazwa statku

@@ -2949,8 +2948,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Pokaż p
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centruj główne okno na pozycji samolotu
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Wyślij samolot do hangaru
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Pokaż szczegóły samolotu
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Dostępny nowy samolot!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koszt: {CURRENCY} Max. Prędkość: {VELOCITY}{}Pojemność: {COMMA} pasażerów, {COMMA} paczek poczty{}Utrzymanie: {CURRENCY}/rok

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nazwa samolotu
@@ -3028,6 +3025,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}suma MD5: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Zamierzasz wprowadzić zmiany do gry w toku; to może zawiesić OpenTTD.{}Czy jesteś całkowicie pewien?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Dodaj
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Dodaj plik NewGRF do listy
 STR_NEWGRF_REMOVE                                               :{BLACK}Usuń
@@ -3184,7 +3182,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Pojemno
 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 towarów
-STR_PURCHASE_INFO_ALL_BUT                                       :Wszystko oprócz {GOLD}}
+STR_PURCHASE_INFO_ALL_BUT                                       :Wszystko oprócz {GOLD}

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

@@ -3227,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}Ta akcja zmieniła poziom trudności na "własny"
+STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Zmieniono 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
@@ -3264,4 +3262,10 @@ STR_MEASURE_AREA                                                :{BLACK}Obszar:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Długość: {NUM}{}Różnica wysokości: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Obszar: {NUM} x {NUM}{}Różnica wysokości: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -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                                       :Ordenação clássica
+STR_ENGINE_SORT_ENGINE_ID                                       :EngineID (ordernação clássica)
 STR_ENGINE_SORT_COST                                            :Custo
 STR_ENGINE_SORT_POWER                                           :Potência
 STR_ENGINE_SORT_INTRO_DATE                                      :Data de Introdução
@@ -590,6 +590,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do primeiro veículo à estação de um oponente
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Acidentes / desastres
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informações da empresa
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Abertura / Fecho de indústrias
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Alterações económicas
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Avisos / informações dos veículos do jogador
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Novos veículos
@@ -729,7 +730,7 @@ 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.{}A área adjacente será inundada se estiver ao nível do mar
+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
@@ -1047,7 +1048,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}Avisar quando comboios andam perdidos: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Alertar em caso de perda do combóio: {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
@@ -1084,7 +1085,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 medidas ao usar ferramentas de construção: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Mostrar uma dica de medição ao utilizar várias 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
@@ -1207,7 +1208,7 @@ 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_BUILD_CANALS_TIP                                            :{BLACK}Construir canais.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Não é possível construir diques aqui...
@@ -2548,9 +2549,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}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_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_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordens)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fim de Ordens - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Inserir
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A ordem seleccionada fará com que o veículo espere carregar completamente
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}A ordem seleccionada forçará o veículo a descarregar
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novo {STRING} disponível!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Avariado
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
@@ -2633,6 +2632,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Vias férreas i
 STR_TRAIN_NO_POWER                                              :{RED}Sem energia
 STR_TRAIN_START_NO_CATENARY                                     :Esta linha não tem catenária, o comboio não pode arrancar

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Novo {STRING} agora disponível!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Novo {STRING} agora disponível! - {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Veículo de estrada no caminho
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Veículos de Estrada
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Arraste
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centrar visualização na localização do depósito de veículos de estrada
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista de veículos de estrada - clique num veículo para informações
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construir o veículo de estrada seleccionado
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novo veículo de estrada disponível!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Custo: {CURRENCY}{}Velocidade: {VELOCITY}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Renomear veículo de estrada
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Mostrar
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrar visualização na localização do barco
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Mandar barco para o depósito
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostrar detalhes do barco
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Novo barco disponível!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {CARGO}{}Custo de circulação: {CURRENCY}/ano
 STR_982F_NAME_SHIP                                              :{BLACK}Renomear barco

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Mostrar
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrar visualização na localização da aeronave
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Mandar aeronave para o hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostrar detalhes da aeronave
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nova aeronave disponível!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {COMMA} passageiros, {COMMA} sacos de correio{}Custo de circulação: {CURRENCY}/ano

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Renomear aeronave
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vai alterar um jogo em andamento; o OpenTTD pode terminar abruptamente.{}Tem a certeza que quer continuar?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Adicionar
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Adicionar um ficheiro NewGRF à lista
 STR_NEWGRF_REMOVE                                               :{BLACK}Remover
@@ -3135,4 +3133,10 @@ STR_MEASURE_AREA                                                :{BLACK}Área: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Comprimento: {NUM}{}Diferença de altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Área: {NUM} x {NUM}{}Diferença de altura: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -456,7 +456,7 @@ STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Nu pot s
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Închide fereastra
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Titlul ferestrei - trage de aici pentru a muta fereastra
 STR_STICKY_BUTTON                                               :{BLACK}Mark this window as undeletable for the 'Close All Windows' key
-STR_RESIZE_BUTTON                                               :{BLACK}Click&trage pt redimensionarea ferestrei
+STR_RESIZE_BUTTON                                               :{BLACK}Apasa si trage pentru redimensionarea ferestrei
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Click aici pentru a ajunge la directorul predefinit pentru salvari
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Demoleazã clãdiri, strãzi, etc. pe un pãtrat de teren
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Scade altitudinea unui vârf de teren
@@ -590,6 +590,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Sosirea
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Sosirea primului vehicul la una din statiile competitorilor
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidente/dezastre
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informatii despre companie
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Deschidere / inchidere industrii
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Schimbãri economice
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Sfaturi/informatii despre vehiculele tale
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Vehicule noi
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Plaseaza
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Plaseazã far
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plaseazã transmitãtor
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Defineste suprafata de desert.{}Apasã si mentine apasat CTRL pentru a o sterge
-STR_CREATE_LAKE                                                 :{BLACK}Defineste suprafata cu apã.{}Împrejurimile aflate la acelasi nivel vor fi inundate
+STR_CREATE_LAKE                                                 :{BLACK}Defineste zona apei.{}Creeaza un canal, mai putin cand CTRL este apasat la nivelul marii, cand va inunda, in loc, imprejurimile
 STR_0290_DELETE                                                 :{BLACK}Sterge
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Sterge acest oras
 STR_0292_SAVE_SCENARIO                                          :Salveazã scenariul
@@ -784,7 +785,7 @@ STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Afisar
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Animatie completã
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Detalii grafice complete
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Peisaj transparent (X)
-STR_TRANSPARENT_SIGNS                                           :{SETX 12}Numele statiilor transparente
+STR_TRANSPARENT_SIGNS                                           :{SETX 12}Semne statii, transparente
 ############ range ends here

 ############ range for menu starts
@@ -933,7 +934,7 @@ STR_OPTIONS_LANG                                                :{BLACK}Limba
 STR_OPTIONS_LANG_CBO                                            :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_LANG_TIP                                            :{BLACK}Alege limba în care doresti afisatã interfata

-STR_OPTIONS_FULLSCREEN                                          :{BLACK}Mod
+STR_OPTIONS_FULLSCREEN                                          :{BLACK}Ecran intreg
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Bifeaza aceasta casuta pentru a juca in modul

 STR_OPTIONS_RES                                                 :{BLACK}Rezolutia ecranului
@@ -992,7 +993,7 @@ STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Trenul {
 STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Trenul {COMMA} are o statie inexistentã în comenzi
 STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Autovehiculul {COMMA} are prea putine comenzi în listã
 STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Autovehiculul {COMMA} nu are comenzi
-STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Autovehiculul {COMMA} are comenzi repetate
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Autovehiculul {COMMA} are comenzi duplicat
 STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Autovehiculul {COMMA} are o statie inexistentã în comenzi
 STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Nava {COMMA} are prea putine comenzi în listã
 STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Nava {COMMA} nu are comenzi
@@ -1025,7 +1026,7 @@ STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permite
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Interzice trenurilor si navelor sa faca intoarceri de 90 de grade: {ORANGE}{STRING} {LTBLUE} (necesita NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Uneste gãrile alãturate: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Pãrãseste statia când orice tip de marfã este 'full load': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Foloseste algoritmul de LOAD imbunatatit: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Foloseste algoritm incarcare imbunatatit: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Incarca vehiculele gradual: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflatia: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Livreazã marfa doar in statiile unde aceasta este ceruta: {ORANGE}{STRING}
@@ -1085,16 +1086,16 @@ STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Service
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Conecteaza bara de instrumente pentru peisaj cu cea de constructii feroviare/auto/aeriane: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Cand faci scroll cu mouse-ul muta ecranul in directia opusã: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Arata o bara de unelte de masuratori la folosirea uneltelor de constructie: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Arata unifromete companiilor: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Arata uniformele companiilor: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Niciunul
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Propria companie
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Toate companiile
 STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Echipa preferata pentru chat <ENTER>: {ORANGE}{STRING}

-STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nr. max. de trenuri pentru un jucãtor: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Nr. max. de trenuri per jucãtor: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Nr. max. de autovehicule pentru un jucãtor: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Nr. max. de aeronave pentru un jucãtor: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nr. max. de nave pentru un jucãtor: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Nr. max. de nave per jucãtor: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Dezactiveazã trenurile pentru jucãtorii PC: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Dezactiveazã autovehiculele pentru jucãtorii PC: {ORANGE}{STRING}
@@ -1207,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbori d
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Planteazã arbori din diverse specii la întâmplare

 STR_CANT_BUILD_CANALS                                           :{WHITE}Nu pot construi un canal aici...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Construieste canale
+STR_BUILD_CANALS_TIP                                            :{BLACK}Construieste canale.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Nu pot construi o ecluzã aici...
@@ -2604,9 +2605,7 @@ STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Mergi no
 STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Introdu o comandã înaintea celei selectate sau adaugã o comandã la sfârsitul listei
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Forteazã trenul sã astepte la destinatia selectatã pânã la umplerea la capacitate maximã
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Forteazã trenul sã descarce marfa la destinatia selectatã
-STR_SERVICE_HINT                                                :{BLACK}Sãri peste aceastã comandã dacã nu este necesar un service
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Stiri: {STRING} este acum disponibil!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
+STR_SERVICE_HINT                                                :{BLACK}Sari peste aceastã comandã dacã nu este necesar un service
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Greutate: {WEIGHT_S}{}Vitezã: {VELOCITY}  Putere: {POWER}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Defectiune
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vechimea: {LTBLUE}{STRING}{BLACK}   Cost de rulare: {LTBLUE}{CURRENCY}/an
@@ -2633,6 +2632,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipuri de sine
 STR_TRAIN_NO_POWER                                              :{RED}Fara curent
 STR_TRAIN_START_NO_CATENARY                                     :Aceasta sina nu este electrificata, deci trenul nu poate porni

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Un nou {STRING} este acum disponibil!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Un nou {STRING} este acum disponibil!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Autovehicul in cale
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA}Autovehicule
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Mutã un
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centreazã imaginea pe locatia acestei autobaze
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista selectie vehicule rutiere - apasa pe vehicul pentru informatii
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Cumpãrã autovehiculul selectat
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Un nou autovehicul disponibil!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Pret: {CURRENCY}{}Vitezã: {VELOCITY}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Numele autovehiculului
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Afiseaz
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centreazã imaginea pe locatia curentã a navei
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Trimite nava într-un santier
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Afiseazã detaliile navei
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}O nouã navã este disponibilã!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cost: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {CARGO}{}Cost de rulare: {CURRENCY}/an
 STR_982F_NAME_SHIP                                              :{BLACK}Alege un nume pentru aceastã navã

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Afiseaz
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centreazã imaginea pe locatia curentã a aeronavei
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Trimite aeronava într-un hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Afiseazã detaliile aeronavei
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Un nou tip de aeronavã disponibil!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Pret: {CURRENCY} Viteza max.: {VELOCITY}{}Capacitate: {COMMA} cãlãtori, {COMMA} saci de postã{}Cost de rulare: {CURRENCY}/an

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Redenumeste aeronava
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Esti pe cale sa faci modificari intr-un joc activ. Aceasta poate destabiliza OpenTTD.{}Esti absolut sigur ca vrei sa faci asta?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Adauga
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Adauga un fisier NewGRF in lista
 STR_NEWGRF_REMOVE                                               :{BLACK}Elimina
@@ -2997,12 +2995,12 @@ STR_REPLACE_VEHICLES_START                                      :{BLACK}Incepere
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Oprire inlocuire vehicuke
 STR_NOT_REPLACING                                               :{BLACK}Neinlocuire
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nici un vehicul selectat
-STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Alege tipul de vehicul pentru inlocuire
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Alege noul tip de vehicul cu care doresti sa inlocuiesti tipul de vehicul din stanga
-STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Apasa acest buton daca nu doresti sa inlocuiesti vehiculele selectate in stanga
-STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Apasa acest buton daca doresti sa inlocuiesti vehiculele selectate in stanga cu cele selectate in dreapta
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Alege un tip de cale ferata pentru care sa selectezi vehiculele
-STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Afiseaza cu ce model vor fi inlocuite vehiculele din stanga
+STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Alege tipul de motor pentru inlocuire
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Alege noul tip de motor pe care doresti sa-l folosesti in locul motorului selectat in stanga
+STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Apasa aici pentru oprirea inlocuirii motorului selectat in stanga
+STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Apasa aici pentru a incepe inlocuirea motorului selectat in stanga cu cel selectat in dreapta
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Alege un tip de cale ferata pentru care sa inlocuiesti motoarele
+STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Arata care va fi  inlocuitorul motorului selectat in stanga
 STR_REPLACE_HELP                                                :{BLACK}Aceasta functie iti permite sa selectezi un model de vehicul si sa-l inlocuiesti cu altul. Schimbarea se va efectua automat la intrarea vehiculului intr-un depou.
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Retragere vagoane: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Fã optiunea de autoînlocuire sã pãstreze identicã lungimea unui tren prin eliminarea vagoanelor (începând din fatã), dacã înlocuirea motorului ar face trenul mai lung.
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Suprafat
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lungime: {NUM}{}Diferenta inaltime: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Suprafata: {NUM} x {NUM}{}Diferenta inaltime: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -360,6 +360,7 @@ 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}选择排序标准
@@ -589,6 +590,7 @@ 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}新的车辆类型
@@ -613,16 +615,22 @@ 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}生成工业
@@ -722,7 +730,7 @@ 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}定义睡眠。{}在海平面高度的水面将淹没周围的区域。
+STR_CREATE_LAKE                                                 :{BLACK}定义水域。{}修建运河，仅在CTRL被按下的情况下不会在海平面淹没周围的区域。
 STR_0290_DELETE                                                 :{BLACK}删除
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}完全删除这座城镇
 STR_0292_SAVE_SCENARIO                                          :保存场景
@@ -736,6 +744,7 @@ 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 年
@@ -1199,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}随机
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}种植随机类型的树木

 STR_CANT_BUILD_CANALS                                           :{WHITE}不能在这里兴建运河……
-STR_BUILD_CANALS_TIP                                            :{BLACK}兴建运河。点击 CTRL 可以增加海面 (仅在平面有效)。
+STR_BUILD_CANALS_TIP                                            :{BLACK}修建运河。
 STR_LANDINFO_CANAL                                              :运河

 STR_CANT_BUILD_LOCKS                                            :{WHITE}不能在这里兴建船闸……
@@ -2597,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}在调
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}命令列车在高亮项目对应的车站装满货物
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}命令列车在高亮项目对应的车站卸载货物
 STR_SERVICE_HINT                                                :{BLACK}除非需要在此处保养，否则跳过这一项目
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}新的 {STRING} 投入使用!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}费用：{CURRENCY} 重量：{WEIGHT_S}{}速度：{VELOCITY}  功率：{POWER}{}运行费用：{CURRENCY}/yr{}Capacity: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}抛锚
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}年龄: {LTBLUE}{STRING}{BLACK}   运行成本: {LTBLUE}{CURRENCY}/年
@@ -2625,6 +2632,10 @@ 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_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}新 {STRING} 上市了！  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}指定的位置有汽车
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} 汽车
@@ -2665,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}将汽
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}将屏幕中心移动到车库所在的位置
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}汽车列表 - 点击可以查看详细信息
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}购买高亮的汽车
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}新的汽车上市！
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}价格：{CURRENCY}{}速度：{VELOCITY}{}运行成本：{CURRENCY}/年{}装载能力：{CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}命名汽车
@@ -2738,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}显示
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}将屏幕中心移动到船只所在的位置
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}命令船只前往船坞。Ctrl+单击时船只只进行保养。
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}显示船只的详情
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}新的船只上市！
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}价格：{CURRENCY} 最大速度：{VELOCITY}{}装载能力：{CARGO}{}运行费用：{CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}命名船只

@@ -2812,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}显示
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}将屏幕中心移动到飞机所在的位置
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}命令飞机前往机库。Ctrl+单击时飞机只进行保养。
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}显示飞机的详情
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}新的飞机上市！
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}价格：{CURRENCY} 最大速度：{VELOCITY}{}运载能力：{COMMA} 位旅客，{COMMA} 包邮件{}运行费用：{CURRENCY}/年

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}命名飞机
@@ -2891,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum：{SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}你将要改变一个正在运行的游戏，这可能导致该游戏崩溃，你确定要这样做吗？

+
 STR_NEWGRF_ADD                                                  :{BLACK}增加
 STR_NEWGRF_ADD_TIP                                              :{BLACK}向列表中增加一个 NewGRF 文件
 STR_NEWGRF_REMOVE                                               :{BLACK}删除
@@ -2950,6 +2956,20 @@ 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}出售船坞中的所有船只
@@ -3114,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}面积
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}长度：{NUM}{}高度差：{NUM} 米
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}面积：{NUM} x {NUM}{}高度差：{NUM}米

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -559,78 +559,78 @@ STR_01AA_NAME                                                   :{BLACK}Meno
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

 ############ range for days starts
-STR_01AC_1ST                                                    :1/
-STR_01AD_2ND                                                    :2
-STR_01AE_3RD                                                    :3
-STR_01AF_4TH                                                    :4
-STR_01B0_5TH                                                    :5
-STR_01B1_6TH                                                    :6
-STR_01B2_7TH                                                    :7
-STR_01B3_8TH                                                    :8
-STR_01B4_9TH                                                    :9
-STR_01B5_10TH                                                   :10
-STR_01B6_11TH                                                   :11
-STR_01B7_12TH                                                   :12
-STR_01B8_13TH                                                   :13
-STR_01B9_14TH                                                   :14
-STR_01BA_15TH                                                   :15
-STR_01BB_16TH                                                   :16
-STR_01BC_17TH                                                   :17
-STR_01BD_18TH                                                   :18
-STR_01BE_19TH                                                   :19
-STR_01BF_20TH                                                   :20
-STR_01C0_21ST                                                   :21
-STR_01C1_22ND                                                   :22
-STR_01C2_23RD                                                   :23
-STR_01C3_24TH                                                   :24
-STR_01C4_25TH                                                   :25
-STR_01C5_26TH                                                   :26
-STR_01C6_27TH                                                   :27
-STR_01C7_28TH                                                   :28
-STR_01C8_29TH                                                   :29
-STR_01C9_30TH                                                   :30
-STR_01CA_31ST                                                   :31
+STR_01AC_1ST                                                    :1.
+STR_01AD_2ND                                                    :2.
+STR_01AE_3RD                                                    :3.
+STR_01AF_4TH                                                    :4.
+STR_01B0_5TH                                                    :5.
+STR_01B1_6TH                                                    :6.
+STR_01B2_7TH                                                    :7.
+STR_01B3_8TH                                                    :8.
+STR_01B4_9TH                                                    :9.
+STR_01B5_10TH                                                   :10.
+STR_01B6_11TH                                                   :11.
+STR_01B7_12TH                                                   :12.
+STR_01B8_13TH                                                   :13.
+STR_01B9_14TH                                                   :14.
+STR_01BA_15TH                                                   :15.
+STR_01BB_16TH                                                   :16.
+STR_01BC_17TH                                                   :17.
+STR_01BD_18TH                                                   :18.
+STR_01BE_19TH                                                   :19.
+STR_01BF_20TH                                                   :20.
+STR_01C0_21ST                                                   :21.
+STR_01C1_22ND                                                   :22.
+STR_01C2_23RD                                                   :23.
+STR_01C3_24TH                                                   :24.
+STR_01C4_25TH                                                   :25.
+STR_01C5_26TH                                                   :26.
+STR_01C6_27TH                                                   :27.
+STR_01C7_28TH                                                   :28.
+STR_01C8_29TH                                                   :29.
+STR_01C9_30TH                                                   :30.
+STR_01CA_31ST                                                   :31.
 ############ range for days ends

 STR_01CB                                                        :{TINYFONT}{COMMA}

-STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Prijma naklad: {LTBLUE}
+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Prijíma náklad: {LTBLUE}

 STR_01D1_8                                                      :({COMMA}/8 {STRING})
 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}Vsetko
-STR_01D6_OLD_STYLE                                              :{TINYFONT}Stary styl
-STR_01D7_NEW_STYLE                                              :{TINYFONT}Novy styl
+STR_01D5_ALL                                                    :{TINYFONT}Všetko
+STR_01D6_OLD_STYLE                                              :{TINYFONT}Starý štýl
+STR_01D7_NEW_STYLE                                              :{TINYFONT}Nový štýl
 STR_01D8_EZY_STREET                                             :{TINYFONT}Ezy Street
-STR_01D9_CUSTOM_1                                               :{TINYFONT}Vlastne 1
-STR_01DA_CUSTOM_2                                               :{TINYFONT}Vlastne 2
+STR_01D9_CUSTOM_1                                               :{TINYFONT}Vlastné 1
+STR_01DA_CUSTOM_2                                               :{TINYFONT}Vlastné 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}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_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_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}Nahodne
+STR_01E9_SHUFFLE                                                :{TINYFONT}Náhodne
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
-STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Vyber hudobneho programu
+STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Výber hudobného programu
 STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
 STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA} "{STRING}"
-STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Cislo stopy
+STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Císlo stopy
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Program - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Zmazat
-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_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_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
@@ -654,6 +654,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Prijazd
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Prijazd prveho vozidla do stanice konkurencie
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Havarie / Katastrofy
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informacie o spolocnosti
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Vznik a zánik priemyslu
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Zmeny v ekonomike
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Oznamenia / Informacie o vozidlach hraca
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nove vozidla
@@ -793,7 +794,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Umiestni
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Umiestnit majak
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Umiestnit vysielac
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Vytvorit oblast puste.{}Drzanim CTRL ju odstranite
-STR_CREATE_LAKE                                                 :{BLACK}Vytvorit oblast vody.{}Okolie bude tiez zaplavene, ak je na urovni mora
+STR_CREATE_LAKE                                                 :{BLACK}Definovat oblast vody.{}Vytvorí kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
 STR_0290_DELETE                                                 :{BLACK}Vymazat
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Kompletne vymazat toto mesto
 STR_0292_SAVE_SCENARIO                                          :Ulozit scenar
@@ -1271,7 +1272,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Nahodne
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Umiestnit nahodne stromy

 STR_CANT_BUILD_CANALS                                           :{WHITE}Tu sa neda postavit prieplav ...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Postavit prieplavy
+STR_BUILD_CANALS_TIP                                            :{BLACK}Stavba kanálov.
 STR_LANDINFO_CANAL                                              :Prieplav

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Tu sa neda postavit stavidlo ...
@@ -2669,8 +2670,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Vlozit n
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Na oznacenom prikaze bude vozidlo cakat na plne nalozenie
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Na oznacenom prikaze bude vozidlo uplne vylozene
 STR_SERVICE_HINT                                                :{BLACK}Vynechat tento prikaz pokial nie je potrebna oprava
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nove {STRING} je uz dostupne!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rýchlost: {VELOCITY}  Výkon: {POWER}{}Náklady na prevádzku: {CURRENCY}/rok{}Kapacita: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Pokazene
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Naklady na prevadzku: {LTBLUE}{CURRENCY}/rok
@@ -2697,6 +2696,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Nekompatibilne
 STR_TRAIN_NO_POWER                                              :{RED}Nie je prud
 STR_TRAIN_START_NO_CATENARY                                     :Vlak nemoze nastartovat, pretoze trat nie je pripojena

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nové {STRING} dostupné!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nové {STRING} dostupné!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Automobil v ceste
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Automobil{P "" y ov}
@@ -2737,8 +2740,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Potiahni
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centrovat pohlad na poziciu garaze
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Vyber vozidiel - kliknut pre detaily
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Zakupit vybrany automobil
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novy automobil dostupny!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Rychlost: {VELOCITY}{}Naklady na prevadzku: {CURRENCY}/rok{}Kapacita: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Pomenovat automobil
@@ -2810,8 +2811,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Zobrazit
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Vycentrovat pohlad na lod
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Poslat lod do lodenice
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Zobrazit detaily o lodi
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nová lod je dostupná!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO}{}Naklady na prevadzku: {CURRENCY}/rok
 STR_982F_NAME_SHIP                                              :{BLACK}Pomenovat lod

@@ -2884,8 +2883,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Zobrazit
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Vycentrovat pohlad na lietadlo
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Poslat lietadlo do hangaru
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Zobrazit detaily o lietadle
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nove lietadlo dostupne!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {COMMA} cestujucich, {COMMA} balikov posty{}Naklady na prevadzku: {CURRENCY}/rok

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Pomenovat lietadlo
@@ -2963,6 +2960,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Chystáte sa vykonat zmeny v spustenej hre, co može sposobit pád hry.{}Naozaj ich chcete vykonat?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Pridat
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Pridat NewGRF súbor do zoznamu
 STR_NEWGRF_REMOVE                                               :{BLACK}Odstránit
@@ -3200,4 +3198,10 @@ STR_MEASURE_AREA                                                :{BLACK}Plocha:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dlžka: {NUM}{}Výškový rozdiel: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Plocha: {NUM} x {NUM}{}Výškový rozdiel: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -632,6 +632,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Prihod
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Prihod prvega vozila na nasprotnikovo postajo
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Nesreče / katastrofe
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Informacije o podjetju
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Odpiranje / zapiranje industrij
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Ekonomske spremembe
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Nasveti / informacije o igralčevem vozilu
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nova vozila
@@ -771,7 +772,7 @@ 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 vodno območje.{}Voda bo poplavila okolico, če bo na višini morja
+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
@@ -1249,7 +1250,7 @@ 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}Gradnja kanalov. CTRL+klik za postavitev morskih kvadratkov{}(samo na višini gladine morja)
+STR_BUILD_CANALS_TIP                                            :{BLACK}Zgradi kanale.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Ni mogoče zgraditi zapornic tukaj ...
@@ -1870,6 +1871,7 @@ STR_4801                                                        :{WHITE}{INDUSTR
 STR_4802_COAL_MINE                                              :Premogovnik
 STR_4802_COAL_MINE.r                                            :Premogovnika
 STR_4803_POWER_STATION                                          :Termo elektrarna
+STR_4803_POWER_STATION.r                                        :Termo elektrarne
 STR_4804_SAWMILL                                                :Žaga
 STR_4804_SAWMILL.r                                              :Žage
 STR_4805_FOREST                                                 :Gozd
@@ -2684,8 +2686,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Vstavi n
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Označi izbran ukaz, naj vozilo čaka na polno obremenitev
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Označi izbran ukaz, naj se vozilo v celoti raztovori
 STR_SERVICE_HINT                                                :{BLACK}Preskoči ta ukaz, razen če je potreben servis
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novo prevozno sredstvo {STRING} je sedaj na voljo!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Teža: {WEIGHT_S}{}Hitrost: {VELOCITY}  Moč: {POWER}{}Cena delovanja: {CURRENCY}/leto{}Zmogljivost: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}V okvari
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Cena delovanja: {LTBLUE}{CURRENCY}/leto
@@ -2712,6 +2712,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Nezdružljiv ti
 STR_TRAIN_NO_POWER                                              :{RED}Ni napetosti
 STR_TRAIN_START_NO_CATENARY                                     :Ta proga nima napetostnih vodov, zato vlak ne more z mesta

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Novo! {STRING} sedaj na razpolago!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Novo! {STRING} sedaj na razpolago!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Cestno vozilo na poti
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Cestn{P o i a ih} vozil{P o i a ""}
@@ -2752,8 +2756,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Povleci
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Pogled na garažo
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Seznam cestnih vozil - klikni na vozilo za informacije
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Zgradi izbrano cestno vozilo
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novo cestno vozilo sedaj na voljo!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Hitrost: {VELOCITY}{}Cena delovanja: {CURRENCY}/leto{}Zmogljivost: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Poimenuj cestno vozilo
@@ -2825,8 +2827,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Prikaži
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Pogled na ladjo
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Pošlji ladjo v ladjedelnico. CTRL+klik samo na servis
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Prikaži podrobnosti ladje
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nova ladja na voljo!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO}{}Cena delovanja: {CURRENCY}/leto
 STR_982F_NAME_SHIP                                              :{BLACK}Poimenuj ladjo

@@ -2899,8 +2899,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Prikaži
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Pogled na letalo
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Pošlji letalo v hangar. CTRL+klik samo na servis
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Prikaži podrobnosti letala
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Novo letalo na voljo!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Cena: {CURRENCY} Max. hitrost: {VELOCITY}{}Zmogljivost: {COMMA} potnikov, {COMMA} vreč pošte{}Cena delovanja: {CURRENCY}/leto

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Poimenuj letalo
@@ -2978,6 +2976,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Pripravljaš se narediti spremembe na zagnani igri; to lahko sesuje OpenTTD.{}Si zagotovo želiš tega?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Dodaj
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Dodaj NewGRF datoteko na seznam
 STR_NEWGRF_REMOVE                                               :{BLACK}Odstrani
@@ -3215,4 +3214,10 @@ STR_MEASURE_AREA                                                :{BLACK}Območje
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dolžina: {NUM}{}Višinska razlika: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Območje: {NUM} x {NUM}{}Višinska razlika: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -591,6 +591,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Llegada
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Llegada del 1er veh. estación de la competencia
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidentes / desastres
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Información de la empresa
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Aperturas/ cierres de industrias
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Cambios en la economía
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Sugerencias/info. sobre vehículos del jugador
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nuevos vehículos
@@ -730,7 +731,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Coloca z
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Colocar faro
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Colocar transmisor
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Define área desertica.{}Pulsa y mantén CTRL para quitarla
-STR_CREATE_LAKE                                                 :{BLACK}Define zona de água.{}Inundará los alrededores hasta nivel del mar
+STR_CREATE_LAKE                                                 :{BLACK}Define el area de agua.{}Haz un canal, a menos que mantengas pulsado CTRL a nivel del mar, entonces se inundarán los alrededores del lugar
 STR_0290_DELETE                                                 :{BLACK}Borrar
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Borrar esta población completamente
 STR_0292_SAVE_SCENARIO                                          :Guardar escenario
@@ -1208,7 +1209,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Árboles
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Colocar distintos árboles al azar

 STR_CANT_BUILD_CANALS                                           :{WHITE}No se pueden construir canales aquí...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Construir canales
+STR_BUILD_CANALS_TIP                                            :{BLACK}Construir canales.
 STR_LANDINFO_CANAL                                              :Canal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}No se pueden construir dársenas aquí...
@@ -2606,8 +2607,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Añadir
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Hacer que en la orden resaltada, el vehículo espere a carga completa
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Hacer que en la orden resaltada, el vehículo espere a descargar completamente
 STR_SERVICE_HINT                                                :{BLACK}Saltar esta orden a menos que el servicio sea necesario
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nuevo {STRING} ahora disponible!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Coste: {CURRENCY} Peso: {WEIGHT_S}{}Velocidad: {VELOCITY}  Potencia: {POWER}{}Coste Operativo: {CURRENCY}/año{}Capacidad: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Averiado
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Operativo: {LTBLUE}{CURRENCY}/año
@@ -2634,6 +2633,10 @@ STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipo de vía in
 STR_TRAIN_NO_POWER                                              :{RED}Sin potencia
 STR_TRAIN_START_NO_CATENARY                                     :Esta vía carece la catenaria, así que el tren no puede comenzar

+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nuevo{STRING} ahora disponible!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nuevo {STRING} ahora disponible!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vehículo de carretera en camino
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vehículos de Carretera
@@ -2674,8 +2677,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Arrastra
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centrar vista en posición del depósito
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Lista de selección de vehículos - click en vehículo para información
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Construir el vehículo resaltado
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}¡Nuevo vehículo de carretera disponible!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Coste: {CURRENCY}{}Velocidad: {VELOCITY}{}Coste Operativo: {CURRENCY}/año{}Capacidad: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Nombrar vehículo
@@ -2747,8 +2748,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Ver órd
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrar vista en posición del barco
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Mandar barco al astillero
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Mostrar detalles del barco
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}¡Nuevo barco ya disponible!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidad Máx.: {VELOCITY}{}Capacidad: {CARGO}{}Coste Operativo: {CURRENCY}/año
 STR_982F_NAME_SHIP                                              :{BLACK}Nombrar barco

@@ -2821,8 +2820,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Ver órd
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrar vista en posición de la aeronave
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Enviar aeronave al hangar
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Mostrar detalles de la aeronave
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}¡Nueva aeronave ya disponible!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Coste: {CURRENCY} Velocidad Máx.: {VELOCITY}{}Capacidad: {COMMA} pasajeros, {COMMA} sacas de correo{}Coste Operativo: {CURRENCY}/año

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Nombrar aeronave
@@ -2900,6 +2897,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Se van a realizar cambios a un juego en ejecución; esto puede cerrar OpenTTD.{}¿Estás completamente seguro de realizar esto?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Añadir
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Añadir un NewGRF a la lista
 STR_NEWGRF_REMOVE                                               :{BLACK}Quitar
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Área: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Longitud: {NUM}{}Diferencia altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Área: {NUM} x {NUM}{}Diferencia altura: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -590,6 +590,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomst
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomst av första fordonet vid konkurrenternas stn.
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Olyckor / katastrofer
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Företagsinformation
+STR_NEWS_OPEN_CLOSE                                             :{YELLOW}Öppning / stängning av industrier
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Förändringar av ekonomin
 STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Råd / information om spelarens fordon
 STR_020C_NEW_VEHICLES                                           :{YELLOW}Nya fordon
@@ -729,7 +730,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Placera
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Placera fyrtorn
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Placera radiosändare
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definiera ökenområde.{}Tryck och håll CTRL för att ta bort
-STR_CREATE_LAKE                                                 :{BLACK}Definiera vattenområde.{}Den fyller närområdet om det ligger i sjönivå
+STR_CREATE_LAKE                                                 :{BLACK}Definiera vattenyta.{}Skapa en kanal, om inte CTRL är nedhållen vid havsnivå, då den kommer att översvämma närliggande områden istället
 STR_0290_DELETE                                                 :{BLACK}Ta bort
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Ta bort staden helt och hållet
 STR_0292_SAVE_SCENARIO                                          :Spara scenario
@@ -1207,7 +1208,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Träd av
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Placera träd av olika typ

 STR_CANT_BUILD_CANALS                                           :{WHITE}Kan inte bygga kanaler här...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Bygg kanaler. Håll ner CTRL för att bygga vid angränsande vatten.
+STR_BUILD_CANALS_TIP                                            :{BLACK}Bygg kanaler.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan inte bygga slussar här...
@@ -1670,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 ansenlig splittring för vägtrafik upp till 6 månader.{}  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_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}
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Infoga n
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Gör markerad order att tvinga fordonet att vänta på full last
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Gör markerad order att tvinga fordonet att vänta på tom last
 STR_SERVICE_HINT                                                :{BLACK}Skippa den här ordern om inte servning behövs
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} nu tillgängligt!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kostnad: {CURRENCY} Vikt: {WEIGHT_S}{}Hastighet: {VELOCITY}  Kraft {POWER}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Motorstopp
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/år
@@ -2631,7 +2630,11 @@ 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                                     :
+STR_TRAIN_START_NO_CATENARY                                     :Detta spår saknar kedjekurva, så tåget kan inte starta
+
+STR_NEW_VEHICLE_NOW_AVAILABLE                                   :{BLACK}{BIGFONT}Nya {STRING} är nu tillgänglig!
+STR_NEW_VEHICLE_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Nya {STRING} är nu tillgänglig  -  {STRING}

 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vägfordon i vägen
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Dra väg
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centrera vyn ovanför bussgaraget
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Vägfordonslista - klicka på fordon för information
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bygg markerat vägfordon
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nytt vägfordon tillgängligt!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kostnad: {CURRENCY}{}Hastighet: {VELOCITY}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Byt namn på vägfordon
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Visa ske
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centrera vyn ovanför skeppet
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Skicka skepp till depå. CTRL + klick servar endast
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Visa skeppdetaljer
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nytt skepp tillgängligt!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Tophastighet: {VELOCITY}{}Kapacitet: {CARGO}{}Löpande kostnad: {CURRENCY}/år
 STR_982F_NAME_SHIP                                              :{BLACK}Byt namn på skepp

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Visa fly
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Centrera vyn ovanför flygplanet
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Skicka flygplan till hangar. CTRL + klick servar endast
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Visa flygplan detaljer
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nytt flygplan tillgängligt!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Kostnad: {CURRENCY} Tophastighet: {VELOCITY}{}Kapacitet: {COMMA} passagerare, {COMMA} postsäckar{}Löpande kostnad: {CURRENCY}/år

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Byt namn på flygplan
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du håller på att göra ändringar i ett spel som används; detta kan krascha OpenTTD.{}Är du helt säker på detta?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Lägg till
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Lägg till en ny NewGRF-fil till listan
 STR_NEWGRF_REMOVE                                               :{BLACK}Ta bort
@@ -3136,4 +3134,10 @@ STR_MEASURE_AREA                                                :{BLACK}Yta: {NU
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Längd: {NUM}{}Höjdskillnad: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Yta: {NUM} x {NUM}{}Höjdskillnad: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -590,6 +590,7 @@ 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
@@ -729,7 +730,7 @@ 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 yap, deniz seviyesindeki yerler suyla dolar
+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
@@ -1207,7 +1208,7 @@ 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_BUILD_CANALS_TIP                                            :{BLACK}Kanal yap.
 STR_LANDINFO_CANAL                                              :Kanal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Buraya kilit yapılamaz...
@@ -2605,8 +2606,6 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Seçili
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili talimatı yaparken tren dolana kadar beklesin
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili talimatı yaparken tren mutlaka yükünü boşaltsın
 STR_SERVICE_HINT                                                :{BLACK}Bakım gerekmiyorsa bunu atla
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Yeni bir araç üretildi: {STRING}
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Fiyat: {CURRENCY} Ağırlık: {WEIGHT_S}{}Hız: {VELOCITY}  Güç: {POWER}{}Bakım: {CURRENCY}/sene{}Kapasite: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Bozuldu
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Yaş: {LTBLUE}{STRING}{BLACK}   Bakım: {LTBLUE}{CURRENCY}/sene
@@ -2633,6 +2632,10 @@ 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
@@ -2673,8 +2676,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Satmak i
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Araba garajını göster
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Araba listesi - bilgi için arabayı tıklayın
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Seçili arabayı al
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Yeni bir araba üretildi!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Fiyat: {CURRENCY}{}Hız: {VELOCITY}{}Bakım: {CURRENCY}/sene{}Kapasite: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Arabayı adlandır
@@ -2746,8 +2747,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Geminin
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Gemiyi göster
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Tersaneye gönder
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Gemi ayrıntılarını göster
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Yeni gemi üretildi!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Fiyatı: {CURRENCY} Mak. Hız: {VELOCITY}{}Kapasite: {CARGO}{}Bakım: {CURRENCY}/sene
 STR_982F_NAME_SHIP                                              :{BLACK}Gemiyi adlandır

@@ -2820,8 +2819,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Uçağı
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Uçağı göster
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Uçağı hangara gönder
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Uçak ayrıntılarını göster
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Yeni bir uçak yapıldı!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Fiyat: {CURRENCY} Mak. Hız: {VELOCITY}{}Kapasite: {COMMA} yolcu, {COMMA} çanta posta{}Bakım: {CURRENCY}/yıl

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Uçağı adlandır
@@ -2899,6 +2896,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Çalışan bir oyunu değiştirmek üzeresiniz; bu OpenTTD'yi çökertebilir.{}Emin misiniz?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Ekle
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Listeye NewGRF dosyası ekle
 STR_NEWGRF_REMOVE                                               :{BLACK}Kaldır
@@ -3135,4 +3133,9 @@ STR_MEASURE_AREA                                                :{BLACK}Alan: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Uzunluk: {NUM}{}Yükseklik farkı: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Alan: {NUM} x {NUM}{}Yükseklik farkı: {NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
@@ -109,8 +109,9 @@ STR_002B_BATTERIES                                              :батарей
 STR_002B_BATTERIES.r                                            :батарейок
 STR_002B_BATTERIES.z                                            :батарейки
 STR_002C_PLASTIC                                                :пластилін
+STR_002C_PLASTIC.r                                              :пластиліну
 STR_002C_PLASTIC.z                                              :пластилін
-STR_002D_FIZZY_DRINKS                                           :газована водф
+STR_002D_FIZZY_DRINKS                                           :газована вода
 STR_002D_FIZZY_DRINKS.r                                         :газованої води
 STR_002D_FIZZY_DRINKS.z                                         :газовану воду
 STR_002E                                                        :
@@ -202,6 +203,7 @@ STR_004B_BATTERY                                                :батарей
 STR_004B_BATTERY.r                                              :батарейок
 STR_004B_BATTERY.z                                              :батарейки
 STR_004C_PLASTIC                                                :пластилін
+STR_004C_PLASTIC.r                                              :пластиліну
 STR_004C_PLASTIC.z                                              :пластилін
 STR_004D_FIZZY_DRINK                                            :газована вода
 STR_004D_FIZZY_DRINK.r                                          :газованої води
@@ -237,7 +239,7 @@ STR_QUANTITY_BUBBLES                                            :{COMMA} бул
 STR_QUANTITY_TOFFEE                                             :{WEIGHT} ірисок
 STR_QUANTITY_BATTERIES                                          :{COMMA} батарей{P ка ки ок}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} пластику
-STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} газованої вод{P а "" и}!!!
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} пляш{P ка ки ок} газованої води
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}ПС
 STR_ABBREV_COAL                                                 :{TINYFONT}ВГ
@@ -275,11 +277,11 @@ STR_ABBREV_ALL                                                  :{TINYFONT}Вс
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Карта - {STRING}
-STR_00B1_GAME_OPTIONS                                           :{WHITE}Опції ігри
+STR_00B1_GAME_OPTIONS                                           :{WHITE}Опції гри
 STR_00B2_MESSAGE                                                :{YELLOW}Повідомлення
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Повідомлення від {STRING}
 STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Обережно!
-STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Неможливо це зробити...
+STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Неможливо зробити це...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Неможливо очистити цю ділянку...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Авторське право {COPYRIGHT} 1995 Кріс Сойєр, Всі права захищені
 STR_00B7_VERSION                                                :{BLACK}OpenTTD версія {REV}
@@ -367,7 +369,7 @@ STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFON
 STR_0113_COLA_WELLS                                             :{BLACK}{TINYFONT}Джерело Кока-Коли
 STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}Іграшковий магазин
 STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}Іграшкова фабрика
-STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}Пластикові фонтани
+STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}Пластилінові фонтани
 STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}Завод газованої води
 STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}Бульбашкова фабрика
 STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Ірисковий кар'єр
@@ -469,7 +471,7 @@ STR_UNITS_FORCE_METRIC                                          :{COMMA} ton for
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

 ############ range for menu starts
-STR_0154_OPERATING_PROFIT_GRAPH                                 :Прибуток виробництва
+STR_0154_OPERATING_PROFIT_GRAPH                                 :Операційний прибуток
 STR_0155_INCOME_GRAPH                                           :Графік доходів
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Доставлення вантажів
 STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Графік продуктивності
@@ -571,7 +573,7 @@ STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Буду
 STR_0182_BUILD_ROADS                                            :{BLACK}Будувати дороги
 STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Будувати порти
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}Будувати аеропорти
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Садити дерева, позначити місце, тощо
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Посадити дерева, позначити місце, тощо
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Інформація про земельну ділянку
 STR_0187_OPTIONS                                                :{BLACK}Опції
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
@@ -594,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})
@@ -714,6 +716,7 @@ 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}Новий транспорт
@@ -762,7 +765,7 @@ STR_0233_TOWN_GENERATION                                        :{WHITE}Ство
 STR_0234_NEW_TOWN                                               :{BLACK}Нове місто
 STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Будувати нове місто
 STR_0236_CAN_T_BUILD_TOWN_HERE                                  :{WHITE}Тут не можна будувати місто...
-STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...близько до краю карти
+STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...надто близько до краю карти
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...надто близько до іншого міста
 STR_0239_SITE_UNSUITABLE                                        :{WHITE}...невідповідне місце
 STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...забагато міст
@@ -802,7 +805,7 @@ STR_0259_BATTERY_FARM                                           :{BLACK}{G=s}Б
 STR_025A_COLA_WELLS                                             :{BLACK}Джерело Кока-коли
 STR_025B_TOY_SHOP                                               :{BLACK}Іграшковий магазин
 STR_025C_TOY_FACTORY                                            :{BLACK}Іграшкова фабрика
-STR_025D_PLASTIC_FOUNTAINS                                      :{BLACK}Пластикові фонтани
+STR_025D_PLASTIC_FOUNTAINS                                      :{BLACK}Пластилінові фонтани
 STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}Фабрика газованої води
 STR_025F_BUBBLE_GENERATOR                                       :{BLACK}Бульбашкова фабрика
 STR_0260_TOFFEE_QUARRY                                          :{BLACK}Ірисковий кар'єр
@@ -828,7 +831,7 @@ STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Буду
 STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}Посадити фруктовий сад
 STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Посадити каучуковий сад
 STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Будувати водопостачання
-STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Будувати водонапірна башту (тільки у містах)
+STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Будувати водонапірну башту (тільки у містах)
 STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Будувати діамантову шахту
 STR_0279_CONSTRUCT_COPPER_ORE_MINE                              :{BLACK}Будувати міднорудну шахту
 STR_027A_PLANT_COTTON_CANDY_FOREST                              :{BLACK}Посадити ліс солодкої вати
@@ -837,7 +840,7 @@ STR_027C_CONSTRUCT_BATTERY_FARM                                 :{BLACK}Поса
 STR_027D_CONSTRUCT_COLA_WELLS                                   :{BLACK}Будувати джерело Кока-коли
 STR_027E_CONSTRUCT_TOY_SHOP                                     :{BLACK}Будувати іграшковий магазин
 STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}Будувати іграшкову фабрику
-STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}Будувати пластикові фонтани
+STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}Будувати пластилінові фонтани
 STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}Будувати завод газованої води
 STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Будувати бульбашкову фабрику
 STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Будувати ірисковий кар'єр
@@ -853,7 +856,7 @@ 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}Позначити територію води.{}Заповниться водою, якщо на рівні моря
+STR_CREATE_LAKE                                                 :{BLACK}Позначити, де буде вода.{}Make a canal, unless CTRL is held down at sea level, when it will flood the surroundings instead
 STR_0290_DELETE                                                 :{BLACK}Видалити
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Видалити місто повністю
 STR_0292_SAVE_SCENARIO                                          :Зберегти сценарій
@@ -944,8 +947,8 @@ STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Вибі
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Транспорт
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Виберіть, по якій стороні їхатиме транспорт
-STR_02E9_DRIVE_ON_LEFT                                          :Їде по лівій стороні
-STR_02EA_DRIVE_ON_RIGHT                                         :Їде по правій стороні
+STR_02E9_DRIVE_ON_LEFT                                          :їде по лівій стороні
+STR_02EA_DRIVE_ON_RIGHT                                         :їде по правій стороні
 STR_02EB_TOWN_NAMES                                             :{BLACK}Назви міст
 STR_02EC                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Виберіть стиль назв міст
@@ -968,7 +971,7 @@ STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Поча
 STR_0304_QUIT                                                   :{BLACK}Вихід
 STR_0305_QUIT_OPENTTD                                           :{BLACK}покинути 'OpenTTD'
 STR_0307_OPENTTD                                                :{WHITE}OpenTTD {REV}
-STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...можна збудувати лише в містах
+STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...можна будувати лише у містах
 STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Вибрати 'помірний' клімат
 STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Вибрати 'субарктичний' клімат
 STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Вибрати 'тропічний' клімат
@@ -1105,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.
@@ -1331,7 +1334,7 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Дере
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Садити дерева випадкового типу

 STR_CANT_BUILD_CANALS                                           :{WHITE}Неможливо будувати канал тут...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Будувати канал
+STR_BUILD_CANALS_TIP                                            :{BLACK}Будувати канали.
 STR_LANDINFO_CANAL                                              :Канал

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Неможливо будувати шлюз тут...
@@ -1374,7 +1377,7 @@ STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Збуд
 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_PLASTIC_FOUNTAINS_TIP                             :{BLACK}Будувати пластилінові фонтани
 STR_CONSTRUCT_BUBBLE_GENERATOR_TIP                              :{BLACK}Збудувати бульбашкову фабрику
 STR_CONSTRUCT_TOFFEE_QUARRY_TIP                                 :{BLACK}Будувати ірисковий кар'єр
 STR_CONSTRUCT_SUGAR_MINE_TIP                                    :{BLACK}Збудувати цукрову копальню
@@ -1510,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}
@@ -1931,14 +1934,14 @@ STR_4001_LOAD_GAME                                              :{WHITE}Зава
 STR_4002_SAVE                                                   :{BLACK}Зберегти
 STR_4003_DELETE                                                 :{BLACK}Видалити
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} мегабайт вільно
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} мегабайт{P "" и ""}  вільно
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Неможливо прочитати пристрій
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Помилка запису гри
-STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Неможлтво видалити файл
+STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Неможливо стерти файл
 STR_4009_GAME_LOAD_FAILED                                       :{WHITE}Помилка завантаження гри
 STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}Список пристроїв, каталогів і збережених файлів гри
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Поточне вибране ім'я файлу для збереження гри
-STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Видалити поточну вибрану збережену гру
+STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Стерти вибрану збережену гру
 STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Зберегти поточну гру, використовуючи вибране ім'я файлу
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Виберіть новий тип гри
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Виберіть сценарій (зелений), встановлена гра (синій), або випадкова нова гра
@@ -2012,8 +2015,8 @@ STR_4820_TOY_SHOP                                               :Іграшко
 STR_4820_TOY_SHOP.z                                             :іграшковий магазин
 STR_4821_TOY_FACTORY                                            :Іграшкова фабрика
 STR_4821_TOY_FACTORY.z                                          :іграшкову фабрику
-STR_4822_PLASTIC_FOUNTAINS                                      :Пластиковий фонтан
-STR_4822_PLASTIC_FOUNTAINS.z                                    :пластиковий фонтан
+STR_4822_PLASTIC_FOUNTAINS                                      :Пластиліновий фонтан
+STR_4822_PLASTIC_FOUNTAINS.z                                    :пластиліновий фонтан
 STR_4823_FIZZY_DRINK_FACTORY                                    :Завод газованої води
 STR_4823_FIZZY_DRINK_FACTORY.z                                  :завод газованої води
 STR_4824_BUBBLE_GENERATOR                                       :Бульбашкова фабрика
@@ -2308,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                                        :Регулювальник
@@ -2338,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% акцій компанії
@@ -2358,6 +2361,8 @@ STR_LIVERY_DIESEL                                               :Дизельн
 STR_LIVERY_ELECTRIC                                             :Електричні потяги
 STR_LIVERY_MONORAIL                                             :Монорельс
 STR_LIVERY_MAGLEV                                               :Потяги на магнітній подушці
+STR_LIVERY_DMU                                                  :DMU
+STR_LIVERY_EMU                                                  :EMU
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Пасажирський вагон (пар)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Пасажирський вагон (дизель)
 STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Пасажирський вагон (електричка)
@@ -2433,7 +2438,7 @@ STR_8031_CANDY_VAN                                              :Вагон дл
 STR_8032_TOY_VAN                                                :Вагон для іграшок
 STR_8033_BATTERY_TRUCK                                          :вантажівка для батарейок
 STR_8034_FIZZY_DRINK_TRUCK                                      :вантажівка для газованої води
-STR_8035_PLASTIC_TRUCK                                          :вантажівка для пластику
+STR_8035_PLASTIC_TRUCK                                          :вантажівка для пластиліну
 STR_8036_X2001_ELECTRIC                                         :'X2001' (Електричка)
 STR_8037_MILLENNIUM_Z1_ELECTRIC                                 :'Millennium Z1' (Електричка)
 STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99
@@ -2463,7 +2468,7 @@ STR_804F_CANDY_VAN                                              :вагон дл
 STR_8050_TOY_VAN                                                :вагон для іграшок
 STR_8051_BATTERY_TRUCK                                          :вагон для батарейок
 STR_8052_FIZZY_DRINK_TRUCK                                      :вантажівка для газованої води
-STR_8053_PLASTIC_TRUCK                                          :вантажівка для пластику
+STR_8053_PLASTIC_TRUCK                                          :вантажівка для пластиліну
 STR_8054_LEV1_LEVIATHAN_ELECTRIC                                :Lev1 'Leviathan' (електричка)
 STR_8055_LEV2_CYCLOPS_ELECTRIC                                  :Lev2 'Cyclops' (електричка)
 STR_8056_LEV3_PEGASUS_ELECTRIC                                  :Lev3 'Pegasus' (електричка)
@@ -2495,7 +2500,7 @@ STR_806F_CANDY_VAN                                              :вагон дл
 STR_8070_TOY_VAN                                                :вагон для іграшок
 STR_8071_BATTERY_TRUCK                                          :вагон для батарейок
 STR_8072_FIZZY_DRINK_TRUCK                                      :вагон для газованої води
-STR_8073_PLASTIC_TRUCK                                          :вагон для пластику
+STR_8073_PLASTIC_TRUCK                                          :вагон для пластиліну
 STR_8074_MPS_REGAL_BUS                                          :MPS Regal автобус
 STR_8075_HEREFORD_LEOPARD_BUS                                   :Hereford Leopard автобус
 STR_8076_FOSTER_BUS                                             :Foster автобус
@@ -2561,8 +2566,8 @@ STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :MightyMover в
 STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Powernaught вантажівка для коли
 STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Wizzowow вантажівка для коли
 STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :MightyMover вантажівка для цукрової вати
-STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Powernaught вантажівка для солодощів
-STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Wizzowow вантажівка для солодощів
+STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Powernaught вантажівка для цукрової вати
+STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Wizzowow вантажівка для цукрової вати
 STR_80B7_MIGHTYMOVER_TOFFEE_TRUCK                               :MightyMover вантажівка для ірисок
 STR_80B8_POWERNAUGHT_TOFFEE_TRUCK                               :Powernaught вантажівка для ірисок
 STR_80B9_WIZZOWOW_TOFFEE_TRUCK                                  :Wizzowow вантажівка для ірисок
@@ -2578,9 +2583,9 @@ STR_80C2_WIZZOWOW_BATTERY_TRUCK                                 :Wizzowow ван
 STR_80C3_MIGHTYMOVER_FIZZY_DRINK                                :MightyMover вантажівка для газованої води
 STR_80C4_POWERNAUGHT_FIZZY_DRINK                                :Powernaught вантажівка для газованої води
 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_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 вантажівка для кульок
@@ -2637,7 +2642,7 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Tricario гел
 STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2 гелікоптер
 STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut гелікоптер
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Повідомлення від виробника транспорту
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Ми розробили новий {STRING} - бажаєте екслюзивно користуватись ним протягом року, так ми побачимо як він зарекомендує себе перед тим як буде доступним для всіх?
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Ми розробили новий {STRING} - чи бажаєте ексклюзивно користуватись ним протягом року, так ми побачимо, як він зарекомендує себе, перед тим як буде доступним для всіх?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :локомотив
 STR_8103_ROAD_VEHICLE                                           :автомобіль
 STR_8104_AIRCRAFT                                               :літак
@@ -2764,13 +2769,11 @@ STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Вста
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Чекати повного завантаження на цій станції
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Лише розвантажитися на цій станції
 STR_SERVICE_HINT                                                :{BLACK}Пропустити це завдання поки обслуговування потрібне!!!
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Доступний новий {STRING}!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Ціна: {CURRENCY} Вага: {WEIGHT_S}{}Швидкість: {VELOCITY}{}Потужність: {POWER}{}Вартість експлуатації: {CURRENCY}/рік{}Місткість: {CARGO}
 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}Неможливо проїхати сигнал - небезпечно...
@@ -2792,6 +2795,10 @@ 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_TYPE                                            :{BLACK}{BIGFONT}{STRING}
+STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                         :{BLACK}Став доступним новий {STRING}!  -  {STRING}
+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}На шляху авто
 STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} автомобіл{P ь і ів}
@@ -2832,8 +2839,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Пере
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Показати авто депо в центрі екрану
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Список авто - натисніть на авто для інформації
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Будувати вибране авто
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Доступне нове авто!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Ціна: {CURRENCY}{}Швидкість: {VELOCITY}{}Транспортні витрати: {CURRENCY}/рік{}Місткість: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Назвати авто
@@ -2905,8 +2910,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Пока
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Показати корабель в центрі екрану
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Направити корабель в депо
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Показати корабель детально
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Доступний новий корабель!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ціна: {CURRENCY} Макс. швидкість: {VELOCITY}{}Місткість: {CARGO}{}Транспортні витрати: {CURRENCY}/рік
 STR_982F_NAME_SHIP                                              :{BLACK}Назвати корабель

@@ -2979,8 +2982,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Пока
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Показати літак в центрі екрану
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Направити літак в ангар
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Показати літак детально
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Доступний новий літак!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Ціна: {CURRENCY} Макс. швидкість: {VELOCITY}{}Місткість: {COMMA} пасажирів, {COMMA} мішків пошти{}Транспортні витрати: {CURRENCY}/рік

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Назвати літак
@@ -3058,6 +3059,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}ID гр
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5сума: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Ви хочете зробити зміни у вже запущеній грі; це може привести до зависання OpenTTD.{}Ви впевнені що хочете зробити це?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Додати
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Додати файли NewGRF до списку
 STR_NEWGRF_REMOVE                                               :{BLACK}Видалити
@@ -3295,4 +3297,10 @@ STR_MEASURE_AREA                                                :{BLACK}Обла
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Довжина: {NUM}{}Різниця висот: {NUM} м
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Ділянка: {NUM} x {NUM}{}Різниця висот: {NUM} м

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -82,6 +82,16 @@ STR_004A_TOFFEE                                                 :Tameletjie
 STR_004B_BATTERY                                                :Battery
 STR_004C_PLASTIC                                                :Plastiek
 STR_004D_FIZZY_DRINK                                            :Koeldrank
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} Passasier{P "" s}
+STR_QUANTITY_COAL                                               :{WEIGHT} van steenkool
+STR_QUANTITY_MAIL                                               :{COMMA} sak{P "" e} van pos
+STR_QUANTITY_OIL                                                :{VOLUME} van olie
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} item{P "" s} van lewende hawe
+STR_QUANTITY_GOODS                                              :{COMMA} hok{P "" ke} van goedere
+STR_QUANTITY_GRAIN                                              :{WEIGHT} van graan
+STR_QUANTITY_WOOD                                               :{WEIGHT} van hout
+STR_QUANTITY_IRON_ORE                                           :{WEIGHT} van yster erts
 STR_QUANTITY_STEEL                                              :{WEIGHT} van staal
 STR_QUANTITY_VALUABLES                                          :{COMMA} sak{P "" ke} van kosbaarhede
 STR_QUANTITY_COPPER_ORE                                         :{WEIGHT} van koper erts
@@ -149,7 +159,7 @@ STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan nie
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan nie die area reinig nie....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Oorspronklik kopiereg {COPYRIGHT} 1995 Chris Sawyer, Alle regte voorbehou
 STR_00B7_VERSION                                                :{BLACK}OpenTTD bewerking {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Die OpenTTD span
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 Die OpenTTD span
 STR_TRANSLATED_BY                                               :{BLACK}  Vertaler(s) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -192,7 +202,7 @@ STR_00E9_VEGETATION                                             :Plantegroei
 STR_00EA_OWNERS                                                 :Eienaars
 STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Paaie
 STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Spoorwege
-STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Stasies/Lughawe/Werfe
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Stasies/Lughawes/Werfe
 STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Geboue/Nywerheide
 STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Voertuie
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100m
@@ -263,7 +273,7 @@ STR_0130_RENAME                                                 :{BLACK}Hernaam
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Te veel naame bepaal
 STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Verkieste naam reeds in gebruik

-STR_0133_WINDOWS                                                :Vensters
+STR_0133_WINDOWS                                                :Windows
 STR_0134_UNIX                                                   :Unix
 STR_0135_OSX                                                    :OS X
 STR_OSNAME_BEOS                                                 :BeOS
@@ -298,6 +308,7 @@ STR_BY                                                          :{BLACK}*
 STR_0148_GAME_OPTIONS                                           :{BLACK}Spel Opsies

 STR_0150_SOMEONE                                                :iemand{SKIP}{SKIP}
+STR_0151_MAP_OF_WORLD                                           :Kaart van die wereld
 STR_0152_TOWN_DIRECTORY                                         :Stad index
 STR_0153_SUBSIDIES                                              :Subsidiëe

@@ -434,7 +445,7 @@ STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Land are
 STR_0187_OPTIONS                                                :{BLACK}Opsies
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
 STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
-STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}kan nie tussendiens tydperk verander nie...
+STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}kan nie versiening tussentyd verander nie...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Maak venster toe
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Venster titel - sleep die om venster te beweeg
 STR_STICKY_BUTTON                                               :{BLACK}Bemerk die venste as ontoemaakbaar by die"Sluit Alle Vensters" sleutel
@@ -540,7 +551,7 @@ STR_01E7                                                        :{DKGREEN}{TINYF
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Liedjie{SETX 88}Titel
 STR_01E9_SHUFFLE                                                :{TINYFONT}Skuifel
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Musiek lys
-STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musiek Lys Seleksie
+STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musiek Lys Keuse
 STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
 STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA} "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Liedjie Index
@@ -557,7 +568,7 @@ STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Reinig h
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Bewaar musiek stellings
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Kliek op musiek liedjie om by huidige musiek lys in te sit (slegs Gewoonte 1 of Gewoonte 2)
 STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Kliek op musiek lied om te verwyder van huidige program (Slegs Gewoonte1 of Gewoonte2)
-STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Skakel musiek lys skuimel aan/af
+STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Skakel musiek lys skuifel aan/af
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Vertoon musiek liedjie keuse venster
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Kliek op diens om uitsig te senter op nywerheid/stad
 STR_01FE_DIFFICULTY                                             :{BLACK}Moeilikheid ({STRING})
@@ -588,6 +599,9 @@ STR_0213_BUSINESSMAN                                            :Sakeman
 STR_0214_ENTREPRENEUR                                           :Ondernemer
 STR_0215_INDUSTRIALIST                                          :Nyweraar
 STR_0216_CAPITALIST                                             :Kapitalis
+STR_0217_MAGNATE                                                :Magnaat
+STR_0218_MOGUL                                                  :Mongool
+STR_0219_TYCOON_OF_THE_CENTURY                                  :Magnaat van die eeu
 STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
 STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} behaal '{STRING}' stand!
@@ -603,7 +617,6 @@ 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
@@ -668,7 +681,7 @@ STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Bou Staa
 STR_026A_CONSTRUCT_FARM                                         :{BLACK}Bou Plaas
 STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Bou Yster Erts Myn
 STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Bou Olie Bron
-STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Bou Bank (kan slegs in stede met 'n populasie grooter as 1200 gebou)
+STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Bou Bank (kan slegs in stede met 'n populasie grooter as 1200 gebou word)
 STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Bou Papiermeul
 STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Bou Kos Verwerkings Fabriek
 STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Bou Drukwerke
@@ -702,8 +715,7 @@ STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}Beplant
 STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Plaas rotse op landerye
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Plaas vuurtoring
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plaas sender
-STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Bepaal woestyn ares.{}Druk en hou CTRL om te verwyder
-STR_CREATE_LAKE                                                 :{BLACK}Bepaal water area.{}Dit sal die omgewing vloed as dit teen seevlak is
+STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Bepaal woestyn area.{}Druk en hou CTRL om te verwyder
 STR_0290_DELETE                                                 :{BLACK}Uitwis
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Uitwis hele stad
 STR_0292_SAVE_SCENARIO                                          :Bewaar draaiboek
@@ -721,9 +733,9 @@ STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}begin 'n
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Is jy seker jy wil die draaiboek verlaat?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Verlaat Redakteur
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kan slegs in stede met 'n populasie van te minste 1200 gebou word
-STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Beweeg die begin datum terug 1 jaar
-STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Beweeg die begin datum voor 1 jaar
-STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...altbei einde van brug moet op land wees
+STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Beweeg die begin datum 1 jaar terug
+STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Beweeg die begin datum 1 jaar voor
+STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...albei einde van brug moet op land wees
 STR_02A1_SMALL                                                  :{BLACK}Klein
 STR_02A2_MEDIUM                                                 :{BLACK}Middel
 STR_02A3_LARGE                                                  :{BLACK}Groot
@@ -731,7 +743,7 @@ STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Kies sta
 STR_02A5_TOWN_SIZE                                              :{YELLOW}Stad groote:

 STR_02B6                                                        :{STRING}  -  {STRING}
-STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Vertoon laaste boodskap of nuus verslag
+STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Wys laaste boodskap of nuus verslag
 STR_OFF                                                         :Af
 STR_SUMMARY                                                     :Opsomming
 STR_FULL                                                        :Vol
@@ -749,7 +761,7 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spel opsies
 STR_02C5_DIFFICULTY_SETTINGS                                    :Moeilikheid stellings
-STR_02C7_CONFIG_PATCHES                                         :Skep Stukke
+STR_02C7_CONFIG_PATCHES                                         :Skep stukke
 STR_NEWGRF_SETTINGS                                             :Newgrf stellings
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Stad naame vertoon
@@ -794,7 +806,7 @@ STR_02E4                                                        :{BLACK}{SKIP}{S
 STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Maatre� eenheide keuse
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Pad voertuie
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Selekteer kant van pad waarop voetuie bestuur
+STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Kies kant van pad waarop voetuie bestuur
 STR_02E9_DRIVE_ON_LEFT                                          :Bestuur op links
 STR_02EA_DRIVE_ON_RIGHT                                         :Bestuur op regs
 STR_02EB_TOWN_NAMES                                             :{BLACK}Stad naame
@@ -811,7 +823,7 @@ STR_02FA_EVERY_12_MONTHS                                        :Elke 12 maande
 STR_02FB_START_A_NEW_GAME                                       :{BLACK}Begin nuwe spel
 STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Laai 'n bewaarde spel
 STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Skep 'n doelgeboude spel wêreld/draaiboek
-STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Kies enkel-spele spel
+STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Kies enkel-speler spel
 STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Kies veelspeler spel met 2-8 spelers
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Vertoon spel opsies
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Vertoon moeilikheid opsies
@@ -1122,7 +1134,6 @@ STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Vlakte l


 STR_CANT_BUILD_CANALS                                           :{WHITE}Kan nie kanaale hier bou nie...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Bou kanaale. Druk CRTL om see blokkies te plaas (slegs op see-vlak)
 STR_LANDINFO_CANAL                                              :Kanaal

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan nie sluite hier bou nie...
@@ -1395,7 +1406,7 @@ STR_BMPMAP_ERROR                                                :{WHITE}Kan nie
 STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan nie prent tipe verdoel nie.

 ##id 0x0800
-STR_0800_COST                                                   :{TINYFONT}{RED}Prys: {CURRENCY}
+STR_0800_COST                                                   :{TINYFONT}{RED}Koste: {CURRENCY}
 STR_0801_COST                                                   :{RED}Koste: {CURRENCY}
 STR_0802_INCOME                                                 :{TINYFONT}{GREEN}Inkome: {CURRENCY}
 STR_0803_INCOME                                                 :{GREEN}Inkome: {CURRENCY}
@@ -1430,7 +1441,7 @@ STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Kan nie
 STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Kan nie spoorweg stasie hier bou nie...
 STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Kan nie seine hier bou nie...
 STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Kan nie spoorweg spoor hier bou nie...
-STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Kan nie spoorweg spoor van hier verwyder nie...
+STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Kan nie spoorweg spoor van hier af verwyder nie...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Kan nie seine van hier verwyder nie...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Trein Depot Ori�tering
 STR_1015_RAILROAD_CONSTRUCTION                                  :Spoorweg konstruksie
@@ -1463,7 +1474,7 @@ STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan nie
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan nie vraagmotor stasie bou nie...
 STR_180A_ROAD_CONSTRUCTION                                      :Pad konstruksie
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bou pad afdeling
-STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bou pad voertuig depot (vir bou en diens van voertuie)
+STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bou pad voertuig depot (vir bou en versiening van voertuie)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bou bus stasie
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bou vraagmotor laai area
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bou pad brug
@@ -1485,7 +1496,7 @@ STR_2006_POPULATION                                             :{BLACK}Populasi
 STR_2007_RENAME_TOWN                                            :Hernaam Stad
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kan nie stad hernaam nie...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} plaaslike raad weier om dit te toelaat
-STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Stad naame - kliek op naam om skerm op stad te senter
+STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Stad naame - kliek naam om skerm op stad te senter
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Senter skerm op stad
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Verander stad naam
 STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passasiers verlede maand: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
@@ -1648,11 +1659,11 @@ STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Senter s
 STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Wys stasie graderings
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Verander naam van stasie
 STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Wys lys van aanvaarde vrag
-STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Stasie naame - Kliek op naam om skerm op stasie te senter
+STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Stasie naame - Kliek naam om skerm op stasie te senter
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Kies groote/tipe van lughawe
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_305E_RAILROAD_STATION                                       :Spoorweg stasie
-STR_305F_AIRCRAFT_HANGAR                                        :Vlietuig hangar
+STR_305F_AIRCRAFT_HANGAR                                        :Vliegtuig hangar
 STR_3060_AIRPORT                                                :Lughawe
 STR_3061_TRUCK_LOADING_AREA                                     :Vraagmotor laai area
 STR_3062_BUS_STATION                                            :Bus stasie
@@ -1808,7 +1819,7 @@ STR_5028_TUBULAR_ROAD_BRIDGE                                    :Buis pad brug
 STR_5800_OBJECT_IN_THE_WAY                                      :{WHITE}Voorwerp in die pad
 STR_5801_TRANSMITTER                                            :Sender
 STR_5802_LIGHTHOUSE                                             :Vuurtoring
-STR_5803_COMPANY_HEADQUARTERS                                   :Maatskappy Hoofkwartier
+STR_5803_COMPANY_HEADQUARTERS                                   :Maatskappy Hoofkwartiers
 STR_5804_COMPANY_HEADQUARTERS_IN                                :{WHITE}...maatskappy hoofkwartiers in die pad
 STR_5805_COMPANY_OWNED_LAND                                     :Maatskappy-besitte land
 STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Land area kan nie aangekoop word nie...
@@ -1819,6 +1830,34 @@ STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...jy be
 ############ These strings may never get a new id, or savegames will break!
 ##id 0x6000

+STR_SV_STNAME_CENTRAL                                           :{STRING} Sentraal
+STR_SV_STNAME_TRANSFER                                          :{STRING} Verplaas
+STR_SV_STNAME_HALT                                              :{STRING} Halte
+STR_SV_STNAME_VALLEY                                            :{STRING} Vallei
+STR_SV_STNAME_HEIGHTS                                           :{STRING} Hoogtes
+STR_SV_STNAME_WOODS                                             :{STRING} Woude
+STR_SV_STNAME_LAKESIDE                                          :{STRING} Meerkant
+STR_SV_STNAME_EXCHANGE                                          :{STRING} Wissel
+STR_SV_STNAME_AIRPORT                                           :{STRING} Lughawe
+STR_SV_STNAME_OILFIELD                                          :{STRING} Olieveld
+STR_SV_STNAME_MINES                                             :{STRING} Myne
+STR_SV_STNAME_DOCKS                                             :{STRING} Werfe
+STR_SV_STNAME_BUOY_1                                            :{STRING} Baken 1
+STR_SV_STNAME_BUOY_2                                            :{STRING} Baken 2
+STR_SV_STNAME_BUOY_3                                            :{STRING} Baken 3
+STR_SV_STNAME_BUOY_4                                            :{STRING} Baken 4
+STR_SV_STNAME_BUOY_5                                            :{STRING} Baken 5
+STR_SV_STNAME_BUOY_6                                            :{STRING} Baken 6
+STR_SV_STNAME_BUOY_7                                            :{STRING} Baken 7
+STR_SV_STNAME_BUOY_8                                            :{STRING} Baken 8
+STR_SV_STNAME_BUOY_9                                            :{STRING} Baken 9
+STR_SV_STNAME_ANNEXE                                            :{STRING} Anneks
+STR_SV_STNAME_SIDINGS                                           :{STRING} Wisselspoore
+STR_SV_STNAME_BRANCH                                            :{STRING} Tak
+STR_SV_STNAME_UPPER                                             :Bo {STRING}
+STR_SV_STNAME_LOWER                                             :Laer {STRING}
+STR_SV_STNAME_HELIPORT                                          :{STRING} Helihawe
+STR_SV_STNAME_FOREST                                            :{STRING} Woud

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

@@ -1865,6 +1904,7 @@ STR_681C_SLOW                                                   :Stadig
 STR_681D_MEDIUM                                                 :Gemiddel
 STR_681E_FAST                                                   :Vinnig
 STR_681F_VERY_FAST                                              :Baie Vinnig
+STR_VERY_LOW                                                    :Baie Laag
 STR_6820_LOW                                                    :Laag
 STR_6821_MEDIUM                                                 :Gemiddel
 STR_6822_HIGH                                                   :Hoog
@@ -1954,7 +1994,10 @@ STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Terugbet
 STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Bestuurder)
 STR_7038_INAUGURATED                                            :{GOLD}Bevestig: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Voertuie
+STR_TRAINS                                                      :{WHITE}{COMMA} trein{P "" e}
+STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} pad voertui{P g e}
 STR_AIRCRAFT                                                    :{WHITE}{COMMA} vliegtuig
+STR_SHIPS                                                       :{WHITE}{COMMA} sk{P ip epe}
 STR_7042_NONE                                                   :{WHITE}Geen
 STR_7043_FACE_SELECTION                                         :{WHITE}Gesig Keuse
 STR_7044_MALE                                                   :{BLACK}Manlik
@@ -2001,10 +2044,13 @@ STR_706C_CHAIRMAN                                               :Voorsitter
 STR_706D_PRESIDENT                                              :President
 STR_706F_BUILD_HQ                                               :{BLACK}Bou HK
 STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Bou maatskappy hoofkwartiers / wys maatskappy hoofkwartiers
+STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Herbou maatskappy hoofkwartiers elders vir 1% koste van maatskappy waarde
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Maatskappy hoofkwartiers kan nie hier gebou word nie...
 STR_7072_VIEW_HQ                                                :{BLACK}Wys HK
+STR_RELOCATE_HQ                                                 :{BLACK}Beweeg HQ
 STR_COMPANY_PASSWORD                                            :{BLACK}Wagwoord
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Wagwoord-beskerm jou maatskappy om onmagtig gebruikers te belet van verbinding
+STR_SET_COMPANY_PASSWORD                                        :Stel maatskappy wagwoord
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}W�eld Insinking!{}{}Finansieel eksperte vrees ergste as ekconomie inmekaar sak!
 STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Insinking Oor!{}{}Oplewing in sake gee vertroue na nywerheide as ekonomie versterk!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Skakel groot/klein venster groote
@@ -2320,8 +2366,8 @@ STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} T
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Burgers herdenk . . .{}Eerste trein arriveer by {STATION}!
 STR_8802_DETAILS                                                :{WHITE}{STRING} (Aanwyse)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Trein in die pad
-STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
-STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
 STR_8806_GO_TO                                                  :Gaan na {STATION}
 STR_8807_GO_TO_TRANSFER                                         :Gaan na {STATION} (Oordrag en vat vrag)
 STR_8808_GO_TO_UNLOAD                                           :Gaan na {STATION} (Aflaai)
@@ -2335,7 +2381,9 @@ STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Gaan deurgaande
 STR_8810_GO_NON_STOP_TO_LOAD                                    :Gaan deurgaande na {STATION} (Laai)
 STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Gaan deurgaande na {STATION} (Oordrag en wag vir volle lading)
 STR_GO_TO_TRAIN_DEPOT                                           :Gaan na {TOWN} Trein Depot
+STR_SERVICE_AT_TRAIN_DEPOT                                      :Diens by {TOWN} Trein Depot
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Gaan deurgaande na {TOWN} Trein Depot
+STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Diens deurgaande by {TOWN} Trein Depot

 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Op pad na {TOWN} Trein Depot
 STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Op pad na {TOWN} Trein Depot, {VELOCITY}
@@ -2344,6 +2392,7 @@ STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Diens b

 STR_INVALID_ORDER                                               :{RED} (Swak Opdrag)

+STR_UNKNOWN_DESTINATION                                         :onbekende destinasie
 STR_8812_EMPTY                                                  :{LTBLUE}Leeg
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} vanaf {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} van {STATION} (x{NUM})
@@ -2374,14 +2423,19 @@ STR_8825_NON_STOP                                               :{BLACK}Deurgaan
 STR_8826_GO_TO                                                  :{BLACK}Gaan Na
 STR_8827_FULL_LOAD                                              :{BLACK}Volle Lading
 STR_8828_UNLOAD                                                 :{BLACK}Aflaai
+STR_REFIT                                                       :{BLACK}Herpas
+STR_REFIT_TIP                                                   :{BLACK}Kies watter vrag tipe te herpas na in die opdraag. CTRL-kliek om herpas instruksie te verwyder
+STR_REFIT_ORDER                                                 :(Herpas na {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Opdrae)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Einde van Opdrae - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
+STR_SERVICE                                                     :{BLACK}Diens
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Kan nie spoorweg voertuig bou nie...
 STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Laai / Aflaai
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trein moet binne in 'n depot gestop word
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan nie trein na depot stuur nie...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Geen spasie vir nog opdrae
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Te veel opdrae
@@ -2394,6 +2448,7 @@ STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kan nie
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kan nie roete na plaaslike depot vind nie
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Trein kan nie stop/aanvang word nie...
 STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Diens tussentyd: {LTBLUE}{COMMA}dae{BLACK}   Laaste diens: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Versiens tussentyd: {LTBLUE}{COMMA}%{BLACK}   Laaste versiening: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treine - kliek op trein vir inligting
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Bou nuwe treine (vereis trein depot)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treine - kliek op trein vir info., sleep voertuig om te bysit/verwyder van trein
@@ -2423,10 +2478,12 @@ STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die
 STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Invoeg 'n nuwe opdrag voor die beklemtoonde opdrag, of byvoeg na einde van lys
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die beklemtoonde opdrag dwing die voertuig om vir 'n volle lading te wag
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die beklemtoonde opdrag dwing die voertuig te aflaai
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nuwe {STRING} nou beskikbaar!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
+STR_SERVICE_HINT                                                :{BLACK}Sprong die opdraag tensy 'n versiening nodig is
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Koste: {CURRENCY} Gewig: {WEIGHT_S}{}Spoed: {VELOCITY}  Krag: {POWER}{}Loopkoste: {CURRENCY}/jr{}Kapasitiet: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Oponthoud
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ouderdom: {LTBLUE}{STRING}{BLACK}   Loopkoste: {LTBLUE}{CURRENCY}/Jr
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewig: {LTBLUE}{WEIGHT_S}  {BLACK}Krag: {LTBLUE}{POWER}{BLACK} Max. spoed: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Gewig: {LTBLUE}{WEIGHT_S} {BLACK}Krag: {LTBLUE}{POWER}{BLACK} Max. spoed: {LTBLUE}{VELOCITY} {BLACK}Max. T.E.: {LTBLUE}{FORCE}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profyt die jaar: {LTBLUE}{CURRENCY}  (verlede jaar: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Deeglikheid: {LTBLUE}{COMMA}%  {BLACK}Oponthoude sedert laaste diens: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Gestop
@@ -2443,7 +2500,10 @@ STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Trein vo
 STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die beklemtoonde opdrag dwing die voertuig om sy vrag te stort
 STR_886F_TRANSFER                                               :{BLACK}Oordrag

+STR_TRAIN_STOPPING                                              :{RED}Ophou
+STR_TRAIN_STOPPING_VEL                                          :{RED}Ophou, {VELOCITY}
 STR_INCOMPATIBLE_RAIL_TYPES                                     :Onbestaaanbaar spoor tipes
+STR_TRAIN_NO_POWER                                              :{RED}Geen Krag

 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Pad voertuig in die pad
@@ -2485,8 +2545,6 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Sleep pa
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Senter skerm op pad voertuig depot
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Pad voertuig keuse lys - kliek op voertuig vir inligting
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bou die beklemtoonde pad voertuig
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nuwe pad voertuig nou beskikbaar!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koste: {CURRENCY}{}Spoed: {VELOCITY}{}Loopkoste: {CURRENCY}/yr{}Kapasitiet: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Benaam pad voertuig
@@ -2503,7 +2561,11 @@ STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Hernaam
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Hernaam pad voertuig tipe
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Pad voertuig tipe kan nie hernaam word nie...
 STR_9038_GO_TO_ROADVEH_DEPOT                                    :Gaan na {TOWN} Pad Voertuig Depot
+STR_SERVICE_AT_ROADVEH_DEPOT                                    :Versien by {TOWN} Pad Voertuig Depot

+STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Herpas pad voertuig om 'n ander vrag tipe te ontvoer
+STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Herpas pad voertuig
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Herpas pad voertuig om beklemtoonde vrat tipe te ontvoer

 ##id 0x9800
 STR_9800_DOCK_CONSTRUCTION                                      :Werf konstruksie
@@ -2552,8 +2614,6 @@ STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Wys skip
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Senter skerm op skip
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Stuur skip na depot
 STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Wys skip se aanwyse
-STR_982C_NEW_SHIP_NOW_AVAILABLE                                 :{BLACK}{BIGFONT}Nuwe skip nou beskikbaar!
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_982E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koste: {CURRENCY} Max. Spoed: {VELOCITY}{}Kapasitiet: {CARGO}{}Loopkoste: {CURRENCY}/yr
 STR_982F_NAME_SHIP                                              :{BLACK}Benaam skip

@@ -2626,8 +2686,6 @@ STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Wys vlie
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Senter skerm op vliegtuig
 STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Stuur vliegtuig na hangar. CTRL+kliek sal net diens
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Wys vliegtuig aanwyse
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nuwe vliegtuig nou beskikbaar!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
 STR_A02E_COST_MAX_SPEED_CAPACITY                                :{BLACK}Koste: {CURRENCY} Max. Spoed: {VELOCITY}{}Kapasiteit: {COMMA} passasiers, {COMMA} sakke van pos{}Loopkoste: {CURRENCY}/Jr

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Benaam vliegtuig
@@ -2698,6 +2756,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:



+
 STR_CURRENCY_WINDOW                                             :{WHITE}Gewoonte koers
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} =  {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Afskeier
@@ -2811,4 +2870,6 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengte: {NUM}{}Hoogte verskil: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Hoogte verskil: {NUM} m

+############ Date formatting
+
 ########
@@ -114,6 +114,7 @@ STR_QUANTITY_BUBBLES                                            :{COMMA} balon{P
 STR_QUANTITY_TOFFEE                                             :{WEIGHT} mliječne karamele
 STR_QUANTITY_BATTERIES                                          :{COMMA} baterij{P a e a}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} plastike
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} Gaziran{P o a a} pić{P e a a}
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PU
 STR_ABBREV_COAL                                                 :{TINYFONT}UG
@@ -142,8 +143,10 @@ STR_ABBREV_SWEETS                                               :{TINYFONT}SL
 STR_ABBREV_COLA                                                 :{TINYFONT}CL
 STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}ŠV
 STR_ABBREV_BUBBLES                                              :{TINYFONT}BL
+STR_ABBREV_TOFFEE                                               :{TINYFONT}MČ
 STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
 STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}GP
 STR_ABBREV_NONE                                                 :{TINYFONT}NI
 STR_ABBREV_ALL                                                  :{TINYFONT}SVE
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
@@ -392,10 +395,17 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Nosivost tereta
 STR_NO_WAITING_CARGO                                            :{BLACK}Nijedna vrsta tereta ne čeka
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Izaberi sva sredstva
 STR_SELECT_ALL_TYPES                                            :{BLACK}Izaberi sve vrste tereta (uključujući i teret koji ne čeka)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupni vlakovi
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupna vozila
+STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupni brodovi
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupni zrakoplovi
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Pogledaj popis dostupnih dizajna motora za ovu vrstu vozila.
 STR_MANAGE_LIST                                                 :{BLACK}Uredi popis
 STR_MANAGE_LIST_TIP                                             :{BLACK}Pošalji upute svim vozilima na ovoj listi
 STR_REPLACE_VEHICLES                                            :Zamjeni vozila
+STR_SEND_TRAIN_TO_DEPOT                                         :Pošalji u spremište
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :
+STR_SEND_SHIP_TO_DEPOT                                          :
 STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošalji u hangar
 STR_SEND_FOR_SERVICING                                          :Pošalji na servis

@@ -611,8 +621,6 @@ STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Smanji p
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Napravi nasumično zemljište
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Poništi krajolik
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Poništi krajolik
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Obriši sa mape sve u vlasništvu igrača
-STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Jeste li sigurni da želite obrisati sve u vlasništvu igrača?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Stvaranje krajolika
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stvaranje gradova
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Stvaranje industrija
@@ -712,11 +720,11 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Stavi st
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Postavi svjetionik
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Postavi odašiljač
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Odredi pustinjsko područje.{}Pritisni i drži CTRL za uklanjanje
-STR_CREATE_LAKE                                                 :{BLACK}Odredi vodeno područje.{}Poplaviti će okolno područje ako je na razini mora
 STR_0290_DELETE                                                 :{BLACK}Obriši
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Obriši ovaj grad u cjelosti
 STR_0292_SAVE_SCENARIO                                          :Spremi scenarij
 STR_0293_LOAD_SCENARIO                                          :Učitaj secenarij
+STR_LOAD_HEIGHTMAP                                              :Učitaj visinsku kartu
 STR_0294_QUIT_EDITOR                                            :Završi s uređivanjem
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Završi
@@ -962,6 +970,7 @@ STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Kr

 STR_TRAIN_IS_LOST                                               :{WHITE}Vlak {COMMA} se izgubio.
 STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Prošlogodišnja zarada vlaka  {COMMA} bila je {CURRENCY}
+STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europska Monetarna Unija!{}{}Euro je predstavljen kao jedinstvena valuta za svakodnevnu uporabu  u tvojoj zemlji!

 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
@@ -983,7 +992,9 @@ STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Zrakoplo
 STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Zrakoplov {COMMA} ima nevažeću stanicu u voznom redu
 # end of order system

+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Neuspješna automatska obnova vlaka {COMMA} (ograničena količina novca)
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Automatska zamjena nije izvršena na cestovnom vozilu {COMMA} (money limit)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Neuspješna automatska obnova broda {COMMA} (ograničena količina novca)
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Neuspjela automatska zamjena zrakoplova {COMMA} (novčano ograničenje)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Nakon zamjene, vlak {COMMA} je postao predug

@@ -1000,10 +1011,13 @@ STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Omoguć
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Omogući realno ubrzanje za vlakove: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zabrani vlakovima i brodovima skretanja pod 90 stupnjeva: {ORANGE}{STRING} {LTBLUE} (requires NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Spoji željezničke stanice koje se izgrade jedna kraj druge: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Napusti stanicu ako je bilo koji teret u potpunosti natovaren pri 'punom utovaru': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Koristi unaprijeđen algoritam ukrcavanja: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Postupno utovaruj vozila: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacija: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Dostavi teret u stanicu samo ako u njoj postoji potražnja: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Dopusti izgradnju vrlo dugačkih mostova: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Dopusti naredbe za slanje u spremište: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Dopusti izgadnju industrija koje proizvode sirovine: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Dopusti više sličnih industrija po gradu: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Moguće je graditi spojene industrije iste vrste: {ORANGE}{STRING}
@@ -1151,7 +1165,6 @@ STR_TREES_RANDOM_TYPE                                           :{BLACK}Raznovrs
 STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Stavi drveće nasumičnog tipa

 STR_CANT_BUILD_CANALS                                           :{WHITE}Ovdje ne možeš graditi kanale...
-STR_BUILD_CANALS_TIP                                            :{BLACK}Izgradi kanale. Pritisni CTRL kako bi smjestio vodene pločice (samo na razini mora).
 STR_LANDINFO_CANAL                                              :Kanal


@@ -1670,6 +1683,7 @@ STR_3030_RENAME_STATION_LOADING                                 :Preimenuj stani
 STR_3031_CAN_T_RENAME_STATION                                   :{WHITE}Ne možeš preimenovati stanicu...
 STR_3032_RATINGS                                                :{BLACK}Ocjene
 STR_3033_ACCEPTS                                                :{BLACK}Prihvaća
+STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Lokalna ocjena usluge prijevoza:

 ############ range for rating starts
 STR_3035_APPALLING                                              :Užasno
@@ -1689,24 +1703,24 @@ STR_3040_NOW_ACCEPTS                                            :{WHITE}{STATION
 STR_3041_NOW_ACCEPTS_AND                                        :{WHITE}{STATION} od sada prihvaća {STRING} i {STRING}
 STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Smjer autobusne stanice
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Smjer kamionskog terminala
-STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Moraš uništiti autobusnu stanicu prvo
-STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Moraš uništiti kamionski terminal prvo
-STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Station{P a e a}
+STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Prvo moraš uništiti autobusnu stanicu
+STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Prvo moraš uništiti kamionski terminal
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stanic{P a e a}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Ništa -
-STR_304B_SITE_UNSUITABLE                                        :{WHITE}...mjesto neprikladno
+STR_304B_SITE_UNSUITABLE                                        :{WHITE}...neprikladno mjesto
 STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK                              :{WHITE}Preblizu drugom pristaništu
 STR_304D_MUST_DEMOLISH_DOCK_FIRST                               :{WHITE}Prvo moraš srušiti pristanište
 STR_304E_SELECT_RAILROAD_STATION                                :{BLACK}Izaberi smjer željezničke stanice
-STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Izaberi broj platformi na željezničkoj stanici
+STR_304F_SELECT_NUMBER_OF_PLATFORMS                             :{BLACK}Izaberi broj perona na željezničkoj stanici
 STR_3050_SELECT_LENGTH_OF_RAILROAD                              :{BLACK}Izaberi dužinu željezničke stanice
 STR_3051_SELECT_BUS_STATION_ORIENTATION                         :{BLACK}Izaberi smjer autobusne stanice
 STR_3052_SELECT_TRUCK_LOADING_BAY                               :{BLACK}Izaberi smjer kamionskog terminala
 STR_3053_CENTER_MAIN_VIEW_ON_STATION                            :{BLACK}Centriraj glavni pogled na lokaciju stanice
-STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Pokazi ocjene stanice
+STR_3054_SHOW_STATION_RATINGS                                   :{BLACK}Pokaži ocjene stanice
 STR_3055_CHANGE_NAME_OF_STATION                                 :{BLACK}Promijeni ime stanice
 STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Prikaži popis prihvaćenog tereta
-STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Imena stanica - klikni na ime kako bi centrirao glavni pogled na stanicu
+STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Imena stanica - pritisni ime da bi centrirao glavni pogled na stanicu
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Izaberi veličinu/tip zračne luke
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
 STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
@@ -1716,11 +1730,14 @@ STR_3060_AIRPORT                                                :Zračna luka
 STR_3061_TRUCK_LOADING_AREA                                     :Ukrcajno područje
 STR_3062_BUS_STATION                                            :Autobusna stanica
 STR_3063_SHIP_DOCK                                              :Brodsko pristanište
+STR_3064_HIGHLIGHT_COVERAGE_AREA                                :{BLACK}Označi područje koje pokriva željeno mjesto
+STR_3065_DON_T_HIGHLIGHT_COVERAGE                               :{BLACK}Nemoj označiti područje koje pokriva željeno mjesto
+STR_3066_COVERAGE_AREA_HIGHLIGHT                                :{BLACK}Označavanje područja pokrivanja
 STR_3068_DOCK                                                   :{WHITE}Pristanište
 STR_3069_BUOY                                                   :Plutača
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...plutača na putu
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stanica previše proširena
-STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...neuniformne stanice zabranjene
+STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...neujednačene stanice onemogućene
 STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Drži CTRL kako bi izabrao više od jednog itema

 STR_UNDEFINED                                                   :(neodređen znakovni niz)
@@ -1730,8 +1747,8 @@ STR_STAT_CLASS_WAYP                                             :Čvorišta
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Smjer brodskog spremišta
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...mora biti izgrađen na vodi
-STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Ne možeš graditi brodsko spremište ovdje...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Izaberi smjer brodsko spremišta
+STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Ovdje ne možeš graditi brodsko spremište...
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Izaberi smjer brodskog spremišta
 STR_3804_WATER                                                  :Voda
 STR_3805_COAST_OR_RIVERBANK                                     :Obala ili riječni nasip
 STR_3806_SHIP_DEPOT                                             :Brodsko spremište
@@ -1743,7 +1760,7 @@ STR_4001_LOAD_GAME                                              :{WHITE}Učitaj
 STR_4002_SAVE                                                   :{BLACK}Spremi
 STR_4003_DELETE                                                 :{BLACK}Obriši
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
-STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabajt{P "" a a} free
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabajt{P "" a a} slobod{P an na no}
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Ne mogu pročitati disk
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Spremanje igre nije uspjelo
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Ne mogu obrisati datoteku
@@ -1754,7 +1771,7 @@ STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Obriši
 STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Spremi ovu igru, koristeći odabrano ime
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Odaberi vrstu nove igre
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Odaberi scenarij (zeleno), namještenu igru (plavo), ili nasumičnu novu igru
-STR_4010_GENERATE_RANDOM_NEW_GAME                               :Generiraj nasumičnu novu igru
+STR_4010_GENERATE_RANDOM_NEW_GAME                               :Izradi nasumičnu novu igru
 STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Učitaj visinsku kartu

 ##id 0x4800
@@ -1806,21 +1823,21 @@ STR_4829_REQUIRES                                               :{BLACK}Treba: {

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Prošlomjesečna proizvodnja:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% prevezeno)
-STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centriraj glavni pogled na lokaciju gospodarstva
-STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Nova {STRING} pod konstrukcijom blizu grada {TOWN}!
-STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nova {STRING} se trenutno sadi blizu grada {TOWN}!
+STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centriraj glavni pogled na položaj industrije
+STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Započela je izgradnja nove industrije ( {STRING} ) u blizini grada {TOWN}!
+STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Nova {STRING} trenutno se sadi blizu grada {TOWN}!
 STR_482F_COST                                                   :{BLACK}Trošak: {YELLOW}{CURRENCY}
-STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Ne možeš konstruirati ovaj tip gospodarstva ovdje...
+STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Ovdje ne možeš izgraditi ovu vrstu industrije ovdje...
 STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...šume mogu jedino biti posađene iznad linije snijega
 STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{INDUSTRY} objavljuje skoro zatvaranje!
-STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Nabavni problemi uzrokuju {INDUSTRY} da objavi skoro zatvaranje!
-STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Manjak drveća u blizini uzrokuje {INDUSTRY} da objavi skoro zatvaranje!
-STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} povećava produkciju!
-STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}Nova pukotina ugljena pronađena kod {INDUSTRY}!{}Očekuje se udvostručenje proizvodnje!
-STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}Nove rezerve nafte pronađene kod:{INDUSTRY}!{}Očekuje se udvostručenje proizvodnje!
-STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT}Poboljšane metode uzgoja u {INDUSTRY}, očekuje se udvostručenje proizvodnje!
-STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} proizvodnja pala za 50%
-STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Najezda kukaca uzrokovala havariju kod {INDUSTRY}!{}Proizvodnja pala za 50%
+STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Zbog problema u nabavi {INDUSTRY} se uskoro zatvara!
+STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Manjak drveća u glavni je razlog što se {INDUSTRY} se uskoro zatvara!
+STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} povećava proizvodnju!
+STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}{INDUSTRY} očekuje udvostručenje proizvodnje!{}Pronađena je nova pukotina ugljena!
+STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}{INDUSTRY} očekuje udvostručenje proizvodnje!{}Pronađene su nove rezerve nafte!
+STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT}{INDUSTRY} poboljšava metode uzgoja, očekuje se udvostručenje proizvodnje!
+STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} smanjuje proizvodnju za 50%
+STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}{INDUSTRY} pod najezdom kukaca! Havarija!{}Proizvodnja je pala za 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...može se postaviti samo blizu rubova karte
 STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} prozivodnja u {INDUSTRY} povećana je {COMMA}%!
 STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} prozivodnja u {INDUSTRY} smanjena je {COMMA}%!
@@ -1829,7 +1846,7 @@ STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Vlak u tunelu
 STR_5001_ROAD_VEHICLE_IN_TUNNEL                                 :{WHITE}Cestovno vozilo u tunelu
 STR_5003_ANOTHER_TUNNEL_IN_THE_WAY                              :{WHITE}Smeta drugi tunel
-STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}Ne mogu iskopoati zemlju na drugoj strani tunela
+STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}Ne moguće iskopoati zemlju na drugoj strani tunela
 STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Moraš prvo srušiti tunel
 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Moraš prvo srušiti most
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Početak i kraj ne mogu biti na istom mjestu
@@ -2398,8 +2415,6 @@ STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Pokaži
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Preskoči trenutnu naredbu i počni sa sljedećom
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Obriši označenu naredbu
 STR_SERVICE_HINT                                                :{BLACK}Preskoči ovu narudžbu osim ako servis nije potreban
-STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novi {STRING} od sada dostupan!
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Trošak: {CURRENCY} Težina: {WEIGHT_S}{}Brzina: {VELOCITY} Snaga: {POWER}{}Troškovi održavanja: {CURRENCY}/god{}Kapacitet: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Pokvaren
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Troškovi uporabe: {LTBLUE}{CURRENCY}/god
@@ -2420,6 +2435,7 @@ STR_886F_TRANSFER                                               :{BLACK}Transfer
 STR_TRAIN_STOPPING                                              :{RED}Zaustavljam
 STR_TRAIN_STOPPING_VEL                                          :{RED}Zaustavljam, {VELOCITY}

+
 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Cestovno vozilo na putu
 STR_9002                                                        :{WHITE}{VEHICLE}
@@ -2457,14 +2473,12 @@ STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Vozila -
 STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Izgradi novo cestovno vozilo
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Povuci cestovno vozilo ovdje kako bi ga prodao
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centriraj glavni pogled na lokaciju spremišta cestovnih vozila
-STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Popis cestovnih vozila - klikni na vozilo za informacije
+STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Popis cestovnih vozila - pritisni na vozilo za informacije
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Izgradi označeno cestovno vozilo
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novo cestovno vozilo od sada dostupno!
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Trošak: {CURRENCY}{}Brzina: {VELOCITY}{}Trošak uporabe: {CURRENCY}/god{}Kapacitet: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Imenuj cestovno vozilo
-STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Ne mogu preimenovati cestovno vozilo...
+STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Ne mogu imenovati cestovno vozilo...
 STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Imenuj cestovno vozilo
 STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi bus stiže na {STATION}!
 STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi kamion stiže na {STATION}!
@@ -2476,7 +2490,7 @@ STR_9034_RENAME                                                 :{BLACK}Preimenu
 STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Preimenuj vrstu cestovnog vozila
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Preimenuj vrstu cestovnog vozila
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ne mogu preimenovati vrstu cestovnog vozila...
-STR_9038_GO_TO_ROADVEH_DEPOT                                    :Idi prema {TOWN} spremištu cestovnih vozila
+STR_9038_GO_TO_ROADVEH_DEPOT                                    :Idi prema spremištu cestovnih vozila {TOWN}
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servisiranje pri {TOWN} spremištu cestovnih vozila

 STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prenamijeni cestovno vozilo za prijevoz druge vrste tereta
@@ -2488,9 +2502,10 @@ STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Izaberi
 ##id 0x9800
 STR_9800_DOCK_CONSTRUCTION                                      :Izgradnja pristaništa
 STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}Izgradnja pristaništa
-STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Ne mogu izgraditi pristanište ovdje...
+STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Ovdje ne mogu izgraditi pristanište...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Spremište brodova
 STR_9804_NEW_SHIPS                                              :{BLACK}Novi brodovi
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Brod{P "" a ova}
 STR_9808_NEW_SHIPS                                              :{WHITE}Novi brodovi
 STR_9809_BUILD_SHIP                                             :{BLACK}Izgradi brod
 STR_CLONE_SHIP                                                  :{BLACK}Kloniraj brod
@@ -2498,15 +2513,15 @@ STR_CLONE_SHIP_INFO                                             :{BLACK}Ovo će
 STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Brod mora biti zaustavljen u spremištu
 STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Ne mogu prodati brod...
 STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Ne mogu izgraditi brod...
-STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Brod smeta
+STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Smeta brod
 STR_980F                                                        :{WHITE}{VEHICLE}
 STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalji)
 STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Trošak uporabe: {LTBLUE}{CURRENCY}/god
-STR_9813_MAX_SPEED                                              :{BLACK}Maks brzina: {LTBLUE}{VELOCITY}
+STR_9813_MAX_SPEED                                              :{BLACK}Maks. brzina: {LTBLUE}{VELOCITY}
 STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY}  (prošle godine: {CURRENCY})
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pouzdanost: {LTBLUE}{COMMA}%  {BLACK}Kvarova od posljednjeg servisa: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Izgrađeno: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
-STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}
+STR_9817_CAPACITY                                               :{BLACK}Zapremnina: {LTBLUE}{CARGO}
 STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Ne mogu pokrenuti/zaustaviti brod...
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Ne mogu poslati brod u skladište...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Ne mogu naći lokalno spremište
@@ -2523,12 +2538,16 @@ STR_9821_DRAG_SHIP_TO_HERE_TO_SELL                              :{BLACK}Povuci b
 STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centriraj glavni pogled na lokaciju spremišta brodova
 STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Brodovi - klikni na brod za informacije
 STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Izgradi nove brodove (zahtijeva spremište brodova)
-STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Popis brodova - klikni na brod za informacije
+STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Popis brodova - pritisni na brod za informacije
 STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Izgradi označeni brod
-STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Trenutna radnja broda - klikni ovdje za zaustavljanje/pokretanje broda
+STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Trenutna radnja broda - pritisni ovdje za zaustavljanje/pokretanje broda
 STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Prikaži naredbe broda
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centriraj glavni pogled na lokaciju broda
+STR_982B_SHOW_SHIP_DETAILS                                      :{BLACK}Prikaži detalje broda
+STR_982F_NAME_SHIP                                              :{BLACK}Imenuj brod

+STR_9831_NAME_SHIP                                              :{WHITE}Imenuj brod
+STR_9832_CAN_T_NAME_SHIP                                        :{WHITE}Ne mogu imenovati brod...
 STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi brod stigao do {STATION}!
 STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Smjesti plutaču koja može biti korištena kao pokazatelj puta
 STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Ne mogu staviti plutaču ovdje...
@@ -2539,6 +2558,10 @@ STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Ne mogu
 STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Prenamijeni teretni brod da nosi neku drugu vrstu tereta
 STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Prenamijeni)
 STR_983C_REFIT_SHIP                                             :{BLACK}Prenamijeni brod
+STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Odabri vrstu tereta za prijevoz brodom:
+STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Prenamjeni brod za prijevoz označene vrste tereta
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Odabri vrstu tereta za prijevoz:
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova zapremnina: {GOLD}{CARGO}{}{BLACK}Cijena prenamjene: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Ne mogu prenamijeniti brod...
 STR_9842_REFITTABLE                                             :(prenamjenjiv)
 SERVICE_AT_SHIP_DEPOT                                           :Servis u brodskom spremištu grada {TOWN}
@@ -2546,6 +2569,7 @@ SERVICE_AT_SHIP_DEPOT                                           :Servis u brodsk
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Zračne luke
 STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Ne možeš graditi zračnu luku ovdje...
+STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION} Spremište zrakoplova
 STR_A003_NEW_AIRCRAFT                                           :{BLACK}Novi zrakoplov
 STR_CLONE_AIRCRAFT                                              :{BLACK}Kloniraj zrakoplov
 STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ovo će izgraditi kopiju zrakoplova. Control-klik će dijeliti naredbe
@@ -2556,8 +2580,15 @@ STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY
 STR_A00A                                                        :{WHITE}{VEHICLE}
 STR_A00B_ORDERS                                                 :{WHITE}{VEHICLE} (Naredbe)
 STR_A00C_DETAILS                                                :{WHITE}{VEHICLE} (Detalji)
+STR_A00D_AGE_RUNNING_COST_YR                                    :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Troškovi uporabe {LTBLUE}{CURRENCY}/god
 STR_A00E_MAX_SPEED                                              :{BLACK}Maks brzina: {LTBLUE}{VELOCITY}
 STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY}  (prošle godine: {CURRENCY})
+STR_A010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pouzdanost: {LTBLUE}{COMMA}%  {BLACK}Kvarova od poslijednjeg servisa: {LTBLUE}{COMMA}
+STR_A011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
+STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Ne mogu poslati zrakoplov u hangar
+STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Zrakoplov {COMMA} čeka u hangaru
+STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Smeta zrakoplov
+STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Ne mogu zaustaviti/pokrenuti zrakoplov...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Zrakoplov je u letu
 STR_A019_CAPACITY                                               :{BLACK}Nosivost: {LTBLUE}{CARGO}, {CARGO}
 STR_A01A_CAPACITY                                               :{BLACK}Nosivost: {LTBLUE}{CARGO}
@@ -2572,8 +2603,6 @@ STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Popis zr
 STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Izgradi označeni zrakoplov
 STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Prikaži naredbe zrakoplova
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Prikaži detalje zrakoplova
-STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Novi zrakoplov od sada dostupan!
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}

 STR_A030_NAME_AIRCRAFT                                          :{WHITE}Imenuj zrakoplov
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Ne mogu imenovati zrakoplov...
@@ -2644,6 +2673,7 @@ STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID:
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 suma: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Spremate se napraviti izmjene na pokrenutoj igri; to može srušiti OpenTTD.{}Jeste li potpuno sigurni u to?

+
 STR_NEWGRF_ADD                                                  :{BLACK}Dodaj
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Dodaj NewGRF datoteku u listu
 STR_NEWGRF_REMOVE                                               :{BLACK}Obriši
@@ -2670,6 +2700,7 @@ STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Odgovar

 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilni GRF(ovi) učitani umjesto nepronađenih datoteka
 STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Nepronađene GRF datoteke su isključene
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Nedostaje(u) datoteka(e) GRF za učitavanje igre

 STR_CURRENCY_WINDOW                                             :{WHITE}Proizvoljna valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Devizni tečaj: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2687,13 +2718,17 @@ STR_LORRY                                                       :{BLACK}{LORRY}
 STR_PLANE                                                       :{BLACK}{PLANE}
 STR_SHIP                                                        :{BLACK}{SHIP}

+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Vlak{P "" a ova}
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Cestovn{P o a ih} vozil{P o a a}
 STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Zrakoplov
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Brod{P "" a ova}

 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Prikaži sve vlakove koji imaju ovu stanicu u svom rasporedu
 STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikaži sva cestovna vozila koja imaju ovu stanicu u svom rasporedu
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikaži sve zrakoplove koji imaju ovu stanicu u svom rasporedu
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikaži sve brodove koji imaju ovu stanicu u svom rasporedu

+STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Djeljene naredbe za {COMMA} vozil{P o a a}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Prikaži sva vozila koja dijele ovaj raspored.

 ### depot strings
@@ -2714,6 +2749,9 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Automats
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Automatski zamijeni sve brodove u spremištu
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Automatski zamijeni sve zrakoplove u spremištu

+STR_VEHICLE_LIST_TRAIN_DEPOT                                    :{BLACK}{STRING} - {COMMA} Vlak{P "" a ova}
+STR_VEHICLE_LIST_ROADVEH_DEPOT                                  :{BLACK}{STRING} - {COMMA} Cestovn{P o a ih} vozil{P o a a}
+STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING} - {COMMA} Brod{P "" a ova}
 STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} Zrakoplov

 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamijeni {STRING}
@@ -2732,25 +2770,38 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Brisanje
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Neka automatska zamijena drži dužinu vlaka istom brišući vagone(počevši od naprijed), ako bi zamijena lokomotive vlak učinila dužim.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zamjenjujem:{ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}EXPERIMENTALNA FUNKCIJA {} Prebaci između prozora za izmjenu lokomotiva i vagona.{}Izmjena vagona će se izvršiti samo ako novi vagon može biti prenamijenjen za prijevoz istog tipa tereta kao i stari vagon. Ovo se provjerava za svaki vagon kada se stvarna zamjena odvija.
+STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Lokomotiva se nemože izgraditi

+STR_ENGINES                                                     :Lokomotive
 STR_WAGONS                                                      :Vagoni

+STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Pritisni za zaustavljanje svih vlakova u spremištu
+STR_MASS_STOP_DEPOT_ROADVEH_TIP                                 :{BLACK}Pritisni za zaustavljanje svih cestovnih vozila u spremištu
+STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Pritisni za zaustavljanje svih brodova u spremištu
+STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Pritisni za zaustavljanje svih zrakoplova u hangaru

+STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Pritisni za pokretanje svih vlakova u spremištu
+STR_MASS_START_DEPOT_ROADVEH_TIP                                :{BLACK}Pritisni za pokretanje svih cestovnih vozila u spremištu
+STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Pritisni za pokretanje svih brodova u spremištu
 STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klikni za pokretanje svih aviona u hangaru

 STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klikni za zaustavljanje svih vozila na listi
 STR_MASS_START_LIST_TIP                                         :{BLACK}Klikni za pokretanje svih vozila na listi

 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Popis znakova - {COMMA} Znak{P "" a ova}


 ############ Lists rail types

 STR_RAIL_VEHICLES                                               :Tračna Vozila
+STR_ELRAIL_VEHICLES                                             :Električna željeznička vozila
 STR_MONORAIL_VEHICLES                                           :Jednotračna vozila
+STR_MAGLEV_VEHICLES                                             :Maglev željeznička vozila

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

+STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}

 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Trošak: {GOLD}{CURRENCY}{BLACK} Težina {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK} Snaga: {GOLD}{POWER}
@@ -2762,6 +2813,7 @@ STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Maks. po
 STR_PURCHASE_INFO_COST                                          :{BLACK}Trošak: {GOLD}{CURRENCY}
 STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Težina: {GOLD}{WEIGHT_S} ({WEIGHT_S})
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Trošak: {GOLD}{CURRENCY}{BLACK} Brzina: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Zapremnina: {GOLD}{COMMA} putnika, {COMMA} vreća s poštom
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Promjenjivo u: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Svi tipovi tereta
 STR_PURCHASE_INFO_ALL_BUT                                       :Sve osim {GOLD}
@@ -2769,23 +2821,35 @@ STR_PURCHASE_INFO_MAX_TE                                        :{BLACK} Maks. v

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

+STR_GENERATE                                                    :{WHITE}Izradi
 STR_RANDOM                                                      :{BLACK}Nasumično
 STR_RANDOM_HELP                                                 :{BLACK}Promijeni slučajni slijed koji se koristi za kreiranje terena
+STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Izrada svijeta
 STR_RANDOM_SEED                                                 :{BLACK}Nasumični slijed:
 STR_RANDOM_SEED_HELP                                            :{BLACK}Klikni za unos nasumičnog slijeda
+STR_LAND_GENERATOR                                              :{BLACK}Izrađivač zemljišta:
 STR_TREE_PLACER                                                 :{BLACK} Algoritam za drveće:
 STR_TERRAIN_TYPE                                                :{BLACK}Tip terena:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Razina mora:
 STR_SMOOTHNESS                                                  :{BLACK}Graduacija:
 STR_SNOW_LINE_HEIGHT                                            :{BLACK}Visina linije snijega
+STR_DATE                                                        :{BLACK}Datum:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}Broj gradova:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Broj industrija:
+STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
 STR_SNOW_LINE_UP                                                :{BLACK}Pomakni visinu linije snijega za jedan gore
 STR_SNOW_LINE_DOWN                                              :{BLACK}Pomakni visinu linije snijega za jedan dolje
 STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Promijeni visinu linije snijega
 STR_START_DATE_QUERY_CAPT                                       :{WHITE}Promijeni početnu godinu
 STR_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
+STR_HEIGHTMAP_SIZE                                              :{BLACK}Veličina: {ORANGE}{NUM} x {NUM}
+STR_GENERATION_WORLD                                            :{WHITE}Izrada svijeta u toku...
+STR_GENERATION_ABORT                                            :{BLACK}Prekini
+STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Poništi izradu svijeta
+STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Da li zaista želiš prekinuti izradu?
 STR_PROGRESS                                                    :{WHITE}{NUM}% gotovo
+STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
+STR_WORLD_GENERATION                                            :{BLACK}Izrada svijeta
 STR_TREE_GENERATION                                             :{BLACK}Generiranje drveća
 STR_CLEARING_TILES                                              :{BLACK}Generiranje grubog i stjenovitog područja
 STR_SETTINGUP_GAME                                              :{BLACK}Uspostavljam igru
@@ -2796,17 +2860,29 @@ STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Kreiraj
 STR_SE_RANDOM_LAND                                              :{WHITE}Nasumični teren
 STR_SE_NEW_WORLD                                                :{BLACK}Kreiraj novi scenarij
 STR_SE_CAPTION                                                  :{WHITE}Vrsta scenarija
+STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Snizi ravnu površinu za jedan korak
+STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Povisi ravnu površinu za jedan korak
+STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Promijeni visinu ravne površine
+STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Visina ravne površine:
+STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}

 STR_SMALLMAP_CENTER                                             :{BLACK}Centriraj malu mapu na trenutni položaj

 ########### String for new airports
 STR_SMALL_AIRPORT                                               :{BLACK}Mala
 STR_CITY_AIRPORT                                                :{BLACK}Grad
+STR_METRO_AIRPORT                                               :{BLACK}Metropolitanski airport
 STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Međunarodni aerodrom
 STR_COMMUTER_AIRPORT                                            :{BLACK}Redoviti putnik
+STR_INTERCONTINENTAL_AIRPORT                                    :{BLACK}Međukontinentalni
+STR_HELIPORT                                                    :{BLACK}Heliodrom
+STR_HELIDEPOT                                                   :{BLACK}Spremište za helikoptere
+STR_HELISTATION                                                 :{BLACK}Stanica za helikoptere

 STR_SMALL_AIRPORTS                                              :{BLACK}Mali aerodromi
 STR_LARGE_AIRPORTS                                              :{BLACK}Veliki aerodromi
+STR_HUB_AIRPORTS                                                :{BLACK}Središnje zračne luke
+STR_HELIPORTS                                                   :{BLACK}Helicopterske zračne luke

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

@@ -2815,4 +2891,10 @@ STR_MEASURE_AREA                                                :{BLACK}Područj
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dužina:{NUM}{}Visinska razlika:{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Područje:{NUM}x{NUM}Visinska razlika:{NUM} m

+############ Date formatting
+STR_DATE_TINY                                                   :{STRING}-{STRING}-{NUM}
+STR_DATE_SHORT                                                  :{STRING} {NUM}
+STR_DATE_LONG                                                   :{STRING} {STRING} {NUM}
+
 ########
+
@@ -232,8 +232,10 @@ 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
@@ -1099,8 +1101,26 @@ 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
@@ -1113,14 +1133,93 @@ STR_482F_COST                                                   :{BLACK}Kostet:
 ##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



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

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

+############ Date formatting

 ########
@@ -5,11 +5,13 @@
 ##gender m f n

 ##id 0x0000
+STR_NULL                                                        :
 STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Απο την άκρη του χάρτη
 STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Πολυ κοντά στην άκρη του χάρτη
 STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Δεν υπάρχουν αρκετά χρήματα - απαιτούνται {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY64}.
 STR_0005                                                        :{RED}{CURRENCY64}.
+STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Απαιτείται επίπεδο εδαφος
 STR_0008_WAITING                                                :{BLACK}Αναμονη: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
@@ -81,6 +83,14 @@ STR_004A_TOFFEE                                                 :Τόφυ
 STR_004B_BATTERY                                                :Μπαταρία
 STR_004C_PLASTIC                                                :Πλαστικό
 STR_004D_FIZZY_DRINK                                            :Αναψυκτικό
+STR_QUANTITY_NOTHING                                            :
+STR_QUANTITY_PASSENGERS                                         :{COMMA} επιβάτης{P "" s}
+STR_QUANTITY_COAL                                               :{WEIGHT} άνθρακα
+STR_QUANTITY_MAIL                                               :{COMMA} σάκος{P "" s} με αλληλογραφία
+STR_QUANTITY_OIL                                                :{VOLUME} πετρελαίου
+STR_QUANTITY_LIVESTOCK                                          :{COMMA} αντικείμενο{P "" s} ζώων
+STR_QUANTITY_GOODS                                              :{COMMA} κιβώτιο{P "" s} αγαθών
+STR_QUANTITY_GRAIN                                              :{WEIGHT} σιτάρι
 STR_QUANTITY_WOOD                                               :{WEIGHT} ξύλου
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT} μεταλλεύματος σιδήρου
 STR_QUANTITY_STEEL                                              :{WEIGHT} ατσαλιού
@@ -101,9 +111,44 @@ STR_QUANTITY_SWEETS                                             :{COMMA} τσά
 STR_QUANTITY_COLA                                               :{VOLUME} κόλας
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} μαλλί της γριάς
 STR_QUANTITY_BUBBLES                                            :{COMMA} φυσαλίδ{P α ες}
+STR_QUANTITY_TOFFEE                                             :{WEIGHT} τόφυ
 STR_QUANTITY_BATTERIES                                          :{COMMA} μπαταρί{P α ες}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} πλαστικού
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} αναψυκτικ{P ό ά}
+STR_ABBREV_NOTHING                                              :
+STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GRAIN                                                :{TINYFONT}GR
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
+STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
+STR_ABBREV_FRUIT                                                :{TINYFONT}FT
+STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
+STR_ABBREV_PAPER                                                :{TINYFONT}PR
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
+STR_ABBREV_COLA                                                 :{TINYFONT}CL
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
+STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
+STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
+STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
+STR_ABBREV_NONE                                                 :{TINYFONT}NO
+STR_ABBREV_ALL                                                  :{TINYFONT}ALL
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Χάρτης - {STRING}
@@ -232,6 +277,10 @@ STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Το ό
 STR_0133_WINDOWS                                                :Windows
 STR_0134_UNIX                                                   :Unix
 STR_0135_OSX                                                    :OS X
+STR_OSNAME_BEOS                                                 :BeOS
+STR_OSNAME_MORPHOS                                              :MorphOS
+STR_OSNAME_AMIGAOS                                              :AmigaOS
+STR_OSNAME_OS2                                                  :OS/2

 STR_013B_OWNED_BY                                               :{WHITE}...ιδιοκτησία του {STRING}
 STR_013C_CARGO                                                  :{BLACK}Φορτίο
@@ -242,10 +291,12 @@ STR_013F_CAPACITY                                               :{BLACK}Χωρη
 STR_CAPACITY_MULT                                               :{BLACK}Χωριτηκότητα: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Συνολική χωρητικότητα φορτίου του τραίνου:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Νέο Παιχνίδι
 STR_0141_LOAD_GAME                                              :{BLACK}Φόρτωση Παιχνιδιού
 STR_SINGLE_PLAYER                                               :{BLACK}Ένας παίκτης
 STR_MULTIPLAYER                                                 :{BLACK}Πολοί παίκτες
+STR_SCENARIO_EDITOR                                             :{BLACK}Διαμόρφωση Σεναρίου

 STR_64                                                          :64
 STR_128                                                         :128
@@ -254,6 +305,7 @@ STR_512                                                         :512
 STR_1024                                                        :1024
 STR_2048                                                        :2048
 STR_MAPSIZE                                                     :{BLACK}Διάσταση χάρτη:
+STR_BY                                                          :{BLACK}*
 STR_0148_GAME_OPTIONS                                           :{BLACK}Επιλογές Παιχνιδιού

 STR_0150_SOMEONE                                                :κάποιος{SKIP}{SKIP}
@@ -261,14 +313,37 @@ STR_0151_MAP_OF_WORLD                                           :Χάρτης τ
 STR_0152_TOWN_DIRECTORY                                         :Κατάλογος Πόλεων
 STR_0153_SUBSIDIES                                              :Επιχορηγήσεις

+STR_UNITS_IMPERIAL                                              :Αυτοκρατορικό
+STR_UNITS_METRIC                                                :Μετρικό
+STR_UNITS_SI                                                    :SI

+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} μαω
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA} χλμ/ώρα
+STR_UNITS_VELOCITY_SI                                           :{COMMA} μ/δ

+STR_UNITS_POWER_IMPERIAL                                        :{COMMA}hp
+STR_UNITS_POWER_METRIC                                          :{COMMA}hp
+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_IMPERIAL                                  :{COMMA} τονος{P "" s}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} τόνοι{P "" s}
+STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg

+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}γαλ
+STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}λ
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}m³

+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} γαλλόνι{P "" s}
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} λίτρα{P "" s}
+STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

+STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lbf
+STR_UNITS_FORCE_METRIC                                          :{COMMA} δύναμη τόνου
+STR_UNITS_FORCE_SI                                              :{COMMA} kN

 ############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Γράφημα λειτουργικού κέρδους
@@ -278,6 +353,7 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Γράφημα
 STR_0158_COMPANY_VALUE_GRAPH                                    :Γράφημα εταιρικής αξίας
 STR_0159_CARGO_PAYMENT_RATES                                    :Ποσοστά πληρωμής φορτίου
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Πίνακας κατάταξης επιχείρησης
+STR_PERFORMANCE_DETAIL_MENU                                     :Λεπτομερής εκτίμηση απόδοσης
 ############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Σχετικά με το OpenTTD
@@ -285,10 +361,16 @@ STR_015C_SAVE_GAME                                              :Αποθήκε
 STR_015D_LOAD_GAME                                              :Φόρτωση παιχνιδιού
 STR_015E_QUIT_GAME                                              :Παραίτηση από το παιχνίδι
 STR_015F_QUIT                                                   :Έξοδος
+STR_ABANDON_GAME_QUERY                                          :{YELLOW}Είστε σίγουρος ότι θέλετε να εγκαταλείψετε το παιχνίδι;
 STR_0161_QUIT_GAME                                              :{WHITE}Παραίτηση από το Παιχνίδι
+STR_SORT_ORDER_TIP                                              :{BLACK}Επιλογή σειράς ταξινόμησης  (καθοδικά/ανοδικά)
+STR_SORT_CRITERIA_TIP                                           :{BLACK}Επιλογή κριτηρίου ταξινόμησης
+STR_SORT_BY                                                     :{BLACK}Ταξινόμηση κατά

+STR_SORT_BY_POPULATION                                          :{BLACK}Πληθυσμός
 STR_SORT_BY_PRODUCTION                                          :{BLACK}Παραγωγή
 STR_SORT_BY_TYPE                                                :{BLACK}Τύπος
+STR_SORT_BY_TRANSPORTED                                         :{BLACK}Μεταφέρθηκαν
 STR_SORT_BY_NAME                                                :{BLACK}Όνομα
 STR_SORT_BY_DROPDOWN_NAME                                       :Όνομα
 STR_SORT_BY_DATE                                                :{BLACK}Μέρα
@@ -297,13 +379,29 @@ STR_SORT_BY_PROFIT_LAST_YEAR                                    :Κέρδος π
 STR_SORT_BY_PROFIT_THIS_YEAR                                    :Κέρδος αυτού του χρόνου
 STR_SORT_BY_AGE                                                 :Ηλικία
 STR_SORT_BY_RELIABILITY                                         :αξιοπιστία
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Συνολική χωρητικότητα ανά τύπο φορτίου
 STR_SORT_BY_MAX_SPEED                                           :Μέγιστη ταχύτητα
 STR_SORT_BY_MODEL                                               :Μοντέλο
 STR_SORT_BY_VALUE                                               :Αξία
 STR_SORT_BY_FACILITY                                            :Τύπος σταθμού
+STR_SORT_BY_WAITING                                             :Αξία φορτίου σε αναμονή
+STR_SORT_BY_RATING_MAX                                          :Εκτίμηση φορτίου
+STR_ENGINE_SORT_ENGINE_ID                                       :EngineID (κλασσική ταξινόμηση)
 STR_ENGINE_SORT_COST                                            :Κόστος
 STR_ENGINE_SORT_POWER                                           :Δύναμη
+STR_ENGINE_SORT_INTRO_DATE                                      :Ημέρα Κυκλοφορίας
+STR_ENGINE_SORT_RUNNING_COST                                    :Κόστος Συντήρησης
+STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Δύναμη/Κόστος Συντήρησης
+STR_ENGINE_SORT_CARGO_CAPACITY                                  :Χωρητικότητα Φορτίου
 STR_NO_WAITING_CARGO                                            :{BLACK}Κανένα εμπόρευμα κανενός τύπου δεν περιμένει
+STR_SELECT_ALL_FACILITIES                                       :{BLACK}Επιλογή όλων των εγκαταστάσεων
+STR_SELECT_ALL_TYPES                                            :{BLACK}Επιλογή όλων των τύπων φορτίου (συμπεριλαμβανομένου φορτίου μη-αναμονής)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Διαθέσιμα Τρένα
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Διαθέσιμα Οχήματα
+STR_AVAILABLE_SHIPS                                             :{BLACK}Διαθέσιμα Πλοία
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Διαθέσιμα Αεροσκάφη
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Προβολή λίστας διαθέσιμων σχεδίων μηχανών για τον τύπο οχήματος.
+STR_MANAGE_LIST                                                 :{BLACK}Διαχείριση λίστας
 STR_MANAGE_LIST_TIP                                             :{BLACK}Στείλε οδηγίες σε όλα τα οχήματα σε αυτή λίστα
 STR_REPLACE_VEHICLES                                            :Αντικατέστησε τα οχήματα
 STR_SEND_TRAIN_TO_DEPOT                                         :Στείλε στο υπόστεγο
@@ -358,10 +456,14 @@ STR_0189                                                        :{BLACK}{SMALLDO
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Δεν μπορεί να αλλάξει το διάστημα της συντήρησης...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Κλείσιμο παραθύρου
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Τίτλος παραθύρου - σύρετε για να το μετακινήσετε
+STR_STICKY_BUTTON                                               :{BLACK}Σημείωση αυτού του παραθύρου να μην κλείνει από το πλήκτρο 'Κλείσιμο Παραθύρων'
+STR_RESIZE_BUTTON                                               :{BLACK}Κάντε κλίκ και σύρετε για να αλλάξετε το μέγεθος του παραθύρου
+STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Κάντε κλίκ εδώ για να πάτε στον τρέχων φάκελλο αποθήκευσης
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Κατεδάφιση των κτηρίων κ.λπ. σε ένα τετράγωνο εδάφους
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Χαμηλώστε μια γωνία του εδάφους
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Ανυψώστε μια γωνία του εδάφους
 STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Μπάρα Κύλισης - μετακινεί την λίστα πάνω/κάτω
+STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}Μπάρα κίνησης - κινεί τη λίστα  αριστερά/δεξιά
 STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}Εμφάνιση περιγραμμάτων εδάφους στο χάρτη
 STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Εμφάνιση οχημάτων στο χάρτη
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Εμφάνιση βιομηχανιών στο χάρτη
@@ -473,6 +575,7 @@ STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Επιλ
 STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Καθαρισμός τρέχοντος προγράμματος (Προσαρμοσμένο1 ή Προσαρμοσμένο2 μόνο)
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Αποθήκευση επιλογών μουσικής
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Κάντε κλίκ στο μουσικό κομμάτι για προσθήκη στο τρέχον πρόγραμμα (Προσαρμοσμένο1 ή Προσαρμοσμένο2 μόνο)
+STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Κάντε κλικ στο τραγούδι για να το αφαιρέσετε από το πρόγραμμα (Προσαρμοσμένο 1 ή 2 μόνο)
 STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Εναλλαγή τυχαίας αναπαραγωγής on/off στο πρόγραμμα
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Εμφάνιση παραθύρου επιλογής μουσικού κομματιού
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Κάντε κλίκ στην υπηρεσία για κεντράρισμα στην βιομηχανία/πόλη
@@ -487,14 +590,18 @@ 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}Νέα οχήματα
 STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Αλλαγές στην αποδοχή φορτίου
 STR_020E_SUBSIDIES                                              :{YELLOW}Επιχορηγήσεις
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Γενικές πληροφορίες
+STR_MESSAGES_ALL                                                :{YELLOW}Ρύθμιση όλων των μηνυμάτων σε: Κλειστά / Περιγραφή / Ολόκληρα
+STR_MESSAGE_SOUND                                               :{YELLOW}Αναπαραγωγή ήχου για μηνύματα σε περιγραφή
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...πολύ μακριά από τον προηγούμενο προορισμό
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Οι καλύτερες εταιρείες που έφτασαν το {NUM}{}({STRING} Επίπεδο)
+STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}Πίνακας Πρωταθλήματος Εταιρειών σε {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA},
 STR_0213_BUSINESSMAN                                            :Επαγγελματίας
 STR_0214_ENTREPRENEUR                                           :Επιχειρηματίας
@@ -508,20 +615,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_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Είστε σίγουρος ότι θέλετε να επαναφέρετε το τοπίο;
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Δημιουργία τοπίου
 STR_022F_TOWN_GENERATION                                        :{BLACK}Δημιουργία πόλης
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Δημιουργία Βιομηχανίας
@@ -534,6 +637,7 @@ STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...πο
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...πολύ κοντά σε άλλη πόλη
 STR_0239_SITE_UNSUITABLE                                        :{WHITE}...ακατάλληλη περιοχή
 STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...πάρα πολλές πόλεις
+STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Αδύνατο να χτιστούν πόλεις
 STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...δεν υπάρχει αλλος χώρος στον χάρτη
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Αύξηση μεγέθους πόλεως
 STR_023C_EXPAND                                                 :{BLACK}Επέκταση
@@ -624,6 +728,7 @@ STR_0290_DELETE                                                 :{BLACK}Διαγ
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Πλήρης διαγραφή πόλεως
 STR_0292_SAVE_SCENARIO                                          :Απποθήκευση σεναρίου
 STR_0293_LOAD_SCENARIO                                          :Φόρτωση σεναρίου
+STR_LOAD_HEIGHTMAP                                              :Φόρτωση heightmap
 STR_0294_QUIT_EDITOR                                            :Έξοδος από το πρόγραμμα επεξεργασίας
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Έξοδος
@@ -631,6 +736,8 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Αποθ
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Φόρτωση Σεναρίου
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Αποθήκευση Σεναρίου
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Παιξτε το Σενάριο
+STR_PLAY_HEIGHTMAP                                              :{BLACK}Παίξτε Heightmap
+STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Εκκίνηση νέου παιχνιδιού, χρησιμοποιώντας heightmap για χάρτη
 STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Είστε σίγουροι οτι θέλετε ναφύγετε από το πίστα;
 STR_029C_QUIT_EDITOR                                            :{WHITE}Έξοδος από το Πρόγραμμα Επεξεργασίας
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...μπορεί να χτιστεί μόνο σε πόλεις με πληθυσμό άνω των 1200
@@ -645,6 +752,9 @@ STR_02A5_TOWN_SIZE                                              :{YELLOW}Μέγ

 STR_02B6                                                        :{STRING}  -  {STRING}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Εμφάνιση τελευταίου μηνύματος ή αναφοράς νέων
+STR_OFF                                                         :Κλειστό
+STR_SUMMARY                                                     :Περιγραφή
+STR_FULL                                                        :Ολόκληρο
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
 STR_02BB_TOWN_DIRECTORY                                         :Καταλογος πόλεων
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Ονόματα σχεδίων οχημάτων
@@ -655,13 +765,17 @@ STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Αποθ
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Επιλογή ονομάτων σχεδίασης οχημάτων
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Αποθήκευση προσαρμοσμένων ονομάτων σχεδίασης οχημάτων

+STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Επιλογές παιχνιδιού
 STR_02C5_DIFFICULTY_SETTINGS                                    :Ρυθμίσεις δυσκολίας
 STR_02C7_CONFIG_PATCHES                                         :Ρύθμιση διορθώσεων
+STR_NEWGRF_SETTINGS                                             :Ρυθμίσεις NewGRF
+STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Ονόματα πόλεων που εμφανίζονται
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Ονόματα σταθμών που εμφανίζονται
 STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Πινακίδες που εμφανίζονται
+STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Εμφάνιση σημείων διαδρομής
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Πλήρες animation
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Πλήρης λεπτομέρεια
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Διαφανή κτίρια
@@ -671,6 +785,7 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Δια
 ############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Πληροφορίες περιοχής εδάφους
 STR_02D6                                                        :
+STR_CONSOLE_SETTING                                             :Ενναλαγή Κονσόλας
 STR_02D7_SCREENSHOT_CTRL_S                                      :Φωτογραφία εικόνας (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Γιγαντιαία Φωτογραφία Εικόνας (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Σχετικά με το 'OpenTTD'
@@ -681,13 +796,22 @@ STR_02DA_ON                                                     :{BLACK}Ενερ
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Εμφάνιση χρηματοδοτήσεων
 STR_02DD_SUBSIDIES                                              :Χρηματοδοτήσεις
 STR_02DE_MAP_OF_WORLD                                           :Χάρτης του κόσμου
+STR_EXTRA_VIEW_PORT                                             :Πρόσθετη εμφάνιση
 STR_SIGN_LIST                                                   :Λίστα ταμπελών
 STR_02DF_TOWN_DIRECTORY                                         :Κατάλογος πόλεων
+STR_TOWN_POPULATION                                             :{BLACK}Παγκόσμιος πληθυσμός: {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Εμφάνιση {COMMA}
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Αντιγραφή στην εμφάνιση
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Αντιγραφή της περιοχής της παγκόσμιας προβολής σε αυτή την εμφάνιση
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Επικόλληση από εμφάνιση
+STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Επικόλληση της περιοχής αυτής της εμφάνισης στην παγκόσμια προβολή

 STR_02E0_CURRENCY_UNITS                                         :{BLACK}Νομισματικές μονάδες
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
 STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Επιλογή νομισματικών μονάδων
+STR_MEASURING_UNITS                                             :{BLACK}Μονάδες μέτρησης
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
+STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Επιλογή μονάδων μέτρησης
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Οχήματα δρόμου
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Επιλογή πλευράς δρόμου όπου τα οχήματα οδηγούν
@@ -723,10 +847,12 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Επιλ
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Χρηματοδοτήστε την κατασκευή νέας βιομηχανίας

 ############ range for menu starts
+STR_INDUSTRY_DIR                                                :Κατάλογος Βιομηχανιών
 STR_0313_FUND_NEW_INDUSTRY                                      :Χρηματοδότηση νέας βιομηχανίας
 ############ range ends here

 STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Χρηματοδότηση νέας βιομηχανίας
+STR_JUST_STRING                                                 :{STRING}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...μπορεί να χτιστεί μόνο σε πόλεις
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...μπορεί να χτιστεί μόνο σε δασώδεις περιοχές
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...μπορεί να χτιστεί μόνο σε περιοχές με έρημο
@@ -737,19 +863,70 @@ STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Φωτο

 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Αγορά γης για μελλοντική χρήση
 STR_032F_AUTOSAVE                                               :{RED}ΑΥΤΟΜΑΤΗ ΑΠΟΘΗΚΕΥΣΗ
+STR_SAVING_GAME                                                 :{RED}*  *  ΑΠΟΘΗΚΕΥΣΗ ΠΑΙΧΝΙΔΙΟΥ  *  *
+STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}παρακαλώ περιμένετε να τελειώσει!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Επιλογή προγράμματος 'Ezy Street στυλ μουσικής'

 STR_0335_6                                                      :{BLACK}6
 STR_0336_7                                                      :{BLACK}7

 ############ start of townname region
+STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Αγγλικά (Αυθεντικά)
+STR_TOWNNAME_FRENCH                                             :Γαλλικά
+STR_TOWNNAME_GERMAN                                             :Γερμανικά
+STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :Αγγλικά (Πρόσθετα)
+STR_TOWNNAME_LATIN_AMERICAN                                     :Λατινοαμερικάνικα
+STR_TOWNNAME_SILLY                                              :Αστεία
+STR_TOWNNAME_SWEDISH                                            :Σουηδικά
+STR_TOWNNAME_DUTCH                                              :Ολλανδικά
+STR_TOWNNAME_FINNISH                                            :Φινλανδικά
+STR_TOWNNAME_POLISH                                             :Πολωνικά
+STR_TOWNNAME_SLOVAKISH                                          :Σλοβάκικα
+STR_TOWNNAME_NORWEGIAN                                          :Νορβηγικά
+STR_TOWNNAME_HUNGARIAN                                          :Όυγγαρικά
+STR_TOWNNAME_AUSTRIAN                                           :Αυστριακά
+STR_TOWNNAME_ROMANIAN                                           :Ρουμάνικα
+STR_TOWNNAME_CZECH                                              :Τσέχικα
+STR_TOWNNAME_SWISS                                              :Ελβετικά
+STR_TOWNNAME_DANISH                                             :Δανέζικα
+STR_TOWNNAME_TURKISH                                            :Τούρκικα
+STR_TOWNNAME_ITALIAN                                            :Ιταλικά
+STR_TOWNNAME_CATALAN                                            :Καταλανικά
 ############ end of townname region

 STR_CURR_GBP                                                    :Αγγλική Λίρα (£)
+STR_CURR_USD                                                    :Δολλάρια ($)
+STR_CURR_EUR                                                    :Ευρώ (€)
+STR_CURR_YEN                                                    :Γιεν (¥)
+STR_CURR_ATS                                                    :Αυστραικό Σελίνι (ATS)
+STR_CURR_BEF                                                    :Βελγικό Φράγκο (BEF)
+STR_CURR_CHF                                                    :Ελβετικό Φράγκο (CHF)
+STR_CURR_CZK                                                    :Τσέχικη Κορώνα (CZK)
+STR_CURR_DEM                                                    :Γερμανικό Μάρκο (DEM)
+STR_CURR_DKK                                                    :Δανέζικη Κορώνα (DKK)
+STR_CURR_ESP                                                    :Πεσέτα (ESP)
+STR_CURR_FIM                                                    :Φινλανδικό Μάρκο (FIM)
+STR_CURR_FRF                                                    :Φράγκο (FRF)
 STR_CURR_GRD                                                    :Δραχμή(δρχ.)
+STR_CURR_HUF                                                    :Ουγγρικό Φλουρί (HUF)
+STR_CURR_ISK                                                    :Ισλανδική Κορώνα (ISK)
+STR_CURR_ITL                                                    :Ιταλική Λίρα (ITL)
+STR_CURR_NLG                                                    :Ολλανδικό Φιορίνι (NLG)
+STR_CURR_NOK                                                    :Νορβηγική Κορώνα (NOK)
+STR_CURR_PLN                                                    :Πολωνικό Zloty (PLN)
+STR_CURR_ROL                                                    :Ρουμάνικο Λευ (ROL)
+STR_CURR_RUR                                                    :Ρώσσικες Ρούβλες (RUR)
+STR_CURR_SIT                                                    :Σλοβένικο Tolar (SIT)
+STR_CURR_SEK                                                    :Σουηδική Κορώνα (SEK)
+STR_CURR_YTL                                                    :Τούρκικη Λίρα (YTL)
+STR_CURR_SKK                                                    :Σλοβάκικη Κορώνα (SKK)
+STR_CURR_BRR                                                    :Βραζιλιάνικο Real (BRL)

+STR_CURR_CUSTOM                                                 :Άλλο...

+STR_OPTIONS_LANG                                                :{BLACK}Γλώσσα
 STR_OPTIONS_LANG_CBO                                            :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_OPTIONS_LANG_TIP                                            :{BLACK}Επιλογή της γλώσσας σε χρήση

 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Σε όλη την οθόνη
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Τσεκάρεται αυτό το κουτάκι ωστε να παίξετε το OpenTTD σε όλη την οθόνη
@@ -758,7 +935,9 @@ STR_OPTIONS_RES                                                 :{BLACK}Ανάλ
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_RES_TIP                                             :{BLACK}Διαλέξτε την ανάλυση της οθόνης που θέλετε

+STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Διαμόρφωση φωτογραφίας
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Επιλογή της διαμόρφωσης της φωτογραφίας σε χρήση

 STR_AUTOSAVE_1_MONTH                                            :Κάθε μήνα
 STR_AUTOSAVE_FAILED                                             :{WHITE}Το αυτόματο σώσιμο απέτυχε
@@ -785,55 +964,183 @@ STR_PASSENGERS                                                  :Επιβάτε
 STR_BAGS                                                        :Τσάντες
 STR_TONS                                                        :Τόνοι
 STR_LITERS                                                      :Λίτρα
+STR_ITEMS                                                       :αντικείμενα
 STR_CRATES                                                      :Κουτιά
 STR_RES_OTHER                                                   :άλλα
 STR_NOTHING                                                     :

 STR_SMALL_RIGHT_ARROW                                           :{TINYFONT}{RIGHTARROW}

+STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Αδύνατο να μοιραστεί η λίστα οδηγιών...
+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_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Ευρωπαϊκή Οικονομική Ένωση!{}{}Το Ευρώ είναι πλέον το μοναδικό νόμισμα για τις καθημερινές συναλλαγές στην χώρα σας!

 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Το τραίνο {COMMA} έχει τόσες λίγες οδηγίες
+STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Το τρένο {COMMA} έχει κενές εντολές
+STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Το τρένο {COMMA} έχει διπλές εντολές
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Το τρένο {COMMA} έχει έναν λανθασμένο σταθμό στις οδηγίες του
 STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Το Οδικό όχημα {COMMA} έχει τόσες λίγες οδηγίες
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Το Όχημα {COMMA} έχει μία κενή εντολή
+STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Το Όχημα {COMMA} έχει διπλές εντολές
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Το Όχημα {COMMA} έχε έναν λανθασμένο σταθμό στις οδηγίες του
 STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Το πλοίο {COMMA} έχει τόσες λίγες οδηγίες
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Το Πλοίο {COMMA} έχει μία κενή οδηγία
+STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Το Πλοίο {COMMA} έχει διπλές οδηγίες
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Το Πλοίο {COMMA} έχει έναν λανθασμένο σταθμό στις οδηγίες του
 STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Το αεροσκάφος {COMMA} has too few orders in the schedule
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Το Αεροσκάφος {COMMA} έχει μία κενή οδηγία
+STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Το Αεροσκάφος {COMMA} έχει διπλές οδηγίες
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Το Αεροσκάφος {COMMA} έχει ένα λανθασμένο σταθμό στις οδηγίες του
 # end of order system

+STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Η Αυτόματη Ανανέωση απέτυχε στο τρένο {COMMA} (χρηματικό όριο)
+STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Η Αυτόματη Ανανέωση απέτυχε στο όχημα {COMMA} (χρηματικό όριο)
+STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Η Αυτόματη Ανανέωση απέτυχε στο πλοίο {COMMA} (χρηματικό όριο)
+STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Η Αυτόματη Ανανέωση απέτυχε στο αεροσκάφος {COMMA} (χρηματικό όριο)
+STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Το τρένο {COMMA} είναι πολύ μακρύ μετά την αντικατάσταση

+STR_CONFIG_PATCHES                                              :{BLACK}Ρύθμιση Διορθώσεων
+STR_CONFIG_PATCHES_TIP                                          :{BLACK}Ρύθμιση των Διορθώσεων
+STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Ρύθμιση Διορθώσεων

+STR_CONFIG_PATCHES_OFF                                          :Κλειστό
+STR_CONFIG_PATCHES_ON                                           :Ανοιχτό
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Εμφάνιση της ταχύτητας του οχήματος στη γραμμή κατάστασης: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Επιτρέπεται το χτίσιμο σε πλαγιές και ακτές: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Επιτρέπονται πιο ρεαλιστικά ταξινομημένες περιοχές συλλογής : {ORANGE}{STRING}
+STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Επιτρέπεται η αφαίρεση περισσότερων ιδιοκτησιών πόλεων: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Επιτρέπεται η δημιουργία πολύ μακριών τρένων: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Ενεργοποίηση ρεαλιστικής επιτάχυνσης για τα τρένα: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Απαγόρευση στροφών 90 μοιρών για τρένα και πλοία: {ORANGE}{STRING} {LTBLUE} (απαιτεί NPF)
+STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Σύνδεση σταθμών τρένων χτισμένων κοντά: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Αναχώρηση από το σταθμό όταν οποιοδήποτε φορτίο είναι πλήρες, όταν 'πλήρης φόρτος': {ORANGE}{STRING}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Χρησιμοποίηση βελτιωμένου αλγόριθμου φόρτωσης: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Φόρτωση οχημάτων σταδιακά: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Πληθωρισμός: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Παράδοση φορτίου σε σταθμό μόνο όταν υπάρχει ζήτηση: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Επιτρέπεται να χτίζονται πολύ μακριές γέφυρες: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Επιτρέπονται οι εντολές αποστολής σε αμαξοστάσιο: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Επιτρέπεται η κατασκευή βιομηχανιών πρώτων υλών: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Επιτρέπονται πολλαπλές όμοιες βιομηχανίες ανα πόλη: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Βιομηχανίες ίδου τύπου μπορούν να χτιστούν κοντά η μία στην άλλη: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Εμφάνιση ολόκληρης ημερομηνίες στη γραμμή κατάστασης: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Εμφάνιση σήμανσης στην πλευρά οδήγησης: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Εμφάνιση παράθυρου οικονομικών στο τέλος του έτους: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch συμβατός απ'ευθείας χειρισμός: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Ουρά οχημάτων (με κβαντικά εφφέ): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Μετακίνηση παραθύρου όταν είναι το ποντίκι στην άκρη: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Επιτρέπεται η δωροδοκία της τοπικής αρχής: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ανομοιόμορφοι σταθμοί: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Νέο παγκόσμιο σύστημα εύρεσης μονοπατιού (NPF, αγνοεί το NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Πολλαπλασιαστής βάρους σε φορία για εξομοίωση βαρέων τρένων: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Επιτρέπονται τα μικρά αεροδρόμια πάντα: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Προειδοποίηση αν χαθεί τρένο: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Επανεξέταση οδηγιών τρένων: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :όχι
+STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ναι, αλλά εξαιρούνται τα σταματημένα οχήματα
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :από όλα τα οχήματα
+STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Προειδοποίηση όταν τα έσοδα ενός τρένου είναι αρνητικά: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Τα οχήματα δεν λήγουν ποτέ: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Αυτόματη Ανανέωση όταν ένα όχημα παλιώνει
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Αυτόματη Ανανέωση όταν ένα όχημα είναι {ORANGE}{STRING}{LTBLUE} μήνες πρίν/μετά την μέγιστη ηληκία
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Αυτόματη Ανανέωση με τα ελάχιστα απαιτούμενα χρήματα: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Διάρκεια μηνύματος σφάλματος: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Εμφάνιση πληθυσμού πόλης στο όνομα της πόλης: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Αόρατα δέντρα (με διαφανή κτίρια): {ORANGE}{STRING}

+STR_CONFIG_PATCHES_LAND_GENERATOR                               :{LTBLUE}Γεννήτρια Γης: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Αυθεντικό
+STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :ΤεραΓένεση
+STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Μέγιστη απόσταση από την άκρη για τα Διυλιστήρια {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Κορυφογραμμή χιονιού: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Σκληρότητα επιφάνειας (ΤεραΓέννεση μόνο) : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Πολύ απαλός
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Απαλός
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH                   :Σκληρή
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Πολύ ανώμαλος
+STR_CONFIG_PATCHES_TREE_PLACER                                  :{LTBLUE}Αλγόριθμος τοποθέτησης Δέντρων: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TREE_PLACER_NONE                             :Κανένας
 STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL                         :Αυθεντικό
 STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED                         :Βελτιωμένος
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION                           :{LTBLUE}Περιστροφή Heightmap: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :Αντίθετη Φορά Ρολογιού
 STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :Δεξιόστροφα
+STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Το επίπεδο ύψους που παίρνει ένα επίπεδο σενάριο: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Μέγιστη διασπορά σταθμών: {ORANGE}{STRING} {RED}Προσοχή: Η υψηλή ρύθμιση καθυστερεί το παιχνίδι
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Αυτόματη επισκευή ελικοπτέρων στα ελικοδρόμια: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Σύνδεση γραμμής εργαλείων τοπίου με γραμμή εργαλείων σιδηρόδρομου/δρόμου/νερού/αεροδρομίου: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Ανάποδη μετακίνηση οθόνης: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Εμφάνιση εργαλείου μετρήσεως όταν χρησιμοποιούνται διάφορα εργαλεία: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Εμφάνιση χρωμάτων των εταιρειών: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Κανένας
+STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Η Εταιρεία μου
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Όλες οι εταιρίες
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Προτίμηση ομαδικού chat με <ENTER>: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Μέγιστα τρένα ανα παίκτη: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Μέγιστα οχήματα ανα παίκτη: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_AIRCRAFT                                 :{LTBLUE}Μέγιστα αεροσκάφη ανα παίκτη: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MAX_SHIPS                                    :{LTBLUE}Μέγιστα πλοία ανά παίκτη: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_AI_BUILDS_TRAINS                             :{LTBLUE}Απενεργοποίηση τρένων υπολογιστή: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH                            :{LTBLUE}Απενεργοποίηση οχημάτων υπολογιστή: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Απενεργοποίηση αεροσκαφών υπολογιστή: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Απενεργοποίηση πλοίων υπολογιστή: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Ενεγοποίηση νέας AI (alpha): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Επιτρέπονται οι AI σε παιχνίδι για πολλούς παίκτες (πειραματικό): {ORANGE}{STRING}

+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για τρένα: {ORANGE}{STRING} μέρες/%
+STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για τρένα: {ORANGE}απενεργοποιημένο
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για οχήματα: {ORANGE}{STRING} μέρες/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για οχήματα:: {ORANGE}απενεργοποιημένο
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για αεροσκάφη: {ORANGE}{STRING} μέρες/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για αεροσκάφη: {ORANGE}απενεργοποιημένο
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για πλοία: {ORANGE}{STRING} μέρες/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Προεπιλεγμένο διάστημα επισκευών για πλοία: {ORANGE}απενεργοποιημένο
+STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Απενεργοποίηση επισκευών όταν οι βλάβες είναι απενεργοποιημένες: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Ενεργοποίηση ορίων ταχύτητας βαγονιών: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Απενεργοποίηση ηλεκτρικών γραμμών: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Τα έγχρωμα νέα εμφανίζονται το: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Έτος εκκίνησης: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Τέλος παιχνιδιού το: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Ενεργοποίηση ομαλής οικονομίας (περισσότερες, μικρότερες αλλαγές)
+STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Ενεργοποίηση δυνατότητας αγοράς μετοχών από άλλες εταιρείες
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Κατά το σύρσιμο, τοποθέτησε σήματα κάθε: {ORANGE}{STRING} τετράγωνο(α)
+STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE                  :{LTBLUE}Αυτόματο χτίσιμο σηματοφόρων πρίν: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Θέση κύριας εργαλειοθήκης: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Αριστερά
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Κέντρο
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Δεξιά
+STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Ακτίνα επικόλλησης παραθύρου: {ORANGE}{STRING} px
+STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Ακτίνα επικόλλησης παραθύρου: {ORANGE}απενεργοποιημένο

+STR_CONFIG_PATCHES_GUI                                          :{BLACK}Σύστημα Διεπαφής
+STR_CONFIG_PATCHES_CONSTRUCTION                                 :{BLACK}Κατασκευή
+STR_CONFIG_PATCHES_VEHICLES                                     :{BLACK}Οχήματα
+STR_CONFIG_PATCHES_STATIONS                                     :{BLACK}Σταθμοί
+STR_CONFIG_PATCHES_ECONOMY                                      :{BLACK}Οικονομία
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Ανταγωνιστές

+STR_CONFIG_PATCHES_DISABLED                                     :απενεργοποιημένο
 STR_CONFIG_PATCHES_INT32                                        :{NUM}
 STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}

+STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Αλλαγή τιμής ρύθμισης
+STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Κάποια ή όλα τα προεπιλεγμένα διαστήματα επισκευών παρακάτω δεν είναι συμβατά με την επιλεγμένη ρύθμιση! 5-90% και 30-800 μέρες είναι τα αποδεκτά
+STR_CONFIG_PATCHES_YAPF_SHIPS                                   :{LTBLUE}Χρησιμοποίηση YAPF για τα πλοία: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_ROAD                                    :{LTBLUE}Χρησιμοποίηση YAPF για τα οχήματα: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_YAPF_RAIL                                    :{LTBLUE}Χρησιμοποίηση YAPF για τα τρένα: {ORANGE}{STRING}

 STR_TEMPERATE_LANDSCAPE                                         :Συγκρατημένο τοπίο
 STR_SUB_ARCTIC_LANDSCAPE                                        :Πολικό τοπίο
@@ -841,19 +1148,48 @@ STR_SUB_TROPICAL_LANDSCAPE                                      :Υποτροπ
 STR_TOYLAND_LANDSCAPE                                           :Παιχνιδιάστικο τοπίο

 STR_CHEATS                                                      :{WHITE}Κλεψιές
+STR_CHEATS_TIP                                                  :{BLACK}Τα κουτάκια δείχνουν αν έχετε χρησιμοποιήσει αυτό το κόλπο πρίν
+STR_CHEATS_WARNING                                              :{BLACK}Προσοχή! Είστε έτοιμος να προδώσετε τους φίλους ανταγωνιστές σας. Θυμηθείτε ότι αυτή η ντροπή θα μείνει για πάντα.
+STR_CHEAT_MONEY                                                 :{LTBLUE}Αύξηση χρημάτων κατά {CURRENCY64}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Παίξτε σαν παίκτης: {ORANGE}{COMMA}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Μαγική μπουλντόζα (αφαιρεί βιομηχανίες, αμετακίνητα): {ORANGE}{STRING}
+STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Τα τούνελ διασταυρώνονται: {ORANGE}{STRING}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Χτήσιμο ενώ βρίσκεστε σε παύση: {ORANGE}{STRING}
+STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Τα Jet δεν θα συγκρούονται (συχνά) σε μικρά αεροδρόμια: {ORANGE} {STRING}
+STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Αλλαγή κλίματος: {ORANGE} {STRING}
+STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Αλλαγή ημ/νίας: {ORANGE} {DATE_SHORT}
+STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ενεργοποίηση δυνατότητας αλλαγής τιμών παραγωγής: {ORANGE}{STRING}

 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Καθ' οδόν {WAYPOINT}
+STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Πορεία προς {WAYPOINT}, {VELOCITY}

 STR_GO_TO_WAYPOINT                                              :Πήγαινε δια μέσου {WAYPOINT}
+STR_GO_NON_STOP_TO_WAYPOINT                                     :Πήγαινε χωρίς στάση μέσω {WAYPOINT}

+STR_WAYPOINTNAME_CITY                                           :Σημείο πορείας {TOWN}
+STR_WAYPOINTNAME_CITY_SERIAL                                    :Σημείο πορείας {TOWN} #{COMMA}
+STR_LANDINFO_WAYPOINT                                           :Σημείο πορείας

+STR_WAYPOINT                                                    :{WHITE}Σημείο πορείας
+STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Επιλογή τύπου σημείου πορείας

+STR_WAYPOINT_VIEWPORT                                           :{WHITE}{WAYPOINT}
+STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WHITE}{WAYPOINT}
+STR_WAYPOINT_RAW                                                :{WAYPOINT}
+STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Διαμόρφωση ονόματος σημείου πορείας

+STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Αδύνατο να αλλαχτεί το όνομα του σημείου πορείας...
+STR_CONVERT_RAIL_TO_WAYPOINT_TIP                                :{BLACK}Μετατροπή γραμμής σε σημείο πορείας
+STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Αδύνατο να χτιστεί σημείο πορείας τρένου εδώ...
+STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Αδύνατο να αφαιρεθεί το σημείο πορείας τρένου εδώ...

+STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Κατασκευή σιδηροδρομικής γραμμής χρησιμοποιώντας την Αυτόματη Γραμμή

 STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...δεν υπάρχει καμία πόλη στην πίστα

+STR_GENERATE_RANDOM_LANDSCAPE                                   :{WHITE}Είστε σίγουρος ότι θέλετε να δημιουργήσετε ένα τυχαίο τοπίο;
 STR_MANY_RANDOM_TOWNS                                           :{BLACK}Πολλές τυχαίες πόλεις
+STR_RANDOM_TOWNS_TIP                                            :{BLACK}Κάλυψη του χάρτη με τυχαία τοποθετημένες πόλεις
 STR_MANY_RANDOM_INDUSTRIES                                      :{BLACK}Πολλές τυχαίες βιομηχανίες


@@ -1608,6 +1944,7 @@ STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99



+
 ##id 0x9000


@@ -1637,6 +1974,7 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.



+
 ### depot strings


@@ -1667,4 +2005,7 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.
 ############ Tooltip measurment


+############ Date formatting
+
 ########
+
@@ -660,7 +660,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Novietot
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Bu've't ba'ku
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Bu've't raidi'ta'ju
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Nora'di't tuksnes'a plati'bu.{}Spiest un turet CTRL lai to izdze'stu
-STR_CREATE_LAKE                                                 :{BLACK}Nora'di't u'dens plati'bu.{}Ta' tiks appludina'ta ja bu's ju'ras li'meni'
 STR_0290_DELETE                                                 :{BLACK}Izdzest
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Pilni'ba' izdze'st s'o pilse'tu
 STR_0292_SAVE_SCENARIO                                          :Saglaba't scena'riju
@@ -1382,7 +1381,6 @@ STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{ST
 STR_SERVICE                                                     :{BLACK}Serviss
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vilciens ja'apsta'dina kad tas ierodas depo
-STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
 STR_8861_STOPPED                                                :{RED}Stoppets

 STR_8865_NAME_TRAIN                                             :{WHITE}Nosaukt vilcienu
@@ -1394,7 +1392,6 @@ STR_886F_TRANSFER                                               :{BLACK}Tranzi't
 ##id 0x9000
 STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9012_CAPACITY                                               :{BLACK}Capacitâte: {LTBLUE}{CARGO}
-STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
 STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Cena: {CURRENCY}{}Atrums: {VELOCITY}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}

 STR_9034_RENAME                                                 :{BLACK}Pârsaukt
@@ -1403,13 +1400,11 @@ STR_9034_RENAME                                                 :{BLACK}Pârsauk
 STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Kuìi
 STR_980F                                                        :{WHITE}{VEHICLE}
 STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Uzbûvet jauno kuìi
-STR_982D                                                        :{BLACK}{BIGFONT}{STRING}

 STR_9836_RENAME                                                 :{BLACK}Pârsaukt

 ##id 0xA000
 STR_A00A                                                        :{WHITE}{VEHICLE}
-STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}

 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Lidmaðînas avârija!{}Lidmaðînai pietrûka degviela, {COMMA} nogalinâti!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
@@ -794,21 +794,21 @@ static void DelChar(Textbuf *tb, bool backspace)
 	WChar c;
 	uint width;
 	size_t len;
+	char *s = tb->buf + tb->caretpos;

-	if (backspace) {
-		do {
-			tb->caretpos--;
-		} while (IsUtf8Part(*(tb->buf + tb->caretpos)));
-	}
+	if (backspace) s = Utf8PrevChar(s);

-	len = Utf8Decode(&c, tb->buf + tb->caretpos);
+	len = Utf8Decode(&c, s);
 	width = GetCharacterWidth(FS_NORMAL, c);

 	tb->width  -= width;
-	if (backspace) tb->caretxoffs -= width;
+	if (backspace) {
+		tb->caretpos   -= len;
+		tb->caretxoffs -= width;
+	}

 	/* Move the remaining characters over the marker */
-	memmove(tb->buf + tb->caretpos, tb->buf + tb->caretpos + len, tb->length - tb->caretpos - len + 1);
+	memmove(s, s + len, tb->length - (s - tb->buf) - len + 1);
 	tb->length -= len;
 }

@@ -881,12 +881,9 @@ bool MoveTextBufferPos(Textbuf *tb, int navmode)
 	case WKC_LEFT:
 		if (tb->caretpos != 0) {
 			WChar c;
-
-			do {
-				tb->caretpos--;
-			} while (IsUtf8Part(*(tb->buf + tb->caretpos)));
-
-			Utf8Decode(&c, tb->buf + tb->caretpos);
+			const char *s = Utf8PrevChar(tb->buf + tb->caretpos);
+			Utf8Decode(&c, s);
+			tb->caretpos    = s - tb->buf; // -= (tb->buf + tb->caretpos - s)
 			tb->caretxoffs -= GetCharacterWidth(FS_NORMAL, c);

 			return true;
@@ -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ä"
 		// 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ä", last);
 		}
 	} else {
 		// A two-part name by combining one of name_finnish_{1,2} + name_finnish_3.
@@ -7,7 +7,7 @@
 	extern const char _openttd_revision[];
 #elif defined(WITH_REV_HACK)
 	#define WITH_REV
-	const char _openttd_revision[] = WITH_REV_HACK;
+	const char _openttd_revision[] = "0.5.2";
 #else
 	const char _openttd_revision[] = NOREV_STRING;
 #endif
@@ -641,7 +641,7 @@ void NetworkCloseClient(NetworkClientState *cs)

 	if (_network_server) {
 		// We just lost one client :(
-		if (cs->status > STATUS_INACTIVE) _network_game_info.clients_on--;
+		if (cs->status >= STATUS_AUTH) _network_game_info.clients_on--;
 		_network_clients_connected--;

 		while ((cs + 1) != DEREF_CLIENT(MAX_CLIENTS) && (cs + 1)->socket != INVALID_SOCKET) {
@@ -1397,11 +1397,13 @@ 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
@@ -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);
-	//    uint8:  Destination Player (1..MAX_PLAYERS)
+	//    uint16: Destination Player
 	//    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_uint8(p, dest);
+	NetworkSend_uint16(p, dest);
 	NetworkSend_string(p, msg);
 	NetworkSend_Packet(p, MY_CLIENT);
 }
@@ -49,6 +49,7 @@ typedef struct CommandPacket {

 typedef enum {
 	STATUS_INACTIVE,
+	STATUS_AUTHORIZING, // This means that the client is authorizing
 	STATUS_AUTH, // This means that the client is authorized
 	STATUS_MAP_WAIT, // This means that the client is put on hold because someone else is getting the map
 	STATUS_MAP,
@@ -1479,7 +1479,7 @@ void ShowJoinStatusWindowAfterJoin(void)
 	AllocateWindowDesc(&_network_join_status_window_desc);
 }

-static void SendChat(const char *buf, DestType type, byte dest)
+static void SendChat(const char *buf, DestType type, int 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, querystr_d).text;
+	Textbuf *tb = &WP(w, chatquerystr_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, querystr_d).text);
+			UpdateTextBufferSize(&WP(w, chatquerystr_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, querystr_d).text);
+		UpdateTextBufferSize(&WP(w, chatquerystr_d).text);

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

-/* 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 */
+/*
+ * uses chatquerystr_d WP macro
+ * uses chatquerystr_d->caption to store type of chat message (Private/Team/All)
+ */
 static void ChatWindowWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
@@ -1644,8 +1644,8 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e)

 		DrawWindowWidgets(w);

-		assert(GB(WP(w, querystr_d).caption, 0, 8) < lengthof(chat_captions));
-		msg = chat_captions[GB(WP(w, querystr_d).caption, 0, 8)];
+		assert(WP(w, chatquerystr_d).caption < lengthof(chat_captions));
+		msg = chat_captions[WP(w, chatquerystr_d).caption];
 		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 = 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);
+				DestType type = (DestType)WP(w, chatquerystr_d).caption;
+				int dest = WP(w, chatquerystr_d).dest;
+				SendChat(WP(w, chatquerystr_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 = 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);
+				DestType type = (DestType)WP(w, chatquerystr_d).caption;
+				int dest = WP(w, chatquerystr_d).dest;
+				SendChat(WP(w, chatquerystr_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, byte dest)
+void ShowNetworkChatQueryWindow(DestType type, int dest)
 {
 	Window *w;

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

 	LowerWindowWidget(w, 2);
-	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);
+	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);
 }

 #endif /* ENABLE_NETWORK */
@@ -9,7 +9,7 @@

 void ShowNetworkNeedPassword(NetworkPasswordType npt);
 void ShowNetworkGiveMoneyWindow(byte player); // PlayerID
-void ShowNetworkChatQueryWindow(DestType type, byte dest);
+void ShowNetworkChatQueryWindow(DestType type, int 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, byte dest) {}
+static inline void ShowNetworkChatQueryWindow(byte desttype, int dest) {}
 static inline void ShowClientList(void) {}
 static inline void ShowJoinStatusWindowAfterJoin(void) {}
 static inline void ShowNetworkGameWindow(void) {}
@@ -215,7 +215,14 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_NEED_PASSWORD)(NetworkClientState *c
 	//    uint8:  Type of password
 	//

-	Packet *p = NetworkSend_Init(PACKET_SERVER_NEED_PASSWORD);
+	Packet *p;
+
+	/* Invalid packet when status is AUTH or higher */
+	if (cs->status >= STATUS_AUTH) return;
+
+	cs->status = STATUS_AUTHORIZING;
+
+	p = NetworkSend_Init(PACKET_SERVER_NEED_PASSWORD);
 	NetworkSend_uint8(p, type);
 	NetworkSend_Packet(p, cs);
 }
@@ -694,7 +701,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_PASSWORD)
 	type = NetworkRecv_uint8(cs, p);
 	NetworkRecv_string(cs, p, password, sizeof(password));

-	if (cs->status == STATUS_INACTIVE && type == NETWORK_GAME_PASSWORD) {
+	if (cs->status == STATUS_AUTHORIZING && type == NETWORK_GAME_PASSWORD) {
 		// Check game-password
 		if (strcmp(password, _network_game_info.server_password) != 0) {
 			// Password is invalid
@@ -712,7 +719,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_PASSWORD)
 		// Valid password, allow user
 		SEND_COMMAND(PACKET_SERVER_WELCOME)(cs);
 		return;
-	} else if (cs->status == STATUS_INACTIVE && type == NETWORK_COMPANY_PASSWORD) {
+	} else if (cs->status == STATUS_AUTHORIZING && type == NETWORK_COMPANY_PASSWORD) {
 		ci = DEREF_CLIENT_INFO(cs);

 		if (strcmp(password, _network_player_info[ci->client_playas].password) != 0) {
@@ -1112,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_uint8(cs, p);
+	int dest = NetworkRecv_uint16(cs, p);
 	char msg[MAX_TEXT_MSG_LEN];

 	NetworkRecv_string(cs, p, msg, MAX_TEXT_MSG_LEN);
@@ -1534,6 +1541,12 @@ void NetworkServer_Tick(bool send_frame)
 				IConsolePrintF(_icolour_err,"Client #%d is dropped because it took longer than %d ticks for him to join", cs->index, _network_max_join_time);
 				NetworkCloseClient(cs);
 			}
+		} else if (cs->status == STATUS_INACTIVE) {
+			int lag = NetworkCalculateLag(cs);
+			if (lag > 4 * DAY_TICKS) {
+				IConsolePrintF(_icolour_err,"Client #%d is dropped because it took longer than %d ticks to start the joining process", cs->index, 4 * DAY_TICKS);
+				NetworkCloseClient(cs);
+			}
 		}

 		if (cs->status >= STATUS_PRE_ACTIVE) {
@@ -2096,79 +2096,73 @@ static void FeatureNewName(byte *buf, int len)

 		len -= (int)name_length;

-		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);
+		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);
-					}
-					break;
+		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;
+			}

-				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
-			}
 		}
 	}
 }
@@ -3505,7 +3499,7 @@ static void ResetNewGRFData(void)
 	ResetPriceBaseMultipliers();

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

 	// Reset station classes
 	ResetStationClasses();
@@ -241,8 +241,8 @@ compatible_grf:
 				free(c->filename);
 				c->filename = strdup(f->filename);
 				memcpy(c->md5sum, f->md5sum, sizeof(c->md5sum));
-				if (c->name == NULL) c->name = strdup(f->name);
-				if (c->info == NULL) c->info = strdup(f->info);
+				if (c->name == NULL && f->name != NULL) c->name = strdup(f->name);
+				if (c->info == NULL && f->info != NULL) c->info = strdup(f->info);
 			}
 		}
 	}
@@ -523,21 +523,6 @@ static void VehicleSetTriggers(const ResolverObject *object, int triggers)
 }


-static uint32 GetVehicleTypeInfo(EngineID engine_type)
-{
-	/* Bit 0  Vehicle type is available on the market
-	 * Bit 1  Vehicle type is in the testing phase
-	 * Bit 2  Exclusive testing offer for a human player active */
-	const Engine *e = GetEngine(engine_type);
-	uint32 var = 0;
-
-	if (e->player_avail == 0xFF) SETBIT(var, 0);
-	if (e->age < e->duration_phase_1) SETBIT(var, 1);
-	if (e->player_avail > 0 && e->player_avail != 0xFF) SETBIT(var, 2);
-	return var;
-}
-
-
 static uint32 GetGRFParameter(EngineID engine_type, byte parameter)
 {
 	const GRFFile *file = GetEngineGRF(engine_type);
@@ -556,7 +541,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
 		switch (variable) {
 			case 0x43: return _current_player; /* Owner information */
 			case 0x46: return 0;               /* Motion counter */
-			case 0x48: return GetVehicleTypeInfo(object->u.vehicle.self_type); /* Vehicle Type Info */
+			case 0x48: return GetEngine(object->u.vehicle.self_type)->flags; /* Vehicle Type Info */
 			case 0xC4: return clamp(_cur_year, ORIGINAL_BASE_YEAR, ORIGINAL_MAX_YEAR) - ORIGINAL_BASE_YEAR; /* Build year */
 			case 0xDA: return INVALID_VEHICLE; /* Next vehicle */
 			case 0x7F: return GetGRFParameter(object->u.vehicle.self_type, parameter); /* Read GRF parameter */
@@ -669,7 +654,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by
 			return (_cargo_classes[cid] << 16) | (_cargoc.weights[v->cargo_type] << 8) | cid;
 		}

-		case 0x48: return GetVehicleTypeInfo(v->engine_type); /* Vehicle Type Info */
+		case 0x48: return GetEngine(v->engine_type)->flags; /* Vehicle Type Info */

 		/* Variables which use the parameter */
 		case 0x60: /* Count consist's engine ID occurance */
@@ -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 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_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_MUL:  return last_value * value; \
 		case DSGA_OP_AND:  return last_value & value; \
 		case DSGA_OP_OR:   return last_value | value; \
@@ -31,18 +31,22 @@ void InitNewsItemStructs(void);
 VARDEF NewsItem _statusbar_news_item;

 enum NewsType {
-	NT_ARRIVAL_PLAYER = 0,
-	NT_ARRIVAL_OTHER  = 1,
-	NT_ACCIDENT       = 2,
-	NT_COMPANY_INFO   = 3,
-	NT_ECONOMY        = 4,
-	NT_ADVICE         = 5,
-	NT_NEW_VEHICLES   = 6,
-	NT_ACCEPTANCE     = 7,
-	NT_SUBSIDIES      = 8,
-	NT_GENERAL        = 9,
+	NT_ARRIVAL_PLAYER,
+	NT_ARRIVAL_OTHER,
+	NT_ACCIDENT,
+	NT_COMPANY_INFO,
+	NT_OPENCLOSE,
+	NT_ECONOMY,
+	NT_ADVICE,
+	NT_NEW_VEHICLES,
+	NT_ACCEPTANCE,
+	NT_SUBSIDIES,
+	NT_GENERAL,
+	NT_END,
 };

+extern const char *_news_display_name[NT_END];
+
 enum NewsMode {
 	NM_SMALL    = 0, ///< Show only a small popup informing us about vehicle age for example
 	NM_NORMAL   = 1, ///< Show a simple news message (height 170 pixels)
@@ -59,11 +63,8 @@ enum NewsFlags {
 };

 enum NewsCallback {
-	DNC_TRAINAVAIL    = 0, ///< Show new train available message. StringID is EngineID
-	DNC_ROADAVAIL     = 1, ///< Show new road vehicle available message. StringID is EngineID
-	DNC_SHIPAVAIL     = 2, ///< Show new ship available message. StringID is EngineID
-	DNC_AIRCRAFTAVAIL = 3, ///< Show new aircraft available message. StringID is EngineID
-	DNC_BANKRUPCY     = 4, ///< Show bankrupcy message. StringID is PlayerID (0-3) and NewsBankrupcy (4-7)
+	DNC_VEHICLEAVAIL  = 0, ///< Show new vehicle available message. StringID is EngineID
+	DNC_BANKRUPCY     = 1, ///< Show bankrupcy message. StringID is PlayerID (0-3) and NewsBankrupcy (4-7)
 };

 enum NewsBankrupcy {
@@ -53,32 +53,21 @@ static NewsID _forced_news = INVALID_NEWS;

 static byte _total_news = 0; // total news count

-void DrawNewsNewTrainAvail(Window *w);
-void DrawNewsNewRoadVehAvail(Window *w);
-void DrawNewsNewShipAvail(Window *w);
-void DrawNewsNewAircraftAvail(Window *w);
+void DrawNewsNewVehicleAvail(Window *w);
 void DrawNewsBankrupcy(Window *w);
 static void MoveToNextItem(void);

-StringID GetNewsStringNewTrainAvail(const NewsItem *ni);
-StringID GetNewsStringNewRoadVehAvail(const NewsItem *ni);
-StringID GetNewsStringNewShipAvail(const NewsItem *ni);
-StringID GetNewsStringNewAircraftAvail(const NewsItem *ni);
+StringID GetNewsStringNewVehicleAvail(const NewsItem *ni);
 StringID GetNewsStringBankrupcy(const NewsItem *ni);

 static DrawNewsCallbackProc * const _draw_news_callback[] = {
-	DrawNewsNewTrainAvail,    /* DNC_TRAINAVAIL */
-	DrawNewsNewRoadVehAvail,  /* DNC_ROADAVAIL */
-	DrawNewsNewShipAvail,     /* DNC_SHIPAVAIL */
-	DrawNewsNewAircraftAvail, /* DNC_AIRCRAFTAVAIL */
+	DrawNewsNewVehicleAvail,  /* DNC_VEHICLEAVAIL */
 	DrawNewsBankrupcy,        /* DNC_BANKRUPCY */
 };

+extern GetNewsStringCallbackProc * const _get_news_string_callback[];
 GetNewsStringCallbackProc * const _get_news_string_callback[] = {
-	GetNewsStringNewTrainAvail,    /* DNC_TRAINAVAIL */
-	GetNewsStringNewRoadVehAvail,  /* DNC_ROADAVAIL */
-	GetNewsStringNewShipAvail,     /* DNC_SHIPAVAIL */
-	GetNewsStringNewAircraftAvail, /* DNC_AIRCRAFTAVAIL */
+	GetNewsStringNewVehicleAvail,  /* DNC_VEHICLEAVAIL */
 	GetNewsStringBankrupcy,        /* DNC_BANKRUPCY */
 };

@@ -363,19 +352,34 @@ static WindowDesc _news_type0_desc = {
 	NewsWindowProc
 };

-static const SoundFx _news_sounds[] = {
+static const SoundFx _news_sounds[NT_END] = {
 	SND_1D_APPLAUSE,
 	SND_1D_APPLAUSE,
 	0,
 	0,
 	0,
 	0,
+	0,
 	SND_1E_OOOOH,
 	0,
 	0,
 	0
 };

+const char *_news_display_name[NT_END] = {
+	"arrival_player",
+	"arrival_other",
+	"accident",
+	"company_info",
+	"openclose",
+	"economy",
+	"advice",
+	"new_vehicles",
+	"acceptance",
+	"subsidies",
+	"general",
+};
+
 /** Get the value of an item of the news-display settings. This is
 * a little tricky since on/off/summary must use 2 bits to store the value
 * @param item the item whose value is requested
@@ -383,7 +387,7 @@ static const SoundFx _news_sounds[] = {
 */
 static inline byte GetNewsDisplayValue(byte item)
 {
-	assert(item < 10 && GB(_news_display_opt, item * 2, 2) <= 2);
+	assert(item < NT_END && GB(_news_display_opt, item * 2, 2) <= 2);
 	return GB(_news_display_opt, item * 2, 2);
 }

@@ -394,7 +398,7 @@ static inline byte GetNewsDisplayValue(byte item)
 */
 static inline void SetNewsDisplayValue(byte item, byte val)
 {
-	assert(item < 10 && val <= 2);
+	assert(item < NT_END && val <= 2);
 	SB(_news_display_opt, item * 2, 2, val);
 }

@@ -598,6 +602,7 @@ 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);
@@ -611,15 +616,21 @@ 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;
-		if (c == '\r') {
+		/* Make a space from a newline, but ignore multiple newlines */
+		if (c == '\n' && c_last != '\n') {
+			dest[0] = ' ';
+			dest++;
+		} else 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';
@@ -732,11 +743,19 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
 	switch (e->event) {
 	case WE_CREATE: {
 		uint32 val = _news_display_opt;
+		uint32 all_val;
 		int i;
-		WP(w, def_d).data_1 = WP(w, def_d).data_2 = 0;
+		WP(w, def_d).data_1 = 0;

-		// Set up the initial disabled buttons in the case of 'off' or 'full'
-		for (i = 0; i != 10; i++, val >>= 2) SetMessageButtonStates(w, val & 0x3, i);
+		/* Set up the initial disabled buttons in the case of 'off' or 'full' */
+		all_val = val & 0x3;
+		for (i = 0; i != 10; i++, val >>= 2) {
+			SetMessageButtonStates(w, val & 0x3, i);
+			/* If the value doesn't match the ALL-button value, set the ALL-button value to 'off' */
+			if ((val & 0x3) != all_val) all_val = 0;
+		}
+		/* If all values are the same value, the ALL-button will take over this value */
+		WP(w, def_d).data_2 = all_val;
 	} break;

 	case WE_PAINT: {
@@ -744,12 +763,12 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
 		int click_state = WP(w, def_d).data_1;
 		int i, y;

-		if (_news_ticker_sound) LowerWindowWidget(w, 25);
+		if (_news_ticker_sound) LowerWindowWidget(w, 27);
 		DrawWindowWidgets(w);

 		/* XXX - Draw the fake widgets-buttons. Can't add these to the widget-desc since
 		 * openttd currently can only handle 32 widgets. So hack it *g* */
-		for (i = 0, y = 26; i != 10; i++, y += 12, click_state >>= 1, val >>= 2) {
+		for (i = 0, y = 26; i < NT_END; i++, y += 12, click_state >>= 1, val >>= 2) {
 			bool clicked = !!(click_state & 1);

 			DrawFrameRect(13, y, 89, 11 + y, 3, (clicked) ? FR_LOWERED : 0);
@@ -757,7 +776,7 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
 			DrawString(103, y + 1, i + STR_0206_ARRIVAL_OF_FIRST_VEHICLE, 0);
 		}

-		DrawString(  8, y + 9, message_opt[WP(w, def_d).data_2], 0x10);
+		DrawStringCentered(((13 + 89 + 1) >> 1), y + 9, message_opt[WP(w, def_d).data_2], 0x10);
 		DrawString(103, y + 9, STR_MESSAGES_ALL, 0);
 		DrawString(103, y + 9 + 12, STR_MESSAGE_SOUND, 0);

@@ -766,7 +785,7 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
 	case WE_CLICK:
 		switch (e->we.click.widget) {
 		case 2: /* Clicked on any of the fake widgets */
-			if (e->we.click.pt.x > 13 && e->we.click.pt.x < 89 && e->we.click.pt.y > 26 && e->we.click.pt.y < 146) {
+			if (e->we.click.pt.x > 13 && e->we.click.pt.x < 89 && e->we.click.pt.y > 26 && e->we.click.pt.y < NT_END * 12 + 26) {
 				int element = (e->we.click.pt.y - 26) / 12;
 				byte val = (GetNewsDisplayValue(element) + 1) % 3;

@@ -778,17 +797,17 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
 				SetWindowDirty(w);
 			}
 			break;
-		case 23: case 24: /* Dropdown menu for all settings */
-			ShowDropDownMenu(w, message_opt, WP(w, def_d).data_2, 24, 0, 0);
+		case 25: case 26: /* Dropdown menu for all settings */
+			ShowDropDownMenu(w, message_opt, WP(w, def_d).data_2, 26, 0, 0);
 			break;
-		case 25: /* Change ticker sound on/off */
+		case 27: /* Change ticker sound on/off */
 			_news_ticker_sound ^= 1;
 			ToggleWidgetLoweredState(w, e->we.click.widget);
 			InvalidateWidget(w, e->we.click.widget);
 			break;
 		default: { /* Clicked on the [<] .. [>] widgets */
 			int wid = e->we.click.widget;
-			if (wid > 2 && wid < 23) {
+			if (wid > 2 && wid <= NT_END * 2 + 2) {
 				int element = (wid - 3) / 2;
 				byte val = (GetNewsDisplayValue(element) + ((wid & 1) ? -1 : 1)) % 3;

@@ -804,9 +823,9 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)

 		WP(w, def_d).data_2 = e->we.dropdown.index;

-		for (i = 0; i != 10; i++) {
-			SB(_news_display_opt, i*2, 2, e->we.dropdown.index);
+		for (i = 0; i < NT_END; i++) {
 			SetMessageButtonStates(w, e->we.dropdown.index, i);
+			SetNewsDisplayValue(i, e->we.dropdown.index);
 		}
 		SetWindowDirty(w);
 		break;
@@ -822,7 +841,7 @@ static void MessageOptionsWndProc(Window *w, WindowEvent *e)
 static const Widget _message_options_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    13,     0,   10,     0,    13, STR_00C5,                 STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    13,    11,  409,     0,    13, STR_0204_MESSAGE_OPTIONS, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,    13,     0,  409,    14,   184, 0x0,                      STR_NULL},
+{      WWT_PANEL,   RESIZE_NONE,    13,     0,  409,    14,   196, 0x0,                      STR_NULL},

 { WWT_PUSHIMGBTN,   RESIZE_NONE,     3,     4,   12,    26,    37, SPR_ARROW_LEFT,           STR_HSCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHIMGBTN,   RESIZE_NONE,     3,    90,   98,    26,    37, SPR_ARROW_RIGHT,          STR_HSCROLL_BAR_SCROLLS_LIST},
@@ -854,16 +873,19 @@ static const Widget _message_options_widgets[] = {
 { WWT_PUSHIMGBTN,   RESIZE_NONE,     3,     4,   12,   134,   145, SPR_ARROW_LEFT,           STR_HSCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHIMGBTN,   RESIZE_NONE,     3,    90,   98,   134,   145, SPR_ARROW_RIGHT,          STR_HSCROLL_BAR_SCROLLS_LIST},

-{      WWT_PANEL,   RESIZE_NONE,     3,     4,   86,   154,   165, 0x0,                      STR_NULL},
-{    WWT_TEXTBTN,   RESIZE_NONE,     3,    87,   98,   154,   165, STR_0225,                 STR_NULL},
-{  WWT_TEXTBTN_2,   RESIZE_NONE,     3,     4,   98,   166,   177, STR_02DB_OFF,             STR_NULL},
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,     3,     4,   12,   146,   157, SPR_ARROW_LEFT,           STR_HSCROLL_BAR_SCROLLS_LIST},
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,     3,    90,   98,   146,   157, SPR_ARROW_RIGHT,          STR_HSCROLL_BAR_SCROLLS_LIST},
+
+{      WWT_PANEL,   RESIZE_NONE,     3,     4,   86,   166,   177, 0x0,                      STR_NULL},
+{    WWT_TEXTBTN,   RESIZE_NONE,     3,    87,   98,   166,   177, STR_0225,                 STR_NULL},
+{  WWT_TEXTBTN_2,   RESIZE_NONE,     3,     4,   98,   178,   189, STR_02DB_OFF,             STR_NULL},

 {      WWT_LABEL,   RESIZE_NONE,    13,     0,  409,    13,    26, STR_0205_MESSAGE_TYPES,   STR_NULL},
 {   WIDGETS_END},
 };

 static const WindowDesc _message_options_desc = {
-	270, 22, 410, 185,
+	270, 22, 410, 197,
 	WC_GAME_OPTIONS, 0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_message_options_widgets,
@@ -344,6 +344,9 @@ 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 */
@@ -1511,6 +1514,7 @@ 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) {
@@ -385,6 +385,8 @@ int ttd_main(int argc, char *argv[])
 				_switch_mode = SM_LOAD;
 			} else {
 				_switch_mode = SM_NEWGAME;
+				/* Give a random map */
+				generation_seed = InteractiveRandom();
 			}
 			break;
 		case 'G': generation_seed = atoi(mgo.opt); break;
@@ -1240,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 network_servers!
-	if (!_players[0].is_active && (!_networking || (_networking && _network_server)))
+	//   But this exeption is not true for non dedicated network_servers! */
+	if (!_players[0].is_active && (!_networking || (_networking && _network_server && !_network_dedicated)))
 		DoStartupNewPlayer(false);

 	DoZoomInOutWindow(ZOOM_NONE, w); // update button status
@@ -1594,6 +1596,21 @@ bool AfterLoadGame(void)
 		}
 	}

+	if (CheckSavegameVersion(7)) {
+		Station *st;
+		FOR_ALL_STATIONS(st) {
+			CargoID c;
+			for (c = 0; c < NUM_CARGO; c++) {
+				GoodsEntry *ge = &st->goods[c];
+
+				/* In old versions, enroute_from used 0xFF as INVALID_STATION */
+				if (ge->enroute_from == 0xFF) {
+					ge->enroute_from = INVALID_STATION;
+				}
+			}
+		}
+	}
+
 	return true;
 }

@@ -1611,6 +1628,7 @@ void ReloadNewGRFData(void)
 	/* reload vehicles */
 	ResetVehiclePosHash();
 	AfterLoadVehicles();
+	StartupEngines();
 	/* update station and waypoint graphics */
 	AfterLoadWaypoints();
 	AfterLoadStations();
@@ -28,7 +28,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
@@ -54,7 +54,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
+				AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
 				OutputFile=".\Release/openttd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -101,7 +101,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
@@ -28,7 +28,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -58,7 +58,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -139,7 +139,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -170,7 +170,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -251,7 +251,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -276,7 +276,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -349,7 +349,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -375,7 +375,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -455,6 +455,26 @@ static int32 DecloneOrder(Vehicle *dst, uint32 flags)
 	return 0;
 }

+/**
+ * Remove the VehicleList that shows all the vehicles with the same shared
+ *  orders.
+ */
+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;
+		case VEH_Road:     window_class = WC_ROADVEH_LIST;  break;
+		case VEH_Ship:     window_class = WC_SHIPS_LIST;    break;
+		case VEH_Aircraft: window_class = WC_AIRCRAFT_LIST; break;
+	}
+	DeleteWindowById(window_class, (v->orders->index << 16) | (v->type << 11) | VLW_SHARED_ORDERS | v->owner);
+}
+
 /** Delete an order from the orderlist of a vehicle.
 * @param tile unused
 * @param p1 the ID of the vehicle
@@ -489,6 +509,10 @@ int32 CmdDeleteOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 				order = GetVehicleOrder(v, sel_ord + 1);
 				SwapOrders(v->orders, order);
 			} else {
+				/* XXX -- The system currently can't handle a shared-order vehicle list
+				 *  open when there aren't any orders in the list, so close the window
+				 *  in this case. Of course it needs a better fix later */
+				RemoveSharedOrderVehicleList(v);
 				/* Last item, so clean the list */
 				v->orders = NULL;
 			}
@@ -1120,7 +1144,7 @@ void DeleteVehicleOrders(Vehicle *v)
 	/* If we have a shared order-list, don't delete the list, but just
 	    remove our pointer */
 	if (IsOrderListShared(v)) {
-		const Vehicle *u = v;
+		Vehicle *u = v;

 		v->orders = NULL;
 		v->num_orders = 0;
@@ -1137,6 +1161,10 @@ void DeleteVehicleOrders(Vehicle *v)
 		v->prev_shared = NULL;
 		v->next_shared = NULL;

+		/* 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);
+
 		/* We only need to update this-one, because if there is a third
 		 *  vehicle which shares the same order-list, nothing will change. If
 		 *  this is the last vehicle, the last line of the order-window
@@ -1148,23 +1176,11 @@ void DeleteVehicleOrders(Vehicle *v)

 	/* Remove the orders */
 	cur = v->orders;
+	/* Delete the vehicle list of shared orders, if any */
+	if (cur != NULL) RemoveSharedOrderVehicleList(v);
 	v->orders = NULL;
 	v->num_orders = 0;

-	if (cur != NULL) {
-		/* Delete the vehicle list of shared orders, if any */
-		int window_type = 0;
-
-		switch (v->type) {
-			case VEH_Train:    window_type = WC_TRAINS_LIST;   break;
-			case VEH_Road:     window_type = WC_ROADVEH_LIST;  break;
-			case VEH_Ship:     window_type = WC_SHIPS_LIST;    break;
-			case VEH_Aircraft: window_type = WC_AIRCRAFT_LIST; break;
-			default: NOT_REACHED();
-		}
-		DeleteWindowById(window_type, (cur->index << 16) | (v->type << 11) | VLW_SHARED_ORDERS | v->owner);
-	}
-
 	while (cur != NULL) {
 		next = cur->next;
 		DeleteOrder(cur);
@@ -1,3 +1,39 @@
+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.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Wed, 20 Mar 2007 22:03:46 +0100
+
 openttd (0.5.0-1) unstable; urgency=low

  * New upstream release
@@ -1,6 +1,6 @@
 !define APPNAME "OpenTTD"   ; Define application name
-!define APPVERSION "0.5.0"  ; Define application version
-!define INSTALLERVERSION 28 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPVERSION "0.5.2"  ; Define application version
+!define INSTALLERVERSION 34 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!

 !define APPURLLINK "http://www.openttd.org"
 !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
@@ -76,11 +76,12 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
 Page custom ShowWarningsPage

 !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
-!define MUI_FINISHPAGE_LINK "Visit OpenTTD's homepage"
+!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for latest news, FAQs and downloads"
 !define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
 !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
@@ -114,6 +115,10 @@ Section "!OpenTTD" Section1
 	SetOutPath "$INSTDIR\scenario\"
 	File /nonfatal ${PATH_ROOT}scenario\*.scn

+	; Copy heightmap files (don't choke if they don't exist)
+	SetOutPath "$INSTDIR\scenario\heightmap\"
+	File /nonfatal ${PATH_ROOT}scenario\heightmap\*.*
+
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"

@@ -214,6 +219,8 @@ Section "Uninstall"
 		If you choose Yes, your scenarios will be deleted." \
 		IDYES RemoveScen IDNO NoRemoveScen
 	RemoveScen:
+		Delete "$INSTDIR\scenario\heightmap*"
+		RMDir "$INSTDIR\scenario\heightmap"
 		Delete "$INSTDIR\scenario\*"
 		RMDir "$INSTDIR\scenario"
 	NoRemoveScen:
@@ -348,26 +355,30 @@ NoCD:
 hasCD:
 FunctionEnd

-;---------------------------------------------------------------------
-; Custom page function to show notices for running OpenTTD
+;----------------------------------------------------------------------------------
+; 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)
 ; 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
@@ -1,41 +1,17 @@
 ; Ini file generated by the HM NIS Edit IO designer.
 [Settings]
-NumFields=6
+NumFields=3
+CancelEnabled=0

 [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 5]
+[Field 2]
 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
@@ -43,7 +19,7 @@ Right=284
 Top=9
 Bottom=65

-[Field 6]
+[Field 3]
 Type=Link
 Text=OpenTTD wiki
 Left=238
@@ -114,11 +114,15 @@ 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);
-	if (stat(filename, sb) != 0) return false;
-
-	return (ent->d_name[0] != '.'); // hidden file
+	return stat(filename, sb) == 0;
 }

+bool FiosIsHiddenFile(const struct dirent *ent)
+{
+	return ent->d_name[0] == '.';
+}
+
+
 static void ChangeWorkingDirectory(char *exe)
 {
 	char *s = strrchr(exe, PATHSEPCHAR);
@@ -65,8 +65,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,0,0
- PRODUCTVERSION 0,5,0,0
+ FILEVERSION 0,5,2,0
+ PRODUCTVERSION 0,5,2,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", "Development Version\0"
+            VALUE "FileVersion", "0.5.2\0"
            VALUE "InternalName", "openttd\0"
            VALUE "LegalCopyright", "Copyright © 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.0.0.0\0"
+            VALUE "ProductVersion", "0.5.2.0\0"
            VALUE "SpecialBuild", "-\0"
        END
    END
@@ -871,8 +871,8 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 		}

 		/* This is the joining client who wants a new company */
-		if (_local_player != _network_playas) {
-			assert(_local_player == PLAYER_SPECTATOR && _network_playas == p->index);
+		if (_local_player != _network_playas && _network_playas == p->index) {
+			assert(_local_player == PLAYER_SPECTATOR);
 			SetLocalPlayer(p->index);
 			MarkWholeScreenDirty();
 		}
@@ -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 (existing == 0) {
+		if (_patches.build_on_slopes && 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;
 		}
@@ -272,7 +272,7 @@ int32 CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

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

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

 			if (GetRoadTileType(tile) == ROAD_TILE_NORMAL) {
 				if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
@@ -384,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)) ||
-					!EnsureNoVehicle(tile)) {
+					!EnsureNoVehicleOnGround(tile)) {
 				return CMD_ERROR;
 			}

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

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

@@ -654,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) || !EnsureNoVehicle(tile))
+	if (!ValParamTrackOrientation(track) || !IsTileType(tile, MP_RAILWAY) || !EnsureNoVehicleOnGround(tile))
 		return CMD_ERROR;

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

 	if (!ValParamTrackOrientation(track) ||
 			!IsTileType(tile, MP_RAILWAY) ||
-			!EnsureNoVehicle(tile) ||
+			!EnsureNoVehicleOnGround(tile) ||
 			!HasSignalOnTrack(tile, track)) {
 		return CMD_ERROR;
 	}
@@ -874,15 +874,24 @@ 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 (!EnsureNoVehicle(tile) && (!IsCompatibleRail(GetRailType(tile), totype) || IsPlainRailTile(tile))) return CMD_ERROR;
-
-	// tile is already of requested type?
 	if (GetRailType(tile) == totype) return CMD_ERROR;

+	if (!EnsureNoVehicleOnGround(tile) && (!IsCompatibleRail(GetRailType(tile), totype) || IsPlainRailTile(tile))) 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;

@@ -984,7 +993,7 @@ static int32 RemoveTrainDepot(TileIndex tile, uint32 flags)
 	if (!CheckTileOwnership(tile) && _current_player != OWNER_WATER)
 		return CMD_ERROR;

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

 	if (flags & DC_EXEC) {
@@ -795,16 +795,33 @@ static void StationBuildWndProc(Window *w, WindowEvent *e)
 		case 8:
 		case 9:
 		case 10:
-		case 11:
+		case 11: {
+			const StationSpec *statspec;
 			RaiseWindowWidget(w, _railstation.numtracks + 4);
 			RaiseWindowWidget(w, 19);
+
 			_railstation.numtracks = (e->we.click.widget - 5) + 1;
 			_railstation.dragdrop = false;
+
+			statspec = _railstation.newstations ? GetCustomStationSpec(_railstation.station_class, _railstation.station_type) : NULL;
+			if (statspec != NULL && HASBIT(statspec->disallowed_lengths, _railstation.platlength - 1)) {
+				/* The previously selected number of platforms in invalid */
+				uint i;
+				for (i = 0; i < 7; i++) {
+					if (!HASBIT(statspec->disallowed_lengths, i)) {
+						RaiseWindowWidget(w, _railstation.platlength + 11);
+						_railstation.platlength = i + 1;
+						break;
+					}
+				}
+			}
+
 			LowerWindowWidget(w, _railstation.platlength + 11);
 			LowerWindowWidget(w, _railstation.numtracks + 4);
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
+		}

 		case 12:
 		case 13:
@@ -812,16 +829,33 @@ static void StationBuildWndProc(Window *w, WindowEvent *e)
 		case 15:
 		case 16:
 		case 17:
-		case 18:
+		case 18: {
+			const StationSpec *statspec;
 			RaiseWindowWidget(w, _railstation.platlength + 11);
 			RaiseWindowWidget(w, 19);
+
 			_railstation.platlength = (e->we.click.widget - 12) + 1;
 			_railstation.dragdrop = false;
+
+			statspec = _railstation.newstations ? GetCustomStationSpec(_railstation.station_class, _railstation.station_type) : NULL;
+			if (statspec != NULL && HASBIT(statspec->disallowed_platforms, _railstation.numtracks - 1)) {
+				/* The previously selected number of tracks in invalid */
+				uint i;
+				for (i = 0; i < 7; i++) {
+					if (!HASBIT(statspec->disallowed_platforms, i)) {
+						RaiseWindowWidget(w, _railstation.numtracks + 4);
+						_railstation.numtracks = i + 1;
+						break;
+					}
+				}
+			}
+
 			LowerWindowWidget(w, _railstation.platlength + 11);
 			LowerWindowWidget(w, _railstation.numtracks + 4);
 			SndPlayFx(SND_15_BEEP);
 			SetWindowDirty(w);
 			break;
+		}

 		case 19:
 			_railstation.dragdrop ^= true;
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2007-02-27
-Release version: 0.5.0
+Last updated:    2007-05-29
+Release version: 0.5.2
 ------------------------------------------------------------------------


@@ -71,7 +71,7 @@ static bool CheckAllowRemoveRoad(TileIndex tile, RoadBits remove, bool* edge_roa
 		// you can remove all kind of roads with extra dynamite
 		if (_patches.extra_dynamite) return true;

-		t = ClosestTownFromTile(tile, _patches.dist_local_authority);
+		t = ClosestTownFromTile(tile, (uint)-1);

 		SetDParam(0, t->index);
 		_error_message = STR_2009_LOCAL_AUTHORITY_REFUSES;
@@ -308,7 +308,7 @@ int32 CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 					if ((existing & pieces) == pieces) {
 						return_cmd_error(STR_1007_ALREADY_BUILT);
 					}
-					if (!EnsureNoVehicle(tile)) return CMD_ERROR;
+					if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
 					break;

 				case ROAD_TILE_CROSSING:
@@ -352,7 +352,7 @@ int32 CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 				default: goto do_clear;
 			}

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

 			if (flags & DC_EXEC) {
 				YapfNotifyTrackLayoutChange(tile, FIND_FIRST_BIT(GetTrackBits(tile)));
@@ -422,13 +422,21 @@ do_clear:;
 	return cost;
 }

+/**
+ * Switches the rail type on a level crossing.
+ * @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.
+ */
 int32 DoConvertStreetRail(TileIndex tile, RailType totype, bool exec)
 {
 	// not a railroad crossing?
 	if (!IsLevelCrossing(tile)) return CMD_ERROR;

 	// not owned by me?
-	if (!CheckTileOwnership(tile) || !EnsureNoVehicle(tile)) return CMD_ERROR;
+	if (!CheckTileOwnership(tile) || !EnsureNoVehicleOnGround(tile)) return CMD_ERROR;

 	if (GetRailTypeCrossing(tile) == totype) return CMD_ERROR;

@@ -441,7 +449,7 @@ int32 DoConvertStreetRail(TileIndex tile, RailType totype, bool exec)
 		YapfNotifyTrackLayoutChange(tile, FIND_FIRST_BIT(GetCrossingRailBits(tile)));
 	}

-	return _price.build_rail >> 1;
+	return _price.build_rail / 2;
 }


@@ -573,7 +581,7 @@ int32 CmdBuildRoadDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 	if (p1 > 3) return CMD_ERROR; // check direction

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

 	tileh = GetTileSlope(tile, NULL);
 	if (tileh != SLOPE_FLAT && (
@@ -939,7 +947,7 @@ static void TileLoop_Road(TileIndex tile)
 			if (t->road_build_months != 0 &&
 					(DistanceManhattan(t->xy, tile) < 8 || grp != 0) &&
 					GetRoadTileType(tile) == ROAD_TILE_NORMAL && (GetRoadBits(tile) == ROAD_X || GetRoadBits(tile) == ROAD_Y)) {
-				if (GetTileSlope(tile, NULL) == SLOPE_FLAT && EnsureNoVehicle(tile) && CHANCE16(1, 20)) {
+				if (GetTileSlope(tile, NULL) == SLOPE_FLAT && EnsureNoVehicleOnGround(tile) && CHANCE16(1, 20)) {
 					StartRoadWorks(tile);

 					SndPlayTileFx(SND_21_JACKHAMMER, tile);
@@ -40,6 +40,7 @@
 #include "genworld.h"
 #include "date.h"
 #include "rail.h"
+#include "news.h"
 #ifdef WITH_FREETYPE
 #include "gfx.h"
 #include "fontcache.h"
@@ -259,7 +260,13 @@ static IniFile *ini_load(const char *filename)
 			}
 		} else if (group) {
 			// find end of keyname
-			for (t = s; *t != '\0' && *t != '=' && *t != '\t' && *t != ' '; t++);
+			if (*s == '\"') {
+				s++;
+				for (t = s; *t != '\0' && *t != '\"'; t++);
+				if (*t == '\"') *t = ' ';
+			} else {
+				for (t = s; *t != '\0' && *t != '=' && *t != '\t' && *t != ' '; t++);
+			}

 			// it's an item in an existing group
 			item = ini_item_alloc(group, s, t-s);
@@ -347,11 +354,18 @@ static bool ini_save(const char *filename, IniFile *ini)
 			assert(item->value != NULL);
 			if (item->comment != NULL) fputs(item->comment, f);

+			/* protect item->name with quotes if needed */
+			if (strchr(item->name, ' ') != NULL) {
+				fprintf(f, "\"%s\"", item->name);
+			} else {
+				fprintf(f, "%s", item->name);
+			}
+
 			/* Don't give an equal sign to list items that don't have a parameter */
 			if (group->type == IGT_LIST && *item->value == '\0') {
-				fprintf(f, "%s\n", item->name);
+				fprintf(f, "\n");
 			} else {
-				fprintf(f, "%s = %s\n", item->name, item->value);
+				fprintf(f, " = %s\n", item->value);
 			}
 		}
 	}
@@ -975,7 +989,7 @@ static void ini_save_setting_list(IniFile *ini, const char *grpname, char **list
 #define SDTG_CONDOMANY(name, type, flags, guiflags, var, def, max, full, str, proc, from, to)\
 	SDTG_GENERAL(name, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, max, 0, full, str, proc, from, to)
 #define SDTG_OMANY(name, type, flags, guiflags, var, def, max, full, str, proc)\
-	SDTG_CONDOMANY(name, type, flags, guiflags, var, def, max full, str, proc, 0, SL_MAX_VERSION)
+	SDTG_CONDOMANY(name, type, flags, guiflags, var, def, max, full, str, proc, 0, SL_MAX_VERSION)

 #define SDTG_CONDMMANY(name, type, flags, guiflags, var, def, full, str, proc, from, to)\
 	SDTG_GENERAL(name, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, 0, 0, full, str, proc, from, to)
@@ -1181,7 +1195,6 @@ static const SettingDescGlobVarList _win32_settings[] = {

 static const SettingDescGlobVarList _misc_settings[] = {
 	SDTG_MMANY("display_opt",     SLE_UINT8, S, 0, _display_opt,       (DO_SHOW_TOWN_NAMES|DO_SHOW_STATION_NAMES|DO_SHOW_SIGNS|DO_FULL_ANIMATION|DO_FULL_DETAIL|DO_TRANS_BUILDINGS|DO_WAYPOINTS), "SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|TRANS_BUILDINGS|FULL_DETAIL|WAYPOINTS", STR_NULL, NULL),
-	  SDTG_VAR("news_display_opt", SLE_UINT, S, 0, _news_display_opt,0xAAAAAAAA,0,0xAAAAAAAA,0,STR_NULL, NULL), // default to all full messages: 10101010101010101010 = 0xAAAAAAAA
 	 SDTG_BOOL("news_ticker_sound",          S, 0, _news_ticker_sound,     true,    STR_NULL, NULL),
 	 SDTG_BOOL("fullscreen",                 S, 0, _fullscreen,           false,    STR_NULL, NULL),
 	  SDTG_STR("videodriver",      SLE_STRB,C|S,0, _ini_videodriver,       NULL,    STR_NULL, NULL),
@@ -1205,29 +1218,30 @@ static const SettingDescGlobVarList _misc_settings[] = {

 #ifdef ENABLE_NETWORK
 static const SettingDescGlobVarList _network_settings[] = {
-	 SDTG_VAR("sync_freq",           SLE_UINT16,C|S,0, _network_sync_freq,            100, 0,   100,   0, STR_NULL, NULL),
-	 SDTG_VAR("frame_freq",           SLE_UINT8,C|S,0, _network_frame_freq,             0, 0,   100,   0, STR_NULL, NULL),
-	 SDTG_VAR("max_join_time",       SLE_UINT16, S, 0, _network_max_join_time,        500, 0, 32000,   0, STR_NULL, NULL),
-	SDTG_BOOL("pause_on_join",                   S, 0, _network_pause_on_join,        true,               STR_NULL, NULL),
-	 SDTG_STR("server_bind_ip",        SLE_STRB, S, 0, _network_server_bind_ip_host,  "0.0.0.0",          STR_NULL, NULL),
-	 SDTG_VAR("server_port",         SLE_UINT16, S, 0, _network_server_port,          NETWORK_DEFAULT_PORT, 0, 65535, 0, STR_NULL, NULL),
-	SDTG_BOOL("server_advertise",                S, 0, _network_advertise,            false,              STR_NULL, NULL),
-	 SDTG_VAR("lan_internet",         SLE_UINT8, S, 0, _network_lan_internet,           0, 0,     1,   0, STR_NULL, NULL),
-	 SDTG_STR("player_name",           SLE_STRB, S, 0, _network_player_name,          NULL,               STR_NULL, NULL),
-	 SDTG_STR("server_password",       SLE_STRB, S, 0, _network_server_password,      NULL,               STR_NULL, NULL),
-	 SDTG_STR("rcon_password",         SLE_STRB, S, 0, _network_rcon_password,        NULL,               STR_NULL, NULL),
-	 SDTG_STR("server_name",           SLE_STRB, S, 0, _network_server_name,          NULL,               STR_NULL, NULL),
-	 SDTG_STR("connect_to_ip",         SLE_STRB, S, 0, _network_default_ip,           NULL,               STR_NULL, NULL),
-	 SDTG_STR("network_id",            SLE_STRB, S, 0, _network_unique_id,            NULL,               STR_NULL, NULL),
-	SDTG_BOOL("autoclean_companies",             S, 0, _network_autoclean_companies,  false,              STR_NULL, NULL),
-	 SDTG_VAR("autoclean_unprotected",SLE_UINT8, S, 0, _network_autoclean_unprotected,12, 0,     60,   0, STR_NULL, NULL),
-	 SDTG_VAR("autoclean_protected",  SLE_UINT8, S, 0, _network_autoclean_protected,  36, 0,    180,   0, STR_NULL, NULL),
-	 SDTG_VAR("max_companies",        SLE_UINT8, S, 0, _network_game_info.companies_max,   8, 0,  8,   0, STR_NULL, NULL),
-	 SDTG_VAR("max_clients",          SLE_UINT8, S, 0, _network_game_info.clients_max,    10, 0, 10,   0, STR_NULL, NULL),
-	 SDTG_VAR("max_spectators",       SLE_UINT8, S, 0, _network_game_info.spectators_max, 10, 0, 10,   0, STR_NULL, NULL),
-	 SDTG_VAR("restart_game_year",    SLE_INT32, S,D0, _network_restart_game_year,    0, MIN_YEAR, MAX_YEAR, 1, STR_NULL, NULL),
-	 SDTG_VAR("min_players",          SLE_UINT8, S, 0, _network_min_players,               0, 0, 10,   0, STR_NULL, NULL),
-	 SDTG_END()
+	  SDTG_VAR("sync_freq",           SLE_UINT16,C|S,0, _network_sync_freq,            100, 0,   100,   0, STR_NULL, NULL),
+	  SDTG_VAR("frame_freq",           SLE_UINT8,C|S,0, _network_frame_freq,             0, 0,   100,   0, STR_NULL, NULL),
+	  SDTG_VAR("max_join_time",       SLE_UINT16, S, 0, _network_max_join_time,        500, 0, 32000,   0, STR_NULL, NULL),
+	 SDTG_BOOL("pause_on_join",                   S, 0, _network_pause_on_join,        true,               STR_NULL, NULL),
+	  SDTG_STR("server_bind_ip",        SLE_STRB, S, 0, _network_server_bind_ip_host,  "0.0.0.0",          STR_NULL, NULL),
+	  SDTG_VAR("server_port",         SLE_UINT16, S, 0, _network_server_port,          NETWORK_DEFAULT_PORT, 0, 65535, 0, STR_NULL, NULL),
+	 SDTG_BOOL("server_advertise",                S, 0, _network_advertise,            false,              STR_NULL, NULL),
+	  SDTG_VAR("lan_internet",         SLE_UINT8, S, 0, _network_lan_internet,           0, 0,     1,   0, STR_NULL, NULL),
+	  SDTG_STR("player_name",           SLE_STRB, S, 0, _network_player_name,          NULL,               STR_NULL, NULL),
+	  SDTG_STR("server_password",       SLE_STRB, S, 0, _network_server_password,      NULL,               STR_NULL, NULL),
+	  SDTG_STR("rcon_password",         SLE_STRB, S, 0, _network_rcon_password,        NULL,               STR_NULL, NULL),
+	  SDTG_STR("server_name",           SLE_STRB, S, 0, _network_server_name,          NULL,               STR_NULL, NULL),
+	  SDTG_STR("connect_to_ip",         SLE_STRB, S, 0, _network_default_ip,           NULL,               STR_NULL, NULL),
+	  SDTG_STR("network_id",            SLE_STRB, S, 0, _network_unique_id,            NULL,               STR_NULL, NULL),
+	 SDTG_BOOL("autoclean_companies",             S, 0, _network_autoclean_companies,  false,              STR_NULL, NULL),
+	  SDTG_VAR("autoclean_unprotected",SLE_UINT8, S, 0, _network_autoclean_unprotected,12, 0,     60,   0, STR_NULL, NULL),
+	  SDTG_VAR("autoclean_protected",  SLE_UINT8, S, 0, _network_autoclean_protected,  36, 0,    180,   0, STR_NULL, NULL),
+	  SDTG_VAR("max_companies",        SLE_UINT8, S, 0, _network_game_info.companies_max,   8, 0,  8,   0, STR_NULL, NULL),
+	  SDTG_VAR("max_clients",          SLE_UINT8, S, 0, _network_game_info.clients_max,    10, 0, 10,   0, STR_NULL, NULL),
+	  SDTG_VAR("max_spectators",       SLE_UINT8, S, 0, _network_game_info.spectators_max, 10, 0, 10,   0, STR_NULL, NULL),
+	  SDTG_VAR("restart_game_year",    SLE_INT32, S,D0, _network_restart_game_year,    0, MIN_YEAR, MAX_YEAR, 1, STR_NULL, NULL),
+	  SDTG_VAR("min_players",          SLE_UINT8, S, 0, _network_min_players,               0, 0, 10,   0, STR_NULL, NULL),
+	SDTG_OMANY("server_lang",          SLE_UINT8, S, 0, _network_game_info.server_lang,     0, 3, "ANY|ENGLISH|GERMAN|FRENCH", STR_NULL, NULL),
+	  SDTG_END()
 };
 #endif /* ENABLE_NETWORK */

@@ -1241,12 +1255,12 @@ static const SettingDesc _gameopt_settings[] = {
 	 * and why not byte for example? */
 	SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, (SLE_FILE_I16 | SLE_VAR_I32), 0, 0, GameOptions, diff, 17, 0, 0, 0, 0, NULL, STR_NULL, NULL, 0, 3),
 	SDT_GENERAL("diff_custom", SDT_INTLIST, SL_ARR, (SLE_FILE_I16 | SLE_VAR_I32), 0, 0, GameOptions, diff, 18, 0, 0, 0, 0, NULL, STR_NULL, NULL, 4, SL_MAX_VERSION),
-	    SDT_VAR(GameOptions, diff_level,SLE_UINT8, 0, 0, 9, 0,  9, 0, STR_NULL, NULL),
+	    SDT_VAR(GameOptions, diff_level,SLE_UINT8, 0, 0, 0, 0,  3, 0, STR_NULL, NULL),
 	  SDT_OMANY(GameOptions, currency,  SLE_UINT8, N, 0, 0, CUSTOM_CURRENCY_ID, "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SIT|SEK|YTL|SKK|BRR|custom", STR_NULL, NULL),
 	  SDT_OMANY(GameOptions, units,     SLE_UINT8, N, 0, 1,     2, "imperial|metric|si", STR_NULL, NULL),
 	  SDT_OMANY(GameOptions, town_name, SLE_UINT8, 0, 0, 0,    20, "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish|italian|catalan", STR_NULL, NULL),
 	  SDT_OMANY(GameOptions, landscape, SLE_UINT8, 0, 0, 0,     3, "normal|hilly|desert|candy", STR_NULL, NULL),
-	    SDT_VAR(GameOptions, snow_line, SLE_UINT8, 0, 0, 1, 0, 56, 0, STR_NULL, NULL),
+	    SDT_VAR(GameOptions, snow_line, SLE_UINT8, 0, 0, 7 * TILE_HEIGHT, 2 * TILE_HEIGHT, 13 * TILE_HEIGHT, 0, STR_NULL, NULL),
 	SDT_CONDOMANY(GameOptions,autosave, SLE_UINT8, 0, 22,             N, 0, 0, 0, "", STR_NULL, NULL),
 	SDT_CONDOMANY(GameOptions,autosave, SLE_UINT8,23, SL_MAX_VERSION, S, 0, 1, 4, "off|monthly|quarterly|half year|yearly", STR_NULL, NULL),
 	  SDT_OMANY(GameOptions, road_side, SLE_UINT8, 0, 0, 1,   1, "left|right", STR_NULL, NULL),
@@ -1350,7 +1364,7 @@ const SettingDesc _patch_settings[] = {
 	 SDT_VAR(Patches, starting_year,    SLE_INT32, 0,NC,  1950, MIN_YEAR, MAX_YEAR, 1, STR_CONFIG_PATCHES_STARTING_YEAR,NULL),
 	 SDT_VAR(Patches, ending_year,      SLE_INT32,0,NC|NO,2051, MIN_YEAR, MAX_YEAR, 1, STR_CONFIG_PATCHES_ENDING_YEAR,  NULL),
 	SDT_BOOL(Patches, smooth_economy,             0, 0,  true,            STR_CONFIG_PATCHES_SMOOTH_ECONOMY,   NULL),
-	SDT_BOOL(Patches, allow_shares,               0, 0,  true,            STR_CONFIG_PATCHES_ALLOW_SHARES,     NULL),
+	SDT_BOOL(Patches, allow_shares,               0, 0, false,            STR_CONFIG_PATCHES_ALLOW_SHARES,     NULL),

 	/***************************************************************************/
 	/* AI section of the GUI-configure patches window */
@@ -1465,7 +1479,7 @@ const SettingDesc _patch_settings[] = {
 	/***************************************************************************/
 	/* Terrain genation related patch options */
 	SDT_CONDVAR(Patches,      land_generator,           SLE_UINT8,  30, SL_MAX_VERSION, 0, MS,   1,                   0,    1,               0, STR_CONFIG_PATCHES_LAND_GENERATOR,           NULL),
-	SDT_CONDVAR(Patches,      oil_refinery_limit,       SLE_UINT8,  30, SL_MAX_VERSION, 0, 0,   16,                  12,   48,               0, STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE,    NULL),
+	SDT_CONDVAR(Patches,      oil_refinery_limit,       SLE_UINT8,  30, SL_MAX_VERSION, 0, 0,   32,                  12,   48,               0, STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE,    NULL),
 	SDT_CONDVAR(Patches,      tgen_smoothness,          SLE_UINT8,  30, SL_MAX_VERSION, 0, MS,   1,                   0,    3,               0, STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN,     NULL),
 	SDT_CONDVAR(Patches,      generation_seed,          SLE_UINT32, 30, SL_MAX_VERSION, 0, 0,    GENERATE_NEW_SEED,   0, MAX_UVALUE(uint32), 0, STR_NULL,                                    NULL),
 	SDT_CONDVAR(Patches,      tree_placer,              SLE_UINT8,  30, SL_MAX_VERSION, 0, MS,   2,                   0,    2,               0, STR_CONFIG_PATCHES_TREE_PLACER,              NULL),
@@ -1478,7 +1492,7 @@ const SettingDesc _patch_settings[] = {
 static const SettingDesc _currency_settings[] = {
 	SDT_VAR(CurrencySpec, rate,    SLE_UINT16, S, 0,  1, 0, 100, 0, STR_NULL, NULL),
 	SDT_CHR(CurrencySpec, separator,           S, 0,        ".",    STR_NULL, NULL),
-	SDT_VAR(CurrencySpec, to_euro,  SLE_INT32, S, 0,  0, 0,1000, 0, STR_NULL, NULL),
+	SDT_VAR(CurrencySpec, to_euro,  SLE_INT32, S, 0,  0, 0,3000, 0, STR_NULL, NULL),
 	SDT_STR(CurrencySpec, prefix,   SLE_STRBQ, S, 0,       NULL,    STR_NULL, NULL),
 	SDT_STR(CurrencySpec, suffix,   SLE_STRBQ, S, 0, " credits",    STR_NULL, NULL),
 	SDT_END()
@@ -1495,6 +1509,44 @@ static const SettingDesc _currency_settings[] = {
 #undef NO
 #undef CR

+static uint NewsDisplayLoadConfig(IniFile *ini, const char *grpname)
+{
+	IniGroup *group = ini_getgroup(ini, grpname, -1);
+	IniItem *item;
+	/* By default, set everything to full (0xAAAAAAAA = 1010101010101010) */
+	uint res = 0xAAAAAAAA;
+
+	/* If no group exists, return everything FULL */
+	if (group == NULL) return res;
+
+	for (item = group->item; item != NULL; item = item->next) {
+		int news_item = -1;
+		int i;
+		for (i = 0; i < NT_END; i++) {
+			if (strcasecmp(item->name, _news_display_name[i]) == 0) {
+				news_item = i;
+				break;
+			}
+		}
+		if (news_item == -1) {
+			DEBUG(misc, 0)("Invalid display option: %s", item->name);
+			continue;
+		}
+
+		if (strcasecmp(item->value, "full") == 0) {
+			SB(res, news_item * 2, 2, 2);
+		} else if (strcasecmp(item->value, "off") == 0) {
+			SB(res, news_item * 2, 2, 0);
+		} else if (strcasecmp(item->value, "summarized") == 0) {
+			SB(res, news_item * 2, 2, 1);
+		} else {
+			DEBUG(misc, 0)("Invalid display value: %s", item->value);
+			continue;
+		}
+	}
+
+	return res;
+}

 /* Load a GRF configuration from the given group name */
 static GRFConfig *GRFLoadConfig(IniFile *ini, const char *grpname, bool is_static)
@@ -1549,6 +1601,27 @@ static GRFConfig *GRFLoadConfig(IniFile *ini, const char *grpname, bool is_stati
 	return first;
 }

+static void NewsDisplaySaveConfig(IniFile *ini, const char *grpname, uint news_display)
+{
+	IniGroup *group = ini_getgroup(ini, grpname, -1);
+	IniItem **item;
+	int i;
+
+	if (group == NULL) return;
+	group->item = NULL;
+	item = &group->item;
+
+	for (i = 0; i < NT_END; i++) {
+		const char *value;
+		int v = GB(news_display, i * 2, 2);
+
+		value = (v == 0 ? "off" : (v == 1 ? "summarized" : "full"));
+
+		*item = ini_item_alloc(group, _news_display_name[i], strlen(_news_display_name[i]));
+		(*item)->value = (char*)pool_strdup(&ini->pool, value, strlen(value));
+		item = &(*item)->next;
+	}
+}

 /* Save a GRF configuration to the given group name */
 static void GRFSaveConfig(IniFile *ini, const char *grpname, const GRFConfig *list)
@@ -1591,13 +1664,18 @@ static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc, SettingDescP
 #endif /* ENABLE_NETWORK */
 }

+extern void CheckDifficultyLevels(void);
+
 /** Load the values from the configuration files */
 void LoadFromConfig(void)
 {
 	IniFile *ini = ini_load(_config_file);
+	ResetCurrencies(false);
 	HandleSettingDescs(ini, ini_load_settings, ini_load_setting_list);
 	_grfconfig_newgame = GRFLoadConfig(ini, "newgrf", false);
 	_grfconfig_static  = GRFLoadConfig(ini, "newgrf-static", true);
+	_news_display_opt  = NewsDisplayLoadConfig(ini, "news_display");
+	CheckDifficultyLevels();
 	ini_free(ini);
 }

@@ -1608,6 +1686,7 @@ void SaveToConfig(void)
 	HandleSettingDescs(ini, ini_save_settings, ini_save_setting_list);
 	GRFSaveConfig(ini, "newgrf", _grfconfig_newgame);
 	GRFSaveConfig(ini, "newgrf-static", _grfconfig_static);
+	NewsDisplaySaveConfig(ini, "news_display", _news_display_opt);
 	ini_save(_config_file, ini);
 	ini_free(ini);
 }
@@ -1735,6 +1814,26 @@ void IConsoleGetPatchSetting(const char *name)
 		name, value, (sd->desc.flags & SGF_0ISDISABLED) ? "(0) " : "", sd->desc.min, sd->desc.max);
 }

+void IConsoleListPatches(void)
+{
+	const SettingDesc *sd;
+	IConsolePrintF(_icolour_warn, "All patches with their current value:");
+
+	for (sd = _patch_settings; sd->save.cmd != SL_END; sd++) {
+		char value[80];
+		const void *ptr = GetVariableAddress((_game_mode == GM_MENU) ? &_patches_newgame : &_patches, &sd->save);
+
+		if (sd->desc.cmd == SDT_BOOLX) {
+			snprintf(value, lengthof(value), (*(bool*)ptr == 1) ? "on" : "off");
+		} else {
+			snprintf(value, lengthof(value), "%d", (uint32)ReadValue(ptr, sd->save.conv));
+		}
+		IConsolePrintF(_icolour_def, "%s = %s", sd->desc.name, value);
+	}
+
+	IConsolePrintF(_icolour_warn, "Use 'patch' command to change a value");
+}
+
 /** Save and load handler for patches/settings
 * @param osd SettingDesc struct containing all information
 * @param object can be either NULL in which case we load global variables or
@@ -1817,16 +1916,6 @@ static void Save_PATS(void)

 void CheckConfig(void)
 {
-	// fix up news_display_opt from old to new
-	int i;
-	uint32 tmp;
-	for (i = 0, tmp = _news_display_opt; i != 10; i++, tmp >>= 2) {
-		if ((tmp & 0x3) == 0x3) { // old settings
-			_news_display_opt = 0xAAAAAAAA; // set all news-messages to full 1010101010...
-			break;
-		}
-	}
-
 	// Increase old default values for pf_maxdepth and pf_maxlength
 	// to support big networks.
 	if (_patches_newgame.pf_maxdepth == 16 && _patches_newgame.pf_maxlength == 512) {
@@ -71,6 +71,7 @@ extern Patches _patches_newgame;

 bool IConsoleSetPatchSetting(const char *name, int32 value);
 void IConsoleGetPatchSetting(const char *name);
+void IConsoleListPatches(void);
 const SettingDesc *GetPatchFromName(const char *name, uint *i);
 bool SetPatchValue(uint index, const Patches *object, int32 value);

@@ -200,6 +200,7 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e)
 			break;
 		case 24: /* Change interface language */
 			ReadLanguagePack(e->we.dropdown.index);
+			UpdateAllStationVirtCoord();
 			MarkWholeScreenDirty();
 			break;
 		case 27: /* Change resolution */
@@ -368,6 +369,24 @@ void SetDifficultyLevel(int mode, GameOptions *gm_opt)
 	}
 }

+/**
+ * Checks the difficulty levels read from the configuration and
+ * forces them to be correct when invalid.
+ */
+void CheckDifficultyLevels(void)
+{
+	if (_opt_newgame.diff_level != 3) {
+		SetDifficultyLevel(_opt_newgame.diff_level, &_opt_newgame);
+	} else {
+		uint i;
+		for (i = 0; i < GAME_DIFFICULTY_NUM; i++) {
+			int *diff = ((int*)&_opt_newgame.diff) + i;
+			*diff = clamp(*diff, _game_setting_info[i].min, _game_setting_info[i].max);
+			*diff -= *diff % _game_setting_info[i].step;
+		}
+	}
+}
+
 extern void StartupEconomy(void);

 enum {
@@ -391,6 +410,7 @@ static void GameDifficultyWndProc(Window *w, WindowEvent *e)
 		SetWindowWidgetDisabledState(w,  6, _game_mode == GM_NORMAL);
 		SetWindowWidgetDisabledState(w,  7, _game_mode == GM_EDITOR || _networking); // highscore chart in multiplayer
 		SetWindowWidgetDisabledState(w, 10, _networking && !_network_server); // Save-button in multiplayer (and if client)
+		LowerWindowWidget(w, _opt_mod_temp.diff_level + 3);

 		break;
 	case WE_PAINT: {
@@ -478,7 +498,9 @@ static void GameDifficultyWndProc(Window *w, WindowEvent *e)

 			// save value in temporary variable
 			((int*)&_opt_mod_temp.diff)[btn] = val;
+			RaiseWindowWidget(w, _opt_mod_temp.diff_level + 3);
 			SetDifficultyLevel(3, &_opt_mod_temp); // set difficulty level to custom
+			LowerWindowWidget(w, _opt_mod_temp.diff_level + 3);
 			SetWindowDirty(w);
 		}	break;
 		case 3: case 4: case 5: case 6: /* Easy / Medium / Hard / Custom */
@@ -823,8 +845,8 @@ static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
 						if (value < sdb->min) value = (sdb->flags & SGF_0ISDISABLED) ? 0 : sdb->min;
 					}

-					/* Set up scroller timeout */
-					if (value != oldvalue) {
+					/* Set up scroller timeout for numeric values */
+					if (value != oldvalue && !(sd->desc.flags & SGF_MULTISTRING)) {
 						WP(w,def_d).data_2 = btn * 2 + 1 + ((x >= 10) ? 1 : 0);
 						w->flags4 |= 5 << WF_TIMEOUT_SHL;
 						_left_button_clicked = false;
@@ -27,6 +27,7 @@ typedef enum RoadStopType {

 enum {
 	INVALID_STATION = 0xFFFF,
+	INITIAL_STATION_RATING = 175,
 	ROAD_STOP_LIMIT = 16,
 };

@@ -467,7 +467,7 @@ static void StationInitialize(Station *st, TileIndex tile)
 		ge->waiting_acceptance = 0;
 		ge->days_since_pickup = 0;
 		ge->enroute_from = INVALID_STATION;
-		ge->rating = 175;
+		ge->rating = INITIAL_STATION_RATING;
 		ge->last_speed = 0;
 		ge->last_age = 0xFF;
 		ge->feeder_profit = 0;
@@ -1096,7 +1096,7 @@ int32 CmdBuildRailroadStation(TileIndex tile_org, uint32 flags, uint32 p1, uint3
 			int w = plat_len;
 			do {
 				byte layout = *layout_ptr++;
-				MakeRailStation(tile, st->owner, st->index, axis, layout, GB(p2, 0, 4));
+				MakeRailStation(tile, st->owner, st->index, axis, layout & ~1, GB(p2, 0, 4));
 				SetCustomStationSpecIndex(tile, specindex);
 				SetStationTileRandomBits(tile, GB(Random(), 0, 4));

@@ -1104,7 +1104,7 @@ int32 CmdBuildRailroadStation(TileIndex tile_org, uint32 flags, uint32 p1, uint3
 					/* Use a fixed axis for GetPlatformInfo as our platforms / numtracks are always the right way around */
 					uint32 platinfo = GetPlatformInfo(AXIS_X, 0, plat_len, numtracks_orig, plat_len - w, numtracks_orig - numtracks, false);
 					uint16 callback = GetStationCallback(CBID_STATION_TILE_LAYOUT, platinfo, 0, statspec, st, tile);
-					if (callback != CALLBACK_FAILED && callback < 8) SetStationGfx(tile, callback + axis);
+					if (callback != CALLBACK_FAILED && callback < 8) SetStationGfx(tile, (callback & ~1) + axis);
 				}

 				tile += tile_delta;
@@ -1337,6 +1337,14 @@ static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
 	return cost;
 }

+/**
+ * Switches the rail type at a railway station tile.
+ * @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.
+ */
 int32 DoConvertStationRail(TileIndex tile, RailType totype, bool exec)
 {
 	const Station* st = GetStationByTile(tile);
@@ -1357,7 +1365,7 @@ int32 DoConvertStationRail(TileIndex tile, RailType totype, bool exec)
 		YapfNotifyTrackLayoutChange(tile, GetRailStationTrack(tile));
 	}

-	return _price.build_rail >> 1;
+	return _price.build_rail / 2;
 }

 /** Heavy wizardry used to add a roadstop to a station.
@@ -1589,7 +1597,7 @@ static const byte _airport_sections_international[] = {
 // Intercontinental Airport (vlarge) - 4 runways
 static const byte _airport_sections_intercontinental[] = {
 	102, 120,  89,  89,  89,  89,  89,  89, 118,
-	120,  22,  22,  22,  22,  22,  22, 119, 117,
+	120,  23,  23,  23,  23,  23,  23, 119, 117,
 	 87,  54,  87,   8,   8,   8,   8,  51, 117,
 	 87, 162,  87,  85, 116, 116,   8,   9,  10,
 	 87,   8,   8,  11,  31,  11,   8, 160,  32,
@@ -1598,7 +1606,7 @@ static const byte _airport_sections_intercontinental[] = {
 	 87, 142,   8,  11,  29,  11,  10, 163,  10,
 	 87, 164,  87,   8,   8,   8,  10,  37, 117,
 	 87, 120,  89,  89,  89,  89,  89,  89, 119,
-	121,  22,  22,  22,  22,  22,  22, 119,  37
+	121,  23,  23,  23,  23,  23,  23, 119,  37
 };


@@ -2473,6 +2481,12 @@ static void UpdateStationRating(Station *st)

 	ge = st->goods;
 	do {
+		/* Slowly increase the rating back to his original level in the case we
+		 *  didn't deliver cargo yet to this station. This happens when a bribe
+		 *  failed while you didn't moved that cargo yet to a station. */
+		if (ge->enroute_from == INVALID_STATION && ge->rating < INITIAL_STATION_RATING)
+			ge->rating++;
+		/* Only change the rating if we are moving this cargo */
 		if (ge->enroute_from != INVALID_STATION) {
 			byte_inc_sat(&ge->enroute_time);
 			byte_inc_sat(&ge->days_since_pickup);
@@ -2832,7 +2846,7 @@ void BuildOilRig(TileIndex tile)
 		st->goods[j].waiting_acceptance = 0;
 		st->goods[j].days_since_pickup = 0;
 		st->goods[j].enroute_from = INVALID_STATION;
-		st->goods[j].rating = 175;
+		st->goods[j].rating = INITIAL_STATION_RATING;
 		st->goods[j].last_speed = 0;
 		st->goods[j].last_age = 255;
 	}
@@ -3058,11 +3072,6 @@ static void SaveLoad_STNS(Station *st)
 	SlObject(st, _station_desc);
 	for (i = 0; i != NUM_CARGO; i++) {
 		SlObject(&st->goods[i], _goods_desc);
-
-		/* In older versions, enroute_from had 0xFF as INVALID_STATION, is now 0xFFFF */
-		if (CheckSavegameVersion(7) && st->goods[i].enroute_from == 0xFF) {
-			st->goods[i].enroute_from = INVALID_STATION;
-		}
 	}

 	if (st->num_specs != 0) {
@@ -134,6 +134,14 @@ static int CDECL StationWaitingSorter(const void *a, const void *b)
 	return (_internal_sort_order & 1) ? sum2 - sum1 : sum1 - sum2;
 }

+/**
+ * qsort-compatible version of sorting two stations by maximum rating
+ * @param a   First object to be sorted, must be of type (const Station *)
+ * @param b   Second object to be sorted, must be of type (const Station *)
+ * @return    The sort order
+ * @retval >0 a should come before b in the list
+ * @retval <0 b should come before a in the list
+ */
 static int CDECL StationRatingMaxSorter(const void *a, const void *b)
 {
 	const Station* st1 = *(const Station**)a;
@@ -143,8 +151,8 @@ static int CDECL StationRatingMaxSorter(const void *a, const void *b)
 	int j;

 	for (j = 0; j < NUM_CARGO; j++) {
-		if (st1->goods[j].waiting_acceptance & 0xfff) maxr1 = max(maxr1, st1->goods[j].rating);
-		if (st2->goods[j].waiting_acceptance & 0xfff) maxr2 = max(maxr2, st2->goods[j].rating);
+		if (st1->goods[j].enroute_from != INVALID_STATION) maxr1 = max(maxr1, st1->goods[j].rating);
+		if (st2->goods[j].enroute_from != INVALID_STATION) maxr2 = max(maxr2, st2->goods[j].rating);
 	}

 	return (_internal_sort_order & 1) ? maxr2 - maxr1 : maxr1 - maxr2;
@@ -99,6 +99,15 @@
 // Stuff for MSVC
 #if defined(_MSC_VER)
 # pragma once
+/* Define a win32 target platform, to override defaults of the SDK
+ * We need to define NTDDI version for Vista SDK, but win2k is minimum */
+# define NTDDI_VERSION NTDDI_WIN2K // Windows 2000
+# define _WIN32_WINNT 0x0500       // Windows 2000
+
+# define _WIN32_WINDOWS 0x400      // Windows 95
+# define WINVER 0x0400             // Windows NT 4.0 / Windows 95
+# define _WIN32_IE_ 0x0401         // 4.01 (win98 and NT4SP5+)
+
 # define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
 # pragma warning(disable: 4244)  // 'conversion' conversion from 'type1' to 'type2', possible loss of data
 # pragma warning(disable: 4761)  // integral size mismatch in argument : conversion supplied
@@ -158,9 +167,10 @@
 * call to the same function and is not thread- or reentrancy-safe */
 #if !defined(STRGEN)
 # if defined(WIN32) || defined(WIN64)
-#  define fopen(file, mode) _wfopen(OTTD2FS(file), L ## mode)
-   const char *FS2OTTD(const wchar_t *name);
-   const wchar_t *OTTD2FS(const char *name);
+#  include <tchar.h>
+#  define fopen(file, mode) _tfopen(OTTD2FS(file), _T(mode))
+   const char *FS2OTTD(const TCHAR *name);
+   const TCHAR *OTTD2FS(const char *name);
 # else
 #  define fopen(file, mode) fopen(OTTD2FS(file), mode)
   const char *FS2OTTD(const char *name);
@@ -269,3 +269,30 @@ size_t Utf8Encode(char *buf, WChar c)
 	*buf = '?';
 	return 1;
 }
+
+/**
+ * Properly terminate an UTF8 string to some maximum length
+ * @param s string to check if it needs additional trimming
+ * @param maxlen the maximum length the buffer can have.
+ * @return the new length in bytes of the string (eg. strlen(new_string))
+ * @NOTE maxlen is the string length _INCLUDING_ the terminating '\0'
+ */
+size_t Utf8TrimString(char *s, size_t maxlen)
+{
+	size_t length = 0;
+	const char *ptr = strchr(s, '\0');
+	while (*s != '\0') {
+		size_t len = Utf8EncodedCharLen(*s);
+		/* Silently ignore invalid UTF8 sequences, our only concern trimming */
+		if (len == 0) len = 1;
+
+		/* Take care when a hard cutoff was made for the string and
+		 * the last UTF8 sequence is invalid */
+		if (length + len >= maxlen || (s + len > ptr)) break;
+		s += len;
+		length += len;
+	}
+
+	*s = '\0';
+	return length;
+}
@@ -71,6 +71,7 @@ bool IsValidChar(WChar key, CharSetFilter afilter);

 size_t Utf8Decode(WChar *c, const char *s);
 size_t Utf8Encode(char *buf, WChar c);
+size_t Utf8TrimString(char *s, size_t maxlen);


 static inline WChar Utf8Consume(const char **s)
@@ -97,12 +98,43 @@ static inline size_t Utf8CharLen(WChar c)
 }


+/**
+ * Return the length of an UTF-8 encoded value based on a single char. This
+ * char should be the first byte of the UTF-8 encoding. If not, or encoding
+ * is invalid, return value is 0
+ */
+static inline size_t Utf8EncodedCharLen(char c)
+{
+	if (GB(c, 3, 5) == 0x1E) return 4;
+	if (GB(c, 4, 4) == 0x0E) return 3;
+	if (GB(c, 5, 3) == 0x06) return 2;
+	if (GB(c, 7, 1) == 0x00) return 1;
+
+	/* Invalid UTF8 start encoding */
+	return 0;
+}
+
+
 /* Check if the given character is part of a UTF8 sequence */
 static inline bool IsUtf8Part(char c)
 {
 	return GB(c, 6, 2) == 2;
 }

+/**
+ * Retrieve the previous UNICODE character in an UTF-8 encoded string.
+ * @param s char pointer pointing to (the first char of) the next character
+ * @returns a pointer in 's' to the previous UNICODE character's first byte
+ * @note The function should not be used to determine the length of the previous
+ * encoded char because it might be an invalid/corrupt start-sequence
+ */
+static inline char *Utf8PrevChar(const char *s)
+{
+	const char *ret = s;
+	while (IsUtf8Part(*--ret));
+	return (char*)ret;
+}
+

 static inline bool IsPrintable(WChar c)
 {
@@ -112,5 +144,20 @@ static inline bool IsPrintable(WChar c)
 	return true;
 }

+/**
+ * Check whether UNICODE character is whitespace or not
+ * @param c UNICODE character to check
+ * @return a boolean value whether 'c' is a whitespace character or not
+ * @see http://www.fileformat.info/info/unicode/category/Zs/list.htm
+ */
+static inline bool IsWhitespace(WChar c)
+{
+	return
+	  c == 0x0020 /* SPACE */ ||
+	  c == 0x00A0 /* NO-BREAK SPACE */ ||
+	  c == 0x3000 /* IDEOGRAPHIC SPACE */
+	;
+}
+

 #endif /* STRING_H */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rubidium	9df8a3bd4c	(svn r9978) -Release 0.5.2.	2007-05-29 18:13:06 +00:00
rubidium	4f757bb914	(svn r9977) [0.5] -Prepare 0.5 branch for release of 0.5.2.	2007-05-29 18:02:14 +00:00
rubidium	aafb49b3c4	(svn r9968) [0.5] -Backport from trunk (r9966): - 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.	2007-05-28 22:11:42 +00:00
glx	4bbc264c72	(svn r9864) [0.5] -Codechange (win32): Remove references to MSLU and hide UNICODE notice for win9x users in installer	2007-05-17 19:47:04 +00:00
rubidium	f042798507	(svn r9863) [0.5] -Backport from trunk (r9759, r9861): - Feature: Add threading support for MorphOS (r9759) - Fix: Null pointer dereference under MorphOS and AmigaOS (r9861)	2007-05-17 15:04:28 +00:00
rubidium	909edb84af	(svn r9859) [0.5] -Prepare 0.5 branch for release of 0.5.2-RC1.	2007-05-16 21:41:34 +00:00
rubidium	906a606418	(svn r9858) [0.5] -Backport from trunk (r9771, r9856): - Feature: Add password protected status to 'players' (network server) console command (r9771) - Fix: Loading some TTDP savegames caused an instant assertion on loading (r9857)	2007-05-16 21:33:07 +00:00
rubidium	2c6a0e46a9	(svn r9856) [0.5] -Backport from trunk (r9855): - Fix: Do not perform any commands on MP_VOID tiles [FS#779] (r9855)	2007-05-16 08:21:16 +00:00
rubidium	236237740a	(svn r9854) [0.5] -Backport from trunk (r9715, r9724, r9774, r9796, r9811, r9847): language updates.	2007-05-15 23:32:50 +00:00
rubidium	3a195edcad	(svn r9853) [0.5] -Backport from trunk (r9837, r9827, r9785, r9775, r9758, r9716): - Feature: Add server_lang in [network] section of openttd.cfg (r9716) - 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)	2007-05-15 22:02:32 +00:00
glx	c50cf74889	(svn r9852) [0.5] -Backport from trunk (r9728, r9834): - Fix: [win32] Dead key and open/close console. (r9728) - Add: win9x check in win32 builds	2007-05-15 22:00:41 +00:00
rubidium	4b6d1f9027	(svn r9851) [0.5] -Backport from trunk (r9731, r9741, r9743, r9753, r9757): - 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)	2007-05-15 21:42:27 +00:00
rubidium	c9c087e858	(svn r9849) [0.5] -Backport from trunk (r9693, r9694, r9697, r9718, r9719, r9725 and 9726): - 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)	2007-05-15 21:24:18 +00:00
rubidium	ac66e29910	(svn r9698) [0.5] -Prepare 0.5 branch for release of 0.5.1.	2007-04-20 19:45:38 +00:00
rubidium	b7749bde91	(svn r9695) [0.5] -Backport from trunk (r9668, r9680, r9681, r9687): language updates.	2007-04-20 19:40:07 +00:00
rubidium	635eff5e51	(svn r9660) [0.5] -Prepare 0.5 branch for release of 0.5.1-RC3.	2007-04-17 20:11:11 +00:00
truelight	4cd6870777	(svn r9659) [0.5] -Fix r9656: missed 2 hunks in last commit	2007-04-17 19:08:08 +00:00
truelight	54cfb12334	(svn r9657) [0.5] -Backport from trunk (r9585, r9613, r9615, r9633, r9640, r9649): - Language updates (r9585, r9613, r9615, r9633, r9640, r9649)	2007-04-17 19:05:47 +00:00
rubidium	2d746c52c8	(svn r9656) [0.5] -Backport from trunk (r9602, r9641, r9647): - Fix: Building rail on steep slopes ignored build_on_slopes patch setting (r9602) - Fix: namegen.cpp was not UTF-8, which caused artefacts in Finnish town names (r9641) - Fix: Select "Custom" in the difficulty settings gui when changing a setting [FS#733] (r9647)	2007-04-17 18:09:12 +00:00
truelight	cb001e017a	(svn r9589) [0.5] -Fix (r9587, r9588): this time I really do hope turkish.txt went okay...	2007-04-10 13:12:15 +00:00
truelight	9bee2fc641	(svn r9588) [0.5] -Fix r9587: something went wrong in turkish.txt update	2007-04-10 13:04:44 +00:00
truelight	7399e107e1	(svn r9587) [0.5] -Backport from trunk (r9585): - Language updates (r9585)	2007-04-10 13:02:01 +00:00
truelight	70db6b3f40	(svn r9586) [0.5] -Backport from trunk (r9525, r9527, r9547, r9548, r9570, r9571, r9572, r9576): - Language updates (r9525, r9527, r9547, r9548, r9570, r9571, r9572, r9576)	2007-04-10 12:58:05 +00:00
truelight	ac6aefa07b	(svn r9584) [0.5] -Backport frmo trunk (r9542, r9565, r9573): - Fix: when checking for no vehicle on ground-tiles, don't take into account vehicles that are in the air (r9542) - Feature: add list_patches to console commands; shows all patches and values (r9565) - Fix: enclose settings names containing spaces with quotes (r9573)	2007-04-10 09:57:35 +00:00
truelight	c04f0af19b	(svn r9583) [0.5] -Backport from trunk (r9529, r9533, r9540, r9541): - Fix: when 2 clients joined together, the second asserted on the NewCompany command of the first (r9529) - Fix: when company is removed, sell all shares he has first, then sell all shares other people might have in this company (r9533) - Fix: bankrupt AIs no longer buy over themselves (also added safeguards to prevent in future) (r9540 / r9541)	2007-04-10 09:49:41 +00:00
truelight	c8c8667dc8	(svn r9582) [0.5] -Backport from trunk (r9425, r9437, r9455, r9519): - Fix: housekeeping in convert rail functions (r9425) - Fix: dedicated server crashed when the y part of the resolution was less than 10 (r9437) - Fix: values of diff_custom and snow_line in .cfg weren't checked properly (r9455) - Fix: free the malloc'd variable, not the pointer to that variable (r9519)	2007-04-10 09:40:36 +00:00
belugas	a0688e8d85	(svn r9471) [0.5] -Backport from trunk (r9467 & r9469): Reset the whole currency array while preserving custom one. Also, max data of to_euro is now 300, not 1000, disabling any proper loading of the patch setting	2007-03-26 00:20:22 +00:00
truelight	c85022e3db	(svn r9430) [0.5] -Backport r9429: when deleting a vehicle which has shared orders with one more vehicle and no orders, segfaulted	2007-03-24 15:16:41 +00:00
rubidium	be39b87154	(svn r9422) [0.5] -Prepare 0.5 branch for release of 0.5.1-RC2.	2007-03-23 22:54:19 +00:00
rubidium	71aa3a4de2	(svn r9421) [0.5] -Backport from trunk (r9392, r9415, r9420, custom): - Fix: crashes when the chatbox would be drawn outside of the main window [FS#701] (r9420) - Language updates (r9392, r9414, custom Simplified Chinese)	2007-03-23 22:44:03 +00:00
rubidium	f7fd8eca21	(svn r9394) [0.5] -Fix (r9343): reading out of an array caused a segmentation fault.	2007-03-21 23:06:01 +00:00
bjarni	ab77a35093	(svn r9384) [0.5] -Fix: [MorphOS] updated make release to avoid the need to specify RELEASE when building	2007-03-21 00:00:08 +00:00
rubidium	a808b77b2b	(svn r9382) [0.5] -Prepare 0.5 branch for release of 0.5.1-RC1.	2007-03-20 21:12:18 +00:00
rubidium	52a0d04473	(svn r9380) [0.5] -Backport from trunk (r9378): - Fix: cancel in password queries reduces amount of players in the network game when they haven't joined the game yet (r9378)	2007-03-20 20:36:45 +00:00
glx	64f7b3a059	(svn r9358) [0.5] -Backport from trunk (r9055, r9082, r9083, r9084, r9085, r9086): - Codechange: Change windows unicode handling and allow a pure non-unicode build to function. (r9055) - Codechange: [win32] Update VS2003 and VS2005 project files to build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better). (r9082) - 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) - Fix: [win9x] Clipboard paste for Windows95 (doesn't have CF_UNICODETEXT) correctly converts the input to the current locale. (r9084) - Fix: [win32] Move the initialisation of _codepage (non-UNICODE) to winMain as a dedicated server, or different video driver will not have a win32 messageloop. (r9085) - Fix: [win32] Rewrite keyboard input and handle all keypresses in a WM_CHAR event. This saves us from doing translation (ToUnicode[Ex], ToAscii[Ex]), and we get free IME-input support as a plus. (r9086)	2007-03-20 00:02:18 +00:00
rubidium	b70c3613fa	(svn r9355) [0.5] -Backport from trunk (r8906): - Feature: translation dependant formatting of dates (r8906)	2007-03-19 22:08:18 +00:00
glx	3158cdaa7a	(svn r9354) [0.5] -Backport from trunk (r8975, r9003, r9011, r9012): -Regression: [win32] Possible buffer overflow if unicode text is pasted into an input box and needs trimming. (r8975) -Codechange: Introduce a function Utf8PrevCharLen that finds the starting character of an UTF-8 sequence from a given position and returns the length to the first UTF-8 encoding byte of that sequence. (r9003) -Codechange: Rework Utf8PrevChar so that it returns a pointer to the previous UTF8 character's first byte instead of a byte-length offset (r9011) -Fix: When cutting strings into multiple lines also take into consideration whitespace characters of more than 1 byte length (eg IDEOGRAPHIC SPACE, IsWhitespace() function). When trimming such strings, account for multiple-byte long sequences so use *Utf8PrevChar(v) = '\0'. (r9012) -Codechange: Add a function Utf8TrimString() that properly trims a string to an UTF8 encoding seperation instead of somewhere in the wild (and use it in the chat area) (r9012)	2007-03-19 21:42:05 +00:00
rubidium	140abde4ef	(svn r9353) [0.5] -Backport language updates from trunk (r8957, r9002, r9005, r9013, r9014, r9020, r9021, r9054, r9116, r9118, r9132, r9286, r9292)	2007-03-19 21:04:06 +00:00
rubidium	850f73719f	(svn r9351) [0.5] -Backport from trunk (r9147, r9205, r9251, r9298): - 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: 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)	2007-03-19 20:38:26 +00:00
rubidium	d2ce2009b5	(svn r9350) [0.5] -Backport from trunk (r9105, r9115, r9117, r9146): - 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)	2007-03-19 20:23:27 +00:00
rubidium	6ad4716dc1	(svn r9349) [0.5] -Backport from trunk (r9043, r9062, r9064, r9070): - 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)	2007-03-19 20:17:24 +00:00
rubidium	0ec558f99f	(svn r9348) [0.5] -Backport from trunk (r8974, r8994, r9074): - Fix: support compilation with the Vista Platform SDK (r8974) - Fix: resolution doubled in cfg file when fullscreen mode used (r8994) - Fix: win32 dedicated console now doesn't need an extra 'enter' to fully quit (r9074)	2007-03-19 20:05:49 +00:00
rubidium	41727b6e23	(svn r9347) [0.5] -Backport from trunk (r9019, r9076, r9077): - Fix: use <> for system-headers (r9019) - 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)	2007-03-19 19:56:16 +00:00
rubidium	c559703312	(svn r9345) [0.5] -Backport from trunk (r9277, r9337, r9338): - Fix: shared orders got messed up when the 'first' trains got removed in the depot (r9277) - 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)	2007-03-19 19:42:40 +00:00
rubidium	1e7cca8f8b	(svn r9344) [0.5] -Backport from trunk (r9027, r9038, r9061, r9071): - Fix: desync caused by buffer overflow (r9027) - Feature: kick inactive initial network connections after some time (r9038, r9061) - Fix: take over companies properly in multiplayer games (r9071)	2007-03-19 19:34:44 +00:00
rubidium	759d155b08	(svn r9343) [0.5] -Backport from trunk (r9000, r9001, r9097, r9137): - Fix: new locomotive names were not announced in the news, it said "new railway locomotive available - railway locomotive" (r9000, r9001) - Feature: add an extra news group for opening and closing of industries (r9097) - Fix: when all news-setting buttons are 'full', make the for-all button show 'full' too (r9137)	2007-03-19 19:22:26 +00:00
rubidium	11b1c6f2ee	(svn r9342) [0.5] -Backport from trunk (r8980, r9065, r9339): - Fix: the industry list should also be (re)set when the number of industries is 0 (r8980) - Fix: possible dereference of NULL pointer (r9065) - Codechange: disable shares by default and increase the default maximum distance from edge for oil refineries (r9339)	2007-03-19 18:54:48 +00:00
rubidium	98f77876e6	(svn r9341) [0.5] -Backport from trunk (r8943, r8955, r8976, r8999, r9009): - 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: reinitialize all engines after grf files have been reloaded/changed (r8976) - Fix: do not select a disabled platform length/number of track count when going out of drag-drop mode (r8999) - Fix: play the correct engine sound based on the engine type instead of the sprite (r9009)	2007-03-19 18:47:10 +00:00
rubidium	5a703390ec	(svn r9128) [0.5] -Fix: trains slow down under bridges when they were going down on the tile before the bridge tile.	2007-03-11 23:03:14 +00:00
Darkvater	e925f8b2c3	(svn r8930) [0.5] -Backport from trunk (r8929): - [win32] Installer update (r8929)	2007-02-27 22:13:15 +00:00