(svn r2355) Tagged 0.4.0.1

- Fix: typo in pool.c "Cleaing up" --> "Cleaning up"

Makefile

@@ -457,10 +457,6 @@ endif
 # libpng config
 ifdef WITH_PNG
 CDEFS += -DWITH_PNG
-# FreeBSD doesn't use libpng-config
-ifdef FREEBSD
-LIBS += -lpng
-else
 CFLAGS += $(shell libpng-config --cflags)
 
 # seems like older libpng versions are broken and need this
@@ -476,7 +472,6 @@ else
 LIBS += $(shell libpng-config  --L_opts $(PNGCONFIG_FLAGS))
 endif
 endif
-endif
 
 # enables/disables assert()
 ifdef DISABLE_ASSERTS
@@ -778,7 +773,7 @@ quiet_cmd_cxx_compile = '===> Compiling $<'
 
 ifdef OSX
 OSX:=OSX
-OSX_MIDI_PLAYER_FILE:=os/macosx/OpenTTDMidi.class
+OSX_MIDI_PLAYER_FILE:=os/macos/OpenTTDMidi.class
 endif
 
 

changelog.txt

@@ -1,3 +1,26 @@
+0.4.0.1 (2005-05-21)
+------------------------------------------------------------------------
+
+- Feature: Add 'clear' command and CTRL+L to empty console window
+- Feature: add the possibility to print out the current debug-level
+- Fix: [MacOSX] default path for midi player on mac is now correct again
+- Fix: Updated makefile for FreeBSD
+- Fix: Text overflows in about box
+- Fix: Link error while compiling as dedicated server
+- Fix: Do not execute empty commands
+- Fix: Make OpenTTD icon look good on Win2K and earlier
+- Fix: NetworkUDPRemoveAdvertise wasn't completely correct
+- Fix: Signs in multiplayer didn't work
+- Fix: Dedicated server desyncs
+- Fix: [ 1197216 ] Error: !invalid string id 0 in GetString, dedicated server endgame crash
+- Fix: Don't allow things to be renamed to nothing
+- Fix: Windows installer deletes spritecache files on uninstall
+- Fix: Depot window did not get redrawn when a non-train-engine was sold
+- Fix: Do not scroll the game with the arrow keys when the chatbox is open
+- Fix: Remove warning from release build when assertions are no longer active
+- Fix: It was possible to open more than one tree window
+
+
 0.4.0 (2005-05-15)
 ------------------------------------------------------------------------
 - Feature: Bigger maps. Enjoy playing up to 2028x2048 (64 times as big as you were used to!)
@@ -77,6 +100,8 @@
 - Fix: Game would crash if you full-screened with the 'fullscreen' button than chose a resolution from the dropdown box that was no longer valid.
 - Fix: Scrolling with the arrow keys is now smooth and it now also scrolls exactly in tile direction if e.g. up and left are pressed
 - Fix: many more fixes but I am too tired to list them all
+
+
 0.3.6 (2005-01-24)
 ------------------------------------------------------------------------
 - Feature: resizable windows. All useful windows are already made resizable.

command.c

@@ -413,8 +413,9 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	_error_message_2 = cmd >> 16;
 	_additional_cash_required = 0;
 
-	// spectator has no rights.
-	if (_current_player == OWNER_SPECTATOR) {
+	/** Spectator has no rights except for the dedicated server which
+	 * is a spectator but is the server, so can do anything */
+	if (_current_player == OWNER_SPECTATOR && !_network_dedicated) {
 		ShowErrorMessage(_error_message, _error_message_2, x, y);
 		_cmd_text = NULL;
 		return false;
@@ -475,10 +476,16 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	}
 
 #ifdef ENABLE_NETWORK
-	// If we are in network, and the command is not from the network
-	//   send it to the command-queue and abort execution
+	/** If we are in network, and the command is not from the network
+	 * send it to the command-queue and abort execution
+	 * If we are a dedicated server temporarily switch local player, otherwise
+	 * the other parties won't be able to execute our command and will desync.
+	 * @todo Rewrite dedicated server to something more than a dirty hack!
+	 */
 	if (_networking && !(cmd & CMD_NETWORK_COMMAND)) {
+		if (_network_dedicated) _local_player = 0;
 		NetworkSend_Command(tile, p1, p2, cmd, callback);
+		if (_network_dedicated) _local_player = OWNER_SPECTATOR;
 		_docommand_recursive = 0;
 		_cmd_text = NULL;
 		return true;

console.c

@@ -151,6 +151,9 @@ static void IConsoleWndProc(Window* w, WindowEvent* e)
 						SetWindowDirty(w);
 					}
 					break;
+					case (WKC_CTRL | 'L'):
+					IConsoleCmdExec("clear");
+					break;
 				case WKC_BACKSPACE: case WKC_DELETE:
 					if (DeleteTextBufferChar(&_iconsole_cmdline, e->keypress.keycode)) {
 						IConsoleResetHistoryPos();
@@ -222,13 +225,19 @@ void IConsoleInit(void)
 	IConsoleHistoryAdd("");
 }
 
-void IConsoleClear(void)
+void IConsoleClearBuffer(void)
 {
 	uint i;
-	for (i = 0; i <= ICON_BUFFER; i++)
+	for (i = 0; i <= ICON_BUFFER; i++) {
 		free(_iconsole_buffer[i]);
+		_iconsole_buffer[i] = NULL;
+	}
+}
 
+static void IConsoleClear(void)
+{
 	free(_iconsole_cmdline.buf);
+	IConsoleClearBuffer();
 }
 
 static void IConsoleWriteToLogFile(const char* string)
@@ -463,6 +472,88 @@ bool GetArgumentInteger(uint32 *value, const char *arg)
 	return (arg == endptr) ? false : true;
 }
 
+// * ************************* * //
+// * hooking code              * //
+// * ************************* * //
+/**
+ * General internal hooking code that is the same for both commands and variables
+ * @param hooks @IConsoleHooks structure that will be set according to
+ * @param type type access trigger
+ * @param proc function called when the hook criteria is met
+ */
+static void IConsoleHookAdd(IConsoleHooks *hooks, IConsoleHookTypes type, IConsoleHook *proc)
+{
+	if (hooks == NULL || proc == NULL) return;
+
+	switch (type) {
+		case ICONSOLE_HOOK_ACCESS:
+			hooks->access = proc;
+			break;
+		case ICONSOLE_HOOK_PRE_ACTION:
+			hooks->pre = proc;
+			break;
+		case ICONSOLE_HOOK_POST_ACTION:
+			hooks->post = proc;
+			break;
+			default: NOT_REACHED();
+	}
+}
+
+/**
+ * Handle any special hook triggers. If the hook type is met check if
+ * there is a function associated with that and if so, execute it
+ * @param hooks @IConsoleHooks structure that will be checked
+ * @param type type of hook, trigger that needs to be activated
+ * @return true on a successfull execution of the hook command or if there
+ * is no hook/trigger present at all. False otherwise
+ */
+static bool IConsoleHookHandle(const IConsoleHooks *hooks, IConsoleHookTypes type)
+{
+	IConsoleHook *proc = NULL;
+	if (hooks == NULL) return false;
+
+	switch (type) {
+		case ICONSOLE_HOOK_ACCESS:
+			proc = hooks->access;
+			break;
+		case ICONSOLE_HOOK_PRE_ACTION:
+			proc = hooks->pre;
+			break;
+		case ICONSOLE_HOOK_POST_ACTION:
+			proc = hooks->post;
+			break;
+			default: NOT_REACHED();
+	}
+
+	return (proc == NULL) ? true : proc();
+}
+
+/**
+ * Add a hook to a command that will be triggered at certain points
+ * @param name name of the command that the hook is added to
+ * @param type type of hook that is added (ACCESS, BEFORE and AFTER change)
+ * @param proc function called when the hook criteria is met
+ */
+void IConsoleCmdHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc)
+{
+	IConsoleCmd *cmd = IConsoleCmdGet(name);
+	if (cmd == NULL) return;
+	IConsoleHookAdd(&cmd->hook, type, proc);
+}
+
+/**
+ * Add a hook to a variable that will be triggered at certain points
+ * @param name name of the variable that the hook is added to
+ * @param type type of hook that is added (ACCESS, BEFORE and AFTER change)
+ * @param proc function called when the hook criteria is met
+ */
+void IConsoleVarHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc)
+{
+	IConsoleVar *var = IConsoleVarGet(name);
+	if (var == NULL) return;
+	IConsoleHookAdd(&var->hook, type, proc);
+}
+
 /**
  * Perhaps ugly macro, but this saves us the trouble of writing the same function
  * three types, just with different variables. Yes, templates would be handy. It was
@@ -720,6 +811,7 @@ IConsoleVar *IConsoleVarGet(const char *name)
  */
 static void IConsoleVarSetValue(const IConsoleVar *var, uint32 value)
 {
+	IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_PRE_ACTION);
 	switch (var->type) {
 		case ICONSOLE_VAR_BOOLEAN:
 			*(bool*)var->addr = (value != 0);
@@ -742,6 +834,7 @@ static void IConsoleVarSetValue(const IConsoleVar *var, uint32 value)
 		default: NOT_REACHED();
 	}
 
+	IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_POST_ACTION);
 	IConsoleVarPrintSetValue(var);
 }
 
@@ -755,7 +848,9 @@ static void IConsoleVarSetStringvalue(const IConsoleVar *var, char *value)
 {
 	if (var->type != ICONSOLE_VAR_STRING || var->addr == NULL) return;
 
+	IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_PRE_ACTION);
 	ttd_strlcpy((char*)var->addr, (char*)value, var->size);
+	IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_POST_ACTION);
 	IConsoleVarPrintSetValue(var); // print out the new value, giving feedback
 	return;
 }
@@ -909,88 +1004,6 @@ void IConsoleVarExec(const IConsoleVar *var, byte tokencount, char *token[ICON_T
 	IConsoleError("invalid variable assignment");
 }
 
-// * ************************* * //
-// * hooking code              * //
-// * ************************* * //
-/**
- * General internal hooking code that is the same for both commands and variables
- * @param hooks @IConsoleHooks structure that will be set according to
- * @param type type access trigger
- * @param proc function called when the hook criteria is met
- */
-static void IConsoleHookAdd(IConsoleHooks *hooks, IConsoleHookTypes type, IConsoleHook *proc)
-{
-	if (hooks == NULL || proc == NULL) return;
-
-	switch (type) {
-	case ICONSOLE_HOOK_ACCESS:
-		hooks->access = proc;
-		break;
-	case ICONSOLE_HOOK_PRE_ACTION:
-		hooks->pre = proc;
-		break;
-	case ICONSOLE_HOOK_POST_ACTION:
-		hooks->post = proc;
-		break;
-	default: NOT_REACHED();
-	}
-}
-
-/**
- * Handle any special hook triggers. If the hook type is met check if
- * there is a function associated with that and if so, execute it
- * @param hooks @IConsoleHooks structure that will be checked
- * @param type type of hook, trigger that needs to be activated
- * @return true on a successfull execution of the hook command or if there
- * is no hook/trigger present at all. False otherwise
- */
-static bool IConsoleHookHandle(IConsoleHooks *hooks, IConsoleHookTypes type)
-{
-	IConsoleHook *proc = NULL;
-	if (hooks == NULL) return false;
-
-	switch (type) {
-	case ICONSOLE_HOOK_ACCESS:
-		proc = hooks->access;
-		break;
-	case ICONSOLE_HOOK_PRE_ACTION:
-		proc = hooks->pre;
-		break;
-	case ICONSOLE_HOOK_POST_ACTION:
-		proc = hooks->post;
-		break;
-	default: NOT_REACHED();
-	}
-
-	return (proc == NULL) ? true : proc();
-}
-
-/**
- * Add a hook to a command that will be triggered at certain points
- * @param name name of the command that the hook is added to
- * @param type type of hook that is added (ACCESS, BEFORE and AFTER change)
- * @param proc function called when the hook criteria is met
- */
-void IConsoleCmdHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc)
-{
-	IConsoleCmd *cmd = IConsoleCmdGet(name);
-	if (cmd == NULL) return;
-	IConsoleHookAdd(&cmd->hook, type, proc);
-}
-
-/**
- * Add a hook to a variable that will be triggered at certain points
- * @param name name of the variable that the hook is added to
- * @param type type of hook that is added (ACCESS, BEFORE and AFTER change)
- * @param proc function called when the hook criteria is met
- */
-void IConsoleVarHookAdd(const char *name, IConsoleHookTypes type, IConsoleHook *proc)
-{
-	IConsoleVar *var = IConsoleVarGet(name);
-	if (var == NULL) return;
-	IConsoleHookAdd(&var->hook, type, proc);
-}
-
 /**
  * Add a callback function to the variable. Some variables need
  * very special processing, which can only be done with custom code
@@ -1039,7 +1052,6 @@ void IConsoleCmdExec(const char *cmdstr)
 	/* 1. Split up commandline into tokens, seperated by spaces, commands
 	 * enclosed in "" are taken as one token. We can only go as far as the amount
 	 * of characters in our stream or the max amount of tokens we can handle */
-	tokens[0] = tokenstream;
 	for (cmdptr = cmdstr, t_index = 0, tstream_i = 0; *cmdptr != '\0'; cmdptr++) {
 		if (t_index >= lengthof(tokens) || tstream_i >= lengthof(tokenstream)) break;
 
@@ -1076,6 +1088,7 @@ void IConsoleCmdExec(const char *cmdstr)
 			IConsolePrintF(_icolour_dbg, "condbg: token %d is: '%s'", i, tokens[i]);
 	}
 
+	if (tokens[0] == '\0') return; // don't execute empty commands
 	/* 2. Determine type of command (cmd, alias or variable) and execute
 	 * First try commands, then aliases, and finally variables. Execute
 	 * the found action taking into account its hooking code
@@ -1100,12 +1113,9 @@ void IConsoleCmdExec(const char *cmdstr)
 
 	 var = IConsoleVarGet(tokens[0]);
 	 if (var != NULL) {
-	 	if (IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_ACCESS)) {
-	 		IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_PRE_ACTION);
+	 	if (IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_ACCESS))
 	 		IConsoleVarExec(var, t_index, &tokens[1]);
-	 		if (t_index != 0) // value has indeed been changed
-	 			IConsoleHookHandle(&var->hook, ICONSOLE_HOOK_POST_ACTION);
-	 	}
+
 	 	return;
 	 }
 

console.h

@@ -114,8 +114,8 @@ VARDEF IConsoleModes _iconsole_mode;
 
 // ** console functions ** //
 void IConsoleInit(void);
-void IConsoleClear(void);
 void IConsoleFree(void);
+void IConsoleClearBuffer(void);
 void IConsoleResize(void);
 void IConsoleSwitch(void);
 void IConsoleClose(void);

console_cmds.c

@@ -268,7 +268,6 @@ DEF_CONSOLE_CMD(ConChangeDirectory)
 	return true;
 }
 
-
 DEF_CONSOLE_CMD(ConPrintWorkingDirectory)
 {
 	const char *path;
@@ -287,6 +286,18 @@ DEF_CONSOLE_CMD(ConPrintWorkingDirectory)
 	return true;
 }
 
+DEF_CONSOLE_CMD(ConClearBuffer)
+{
+	if (argc == 0) {
+		IConsoleHelp("Clear the console buffer. Usage: 'clear'");
+		return true;
+	}
+
+	IConsoleClearBuffer();
+	InvalidateWindow(WC_CONSOLE, 0);
+	return true;
+}
+
 
 // ********************************* //
 // * Network Core Console Commands * //
@@ -822,13 +833,17 @@ DEF_CONSOLE_CMD(ConInfoCmd)
 DEF_CONSOLE_CMD(ConDebugLevel)
 {
 	if (argc == 0) {
-		IConsoleHelp("Set the default debugging level for the game. Usage: 'debug_level <level>'");
+		IConsoleHelp("Get/set the default debugging level for the game. Usage: 'debug_level [<level>]'");
 		IConsoleHelp("Level can be any combination of names, levels. Eg 'net=5 ms=4'. Remember to enclose it in \"'s");
 		return true;
 	}
 
-	if (argc < 2) return false;
-	SetDebugString(argv[1]);
+	if (argc > 2) return false;
+
+	if (argc == 1) {
+		IConsolePrintF(_icolour_def, "Current debug-level: '%s'", GetDebugString());
+	} else SetDebugString(argv[1]);
+
 	return true;
 }
 
@@ -1104,7 +1119,7 @@ DEF_CONSOLE_HOOK(ConHookServerName)
 
 DEF_CONSOLE_HOOK(ConHookServerAdvertise)
 {
-	if (!_network_advertise)
+	if (!_network_advertise) // remove us from advertising
 		NetworkUDPRemoveAdvertise();
 
 	return true;
@@ -1217,6 +1232,7 @@ void IConsoleStdLibRegister(void)
 	IConsoleCmdRegister("ls",           ConListFiles);
 	IConsoleCmdRegister("cd",           ConChangeDirectory);
 	IConsoleCmdRegister("pwd",          ConPrintWorkingDirectory);
+	IConsoleCmdRegister("clear",        ConClearBuffer);
 
 	IConsoleAliasRegister("dir",      "ls");
 	IConsoleAliasRegister("newmap",   "newgame");

debug.c

@@ -4,6 +4,7 @@
 #include "ttd.h"
 #include "console.h"
 #include "debug.h"
+#include "string.h"
 
 int _debug_ai_level;
 int _debug_grf_level;
@@ -28,6 +29,24 @@ void CDECL debug(const char *s, ...)
 	IConsoleDebug(buf);
 }
 
+typedef struct DebugLevel {
+	const char *name;
+	int *level;
+} DebugLevel;
+
+#define DEBUG_LEVEL(x) { #x, &_debug_##x##_level }
+	static const DebugLevel debug_level[] = {
+	DEBUG_LEVEL(ai),
+	DEBUG_LEVEL(grf),
+	DEBUG_LEVEL(map),
+	DEBUG_LEVEL(misc),
+	DEBUG_LEVEL(ms),
+	DEBUG_LEVEL(net),
+	DEBUG_LEVEL(spritecache),
+	DEBUG_LEVEL(oldloader),
+	DEBUG_LEVEL(npf)
+	};
+#undef DEBUG_LEVEL
 
 void SetDebugString(const char *s)
 {
@@ -35,25 +54,6 @@ void SetDebugString(const char *s)
 	char *end;
 	const char *t;
 
-	typedef struct DebugLevel {
-		const char* name;
-		int* level;
-	} DebugLevel;
-
-	#define DEBUG_LEVEL(x) { #x, &_debug_##x##_level }
-	static const DebugLevel debug_level[] = {
-		DEBUG_LEVEL(ai),
-		DEBUG_LEVEL(grf),
-		DEBUG_LEVEL(map),
-		DEBUG_LEVEL(misc),
-		DEBUG_LEVEL(ms),
-		DEBUG_LEVEL(net),
-		DEBUG_LEVEL(spritecache),
-		DEBUG_LEVEL(oldloader),
-		DEBUG_LEVEL(npf)
-	};
-	#undef DEBUG_LEVEL
-
 	// global debugging level?
 	if (*s >= '0' && *s <= '9') {
 		const DebugLevel *i;
@@ -96,3 +96,25 @@ void SetDebugString(const char *s)
 		}
 	}
 }
+
+/** Print out the current debug-level
+ * Just return a string with the values of all the debug categorites
+ * @return string with debug-levels
+ */
+const char *GetDebugString(void)
+{
+	const DebugLevel *i;
+	static char dbgstr[100];
+	char dbgval[20];
+
+	memset(dbgstr, 0, sizeof(dbgstr));
+	i = debug_level;
+	snprintf(dbgstr, sizeof(dbgstr), "%s=%d", i->name, *i->level);
+
+	for (i++; i != endof(debug_level); i++) {
+		snprintf(dbgval, sizeof(dbgval), ", %s=%d", i->name, *i->level);
+		ttd_strlcat(dbgstr, dbgval, sizeof(dbgstr));
+	}
+
+	return dbgstr;
+}

debug.h

@@ -20,5 +20,6 @@
 void CDECL debug(const char *s, ...);
 
 void SetDebugString(const char *s);
+const char *GetDebugString(void);
 
 #endif

dedicated.c

@@ -167,6 +167,7 @@ static void DedicatedVideoStop(void)
 
 static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {}
 static bool DedicatedVideoChangeRes(int w, int h) { return false; }
+static void DedicatedVideoFullScreen(bool fs) {}
 
 #if defined(UNIX) || defined(__OS2__)
 static bool InputWaiting(void)
@@ -322,6 +323,7 @@ const HalVideoDriver _dedicated_video_driver = {
 	DedicatedVideoMakeDirty,
 	DedicatedVideoMainLoop,
 	DedicatedVideoChangeRes,
+	DedicatedVideoFullScreen,
 };
 
 #else
@@ -339,6 +341,7 @@ void DedicatedFork(void) {}
 static void DedicatedVideoStop(void) { free(_dedicated_video_mem); }
 static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {}
 static bool DedicatedVideoChangeRes(int w, int h) { return false; }
+static void DedicatedVideoFullScreen(bool fs) {}
 static int DedicatedVideoMainLoop(void) { return ML_QUIT; }
 
 const HalVideoDriver _dedicated_video_driver = {
@@ -347,6 +350,7 @@ const HalVideoDriver _dedicated_video_driver = {
 	DedicatedVideoMakeDirty,
 	DedicatedVideoMainLoop,
 	DedicatedVideoChangeRes,
+	DedicatedVideoFullScreen,
 };
 
 #endif /* ENABLE_NETWORK */

docs/Readme_OS2.txt

@@ -20,6 +20,11 @@ http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
 ftp://ftp.netlabs.org/pub/sdl/sdl-dev-os2-2004-12-22.zip which may
 help solve some problems).
 
+Please note that SDL release 2005-03-30 does NOT work with OpenTTD,
+at least in my experience and the experience of a couple of other
+users. If you experience problems with OpenTTD, please try downgrading
+to SDL 2004-12-22.
+
 Note that to actually play the game, I have found in my own
 experience that a version of the Scitech Display Drivers or its later
 incarnation (see www.scitech.com) are necessary for it to work. If

engine.c

@@ -887,7 +887,7 @@ int32 CmdRenameEngine(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 {
 	StringID str;
 
-	if (!IsEngineIndex(p1)) return CMD_ERROR;
+	if (!IsEngineIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	str = AllocateNameUnique(_cmd_text, 0);
 	if (str == 0) return CMD_ERROR;

gfx.c

@@ -1979,6 +1979,8 @@ bool ChangeResInGame(int w, int h)
 	return true;
 }
 
+void ToggleFullScreen(bool fs) {_video_driver->toggle_fullscreen(fs);}
+
 static int CDECL compare_res(const void *pa, const void *pb)
 {
 	int x = ((const uint16*)pa)[0] - ((const uint16*)pb)[0];

gfx.h

@@ -67,7 +67,7 @@ void ScreenSizeChanged(void);
 void UndrawMouseCursor(void);
 bool ChangeResInGame(int w, int h);
 void SortResolutions(int count);
-void ToggleFullScreen(bool full_screen);
+void ToggleFullScreen(bool fs);
 
 /* gfx.c */
 #define ASCII_LETTERSTART 32

hal.h

@@ -12,6 +12,7 @@ typedef struct {
 	void (*make_dirty)(int left, int top, int width, int height);
 	int (*main_loop)(void);
 	bool (*change_resolution)(int w, int h);
+	void (*toggle_fullscreen)(bool fullscreen);
 } HalVideoDriver;
 
 enum {

known-bugs.txt

@@ -14,11 +14,13 @@ by the number below on http://sourceforge.net/tracker/?group_id=103924&atid=6363
 If the the bug report is closed, it has been fixed, which then can be verified
 in the latest SVN version.
 
-Bugs for 0.4.0
+Bugs for 0.4.0.1
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
--		In certain circumstances the game can crash if you drag the minimap to a corner
--1197216	Error: !invalid string id 0 in GetString
+
+-		Minimap crash with certain views and certain resolutions
+-		"Broken" autoreplace for dual-headed trains
+-1203319	Pre-signal exits not working when one way signal
 -1197116	Some stations are cargo-less
 -1188897	Station with cargo enroute_from INVALID_STATION
 -1186802	Company value problem (loans)
@@ -34,9 +36,10 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 -1085486	Subsidies: Only count when station is in right suburb
 -992677		BeOS MIDI does not initialise on newer BeOS releases
 
-Minor Bugs for 0.4.0
+Minor Bugs for 0.4.0.1
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
+
 -1201284	permanent hilight in a depot
 -1197258	Window Z-order locked when exiting openttd
 -1193882	problems with dualhead engins in DB Set XL (v0.81)
@@ -69,4 +72,4 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 -980276		Overflow in factory directory
 -976824		transmitter base
 -941694		Clipping problems stations/vehicles on slopes
--936997		Stationname too long to fit in trainwindow bug
+-936997		Stationname too long to fit in trainwindow bug

lang/american.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Can't do this...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Can't bo
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...no loan to repay
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} required
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Can't repay loan...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Can't give away money that is loaned from the bank...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Select new face for president
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Change the company vehicle livery
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Change the president's name
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Value: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Loading / Unloading
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Train must be stopped inside depot
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Can't send train to depot...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}No more space for orders
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Too many orders

lang/brazilian_portuguese.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financiar a construção de edifícios comerciais novos na cidade.{}  Custo: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Comprar a exclusividade dos serviços durante 1 ano na cidade. A autoridade da cidade permitirá que os passageiros e a carga usem somente estações da sua companhia.{} Custo: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar a autoridade local para aumentar a sua avaliação, correndo o  risco de uma penalidade severa se apanhado.{}  Custo: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Não pode fazer isto...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {STRING} provoca 6 meses de miséria aos condutores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}N
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...não há empréstimo para pagar
 STR_702E_REQUIRED                                               :{WHITE}...necessário {CURRENCY}
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Não é possível pagar empréstimo...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Não é possível dar o dinheiro emprestado do banco
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Selecione um novo rosto para o presidente
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Alterar cores dos veículos
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Alterar nome do presidente
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Carregando / descarregando
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}O trem deve estar parado dentro do depósito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Não é possível mandar o trem para o depósito...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Não há espaço para mais ordens
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Muitas ordens

lang/catalan.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Patrocinar la construcció de nous edificis comercials en la població.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Comprar per 1 any els drets exclusius de transport en la població. La autoritat local només permetrà utilitzar les instal.lacions de la teva empresa de transports als passatgers i les mercaderíes.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar les autoritats locals per incrementar el teu rati, a risc de greus penalitzacions si et pesquen!!.{}  Cost: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}No es pot fer aixó...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Caos de trànsit en  {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {STRING} porta 6 mesos de misèria als motoristes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})

lang/czech.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Dotovat stavbu nových obchodních budov ve meste.{}  Cena: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Koupit výhradní práva k preprave zbozi z tohoto mesta po dobu jednoho roku. Místní správa dovolí cestujícím a nákladu pouzivat pouze stanice tvé spolecnosti.{} Cena: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Podplatit místní správu pro zvyseni hodnocení spolecnosti. Riziko trestu v pripade pristizeni.{}  Cena: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Toto nemuzes udelat...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Dopravni chaos v {TOWN}!{}{}Program prestavby ulic sponzorovaný {STRING} prinasi motoristum 6 mesicu utrpení!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})

lang/danish.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Betal for bygning af kommercielle bygninger i byen.{}  Pris: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Køb et års eksklusive rettigheder til transport i byen. De lokale myndigheder vil kun tillade passagerer og last at bruge dine stationer.{} Prist: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestik de lokale myndigheder til at høve din bedømmelse, med sandsynlighed for en stor straf hvis det bliver opdaget.{}  Pris: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Kan ikke gøre dette...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i byen {TOWN}!{}{}Vejfornyelse betalt af {STRING} bringer 6 måneders kaos for trafikken!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Kan ikke
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...ingen lån at tilbagebetale
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} krævet
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Kan ikke tilbagebetale lån...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Du kan ikke forære penge væk, som du har lånt i banken...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Vælg nyt ansigt til direktøren
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Ændrer firmaets køretøjers farve
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Ændrer direktørens navn

lang/dutch.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Betaal de bouw van nieuwe commerciele gebouwen in de stad.{}  Kosten: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Koop 1 jaar exclusieve transportrechten in deze stad. De gemeenteraad staat passagiers en goederen toe alleen jouw stations te gebruiken.{} Kosten: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Koop het plaatselijk gezag om om je rang te verhogen, met het gevaar van een strenge sanctie, wanneer gepakt.{}  Kosten: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Kan dit niet doen...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkeerschaos in {TOWN}!{}{}Wegreparatie betaald door {STRING} zorgt voor 6 maanden van irritatie bij weggebruikers!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Kan geen
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...geen lening om terug te betalen
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} benodigd
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Kan geen lening terugbetalen
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan geen geld weggeven dat van de bank geleend is...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Kies nieuw gezicht voor directeur
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Verander het uiterlijk van de bedrijfsvoertuigen
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Verander de naam van de manager
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}In- en uitladen
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trein moet gestopt zijn in depot
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan trein niet naar depot sturen...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Geen ruimte meer voor orders
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Teveel orders

lang/finnish.txt

@@ -187,7 +187,7 @@ STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Ei onnis
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Aluetta ei voi puhdistaa....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Alkuperäinen {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pidätetään
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versio {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-ryhmä
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2005 OpenTTD-tiimi
 STR_TRANSLATED_BY                                               :{BLACK}  Kääntäjä(t) -
 
 STR_00C5                                                        :{BLACK}{CROSS}
@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Rahoita uusien kaupparakennusten rakentamista kaupungissa.{}  Kulu: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Osta vuoden yksinoikeudet kaupungin liikennöintiin. Paikallisviranomaiset eivät salli muiden yhtiöiden kuljettaa matkustajia ja rahtia.{} Kulu: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Lahjo viranomaisia lisätäksesi arviotasi; rangaistus voi olla kuitenkin suuri, jos jäät kiinni.{}  Kulu: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Näin ei voi tehdä...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}{TOWN}: liikenne on kaaoksessa!{}{}Yhtiön {STRING} rahoittama teiden uudelleenrakennusohjelma tuo kuuden kuukauden kurjuuden motoristeille!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Lis
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...ei lainaa maksettavana.
 STR_702E_REQUIRED                                               :{WHITE}...tarvitaan {CURRENCY}.
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Lainaa ei voi lyhentää...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Pankista lainattua rahaa ei voi antaa pois...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Valitse uudet kasvot pääjohtajalle.
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Muuta yhtiön ajoneuvoammattikuntaa.
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Muuta pääjohtajan nimeä.
@@ -2245,9 +2245,9 @@ STR_8077_FOSTER_MKII_SUPERBUS                                   :Foster MkII sup
 STR_8078_PLODDYPHUT_MKI_BUS                                     :Ploddyphut MkI -linja-auto
 STR_8079_PLODDYPHUT_MKII_BUS                                    :Ploddyphut MkII -linja-auto
 STR_807A_PLODDYPHUT_MKIII_BUS                                   :Ploddyphut MkIII -linja-auto
-STR_807B_BALOGH_COAL_TRUCK                                      :Balogh -hiilirekka
-STR_807C_UHL_COAL_TRUCK                                         :Uhl -hiilirekka
-STR_807D_DW_COAL_TRUCK                                          :DW -hiilirekka
+STR_807B_BALOGH_COAL_TRUCK                                      :Balogh -hiiliauto
+STR_807C_UHL_COAL_TRUCK                                         :Uhl -hiiliauto
+STR_807D_DW_COAL_TRUCK                                          :DW -hiiliauto
 STR_807E_MPS_MAIL_TRUCK                                         :MPS -postiauto
 STR_807F_REYNARD_MAIL_TRUCK                                     :Reynard -postiauto
 STR_8080_PERRY_MAIL_TRUCK                                       :Perry -postiauto
@@ -2260,72 +2260,72 @@ STR_8086_PERRY_OIL_TANKER                                       :Perry -
 STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Talbott -karja-auto
 STR_8088_UHL_LIVESTOCK_VAN                                      :Uhl -karja-auto
 STR_8089_FOSTER_LIVESTOCK_VAN                                   :Foster -karja-auto
-STR_808A_BALOGH_GOODS_TRUCK                                     :Balogh -tavararekka
-STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Craighead -tavararekka
-STR_808C_GOSS_GOODS_TRUCK                                       :Goss -tavararekka
-STR_808D_HEREFORD_GRAIN_TRUCK                                   :Hereford -viljarekka
-STR_808E_THOMAS_GRAIN_TRUCK                                     :Thomas -viljarekka
-STR_808F_GOSS_GRAIN_TRUCK                                       :Goss -viljarekka
-STR_8090_WITCOMBE_WOOD_TRUCK                                    :Witcombe -tukkirekka
-STR_8091_FOSTER_WOOD_TRUCK                                      :Foster -tukkirekka
-STR_8092_MORELAND_WOOD_TRUCK                                    :Moreland -tukkirekka
-STR_8093_MPS_IRON_ORE_TRUCK                                     :MPS -rautamalmirekka
-STR_8094_UHL_IRON_ORE_TRUCK                                     :Uhl -rautamalmirekka
-STR_8095_CHIPPY_IRON_ORE_TRUCK                                  :Chippy -rautamalmirekka
-STR_8096_BALOGH_STEEL_TRUCK                                     :Balogh -teräsrekka
-STR_8097_UHL_STEEL_TRUCK                                        :Uhl -teräsrekka
-STR_8098_KELLING_STEEL_TRUCK                                    :Kelling -teräsrekka
-STR_8099_BALOGH_ARMORED_TRUCK                                   :Balogh -panssarirekka
-STR_809A_UHL_ARMORED_TRUCK                                      :Uhl -panssarirekka
-STR_809B_FOSTER_ARMORED_TRUCK                                   :Foster -panssarirekka
-STR_809C_FOSTER_FOOD_VAN                                        :Foster -ruokarekka
-STR_809D_PERRY_FOOD_VAN                                         :Perry -ruokarekka
-STR_809E_CHIPPY_FOOD_VAN                                        :Chippy -ruokarekka
-STR_809F_UHL_PAPER_TRUCK                                        :Uhl -paperirekka
-STR_80A0_BALOGH_PAPER_TRUCK                                     :Balogh -paperirekka
-STR_80A1_MPS_PAPER_TRUCK                                        :MPS -paperirekka
-STR_80A2_MPS_COPPER_ORE_TRUCK                                   :MPS -kuparirekka
-STR_80A3_UHL_COPPER_ORE_TRUCK                                   :Uhl -kuparirekka
-STR_80A4_GOSS_COPPER_ORE_TRUCK                                  :Goss -kuparirekka
+STR_808A_BALOGH_GOODS_TRUCK                                     :Balogh -tavara-auto
+STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Craighead -tavara-auto
+STR_808C_GOSS_GOODS_TRUCK                                       :Goss -tavara-auto
+STR_808D_HEREFORD_GRAIN_TRUCK                                   :Hereford -vilja-auto
+STR_808E_THOMAS_GRAIN_TRUCK                                     :Thomas -vilja-auto
+STR_808F_GOSS_GRAIN_TRUCK                                       :Goss -vilja-auto
+STR_8090_WITCOMBE_WOOD_TRUCK                                    :Witcombe -tukkiauto
+STR_8091_FOSTER_WOOD_TRUCK                                      :Foster -tukkiauto
+STR_8092_MORELAND_WOOD_TRUCK                                    :Moreland -tukkiauto
+STR_8093_MPS_IRON_ORE_TRUCK                                     :MPS -rautamalmiauto
+STR_8094_UHL_IRON_ORE_TRUCK                                     :Uhl -rautamalmiauto
+STR_8095_CHIPPY_IRON_ORE_TRUCK                                  :Chippy -rautamalmiauto
+STR_8096_BALOGH_STEEL_TRUCK                                     :Balogh -teräsauto
+STR_8097_UHL_STEEL_TRUCK                                        :Uhl -teräsauto
+STR_8098_KELLING_STEEL_TRUCK                                    :Kelling -teräsauto
+STR_8099_BALOGH_ARMORED_TRUCK                                   :Balogh -panssariauto
+STR_809A_UHL_ARMORED_TRUCK                                      :Uhl -panssariauto
+STR_809B_FOSTER_ARMORED_TRUCK                                   :Foster -panssariauto
+STR_809C_FOSTER_FOOD_VAN                                        :Foster -ruoka-auto
+STR_809D_PERRY_FOOD_VAN                                         :Perry -ruoka-auto
+STR_809E_CHIPPY_FOOD_VAN                                        :Chippy -ruoka-auto
+STR_809F_UHL_PAPER_TRUCK                                        :Uhl -paperiauto
+STR_80A0_BALOGH_PAPER_TRUCK                                     :Balogh -paperiauto
+STR_80A1_MPS_PAPER_TRUCK                                        :MPS -paperiauto
+STR_80A2_MPS_COPPER_ORE_TRUCK                                   :MPS -kupariauto
+STR_80A3_UHL_COPPER_ORE_TRUCK                                   :Uhl -kupariauto
+STR_80A4_GOSS_COPPER_ORE_TRUCK                                  :Goss -kupariauto
 STR_80A5_UHL_WATER_TANKER                                       :Uhl -vesisäiliöauto
 STR_80A6_BALOGH_WATER_TANKER                                    :Balogh -vesisäiliöauto
 STR_80A7_MPS_WATER_TANKER                                       :MPS -vesisäiliöauto
-STR_80A8_BALOGH_FRUIT_TRUCK                                     :Balogh -hedelmärekka
-STR_80A9_UHL_FRUIT_TRUCK                                        :Uhl -hedelmärekka
-STR_80AA_KELLING_FRUIT_TRUCK                                    :Kelling -hedelmärekka
-STR_80AB_BALOGH_RUBBER_TRUCK                                    :Balogh -kumirekka
-STR_80AC_UHL_RUBBER_TRUCK                                       :Uhl -kumirekka
-STR_80AD_RMT_RUBBER_TRUCK                                       :RMT -kumirekka
-STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :MightyMover -sokerirekka
-STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Powernaught -sokerirekka
-STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Wizzowow -sokerirekka
-STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :MightyMover -limsarekka
-STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Powernaught -limsarekka
-STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Wizzowow -limsarekka
-STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :MightyMover -hattararekka
-STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Powernaught -hattararekka
-STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Wizzowow -hattararekka
-STR_80B7_MIGHTYMOVER_TOFFEE_TRUCK                               :MightyMover -toffeerekka
-STR_80B8_POWERNAUGHT_TOFFEE_TRUCK                               :Powernaught -toffeerekka
-STR_80B9_WIZZOWOW_TOFFEE_TRUCK                                  :Wizzowow -toffeerekka
+STR_80A8_BALOGH_FRUIT_TRUCK                                     :Balogh -hedelmäauto
+STR_80A9_UHL_FRUIT_TRUCK                                        :Uhl -hedelmäauto
+STR_80AA_KELLING_FRUIT_TRUCK                                    :Kelling -hedelmäauto
+STR_80AB_BALOGH_RUBBER_TRUCK                                    :Balogh -kumiauto
+STR_80AC_UHL_RUBBER_TRUCK                                       :Uhl -kumiauto
+STR_80AD_RMT_RUBBER_TRUCK                                       :RMT -kumiauto
+STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :MightyMover -sokeriauto
+STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Powernaught -sokeriauto
+STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Wizzowow -sokeriauto
+STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :MightyMover -kola-auto
+STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Powernaught -kola-auto
+STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Wizzowow -kola-auto
+STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :MightyMover -hattara-auto
+STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Powernaught -hattara-auto
+STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Wizzowow -hattara-auto
+STR_80B7_MIGHTYMOVER_TOFFEE_TRUCK                               :MightyMover -toffeeauto
+STR_80B8_POWERNAUGHT_TOFFEE_TRUCK                               :Powernaught -toffeeauto
+STR_80B9_WIZZOWOW_TOFFEE_TRUCK                                  :Wizzowow -toffeeauto
 STR_80BA_MIGHTYMOVER_TOY_VAN                                    :MightyMover -lelupakettiauto
 STR_80BB_POWERNAUGHT_TOY_VAN                                    :Powernaught -lelupakettiauto
 STR_80BC_WIZZOWOW_TOY_VAN                                       :Wizzowow -lelupakettiauto
-STR_80BD_MIGHTYMOVER_CANDY_TRUCK                                :MightyMover -lelurekka
-STR_80BE_POWERNAUGHT_CANDY_TRUCK                                :Powernaught -lelurekka
-STR_80BF_WIZZOWOW_CANDY_TRUCK                                   :Wizzowow -lelurekka
-STR_80C0_MIGHTYMOVER_BATTERY_TRUCK                              :MightyMover -patterirekka
-STR_80C1_POWERNAUGHT_BATTERY_TRUCK                              :Powernaught -patterirekka
-STR_80C2_WIZZOWOW_BATTERY_TRUCK                                 :Wizzowow -patterirekka
-STR_80C3_MIGHTYMOVER_FIZZY_DRINK                                :MightyMover -sihijuomarekka
-STR_80C4_POWERNAUGHT_FIZZY_DRINK                                :Powernaught -sihijuomarekka
-STR_80C5_WIZZOWOW_FIZZY_DRINK_TRUCK                             :Wizzowow -sihijuomarekka
-STR_80C6_MIGHTYMOVER_PLASTIC_TRUCK                              :MightyMover -muovirekka
-STR_80C7_POWERNAUGHT_PLASTIC_TRUCK                              :Powernaught -muovirekka
-STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Wizzowow -muovirekka
-STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :MightyMover -kuplarekka
-STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Powernaught -kuplarekka
-STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Wizzowow -kuplarekka
+STR_80BD_MIGHTYMOVER_CANDY_TRUCK                                :MightyMover -leluauto
+STR_80BE_POWERNAUGHT_CANDY_TRUCK                                :Powernaught -leluauto
+STR_80BF_WIZZOWOW_CANDY_TRUCK                                   :Wizzowow -leluauto
+STR_80C0_MIGHTYMOVER_BATTERY_TRUCK                              :MightyMover -patteriauto
+STR_80C1_POWERNAUGHT_BATTERY_TRUCK                              :Powernaught -patteriauto
+STR_80C2_WIZZOWOW_BATTERY_TRUCK                                 :Wizzowow -patteriauto
+STR_80C3_MIGHTYMOVER_FIZZY_DRINK                                :MightyMover -sihijuoma-auto
+STR_80C4_POWERNAUGHT_FIZZY_DRINK                                :Powernaught -sihijuoma-auto
+STR_80C5_WIZZOWOW_FIZZY_DRINK_TRUCK                             :Wizzowow -sihijuoma-auto
+STR_80C6_MIGHTYMOVER_PLASTIC_TRUCK                              :MightyMover -muoviauto
+STR_80C7_POWERNAUGHT_PLASTIC_TRUCK                              :Powernaught -muoviauto
+STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Wizzowow -muoviauto
+STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :MightyMover -kupla-auto
+STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Powernaught -kupla-auto
+STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Wizzowow -kupla-auto
 STR_80CC_MPS_OIL_TANKER                                         :MPS -öljytankkeri
 STR_80CD_CS_INC_OIL_TANKER                                      :CS-Inc. -öljytankkeri
 STR_80CE_MPS_PASSENGER_FERRY                                    :MPS -matkustajalautta
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Arvo: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Lastataan/puretaan
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Juna täytyy pysäyttää veturitallin sisällä
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Junan lähettäminen veturitalliin ei onnistu...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Ei enää tilaa pysähdyksille.
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Liian monta pysähdystä.

lang/french.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financer la construction de nouveaux immeubles commerciaux.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Acheter les droits de transports exclusifs dans cette ville pour 1 an. Seules vos ligness seront autorisées dans la ville.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Corrompre la municipalité pour améliorer votre réputation. Risque de pénalisation si le pot-de-vin est dévoilé.{}  Coût: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Impossible...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Problèmes de traffic à {TOWN}!{}{}La reconstruction des routes financée par {STRING} provoque 6 mois de problèmes aux automobilistes!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Impossib
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...Prêt déjà remboursé
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} nécessaires
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Impossible de rembourser...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}On ne peut pas distribuer de l'argent qui est emprunté à la banque...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Choix d'un nouveau visage pour le P.D.G.
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Change la couleur des véhicules
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Change le nom du président directeur général
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valeur: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Chargement/déchargement
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Le train doit être stoppé dans un dépôt
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Impossible d'envoyer le train au dépôt...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Plus de places pour les ordres
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Trop d'ordres

lang/galician.txt

@@ -1589,7 +1589,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Subvencina-la construcción de novos edificios comerciais na cidade.{}  Coste: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compra-los dereitos exclusivos de transporte na cidade durante 1 ano. A autoridade só permitirá que os pasaxeiros e as mercadorías usen as estacións da túa compañía.{} Coste: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Suborna-la autoridade local para mellora-la túa puntuación, co risco dunha gran penalización se o descobren.{}  Cost: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Non podes facer isto...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}¡Caos no tráfico de {TOWN}!{}{}¡O programa de reconstrucción das estradas subvencionado por {STRING} trae 6 meses de miseria para os motoristas!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})

lang/german.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}Finanzieren Sie den Bau kommerzieller Gebäude im Ort.{}Kosten: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}Kaufen Sie für 1 Jahre die exklusiven Transportrechte der Stadt. Die Stadtverwaltung erlaubt nur Passagier- und Frachttransporte Ihres Unternehmens.{}Kosten: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW}Bestechen Sie die Stadtverwaltung, um Ihre Bewertung zu verbessern. Dabei riskieren Sie allerdings eine harte Strafe, falls Sie ertappt werden.{}Kosten: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Leider nicht möglich...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Verkehrschaos in {TOWN}!{}{}Straßensanierungsprogramm finanziert durch {STRING} wird 6 Monate lang Verzögerungen im Verkehr bewirken!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2445,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Wert: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Laden / Entladen
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Zug muss im Depot angehalten sein
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kann den Zug nicht ins Depot schicken...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Kein Platz für weitere Aufträge
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Zu viele Aufträge

lang/hungarian.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW}  Új kereskedelmi épületek építésének támogatása a városban.{}  Ára: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW}  Egy éves kizárólagos szállítási jogok vétele a városban. Az önkormányzat csak a te állomásaid használatát engedi meg az utasoknak és az áruknak.{}  Ára: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} A megítélésed növelése az önkormányzat megvesztegetésével, komoly büntetést kockáztatva, ha ez kiderül.{} Ára: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Nem teheted ezt...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Közlekedési zûrzavar {TOWN} városában!{}{}{STRING} által indított útjavítás keseríti meg hat hónapig az autóvezetõk életét!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2445,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Érték: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Felpakol / Lepakol
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}A remízben kellene állnia ehhez
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nem küldheted a vonatot a jármûtelepre...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Nincs több hely új célpontnak
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Túl sok a célpont
@@ -2674,7 +2674,7 @@ STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}... a le
 STR_A018_MUST_BUILD_AIRPORT_FIRST                               :{WHITE}Elõbb repülõteret kell építened
 STR_A019_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}, {STRING}
 STR_A01A_CAPACITY                                               :{BLACK}Kapacitás: {LTBLUE}{STRING}
-STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}A a hangárban kellene állnia ehhez
+STR_A01B_AIRCRAFT_MUST_BE_STOPPED                               :{WHITE}A hangárban kellene állnia ehhez
 STR_A01C_CAN_T_SELL_AIRCRAFT                                    :{WHITE}Nem adhatod el a repülõgépet...
 STR_A01D_AIRPORT_CONSTRUCTION                                   :Repülõtér építése
 STR_A01E_BUILD_AIRPORT                                          :{BLACK}Repülõtér építése

lang/icelandic.txt

@@ -371,8 +371,8 @@ STR_SORT_BY_DROPDOWN_NAME                                       :Nafn
 STR_SORT_BY_DATE                                                :{BLACK}Dagsetning
 STR_SORT_BY_UNSORTED                                            :Óflokkað
 STR_SORT_BY_NUMBER                                              :Númer
-STR_SORT_BY_PROFIT_LAST_YEAR                                    :Gróði seinasta árs
-STR_SORT_BY_PROFIT_THIS_YEAR                                    :Gróði þessa árs
+STR_SORT_BY_PROFIT_LAST_YEAR                                    :Hagnaður síðasta árs
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :Hagnaður þessa árs
 STR_SORT_BY_AGE                                                 :Aldur
 STR_SORT_BY_RELIABILITY                                         :Áreiðanleiki
 STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Burðargeta alls á hverja tegund farms
@@ -998,9 +998,9 @@ STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Raunver
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Leyfa meiri eyðingu vega, brúa, gangna o.s.frv. í eigu bæjar: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Leyfa byggingu mjög langra lesta: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Raunveruleg hröðun lesta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Banna lestum og skipum að taka 90°  beygjur: {ORANGE}{STRING} {LTBLUE} (requires NPF)
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Banna lestum og skipum að taka 90°  beygjur: {ORANGE}{STRING} {LTBLUE} (þarfnast NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Sameina lestarstöðvar sem byggðar eru samsíða: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Yfirgefa lestarstöð þegar einhver farmur er fullur, ef kveikt er á 'fullhlaða': {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Yfirgefa stöð þegar einn farmur er fullfermdur, ef valið er 'fullferma': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Nota endurbættan algóriþma við hleðslu: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Verðbólga: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Aðeins afhlaða farmi á stöðvum þar sem er eftirspurn: {ORANGE}{STRING}
@@ -1011,7 +1011,7 @@ STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Leyfa m
 STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Má byggja iðnaði af sömu gerð nálægt hvor öðrum: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Sýna alltaf fulla dagsetningu í upplýsingaslá: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Sýna umferðarljós akstursmegin: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show finances window at the end of the year: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Sýna fjármálaglugga í lok árs: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch samhæfð meðhöndlun stansleysu: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Bifreiðir fara í biðraðir (með stórvægilegum aukaverkunum): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Færa sjónarhorn þegar músin nálgast brún gluggans: {ORANGE}{STRING}
@@ -1447,7 +1447,7 @@ STR_1007_ALREADY_BUILT                                          :{WHITE}...n
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Verður að fjarlægja lestartein fyrst
 STR_1009_TOO_MANY_DEPOTS                                        :{WHITE}Of mörg skýli
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Járnbrautarlestarframkvæmdir
-STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Monorail framkvæmdir
+STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Einteinungsframkvæmdir
 STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}MagLev framkvæmdir
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Veldu tegund brúar
 STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Get ekki byggt lestarskýli hér...
@@ -1458,7 +1458,7 @@ STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Get ekki
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Get ekki fjarlægt umferðarljós héðan...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Lega lestarskýlis
 STR_1015_RAILROAD_CONSTRUCTION                                  :Járnbrautarlestarframkvæmdir
-STR_1016_MONORAIL_CONSTRUCTION                                  :Monorail framkvæmdir
+STR_1016_MONORAIL_CONSTRUCTION                                  :Einteinungsframkvæmdir
 STR_1017_MAGLEV_CONSTRUCTION                                    :MagLev framkvæmdir
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Leggja lestartein
 STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}Byggja lestarskýli (til að byggja og gera við lestar)
@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Kosta byggingu verslunarhúsnæðis í bænum.{}  Kostnaður: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kaupa 1 árs flutningsrétt í þessum bæ. Bæjaryfirvöld munu aðeins leyfa notkun á þínum flutningsleiðum.{} Kostnaður: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Múta bæjaryfirvöldum til að auka við fylgi þitt, með hættu á þungri refsingu komist það upp.{}  Kostnaður: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Ekki hægt...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Glundroði í umferð {TOWN}!{}{}Uppbygging vega kostuð af {STRING} veldur 6 mánaða vesæld meðal ökumanna!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -1806,8 +1805,8 @@ STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}50% samdráttur í framleiðslu hjá {TOWN} {STRING}
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Skordýraplága veldur tjóni á {TOWN} {STRING}!{}Framleiðsla minnkar um 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...getur aðeins verið staðsett nálægt brún kortsins
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} framleiðsla í {TOWN} {STRING} hækkar um {COMMA16}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} framleiðsla í {TOWN} {STRING} lækkar um {COMMA16}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING}framleiðsla í {TOWN} {STRING} eykst um {COMMA16}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING}framleiðsla í {TOWN} {STRING} minnkar um {COMMA16}%!
 
 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Lest í göngunum
@@ -2012,7 +2011,7 @@ STR_7018_TRAIN_INCOME                                           :{GOLD}Lestartek
 STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Bílatekjur
 STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Flúgvélatekjur
 STR_701B_SHIP_INCOME                                            :{GOLD}Skipstekjur
-STR_701C_LOAN_INTEREST                                          :{GOLD}Lánavextir
+STR_701C_LOAN_INTEREST                                          :{GOLD}Lánsvextir
 STR_701D_OTHER                                                  :{GOLD}Annað
 STR_701E                                                        :{BLACK}-{CURRENCY64}
 STR_701F                                                        :{BLACK}+{CURRENCY64}
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Ekki h
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...ekkert lán til að borga
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} vantar
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Getur ekki borgað lán...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Það er ekki hægt að gefa peninga sem teknir eru að láni frá bankanum...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Velja nýtt andlit á forstöðumanninn
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Breyta útliti á farartækjum fyrirtækisins
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Breyta nafni forstöðumanns
@@ -2384,7 +2384,7 @@ STR_8102_RAILROAD_LOCOMOTIVE                                    :lest
 STR_8103_ROAD_VEHICLE                                           :bifreið
 STR_8104_AIRCRAFT                                               :flugvél
 STR_8105_SHIP                                                   :sjóferju
-STR_8106_MONORAIL_LOCOMOTIVE                                    :einteina lest
+STR_8106_MONORAIL_LOCOMOTIVE                                    :einteinungslest
 STR_8107_MAGLEV_LOCOMOTIVE                                      :segul lest
 
 ##id 0x8800
@@ -2418,7 +2418,7 @@ STR_8813_FROM                                                   :{LTBLUE}{CARGO}
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Lest {COMMA16} bíður í skýli
 STR_8815_NEW_VEHICLES                                           :{BLACK}Ný faratæki
 STR_8816                                                        :{BLACK}-
-STR_8817_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Þyngd: {GOLD}{COMMA16}tonn{}{BLACK}Hraði: {GOLD}{VELOCITY}{BLACK}   Orka: {GOLD}{COMMA32}hestöfl{}{BLACK}Viðhaldskostnaður: {GOLD}{CURRENCY}/ár{}{BLACK}Burðargeta: {GOLD}{STRING}{}{BLACK}Hönnuð: {GOLD}{NUMU16}{BLACK} Líftími: {GOLD}{COMMA16} ár{}{BLACK}Áreiðanleiki mest: {GOLD}{COMMA8}%
+STR_8817_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Þyngd: {GOLD}{COMMA16}tonn{}{BLACK}Hraði: {GOLD}{VELOCITY}{BLACK}   Hestöfl: {GOLD}{COMMA32}{}{BLACK}Rekstrarkostnaður: {GOLD}{CURRENCY} á ári{}{BLACK}Burðargeta: {GOLD}{STRING}{}{BLACK}Hönnuð: {GOLD}{NUMU16}{BLACK} Líftími: {GOLD}{COMMA16} ár{}{BLACK}Áreiðanleiki mest: {GOLD}{COMMA8}%
 STR_8818_INFORMATION                                            :{BLACK}Upplýsingar
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Lestin er of löng
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Aðeins er hægt að eiga við lestir þegar þær bíða í skýli
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Virði: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Fermandi / Affermandi
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Lest þarf að vera stöðvuð í skýli
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Get ekki sent lest í skýli...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Ekki pláss fyrir fleiri skipanir
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Of margar skipanir
@@ -2490,10 +2491,10 @@ STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Ney
 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_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {CURRENCY} Þyngd: {COMMA16}tonn{}Hraði: {VELOCITY}  Kraftur: {COMMA16}hö{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING}
+STR_885B_COST_WEIGHT_T_SPEED_POWER                              :{BLACK}Verð: {CURRENCY} Þyngd: {COMMA16}tonn{}Hraði: {VELOCITY}  Hestöfl: {COMMA16}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {STRING}
 STR_885C_BROKEN_DOWN                                            :{RED}Bilaður
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Keyrslukostnaður: {LTBLUE}{CURRENCY}/ár
-STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Þyngd: {LTBLUE}{COMMA16}t  {BLACK}Kraftur: {LTBLUE}{COMMA32}hp{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
+STR_885E_WEIGHT_T_POWER_HP_MAX_SPEED                            :{BLACK}Þyngd: {LTBLUE}{COMMA16}t  {BLACK}Hestöfl: {LTBLUE}{COMMA32}{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Hagnaður á þessu ári: {LTBLUE}{CURRENCY}  (síðasta ár: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Áreiðanleiki: {LTBLUE}{COMMA8}%  {BLACK}Bilanir frá síðustu viðgerð: {LTBLUE}{COMMA16}
 STR_8861_STOPPED                                                :{RED}Stöðvaður

lang/italian.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finanzia la costruzione di nuove strutture commerciali nella città.{}  Costo: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compra 1 anno di esclusiva sui trasporti nella città. Compra 1 anno di esclusiva sui diritti di trasporto in città. L'autorità cittadina autorizzerà passeggeri e merci a usare solo le tue stazioni.{} Costo: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Corrompi l’autorità locale per incrementare la tua valutazione con il rischio di una severa multa se scoperto.{}  Costo: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Non puoi farlo...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffico nel caos a {TOWN}!{}{}La ricostruzione stradale finanziata da {STRING} porterà 6 mesi di disagio agli automobilisti!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2445,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valore: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Carica / Scarica
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Il treno deve essere fermato nel deposito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Non puoi mandare treno al deposito...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Spazio per gli ordini terminato
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Troppi ordini

lang/latvian.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Can't do this...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})

lang/lithuanian.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fund the construction of new commercial buildings in the town.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}  Cost: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Can't do this...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {STRING} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Daugiau
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...kreditas grazintas
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} reikia
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Skolos grazinti negalima...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Negalima dovanoti is banko pasiskolintu pinigu...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Pasirink nauja veida
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Keicia kompanijos transporto priemoniu spalva
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Keicia kompanijos direktoriaus varda

lang/norwegian.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finasier byggingen av nye kommersielle byggninger i byen .{}  Koster: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kjøp 1 års ekslusive transportrettigheter i byen. Bystyre vil bare tillate passasjerer og varer å bruke dine transporttjenester.{} Koster: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Bestikk bystyret til å forbedre vurderingen av firmaet, men du riskerer å bli bøtlagt hvis du blir oppdaget.{}  Koster: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Kan ikke gjøre dette...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffkkaos i {TOWN}!{}{}Ombygging av veien, finasiert av {STRING}, fører med seg seks måneders veiproblemer.
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Kan ikke
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...lånet er allerede betalt tilbake
 STR_702E_REQUIRED                                               :{WHITE}...du trenger {CURRENCY}
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Kan ikke betale tilbake lån...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan ikke gi vekk penger som er lånt fra banken...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Velg nytt utsende på sjefen
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Endre firmafarge
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Endre navnet til sjefen
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Verdi: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Laster på/av
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Toget må være stoppet i togstallen
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan ikke sende tog til togstall...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Ikke plass til flere ordrer
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}For mange ordrer
@@ -2813,9 +2814,9 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltlis
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Jernbane-lokomotiv
-STR_MONORAIL_VEHICLES                                           :Monorail-lokomotiv
-STR_MAGLEV_VEHICLES                                             :Maglev-lokomotiv
+STR_RAIL_VEHICLES                                               :Jernbanelokomotiv
+STR_MONORAIL_VEHICLES                                           :Monoraillokomotiv
+STR_MAGLEV_VEHICLES                                             :Maglevlokomotiv
 
 ############ End of list of rail types
 

lang/polish.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Ufundowanie nowych budynkow handlowych w miescie.{}  Koszt: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kup roczna wylacznosc na prawa transportowe w miescie. Lokalne wladze pozwala kozystac tylko ze stacji twojej firmy.{} Koszt: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Daj lapowke lokanym wladzom, powieksz swoja ocene, ryzykujac powazne kary w razie zlapania.{}  Koszt: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Nie mozna wykonac...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Chaos na drogach w {TOWN}!{}{}Program przebudowy drog ufundowany przez {STRING} prowadzi do 6 miesiecy meki dla kierowcow!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Nie mozn
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...pozyczka juz splacona
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} wymagane
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Nie mozna zwrocic pozyczki...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nie mozesz wydac pieniedzy, ktore sa pozyczone z banku...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Wybierz nowa twarz prezesa
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Zmien kolor pojazdow firmy
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Zmien imie prezesa
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Wartosc: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Zaladunek / Rozladowanie
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Pociag musi byc zatrzymany w zajezdni
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nie mozna wyslac pociagu do zajezdni...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Brak miejsca na polecenia
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Zbyt wiele polecen

lang/portuguese.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financiar a construção de edifícios comerciais novos na cidade.{}  Custo: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Comprar a exclusividade dos serviços durante 1 ano na cidade. A autoridade da cidade permitirá que os passageiros e a carga usem somente estações da sua companhia.{} Custo: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subornar a autoridade local para aumentar a sua avaliação, correndo o  risco de uma penalidade severa se apanhado.{}  Custo: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Não pode fazer isto...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{}Programa de reconstrução de estradas financiado por {STRING} provoca 6 meses de miséria aos condutores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2445,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}A carregar / descarregar
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Comboio tem que estar parado dentro do depósito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Não é possível mandar o comboio para o depósito...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Não há espaço para mais ordens
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Demasiadas ordens

lang/romanian.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Finanteazã constructia de noi clãdiri comerciale în oras.{}  Cost: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Cumpãrã drepturile exclusive în acest oras pe o perioadã de un an. Autoritãtile locale vor folosi doar compania ta pentru transportul de pasageri si mãrfuri.{} Cost: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Mituieste autoritãtile locale pentru a-ti îmbunãtãti ratingul, dar cu riscul de a fi prins si de a plãti amenzi serioase.{}  Cost: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Nu pot face asta...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Haos pe strãzile din {TOWN}!{}{}Programul finantat de {STRING} pentru reconstructia strãzilor, aduce 6 luni de haos participantilor la trafic!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Nu mai p
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...nu ai nici un credit de plãtit
 STR_702E_REQUIRED                                               :{WHITE}...ai nevoie de {CURRENCY}
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Nu poti plãti creditul...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nu poti dona din banii împrumutati de bancã...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Alege o nouã fotografie a presedintelui
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Schimbã culoarea care îti reprezintã compania
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Schimbã numele presedintelui
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valoare: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Încarcã / Descarcã
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trenul trebuie oprit intr-un depou
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Nu pot trimite trenul la depou...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Nu mai este loc pentru comenzi
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Prea multe comenzi

lang/slovak.txt

@@ -998,7 +998,7 @@ STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Povolit
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Umoznit odstranenie viacerych mestskych ciest, mostov, atd.: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Umoznit stavbu dlhych vlakov: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Zapnut realnu akceleraciu vlakov: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakazat vlakom a lodiam otacenie o 90 stupnov: {ORANGE}{STRING} {LTBLUE} (vyzaduje NPF)
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakazat vlakom a lodiam otacenie o 90 st.: {ORANGE}{STRING} {LTBLUE} (vyzaduje NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Umoznit spajat stanice: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Opustit stanicu ked jeden z nakladov je plny, pri 'plne naloz': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Pouzit vylepseny algoritmus nakladania: {ORANGE}{STRING}
@@ -1019,7 +1019,7 @@ STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Umoznit
 STR_CONFIG_PATCHES_NEW_DEPOT_FINDING                            :{LTBLUE}Nove vyhladavanie depa: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Roznorode stanice: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_TRAIN_PATHFIND                           :{LTBLUE}Novy algoritmus pre hladanie smeru: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Novy globalny algoritmus vyhladavania cesty (NPF, nahradzuje NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Novy globalny algoritmus hladania cesty (NPF namiesto NTP): {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Vzdy povolit male letiska: {ORANGE}{STRING}
 
@@ -1033,7 +1033,7 @@ STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Upozorn
 STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Stare vozidla sa neprestanu vyrabat: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Automaticka obnova dopravnych prostriedkov, ked su stare
 STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Obnovit vozidlo {ORANGE}{STRING}{LTBLUE} mesiacov pred/po dosiahnuti max. veku
-STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Min. mnozstvo penazi pre automaticke obnovovanie vozidiel: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Min. mnozstvo penazi pre aut. obnovovanie vozidiel: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Dlzka zobrazenia chybovej spravy: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Zobrazit populaciu mesta v jeho nazve: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Neviditelne stromy (pri priesvitnych budovach): {ORANGE}{STRING}
@@ -1068,7 +1068,7 @@ STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Datum z
 STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Ukoncit hru v roku: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Mierne zmeny ekonomiky (viac mensich zmien)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Povolit nakup akcii od ostatnych spolocnosti
-STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}When dragging place signals every: {ORANGE}{STRING} tile(s)
+STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Pri tahani umiestnit semafory kazdych(e): {ORANGE}{STRING} dlazdic(e)
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Pozicia hlavneho menu: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Na lavo
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :V strede
@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financovat vystavbu administrativnych a obchodnych budov.{}  Cena: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Na 1 rok kupit exkluzivne dopravne prava pre vasu spolocnost. Miestna sprava vam zaruci vyuzivanie dopravnych sluzieb len vasej spolocnosti.{} Cena: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Podplatit miestnu spravu pre zvysenie hodnotenia vasej spolocnosti, s rizikom tazkeho postihu ked sa to prevali!{}  Cost: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}To sa neda urobit...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}V meste {TOWN} zavladol dopravny chaos!{}{}Rekonstrukcia ciest financovana {STRING} prinesie 6 mesiacov utrpenia pre motoristov!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Nemozno
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...pozicka uz bola splatena
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} potrebne
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Pozicka sa neda vratit...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nie je mozne poskytnut peniaze, ktore su pozicane z banky...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Vybrat novu tvar prezidenta
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Zmenit vzhlad spolocnosti
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Zmenit meno prezidenta
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Cena: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Naklada/Vyklada
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Vlak musi byt zastaveny v depe
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Vlak sa neda poslat do depa...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Nemozno zadat dalsie prikazy
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Prilis vela prikazov

lang/spanish.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Pagar la construcción de nuevos edificios comerciales en la población.{}  Coste: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Compre la exclusiva durante 1 año de los derechos de transporte en esta población. Las autoridades solo permitirán el uso de las estaciones de su empresa.{} Coste: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Soborne a las autoridades locales para aumentar su ranking, con el riesgo de una severa penalización si es descubierto.{}  Coste: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Can't do this...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Colapso circulatorio en {TOWN}!{}{}¡Programa de reconstrucción de carreteras patrocinado por {STRING} causa 6 meses de problemas a los conductores!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}No se pu
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...no hay préstamo que pagar
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} requerido
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}No es posible pagar préstamo...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}No se puede dar dinero que ha sido prestado de un banco...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Selecciona nueva cara para el presidente
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Cambiar los colores de la empresa
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Cambiar el nombre del presidente
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Cargando / Descargando
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}El tren debe pararse dentro del depósito
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}No se puede enviar el tren al depósito...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}No hay más lugar para pedidos
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Demasiados pedidos

lang/swedish.txt

@@ -1595,7 +1595,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 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 kommun kommer bara tillåta passagerare och gods till användning för ditt företags stationer.{} Kostnad: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Muta den lokala kommunen för att öka din värdering, på risken av att få höga böter om du blir upptäckt.{}  Kostnad: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Kan inte utföra detta...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafikkaos i {TOWN}!{}{}Vägombyggnadsprogram bekostat av {STRING} medför 6 månader av elände för bilister!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})
@@ -2034,6 +2033,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Kan inte
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...lånet redan återbetalt
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} krävs
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Kan inte återbetala lånet...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan inte ge bort pengar som är lånade från banken...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Välj nytt ansikte på VD:n
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Byt färg på företaget
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Byt VD:ns namn
@@ -2444,6 +2444,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Värde: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{STRING}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Lastar / lastar av
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Tåget måste stoppas inne i depån
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Kan inte skicka tåg till depå...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Ingen mer plats för order
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}För många order

lang/unfinished/estonian.txt

@@ -1581,7 +1581,6 @@ STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Uute ärihoonete ehitamise rahastamine selles linnas.{} Hind: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Üheks aastaks monopoolsete transpordiõiguste ostmine selles linnas. Linna võimud lubavad reisijate ja kauba veoks kasutada ainult sinu jaamasid.{} Hind: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Linnavõimudele altkäemaksu pakkumine, et tõsta ettevõtte reitingut. Vahelejäämise korral tuleb maksta trahvi.{} Hind: {CURRENCY}
-STR_2054_CAN_T_DO_THIS                                          :{WHITE}Seda ei saa teha...
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Liikluskaos linnas {TOWN}!{}{}Teedeehitus programmi rahastab {STRING}, mis tekitab 6 kuud häireid maanteesõidukitele!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA32})

lang/unfinished/turkish.txt

@@ -188,6 +188,7 @@ STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Bu b
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Orjinal telif hakki {COPYRIGHT} 1995 Chris Sawyer, Tüm haklari saklidir
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versiyon {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2004 OpenTTD ekibi
+STR_TRANSLATED_BY                                               :{BLACK}  Translator(s) - Ceyhun Tansu
 
 STR_00C5                                                        :{BLACK}{CROSS}
 STR_00C6                                                        :{SILVER}{CROSS}
@@ -247,19 +248,168 @@ STR_00FB_POWER_STATION                                          :{BLACK}{TINYFON
 STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Orman
 STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Biçki Fabrikasi
 STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Petrol Rafinerisi
+STR_00FF_FARM                                                   :{BLACK}{TINYFONT}Çiftlik
+STR_0100_FACTORY                                                :{BLACK}{TINYFONT}Fabrika
+STR_0101_PRINTING_WORKS                                         :{BLACK}{TINYFONT}Printing Works
+STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}Petrol Kuyusu
+STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}Demir Madeni
+STR_0104_STEEL_MILL                                             :{BLACK}{TINYFONT}Çelik Isletmesi
+STR_0105_BANK                                                   :{BLACK}{TINYFONT}Banka
+STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Paper Mill
+STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Altin Madeni
+STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Food Processing Plant
+STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Elmas Madeni
+STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Bakir Madeni
+STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Fruit Plantation
+STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Rubber Plantation
+STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Su Kaynagi
+STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Su Kulesi
+STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Lumber Mill
+STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Candyfloss Forest
+STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Sweet Factory
+STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}Battery Farm
+STR_0113_COLA_WELLS                                             :{BLACK}{TINYFONT}Cola Wells
+STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}Toy Shop
+STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}Toy Factory
+STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}Plastic Fountains
+STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}Fizzy Drink Factory
+STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}Bubble Generator
+STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Toffee Quarry
+STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}Seker Madeni
+STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Demiryolu Istasyonu
+STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Kamyon Yükleme Yeri
+STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Otobüs Gari
+STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Havaalani/Helikopter Pisti
+STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Liman
+STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Rough Land
+STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Yesil Alan
+STR_0122_BARE_LAND                                              :{BLACK}{TINYFONT}Açik Arazi
+STR_0123_FIELDS                                                 :{BLACK}{TINYFONT}Tarlalar
+STR_0124_TREES                                                  :{BLACK}{TINYFONT}Agaçlar
+STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Kayalar
+STR_0126_WATER                                                  :{BLACK}{TINYFONT}Su
+STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Sahibi Yok
+STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Kasabalar
+STR_0129_INDUSTRIES                                             :{BLACK}{TINYFONT}Endüstriler
+STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Çöl
+STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Kar
+STR_012C_MESSAGE                                                :{WHITE}Mesaj
+STR_012D                                                        :{WHITE}{STRING}
+STR_012E_CANCEL                                                 :{BLACK}Iptal
+STR_012F_OK                                                     :{BLACK}Tamam
+STR_0130_RENAME                                                 :{BLACK}Rename
+STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Çok fazla isim tanimlandi
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Seçili isim kullaniliyor
 
+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_0139_IMPERIAL_MILES                                         :Emperyal (mil)
+STR_013A_METRIC_KILOMETERS                                      :Metrik (kilometre)
+STR_013B_OWNED_BY                                               :{WHITE}...sahibi {STRING}
+STR_013C_CARGO                                                  :{BLACK}Kargo
+STR_013D_INFORMATION                                            :{BLACK}Bilgi
+STR_013E_CAPACITIES                                             :{BLACK}Kapasiteler
+STR_013E_TOTAL_CARGO                                            :{BLACK}Toplam Kargo
+STR_013F_CAPACITY                                               :{BLACK}Kapasite: {LTBLUE}{STRING}
+STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Bu trenin toplam kargo kapasitesi:
+STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_0140_NEW_GAME                                               :{BLACK}Yeni Oyun
+STR_0141_LOAD_GAME                                              :{BLACK}Yükle
+STR_0142_TUTORIAL_DEMONSTRATION                                 :{BLACK}Ögretici / Demo
+STR_SINGLE_PLAYER                                               :{BLACK}Tek Oyunculu
+STR_MULTIPLAYER                                                 :{BLACK}Çok Oyunculu
 
+STR_64                                                          :64
+STR_128                                                         :128
+STR_256                                                         :256
+STR_512                                                         :512
+STR_1024                                                        :1024
+STR_2048                                                        :2048
+STR_MAPSIZE                                                     :{BLACK}Harita Büyüklügü:
+STR_BY                                                          :{BLACK}*
+STR_0148_GAME_OPTIONS                                           :{BLACK}Oyun Seçenekleri
 
+STR_0150_SOMEONE                                                :birisi{SKIP}{SKIP}
+STR_0151_MAP_OF_WORLD                                           :Dünya haritasi
+STR_0152_TOWN_DIRECTORY                                         :Kasaba dizini
+STR_0153_SUBSIDIES                                              :Tesvikler
 
 ############ range for menu	starts
+STR_0154_OPERATING_PROFIT_GRAPH                                 :Isletme karlari grafigi
+STR_0155_INCOME_GRAPH                                           :Gelirler grafigi
+STR_0156_DELIVERED_CARGO_GRAPH                                  :Tasinan kargo grafigi
+STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Performans gecmisi grafigi
+STR_0158_COMPANY_VALUE_GRAPH                                    :Firma degeri grafigi
+STR_0159_CARGO_PAYMENT_RATES                                    :Kargo bedeli degerleri
+STR_015A_COMPANY_LEAGUE_TABLE                                   :Firma lig tablosu
+STR_PERFORMANCE_DETAIL_MENU                                     :Ayrintili performans degerleri
 ############ range for menu	ends
 
+STR_015B_OPENTTD                                                :{WHITE}OpenTTD Hakkinda
+STR_015C_SAVE_GAME                                              :Kaydet
+STR_015D_LOAD_GAME                                              :Yükle
+STR_015E_QUIT_GAME                                              :Oyundan Çik
+STR_015F_QUIT                                                   :Çik
+STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Oyundan çikmak istediginizden emin misiniz?
+STR_0161_QUIT_GAME                                              :{WHITE}Oyundan Çik
+STR_SORT_ORDER_TIP                                              :{BLACK}Siralama Seçenegi(azalan/artan)
+STR_SORT_CRITERIA_TIP                                           :{BLACK}Siralama kriterini seç
+SRT_SORT_BY                                                     :{BLACK}Sirala
 
+STR_SORT_BY_POPULATION                                          :{BLACK}Nüfus
+STR_SORT_BY_PRODUCTION                                          :{BLACK}Üretim
+STR_SORT_BY_TYPE                                                :{BLACK}Tip
+STR_SORT_BY_TRANSPORTED                                         :{BLACK}Tasinan
+STR_SORT_BY_NAME                                                :{BLACK}Ad
+STR_SORT_BY_DROPDOWN_NAME                                       :Ad
+STR_SORT_BY_DATE                                                :{BLACK}Tarih
+STR_SORT_BY_UNSORTED                                            :Siralanmamis
+STR_SORT_BY_NUMBER                                              :Numara
+STR_SORT_BY_PROFIT_LAST_YEAR                                    :Geçen yilki kari
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :Bu yilki kari
+STR_SORT_BY_AGE                                                 :Yas
+STR_SORT_BY_RELIABILITY                                         :Güvenilirlik
+STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Kargo tipine göre toplam kapasite
+STR_SORT_BY_MAX_SPEED                                           :Azami Hiz
 
 ############ range for months starts
+STR_0162_JAN                                                    :Oc
+STR_0163_FEB                                                    :Sub
+STR_0164_MAR                                                    :Mar
+STR_0165_APR                                                    :Nis
+STR_0166_MAY                                                    :May
+STR_0167_JUN                                                    :Haz
+STR_0168_JUL                                                    :Tem
+STR_0169_AUG                                                    :Agu
+STR_016A_SEP                                                    :Eyl
+STR_016B_OCT                                                    :Eki
+STR_016C_NOV                                                    :Kas
+STR_016D_DEC                                                    :Ara
 ############ range for months ends
 
+STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUMU16}
+STR_0170                                                        :{TINYFONT}{STRING}-
+STR_0171_PAUSE_GAME                                             :{BLACK}Duraklat
+STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Kaydet, Oyundan Çik, Çik
+STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Firma istasyonlarini göster
+STR_0174_DISPLAY_MAP                                            :{BLACK}Haritayi göster
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Harita, kasaba dizinini göster
+STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Kasaba dizinini göster
+STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Firma finans bilgilerini göster
+STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Genel firma bilgilerini göster
+STR_0179_DISPLAY_GRAPHS                                         :{BLACK}Grafikleri göster
+STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Firma lig tablosunu göster
+STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Firma trenleri listesini göster
+STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Display list of company's road vehicles
+STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Firma gemileri listesini göster
+STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Display list of company's aircraft
 
 ############ range for service numbers starts
 ############ range for service numbers ends

makefiledir/Makefile.libdetection

@@ -66,17 +66,7 @@ WITH_NETWORK:=1
 WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
 
 # libpng detection
-ifdef FREEBSD
-# a little hack was needed for FreeBSD because it misses libpng-config
-WITH_PNG:=$(shell ls /usr/lib | grep "libpng" 2>/dev/null) $(shell \
-ls /usr/local/lib | grep "libpng" 2>/dev/null)
-ifdef WITH_PNG
-# makes the flag look nicer in makefile.config
-WITH_PNG:=1
-endif
-else
 WITH_PNG:=$(shell libpng-config --version 2>/dev/null)
-endif
 
 ifdef WITH_PNG
 # LibPNG depends on Zlib

misc_cmd.c

@@ -129,6 +129,8 @@ int32 CmdChangeCompanyName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	StringID str;
 	Player *p;
 
+	if (_cmd_text[0] == '\0') return CMD_ERROR;
+
 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
 
@@ -153,6 +155,8 @@ int32 CmdChangePresidentName(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	StringID str;
 	Player *p;
 
+	if (_cmd_text[0] == '\0') return CMD_ERROR;
+
 	str = AllocateNameUnique(_cmd_text, 4);
 	if (str == 0) return CMD_ERROR;
 

misc_gui.c

@@ -176,10 +176,10 @@ static const char *credits[] = {
 	"Original graphics by Simon Foster",
 	"",
 	"The OpenTTD team (in alphabetical order):",
+	"  Matthijs Kooijman (blathijs) - Pathfinder-god",
 	"  Bjarni Corfitzen (Bjarni) - MacOSX port, coder",
 	"  Victor Fischer (Celestar) - Programming everywhere you need him to",
 	"  Tamas Faragó (Darkvater) - Lead coder",
-	"  Dominik Scherer (dominik81) - Lead coder",
 	"  Kerekes Miham (MiHaMiX) - Translator system, and Nightlies host",
 	"  Owen Rudge (orudge) - Forum- and masterserver host, OS/2 port",
 	"  Christoph Mallon (Tron) - Programmer, code correctness police",
@@ -188,14 +188,14 @@ static const char *credits[] = {
 	"Retired Developers:",
 	"  Ludvig Strigeus (ludde) - OpenTTD author, main coder (0.1 - 0.3.3)",
 	"  Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)",
+	"  Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3.0 - 0.3.6)",
 	"",
 	"Special thanks go out to:",
 	"  Josef Drexler - For his great work on TTDPatch",
 	"  Marcin Grzegorczyk - For his documentation of TTD internals",
-	"  Matthijs Kooijman (blathijs) - For his many patches, suggestions and major work on maprewrite",
 	"  Petr Baudis (pasky) - Many patches, newgrf support",
 	"  Stefan Meißner (sign_de) - For his work on the console",
-	"  Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with (and future PBS)",
+	"  Simon Sasburg (HackyKid) - Many bugfixes he has blessed us with (and PBS)",
 	"  Cian Duffy (MYOB) - BeOS port / manual writing",
 	"  Christian Rosentreter (tokaiz) - MorphOS / AmigaOS port",
 	"",
@@ -423,7 +423,7 @@ static const WindowDesc _build_trees_scen_desc = {
 
 void ShowBuildTreesToolbar(void)
 {
-	AllocateWindowDesc(&_build_trees_desc);
+	AllocateWindowDescFront(&_build_trees_desc, 0);
 }
 
 void ShowBuildTreesScenToolbar(void)
@@ -930,7 +930,12 @@ void DrawEditBox(Window *w, int wid)
 static void QueryStringWndProc(Window *w, WindowEvent *e)
 {
 	static bool closed = false;
-	switch(e->event) {
+	switch (e->event) {
+	case WE_CREATE:
+		SETBIT(_no_scroll, SCROLL_EDIT);
+		closed = false;
+		break;
+
 	case WE_PAINT:
 		SetDParam(0, WP(w,querystr_d).caption);
 		DrawWindowWidgets(w);
@@ -987,10 +992,6 @@ press_ok:;
 		}
 	} break;
 
-	case WE_CREATE:
-		closed = false;
-		break;
-
 	case WE_DESTROY:
 		// If the window is not closed yet, it means it still needs to send a CANCEL
 		if (!closed) {
@@ -1039,7 +1040,6 @@ void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth,
 	DeleteWindowById(WC_SAVELOAD, 0);
 
 	w = AllocateWindowDesc(&_query_string_desc);
-	SETBIT(_no_scroll, SCROLL_EDIT);
 
 	GetString(_edit_str_buf, str);
 	_edit_str_buf[realmaxlen] = '\0';

network.c

@@ -1018,7 +1018,8 @@ void NetworkDisconnect(void)
 		}
 	}
 
-	NetworkUDPRemoveAdvertise();
+	if (_network_advertise)
+		NetworkUDPRemoveAdvertise();
 
 	DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 

network_gui.c

@@ -1363,6 +1363,7 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e)
 	switch (e->event) {
 	case WE_CREATE:
 		SendWindowMessage(WC_NEWS_WINDOW, 0, WE_CREATE, w->height, 0);
+		SETBIT(_no_scroll, SCROLL_CHAT); // do not scroll the game with the arrow-keys
 		closed = false;
 		break;
 
@@ -1421,6 +1422,7 @@ press_ok:;
 
 	case WE_DESTROY:
 		SendWindowMessage(WC_NEWS_WINDOW, 0, WE_DESTROY, 0, 0);
+		CLRBIT(_no_scroll, SCROLL_CHAT);
 		// If the window is not closed yet, it means it still needs to send a CANCEL
 		if (!closed) {
 			Window *parent = FindWindowById(WP(w,querystr_d).wnd_class, WP(w,querystr_d).wnd_num);

network_server.c

@@ -1036,12 +1036,11 @@ void NetworkServer_HandleChat(NetworkAction action, DestType desttype, int dest,
 			NetworkTextMessage(action, GetDrawStringPlayerColor(ci->client_playas-1), false, ci->client_name, "%s", msg);
 			if (from_index == NETWORK_SERVER_INDEX)
 				show_local = false;
-			ci_to = ci;
+			ci_to = ci_own;
 		}
 
 		/* There is no such player */
-		if (ci_to == NULL)
-			break;
+		if (ci_to == NULL) break;
 
 		// Display the message locally (so you know you have sent it)
 		if (ci != NULL && show_local) {

network_udp.c

@@ -555,7 +555,7 @@ void NetworkUDPRemoveAdvertise(void)
 	Packet *p;
 
 	/* Check if we are advertising */
-	if (!_networking || !_network_server || !_network_udp_server || !_network_advertise)
+	if (!_networking || !_network_server || !_network_udp_server)
 		return;
 
 	/* check for socket */

os/win32/installer/install.nsi

@@ -1,8 +1,8 @@
 ; Define your application name
 !define APPNAME "OpenTTD"
-!define APPNAMEANDVERSION "OpenTTD 0.4.0.0"
-!define APPVERSION "0.4.0.0"
-!define INSTALLERVERSION 15 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPNAMEANDVERSION "OpenTTD 0.4.0.1"
+!define APPVERSION "0.4.0.1"
+!define INSTALLERVERSION 16 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !define MUI_ICON "..\..\..\openttd.ico"
 !define MUI_UNICON "..\..\..\openttd.ico"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
@@ -233,6 +233,7 @@ Section Uninstall
 	Delete "$INSTDIR\crash.log"
 	Delete "$INSTDIR\openttd.cfg"
 	Delete "$INSTDIR\hs.dat"
+	Delete "$INSTDIR\cached_sprites.*"
 	Delete "$INSTDIR\save\autosave\network*.tmp" ; temporary network file
 
 	; Data files

player_gui.c

@@ -653,10 +653,10 @@ static void PlayerCompanyWndProc(Window *w, WindowEvent *e)
 		_cmd_text = b;
 		switch (WP(w,def_d).byte_1) {
 		case 0: /* Change president name */
-			DoCommandP(0, w->window_number, 0, NULL, CMD_CHANGE_PRESIDENT_NAME | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT));
+			DoCommandP(0, 0, 0, NULL, CMD_CHANGE_PRESIDENT_NAME | CMD_MSG(STR_700D_CAN_T_CHANGE_PRESIDENT));
 			break;
 		case 1: /* Change company name */
-			DoCommandP(0, w->window_number, 0, NULL, CMD_CHANGE_COMPANY_NAME | CMD_MSG(STR_700C_CAN_T_CHANGE_COMPANY_NAME));
+			DoCommandP(0, 0, 0, NULL, CMD_CHANGE_COMPANY_NAME | CMD_MSG(STR_700C_CAN_T_CHANGE_COMPANY_NAME));
 			break;
 		#ifdef ENABLE_NETWORK
 		case 2: /* Change company password */
@@ -800,14 +800,13 @@ static void EndGameWndProc(Window *w, WindowEvent *e)
 			DrawStringMultiCenter(x + (640 / 2), y + 157, STR_021B_ACHIEVES_STATUS, 640);
 		}
 	} break;
-	case WE_CLICK: { /* OnClick show the highscore chart */
-		int diff = w->window_number; // save values because deletewindow is called
-		int8 rank = WP(w, highscore_d).rank;
-		DoCommandP(0, 0, 0, NULL, CMD_PAUSE);
+	case WE_CLICK: /* Close the window (and show the highscore window) */
 		DeleteWindow(w);
-
-		ShowHighscoreTable(diff, rank);
-	} break;
+	break;
+	case WE_DESTROY: /* Show the highscore window when this one is closed */
+		if (!_networking) DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // unpause
+		ShowHighscoreTable(w->window_number, WP(w, highscore_d).rank);
+		break;
 	}
 }
 
@@ -841,15 +840,17 @@ static void HighScoreWndProc(Window *w, WindowEvent *e)
 		}
 	} break;
 
-	case WE_CLICK: /* Onclick get back all hidden windows */
-		if (_game_mode != GM_MENU && !_networking)
-			ShowVitalWindows();
-
-		DoCommandP(0, 0, 0, NULL, CMD_PAUSE);
+	case WE_CLICK: /* Onclick to close window, and in destroy event handle the rest */
 		DeleteWindow(w);
 		break;
+
+	case WE_DESTROY: /* Get back all the hidden windows */
+		if (_game_mode != GM_MENU) ShowVitalWindows();
+
+		if (!_networking) DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // unpause
+		break;
+	}
 	}
-}
 
 static const Widget _highscore_widgets[] = {
 {      WWT_PANEL, RESIZE_NONE, 16, 0, 640, 0, 480, 0x0, STR_NULL},
@@ -879,12 +880,11 @@ void ShowHighscoreTable(int difficulty, int8 ranking)
 {
 	Window *w;
 
-	if (!_networking) { // pause game to show chart
-		DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
-		/* Close all always on-top windows to get a clean screen */
-		if (_game_mode != GM_MENU)
-			HideVitalWindows();
-	}
+	// pause game to show the chart
+	if (!_networking) DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
+
+	/* Close all always on-top windows to get a clean screen */
+	if (_game_mode != GM_MENU) 	HideVitalWindows();
 
 	DeleteWindowById(WC_HIGHSCORE_ENDSCREEN, 0);
 	w = AllocateWindowDesc(&_highscore_desc);
@@ -903,11 +903,12 @@ void ShowEndGameChart(void)
 {
 	Window *w;
 
-	if (!_networking) { // pause the game and hide all windows to show end-chart
-		DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
-		HideVitalWindows();
-	}
+	/* Dedicated server doesn't need the highscore window */
+	if (_network_dedicated) return;
+	/* Pause in single-player to have a look at the highscore at your own leisure */
+	if (!_networking) DoCommandP(0, 1, 0, NULL, CMD_PAUSE);
 
+	HideVitalWindows();
 	DeleteWindowById(WC_HIGHSCORE_ENDSCREEN, 0);
 	w = AllocateWindowDesc(&_endgame_desc);
 

players.c

@@ -674,7 +674,7 @@ int32 CmdPlayerCtrl(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 		if (p != NULL) {
 			if (_local_player == OWNER_SPECTATOR) {
 				/* Check if we do not want to be a spectator in network */
-				if (!_networking || _network_server || _network_playas != OWNER_SPECTATOR) {
+				if (!_networking ||  (_network_server && !_network_dedicated) || _network_playas != OWNER_SPECTATOR) {
 					_local_player = p->index;
 					MarkWholeScreenDirty();
 				}

pool.c

@@ -10,7 +10,7 @@ void CleanPool(MemoryPool *pool)
 {
 	uint i;
 
-	DEBUG(misc, 4)("[Pool] (%s) Cleaing pool..", pool->name);
+	DEBUG(misc, 4)("[Pool] (%s) Cleaning pool..", pool->name);
 
 	/* Free all blocks */
 	for (i = 0; i < pool->current_blocks; i++)

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2005-05-15
-Release version: 0.4.0
+Last updated:    2005-05-21
+Release version: 0.4.1
 ------------------------------------------------------------------------
 
 

sdl.c

@@ -636,7 +636,7 @@ static bool SdlVideoChangeRes(int w, int h)
 	return true;
 }
 
-void ToggleFullScreen(bool full_screen)
+static void SdlVideoFullScreen(bool full_screen)
 {
 	_fullscreen = full_screen;
 	GetVideoModes(); // get the list of available video modes
@@ -650,6 +650,7 @@ const HalVideoDriver _sdl_video_driver = {
 	SdlVideoMakeDirty,
 	SdlVideoMainLoop,
 	SdlVideoChangeRes,
+	SdlVideoFullScreen,
 };
 
 static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len)
@@ -706,4 +707,4 @@ static void DbgRedraw()
 }
 #endif
 
-#endif // WITH_SDL
+#endif /* WITH_SDL */

signs.c

@@ -136,17 +136,17 @@ int32 CmdPlaceSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
  */
 int32 CmdRenameSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 {
-	SignStruct *ss;
+	if (!IsSignIndex(p1)) return CMD_ERROR;
 
-	/* If GetDParam(0) != 0 means the new text for the sign is non-empty.
+	/* If _cmd_text 0 means the new text for the sign is non-empty.
 	 * So rename the sign. If it is empty, it has no name, so delete it */
-	if (GetDParam(0) != 0) {
+	if (_cmd_text[0] != '\0') {
 		/* Create the name */
 		StringID str = AllocateName(_cmd_text, 0);
 		if (str == 0) return CMD_ERROR;
 
 		if (flags & DC_EXEC) {
-			ss = GetSign(p1);
+			SignStruct *ss = GetSign(p1);
 
 			/* Delete the old name */
 			DeleteName(ss->str);
@@ -166,7 +166,7 @@ int32 CmdRenameSign(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 		}
 	} else { /* Delete sign */
 		if (flags & DC_EXEC) {
-			ss = GetSign(p1);
+			SignStruct *ss = GetSign(p1);
 
 			/* Delete the name */
 			DeleteName(ss->str);

signs.h

@@ -41,6 +41,11 @@ static inline uint16 GetSignPoolSize(void)
 	return _sign_pool.total_items;
 }
 
+static inline bool IsSignIndex(uint index)
+{
+	return index < GetSignPoolSize();
+}
+
 #define FOR_ALL_SIGNS_FROM(ss, start) for (ss = GetSign(start); ss != NULL; ss = (ss->index + 1 < GetSignPoolSize()) ? GetSign(ss->index + 1) : NULL)
 #define FOR_ALL_SIGNS(ss) FOR_ALL_SIGNS_FROM(ss, 0)
 

spritecache.c

@@ -368,8 +368,12 @@ static void LoadGrfIndexed(const char *filename, const uint16 *index_tbl, int fi
 			SkipSprites(end);
 		} else { // load sprites and use indexes from start to end
 			do {
+			#ifdef NDEBUG
+				LoadNextSprite(start, file_index);
+			#else
 				bool b = LoadNextSprite(start, file_index);
 				assert(b);
+			#endif
 			} while (++start <= end);
 		}
 	}

station_cmd.c

@@ -2653,7 +2653,7 @@ int32 CmdRenameStation(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	StringID str,old_str;
 	Station *st;
 
-	if (!IsStationIndex(p1)) return CMD_ERROR;
+	if (!IsStationIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 	st = GetStation(p1);
 
 	if (!IsValidStation(st) || !CheckOwnership(st->owner)) return CMD_ERROR;

town_cmd.c

@@ -1447,7 +1447,7 @@ int32 CmdRenameTown(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	StringID str;
 	Town *t;
 
-	if (!IsTownIndex(p1)) return CMD_ERROR;
+	if (!IsTownIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	t = GetTown(p1);
 

train_cmd.c

@@ -932,9 +932,11 @@ int32 CmdSellRailWagon(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	// make sure the vehicle is stopped in the depot
 	if (CheckTrainStoppedInDepot(first) < 0) return CMD_ERROR;
 
-	if ((flags & DC_EXEC) && v == first && first->subtype == TS_Front_Engine) {
-		DeleteWindowById(WC_VEHICLE_VIEW, first->index);
-		InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train);
+	if (flags & DC_EXEC) {
+		if (v == first && first->subtype == TS_Front_Engine) {
+			DeleteWindowById(WC_VEHICLE_VIEW, first->index);
+			InvalidateWindow(WC_REPLACE_VEHICLE, VEH_Train);
+		}
 		InvalidateWindow(WC_VEHICLE_DEPOT, first->tile);
 		RebuildVehicleLists();
 	}

ttd.c

@@ -148,7 +148,7 @@ static int NullVideoMainLoop(void)
 }
 
 static bool NullVideoChangeRes(int w, int h) { return false; }
-
+static void NullVideoFullScreen(bool fs) {}
 
 const HalVideoDriver _null_video_driver = {
 	NullVideoStart,
@@ -156,6 +156,7 @@ const HalVideoDriver _null_video_driver = {
 	NullVideoMakeDirty,
 	NullVideoMainLoop,
 	NullVideoChangeRes,
+	NullVideoFullScreen,
 };
 
 // NULL sound driver

ttd.h

@@ -536,6 +536,7 @@ enum {
 	SCROLL_CON =  0,
 	SCROLL_EDIT = 1,
 	SCROLL_SAVE = 2,
+	SCROLL_CHAT = 4,
 };
 VARDEF byte _no_scroll;
 

vehicle.c

@@ -1654,7 +1654,7 @@ int32 CmdNameVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	Vehicle *v;
 	StringID str;
 
-	if (!IsVehicleIndex(p1)) return CMD_ERROR;
+	if (!IsVehicleIndex(p1) || _cmd_text[0] == '\0') return CMD_ERROR;
 
 	v = GetVehicle(p1);
 

win32.c

@@ -783,7 +783,7 @@ static bool Win32GdiChangeRes(int w, int h)
 	return true;
 }
 
-void ToggleFullScreen(bool full_screen) {MakeWindow(full_screen);}
+static void Win32GdiFullScreen(bool full_screen) {MakeWindow(full_screen);}
 
 const HalVideoDriver _win32_video_driver = {
 	Win32GdiStart,
@@ -791,6 +791,7 @@ const HalVideoDriver _win32_video_driver = {
 	Win32GdiMakeDirty,
 	Win32GdiMainLoop,
 	Win32GdiChangeRes,
+	Win32GdiFullScreen,
 };