(svn r4046) missed a file in last commit

Makefile

@@ -46,6 +46,7 @@
 # WITH_COCOA: Cocoa video driver support
 #
 # Summary of other defines:
+# MANUAL_CONFIG: do not use Makefile.config, config options set manually
 # DEBUG: build in debug mode
 # PROFILE: build in profile mode, disables -s and -fomit-frame-pointer
 # TRANSLATOR: build in translator mode (untranslated strings are prepended by
@@ -108,10 +109,7 @@
 #
 # Special for crosscompiling there are some commands available:
 #
-# UNIVERSAL_BINARY: builds a universal binary for OSX. Make sure you got both PPC and x86 libs. Only works with GCC 4 or newer
-# TRIPLE_BINARY: builds a universal binary with the addition of code optimised for G5 (which means a total of 3 binaries in one file)
-# OTTD_PPC, OTTD_PPC970, OTTD_i386: compile for target architecture.
-#    Multiple flags can be used so OTTD_PPC:=1 OTTD_i386:=1 produces the same result as UNIVERSAL_BINARY
+# FAT_BINARY: builds a universal binary for OSX. Make sure you got both PPC and x86 libs. Only works with GCC 4 or newer
 #
 # JAGUAR: Crosscompiling for OSX 1.2.8 (codenamed Jaguar). Only works if OSX is defined too. Only works with GCC 4 or newer
 #	This can be changed to any PPC version of OSX by changing the ppc flags in Makefile.config
@@ -134,8 +132,12 @@
 
 # Makefile version tag
 # it checks if the version tag in Makefile.config is the same and force update outdated config files
-MAKEFILE_VERSION:=10
+MAKEFILE_VERSION:=8
 
+# CONFIG_WRITER has to be found even for manual configuration
+CONFIG_WRITER=makefiledir/Makefile.config_writer
+
+ifndef MANUAL_CONFIG
 # Automatic configuration
 MAKE_CONFIG:=Makefile.config
 MAKEFILE:=Makefile
@@ -146,10 +148,30 @@ CONFIG_WRITER=makefiledir/Makefile.config_writer
 # See target section for how this is built, suppress errors
 # since first time it isn't found but make reads this twice
 -include $(MAKE_CONFIG)
+else
+CONFIG_INCLUDED:=1
+endif
 
+ifndef LIBPNG-CONFIG
+LIBPNG-CONFIG :=libpng-config
+endif
 
 # updates Makefile.config if it's outdated
 ifneq ($(MAKEFILE_VERSION),$(CONFIG_VERSION))
+	ifndef MANUAL_CONFIG	# manual config should not check this
+		UPDATECONFIG:=upgradeconf
+		CONFIG_INCLUDED:=
+	else
+		# this should define SDL-CONFIG for manual configuration
+		ifeq ($(shell uname),FreeBSD)
+			SDL-CONFIG:=sdl11-config
+		else
+			SDL-CONFIG:=sdl-config
+		endif
+	endif
+endif
+
+ifndef SDL-CONFIG
 	UPDATECONFIG:=upgradeconf
 	CONFIG_INCLUDED:=
 endif
@@ -226,17 +248,6 @@ ifdef OSX
 	LDFLAGS+=-framework Cocoa
 endif
 
-ifdef WITH_SDL
-	ifndef SDL_CONFIG
-$(error WITH_SDL can't be used when SDL_CONFIG is not set. Edit Makefile.config to correct this)
-	endif
-endif
-
-ifdef WITH_PNG
-	ifndef LIBPNG_CONFIG
-$(error WITH_PNG can't be used when LIBPNG_CONFIG is not set. Edit Makefile.config to correct this)
-	endif
-endif
 
 ##############################################################################
 #
@@ -256,7 +267,7 @@ ENDIAN_CHECK=endian_check$(EXE)
 STRGEN=strgen/strgen$(EXE)
 OSXAPP="OpenTTD.app"
 
-REV := 0.4.8-RC1
+REV := 0.4.6
 
 # MorphOS needs builddate
 BUILDDATE=`date +%d.%m.%y`
@@ -402,22 +413,42 @@ endif
 # SDL config
 ifdef WITH_SDL
 CDEFS += -DWITH_SDL
-CFLAGS += $(shell $(SDL_CONFIG) --cflags)
+CFLAGS += $(shell $(SDL-CONFIG) --cflags)
 ifdef STATIC
-LIBS += $(shell $(SDL_CONFIG) --static-libs)
+LIBS += $(shell $(SDL-CONFIG) --static-libs)
 else
-LIBS += $(shell $(SDL_CONFIG) --libs)
+LIBS += $(shell $(SDL-CONFIG) --libs)
 endif
 endif
 
 # zlib config
 ifdef WITH_ZLIB
-	CDEFS += -DWITH_ZLIB
+	CDEFS +=  -DWITH_ZLIB
 	ifdef STATIC
 		ifdef OSX
-		# OSX links dynamically to zlib, even in static builds since it's always present in the system
+# zlib is default on OSX, so everybody have it. No need for static linking
 			LIBS += -lz
 		else
+			ifndef STATIC_ZLIB_PATH
+				ifndef MANUAL_CONFIG
+					# updates Makefile.config with the zlib path
+					UPDATECONFIG:=upgradeconf
+				endif
+				TEMP:=$(shell ls /lib 2>/dev/null | grep "zlib.a")$(shell ls /lib 2>/dev/null | grep "libz.a")
+				ifdef TEMP
+					STATIC_ZLIB_PATH:=/lib/$(TEMP)
+				else
+					TEMP:=$(shell ls /usr/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/lib 2>/dev/null | grep "libz.a")
+					ifdef TEMP
+						STATIC_ZLIB_PATH:=/usr/lib/$(TEMP)
+					else
+						TEMP:=$(shell ls /usr/local/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/local/lib 2>/dev/null | grep "libz.a")
+						ifdef TEMP
+							STATIC_ZLIB_PATH:=/usr/local/lib/$(TEMP)
+						endif
+					endif
+				endif
+			endif
 			LIBS += $(STATIC_ZLIB_PATH)
 		endif
 	else
@@ -428,19 +459,19 @@ endif
 # libpng config
 ifdef WITH_PNG
 CDEFS += -DWITH_PNG
-CFLAGS += $(shell $(LIBPNG_CONFIG) --cppflags --I_opts)
+CFLAGS += $(shell $(LIBPNG-CONFIG) --cppflags --I_opts)
 
 # seems like older libpng versions are broken and need this
 PNGCONFIG_FLAGS = --ldflags --libs
 ifdef STATIC
 ifdef OSX
 # Seems like we need a tiny hack for OSX static to work
-LIBS += $(shell $(LIBPNG_CONFIG) --prefix)/lib/libpng.a
+LIBS += $(shell $(LIBPNG-CONFIG) --prefix)/lib/libpng.a
 else
-LIBS += $(shell $(LIBPNG_CONFIG) --static $(PNGCONFIG_FLAGS))
+LIBS += $(shell $(LIBPNG-CONFIG) --static $(PNGCONFIG_FLAGS))
 endif
 else
-LIBS += $(shell $(LIBPNG_CONFIG)  --L_opts $(PNGCONFIG_FLAGS))
+LIBS += $(shell $(LIBPNG-CONFIG)  --L_opts $(PNGCONFIG_FLAGS))
 endif
 endif
 
@@ -669,7 +700,6 @@ SRCS += town_gui.c
 SRCS += train_cmd.c
 SRCS += train_gui.c
 SRCS += tree_cmd.c
-SRCS += tunnel_map.c
 SRCS += tunnelbridge_cmd.c
 SRCS += unmovable_cmd.c
 SRCS += vehicle.c
@@ -788,12 +818,9 @@ $(ENDIAN_CHECK): endian_check.c
 	$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
 
 
-ifndef NATIVE_OSX
-# OSX links in os/macosx/Makefile to handle universal binaries better
 $(TTD): $(OBJS) $(MAKE_CONFIG)
 	@echo '===> Linking $@'
 	$(Q)$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
-endif
 
 $(STRGEN): strgen/strgen.c endian_host.h
 	@echo '===> Compiling and Linking $@'
@@ -860,7 +887,7 @@ FORCE:
 clean:
 	@echo '===> Cleaning up'
 # endian.h is out-dated and no longer in use, so it can be removed soon
-	$(Q)rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) $(OSX_MIDI_PLAYER_FILE) endian.h endian_host.h endian_target.h $(ENDIAN_CHECK) .OSX
+	$(Q)rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) $(OSX_MIDI_PLAYER_FILE) endian.h endian_host.h endian_target.h $(ENDIAN_CHECK)
 
 mrproper: clean
 	$(Q)rm -rf $(MAKE_CONFIG)
@@ -967,8 +994,6 @@ endif
 	$(Q)$(CC) $(OBJCFLAGS) $(CDEFS) -MM $< | sed 's#^$(@F:%.d=%.o):#$@ $(@:.deps/%.d=%.o):#' > $@
 
 
-ifndef NATIVE_OSX
-# OSX uses os/macosx/Makefile to compile files
 %.o: %.c $(MAKE_CONFIG)
 	@echo '===> Compiling $<'
 	$(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $<
@@ -980,7 +1005,6 @@ ifndef NATIVE_OSX
 %.o: %.m  $(MAKE_CONFIG)
 	@echo '===> Compiling $<'
 	$(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $<
-endif
 
 %.o: %.rc
 	@echo '===> Compiling resource $<'

ai/ai.c

@@ -32,7 +32,7 @@ static void AI_DequeueCommands(byte player)
 
 		/* Copy the DP back in place */
 		_cmd_text = com->text;
-		DoCommandP(com->tile, com->p1, com->p2, com->callback, com->procc);
+		DoCommandP(com->tile, com->p1, com->p2, NULL, com->procc);
 
 		/* Free item */
 		entry_com = com->next;
@@ -46,7 +46,7 @@ static void AI_DequeueCommands(byte player)
  * Needed for SP; we need to delay DoCommand with 1 tick, because else events
  *  will make infinite loops (AIScript).
  */
-static void AI_PutCommandInQueue(PlayerID player, TileIndex tile, uint32 p1, uint32 p2, uint procc, CommandCallback* callback)
+static void AI_PutCommandInQueue(byte player, uint tile, uint32 p1, uint32 p2, uint procc)
 {
 	AICommand *com;
 
@@ -68,7 +68,6 @@ static void AI_PutCommandInQueue(PlayerID player, TileIndex tile, uint32 p1, uin
 	com->p1    = p1;
 	com->p2    = p2;
 	com->procc = procc;
-	com->callback = callback;
 	com->next  = NULL;
 	com->text  = NULL;
 
@@ -82,7 +81,7 @@ static void AI_PutCommandInQueue(PlayerID player, TileIndex tile, uint32 p1, uin
 /**
  * Executes a raw DoCommand for the AI.
  */
-int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc, CommandCallback* callback)
+int32 AI_DoCommand(uint tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
 {
 	PlayerID old_lp;
 	int32 res = 0;
@@ -123,12 +122,12 @@ int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint pr
 	/* Send the command */
 	if (_networking)
 		/* Network is easy, send it to his handler */
-		NetworkSend_Command(tile, p1, p2, procc, callback);
+		NetworkSend_Command(tile, p1, p2, procc, NULL);
 	else
 #endif
 		/* If we execute BuildCommands directly in SP, we have a big problem with events
 		 *  so we need to delay is for 1 tick */
-		AI_PutCommandInQueue(_current_player, tile, p1, p2, procc, callback);
+		AI_PutCommandInQueue(_current_player, tile, p1, p2, procc);
 
 	/* Set _local_player back */
 	_local_player = old_lp;
@@ -140,13 +139,6 @@ int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint pr
 	return res;
 }
 
-
-int32 AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc)
-{
-	return AI_DoCommandCc(tile, p1, p2, flags, procc, NULL);
-}
-
-
 /**
  * Run 1 tick of the AI. Don't overdo it, keep it realistic.
  */

ai/ai.h

@@ -11,7 +11,6 @@ typedef struct AICommand {
 	uint32 p1;
 	uint32 p2;
 	uint32 procc;
-	CommandCallback* callback;
 
 	char *text;
 	uint uid;
@@ -46,8 +45,7 @@ void AI_PlayerDied(PlayerID player);
 void AI_RunGameLoop(void);
 void AI_Initialize(void);
 void AI_Uninitialize(void);
-int32 AI_DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
-int32 AI_DoCommandCc(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc, CommandCallback* callback);
+int32 AI_DoCommand(uint tile, uint32 p1, uint32 p2, uint32 flags, uint procc);
 
 /** Is it allowed to start a new AI.
  * This function checks some boundries to see if we should launch a new AI.

ai/default/default.c

@@ -351,7 +351,7 @@ static void AiHandleReplaceAircraft(Player *p)
 	BackuppedOrders orderbak[1];
 	EngineID veh;
 
-	if (!IsAircraftHangarTile(v->tile) || !(v->vehstatus&VS_STOPPED)) {
+	if (!IsAircraftHangarTile(v->tile) && !(v->vehstatus&VS_STOPPED)) {
 		AiHandleGotoDepot(p, CMD_SEND_AIRCRAFT_TO_HANGAR);
 		return;
 	}
@@ -1620,9 +1620,8 @@ clear_town_stuff:;
 
 			/* signals too? */
 			if (j&3) {
-				/* XXX - we need to check manually whether we can build a signal if DC_EXEC is
-				   not set because the rail has not actually been built */
-				if (!IsTileType(c, MP_RAILWAY)) return CMD_ERROR;
+				// Can't build signals on a road.
+				if (IsTileType(c, MP_STREET)) return CMD_ERROR;
 
 				if (flag & DC_EXEC) {
 					j = 4 - j;
@@ -3575,7 +3574,7 @@ static void AiStateSellVeh(Player *p)
 
 			DoCommandByTile(0, v->index, 0, DC_EXEC, CMD_SELL_ROAD_VEH);
 		} else if (v->type == VEH_Aircraft) {
-			if (!IsAircraftHangarTile(v->tile) || !(v->vehstatus & VS_STOPPED)) {
+			if (!IsAircraftHangarTile(v->tile) && !(v->vehstatus&VS_STOPPED)) {
 				if (v->current_order.type != OT_GOTO_DEPOT)
 					DoCommandByTile(0, v->index, 0, DC_EXEC, CMD_SEND_AIRCRAFT_TO_HANGAR);
 				goto going_to_depot;

ai/trolly/build.c

@@ -6,7 +6,6 @@
 #include "../../functions.h"
 #include "../../map.h"
 #include "../../tile.h"
-#include "../../vehicle.h"
 #include "../../command.h"
 #include "trolly.h"
 #include "../../engine.h"
@@ -246,20 +245,6 @@ int AiNew_PickVehicle(Player *p)
 }
 
 
-void CcAI(bool success, TileIndex tile, uint32 p1, uint32 p2)
-{
-	Player* p = GetPlayer(_current_player);
-
-	if (success) {
-		p->ainew.state = AI_STATE_GIVE_ORDERS;
-		p->ainew.veh_id = _new_vehicle_id;
-	} else {
-		/* XXX this should be handled more gracefully */
-		p->ainew.state = AI_STATE_NOTHING;
-	}
-}
-
-
 // Builds the best vehicle possible
 int AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag)
 {
@@ -268,11 +253,7 @@ int AiNew_Build_Vehicle(Player *p, TileIndex tile, byte flag)
 
 	if (p->ainew.tbt == AI_TRAIN) return CMD_ERROR;
 
-	if (flag & DC_EXEC) {
-		return AI_DoCommandCc(tile, i, 0, flag, CMD_BUILD_ROAD_VEH, CcAI);
-	} else {
-		return AI_DoCommand(tile, i, 0, flag, CMD_BUILD_ROAD_VEH);
-	}
+	return AI_DoCommand(tile, i, 0, flag, CMD_BUILD_ROAD_VEH);
 }
 
 int AiNew_Build_Depot(Player *p, TileIndex tile, byte direction, byte flag)

ai/trolly/trolly.c

@@ -482,7 +482,7 @@ static void AiNew_State_LocateRoute(Player *p)
 					if (GetIndustry(p->ainew.temp)->produced_cargo[0] == GetIndustry(p->ainew.from_ic)->accepts_cargo[i]) {
 						// Found a compatbiel industry
 						found = true;
-						max_cargo = GetIndustry(p->ainew.temp)->total_production[0] - GetIndustry(p->ainew.temp)->total_transported[0];
+						max_cargo = GetIndustry(p->ainew.temp)->total_production[0] - GetIndustry(p->ainew.from_ic)->total_transported[0];
 						p->ainew.from_deliver = false;
 						p->ainew.to_deliver = true;
 						break;
@@ -1162,7 +1162,7 @@ static void AiNew_State_BuildVehicle(Player *p)
 	// Decrease the total counter
 	p->ainew.amount_veh--;
 	// Go give some orders!
-	p->ainew.state = AI_STATE_WAIT_FOR_BUILD;
+	p->ainew.state = AI_STATE_GIVE_ORDERS;
 }
 
 
@@ -1174,6 +1174,18 @@ static void AiNew_State_GiveOrders(Player *p)
 
 	assert(p->ainew.state == AI_STATE_GIVE_ORDERS);
 
+	// Get the new ID
+	/* XXX -- Because this AI isn't using any event-system, this is VERY dangerous!
+	 *  There is no way telling if the vehicle is already bought (or delayed by the
+	 *  network), and if bought, if not an other vehicle is bought in between.. in
+	 *  other words, there is absolutely no way knowing if this id is the true
+	 *  id.. soon this will all change, but for now, we needed something to test
+	 *  on ;) -- TrueLight -- 21-11-2005 */
+	if (p->ainew.tbt == AI_TRAIN) {
+	} else {
+		p->ainew.veh_id = _new_roadveh_id;
+	}
+
 	if (p->ainew.veh_main_id != (VehicleID)-1) {
 		AI_DoCommand(0, p->ainew.veh_id + (p->ainew.veh_main_id << 16), 0, DC_EXEC, CMD_CLONE_ORDER);
 
@@ -1318,7 +1330,6 @@ static AiNew_StateFunction* const _ainew_state[] = {
 	AiNew_State_BuildPath,
 	AiNew_State_BuildDepot,
 	AiNew_State_BuildVehicle,
-	NULL,
 	AiNew_State_GiveOrders,
 	AiNew_State_StartVehicle,
 	AiNew_State_RepayMoney,

ai/trolly/trolly.h

@@ -187,7 +187,6 @@ enum {
 	AI_STATE_BUILD_PATH,
 	AI_STATE_BUILD_DEPOT,
 	AI_STATE_BUILD_VEHICLE,
-	AI_STATE_WAIT_FOR_BUILD,
 	AI_STATE_GIVE_ORDERS,
 	AI_STATE_START_VEHICLE,
 	AI_STATE_REPAY_MONEY,

aircraft.h

@@ -1,16 +0,0 @@
-/* $Id$ */
-
-#include "station_map.h"
-#include "vehicle.h"
-
-
-static inline bool IsAircraftInHangar(const Vehicle* v)
-{
-	assert(v->type == VEH_Aircraft);
-	return v->vehstatus & VS_HIDDEN && IsHangarTile(v->tile);
-}
-
-static inline bool IsAircraftInHangarStopped(const Vehicle* v)
-{
-	return IsAircraftInHangar(v) && v->vehstatus & VS_STOPPED;
-}

aircraft_cmd.c

@@ -2,7 +2,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "aircraft.h"
 #include "debug.h"
 #include "functions.h"
 #include "table/strings.h"
@@ -131,7 +130,7 @@ static int32 EstimateAircraftCost(EngineID engine_type)
 /** Build an aircraft.
  * @param x,y tile coordinates of depot where aircraft is built
  * @param p1 aircraft type being built (engine)
- * @param p2 bit 0 when set, the unitnumber will be 0, otherwise it will be a free number
+ * @param p2 unused
  */
 int32 CmdBuildAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 {
@@ -160,7 +159,7 @@ int32 CmdBuildAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 		return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
 	}
 
-	unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Aircraft);
+	unit_num = GetFreeUnitNumber(VEH_Aircraft);
 	if (unit_num > _patches.max_aircraft)
 		return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
 
@@ -313,6 +312,16 @@ bool IsAircraftHangarTile(TileIndex tile)
 				(_m[tile].m5 == 32 || _m[tile].m5 == 65 || _m[tile].m5 == 86);
 }
 
+bool CheckStoppedInHangar(const Vehicle* v)
+{
+	if (!(v->vehstatus & VS_STOPPED) || !IsAircraftHangarTile(v->tile)) {
+		_error_message = STR_A01B_AIRCRAFT_MUST_BE_STOPPED;
+		return false;
+	}
+
+	return true;
+}
+
 
 static void DoDeleteAircraft(Vehicle *v)
 {
@@ -336,8 +345,8 @@ int32 CmdSellAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 
 	v = GetVehicle(p1);
 
-	if (v->type != VEH_Aircraft || !CheckOwnership(v->owner)) return CMD_ERROR;
-	if (!IsAircraftInHangarStopped(v)) return_cmd_error(STR_A01B_AIRCRAFT_MUST_BE_STOPPED);
+	if (v->type != VEH_Aircraft || !CheckOwnership(v->owner) || !CheckStoppedInHangar(v))
+		return CMD_ERROR;
 
 	SET_EXPENSES_TYPE(EXPENSES_NEW_VEHICLES);
 
@@ -463,7 +472,7 @@ int32 CmdRefitAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	v = GetVehicle(p1);
 
 	if (v->type != VEH_Aircraft || !CheckOwnership(v->owner)) return CMD_ERROR;
-	if (!IsAircraftInHangarStopped(v)) return_cmd_error(STR_A01B_AIRCRAFT_MUST_BE_STOPPED);
+	if (!CheckStoppedInHangar(v)) return_cmd_error(STR_A01B_AIRCRAFT_MUST_BE_STOPPED);
 
 	avi = AircraftVehInfo(v->engine_type);
 
@@ -1198,7 +1207,7 @@ static void AircraftEntersTerminal(Vehicle *v)
 	if (old_order.type == OT_GOTO_STATION &&
 			v->current_order.station == v->last_station_visited) {
 		v->current_order.flags =
-			(old_order.flags & (OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER)) | OF_NON_STOP;
+			(old_order.flags & (OF_FULL_LOAD | OF_UNLOAD)) | OF_NON_STOP;
 	}
 
 	SET_EXPENSES_TYPE(EXPENSES_AIRCRAFT_INC);

aircraft_gui.c

@@ -2,7 +2,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "aircraft.h"
 #include "debug.h"
 #include "functions.h"
 #include "table/sprites.h"
@@ -493,6 +492,7 @@ static const Widget _aircraft_view_widgets[] = {
 { WIDGETS_END }
 };
 
+bool CheckStoppedInHangar(const Vehicle* v); /* XXX extern function declaration in .c */
 
 static void AircraftViewWndProc(Window *w, WindowEvent *e)
 {
@@ -502,7 +502,9 @@ static void AircraftViewWndProc(Window *w, WindowEvent *e)
 		uint32 disabled = 1 << 8;
 		StringID str;
 
-		if (IsAircraftInHangarStopped(v)) disabled = 0;
+		if (v->vehstatus & VS_STOPPED && IsAircraftHangarTile(v->tile)) {
+			disabled = 0;
+		}
 
 		if (v->owner != _local_player) disabled |= 1 << 8 | 1 << 7;
 		w->disabled_state = disabled;
@@ -595,7 +597,7 @@ static void AircraftViewWndProc(Window *w, WindowEvent *e)
 
 	case WE_MOUSELOOP: {
 		const Vehicle* v = GetVehicle(w->window_number);
-		uint32 h = IsAircraftInHangarStopped(v) ? 1 << 7 : 1 << 11;
+		uint32 h = CheckStoppedInHangar(v) ? (1 << 7) : (1 << 11);
 
 		if (h != w->hidden_state) {
 			w->hidden_state = h;
@@ -1031,7 +1033,7 @@ static void PlayerAircraftWndProc(Window *w, WindowEvent *e)
 			DrawVehicleProfitButton(v, x, y + 13);
 
 			SetDParam(0, v->unitnumber);
-			if (IsAircraftInHangar(v)) {
+			if (IsAircraftHangarTile(v->tile) && (v->vehstatus & VS_HIDDEN)) {
 				str = STR_021F;
 			} else {
 				str = v->age > v->max_age - 366 ? STR_00E3 : STR_00E2;

bridge_map.h

@@ -1,64 +0,0 @@
-/* $Id$ */
-
-#ifndef BRIDGE_MAP_H
-#define BRIDGE_MAP_H
-
-#include "direction.h"
-#include "macros.h"
-#include "map.h"
-#include "rail.h"
-#include "tile.h"
-
-
-static inline bool IsBridge(TileIndex t)
-{
-	assert(IsTileType(t, MP_TUNNELBRIDGE));
-	return HASBIT(_m[t].m5, 7);
-}
-
-static inline bool IsBridgeTile(TileIndex t)
-{
-	return IsTileType(t, MP_TUNNELBRIDGE) && IsBridge(t);
-}
-
-
-static inline bool IsBridgeRamp(TileIndex t)
-{
-	assert(IsBridgeTile(t));
-	return !HASBIT(_m[t].m5, 6);
-}
-
-static inline bool IsBridgeMiddle(TileIndex t)
-{
-	assert(IsBridgeTile(t));
-	return HASBIT(_m[t].m5, 6);
-}
-
-
-/**
- * Get the direction pointing onto the bridge
- */
-static inline DiagDirection GetBridgeRampDirection(TileIndex t)
-{
-	assert(IsBridgeRamp(t));
-	/* Heavy wizardry to convert the X/Y (bit 0) + N/S (bit 5) encoding of
-	 * bridges to a DiagDirection
-	 */
-	return (DiagDirection)((6 - (_m[t].m5 >> 4 & 2) - (_m[t].m5 & 1)) % 4);
-}
-
-
-static inline Axis GetBridgeAxis(TileIndex t)
-{
-	assert(IsBridgeMiddle(t));
-	return (Axis)GB(_m[t].m5, 0, 1);
-}
-
-
-static inline bool IsTransportUnderBridge(TileIndex t)
-{
-	assert(IsBridgeMiddle(t));
-	return HASBIT(_m[t].m5, 5);
-}
-
-#endif

callback_table.c

@@ -53,8 +53,6 @@ CommandCallback CcBuildWagon;
 CommandCallback CcBuildLoco;
 CommandCallback CcCloneTrain;
 
-CommandCallback CcAI;
-
 CommandCallback *_callback_table[] = {
 	/* 0x00 */ NULL,
 	/* 0x01 */ CcBuildAircraft,
@@ -81,7 +79,6 @@ CommandCallback *_callback_table[] = {
 	/* 0x16 */ CcCloneRoadVeh,
 	/* 0x17 */ CcCloneShip,
 	/* 0x18 */ CcCloneTrain,
-	/* 0x19 */ CcAI
 };
 
 const int _callback_table_count = lengthof(_callback_table);

changelog.txt

@@ -1,71 +1,4 @@
-0.4.8-RC1 (2006-06-28)
-------------------------------------------------------------------------
-- Feature: Add Turkish town names as we have an official Turkish translation
-- Feature: Add a fully optional configure script that is a wrapper around the cumbersome makefile.config
-- Codechange: [NPF] Disable NPF totally for ships as it wholly kills performance (blathijs). Only for 0.4/ branch and 0.4.8.
-- Fix: Redraw the screen when switching the signal side in the patches window
-- Fix: It was possible to dig into a tunnel if certain rail combinations were ontop of it
-- Fix: A HQ could only be flooded at its northern tile, the other 3 were immune to water
-- Fix: Fix several glitches concerning foundations. Houses, property (rail/road/bridge/etc.) and cursor are now aligned properly
-- Fix: Prohibit altering a road tile while road works are in progress. This fixes some glitches like "turning" the excavation by adding/removing road bits or removing the road piece
-- Fix: Only advertise the server to your external IP/network (eg not to 127.0.0.1) and use proper broadcast addresses
-- Fix: '-f' switch is not valid on windows, so don't show it in help
-- Fix: [autoreplace] Autoreplaced trains can leave all wagons in depot under certain circumstances
-- Fix: The wrong IP could get unbanned, e.g. 'unban 1.2.3.42' could result in unbanning 1.2.3.4
-- Fix: It was possible to convert the railtype of a bridge while a train was on it
-- Fix: It was possible to rename signs or waypoints with the chat box
-- Fix: Be more strict what it means for an aircraft to be in a hangar: It's not just being stopped on a hangar tile
-- Fix: If a road vehicle is on a road depot tile and stopped doesn't mean it's in the depot. Use the proper test for this
-- Fix: [AI] The AI should send a plane into a hangar if it's not in a hangar _or_ not stopped, not when it's not in a hangar _and_ not stopped
-- Fix: [AI] The trolly AI used information from the wrong industry when calculating the amount of to be transported goods
-- Fix: [NTP] Fix NTP over bridges: don't check the rail type when on a bridge
-- Fix: Truncate text in dropdown lists to stop text overflowing.
-- Fix: "Erroneous train reversal on waypoints". When processing the next train order, do not even consider reversing the train if the last order was to a waypoint.
-- Fix: Starting a new scenario did not adhere to local difficulty settings but took it from the scenario itself. That mode is for 'play scenario'
-- Fix: Vehicles on a sloped tile under a bridge were affected by the bridge speed limit
-- Fix: Issue with train pathfinding over level crossings.
-- Fix: [AI] The AI no longer attempts to build signals under bridges.
-- Fix: Refresh build vehicle window (if opened) when converting rail depot
-- Fix: Crash when sorting an empty server list.
-- Fix: The build-tree window button defaulted to a place-push-button on opening where no treetype is selected.
-- Fix: Game crashes when cloning/autoreplace reaches train-limit
-- Fix: [NTP] properly check for railtypes on non-plain-rail-tiles
-- Fix: Trains could enter certain sloped rail tiles under bridges with incompatible rail type
-- Fix: Ensure the map memory is cleared after it is allocated. This fixes random deserts that sometimes occurred.
-- Fix: Some weird behaviour with tile selection near bridges
-- Fix: Don't allow PF to enter train depot from the back (signal updates)
-- Fix: Game no longer crashes when the last vehicle servicing a station has been deleted
-- Fix: Reset the last built railtype when starting a new game
-- Fix: Cloned vehicles get the same service interval as the original vehicle
-- Fix: Game no longer errors out when "Many random towns" is selected in the scenario editor.
-- Fix: Obscure road dragging bug. The road build command did not return the appropiate error message of invalid-slope when building road.
-- Fix: Temperate bank will no longer appear (during game) in tropic landscape. This bug is from the original game.
-- Fix: Specify the 'stopall' console command as a debug command.
-- Fix: Fixed a problem that caused DeliverGoodsToIndustry to not work as intended
-- Fix: Ships and aircraft can now be used as feeders as well
-- Fix: When a multiheaded train is sold the pointers were not updated correctly causing sporadious crashes/disconnects.
-- Fix: New plantations now cause the correct ".. being planted .." news item
-- Fix: Danish town names were saved/loaded as Swiss
-- Fix: Removing roads on crossings was done without a check for ownership
-- Fix: [autoreplace] Fix drawing of train list for outdated engines
-- Fix: Malicious clients/servers could crash the game
-- Fix: [autoreplace] allow replacement of wagons even when the engine fails to be replaced
-- Fix: Certain operations involving trains inside a depot could cause a crash
-- Fix: [autoreplace] cost for refitting a new vehicle is added to the cost animation (player always paid for it, it just wasn't shown)
-- Fix: [OSX] Save/Load issues solved for OSX 10.3.9 universal binaries
-- Fix: Illegal servers in the master-server list could kick the client back to the main menu, effectively making Multiplayer impossible
-- Fix: [NPF] Don't mark tiles when debugging in multiplayer, this will cause desyncs
-- Fix: Several fixes to chatbox code, mainly plug a buffer overflow
-
-0.4.7 (2006-03-26)
-------------------------------------------------------------------------
-
-- Feature: [OSX] Add support for triple-binaries (PPC, PPC970, i386) (r4102)
-- Fix: [OSX] crash when going to fullscreen (r4100)
-- Fix: Allow unused wagons to have their first cache set. Fixes faulty cache-warning message and noticably speeds up depot operations (r4094)
-- Fix: [NPF] Trains & busses were unable to find a route when leaving a depot or bus stop. (r4072)
-
-0.4.6 (2006-03-22)
+t 0.4.6 (2006-03-22)
 ------------------------------------------------------------------------
 
 - Codechange: [win32] Show the revision in crash.txt and enable the button to show the crash text in the crash-window (r3965)

clear_cmd.c

@@ -9,7 +9,6 @@
 #include "tile.h"
 #include "viewport.h"
 #include "command.h"
-#include "tunnel_map.h"
 #include "variables.h"
 #include "table/sprites.h"
 
@@ -87,59 +86,23 @@ static void TerraformAddDirtyTileAround(TerraformerState *ts, TileIndex tile)
 static int TerraformProc(TerraformerState *ts, TileIndex tile, int mode)
 {
 	int r;
-	int32 ret;
 
 	assert(tile < MapSize());
 
-	r = TerraformAllowTileProcess(ts, tile);
-	if (r <= 0) return r;
+	if ((r=TerraformAllowTileProcess(ts, tile)) <= 0)
+		return r;
 
-	if (IsTileType(tile, MP_RAILWAY)) {
-		static const TrackBits safe_track[] = { TRACK_BIT_LOWER, TRACK_BIT_LEFT, TRACK_BIT_UPPER, TRACK_BIT_RIGHT };
-		static const Slope unsafe_slope[] = { SLOPE_S, SLOPE_W, SLOPE_N, SLOPE_E };
+	if (!IsTileType(tile, MP_RAILWAY)) {
+		int32 ret = DoCommandByTile(tile, 0,0, ts->flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
 
-		Slope tileh;
-		uint z;
-
-		// Nothing could be built at the steep slope - this avoids a bug
-		// when you have a single diagonal track in one corner on a
-		// basement and then you raise/lower the other corner.
-		tileh = GetTileSlope(tile, &z);
-		if (tileh == unsafe_slope[mode] ||
-				tileh == ComplementSlope(unsafe_slope[mode])) {
+		if (CmdFailed(ret)) {
 			_terraform_err_tile = tile;
-			_error_message = STR_1008_MUST_REMOVE_RAILROAD_TRACK;
 			return -1;
 		}
 
-		// If we have a single diagonal track there, the other side of
-		// tile can be terraformed.
-		if (IsPlainRailTile(tile) && GetTrackBits(tile) == safe_track[mode]) {
-			/* If terraforming downwards prevent damaging a potential tunnel below.
-			 * This check is only necessary for flat tiles, because if the tile is
-			 * non-flat, then the corner opposing the rail is raised. Only this corner
-			 * can be lowered and this is a safe action
-			 */
-			if (tileh == SLOPE_FLAT &&
-					ts->direction == -1 &&
-					IsTunnelInWay(tile, z - TILE_HEIGHT)) {
-				_terraform_err_tile = tile;
-				_error_message = STR_1002_EXCAVATION_WOULD_DAMAGE;
-				return -1;
-			}
-			return 0;
-		}
+		ts->cost += ret;
 	}
 
-	ret = DoCommandByTile(tile, 0,0, ts->flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
-
-	if (ret == CMD_ERROR) {
-		_terraform_err_tile = tile;
-		return -1;
-	}
-
-	ts->cost += ret;
-
 	if (ts->tile_table_count >= 625) return -1;
 	ts->tile_table[ts->tile_table_count++] = tile;
 
@@ -232,6 +195,7 @@ int32 CmdTerraformLand(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 
 	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
 
+	_error_message = INVALID_STRING_ID;
 	_terraform_err_tile = 0;
 
 	ts.direction = direction = p2 ? 1 : -1;
@@ -270,26 +234,35 @@ int32 CmdTerraformLand(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 					return CMD_ERROR;
 	}
 
-	if (direction == -1) {
-		/* Check if tunnel would take damage */
+	{ /* Check if tunnel or track would take damage */
 		int count;
 		TileIndex *ti = ts.tile_table;
 
 		for (count = ts.tile_table_count; count != 0; count--, ti++) {
-			uint z, t;
+			uint a, b, c, d, r, min;
 			TileIndex tile = *ti;
 
-			z = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 0));
-			t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 0));
-			if (t <= z) z = t;
-			t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 1));
-			if (t <= z) z = t;
-			t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 1));
-			if (t <= z) z = t;
+			_terraform_err_tile = tile;
 
-			if (IsTunnelInWay(tile, z * TILE_HEIGHT)) {
-				return_cmd_error(STR_1002_EXCAVATION_WOULD_DAMAGE);
+			a = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 0));
+			b = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 0));
+			c = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 1));
+			d = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 1));
+
+			r = GetTileh(a, b, c, d, &min);
+
+			if (IsTileType(tile, MP_RAILWAY)) {
+				if (IsSteepTileh(r)) return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
+
+				if (IsPlainRailTile(tile)) {
+					extern const TrackBits _valid_tileh_slopes[2][15];
+					if (GetTrackBits(tile) & ~_valid_tileh_slopes[0][r]) return_cmd_error(STR_1008_MUST_REMOVE_RAILROAD_TRACK);
+				} else return_cmd_error(STR_5800_OBJECT_IN_THE_WAY);
 			}
+
+			if (direction == -1 && !CheckTunnelInWay(tile, min)) return_cmd_error(STR_1002_EXCAVATION_WOULD_DAMAGE);
+
+			_terraform_err_tile = 0;
 		}
 	}
 

configure

@@ -1,276 +0,0 @@
-#!/bin/sh
-
-# This 'configure' script is a very easy wrapper around 'make updateconf'
-#  It allows cross-compilers to do their job much more easy.
-
-function showhelp() {
-	echo "Configure for OpenTTD"
-	echo ""
-	echo "Usage:"
-	echo " $0 --your_options"
-	echo ""
-	echo "Params:"
-	echo " --debug            Create debug-release                [no]"
-	echo " --profile          Create profile-release              [no]"
-	echo " --dedicated        Make a dedicated build              [no]"
-	echo " --revision         Set the revision of the compilation [detected]"
-	echo " --target-cc        Sets the target-compiler            [\$CC]"
-	echo " --target-cxx       Sets the C++ target-compiler        []"
-	echo " --host-cc          Sets the host-compiler              [\$CC]"
-	echo " --os               Sets the OS. Listens to:            [detected]"
-	echo "                       UNIX, OSX, FREEBSD, MORPHOS"
-	echo "                       BEOS, SUNOS, CYGWIN, MINGW"
-	echo " --windres          Sets the windres (Windows)          [windres]"
-	echo " --force-le         Force LE platform                   [no]"
-	echo " --force-be         Force BE platform                   [no]"
-	echo ""
-	echo "Params that can be used with --with or --without"
-	echo "   (e.g.: --without-static disables static (default))"
-	echo " static             Do you want a static build?         [no]"
-	echo " directmusic        Do you want direct-music?           [no]"
-	echo " zlib               Do you want zlib-support?           [yes]"
-	echo " sdl                Do you want SDL-support?            [yes]"
-	echo " png                Do you want PNG-support?            [yes]"
-	echo " cocoa              Do you want cocoa-support? (MacOSX) [no]"
-	echo ""
-	echo "Params used to configure external libs:"
-	echo " --static-zlib-path Set the path to your static zlib    []"
-	echo " --sdl-config       Where is your sdl-config            [sdl-config]"
-	echo " --libpng-config    Where is your libpng-config         [libpng-config]"
-	echo " "
-}
-
-function handle() {
-	PARAM="$PARAM \"$1=`awk 'BEGIN { FS="="; $0="'"$2"'"; print $2;}'`\""
-}
-
-# The things you can use inside this case:
-#  handle NAME VALUE - Sets the value to give the 'make upgradeconf'
-#                         Value is in form: tag=REAL_VALUE
-#  ITEM="NAME"       - Will set the value as above, only with the next param
-#  SITEM="NAME"      - Will set the var $NAME to the next param
-for n in "$@"
-do
-	case "$n" in
-		--help | -h)
-			showhelp
-			exit 0
-			;;
-
-		--debug)
-			DEBUG_SET=1
-			ITEM="DEBUG"
-			;;
-		--debug=*)
-			handle "DEBUG" "$n"
-			;;
-		--profile)
-			PARAM="$PARAM PROFILE=1"
-			;;
-		--dedicated)
-			PARAM="$PARAM DEDICATED=1"
-			;;
-		--revision=*)
-			RELEASE=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
-			;;
-		--revision)
-			SITEM="RELEASE"
-			;;
-		--target-cc=*)
-			handle "CC_TARGET" "$n"
-			;;
-		--target-cc)
-			ITEM="CC_TARGET"
-			;;
-		--target-cxx=*)
-			TARGET_CXX=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
-			;;
-		--target-cxx)
-			SITEM="TARGET_CXX"
-			;;
-		--host-cc=*)
-			handle CC_HOST "$n"
-			;;
-		--host-cc)
-			ITEM="CC_HOST"
-			;;
-		--host-cflags=*)
-			handle CFLAGS_HOST "$n"
-			;;
-		--host-cflags)
-			ITEM="CFLAGS_HOST"
-			;;
-		--os=*)
-			TARGET_OS=`awk 'BEGIN { FS="="; $0="'"$n"'"; print $2;}'`
-			;;
-		--os)
-			SITEM="TARGET_OS"
-			;;
-		--windres=*)
-			handle WINDRES "$n"
-			;;
-		--windres)
-			ITEM="WINDRES"
-			;;
-		--force-le)
-			PARAM="$PARAM ENDIAN_FORCE=LE"
-			;;
-		--force-be)
-			PARAM="$PARAM ENDIAN_FORCE=BE"
-			;;
-
-		--with-static)
-			PARAM="$PARAM STATIC=1"
-			;;
-		--without-static)
-			PARAM="$PARAM STATIC="
-			;;
-		--with-directmusic)
-			PARAM="$PARAM WITH_DIRECTMUSIC=1"
-			;;
-		--without-directmusic)
-			PARAM="$PARAM WITH_DIRECTMUSIC="
-			;;
-		--with-zlib)
-			PARAM="$PARAM WITH_ZLIB=1"
-			;;
-		--without-zlib)
-			PARAM="$PARAM WITH_ZLIB="
-			;;
-		--with-sdl)
-			PARAM="$PARAM WITH_SDL=1"
-			;;
-		--without-sdl)
-			PARAM="$PARAM WITH_SDL="
-			;;
-		--with-png)
-			PARAM="$PARAM WITH_PNG=1"
-			;;
-		--without-png)
-			PARAM="$PARAM WITH_PNG="
-			;;
-		--with-cocoa)
-			PARAM="$PARAM WITH_COCOA=1"
-			;;
-		--without-cocoa)
-			PARAM="$PARAM WITH_COCOA="
-			;;
-		--static-zlib-path=*)
-			handle STATIC_ZLIB_PATH "$n"
-			;;
-		--static-zlib-path)
-			ITEM="STATIC_ZLIB_PATH"
-			;;
-		--sdl-config=*)
-			handle SDL_CONFIG "$n"
-			;;
-		--sdl-config)
-			ITEM="SDL_CONFIG"
-			;;
-		--libpng-config=*)
-			handle LIBPNG_CONFIG "$n"
-			;;
-		--lib-png-config)
-			ITEM="LIBPNG_CONFIG"
-			;;
-
-		--*=*)
-			echo -n "Unknown switch "
-			echo `awk 'BEGIN { FS="="; $0="'"$n"'"; print $1;}'`
-			exit 1
-			;;
-		-*)
-			echo "Unknown switch $n"
-			exit 1
-			;;
-
-		*)
-			if ! test -z "$ITEM"
-			then
-				PARAM="$PARAM $ITEM=\"$n\""
-				ITEM="";
-			elif ! test -z "$SITEM"
-			then
-				export $SITEM="$n"
-				SITEM=""
-			else
-				echo "Unknown switch $n"
-				exit 1
-			fi
-			;;
-	esac
-done
-
-if ! test -z "$TARGET_OS"
-then
-	TARGET_OS=`echo $TARGET_OS | tr '[:lower:]' '[:upper:]'`
-	case "$TARGET_OS" in
-		WIN32)
-			PARAM="$PARAM WIN32=1"
-			;;
-		UNIX)
-			PARAM="$PARAM UNIX=1"
-			;;
-		OSX)
-			PARAM="$PARAM OSX=1 UNIX=1"
-			;;
-		FREEBSD)
-			PARAM="$PARAM FREEBSD=1"
-			;;
-		MORPHOS)
-			PARAM="$PARAM MORPHOS=1 UNIX=1"
-			;;
-		BEOS)
-			PARAM="$PARAM BEOS=1 UNIX=1"
-			;;
-		SUNOS)
-			PARAM="$PARAM SUNOS=1 UNIX=1"
-			;;
-		CYGWIN)
-			PARAM="$PARAM CYGWIN=1 WIN32=1"
-			;;
-		MINGW)
-			PARAM="$PARAM MINGW=1 WIN32=1"
-			;;
-		*)
-			echo "Unknown OS: $TARGET_OS"
-			exit 1
-			;;
-	esac
-	PARAM="$PARAM BYPASS_OS_DETECT=1"
-fi
-
-if ! test -z "$DEBUG_SET"
-then
-	if test -z "`echo $PARAM | grep "DEBUG="`"
-	then
-		# Someone did --debug, without assigning a value, assume 1
-		PARAM="$PARAM DEBUG=1"
-	fi
-fi
-
-# First remove the Makefile.config, else you can have double entries
-if test -e "Makefile.config"
-then
-	rm -f Makefile.config
-fi
-
-echo "make upgradeconf $PARAM" > Makefile.run
-. Makefile.run
-rm -f Makefile.run
-
-# Makefile.config currently doesn't support custom CXX, so, we add the line
-#  ourself!
-
-if ! test -z "$TARGET_CXX"
-then
-	echo "CXX=$TARGET_CXX" >> Makefile.config
-fi
-
-# Same for RELEASE (read: REVISION)
-
-if ! test -z "$RELEASE"
-then
-	echo "RELEASE=$RELEASE" >> Makefile.config
-fi
-

console.c

@@ -224,7 +224,7 @@ void IConsoleInit(void)
 	memset(_iconsole_buffer, 0, sizeof(_iconsole_buffer));
 	memset(_iconsole_cbuffer, 0, sizeof(_iconsole_cbuffer));
 	_iconsole_cmdline.buf = calloc(ICON_CMDLN_SIZE, sizeof(*_iconsole_cmdline.buf)); // create buffer and zero it
-	_iconsole_cmdline.maxlength = ICON_CMDLN_SIZE;
+	_iconsole_cmdline.maxlength = ICON_CMDLN_SIZE - 1;
 
 	IConsolePrintF(13, "OpenTTD Game Console Revision 7 - %s", _openttd_revision);
 	IConsolePrint(12,  "------------------------------------");

console_cmds.c

@@ -91,6 +91,28 @@ static void IConsoleHelp(const char *str)
 	IConsolePrintF(_icolour_warn, "- %s", str);
 }
 
+DEF_CONSOLE_CMD(ConStopAllVehicles)
+{
+	Vehicle* v;
+	if (argc == 0) {
+		IConsoleHelp("Stops all vehicles in the game. For debugging only! Use at your own risk... Usage: 'stopall'");
+		return true;
+	}
+
+	FOR_ALL_VEHICLES(v) {
+		if (IsValidVehicle(v)) {
+			/* Code ripped from CmdStartStopTrain. Can't call it, because of
+			 * ownership problems, so we'll duplicate some code, for now */
+			if (v->type == VEH_Train)
+				v->u.rail.days_since_order_progr = 0;
+			v->vehstatus |= VS_STOPPED;
+			InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
+			InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
+		}
+	}
+	return true;
+}
+
 DEF_CONSOLE_CMD(ConResetEngines)
 {
 	if (argc == 0) {
@@ -121,28 +143,6 @@ DEF_CONSOLE_CMD(ConResetTile)
 
 	return false;
 }
-
-DEF_CONSOLE_CMD(ConStopAllVehicles)
-{
-	Vehicle* v;
-	if (argc == 0) {
-		IConsoleHelp("Stops all vehicles in the game. For debugging only! Use at your own risk... Usage: 'stopall'");
-		return true;
-	}
-
-	FOR_ALL_VEHICLES(v) {
-		if (IsValidVehicle(v)) {
-			/* Code ripped from CmdStartStopTrain. Can't call it, because of
-			 * ownership problems, so we'll duplicate some code, for now */
-			if (v->type == VEH_Train)
-				v->u.rail.days_since_order_progr = 0;
-			v->vehstatus |= VS_STOPPED;
-			InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
-			InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);
-		}
-	}
-	return true;
-}
 #endif /* _DEBUG */
 
 DEF_CONSOLE_CMD(ConScrollToTile)
@@ -433,7 +433,7 @@ DEF_CONSOLE_CMD(ConUnBan)
 	for (i = 0; i < lengthof(_network_ban_list); i++) {
 		if (_network_ban_list[i] == NULL) continue;
 
-		if (strcmp(_network_ban_list[i], argv[1]) == 0 || index == i) {
+		if (strncmp(_network_ban_list[i], argv[1], strlen(_network_ban_list[i])) == 0 || index == i) {
 			free(_network_ban_list[i]);
 			_network_ban_list[i] = NULL;
 			IConsolePrint(_icolour_def, "IP unbanned.");
@@ -1321,7 +1321,6 @@ static void IConsoleDebugLibRegister(void)
 
 	IConsoleVarRegister("con_developer",    &_stdlib_con_developer, ICONSOLE_VAR_BOOLEAN, "Enable/disable console debugging information (internal)");
 	IConsoleCmdRegister("resettile",        ConResetTile);
-	IConsoleCmdRegister("stopall",          ConStopAllVehicles);
 	IConsoleAliasRegister("dbg_echo",       "echo %A; echo %B");
 	IConsoleAliasRegister("dbg_echo2",      "echo %!");
 }
@@ -1365,6 +1364,7 @@ void IConsoleStdLibRegister(void)
 	IConsoleCmdRegister("cd",           ConChangeDirectory);
 	IConsoleCmdRegister("pwd",          ConPrintWorkingDirectory);
 	IConsoleCmdRegister("clear",        ConClearBuffer);
+	IConsoleCmdRegister("stopall",      ConStopAllVehicles);
 
 	IConsoleAliasRegister("dir",      "ls");
 	IConsoleAliasRegister("del",      "rm %+");
@@ -1378,6 +1378,7 @@ void IConsoleStdLibRegister(void)
 	/* networking variables and functions */
 #ifdef ENABLE_NETWORK
 	/* Network hooks; only active in network */
+	IConsoleCmdHookAdd ("stopall",      ICONSOLE_HOOK_ACCESS, ConHookNoNetwork);
 	IConsoleCmdHookAdd ("resetengines", ICONSOLE_HOOK_ACCESS, ConHookNoNetwork);
 
 	/*** Networking commands ***/

direction.h

@@ -1,30 +0,0 @@
-/* $Id$ */
-
-#ifndef DIRECTION_H
-#define DIRECTION_H
-
-
-/* the 2 axis */
-typedef enum Axis {
-	AXIS_X = 0,
-	AXIS_Y = 1,
-	AXIS_END
-} Axis;
-
-
-static inline Axis DiagDirToAxis(uint d)
-{
-	return (Axis)(d & 1);
-}
-
-
-/*
- * Converts an Axis to a DiagDirection
- * Points always in the positive direction, i.e. S[EW]
- */
-static inline uint AxisToDiagDir(Axis a)
-{
-	return (uint)(2 - a);
-}
-
-#endif

docs/OSX_why_multiple_applications.txt

@@ -1,10 +0,0 @@
-There are currently two different downloads for OSX, one is named osx, while the other one is named osx-jaguar
-
-The reason for this is that Apple added more functionality to 10.3 and to make use of that, it will no longer run on OSX 10.2 (codenamed Jaguar). To make the game useable on Jaguar, then a special download is available, but it will miss the bugfixes/features, that relies on newer functionality.
-
-The general download is a universal binary and should work great on all macs using 10.3.9 or newer, no matter what processor it got. You should at all time avoid the Jaguar Build if possible.
-
-Technically the universal binary is a triple binary because it contains code for 3 CPUs and the CPUs in question are PPC (G3+G4), G5 and Intel. The Jaguar build is only optimised for PPC and other (newer) CPUs will not benefit so much from their advanced features. This is another reason to avoid the Jaguar build. It's generally slower on modern CPUs.
-
-Current list of missing features in the Jaguar build:
--Can't save screenshots or savegames if certain chars are in the filename. This mainly applies to European chars and hits German hard as the month Mär (Mar) can't be saved

docs/README_if_game_crashed_on_OSX.txt

@@ -0,0 +1,36 @@
+Since you are reading this, OpenTTD have crashed. This file tells you how 
+to fix the most common problems or make to make a bug report, that the 
+developers can use to track down the problem
+
+If it is an assert, OpenTTD will open the console for you, if it is truly a crash, you have to do it yourself. The Console is located at /Applications/Utilities/Console.
+The problem is near the button of the page
+
+The problems are as follows:
+NOTE: build from source means to download the source and compile 
+yourself. If you get one of the build from source error with the version 
+that is downloaded on a dmg file, you should make a bug report
+
+--Didn't find a needed file:
+	you just give it the file it asks for. It even tells you what 
+folder it wants it in
+	most common version of this problem is "Error: Cannot open file 
+'data/sample.cat'"
+	if you get that one, that means that you haven't got all the 
+needed files from the WINDOWS version of TTD
+	or if you build from source, 
+
+--Error: No available language packs
+	you need at least one .lng file in your lang folder. This applies 
+only to people who build from source
+
+--spritecache.c:237: failed assertion `b'
+	you got an outdated grf file. Update from the data folder in the 
+source. This applies only to people, who build from 	source
+
+--assertion error that are not triggered by one of the errors listed in 
+this file:
+	you most likely found a bug. Write down the assertion and try to 
+see if you can reproduce it. If you can, make a
+	savegame from just before it happens (autosaves are useful here) 
+and post a bugreport with it on sourceforge
+	Write what you did to trigger the bug and what assertion it made

docs/Readme_OS2.txt

@@ -15,13 +15,15 @@ LIBRARIES REQUIRED FOR END USERS
 
 SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program:
 these can be downloaded from the Files section at
-http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
-Version 20051222 of SDL or later is required. This can be found at
-http://sdl.netlabs.org/.
+http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
+(Note that a newer version of SDL is now available at
+ftp://ftp.netlabs.org/pub/sdl/sdl-dev-os2-2004-12-22.zip which may
+help solve some problems).
 
-Please note that earlier SDL releases will probably NOT work with
-OpenTTD. If you experience problems with OpenTTD, please check
-your SDL and FSLib.dll versions (both must match).
+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
@@ -94,12 +96,13 @@ provided, they are not designed for Watcom (apart from SDL):
   http://www.libpng.org/ - contains an EMX/gcc makefile, ignore this
 
 - SDL for OS/2
-  ftp://ftp.netlabs.org/pub/sdl/sdl-1.2.7-src-20051222.zip used for
-  0.4.7
+  For 0.3.5, I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip -
+  take SDL.dll and SDL.lib from the src/ directory. Note that 20041222 is
+  out now, which is recommended for stability updates.
 
 If you do not wish to build the libraries yourself, pre-built versions
 can be downloaded from the Files section at
-http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
+http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
 
 A Note About Subversion Revision Numbers
 ----------------------------------------

docs/openttd.6

@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd March June 28, 2006
+.Dd March 22, 2006
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd

economy.c

@@ -1142,13 +1142,13 @@ static void DeliverGoodsToIndustry(TileIndex xy, byte cargo_type, int num_pieces
 	/* Check if there's an industry close to the station that accepts
 	 * the cargo */
 	best = NULL;
-	u = (_patches.station_spread + 8) * 2;
+	u = _patches.station_spread + 8;
 	FOR_ALL_INDUSTRIES(ind) {
 		if (ind->xy != 0 && (cargo_type == ind->accepts_cargo[0] || cargo_type
 				 == ind->accepts_cargo[1] || cargo_type == ind->accepts_cargo[2]) &&
 				 ind->produced_cargo[0] != CT_INVALID &&
 				 ind->produced_cargo[0] != cargo_type &&
-				 (t = DistanceManhattan(ind->xy, xy)) < 2) {
+				 (t = DistanceManhattan(ind->xy, xy)) < 2 * u) {
 			u = t;
 			best = ind;
 		}

gui.h

@@ -123,6 +123,7 @@ extern const byte _fios_colors[];
 
 /* network gui */
 void ShowNetworkGameWindow(void);
+void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number);
 
 /* bridge_gui.c */
 void ShowBuildBridgeWindow(uint start, uint end, byte type);

industry_cmd.c

@@ -1766,7 +1766,7 @@ static void UpdateIndustryStatistics(Industry *i)
 static const byte _new_industry_rand[4][32] = {
 	{12,12,12,12,12,12,12, 0, 0, 6, 6, 9, 9, 3, 3, 3,18,18, 4, 4, 2, 2, 5, 5, 5, 5, 5, 5, 1, 1, 8, 8},
 	{16,16,16, 0, 0, 0, 9, 9, 9, 9,13,13, 3, 3, 3, 3,15,15,15, 4, 4,11,11,11,11,11,14,14, 1, 1, 7, 7},
-	{21,21,21,24,22,22,22,22,23,23,16,16,16, 4, 4,19,19,19,13,13,20,20,20,11,11,11,17,17,17,10,10,10},
+	{21,21,21,24,22,22,22,22,23,23,12,12,12, 4, 4,19,19,19,13,13,20,20,20,11,11,11,17,17,17,10,10,10},
 	{30,30,30,36,36,31,31,31,27,27,27,28,28,28,26,26,26,34,34,34,35,35,35,29,29,29,32,32,32,33,33,33},
 };
 
@@ -1791,7 +1791,7 @@ static void MaybeNewIndustry(uint32 r)
 	SetDParam(0, type + STR_4802_COAL_MINE);
 	SetDParam(1, i->town->index);
 	AddNewsItem(
-		(type != IT_FOREST && type != IT_FRUIT_PLANTATION && type != IT_RUBBER_PLANTATION && type != IT_COTTON_CANDY) ?
+		(type != IT_FOREST) ?
 			STR_482D_NEW_UNDER_CONSTRUCTION : STR_482E_NEW_BEING_PLANTED_NEAR,
 		NEWS_FLAGS(NM_THIN, NF_VIEWPORT|NF_TILE, NT_ECONOMY,0), i->xy, 0
 	);

known-bugs.txt

@@ -15,34 +15,51 @@ or http://bugs.openttd.org.
 If the bug report is closed, it has been fixed, which then can be verified
 in the latest SVN version.
 
-Bugs for 0.4.8
+Bugs for 0.4.6
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org
 
+-80	Medium Crash when switching from windowed to fullscreen
 -78	Low Save vs. Autosave
+-77	Low cocoa video driver got an artifact in fullscreen
+-74	Low message settings
 -73	vehicle selection bug
+-71	Invalid last_vehicle for station (crash)
+-68	wagon replacements
 -66	wagon re-fitting
 -65	short wagons bug
+-63	Initial Volume Level not restored
+-57	(Ship) Pathfinder problem
+-55	Assertion on TrainController (train_cmd.c:2840)
 -52	desync when server saves game (on slow hardware)
 -51	Windows doesn't support CUSTOM_LANG_DIR
 -50	Trains chosing an alternative path when encountering a 1-way presignal instead of waiting
 -47	Low rating calculation and cargo loading priority
+-45	Low NORETURN wrongly declared for gcc
 -20	Low Saving files when run from gdb 2005-12-06 Unconfirmed
 - 9	Low [MorphOS] write to NULL when going to device root in filerequester 2005-11-28 Assigned Christian Rosentreter
 
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 
+-1454591	Street junctions not able to converted
+-1453676	crash in windowed mode when moving mouse back to openttd
 -1436419	Vehicles profits gone negitive.......bug
+-1438411	Game crash with NPF (r3663)
 -1434000	Error in Transfer-Function
+-1433315	non-existant crash reporting
+-1432871	Wrong signalstate when track over track
 -1427531	Newspapers problem
 -1417453	Makefile and Variables issue
 -1397638	Economics bug?
 -1395628	Trackpad panning/scrolling broken
 -1394799	Dual headed engines disagreement
 -1393415	NPF & one-way sigs
+-1393411	"Void Order" reporting.
+-1390260	Mis-reporting of Plane Crash
 -1389999	Child windows not sticking
 -1389986	Shares problem (nightly 3330)
+-1380497	problems with competitors during multiplayer
 -1362784	Incorrect vehicule profit calcul with inflation on
 -1299162	Music volume too low
 -1250094	Towns Shrink when center tile is built on
@@ -60,15 +77,19 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse
 -1106356	re-offered prototypes
 -1085486	Subsidies: Only count when station is in right suburb
 
-Minor Bugs for 0.4.8
+Minor Bugs for 0.4.5.1
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 
 -1424115	Reversed arrow sign in list view column headers
+-1412033	autoreplace not possible on monorail/maglev trains
 -1412031	fast forward scrolling is also fast forward :)
+-1394316	Multistop traffic jam
+-1394231	Autorenew glitch on helicopters
 -1387424	overtake insolvent company is to cheap
 -1382782	Loan interest calculated 'wrong'
 -1372891	Performance loss with NTP & NPF
+-1342383	Last built rail type not cleared when starting new game
 -1296259	Autosave override for multiplayer games
 -1242753	Town population minus 10
 -1236320	Bug in main menu allows moving screen

landscape.c

@@ -184,54 +184,34 @@ uint GetSlopeZ(int x,  int y)
 	return _tile_type_procs[ti.type]->get_slope_z_proc(&ti);
 }
 
-
-static Slope GetFoundationSlope(TileIndex tile, uint* z)
+// direction=true:  check for foundation in east and south corner
+// direction=false: check for foundation in west and south corner
+static bool hasFoundation(const TileInfo* ti, bool direction)
 {
-	TileInfo ti;
-	Slope tileh;
-	Slope slope;
+	bool south, other; // southern corner and east/west corner
+	uint slope = _tile_type_procs[ti->type]->get_slope_tileh_proc(ti);
+	uint tileh = ti->tileh;
 
-	FindLandscapeHeightByTile(&ti, tile);
-	tileh = ti.tileh;
-	slope = _tile_type_procs[GetTileType(tile)]->get_slope_tileh_proc(&ti);
+	if (slope == 0 && slope != tileh) tileh = 15;
+	south = (tileh & 2) != (slope & 2);
 
-	// Flatter slope -> higher base height
-	if (slope < tileh) *z += TILE_HEIGHT;
-	return slope;
+	if (direction) {
+		other = (tileh & 4) != (slope & 4);
+	} else {
+		other = (tileh & 1) != (slope & 1);
+	}
+	return south || other;
 }
 
-
-static bool HasFoundationNW(TileIndex tile, Slope slope_here, uint z_here)
-{
-	uint z;
-	Slope slope = GetFoundationSlope(TILE_ADDXY(tile, 0, -1), &z);
-
-	return
-		(z_here + (slope_here & SLOPE_N ? TILE_HEIGHT : 0) > z + (slope & SLOPE_E ? TILE_HEIGHT : 0)) ||
-		(z_here + (slope_here & SLOPE_W ? TILE_HEIGHT : 0) > z + (slope & SLOPE_S ? TILE_HEIGHT : 0));
-}
-
-
-static bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here)
-{
-	uint z;
-	Slope slope = GetFoundationSlope(TILE_ADDXY(tile, -1, 0), &z);
-
-	return
-		(z_here + (slope_here & SLOPE_N ? TILE_HEIGHT : 0) > z + (slope & SLOPE_W ? TILE_HEIGHT : 0)) ||
-		(z_here + (slope_here & SLOPE_E ? TILE_HEIGHT : 0) > z + (slope & SLOPE_S ? TILE_HEIGHT : 0));
-}
-
-
 void DrawFoundation(TileInfo *ti, uint f)
 {
 	uint32 sprite_base = SPR_SLOPES_BASE-14;
-	Slope slope;
-	uint z;
 
-	slope = GetFoundationSlope(ti->tile, &z);
-	if (!HasFoundationNW(ti->tile, slope, z)) sprite_base += 22;
-	if (!HasFoundationNE(ti->tile, slope, z)) sprite_base += 44;
+	TileInfo ti2;
+	FindLandscapeHeight(&ti2, ti->x, ti->y - 1);
+	if (hasFoundation(&ti2, true)) sprite_base += 22;		// foundation in NW direction
+	FindLandscapeHeight(&ti2, ti->x - 1, ti->y);
+	if (hasFoundation(&ti2, false)) sprite_base += 22 * 2;	// foundation in NE direction
 
 	if (f < 15) {
 		// leveled foundation

lang/american.txt

@@ -185,7 +185,7 @@ STR_00DB_MAUVE                                                  :Mauve
 STR_00DC_PURPLE                                                 :Purple
 STR_00DD_ORANGE                                                 :Orange
 STR_00DE_BROWN                                                  :Brown
-STR_00DF_GREY                                                   :Gray
+STR_00DF_GREY                                                   :Grey
 STR_00E0_WHITE                                                  :White
 STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Too many vehicles in game
 STR_00E2                                                        :{BLACK}{COMMA}
@@ -268,7 +268,7 @@ STR_012E_CANCEL                                                 :{BLACK}Cancel
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Rename
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Too many names defined
-STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Chosen name already in use
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Chosen name in use already
 
 STR_0133_WINDOWS                                                :Windows
 STR_0134_UNIX                                                   :Unix
@@ -316,7 +316,7 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Performance his
 STR_0158_COMPANY_VALUE_GRAPH                                    :Company value graph
 STR_0159_CARGO_PAYMENT_RATES                                    :Cargo payment rates
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Company league table
-STR_PERFORMANCE_DETAIL_MENU                                     :Detailed performance rating
+STR_PERFORMANCE_DETAIL_MENU                                     :Detail performance rating
 ############ range for menu	ends
 
 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
@@ -326,7 +326,7 @@ STR_015E_QUIT_GAME                                              :Quit game
 STR_015F_QUIT                                                   :Quit
 STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Are you sure you want to quit this game ?
 STR_0161_QUIT_GAME                                              :{WHITE}Quit Game
-STR_SORT_ORDER_TIP                                              :{BLACK}Select sorting order (descending/ascending)
+STR_SORT_ORDER_TIP                                              :{BLACK}Select sorting order descending/ascending
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Select sorting criteria
 STR_SORT_BY                                                     :{BLACK}Sort by
 
@@ -371,7 +371,7 @@ STR_0174_DISPLAY_MAP                                            :{BLACK}Display
 STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Display map, town directory
 STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Display town directory
 STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Display company finances information
-STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Display general company information
+STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Display company general information
 STR_0179_DISPLAY_GRAPHS                                         :{BLACK}Display graphs
 STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Display company league table
 STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Display list of company's trains
@@ -392,7 +392,7 @@ STR_0189                                                        :{BLACK}{SMALLDO
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Can't change servicing interval...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Close window
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Window title - drag this to move window
-STR_STICKY_BUTTON                                               :{BLACK}Mark this window as uncloseable for the 'Close All Windows' key
+STR_STICKY_BUTTON                                               :{BLACK}Mark this window as undeletable for the 'Close All Windows' key
 STR_RESIZE_BUTTON                                               :{BLACK}Click and drag to resize this window
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Click here to jump to the current default save/load directory
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Demolish buildings etc. on a square of land
@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Message setting
 STR_MESSAGE_HISTORY_MENU                                        :Message History
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Show last message/news report, show message options
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Message Options
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Message types:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Message types:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival of first vehicle at player's station
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival of first vehicle at competitor's station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / disasters
@@ -558,8 +558,8 @@ STR_0224                                                        :{BLACK}{UPARROW
 STR_0225                                                        :{BLACK}{DOWNARROW}
 STR_0226_RANDOM_LAND                                            :{BLACK}Random Land
 STR_0227_RESET_LAND                                             :{BLACK}Reset Land
-STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Increase area of land to lower/raise
-STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Decrease area of land to lower/raise
+STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Increase size of land area to lower/raise
+STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Decrease size of land area to lower/raise
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generate random land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reset landscape
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Reset Landscape
@@ -700,7 +700,7 @@ STR_02BE_DEFAULT                                                :Default
 STR_02BF_CUSTOM                                                 :Custom
 STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Save custom names
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Vehicle design names selection
-STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Save customized vehicle design names
+STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Save customized vehicle design names to disk
 
 ############ range for menu	starts
 STR_02C3_GAME_OPTIONS                                           :Game options
@@ -807,7 +807,7 @@ STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...can o
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...can only be built in desert areas
 STR_0319_PAUSED                                                 :{YELLOW}* *  PAUSED  *  *
 
-STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot successfully saved as '{STRING}'
+STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot successfully saved to disk as '{STRING}'
 STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Screenshot failed!
 
 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Purchase land for future use
@@ -820,7 +820,7 @@ STR_0335_6                                                      :{BLACK}6
 STR_0336_7                                                      :{BLACK}7
 
 ############ start of townname region
-STR_TOWNNAME_ORIGINAL_ENGLISH                                   :English (Original)
+STR_TOWNNAME_ORIGINAL_ENGLISH                                   :English
 STR_TOWNNAME_FRENCH                                             :French
 STR_TOWNNAME_GERMAN                                             :German
 STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :English (Additional)
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Romanian
 STR_TOWNNAME_CZECH                                              :Czech
 STR_TOWNNAME_SWISS                                              :Swiss
 STR_TOWNNAME_DANISH                                             :Danish
-STR_TOWNNAME_TURKISH                                            :Turkish
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Pounds (<28>)
@@ -905,7 +904,7 @@ STR_NO_ORDERS_VEL                                               :{LTBLUE}No orde
 
 STR_PASSENGERS                                                  :passengers
 STR_BAGS                                                        :bags
-STR_TONS                                                        :tonnes
+STR_TONS                                                        :tons
 STR_LITERS                                                      :liters
 STR_ITEMS                                                       :items
 STR_CRATES                                                      :crates
@@ -925,19 +924,19 @@ STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT
 STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Train {COMMA} has too few orders in the schedule
 STR_TRAIN_HAS_VOID_ORDER                                        :{WHITE}Train {COMMA} has a void order
 STR_TRAIN_HAS_DUPLICATE_ENTRY                                   :{WHITE}Train {COMMA} has duplicate orders
-STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA} has an invalid station in its orders
+STR_TRAIN_HAS_INVALID_ENTRY                                     :{WHITE}Train {COMMA} has an invalid station in the orders
 STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Road Vehicle {COMMA} has too few orders in the schedule
-STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA} has a void order
+STR_ROADVEHICLE_HAS_VOID_ORDER                                  :{WHITE}Road Vehicle {COMMA} has void order
 STR_ROADVEHICLE_HAS_DUPLICATE_ENTRY                             :{WHITE}Road Vehicle {COMMA} has duplicate orders
-STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA} has an invalid station in its orders
+STR_ROADVEHICLE_HAS_INVALID_ENTRY                               :{WHITE}Road Vehicle {COMMA} has an invalid station in the orders
 STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Ship {COMMA} has too few orders in the schedule
-STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA} has a void order
+STR_SHIP_HAS_VOID_ORDER                                         :{WHITE}Ship {COMMA} has void order
 STR_SHIP_HAS_DUPLICATE_ENTRY                                    :{WHITE}Ship {COMMA} has duplicate orders
-STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA} has an invalid station in its orders
+STR_SHIP_HAS_INVALID_ENTRY                                      :{WHITE}Ship {COMMA} has an invalid station in the orders
 STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Aircraft {COMMA} has too few orders in the schedule
-STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA} has a void order
+STR_AIRCRAFT_HAS_VOID_ORDER                                     :{WHITE}Aircraft {COMMA} has void order
 STR_AIRCRAFT_HAS_DUPLICATE_ENTRY                                :{WHITE}Aircraft {COMMA} has duplicate orders
-STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA} has an invalid station in its orders
+STR_AIRCRAFT_HAS_INVALID_ENTRY                                  :{WHITE}Aircraft {COMMA} has an invalid station in the orders
 # end of order system
 
 STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autorenew failed on train {COMMA} (money limit)
@@ -975,7 +974,7 @@ STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Show fi
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Road vehicle queueing (with quantum effects): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Pan window when mouse is at the edge: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing of the local authority: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Allow bribing the local authority: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Nonuniform stations: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}New global pathfinding (NPF, overrides NTP): {ORANGE}{STRING}
 
@@ -1014,16 +1013,16 @@ STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Disable
 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Enable new AI (alpha): {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Allow AIs in multiplayer (experimental): {ORANGE}{STRING}
 
-STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Default service interval for trains: {ORANGE}{STRING} days
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Default service interval for trains: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_ROADVEH                              :{LTBLUE}Default service interval for road vehicles: {ORANGE}{STRING} days
 STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED                     :{LTBLUE}Default service interval for road vehicles: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_AIRCRAFT                             :{LTBLUE}Default service interval for aircraft: {ORANGE}{STRING} days
 STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Default service interval for aircraft: {ORANGE}disabled
-STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING} days/%
+STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Default service interval for ships: {ORANGE}{STRING} days
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Default service interval for ships: {ORANGE}disabled
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Disable servicing when breakdowns set to none: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Enable railroad car speed limits: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Enable wagon speed limits: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Colored news appears in: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Starting date: {ORANGE}{STRING}
@@ -1052,10 +1051,10 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Change setting value
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Some or all of the default service interval(s) below are incompatible with chosen setting! 5-90% and 30-800 days are valid
 
-STR_TEMPERATE_LANDSCAPE                                         :Temperate landscape
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-arctic landscape
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropical landscape
-STR_TOYLAND_LANDSCAPE                                           :Toyland landscape
+STR_TEMPERATE_LANDSCAPE                                         :temperate landscape
+STR_SUB_ARCTIC_LANDSCAPE                                        :sub-arctic landscape
+STR_SUB_TROPICAL_LANDSCAPE                                      :sub-tropical landscape
+STR_TOYLAND_LANDSCAPE                                           :toyland landscape
 
 STR_CHEATS                                                      :{WHITE}Cheats
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxes indicate if you have used this cheat before
@@ -1174,7 +1173,7 @@ STR_RAIL_CAN_T_REFIT_VEHICLE                                    :{WHITE}Can't re
 STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Service intervals are in percents: {ORANGE}{STRING}
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Change production
 
-TEMP_AI_IN_PROGRESS                                             :{WHITE}Welcome to the new AI under development. If you encounter problems, take a screenshot and post it in the forum.
+TEMP_AI_IN_PROGRESS                                             :{WHITE}Welcome to this new AI, in progress. You can expect problems. When you do, make a screenshot and post it at the forum. Enjoy!
 TEMP_AI_ACTIVATED                                               :{WHITE}Warning: this new AI is still alpha! Currently, only trucks and busses work!
 TEMP_AI_MULTIPLAYER                                             :{WHITE}Warning: implementation is still experimental (using new AI). Please report any problems to truelight@openttd.org.
 
@@ -1236,7 +1235,7 @@ STR_NETWORK_COMBO1                                              :{BLACK}{SKIP}{S
 STR_NETWORK_LAN                                                 :LAN
 STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertize)
+STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertise)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_0_PLAYERS                                           :0 players
 STR_NETWORK_1_PLAYERS                                           :1 player
@@ -1250,10 +1249,10 @@ STR_NETWORK_8_PLAYERS                                           :8 players
 STR_NETWORK_9_PLAYERS                                           :9 players
 STR_NETWORK_10_PLAYERS                                          :10 players
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max companies:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limit the server to a certain number of companies
+STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limit the server to a certain amount of companies
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max spectators:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limit the server to a certain number of spectators
+STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limit the server to a certain amount of spectators
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Language spoken:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Other players will know which language is spoken on the server.
@@ -1314,6 +1313,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnect
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Enter your text message to send
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Enter the amount of money you want to give
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
@@ -1435,7 +1435,7 @@ STR_101B_BUILD_RAILROAD_SIGNALS                                 :{BLACK}Build ra
 STR_101C_BUILD_RAILROAD_BRIDGE                                  :{BLACK}Build railroad bridge
 STR_101D_BUILD_RAILROAD_TUNNEL                                  :{BLACK}Build railroad tunnel
 STR_101E_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Toggle build/remove for railroad track and signals
-STR_101F_BRIDGE_SELECTION_CLICK                                 :{BLACK}Bridge selection - click on your prefered bridge to build it
+STR_101F_BRIDGE_SELECTION_CLICK                                 :{BLACK}Bridge selection - click on selected bridge to build it
 STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Select railroad depot orientation
 STR_1021_RAILROAD_TRACK                                         :Railroad track
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Railroad train depot
@@ -1450,7 +1450,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Railroad track
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Land sloped in wrong direction for road
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Must remove road first
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Road works in progress
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Road Construction
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Select Road Bridge
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Can't build road here...
@@ -1472,7 +1471,7 @@ STR_1814_ROAD                                                   :Road
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Road with streetlights
 STR_1816_TREE_LINED_ROAD                                        :Tree-lined road
 STR_1817_ROAD_VEHICLE_DEPOT                                     :Road vehicle depot
-STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Road/rail grade crossing
+STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Road/rail level crossing
 
 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Towns
@@ -1487,7 +1486,7 @@ STR_2006_POPULATION                                             :{BLACK}Populati
 STR_2007_RENAME_TOWN                                            :Rename Town
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Can't rename town...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} local authority refuses to allow this
-STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Town names - click on name to center view on town
+STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Town names - click on name to center main view on town
 STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Center the main view on town location
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Change town name
 STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passengers last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
@@ -1515,15 +1514,15 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} l
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transport company ratings:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidies
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsidies on offer for services taking:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsidies on offer for services taking:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING} to {STRING}
 STR_2028_BY                                                     :{YELLOW} (by {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}None
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Services already subsidized:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Services already subsidised:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, until {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING} to {STRING} will now not attract a subsidy.
-STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidy withdrawn:{}{}{STRING} service from {STATION} to {STATION} is no longer subsidized.
+STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsidy withdrawn:{}{}{STRING} service from {STATION} to {STATION} is no longer subsidised.
 STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Service subsidy offered:{}{}First {STRING} service from {STRING} to {STRING} will attract a year's subsidy from the local authority!
 STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay 50% extra for the next year!
 STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Service subsidy awarded to {COMPANY}!{}{}{STRING} service from {STATION} to {STATION} will pay double rates for the next year!
@@ -1562,7 +1561,7 @@ 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_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding program funded by {COMPANY} brings 6 months of misery to motorists!
+STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Traffic chaos in {TOWN}!{}{}Road rebuilding programme funded by {COMPANY} brings 6 months of misery to motorists!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
 STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (under construction)
@@ -1773,7 +1772,7 @@ STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} production down by 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Insect infestation causes havoc at {INDUSTRY}!{}Production down by 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...can only be positioned near edges of map
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {INDUSTRY} increases by {COMMA}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{STRING} production at {INDUSTRY} goes up by {COMMA}%!
 STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{STRING} production at {INDUSTRY} goes down by {COMMA}%!
 
 ##id 0x5000
@@ -1970,7 +1969,7 @@ STR_7015_AIRCRAFT_RUNNING_COSTS                                 :{GOLD}Aircraft
 STR_7016_SHIP_RUNNING_COSTS                                     :{GOLD}Ship Running Costs
 STR_7017_PROPERTY_MAINTENANCE                                   :{GOLD}Property Maintenance
 STR_7018_TRAIN_INCOME                                           :{GOLD}Train Income
-STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Road Vehicle Income
+STR_7019_ROAD_VEHICLES_INCOME                                   :{GOLD}Road Vehicles Income
 STR_701A_AIRCRAFT_INCOME                                        :{GOLD}Aircraft Income
 STR_701B_SHIP_INCOME                                            :{GOLD}Ship Income
 STR_701C_LOAN_INTEREST                                          :{GOLD}Loan Interest
@@ -1999,7 +1998,7 @@ STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Select n
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Change the company vehicle livery
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Change the president's name
 STR_7033_CHANGE_THE_COMPANY_NAME                                :{BLACK}Change the company name
-STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Click on desired color scheme
+STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Click on selected new color scheme
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Increase size of loan
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Repay part of loan
 STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(President)
@@ -2061,7 +2060,7 @@ STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Can't bu
 STR_7072_VIEW_HQ                                                :{BLACK}View HQ
 STR_RELOCATE_HQ                                                 :{BLACK}Relocate HQ
 STR_COMPANY_PASSWORD                                            :{BLACK}Password
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Password-protect your company to prevent unauthorized users from joining.
+STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Password-protect your company to prevent unauthorised users from joining.
 STR_SET_COMPANY_PASSWORD                                        :Set company password
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}World Recession!{}{}Financial experts fear worst as economy slumps!
 STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Recession Over!{}{}Upturn in trade gives confidence to industries as economy strengthens!
@@ -2076,7 +2075,7 @@ STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Can't se
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% owned by {COMPANY})
 STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% owned by {COMPANY}{}   {COMMA}% owned by {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} has been taken over by {COMPANY}!
-STR_7080_PROTECTED                                              :{WHITE}This company is not old enough to trade shares yet...
+STR_7080_PROTECTED                                              :{WHITE}This company does not trade shares yet...
 
 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (Steam)
@@ -2408,7 +2407,7 @@ STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Value: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Loading / Unloading
-STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Train must be stopped inside a depot
+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
@@ -2588,8 +2587,8 @@ STR_982F_NAME_SHIP                                              :{BLACK}Name shi
 STR_9831_NAME_SHIP                                              :{WHITE}Name ship
 STR_9832_CAN_T_NAME_SHIP                                        :{WHITE}Can't name ship...
 STR_9833_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Citizens celebrate . . .{}First ship arrives at {STATION}!
-STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Place a buoy which can be used as a waypoint
-STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Can't place buoy here...
+STR_9834_POSITION_BUOY_WHICH_CAN                                :{BLACK}Position buoy, which can be used for additional way points
+STR_9835_CAN_T_POSITION_BUOY_HERE                               :{WHITE}Can't position buoy here...
 STR_9836_RENAME                                                 :{BLACK}Rename
 STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Rename ship type
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Rename ship type
@@ -2599,7 +2598,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Refit ship
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for ship to carry
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Refit ship to carry highlighted cargo type
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Can't refit ship...
 STR_9842_REFITTABLE                                             :(refittable)
@@ -2672,7 +2671,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Refit aircraft
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for aircraft to carry
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry highlighted cargo type
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Can't refit aircraft...
 STR_GO_TO_AIRPORT_HANGAR                                        :Go to {STATION} Hangar
@@ -2685,13 +2684,13 @@ STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}Factory destroyed in suspicious circumstances near {TOWN}!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}'UFO' lands near {TOWN}!
 STR_B005_COAL_MINE_SUBSIDENCE_LEAVES                            :{BLACK}{BIGFONT}Coal mine subsidence leaves trail of destruction near {TOWN}!
-STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA} missing, presumed dead after significant flooding!
+STR_B006_FLOOD_VEHICLE_DESTROYED                                :{BLACK}{BIGFONT}Floods!{}At least {COMMA} presumed missing or dead after deadly floods!
 
 STR_BRIBE_FAILED                                                :{WHITE}Your attempted bribery has been
 STR_BRIBE_FAILED_2                                              :{WHITE}discovered by a regional investigator
 STR_BUILD_DATE                                                  :{BLACK}Built: {LTBLUE}{DATE_LONG}
 
-STR_PERFORMANCE_DETAIL                                          :{WHITE}Detailed performance rating
+STR_PERFORMANCE_DETAIL                                          :{WHITE}Detail performance rating
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{COMMA})
@@ -2709,15 +2708,15 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Money:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Loan:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Number of vehicles; this includes road vehicles, trains, ships and aircraft
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Number of station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected to one station.
+STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Amount of vehicles. This includes road vehicles, trains, ships and aircraft.
+STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Amount of station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected to one station.
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}The profit of the vehicle with the lowest income (of all vehicles older than 2 years)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Amount of cash made in the month with the lowest profit of the past 12 quarters
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Amount of cash made in the month with the highest profit of the past 12 quarters
 STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Units of cargo delivered in the past four quarters.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Number of types of cargo delivered in the past quarter.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Amount of money this company has in the bank
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}The amount of money this company has taken on loan
+STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Types of cargo delivered in the last quarter.
+STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Amount of cash on hand
+STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Do you have a high loan?
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total points out of possible points
 
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Newgrf settings
@@ -2766,8 +2765,8 @@ STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Press to
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Choose the railtype you want to replace engines for
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Displays which engine the left selected engine is being replaced with, if any
 STR_REPLACE_HELP                                                :{BLACK}This allows you to replace one engine type with another type, when trains of the original type enter a depot
-STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Car removal: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Make autoreplace keep the length of a train the same by removing cars (starting at the front), if replacing the engine would make the train longer.
+STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Wagon removal: {ORANGE}{SKIP}{STRING}
+STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Make autoreplace keep the length of a train the same by removing wagons (starting at the front), if replacing the engine would make the train longer.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Engine is not buildable
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}

lang/brazilian_portuguese.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Op
 STR_MESSAGE_HISTORY_MENU                                        :Hist<73>rico de Mensagens
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Mostrar <20>ltima mensagem/not<6F>cia, mostrar op<6F><70>es de mensagens
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Op<4F><70>es de Mensagens
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipos de mensagens:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipos de mensagens:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do primeiro ve<76>culo <20> esta<74><61>o do jogador
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do primeiro ve<76>culo <20> esta<74><61>o de um oponente
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Acidentes / desastres
@@ -860,8 +860,8 @@ STR_CURR_ITL                                                    :Lira Italiana (
 STR_CURR_NLG                                                    :Guilda Holandesa (NLG)
 STR_CURR_NOK                                                    :Coroa Norueguesa (NOK)
 STR_CURR_PLN                                                    :Zloty Polaco (PLN)
-STR_CURR_ROL                                                    :Lei Romeno (ROL)
-STR_CURR_RUR                                                    :Rublo Russo (RUR)
+STR_CURR_ROL                                                    :Lei Romeno (Lei)
+STR_CURR_RUR                                                    :Rublo Russo (rur)
 STR_CURR_SEK                                                    :Coroa Sueca (SEK)
 
 STR_CURR_CUSTOM                                                 :Personalizado...
@@ -911,7 +911,6 @@ STR_CRATES                                                      :caixas
 STR_RES_OTHER                                                   :outros
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}N<>o <20> poss<73>vel compartilhar a lista de ordens...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}N<>o <20> poss<73>vel copiar a lista de ordens...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Compartilhadas - -
@@ -1238,21 +1237,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :Rede Local / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (divulgar)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 jogadores
-STR_NETWORK_1_PLAYERS                                           :1 jogador
-STR_NETWORK_2_PLAYERS                                           :2 jogadores
-STR_NETWORK_3_PLAYERS                                           :3 jogadores
-STR_NETWORK_4_PLAYERS                                           :4 jogadores
-STR_NETWORK_5_PLAYERS                                           :5 jogadores
-STR_NETWORK_6_PLAYERS                                           :6 jogadores
-STR_NETWORK_7_PLAYERS                                           :7 jogadores
-STR_NETWORK_8_PLAYERS                                           :8 jogadores
-STR_NETWORK_9_PLAYERS                                           :9 jogadores
-STR_NETWORK_10_PLAYERS                                          :10 jogadores
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limita o servidor para um certo valor de companhias
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max espectadores:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limita o servidor para um certa quantia de espectadores
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma falado:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Outros jogadores saber<65>o o idioma utilizado no servidor.
@@ -1308,11 +1293,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Obtendo informa<6D><61>es do jogo..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Obtendo informa<6D><61>es da Companhia..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} <20> sua frente
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) <20> sua frente
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes obtidos at<61> agora
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectar
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Digite a mensagem de texto a enviar
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Digite o valor do dinheiro que pretende dar
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Digite a senha
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companhia protegida. Digite a senha
@@ -1350,7 +1336,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :A senha do jogo
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :id do jogador incorreta em DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :chutado pelo servidor
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :estava a tentando trapacear
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor cheio
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :entrou no jogo
 STR_NETWORK_GIVE_MONEY                                          :deu <20> sua empresa algum dinheiro ({CURRENCY})
@@ -1513,11 +1498,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} a
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Avalia<69><61>es da companhia de transporte
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subs<62>dios
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Oferta de subs<62>dios para os servi<76>os:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Oferta de subs<62>dios para os servi<76>os:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} para {STRING}
 STR_2028_BY                                                     :{YELLOW} (por {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Nenhum
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Servi<76>os j<> subsidiados:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Servi<76>os j<> subsidiados:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, at<61> {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A oferta do subs<62>dio expirou:{}{}{STRING} de {STRING} para {STRING} j<> n<>o <20> subsidiado.
@@ -1677,7 +1662,6 @@ STR_306B_HELIPORT                                               :{BLACK}Heliport
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...esta<74><61>o muito extensa
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...Esta<74><61>es n<>o-uniformes desativadas
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orienta<74><61>o do Dep<65>sito
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...dever<65> ser constru<72>do na <20>gua
@@ -2598,7 +2582,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Adaptar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga do barco
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Adaptar barco para transportar a carga seleccionada
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adapta<74><61>o: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}N<>o <20> poss<73>vel adaptar barco...
 STR_9842_REFITTABLE                                             :(adapt<70>vel)
@@ -2671,7 +2655,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Adaptar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga da aeronave
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Adaptar aeronave para transportar a carga seleccionada
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adapta<74><61>o: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}N<>o <20> poss<73>vel adaptar aeronave...
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir para o hangar de {STATION}
@@ -2766,10 +2750,8 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Seleccio
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Exibe o tipo de motor que substituir<69> o que est<73> seleccionado <20> esquerda, se algum
 STR_REPLACE_HELP                                                :{BLACK}Permite a substiui<75><69>o de um tipo de motor por outro, quando comboios do tipo original entram num dep<65>sito
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Remo<6D><6F>o de vag<61>es: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ativar essa op<6F><70>o far<61> com que a auto-reposi<73><69>o remova vag<61>es dos trens, para que eles tenham o comprimento da menor esta<74><61>o em sua rota{}Ela remover<65> quantos vag<61>es forem necess<73>rios, come<6D>ando pelo da frente
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}A locomotiva n<>o pode ser constru<72>da
 
-
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de sinais - {COMMA} Sinais
 

lang/catalan.txt

@@ -34,7 +34,7 @@ STR_001A_COPPER_ORE                                             :Mineral de Cour
 STR_001B_MAIZE                                                  :Blat de Moro
 STR_001C_FRUIT                                                  :Fruita
 STR_001D_DIAMONDS                                               :Diamants
-STR_001E_FOOD                                                   :Menjar
+STR_001E_FOOD                                                   :Queviures
 STR_001F_PAPER                                                  :Paper
 STR_0020_GOLD                                                   :Or
 STR_0021_WATER                                                  :Aigua
@@ -208,7 +208,7 @@ STR_00F2_300M                                                   :{BLACK}{TINYFON
 STR_00F3_400M                                                   :{BLACK}{TINYFONT}400m
 STR_00F4_500M                                                   :{BLACK}{TINYFONT}500m
 STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}Trens
-STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Vehicles de carretera
+STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Vehicles
 STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Vaixells
 STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Aeronaus
 STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Rutes de Transport
@@ -218,7 +218,7 @@ STR_00FC_FOREST                                                 :{BLACK}{TINYFON
 STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Serradora
 STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Refiner<65>a de Petroli
 STR_00FF_FARM                                                   :{BLACK}{TINYFONT}Granja
-STR_0100_FACTORY                                                :{BLACK}{TINYFONT}F<>brica
+STR_0100_FACTORY                                                :{BLACK}{TINYFONT}Factor<EFBFBD>a
 STR_0101_PRINTING_WORKS                                         :{BLACK}{TINYFONT}Impremta
 STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}Pous de Petroli
 STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}Mina de Ferro
@@ -226,7 +226,7 @@ STR_0104_STEEL_MILL                                             :{BLACK}{TINYFON
 STR_0105_BANK                                                   :{BLACK}{TINYFONT}Banc
 STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Paperera
 STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Mina d'Or
-STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Planta de Manipulaci<63> d'Aliments
+STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Planta de Manipulaci<63> de Queviures
 STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Mina de Diamants
 STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Mina de Coure
 STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Plantaci<63> de Fruita
@@ -309,7 +309,7 @@ STR_0152_TOWN_DIRECTORY                                         :Directori de Po
 STR_0153_SUBSIDIES                                              :Subvencions
 
 ############ range for menu	starts
-STR_0154_OPERATING_PROFIT_GRAPH                                 :Gr<47>fic de benefici operatiu
+STR_0154_OPERATING_PROFIT_GRAPH                                 :Gr<47>fic d'aprofitament d'operacions
 STR_0155_INCOME_GRAPH                                           :Gr<47>fic d'ingressos
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Gr<47>fic d'entrega de c<>rrega
 STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Gr<47>fic hist<73>ric de rendiment
@@ -366,7 +366,7 @@ STR_016F                                                        :{TINYFONT}{STRI
 STR_0170                                                        :{TINYFONT}{STRING}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Parar joc
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Desar joc, deixar joc, sortir
-STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostrar la llista d'estacions de l'empresa
+STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostrar la llista d'estacions de les empresses
 STR_0174_DISPLAY_MAP                                            :{BLACK}Mostrar mapa
 STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Mostrar mapa, directori de poblacions
 STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Mostrar directori de poblacions
@@ -391,7 +391,7 @@ STR_0188                                                        :{BLACK}{SMALLUP
 STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}No es pot canviar l'interval del manteniment...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Tancar finestra
-STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}T<>tol de finestra - arrosega a<EFBFBD><EFBFBD> per moure la finestra
+STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}T<>tol de finestra - arrosega aix<EFBFBD> per moure la finestra
 STR_STICKY_BUTTON                                               :{BLACK}Marca aquesta finestra com a no eliminable per a la clau 'Tancar totes les Finestres'
 STR_RESIZE_BUTTON                                               :{BLACK}Prem i arrosega per canviar el tamany de la finestra
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Prem aqui per anar a l'actual directori de desar/carregar per defecte
@@ -424,7 +424,7 @@ STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING}
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Informaci<63> del terreny
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Cost de neteja: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Cost de neteja: {LTBLUE}{CURRENCY}
-STR_01A6_N_A                                                    :N/D
+STR_01A6_N_A                                                    :N/A
 STR_01A7_OWNER                                                  :{BLACK}Propietari: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Autoritat Local: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Ning<6E>
@@ -483,7 +483,7 @@ STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFON
 STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Volum dels efectes
 STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}MIN  '  '  ' '  '  '  MAX
 STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Saltar a la pista anterior de la selecci<63>
-STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Saltar a la pista seg<65>ent de la selecci<63>
+STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}altar a la pista seg<65>ent de la selecci<63>
 STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Parar la m<>sica
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Engegar la m<>sica
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Arrosega els controls per establir el volum de la m<>sica i els efectes de s<>
@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Prefer
 STR_MESSAGE_HISTORY_MENU                                        :Historial de Missatges
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Mostrar darrers missatges/not<6F>cies, mostrar opcions de missatges
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Opcions de Missatges
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipus de Missages:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipus de Missages:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arribada del 1er. vehicle a una estaci<63> teva
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arribada del 1er. vehicle a una estaci<63> competidora
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / desastres
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Roman
 STR_TOWNNAME_CZECH                                              :Txec
 STR_TOWNNAME_SWISS                                              :Su<53>s
 STR_TOWNNAME_DANISH                                             :Dan<61>s
-STR_TOWNNAME_TURKISH                                            :Turc
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Lliures (<28>)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Lires Italianes
 STR_CURR_NLG                                                    :Florins Holandesos (NLG)
 STR_CURR_NOK                                                    :Corones Noruegues (NOK)
 STR_CURR_PLN                                                    :Zloty Polac (PLN)
-STR_CURR_ROL                                                    :Leu Roman<61>s (ROL)
-STR_CURR_RUR                                                    :Rubles Russos (RUR)
+STR_CURR_ROL                                                    :Leu Roman<61>s (Lei)
+STR_CURR_RUR                                                    :Rubles Russos (rur)
 STR_CURR_SEK                                                    :Corones Sueques (SEK)
 
 STR_CURR_CUSTOM                                                 :Personalitzat...
@@ -912,7 +911,6 @@ STR_CRATES                                                      :palets
 STR_RES_OTHER                                                   :altres
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}No es pot compartir la llista d'ordres...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}No es pot copiar la llista d'ordres...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fi d'Ordres Compartides - -
@@ -1041,7 +1039,6 @@ STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED                         :{LTBLUE}Radi de
 
 STR_CONFIG_PATCHES_GUI                                          :{BLACK}Interficie
 STR_CONFIG_PATCHES_CONSTRUCTION                                 :{BLACK}Construcci<63>
-STR_CONFIG_PATCHES_VEHICLES                                     :{BLACK}Vehicles
 STR_CONFIG_PATCHES_STATIONS                                     :{BLACK}Estacions
 STR_CONFIG_PATCHES_ECONOMY                                      :{BLACK}Econom<6F>a
 STR_CONFIG_PATCHES_AI                                           :{BLACK}Competidors
@@ -1239,22 +1236,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (anunci)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 jugadors
-STR_NETWORK_1_PLAYERS                                           :1 jugador
-STR_NETWORK_2_PLAYERS                                           :2 jugadors
-STR_NETWORK_3_PLAYERS                                           :3 jugadors
-STR_NETWORK_4_PLAYERS                                           :4 jugadors
-STR_NETWORK_5_PLAYERS                                           :5 jugadors
-STR_NETWORK_6_PLAYERS                                           :6 jugadors
-STR_NETWORK_7_PLAYERS                                           :7 jugadors
-STR_NETWORK_8_PLAYERS                                           :8 jugadors
-STR_NETWORK_9_PLAYERS                                           :9 jugadors
-STR_NETWORK_10_PLAYERS                                          :10 jugadors
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}M<>x companyies:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limitar el servidor a un cert nombre de companyies
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}M<>x espectadors:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limitar el servidor a un cert nombre de espectadors
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma parlat:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Els altres jugadors sabr<62>n quin idioma es parla en aquest servidor.
@@ -1310,11 +1292,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Obtenint informaci<63> del joc..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Obtenint informaci<63> de l'empresa..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" s} rivals
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(s) rivals
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descarregats aproximadament
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconnecta
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Entra el text del missatge a enviar
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Entra la quantitat de diners que vols obtenir
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegit. Entra la contrasenya
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Entra la contrasenya
@@ -1352,7 +1335,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrasenya de
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :id de jugador incorrecta en DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :tret pel servidor
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :s'ha intentat usar un codi trampa
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor ple
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :ha entrat al joc
 STR_NETWORK_GIVE_MONEY                                          :gave you some money ({CURRENCY})
@@ -1515,11 +1497,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} a
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ratis de l'Empresa de Transports:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subvencions
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subvencions per prestaci<63> de serveis oferides:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subvencions per prestaci<63> de serveis oferides:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} a {STRING}
 STR_2028_BY                                                     :{YELLOW} (per {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Cap
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Serveis ja subvencionats:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Serveis ja subvencionats:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} des de {STATION} fins a {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, fins a {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferiment de subvenci<63> caducada: {}{}{STRING} des de {STRING} fins a {STRING} s'ha declarat desert.
@@ -1679,7 +1661,6 @@ STR_306B_HELIPORT                                               :{BLACK}Heliport
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...estaci<63> massa extesa
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...estacions no uniformes desactivades
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientaci<63> de les Drassanes
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...s'han de construir dins l'aigua
@@ -2600,7 +2581,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Remodelar vaixell
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona el tipus de c<>rrega a transportar
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Remodelar vaixell per portar el tipus de c<>rrega seleccionat
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona el tipus de c<>rrega a transportar:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona el tipus de c<>rrega a transportar:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING}{}{BLACK}Cost de la remodelaci<63>: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}No es pot remodelar el vaixell...
 STR_9842_REFITTABLE                                             :(remodelable)
@@ -2673,7 +2654,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Remodelar aeronaus
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona tipus de c<>rrega a transportar
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Remodelar aeronau per transportar el tipus de c<>rrega seleccionat
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona tipus de c<>rrega a transportar:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona tipus de c<>rrega a transportar:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacitat: {GOLD}{STRING}{}{BLACK}Cost de la remodelaci<63>: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No es pot remodelar l'aeronau...
 STR_GO_TO_AIRPORT_HANGAR                                        :Anar a l'hangar de {STATION}.
@@ -2699,7 +2680,6 @@ STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}
 STR_PERFORMANCE_DETAIL_PERCENT                                  :{WHITE}{NUM}%
 SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
-STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Vehicles:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Estacions:
 STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Min. benefici:
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Min. ingr<67>s:
@@ -2768,9 +2748,6 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Tria el
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Mosyta quin motor dels seleccionats a l'esquerra es reempla<6C>a, si hi ha
 STR_REPLACE_HELP                                                :{BLACK}Et permet reempla<6C>ar un tipus de motor amb un altre, quan els trens del tipus original entrin a cotxeres
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Treure vagons: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Fer que la sustituci<63> autom<6F>tica mantinga la llargaria del tren eliminant vagons (comen<65>ant pel front), si sustituira la m<>quina faria el tren m<>s llarg
-STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}El motor no es pot construir
-
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA} Senyals

lang/czech.txt

@@ -142,7 +142,7 @@ STR_004D_FIZZY_DRINK                                            :limon
 STR_QUANTITY_NOTHING                                            :
 STR_QUANTITY_PASSENGERS                                         :{COMMA} cestuj<75>c<EFBFBD>{P "" "" ch}
 STR_QUANTITY_COAL                                               :{COMMA} tun{P a y ""} uhl<68>
-STR_QUANTITY_MAIL                                               :{COMMA} bal<61>k{P "" y u} po<70>ty
+STR_QUANTITY_MAIL                                               :{COMMA} bal<61>k{P "" "y" u} po<70>ty
 STR_QUANTITY_OIL                                                :{VOLUME} ropy
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} kus{P "" y u} dobytka
 STR_QUANTITY_GOODS                                              :{COMMA} krabic{P e e ""} zbo<62><6F>
@@ -150,14 +150,14 @@ STR_QUANTITY_GRAIN                                              :{COMMA} tun{P a
 STR_QUANTITY_WOOD                                               :{COMMA} tun{P a y ""} dreva
 STR_QUANTITY_IRON_ORE                                           :{COMMA} tun{P a y ""} <20>elezn<7A> rudy
 STR_QUANTITY_STEEL                                              :{COMMA} tun{P a y ""} oceli
-STR_QUANTITY_VALUABLES                                          :{COMMA} bal<61>k{P "" y u} cenin
+STR_QUANTITY_VALUABLES                                          :{COMMA} bal<61>k{P "" "y" u} cenin
 STR_QUANTITY_COPPER_ORE                                         :{COMMA} tun{P a y ""} medene rudy
 STR_QUANTITY_MAIZE                                              :{COMMA} tun{P a y ""} kukurice
 STR_QUANTITY_FRUIT                                              :{COMMA} tun{P a y ""} ovoce
 STR_QUANTITY_DIAMONDS                                           :{COMMA} pyt{P el le lu} diamantu
 STR_QUANTITY_FOOD                                               :{COMMA} tun{P a y ""} j<>dla
 STR_QUANTITY_PAPER                                              :{COMMA} tun{P a y ""} pap<61>ru
-STR_QUANTITY_GOLD                                               :{COMMA} bal<61>k{P "" y u}
+STR_QUANTITY_GOLD                                               :{COMMA} bal<61>k{P "" "y" u}
 STR_QUANTITY_WATER                                              :{VOLUME} vody
 STR_QUANTITY_WHEAT                                              :{COMMA} tun{P a y ""} kukurice
 STR_QUANTITY_RUBBER                                             :{VOLUME} kaucuku
@@ -895,7 +895,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rumunsk
 STR_TOWNNAME_CZECH                                              :Ceska
 STR_TOWNNAME_SWISS                                              :<3A>v<EFBFBD>carsk<73>
 STR_TOWNNAME_DANISH                                             :D<>nsk<73>
-STR_TOWNNAME_TURKISH                                            :Tureck<63>
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Libry (<28>)
@@ -969,7 +968,6 @@ STR_CRATES                                                      :krabic
 STR_RES_OTHER                                                   :jin<69>
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nemuzu sd<73>let seznam prikazu...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nemohu kop<6F>rovat seznam prikazu...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Konec sd<73>len<65>ch prikazu - -
@@ -1057,7 +1055,6 @@ STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}V
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Nejvetsi rozsah stanice: {ORANGE}{STRING} {RED}Pozor: Vysok<6F> nastaven<65> zpomal<61> hru
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}<7D>dr<64>ba helikopt<70>r na heliportech: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Otev<65>rat li<6C>tu na <20>pravy ter<65>nu s li<6C>tami na v<>stavbu trat<61>/silnic atd.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Posouvat pohled opacnym smerem: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximum vlaku na hrace: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximum silnicnich vozidel na hrace: {ORANGE}{STRING}
@@ -1296,22 +1293,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (ozn<7A>mit)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 hracu
-STR_NETWORK_1_PLAYERS                                           :1 hrac
-STR_NETWORK_2_PLAYERS                                           :2 hraci
-STR_NETWORK_3_PLAYERS                                           :3 hraci
-STR_NETWORK_4_PLAYERS                                           :4 hraci
-STR_NETWORK_5_PLAYERS                                           :5 hracu
-STR_NETWORK_6_PLAYERS                                           :6 hracu
-STR_NETWORK_7_PLAYERS                                           :7 hracu
-STR_NETWORK_8_PLAYERS                                           :8 hracu
-STR_NETWORK_9_PLAYERS                                           :9 hracu
-STR_NETWORK_10_PLAYERS                                          :10 hracu
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maxim<69>ln<6C> pocet spolecnosti:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Omezit serverem pocet spolecnosti
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maxim<69>ln<6C> pocet divaku:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Omezit serverem pocet divaku
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Jazyk ve hre:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Aby ostatn<74> hraci vedeli, jak<61>m jazykem se bude ve hre mluvit.
@@ -1367,11 +1349,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Prijimani informac<61> o hre..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Prijimani informac<61> o spolecnosti..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" i u} pred n<>mi
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(u) pred n<>mi
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kB sta<74>eno
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Odpojit se
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Napi<70> zpr<70>vu, kterou chce<63> poslat
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Napi<70> castku, kterou chce<63> poskytnout
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server je chraneny. Napi<70> heslo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Spolecnost je chranena. Napi<70> heslo
@@ -1409,7 +1392,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :<3A>patn<74> id hrace v DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :vyhozen serverem
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :se pokou<6F>el podvadet
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :na serveru je plno
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :vstoupil do hry
 STR_NETWORK_GIVE_MONEY                                          :ti dal nejake pen<65>ze ({CURRENCY})
@@ -1472,7 +1454,7 @@ STR_1004_TOO_HIGH                                               :{WHITE}Prilis v
 STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}<7D><>dn<64> pou<6F>iteln<6C> koleje
 STR_1007_ALREADY_BUILT                                          :{WHITE}... ji<6A> vystaveno
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Mus<75><73> nejprve odstranit koleje
-STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}V<>stavba <20>eleznice
+STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}V<>stavba kolej<EFBFBD>
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}V<>stavba monorailu
 STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}V<>stavba maglevu
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Zvolit zeleznicni most
@@ -1508,7 +1490,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Zeleznicni trat
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Nespr<70>vn<76> sklon zeme pro silnici
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Mus<75><73> nejprve odstranit silnici
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Silnice je v rekonstrukci
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}V<>stavba silnic
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Zvolit silnicni most
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Zde nemohu postavit silnici...
@@ -2474,7 +2455,7 @@ STR_8833_CAN_T_INSERT_NEW_ORDER                                 :{WHITE}Nemohu p
 STR_8834_CAN_T_DELETE_THIS_ORDER                                :{WHITE}Nemohu tento prikaz smazat...
 STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Nemohu tento prikaz zmenit...
 STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Nemohu presunout vozidlo...
-STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}Zadn<64> stroj v<EFBFBD>dy doprov<6F>z<EFBFBD> svuj protejsek vepredu
+STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}Zadn<64> stroj bude vzdy doprov<6F>zet svuj protejsek vepredu
 STR_8838_N_A                                                    :N/A{SKIP}
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nemohu prodat vagon nebo lokomotivu...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nemohu naj<61>t cestu do m<>stn<74>ho depa...
@@ -2825,7 +2806,7 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vyber ty
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Tady je zobrazeno, za jakou lokomotivu se ta v lev<65>m seznamu vymenuje
 STR_REPLACE_HELP                                                :{BLACK}Tato mo<6D>nost hry ti umoznuje vybrat typ lokomotivy, kter<65> nech<63> vymenit za jin<69>. To se bude automaticky provadet, kdy<64> lokomotiva zajede do depa.
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Odeb<65>r<EFBFBD>n<EFBFBD> vagonu: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Funkce automatick<63>ho vylep<65>ov<6F>n<EFBFBD> vlaku muze udr<64>ovat stejnou d<>lku vlaku odstranovanim vagonu (od zacatku vlaku), pokud by zmena ma<6D>iny vlak prodlou<6F>ila.
+STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Funkce automatick<63>ho vylep<65>ov<6F>n<EFBFBD> vlaku muze udr<64>ovat stejnou d<>lku vlaku odstranovanim vagonu (od zacatku vlaku), pokud by vylep<EFBFBD>en<EFBFBD> ma<6D>iny by vlak prodlou<6F>ilo.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Stroj nelze postavit
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}

lang/danish.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Besked Indstill
 STR_MESSAGE_HISTORY_MENU                                        :Tidligere beskeder
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Vis sidste besked/nyheds rapport, vis besked indstillinger
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Besked Indstillinger
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Besked typer:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Besked typer:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Andkomst af f<>rste k<>ret<65>j til spillerens station
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Andkomst af f<>rste k<>ret<65>j til modstanderens station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Uheld / katastrofer
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rum
 STR_TOWNNAME_CZECH                                              :Tjekkiske
 STR_TOWNNAME_SWISS                                              :Schweiziske
 STR_TOWNNAME_DANISH                                             :Danske
-STR_TOWNNAME_TURKISH                                            :Tyrkiske
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Pund (<28>)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Italienske Lire
 STR_CURR_NLG                                                    :Hollandske Guilder (NLG)
 STR_CURR_NOK                                                    :Norske Kroner (NOK)
 STR_CURR_PLN                                                    :Polske Zloty (PLN)
-STR_CURR_ROL                                                    :Rum<75>nske Lei (ROL)
-STR_CURR_RUR                                                    :Russiske Rubel (RUR)
+STR_CURR_ROL                                                    :Rum<75>nske Lei
+STR_CURR_RUR                                                    :Russiske Rubel (rur)
 STR_CURR_SEK                                                    :Svenske Kroner (SEK)
 
 STR_CURR_CUSTOM                                                 :Brugerdefineret...
@@ -912,7 +911,6 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :andet
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan ikke dele ordreliste...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke kopiere ordreliste...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut p<> delt ordreliste - -
@@ -1196,7 +1194,6 @@ STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Spillets
 STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Sprog, server version, osv.
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klik p<> et spil fra listen for at v<>lge det
 
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Find server
 STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}S<>g netv<74>rket for en server
 STR_NETWORK_ADD_SERVER                                          :{BLACK}Tilf<6C>j server
 STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Tilf<6C>j en server til listen, som altid vil blive checket for om den k<>rer et spil
@@ -1253,7 +1250,6 @@ STR_NETWORK_10_PLAYERS                                          :10 spillere
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max firmaer:
 STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begr<67>ns serveren to et bestemt antal firmaer
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max tilskuere:
 STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begr<67>ns serveren til et bestemt antal tilskurere
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Talt sprog:
@@ -1310,11 +1306,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Henter spil info..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter firma info..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} foran dig
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(er) foran dig
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes hentet indtil videre
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Afbryd forbindelse
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Skrive den tekst, som du vil sende
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv det bel<65>b, som du <20>nsker at give
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveren er beskyttet. Skriv kodeordet
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Virksomheden er beskyttet. Skriv kodeordet
@@ -1515,11 +1512,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} l
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transportselskabsbed<65>mmelse:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Specialaftaler
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Specialaftaler til udlicitering:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Specialaftaler til udlicitering:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} fra {STRING} til {STRING}
 STR_2028_BY                                                     :{YELLOW} (inden {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Ingen
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Specialaftaler der allerede er vundet:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Specialaftaler der allerede er vundet:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} fra {STATION} til {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, indtil {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Specialaftale udl<64>bet:{}{}{STRING} fra {STRING} til {STRING} vil ikke l<>ngere udl<64>se en bonus.
@@ -1679,7 +1676,6 @@ STR_306B_HELIPORT                                               :{BLACK}Helikopt
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stationen er for spredt
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ikke uniforme stationer er sl<73>et fra
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Skibsdepot Orientering
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...skal bygges p<> vand
@@ -2600,7 +2596,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Ombyg skibet
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}V<>lg den slags last skibet skal sejle med
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Ombyg skibet til den markerede slags last
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lg den lasttype der skal sejles med:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lg den lasttype der skal sejles med:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan ikke ombygge skib...
 STR_9842_REFITTABLE                                             :(ombygning mulig)
@@ -2673,7 +2669,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Ombyg fly
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}V<>lg den type last flyet skal flyve med
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Ombyg flyet til at flyve med den markerede slags last
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lg den type last der skal flyves med:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lg den type last der skal flyves med:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Ombygningspris: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan ikke ombygge fly...
 STR_GO_TO_AIRPORT_HANGAR                                        :Flyv til {STATION} hangar
@@ -2771,7 +2767,6 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Fjern vo
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}F<> autoudskift til at bevare l<>ngden af tog ved at fjerne vogne (startende fra fronten), hvis autoudskiftningen g<>r toget l<>ngere.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}K<>ret<65>jet kan ikke bygges
 
-
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste of skilte - {COMMA} Skilte
 

lang/dutch.txt

@@ -154,7 +154,7 @@ STR_00B2_MESSAGE                                                :{YELLOW}Bericht
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Bericht van {STRING}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan dit niet uitvoeren....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan gebied niet ontruimen....
-STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Origineel copyright {COPYRIGHT} 1995 Chris Sawyer, alle rechten voorbehouden
+STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Origineel copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rechten voorbehouden
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versie {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Het OpenTTD team
 STR_TRANSLATED_BY                                               :{BLACK}  Vertaler(s) -
@@ -164,7 +164,7 @@ STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Afsluiten
 STR_00C8_YES                                                    :{BLACK}Ja
 STR_00C9_NO                                                     :{BLACK}Nee
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Weet je zeker dat je dit spel wilt verlaten en terug wilt keren naar {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Weet u zeker dat u dit spel wilt verlaten en terug wilt keren naar {STRING}?
 STR_00CB_1                                                      :{BLACK}1
 STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
@@ -301,7 +301,7 @@ STR_1024                                                        :1024
 STR_2048                                                        :2048
 STR_MAPSIZE                                                     :{BLACK}Mapgrootte:
 STR_BY                                                          :{BLACK}*
-STR_0148_GAME_OPTIONS                                           :{BLACK}Spelopties
+STR_0148_GAME_OPTIONS                                           :{BLACK}Spel Opties
 
 STR_0150_SOMEONE                                                :iemand{SKIP}{SKIP}
 STR_0151_MAP_OF_WORLD                                           :Wereldkaart
@@ -324,7 +324,7 @@ STR_015C_SAVE_GAME                                              :Spel opslaan
 STR_015D_LOAD_GAME                                              :Spel laden
 STR_015E_QUIT_GAME                                              :Spel stoppen
 STR_015F_QUIT                                                   :Afsluiten
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Weet je zeker dat je dit spel wilt afsluiten?
+STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Weet u zeker dat u dit spel wilt afsluiten?
 STR_0161_QUIT_GAME                                              :{WHITE}Spel stoppen
 STR_SORT_ORDER_TIP                                              :{BLACK}Selecteer sorteerrichting (aflopend/oplopend)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecteer sorteringscriteria
@@ -364,7 +364,7 @@ STR_016D_DEC                                                    :Dec
 STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
-STR_0171_PAUSE_GAME                                             :{BLACK}Pauzeer spel
+STR_0171_PAUSE_GAME                                             :{BLACK}Pauseer spel
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Spel opslaan, spel stoppen, afsluiten
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Toon lijst met stations van het bedrijf
 STR_0174_DISPLAY_MAP                                            :{BLACK}Toon kaart
@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Berichteninstel
 STR_MESSAGE_HISTORY_MENU                                        :Berichtengeschiedenis
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Toon laatste (nieuws)bericht, toon berichteninstellingen
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Berichtenopties
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Berichttypen:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Berichttypen:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Eerste voertuig bij eigen station
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Eerste voertuig bij concurrerend station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Ongelukken/rampen
@@ -553,7 +553,7 @@ STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Maak scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario editor
-STR_0223_LAND_GENERATION                                        :{WHITE}Landontwikkeling
+STR_0223_LAND_GENERATION                                        :{WHITE}Landgeneratie
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
 STR_0226_RANDOM_LAND                                            :{BLACK}Willekeurig land
@@ -563,7 +563,7 @@ STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Verklein
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genereer willekeurig land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Verwijder landschap
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Verwijder landschap
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Weet je zeker dat je het land wilt verwijderen?
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Weet u zeker dat u het land wilt verwijderen?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landschapproductie
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stadproductie
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrieproductie
@@ -657,13 +657,13 @@ STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...plaat
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...slechts <20><>n per stad toegestaan
 STR_0288_PLANT_TREES                                            :{BLACK}Plant bomen
 STR_0289_PLACE_SIGN                                             :{BLACK}Plaats bord
-STR_028A_RANDOM_TREES                                           :{BLACK}Verspreid willekeurige bomen
+STR_028A_RANDOM_TREES                                           :{BLACK}Willekeurige bomen
 STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}Verspreid bomen over de kaart
 STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Plaats steenachtige gebieden op de kaart
 STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Plaats vuurtoren
 STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Plaats radiomast
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Definieer woestijn gebied.{}Gebruik CTRL om het te verwijderen
-STR_CREATE_LAKE                                                 :{BLACK}Definieer watergebied.{}Het zal de omgeving overstromen als deze op zeeniveau ligt
+STR_CREATE_LAKE                                                 :{BLACK}Definieer water gebied.{}Het zal de omgeving overstromen wanneer deze het niveau bereikt
 STR_0290_DELETE                                                 :{BLACK}Verwijder
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Verwijder deze hele stad
 STR_0292_SAVE_SCENARIO                                          :Scenario opslaan
@@ -734,9 +734,9 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Transp
 ############ range for menu	starts
 STR_02D5_LAND_BLOCK_INFO                                        :Info over blok land
 STR_02D6                                                        :
-STR_CONSOLE_SETTING                                             :Schakel console aan/uit
-STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
-STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Grote screenshot (Ctrl-G)
+STR_CONSOLE_SETTING                                             :Schakel Konsole aan/uit
+STR_02D7_SCREENSHOT_CTRL_S                                      :Schermprint (Ctrl-S)
+STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Grote Schermprint (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Over OpenTTD
 ############ range ends	here
 
@@ -746,9 +746,9 @@ STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Toon sub
 STR_02DD_SUBSIDIES                                              :Subsidies
 STR_02DE_MAP_OF_WORLD                                           :Kaart
 STR_EXTRA_VIEW_PORT                                             :Extra kijkvenster
-STR_SIGN_LIST                                                   :Bordenlijst
+STR_SIGN_LIST                                                   :Bordjes lijst
 STR_02DF_TOWN_DIRECTORY                                         :Stedenlijst
-STR_TOWN_POPULATION                                             :{BLACK}Wereldbevolking: {COMMA}
+STR_TOWN_POPULATION                                             :{BLACK}Wereld populatie: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Kijkvenster {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopieer naar kijkvenster
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopieer de lokatie van het algemene scherm naar dit kijkvenster
@@ -758,9 +758,9 @@ STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Plak de
 STR_02E0_CURRENCY_UNITS                                         :{BLACK}Valuta
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
 STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Kies valuta
-STR_02E3_DISTANCE_UNITS                                         :{BLACK}Meeteenheden
+STR_02E3_DISTANCE_UNITS                                         :{BLACK}Meetstelsel
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
-STR_02E5_DISTANCE_UNITS_SELECTION                               :{BLACK}Kies meeteenheden
+STR_02E5_DISTANCE_UNITS_SELECTION                               :{BLACK}Kies meetstelsel
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Voertuigen
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
 STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Kies aan welke kant de voertuigen moeten rijden
@@ -807,8 +807,8 @@ STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...kan a
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...kan alleen in woestijngebieden gebouwd worden
 STR_0319_PAUSED                                                 :{YELLOW}* *  GEPAUZEERD  *  *
 
-STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot succesvol opgeslagen als '{STRING}'
-STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Screenshot mislukt!
+STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Schermprint succesvol opgeslagen als '{STRING}'
+STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Schermprint mislukt!
 
 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Koop land voor toekomstig gebruik
 STR_032F_AUTOSAVE                                               :{RED}AUTOSAVE
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Roemeens
 STR_TOWNNAME_CZECH                                              :Tsjechisch
 STR_TOWNNAME_SWISS                                              :Zwitsers
 STR_TOWNNAME_DANISH                                             :Deens
-STR_TOWNNAME_TURKISH                                            :Turks
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Pond (<28>)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Italiaanse Lier
 STR_CURR_NLG                                                    :Nederlandse Gulden (NLG)
 STR_CURR_NOK                                                    :Noorweegse Kronen (NOK)
 STR_CURR_PLN                                                    :Poolse Zloty (PLN)
-STR_CURR_ROL                                                    :Roemeense Leu (ROL)
-STR_CURR_RUR                                                    :Russische Rubel (RUR)
+STR_CURR_ROL                                                    :Roemeense Leu (Lei)
+STR_CURR_RUR                                                    :Russische Rubel (rur)
 STR_CURR_SEK                                                    :Zweedse Kronen (SEK)
 
 STR_CURR_CUSTOM                                                 :Aangepast...
@@ -878,7 +877,7 @@ STR_OPTIONS_RES                                                 :{BLACK}Schermre
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_RES_TIP                                             :{BLACK}Selecteer de schermresolutie
 
-STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Screenshotformaat
+STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Schermprint formaat
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_OPTIONS_SCREENSHOT_FORMAT_TIP                               :{BLACK}Selecteer het formaat van de schermprint
 
@@ -912,7 +911,6 @@ STR_CRATES                                                      :kratten
 STR_RES_OTHER                                                   :anders
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan orderlijst niet delen...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan orderlijst niet kopieren...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Einde gedeelde orders - -
@@ -947,7 +945,7 @@ STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Automati
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Automatisch vernieuwen mislukt bij vliegtuig {COMMA} (onvoldoende geld)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Trein {COMMA} is te lang na het vervangen
 
-STR_CONFIG_PATCHES                                              :{BLACK}Selecteer patches
+STR_CONFIG_PATCHES                                              :{BLACK}Kies Patches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Kies welke patches je wilt gebruiken
 STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Kies patches
 
@@ -984,7 +982,7 @@ STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Altijd
 
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS                              :{LTBLUE}Een trein is verdwaald als er geen voortgang is binnen: {ORANGE}{STRING} dagen
 STR_CONFIG_PATCHES_LOST_TRAIN_DAYS_DISABLED                     :{LTBLUE}Een trein is verdwaald wanneer er geen vooruitgang is in: {ORANGE}uit
-STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Herzie voertuigorders: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE} Herzie voertuigorders: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nee
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ja, maar sluit gestopte voertuigen uit
 STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :van alle voertuigen
@@ -999,8 +997,8 @@ STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Onzicht
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sneeuwhoogte: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maximale stationsomvang: {ORANGE}{STRING} {RED}Pas op: Hoge waarde vertraagt spel
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Helikopters automatisch repareren op helipads: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Verbind de landschaptoolbar met de trein/weg/water/vliegveld toolbars: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Omgekeerde scrollrichting: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Open de landschap werkbalk tegelijk met de trein/weg/water/vliegveld werkbalk: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Als er gescrolld word met de muis, beweeg in tegengesteld richting: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maximaal aantal treinen per speler: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maximaal aantal wegvoertuigen per speler: {ORANGE}{STRING}
@@ -1032,7 +1030,7 @@ STR_CONFIG_PATCHES_ENDING_DATE                                  :{LTBLUE}Stop sp
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Vloeiende economie inschakelen (meer, kleinere veranderingen)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Sta het kopen van aandelen toe
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Bij slepen, plaats seinen elke: {ORANGE}{STRING} tegel(s)
-STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Positie van algemene toolbar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Positie van hoofd knoppenbalk: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Links
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Midden
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Rechts
@@ -1060,7 +1058,7 @@ STR_TOYLAND_LANDSCAPE                                           :speelgoed lands
 
 STR_CHEATS                                                      :{WHITE}Cheats
 STR_CHEATS_TIP                                                  :{BLACK}Keuzevakjes geven aan of je deze cheat al ooit gebruikt hebt.
-STR_CHEATS_WARNING                                              :{BLACK}Waarschuwing! Je staat op het punt je concurrenten te verraden. Bedenk dat zo'n schande eeuwig wordt onthouden.
+STR_CHEATS_WARNING                                              :{BLACK}Waarschuwing! Je staat op het punt je concurrenten te verraden. Denk eraan dat zo'n schande eeuwig onthouden wordt.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Verhoog geld met {CURRENCY64}
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelend als speler: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magische bulldozer (industrie<69>n en andere onverplaatsbare objecten verwijderen): {ORANGE}{STRING}
@@ -1110,8 +1108,8 @@ STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Terreinv
 STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Landhoogte gelijk maken
 
 
-STR_TREES_RANDOM_TYPE                                           :{BLACK}Willekeurige boomsoorten
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plant bomen van willekeurig type
+STR_TREES_RANDOM_TYPE                                           :{BLACK}Bomen van willekeurig type
+STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plant Bomen van willekeurig type
 
 STR_CANT_BUILD_CANALS                                           :{WHITE}Kan hier geen kanaal bouwen...
 STR_BUILD_CANALS_TIP                                            :{BLACK}Bouw kanaal
@@ -1167,7 +1165,7 @@ STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUST
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te dicht bij een andere industrie
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Bouw trein om voor een ander ladingtype
+STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}Bouw trein om voor een ander ladingntype
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}Bouw trein om
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies type lading om te transporteren
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}Bouw trein om voor geselecteerde ladingtype
@@ -1310,11 +1308,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Ophalen spelinformatie...
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Ophalen bedrijfsinformatie...
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} spelers{P "" s} voor ons
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} spelers(s) voor ons
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes gedownloaded
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Verbinding verbroken
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Voer het te versturen bericht in
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Voer het geldbedrag dat je wilt geven in
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is beveiligd. Voer wachtwoord in.
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Bedrijf is beveiligd. Voer wachtwoord in.
@@ -1451,7 +1450,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Spoor met combi
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Land heeft helling in verkeerde richting voor weg
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Moet weg eerst weghalen
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Er wordt aan de weg gewerkt
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Wegenbouw
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Kies brug
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kan hier geen weg bouwen...
@@ -1465,7 +1463,7 @@ STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bouw weg
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bouw wegvoertuigdepot (om voertuigen te bouwen en te repareren)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bouw bushalte
 STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bouw vrachtwagen laadhal
-STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bouw brug voor wegvoertuigen
+STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bouw wegvoertuig
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bouw wegtunnel
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Schakel tussen bouwen en verwijderen voor wegbouw
 STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Selecteer richting van wegvoertuigdepot
@@ -1489,7 +1487,7 @@ STR_2007_RENAME_TOWN                                            :Hernoem stad
 STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kan stad niet hernoemen...
 STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}De gemeenteraad van {TOWN} staat dit niet toe
 STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Plaatsnamen - klik op naam om het hoofdbeeld te centreren op de stad
-STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centreer het hoofdbeeld op de lokatie van de stad
+STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centreer de hoofdbeeld op de lokatie van de stad
 STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Hernoem stad
 STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passagiers afelopen maand: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post afgelopen maand: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
@@ -1516,11 +1514,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN}'s
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Reputatie van transportbedrijven:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidies
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Beschikbare subsidies:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Beschikbare subsidies:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} van {STRING} naar {STRING}
 STR_2028_BY                                                     :{YELLOW} (voor {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Geen
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Bestaande subsidies:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Bestaande subsidies:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} van {STATION} naar {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, tot {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsidieaanbod is verlopen:{}{}{STRING} van {STRING} naar {STRING} wordt nu niet meer gesubsidieerd.
@@ -1705,7 +1703,7 @@ STR_400A_LIST_OF_DRIVES_DIRECTORIES                             :{BLACK}Lijst va
 STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Huidige gekozen naam voor opgeslagen spel
 STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Verwijder het momenteel geselecteerde opgeslagen spel
 STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Sla het huidige spel op onder de gekozen naam
-STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Selecteer nieuw speltype
+STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Selecteer Nieuw Spel Type
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Selecteer scenario (groen), vooraf ingesteld spel (blauw), or willekeurig nieuw spel
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Genereer willekeurig nieuw spel
 
@@ -1959,7 +1957,7 @@ STR_7009_PRESIDENT_NAME                                         :{BLACK}Naam dir
 STR_700A_COMPANY_NAME                                           :Bedrijfsnaam
 STR_700B_PRESIDENT_S_NAME                                       :Naam van directeur
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Kan bedrijfsnaam niet veranderen...
-STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Kan naam directeur niet veranderen...
+STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Kan naam manager niet veranderen...
 STR_700E_FINANCES                                               :{WHITE}{COMPANY} Financi<63>n {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Uitgaven/inkomsten
 STR_7010                                                        :{WHITE}{NUM}
@@ -1984,9 +1982,9 @@ STR_7022_INCOME_GRAPH                                           :{WHITE}Inkomste
 STR_CURRCOMPACT                                                 :{CURRCOMPACT64}
 STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Bedrijfswinst Grafiek
-STR_7026_BANK_BALANCE                                           :{WHITE}Banksaldo
+STR_7026_BANK_BALANCE                                           :{WHITE}Bank Saldo
 STR_7027_LOAN                                                   :{WHITE}Lening
-STR_MAX_LOAN                                                    :{WHITE}Max lening:  {BLACK}{CURRENCY64}
+STR_MAX_LOAN                                                    :{WHITE}Max Lening:  {BLACK}{CURRENCY64}
 STR_7028                                                        :{BLACK}{CURRENCY64}
 STR_7029_BORROW                                                 :{BLACK}Leen {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Betaal {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY} terug
@@ -1998,7 +1996,7 @@ STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Kan geen
 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 directeur
+STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Verander de naam van de manager
 STR_7033_CHANGE_THE_COMPANY_NAME                                :{BLACK}Verander de bedrijfsnaam
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Klik op geselecteerde nieuwe kleurenschema
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Vergroot lening
@@ -2600,7 +2598,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Schip ombouwen
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecteer type goederen dat dit schip moet vervoeren
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Bouw schip om om geselecteerde goederen te vervoeren
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecteer goederentype om te vervoeren:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecteer goederentype om te vervoeren:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{STRING}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan schip niet ombouwen...
 STR_9842_REFITTABLE                                             :(ombouwbaar)
@@ -2673,7 +2671,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Vliegtuig ombouwen
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecteer goederentype om te vervoeren door het vliegtuig
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Bouw vliegtuig om om het geselecteerde goederentype te vervoeren
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecteer goederentype om te vervoeren:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecteer goederentype om te vervoeren:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nieuwe capaciteit: {GOLD}{STRING}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan vliegtuig niet ombouwen...
 STR_GO_TO_AIRPORT_HANGAR                                        :Ga naar {STATION} hanger
@@ -2754,7 +2752,7 @@ STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Geef all
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Geef alle vliegtuigen weer die dit station in hun opdrachtenlijst hebben
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben
 
-STR_REPLACE_VEHICLES                                            :{BLACK}Vervang voertuigen
+STR_REPLACE_VEHICLES                                            :{BLACK}Vervang Voertuigen
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vervang {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start het Vervangen
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop het Vervangen
@@ -2766,13 +2764,13 @@ STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klik op
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Klik op deze knop als je de aan de linkerkant geseleteerde locomotief wil vervangen met die aan de rechterkant
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Selecteer een railtype waar je locomotieven voor wil selecteren
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Dit geeft weer waarmee de aan de linkerkant geselecteerde locomotief mee vervangen wordt
-STR_REPLACE_HELP                                                :{BLACK}Deze optie stelt je in staat om een type voertuig te selecteren en die te vervangen door een andere, zodra de voertuigen een depot inrijden
+STR_REPLACE_HELP                                                :{BLACK}Deze optie stelt je in staat om een type locomotief te selecteren en die te vervangen door een andere. Dit zal automatisch gebeuren zodra de voertuigen een depot inrijden
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Wagons verwijderen: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}De te vervangen trein behoudt zijn lengte door wagons weg te halen (startend aan de voorkant), als het vervangen de trein langer zou maken
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Locomotief kan niet gebouwd worden
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
-STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordenlijst - {COMMA} bord{P "" en}
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordjes lijst - {COMMA} Bordjes
 
 ############ Lists rail types
 

lang/english.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Message setting
 STR_MESSAGE_HISTORY_MENU                                        :Message History
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Show last message/news report, show message options
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Message Options
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Message types:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Message types:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival of first vehicle at player's station
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Arrival of first vehicle at competitor's station
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / disasters
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Romanian
 STR_TOWNNAME_CZECH                                              :Czech
 STR_TOWNNAME_SWISS                                              :Swiss
 STR_TOWNNAME_DANISH                                             :Danish
-STR_TOWNNAME_TURKISH                                            :Turkish
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Pounds (<28>)
@@ -1314,6 +1313,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnect
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Enter your text message to send
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Enter the amount of money you want to give
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
@@ -1450,7 +1450,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Railway track w
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Land sloped in wrong direction for road
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Must remove road first
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Road works in progress
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Road Construction
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Select Road Bridge
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Can't build road here...
@@ -1515,11 +1514,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} l
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transport company ratings:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subsidies
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsidies on offer for services taking:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsidies on offer for services taking:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} from {STRING2} to {STRING2}
 STR_2028_BY                                                     :{YELLOW} (by {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}None
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Services already subsidised:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Services already subsidised:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, until {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offer of subsidy expired:{}{}{STRING} from {STRING2} to {STRING2} will now not attract a subsidy.
@@ -2599,7 +2598,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Refit ship
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for ship to carry
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Refit ship to carry highlighted cargo type
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Can't refit ship...
 STR_9842_REFITTABLE                                             :(refittable)
@@ -2672,7 +2671,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Refit aircraft
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Select type of cargo for aircraft to carry
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Refit aircraft to carry highlighted cargo type
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Select cargo type to carry:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}New capacity: {GOLD}{STRING1}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Can't refit aircraft...
 STR_GO_TO_AIRPORT_HANGAR                                        :Go to {STATION} Hangar

lang/estonian.txt

@@ -1,5 +1,5 @@
 ##name Estonian
-##ownname Eesti keel
+##ownname eesti keel
 ##isocode et
 ##plural 0
 
@@ -519,8 +519,8 @@ STR_01FF                                                        :{TINYFONT}{BLAC
 STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Viimane teade
 STR_0201_MESSAGE_SETTINGS                                       :Teadete seaded
 STR_MESSAGE_HISTORY_MENU                                        :Teadete ajalugu
-STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}N<>ita viimast teadet, kuva teadete seaded
-STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Teadete Seaded
+STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}N<>itab viimase teate, kuvab teadete seaded
+STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Teadete seaded
 STR_0205_MESSAGE_TYPES                                          :{BLACK}Teate t<><74>p:
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Esimese s<>iduki saabumine m<>ngija jaama
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Esimese s<>iduki saabumine konkurendi jaama
@@ -689,7 +689,6 @@ STR_02A5_TOWN_SIZE                                              :{YELLOW}Linna s
 
 STR_02B6                                                        :{STRING}  -  {STRING}
 STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}N<>itab viimast teadet
-STR_OFF                                                         :Off
 STR_SUMMARY                                                     :L<>hike
 STR_FULL                                                        :T<>ielik
 STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
@@ -838,7 +837,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rumeenia
 STR_TOWNNAME_CZECH                                              :T<>ehhi
 STR_TOWNNAME_SWISS                                              :<3A>veitsi
 STR_TOWNNAME_DANISH                                             :Taani
-STR_TOWNNAME_TURKISH                                            :T<>rgi
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Naelad (<28>)
@@ -862,7 +860,7 @@ STR_CURR_NLG                                                    :Hollandi kulden
 STR_CURR_NOK                                                    :Norra kroon (NOK)
 STR_CURR_PLN                                                    :Poola Zlott (PLN)
 STR_CURR_ROL                                                    :Rumeenia Leu (ROL)
-STR_CURR_RUR                                                    :Vene rubla (RUR)
+STR_CURR_RUR                                                    :Vene rubla (rur)
 STR_CURR_SEK                                                    :Rootsi kroon (SEK)
 
 STR_CURR_CUSTOM                                                 :Omatehtud...
@@ -912,7 +910,6 @@ STR_CRATES                                                      :kasti
 STR_RES_OTHER                                                   :teised
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Sihtpunktide nimekirja ei saa jagada...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Sihtpunktide nimekirja ei saa kopeerida...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Jagatud sihtpunktide l<>pp - -
@@ -1024,7 +1021,6 @@ STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Vaikimi
 STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Vaikimisi hooldusintervall laevadele: {ORANGE}{STRING} p<>eva
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Vaikimisi teenindusvahemik laevadele: {ORANGE}v<>lja l<>litatud
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Peata hooldus, kui purunemine on keelatud: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Luba vaguni kiiruse limiidid: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}V<>rvilised uudised ilmuvad aastast {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Alustamise aeg: {ORANGE}{STRING}
@@ -1239,26 +1235,9 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (reklaami)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 m<>ngjat
-STR_NETWORK_1_PLAYERS                                           :1 m<>ngija
-STR_NETWORK_2_PLAYERS                                           :2 m<>ngijat
-STR_NETWORK_3_PLAYERS                                           :3 m<>ngijat
-STR_NETWORK_4_PLAYERS                                           :4 m<>ngijat
-STR_NETWORK_5_PLAYERS                                           :5 m<>ngijat
-STR_NETWORK_6_PLAYERS                                           :6 m<>ngijat
-STR_NETWORK_7_PLAYERS                                           :7 m<>ngijat
-STR_NETWORK_8_PLAYERS                                           :8 m<>ngijat
-STR_NETWORK_9_PLAYERS                                           :9 m<>ngijat
-STR_NETWORK_10_PLAYERS                                          :10 m<>ngijat
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks. firmasi:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Luba serveris X m<>ngijat
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks. vaatajaid
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Luba serveris X vaatajat
-STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}R<><52>gitav keel:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Teistele m<>ngijatele teadmiseks, et mis keelt serveris r<><72>gitakse
-STR_NETWORK_COMBO5                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_START_GAME                                          :{BLACK}Alusta m<>ngu
 STR_NETWORK_START_GAME_TIP                                      :{BLACK}Uue v<>rgum<75>ngu alustamine suvalise kaardiga
 STR_NETWORK_LOAD_GAME                                           :{BLACK}M<>ngu laadimine
@@ -1310,11 +1289,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Hangin m<>ngu infot...
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hangin ettev<65>tte infot...
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} kelint{P "" e} sinu ees
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} kelint(e) sinu ees
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbaiti t<>mmatud
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Katkesta
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}S<>numi kirjutamine saatmiseks teistele m<>ngijatele
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Teisele m<>ngijale saadetava rahasumma sisestamine
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server on kaitstud. Sisesta parool
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Ettev<65>te on kaitstud. Sisesta parool
@@ -1352,7 +1332,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :vale m
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :vale m<>ngija-id DoCommand'is
 STR_NETWORK_ERR_CLIENT_KICKED                                   :server viskas v<>lja
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :<3A>ritas pettust kasutada
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server on t<>is
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :liitus m<>nguga
 STR_NETWORK_GIVE_MONEY                                          :andis sinu ettev<65>tele raha ({CURRENCY})
@@ -1679,7 +1658,6 @@ STR_306B_HELIPORT                                               :{BLACK}Helikopt
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...jaam on liiga laiaks venitatud
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...korrap<61>ratud jaamad keelatud
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Paadikuuri orientatsioon
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...peab ehitama vette
@@ -2348,7 +2326,6 @@ STR_8107_MAGLEV_LOCOMOTIVE                                      :maglevi vedur
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Rongi depot
 STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Rahvas r<><72>mustab. . .{}Esimene rong saabus {STATION}i!
-STR_8802_DETAILS                                                :{WHITE}{STRING} (Detailid)
 STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Rong on ees
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
@@ -2401,7 +2378,7 @@ STR_8826_GO_TO                                                  :{BLACK}Mine
 STR_8827_FULL_LOAD                                              :{BLACK}T<>is laadung
 STR_8828_UNLOAD                                                 :{BLACK}Lae maha
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Orders)
-STR_882A_END_OF_ORDERS                                          :{SETX 10}- - K<>skude L<EFBFBD>pp - -
+STR_882A_END_OF_ORDERS                                          :{SETX 10}- - K<>skude l<EFBFBD>pp - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Hooldus
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Ei saa ehitada raudtees<65>idukit...
@@ -2600,7 +2577,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Seadista <20>mber laev
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali kauba t<><74>p, mida laev hakkab kandma
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Seadista laev <20>mber valitud kauba t<><74>bi jaoks
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vali kauba t<><74>p mida vedada:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vali kauba t<><74>p mida vedada:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uus mahutuvus: {GOLD}{STRING}{}{BLACK}Laeva <20>mberseadistamise hind: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Ei saa laeva <20>mberseadistada...
 STR_9842_REFITTABLE                                             :(<28>mberseadistatav)
@@ -2673,7 +2650,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Seadista lennuk <20>mber
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vali kauba t<><74>p mida lennuk hakkab kandma
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Seadista <20>mber lennuk et kanda valitud kauba t<><74>pi
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vali kauba t<><74>p mida kanda:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vali kauba t<><74>p mida kanda:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uus mahutuvus: {GOLD}{STRING}{}{BLACK}Maksumus et <20>mber seadistada: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Ei saa <20>mber seadistada lennukit...
 STR_GO_TO_AIRPORT_HANGAR                                        :Mine {STATION} Angaari
@@ -2746,7 +2723,7 @@ STR_SHIP                                                        :{BLACK}{SHIP}
 
 STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Rong{P "" i}
 STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Maantees<65>iduk{P "" it}
-STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Lennuk{P "" it}
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Lennuk(it)
 STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Laev{P "" a}
 
 STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}N<>ita k<>iki ronge millel on see jaam nende s<>iduplaanis
@@ -2768,9 +2745,6 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vali rau
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}N<>itab mis mootorit vasakult vahetatakse mille vastu, kui <20>ldse
 STR_REPLACE_HELP                                                :{BLACK}Se lubab sul vahetada <20>ks mootori t<><74>p teise t<><74>biga, kui rongid esimest t<><74>pi sisenevad depoosse
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagunite eemaldus: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Sunni automaatvahetus hoidma rongi pikkust samaks eemaldades vaguneid (alustades eestpoolt), kui vahetatav mootor muudaks rongi pikemaks.
-STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Mootorit ei saa ehitada
-
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Siltide nimekiri - {COMMA} Silt{P "" i}

lang/finnish.txt

@@ -33,7 +33,7 @@ STR_0019_VALUABLES                                              :Arvotavaroita
 STR_001A_COPPER_ORE                                             :Kuparimalmia
 STR_001B_MAIZE                                                  :Maissia
 STR_001C_FRUIT                                                  :Hedelmi<6D>
-STR_001D_DIAMONDS                                               :Jalokivi<EFBFBD>
+STR_001D_DIAMONDS                                               :Timantteja
 STR_001E_FOOD                                                   :Ruokaa
 STR_001F_PAPER                                                  :Paperia
 STR_0020_GOLD                                                   :Kultaa
@@ -45,7 +45,7 @@ STR_0025_TOYS                                                   :Leluja
 STR_0026_CANDY                                                  :Karkkia
 STR_0027_COLA                                                   :Limsaa
 STR_0028_COTTON_CANDY                                           :Hattaraa
-STR_0029_BUBBLES                                                :Kuplia
+STR_0029_BUBBLES                                                :Kuplias
 STR_002A_TOFFEE                                                 :Toffeeta
 STR_002B_BATTERIES                                              :Pattereita
 STR_002C_PLASTIC                                                :Muovia
@@ -65,7 +65,7 @@ STR_0039_VALUABLES                                              :Arvotavara
 STR_003A_COPPER_ORE                                             :Kuparimalmi
 STR_003B_MAIZE                                                  :Maissi
 STR_003C_FRUIT                                                  :Hedelm<6C>
-STR_003D_DIAMOND                                                :Jalokivi
+STR_003D_DIAMOND                                                :Timantti
 STR_003E_FOOD                                                   :Ruoka
 STR_003F_PAPER                                                  :Paperi
 STR_0040_GOLD                                                   :Kulta
@@ -153,10 +153,10 @@ STR_00B1_GAME_OPTIONS                                           :{WHITE}Pelin as
 STR_00B2_MESSAGE                                                :{YELLOW}Viesti
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Viesti: {STRING}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Ei onnistu....
-STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Aluetta ei voi tyhjent<EFBFBD><EFBFBD>....
-STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Alkuper<65>iset oikeudet {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pid<69>tet<65><74>n
+STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Aluetta ei voi puhdistaa....
+STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Alkuper<65>inen {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pid<69>tet<65><74>n
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versio {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD-yhteis<EFBFBD>
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD-tiimi
 STR_TRANSLATED_BY                                               :{BLACK}  K<><4B>nt<6E>j<EFBFBD>(t) -
 
 STR_00C5                                                        :{BLACK}{CROSS}
@@ -191,27 +191,27 @@ STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Liian mo
 STR_00E2                                                        :{BLACK}{COMMA}
 STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Sijainti
-STR_00E5_CONTOURS                                               :Korkeuserot
+STR_00E5_CONTOURS                                               :Korkeusk<EFBFBD>yr<EFBFBD>t
 STR_00E6_VEHICLES                                               :Liikennev<65>lineet
 STR_00E7_INDUSTRIES                                             :Teollisuus
 STR_00E8_ROUTES                                                 :Reitit
 STR_00E9_VEGETATION                                             :Kasvillisuus
 STR_00EA_OWNERS                                                 :Omistajat
-STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Tie
-STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Rautatie
-STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Asema/lentokentt<EFBFBD>/satama
-STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Rakennus
-STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Liikennev<65>line
+STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Tiet
+STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Rautatiet
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Asemat/lentokent<6E>t/satamat
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Rakennukset/teollisuus
+STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Liikennev<65>lineet
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100m
 STR_00F1_200M                                                   :{BLACK}{TINYFONT}200m
 STR_00F2_300M                                                   :{BLACK}{TINYFONT}300m
 STR_00F3_400M                                                   :{BLACK}{TINYFONT}400m
 STR_00F4_500M                                                   :{BLACK}{TINYFONT}500m
-STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}Juna
-STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Ajoneuvo
-STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Laiva
-STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Lentokone
-STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Kuljetusreitti
+STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}Junat
+STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Ajoneuvot
+STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Laivat
+STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Lentokoneet
+STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Kuljetusreitit
 STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Hiilikaivos
 STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}S<>hk<68>laitos
 STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Mets<74>
@@ -227,7 +227,7 @@ STR_0105_BANK                                                   :{BLACK}{TINYFON
 STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Paperitehdas
 STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Kultakaivos
 STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Ruoanjalostamo
-STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Jalokivikaivos
+STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Timanttikaivos
 STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Kuparikaivos
 STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Hedelm<6C>viljelm<6C>
 STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Kumiviljelm<6C>
@@ -248,7 +248,7 @@ STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFON
 STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Rautatieasema
 STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Lastauslaituri
 STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Linja-autoasema
-STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Lento-/helikopterikentt<74>
+STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Lentokentt<EFBFBD>/helikopterikentt<74>
 STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Satama
 STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Ep<45>tasaista maata
 STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Ruohikkoa
@@ -258,7 +258,7 @@ STR_0124_TREES                                                  :{BLACK}{TINYFON
 STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Kivi<76>
 STR_0126_WATER                                                  :{BLACK}{TINYFONT}Vett<74>
 STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Ei omistajaa
-STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Kaupunkeja
+STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Kaupunkeja ##
 STR_0129_INDUSTRIES                                             :{BLACK}{TINYFONT}Teollisuutta
 STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Autiomaata
 STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Lunta
@@ -267,8 +267,8 @@ STR_012D                                                        :{WHITE}{STRING}
 STR_012E_CANCEL                                                 :{BLACK}Peruuta
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Nime<6D> uud.
-STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Liian monta nime<6D> m<><6D>ritelty
-STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Nimi on jo k<>yt<79>ss<73>
+STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Liian monta nime<6D> m<><6D>ritelty.
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Valittu nimi on jo k<>yt<79>ss<73>.
 
 STR_0133_WINDOWS                                                :Windows
 STR_0134_UNIX                                                   :Unix
@@ -286,7 +286,7 @@ STR_013D_INFORMATION                                            :{BLACK}Tietoja
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiteetit
 STR_013E_TOTAL_CARGO                                            :{BLACK}Rahtia yhteens<6E>
 STR_013F_CAPACITY                                               :{BLACK}Kapaisteetti: {LTBLUE}{STRING}
-STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Kokonaisrahtikapasiteetti:
+STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Kokonaisrahti (kapasiteetti):
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Uusi peli
 STR_0141_LOAD_GAME                                              :{BLACK}Lataa peli
@@ -306,7 +306,7 @@ STR_0148_GAME_OPTIONS                                           :{BLACK}Pelin as
 STR_0150_SOMEONE                                                :joku{SKIP}{SKIP}
 STR_0151_MAP_OF_WORLD                                           :Maailmankartta
 STR_0152_TOWN_DIRECTORY                                         :Kaupunkihakemisto
-STR_0153_SUBSIDIES                                              :Tukitarjoukset
+STR_0153_SUBSIDIES                                              :Tuet
 
 ############ range for menu	starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :K<>ytt<74>katekuvaaja
@@ -367,47 +367,47 @@ STR_0170                                                        :{TINYFONT}{STRI
 STR_0171_PAUSE_GAME                                             :{BLACK}Tauko
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Pelin tallennus, hylk<6C><6B>minen ja lopetus.
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n asemista.
-STR_0174_DISPLAY_MAP                                            :{BLACK}N<>yt<79> kartta
-STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}N<>yt<79> kartta, kaupunkihakemisto
-STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}N<>yt<79> kaupunkihakemisto
-STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}N<>yt<79> yhti<74>n taloustiedot
-STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}N<>yt<79> yhti<74>n yleiset tiedot
-STR_0179_DISPLAY_GRAPHS                                         :{BLACK}N<>yt<79> kuvaajat
-STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}N<>yt<79> yhti<74>kilpataulukko
-STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n junista
-STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n ajoneuvoista
-STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n laivoista
-STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n lentokoneista
-STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}L<>henn<6E> n<>kym<79><6D>
-STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Loitonna n<>kym<79><6D>
-STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Rakenna rautateit<69>
-STR_0182_BUILD_ROADS                                            :{BLACK}Rakenna teit<69>
-STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Rakenna satamia
-STR_0184_BUILD_AIRPORTS                                         :{BLACK}Rakenna lentokentti<74>
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Istuta puita, asenna kylttej<65>, jne
-STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Maa-aluetiedot
-STR_0187_OPTIONS                                                :{BLACK}Asetukset
+STR_0174_DISPLAY_MAP                                            :{BLACK}N<>yt<79> kartta.
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}N<>yt<79> kartta, kaupunkihakemisto.
+STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}N<>yt<79> kaupunkihakemisto.
+STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}N<>yt<79> yhti<74>n taloustiedot.
+STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}N<>yt<79> yhti<74>n yleiset tiedot.
+STR_0179_DISPLAY_GRAPHS                                         :{BLACK}N<>yt<79> kuvaajat.
+STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}N<>yt<79> yhti<74>kilpataulukko.
+STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n junista.
+STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n ajoneuvoista.
+STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n laivoista.
+STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}N<>yt<79> luettelo yhti<74>n lentokoneista.
+STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}L<>henn<6E> n<>kym<79><6D>.
+STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Loitonna n<>kym<79><6D>.
+STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Rakenna rautateit<69>.
+STR_0182_BUILD_ROADS                                            :{BLACK}Rakenna teit<69>.
+STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Rakenna satamia.
+STR_0184_BUILD_AIRPORTS                                         :{BLACK}Rakenna lentokentti<74>.
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Istuta puita, asenna kylttej<65>, jne.
+STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Maa-aluetiedot.
+STR_0187_OPTIONS                                                :{BLACK}Asetukset.
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
 STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Huoltov<6F>li<6C> ei voi muuttaa...
-STR_018B_CLOSE_WINDOW                                           :{BLACK}Sulje ikkuna
-STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Ikkunan otsake - ved<65> t<>st<73> siirt<72><74>ksesi ikkunaa
+STR_018B_CLOSE_WINDOW                                           :{BLACK}Sulje ikkuna.
+STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Ikkunan otsake - ved<65> t<>st<73> siirt<72><74>ksesi ikkunaa.
 STR_STICKY_BUTTON                                               :{BLACK}Merkitse ikkuna tahmeaksi; 'Sulje kaikki ikkunat'-nappi ei vaikuta tahmeisiin ikkunoihin.
 STR_RESIZE_BUTTON                                               :{BLACK}Napsauta ja ved<65> muuttaaksesi t<>m<EFBFBD>n ikkunan kokoa.
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Siirry tallennusten oletuskansioon napsauttamalla t<>t<EFBFBD>
-STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Tuhoa ruudulla olevat rakennukset, puut, jne.
-STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Madalla ruudun kulmausta
-STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Korota ruudun kulmausta
-STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Vierityspalkki - luettelon vieritys yl<79>s/alas
+STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Tyhjenn<EFBFBD> ruutuja rakennuksista yms.
+STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Madalla maakulmausta.
+STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Korota maakulmausta.
+STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Vierityspalkki - luettelon vieritys yl<79>s/alas.
 STR_HSCROLL_BAR_SCROLLS_LIST                                    :{BLACK}Vierityspalkki - luettelon vieritys vasemmalle/oikealle.
-STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}N<>yt<79> korkeuserot kartalla
-STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}N<>yt<79> liikennev<65>lineet kartalla
-STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}N<>yt<79> teollisuuus kartalla
-STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}N<>yt<79> kuljetusreitit kartalla
-STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}N<>yt<79> kasvillisuus kartalla
-STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}N<>yt<79> maanomistajat kartalla
-STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Kaupunkien nimet kartalla
-STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Voittoa t<>n<EFBFBD> vuonna: {CURRENCY} (viime vuonna: {CURRENCY})
+STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}N<>yt<79> korkeusk<EFBFBD>yr<EFBFBD>t kartalla.
+STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}N<>yt<79> liikennev<65>lineet kartalla.
+STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}N<>yt<79> teollisuuus kartalla.
+STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}N<>yt<79> kuljetusreitit kartalla.
+STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}N<>yt<79> kasvillisuus kartalla.
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}N<>yt<79> maanomistajat kartalla.
+STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Kaupunkien nimet kartalla.
+STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Voittoa t<>n<EFBFBD> vuonna: {CURRENCY} (viime vuonna: {CURRENCY}).
 
 ############ range for service numbers starts
 STR_AGE                                                         :{COMMA} vuo{P si tta} ({COMMA})
@@ -418,12 +418,12 @@ STR_019C_ROAD_VEHICLE                                           :Ajoneuvo
 STR_019D_AIRCRAFT                                               :Lentokone
 STR_019E_SHIP                                                   :Laiva
 STR_019F_TRAIN                                                  :Juna
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} vanhenee
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} on kohta todella vanha
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} on kohta todella vanha ja pit<69><74> pikaisesti korvata
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} vanhenee.
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} on kohta todella vanha.
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} on kohta todella vanha ja pit<69><74> pikaisesti korvata.
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Maa-aluetiedot
-STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Puhdistuksen kustannus: {LTBLUE}-
-STR_01A5_COST_TO_CLEAR                                          :{BLACK}Puhdistuksen kustannus: {LTBLUE}{CURRENCY}
+STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Puhdistuksen kulu: {LTBLUE}-
+STR_01A5_COST_TO_CLEAR                                          :{BLACK}Puhdistuksen kulu: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :-
 STR_01A7_OWNER                                                  :{BLACK}Omistaja: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Kunta: {LTBLUE}{STRING}
@@ -482,17 +482,17 @@ STR_01DA_CUSTOM_2                                               :{TINYFONT}Oma 2
 STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Musiikin voimakkuus
 STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}<7D><>nitehosteiden voimakkuus
 STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}MIN  '  '  ' '  '  '  MAX
-STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Hypp<70><70> edelliseen raitaan.
-STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Hypp<70><70> seuraavaan raitaan.
-STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Pys<EFBFBD>yt<EFBFBD> musiikki
-STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Aloita musiikin soittaminen
+STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Hypp<70><70> valinnan edelliseen raitaan.
+STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Hypp<70><70> valinnan seuraavaan raitaan.
+STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Lopeta musiikin soittaminen.
+STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Aloita musiikin soittaminen.
 STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Aseta liukus<75><73>timi<6D> vet<65>m<EFBFBD>ll<6C> sopiva <20><>nenvoimakkuus musiikille ja <20><>nitehosteille.
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
-STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Raita{SETX 88}Nimi
+STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Raita{SETX 88}Nimike
 STR_01E9_SHUFFLE                                                :{TINYFONT}Sekoita
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Ohjelmoi
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musiikkiohjelman valinta
@@ -502,17 +502,17 @@ STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLAC
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Ohjelma - '{STRING}'
 STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Tyhj<68><6A>
 STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Tallenna
-STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Nykyinen ohjelmointi raidoille
-STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Valitse 'kaikki raidat'
-STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Valitse 'vanhan tyylin musiikki'
-STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Valitse 'uuden tyylin musiikki'
-STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Valitse 'oma 1' (k<>ytt<74>j<EFBFBD>n m<><6D>ritett<74>viss<73>)
-STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Valitse 'oma 2' (k<>ytt<74>j<EFBFBD>n m<><6D>ritett<74>viss<73>)
-STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Tyhj<68><6A> nykyinen ohjelma (vain Oma1 tai Oma2)
-STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Tallenna musiikkiasetukset
+STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Nykyinen musiikkiraitaohjelma
+STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Valitse 'kaikki raidat'.
+STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Valitse 'vanhan tyylin musiikki'.
+STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Valitse 'uuden tyylin musiikki'.
+STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Valitse 'oma 1' (k<>ytt<74>j<EFBFBD>n m<><6D>ritett<74>viss<73>).
+STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Valitse 'oma 2' (k<>ytt<74>j<EFBFBD>n m<><6D>ritett<74>viss<73>).
+STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Tyhj<68><6A> nykyinen ohjelma (vain Oma1 tai Oma2).
+STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Tallenna musiikkiasetukset.
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Napsauta musiikkiraitaa lis<69>t<EFBFBD>ksesi sen nykyiseen ohjelmaan (vain Oma1 tai Oma2).
-STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Sekoittaminen p<><70>lle/pois
-STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}N<>yt<79> musiikkiraitojen valintaikkuna
+STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Sekoittaminen p<><70>lle/pois.
+STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}N<>yt<79> musiikkiraitojen valintaikkuna.
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Napsauta palvelussa keskitt<74><74>ksesi n<>kym<79>n teollisuuteen/kaupunkiin.
 STR_01FE_DIFFICULTY                                             :{BLACK}Vaikeusaste: ({STRING})
 STR_01FF                                                        :{TINYFONT}{BLACK}{DATE_LONG}
@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Viestiasetukset
 STR_MESSAGE_HISTORY_MENU                                        :Viestihistoria
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}N<>yt<79> viimeisin viesti/uutisraportti, n<>yt<79> viestiasetukset.
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Viestiasetukset
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Viestityypit:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Viestityypit:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ensimm<6D>inen ajoneuvo saapuu pelaajan asemalle
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ensimm<6D>inen ajoneuvo saapuu kilpailijan asemalle
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Vahingot/onnettomuudet
@@ -581,7 +581,7 @@ STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...karta
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Suurenna kaupunkia
 STR_023C_EXPAND                                                 :{BLACK}Laajenna
 STR_023D_RANDOM_TOWN                                            :{BLACK}Satunnainen kaupunki
-STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Rakenna kaupunki satunnaiseen kohtaan
+STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Rakenna kaupunki satunnaiseen kohtaan.
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Luo teollisuutta
 STR_0240_COAL_MINE                                              :{BLACK}Hiilikaivos
 STR_0241_POWER_STATION                                          :{BLACK}S<>hk<68>laitos
@@ -604,7 +604,7 @@ STR_0251_FRUIT_PLANTATION                                       :{BLACK}Hedelm
 STR_0252_RUBBER_PLANTATION                                      :{BLACK}Kumiviljelm<6C>
 STR_0253_WATER_SUPPLY                                           :{BLACK}L<>hde
 STR_0254_WATER_TOWER                                            :{BLACK}Vesitorni
-STR_0255_DIAMOND_MINE                                           :{BLACK}Jalokivikaivos
+STR_0255_DIAMOND_MINE                                           :{BLACK}Timanttikaivos
 STR_0256_COPPER_ORE_MINE                                        :{BLACK}Kuparikaivos
 STR_0257_COTTON_CANDY_FOREST                                    :{BLACK}Hattaramets<74>
 STR_0258_CANDY_FACTORY                                          :{BLACK}Karkkitehdas
@@ -639,7 +639,7 @@ STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}Istuta h
 STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Istuta kumiviljelm<6C>.
 STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Rakenna l<>hde.
 STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Rakenna vesitorni (voidaan rakentaa vain kaupunkeihin).
-STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Rakenna jalokivikaivos.
+STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Rakenna timanttikaivos.
 STR_0279_CONSTRUCT_COPPER_ORE_MINE                              :{BLACK}Rakenna kuparikaivos.
 STR_027A_PLANT_COTTON_CANDY_FOREST                              :{BLACK}Istuta hattaramets<74>.
 STR_027B_CONSTRUCT_CANDY_FACTORY                                :{BLACK}Rakenna karkkitehdas.
@@ -742,7 +742,7 @@ STR_02D9_ABOUT_OPENTTD                                          :Tietoja "OpenTT
 
 STR_02DB_OFF                                                    :{BLACK}pois
 STR_02DA_ON                                                     :{BLACK}p<><70>ll<6C>
-STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}N<>yt<79> tukitarjoukset
+STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}N<>yt<79> tuet
 STR_02DD_SUBSIDIES                                              :Tuet
 STR_02DE_MAP_OF_WORLD                                           :Maailmankartta
 STR_EXTRA_VIEW_PORT                                             :Lis<69>n<EFBFBD>kym<79>
@@ -796,11 +796,11 @@ STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Valitse
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Rahoita uuden teollisuuden rakentamista.
 
 ############ range for menu	starts
-STR_INDUSTRY_DIR                                                :Teollisuushakemisto
-STR_0313_FUND_NEW_INDUSTRY                                      :Rakenna uutta teollisuutta
+STR_INDUSTRY_DIR                                                :Rahoitushakemisto
+STR_0313_FUND_NEW_INDUSTRY                                      :Rahoita uutta teollisuutta
 ############ range ends here
 
-STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Rakenna uutta teollisuutta
+STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Rahoita uutta teollisuutta.
 STR_JUST_STRING                                                 :{STRING}
 STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...voidaan rakentaa vain kaupunkeihin.
 STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...voidaan rakentaa vain sademets<74>alueisiin.
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Romanialainen
 STR_TOWNNAME_CZECH                                              :Tsekkil<69>inen
 STR_TOWNNAME_SWISS                                              :Sveitsil<69>inen
 STR_TOWNNAME_DANISH                                             :Tanskalainen
-STR_TOWNNAME_TURKISH                                            :turkkilainen
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Punta (<28>)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Italian liira (
 STR_CURR_NLG                                                    :Hollannin guildeni (NLG)
 STR_CURR_NOK                                                    :Norjan kruunu (NOK)
 STR_CURR_PLN                                                    :Puolan zloty (PLN)
-STR_CURR_ROL                                                    :Romanian leu (ROL)
-STR_CURR_RUR                                                    :Venj<6E>n rupla (RUR)
+STR_CURR_ROL                                                    :Romanian leu (lei)
+STR_CURR_RUR                                                    :Venj<6E>n rupla (rur)
 STR_CURR_SEK                                                    :Ruotsin kruunu (SEK)
 
 STR_CURR_CUSTOM                                                 :Oma...
@@ -909,10 +908,9 @@ STR_TONS                                                        :tonnia
 STR_LITERS                                                      :litraa
 STR_ITEMS                                                       :er<65><72>
 STR_CRATES                                                      :laatikkoa
-STR_RES_OTHER                                                   :muut
+STR_RES_OTHER                                                   :muuta
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Aikataulua ei voi jakaa...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Aikataulua ei voi kopioida...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - jaetun aikataulun loppu - -
@@ -945,7 +943,6 @@ STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Junan {C
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Ajoneuvon {COMMA} itseuudistus ep<65>onnistui (rahoitusraja).
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Laivan {COMMA} itseuudistus ep<65>onnistui (rahoitusraja).
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Lentokoneen {COMMA} itseuudistus ep<65>onnistui (rahoitusraja).
-STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Juna {COMMA} kasvaisi liian pitk<74>ksi
 
 STR_CONFIG_PATCHES                                              :{BLACK}Muokkaa paikkauksia
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Muokkaa paikkauksia.
@@ -1134,7 +1131,7 @@ STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Ved
 STR_DRAG_DROP                                                   :{BLACK}Ved<65>&pudota
 STR_STATION_DRAG_DROP                                           :{BLACK}Rakenna asema vet<65>m<EFBFBD>ll<6C> ja pudottamalla.
 
-STR_FAST_FORWARD                                                :{BLACK}Nopeuta peli<6C>
+STR_FAST_FORWARD                                                :{BLACK}Kelaa peli<6C> eteenp<6E>in
 STR_MESSAGE_HISTORY                                             :{WHITE}Viestihistoria
 STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Lista viimeisimmist<73> uutisviesteist<73>.
 STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Kaikki pois p<><70>lt<6C>
@@ -1147,7 +1144,7 @@ STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Rahoita
 STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Rakenna kuparikaivos.
 STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Poraa <20>ljy<6A>.
 STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Rakenna kultakaivos.
-STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Rakenna jalokivikaivos.
+STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Rakenna timanttikaivos.
 STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Rakenna rautakaivos.
 STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Rahoita hedelm<6C>viljelm<6C><6D>.
 STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Rahoita kumiviljelm<6C><6D>.
@@ -1315,6 +1312,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Pura yhteys
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Sy<53>t<EFBFBD> l<>hetett<74>v<EFBFBD> teksti
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sy<53>t<EFBFBD> annettava raham<61><6D>r<EFBFBD>
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Palvelin on suojattu. Anna salasana
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Yhti<74> on suojattu. Anna salasana
@@ -1386,14 +1384,14 @@ STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}Kartan
 STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Kartan y-koko: {ORANGE}{STRING}
 
 ##id 0x0800
-STR_0800_COST                                                   :{TINYFONT}{RED}Kustannus: {CURRENCY}
-STR_0801_COST                                                   :{RED}Kustannus: {CURRENCY}
+STR_0800_COST                                                   :{TINYFONT}{RED}Kulu: {CURRENCY}
+STR_0801_COST                                                   :{RED}Kulu: {CURRENCY}
 STR_0802_INCOME                                                 :{TINYFONT}{GREEN}Tulo: {CURRENCY}
 STR_0803_INCOME                                                 :{GREEN}Tulo: {CURRENCY}
 STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Siirr<72>: {CURRENCY}
 STR_FEEDER                                                      :{YELLOW}Siirr<72>: {CURRENCY}
-STR_0804_ESTIMATED_COST                                         :{TINYFONT}{WHITE}Arvioitu kustannus: {CURRENCY}
-STR_0805_ESTIMATED_COST                                         :{WHITE}Arvioitu kustannus: {CURRENCY}
+STR_0804_ESTIMATED_COST                                         :{TINYFONT}{WHITE}Arvioitu kulu: {CURRENCY}
+STR_0805_ESTIMATED_COST                                         :{WHITE}Arvioitu kulu: {CURRENCY}
 STR_0806_ESTIMATED_INCOME                                       :{TINYFONT}{WHITE}Arvioitu tulo: {CURRENCY}
 STR_0807_ESTIMATED_INCOME                                       :{WHITE}Arvioitu tulo: {CURRENCY}
 STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Maata ei voi korottaa...
@@ -1515,11 +1513,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN}:
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Kuljetusyhti<74>n arvioinnit:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Tuet
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tarjolla olevat tuet:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Tarjolla olevat tuet palveluille:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} v<>lille {STRING}-{STRING}
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Ei mit<69><74>n
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}K<>ytetyt tuet-
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}K<>ytetyt tuet palveluille:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} v<>lille {STATION}-{STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, {DATE_SHORT} asti)
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tuki p<><70>ttynyt:{}{}{STRING} v<>li {STRING} - {STRING} ei sis<69>ll<6C> en<65><6E> tukia.
@@ -1554,13 +1552,13 @@ STR_204A_BUILD_STATUE_OF_COMPANY                                :Rakenna patsas
 STR_204B_FUND_NEW_BUILDINGS                                     :Rahoita uusia rakennuksia
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Osta yksinoikeudet kuljetuksiin
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Lahjo viranomaisia
-STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Tee aloite pienest<73> mainoskampanjasta hoikutellaksesi lis<69><73> matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Tee aloite keskikokoisesta mainoskampanjasta hoikutellaksesi lis<69><73> matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Tee aloite suuresta mainoskampanjasta hoikutellaksesi lis<69><73> matkustajia ja rahtia kuljetuspalveluihisi.{}  Kustannus: {CURRENCY}
-STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Rahoita kaupungin tieverkon rakentamista. Aiheuttaa huomattavaa h<>iri<72>t<EFBFBD> tieliikenteess<73> kuuden kuukauden ajan.{}  Kustannus: {CURRENCY}
-STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Rakenna patsas yhti<74>si kunniaksi.{} Kustannus: {CURRENCY}
-STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Rahoita uusien kaupparakennusten rakentamista kaupungissa.{}  Kustannus: {CURRENCY}
-STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Osta vuoden yksinoikeudet kaupungin liikenn<6E>intiin. Paikallisviranomaiset eiv<69>t salli muiden yhti<74>iden kuljettaa matkustajia ja rahtia.{} Kustannus: {CURRENCY}
+STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Tee aloite pienest<73> mainoskampanjasta hoikutellaksesi lis<69><73> matkustajia ja rahtia kuljetuspalveluihisi.{}  Kulu: {CURRENCY}
+STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Tee aloite keskikokoisesta mainoskampanjasta hoikutellaksesi lis<69><73> matkustajia ja rahtia kuljetuspalveluihisi.{}  Kulu: {CURRENCY}
+STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Tee aloite suuresta mainoskampanjasta hoikutellaksesi lis<69><73> matkustajia ja rahtia kuljetuspalveluihisi.{}  Kulu: {CURRENCY}
+STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Rahoita kaupungin tieverkon rakentamista. Aiheuttaa huomattavaa h<>iri<72>t<EFBFBD> tieliikenteess<73> jopa kuuden kuukauden ajan.{}  Kulu: {CURRENCY}
+STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Rakenna patsas yhti<74>si kunniaksi.{} Kulu: {CURRENCY}
+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<6E>intiin. Paikallisviranomaiset eiv<69>t salli muiden yhti<74>iden kuljettaa matkustajia ja rahtia.{} Kulu: {CURRENCY}
 STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Lahjo viranomaisia lis<69>t<EFBFBD>ksesi arviotasi; rangaistus voi olla kuitenkin suuri, jos j<><6A>t kiinni.{}  Kulu: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}{TOWN}: liikenne on kaaoksessa!{}{}{COMPANY} rahoittaa katujen kunnostuksen; autoilijoille odotettavissa kuusi kuukautta kurjuutta!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
@@ -1679,7 +1677,6 @@ STR_306B_HELIPORT                                               :{BLACK}Helikopt
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...asema liian levitt<74>ytynyt.
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ep<65>yhdenmukaiset asemat poissa k<>yt<79>st<73>.
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Telakan suunn.
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...se pit<69><74> rakentaa veteen.
@@ -1729,7 +1726,7 @@ STR_480F_FOOD_PROCESSING_PLANT                                  :Ruoanjalostamo
 STR_4810_PAPER_MILL                                             :Paperitehdas
 STR_4811_GOLD_MINE                                              :Kultakaivos
 STR_4812_BANK                                                   :Pankki
-STR_4813_DIAMOND_MINE                                           :Jalokivikaivos
+STR_4813_DIAMOND_MINE                                           :Timanttikaivos
 STR_4814_IRON_ORE_MINE                                          :Rautakaivos
 STR_4815_FRUIT_PLANTATION                                       :Hedelm<6C>viljelm<6C>
 STR_4816_RUBBER_PLANTATION                                      :Kumiviljelm<6C>
@@ -1761,7 +1758,7 @@ STR_482B_TRANSPORTED                                            :{YELLOW}{STRING
 STR_482C_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Keskit<69> p<><70>n<EFBFBD>kym<79> teollisuuden sijaintiin.
 STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT}Uusi {STRING} rakennetaan kaupungin {TOWN} l<>hist<73>lle!
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Uusi {STRING} istutetaan kaupungin {TOWN} l<>hist<73>lle!
-STR_482F_COST                                                   :{BLACK}Kustannus: {YELLOW}{CURRENCY}
+STR_482F_COST                                                   :{BLACK}Kulu: {YELLOW}{CURRENCY}
 STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Teollisuustyyppi<70> ei voi rakentaa t<>h<EFBFBD>n...
 STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...mets<74><73> voi istuttaa vain lumirajan yl<79>puolelle.
 STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{INDUSTRY}: sulkeminen uhkaavan l<>hell<6C>!
@@ -1896,7 +1893,7 @@ STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Vastust
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Vastustajien <20>lykkyys: {ORANGE}{STRING}
 STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Ajoneuvojen hajoaminen: {ORANGE}{STRING}
 STR_680F_SUBSIDY_MULTIPLIER                                     :{LTBLUE}Tukikerroin: {ORANGE}{STRING}
-STR_6810_COST_OF_CONSTRUCTION                                   :{LTBLUE}Rakentamisen kustannus: {ORANGE}{STRING}
+STR_6810_COST_OF_CONSTRUCTION                                   :{LTBLUE}Rakentamisen kulu: {ORANGE}{STRING}
 STR_6811_TERRAIN_TYPE                                           :{LTBLUE}Maaston tyyppi: {ORANGE}{STRING}
 STR_6812_QUANTITY_OF_SEA_LAKES                                  :{LTBLUE}Meren/j<>rvien m<><6D>r<EFBFBD>: {ORANGE}{STRING}
 STR_6813_ECONOMY                                                :{LTBLUE}Talous: {ORANGE}{STRING}
@@ -1953,7 +1950,7 @@ STR_7002_PLAYER                                                 :(Pelaaja {COMMA
 STR_7004_NEW_FACE                                               :{BLACK}Uudet kasvot
 STR_7005_COLOR_SCHEME                                           :{BLACK}V<>riteema
 STR_7006_COLOR_SCHEME                                           :{GOLD}V<>riteema:
-STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Uusi tunnusv<EFBFBD>ri
+STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Uusi v<>riteema
 STR_7008_COMPANY_NAME                                           :{BLACK}Yhti<74>n nimi
 STR_7009_PRESIDENT_NAME                                         :{BLACK}P<><50>johtajan nimi
 STR_700A_COMPANY_NAME                                           :Yhti<74>n nimi
@@ -2000,7 +1997,7 @@ STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Valitse
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Muuta yhti<74>n ajoneuvoammattikuntaa.
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Muuta p<><70>johtajan nime<6D>.
 STR_7033_CHANGE_THE_COMPANY_NAME                                :{BLACK}Muuta yhti<74>n nime<6D>.
-STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Valitse tunnusv<73>ri.
+STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Napsauta valitussa v<>riteemassa.
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Ota lis<69><73> lainaa.
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Lyhenn<6E> lainaa.
 STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(p<><70>johtaja)
@@ -2600,8 +2597,8 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Sovita laiva
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Valitse laivan kuljettama rahtityyppi.
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Sovita laiva korostetulle rahtityypille.
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Valitse kuljetettava rahtityyppi:
-STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING}{}{BLACK}Sovituksen kustannus: {GOLD}{CURRENCY}
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Valitse kuljetettava rahtityyppi:-
+STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING}{}{BLACK}Sovituksen kulu: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Laivaa ei voi sovittaa...
 STR_9842_REFITTABLE                                             :(sovitettava)
 STR_GO_TO_SHIP_DEPOT                                            :Aseta kohteeksi telakka, {TOWN}
@@ -2673,8 +2670,8 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Sovita lentokone
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Valitse kuljetettavan rahdin tyyppi.
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Sovita lentokone kuljettamaan valittua rahtityyppi<70>.
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Valitse kuljetettava rahtityyppi:
-STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING}{}{BLACK}Sovituksen kustannus: {GOLD}{CURRENCY}
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Valitse kuljetettava rahtityyppi:-
+STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Uusi kapasiteetti: {GOLD}{STRING}{}{BLACK}Sovituksen kulu: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi sovittaa...
 STR_GO_TO_AIRPORT_HANGAR                                        :Aseta kohteeksi lentokonehalli, {STATION}
 SERVICE_AT_AIRPORT_HANGAR                                       :Huolto, kohteena lentokonehalli, {STATION}
@@ -2771,7 +2768,6 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vaunun p
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Automaattikorvaus pit<69>k<EFBFBD><6B>n junan vakiopituisena poistamalla vaunuja (edest<73>) jos veturi pident<6E>isi junaa.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Veturi ei ole rakennettavissa
 
-
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Kylttilista - {COMMA} kyltti<74>
 
@@ -2788,7 +2784,7 @@ STR_TINY_BLACK                                                  :{BLACK}{TINYFON
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kulu: {GOLD}{CURRENCY}{BLACK} Paino: {GOLD}{COMMA}t
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Nopeus: {GOLD}{VELOCITY}{BLACK}   Teho: {GOLD}{COMMA}hv
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Nopeus: {GOLD}{VELOCITY}
-STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}K<>ytt<74>kukustannus: {GOLD}{CURRENCY}/vuosi
+STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}K<>ytt<74>kulu: {GOLD}{CURRENCY}/vuosi
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasiteetti: {GOLD}{STRING} {STRING}
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Suunniteltu: {GOLD}{NUM}{BLACK} Elinik<69>: {GOLD}{COMMA} vuotta
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Enimm<6D>isluotettavuus: {GOLD}{COMMA}%

lang/french.txt

@@ -117,36 +117,36 @@ STR_QUANTITY_PLASTIC                                            :{VOLUME} de pla
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} boisson{P "" s} gazeuse{P "" s}
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
-STR_ABBREV_COAL                                                 :{TINYFONT}CH
-STR_ABBREV_MAIL                                                 :{TINYFONT}CO
-STR_ABBREV_OIL                                                  :{TINYFONT}PT
-STR_ABBREV_LIVESTOCK                                            :{TINYFONT}BT
-STR_ABBREV_GOODS                                                :{TINYFONT}BN
+STR_ABBREV_COAL                                                 :{TINYFONT}CL
+STR_ABBREV_MAIL                                                 :{TINYFONT}ML
+STR_ABBREV_OIL                                                  :{TINYFONT}OL
+STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LV
+STR_ABBREV_GOODS                                                :{TINYFONT}GD
 STR_ABBREV_GRAIN                                                :{TINYFONT}GR
-STR_ABBREV_WOOD                                                 :{TINYFONT}BO
-STR_ABBREV_IRON_ORE                                             :{TINYFONT}FE
-STR_ABBREV_STEEL                                                :{TINYFONT}AC
+STR_ABBREV_WOOD                                                 :{TINYFONT}WD
+STR_ABBREV_IRON_ORE                                             :{TINYFONT}OR
+STR_ABBREV_STEEL                                                :{TINYFONT}ST
 STR_ABBREV_VALUABLES                                            :{TINYFONT}VL
-STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CV
-STR_ABBREV_MAIZE                                                :{TINYFONT}MS
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CO
+STR_ABBREV_MAIZE                                                :{TINYFONT}MZ
 STR_ABBREV_FRUIT                                                :{TINYFONT}FT
 STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
-STR_ABBREV_FOOD                                                 :{TINYFONT}NR
+STR_ABBREV_FOOD                                                 :{TINYFONT}FD
 STR_ABBREV_PAPER                                                :{TINYFONT}PR
-STR_ABBREV_GOLD                                                 :{TINYFONT}OR
-STR_ABBREV_WATER                                                :{TINYFONT}EA
-STR_ABBREV_WHEAT                                                :{TINYFONT}BL
-STR_ABBREV_RUBBER                                               :{TINYFONT}CA
-STR_ABBREV_SUGAR                                                :{TINYFONT}SU
-STR_ABBREV_TOYS                                                 :{TINYFONT}JT
-STR_ABBREV_SWEETS                                               :{TINYFONT}BB
+STR_ABBREV_GOLD                                                 :{TINYFONT}GD
+STR_ABBREV_WATER                                                :{TINYFONT}WR
+STR_ABBREV_WHEAT                                                :{TINYFONT}WH
+STR_ABBREV_RUBBER                                               :{TINYFONT}RB
+STR_ABBREV_SUGAR                                                :{TINYFONT}SG
+STR_ABBREV_TOYS                                                 :{TINYFONT}TY
+STR_ABBREV_SWEETS                                               :{TINYFONT}SW
 STR_ABBREV_COLA                                                 :{TINYFONT}CL
-STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}BP
+STR_ABBREV_CANDYFLOSS                                           :{TINYFONT}CF
 STR_ABBREV_BUBBLES                                              :{TINYFONT}BU
-STR_ABBREV_TOFFEE                                               :{TINYFONT}CM
+STR_ABBREV_TOFFEE                                               :{TINYFONT}TF
 STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
 STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
-STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}GZ
+STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Carte - {STRING}
@@ -522,7 +522,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Options de mess
 STR_MESSAGE_HISTORY_MENU                                        :Historique des Messages
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Afficher le dernier message/bulletin, afficher les options des messages
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Options des messages
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Types de message:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Types de message:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}1er v<>hicule dans la station du joueur
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}1er v<>hicule dans la station d'un competiteur
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidents / d<>sastres
@@ -839,7 +839,6 @@ STR_TOWNNAME_ROMANIAN                                           :Roumain
 STR_TOWNNAME_CZECH                                              :Tch<63>ques
 STR_TOWNNAME_SWISS                                              :Suisse
 STR_TOWNNAME_DANISH                                             :Danois
-STR_TOWNNAME_TURKISH                                            :Turques
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Livre (<28>)
@@ -862,7 +861,7 @@ STR_CURR_ITL                                                    :Lire Italienne
 STR_CURR_NLG                                                    :Florint Hollandais (NLG)
 STR_CURR_NOK                                                    :Courronne Norv<72>gienne (NOK)
 STR_CURR_PLN                                                    :Nouv. Zloty Polonais (PLN)
-STR_CURR_ROL                                                    :Leu Roumain (ROL)
+STR_CURR_ROL                                                    :Leu Roumain (LEI)
 STR_CURR_RUR                                                    :Rouble Russe (RUR)
 STR_CURR_SEK                                                    :Couronne Su<53>doise (SEK)
 
@@ -913,7 +912,6 @@ STR_CRATES                                                      :caisses
 STR_RES_OTHER                                                   :autre
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Impossible de partager les ordres...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Impossible de copier les ordres...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin des ordres partag<61>s - -
@@ -1168,7 +1166,7 @@ STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUST
 
 STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...trop proche d'une autre industrie
 
-STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}R<>am<EFBFBD>nager le train pour d'autres marchandises
+STR_RAIL_REFIT_VEHICLE_TO_CARRY                                 :{BLACK}R<>amenager le train pour d'autres marchandises
 STR_RAIL_REFIT_VEHICLE                                          :{BLACK}R<>am<61>nager le train
 STR_RAIL_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choix du type de marchandises <20> transporter
 STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED                             :{BLACK}R<>am<61>nager le train pour les marchandises s<>lectionn<6E>es
@@ -1316,6 +1314,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}D<>connecter
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Saisir le message <20> envoyer
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Saisir le montant d'argent que vous d<>sirez transf<73>rer
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Le serveur est prot<6F>g<EFBFBD>. Entrez le mot de passe
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}La compagnie est prot<6F>g<EFBFBD>e. Entrez le mot de passe
@@ -1452,7 +1451,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Rails avec des
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Terrain en pente dans la mauvaise direction pour des routes
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Doit d'abord retirer la route
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Route en travaux
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construction routi<74>re
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Choisir Pont Routier
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Impossible de construire la route ici...
@@ -1517,11 +1515,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}Municipa
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Notation de la compagnie de transport:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subventions
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Offres de subvention pour le transport de:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Offres de subvention pour le transport de:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} <20> {STRING}
 STR_2028_BY                                                     :{YELLOW} (avant {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Aucune
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Subventions d<>j<EFBFBD> accord<72>es:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Subventions d<>j<EFBFBD> accord<72>es:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} <20> {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, jusqu'<27> {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Offre de subvention expir<69>e:{}{}Le transport de {STRING} entre {STRING} et {STRING} n'est d<>sormais plus subventionn<6E>.
@@ -1681,7 +1679,6 @@ STR_306B_HELIPORT                                               :{BLACK}H
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...gare trop <20>tendue
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...stations non-uniformes d<>sactiv<69>es
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientation du d<>pot naval
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...doit <20>tre construit sur l'eau
@@ -1870,7 +1867,7 @@ STR_SV_STNAME_SIDINGS                                           :{STRING} Voies
 STR_SV_STNAME_BRANCH                                            :{STRING} Embranchement
 STR_SV_STNAME_UPPER                                             :Haut {STRING}
 STR_SV_STNAME_LOWER                                             :Bas {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} H<EFBFBD>li-port
+STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} For<6F>t
 
 ############ end of	savegame specific region!
@@ -2059,7 +2056,7 @@ STR_706D_PRESIDENT                                              :Pr
 STR_706E_TYCOON                                                 :Tycoon
 STR_706F_BUILD_HQ                                               :{BLACK}Const. si<73>ge
 STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Contruire/voir le Si<53>ge Social
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Reconstruit le quartier g<>n<EFBFBD>ral de la compagnie ailleurs pour le prix de 1% de la valeur de la compagnie
+STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Reconstruit le quartier g<>n<EFBFBD>ral de la compagne ailleurs pour le prix de 1% de la valeur de la compagnie
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Impossible de construire le si<73>ge...
 STR_7072_VIEW_HQ                                                :{BLACK}Voir le si<73>ge
 STR_RELOCATE_HQ                                                 :{BLACK}D<>m<EFBFBD>nager le QG
@@ -2286,8 +2283,8 @@ STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Camion de plast
 STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :Camion de bulles MightyMover
 STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Camion de bulles Powernaught
 STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Camion de bulles Wizzowow
-STR_80CC_MPS_OIL_TANKER                                         :P<EFBFBD>trolier MPS
-STR_80CD_CS_INC_OIL_TANKER                                      :P<EFBFBD>trolier CS-Inc.
+STR_80CC_MPS_OIL_TANKER                                         :Camion-citerne de p<EFBFBD>trole MPS
+STR_80CD_CS_INC_OIL_TANKER                                      :Camion-citerne de p<EFBFBD>trole CS-Inc.
 STR_80CE_MPS_PASSENGER_FERRY                                    :Ferry de voyageurs MPS
 STR_80CF_FFP_PASSENGER_FERRY                                    :Ferry de voyageurs FFP
 STR_80D0_BAKEWELL_300_HOVERCRAFT                                :Bakewell 300 A<>roglisseur
@@ -2602,7 +2599,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}R<>am<61>nager navire
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choisir le type de cargaisons <20> transporter
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}R<>am<61>nager le navire pour transporter la cargaison s<>lectionn<6E>e
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selectionner cargaison <20> transporter:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selectionner cargaison <20> transporter:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacit<69>: {GOLD}{STRING}{}{BLACK}Prix du r<>am<61>nagement: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Impossible de r<>am<61>nager le navire...
 STR_9842_REFITTABLE                                             :(r<>am<61>nageable)
@@ -2675,7 +2672,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}R<>am<61>nager a<>ronef
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Choisir type de cargaison <20> transporter
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}R<>am<61>nager a<>ronef pour transporter type de cargaison s<>lectionn<6E>
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selectionner type de cargaison <20> transporter:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selectionner type de cargaison <20> transporter:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nouvelle capacit<69>: {GOLD}{STRING}{}{BLACK}Prix du r<>am<61>nagement: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Impossible de r<>am<61>nager l'a<>ronef...
 STR_GO_TO_AIRPORT_HANGAR                                        :Aller au hangar {STATION}

lang/galician.txt

@@ -211,7 +211,7 @@ STR_00F5_TRAINS                                                 :{BLACK}{TINYFON
 STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Cami<6D>ns/Buses
 STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Nav<61>os
 STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Aeronaves
-STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Rutas De Transporte
+STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Rutas de transporte
 STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Mina de Carb<72>n
 STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Estaci<63>n Enerx<72>tica
 STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Bosque
@@ -233,7 +233,7 @@ STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFON
 STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Plant. de <20>rbores de Caucho
 STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Acu<63>fero
 STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Torre de Auga
-STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}F<>brica de T<EFBFBD>boas
+STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}F<>brica de Madeiros
 STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Bosque de Algod<6F>n de Azucre
 STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}F<>brica de Caramelos
 STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}Granxa de Bater<65>as
@@ -309,7 +309,7 @@ STR_0152_TOWN_DIRECTORY                                         :Directorio de c
 STR_0153_SUBSIDIES                                              :Subsidios
 
 ############ range for menu	starts
-STR_0154_OPERATING_PROFIT_GRAPH                                 :G. beneficios operativos
+STR_0154_OPERATING_PROFIT_GRAPH                                 :G. Beneficios Operativos
 STR_0155_INCOME_GRAPH                                           :Gr<47>fica de ingresos
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Gr<47>fica de carga entregada
 STR_0157_PERFORMANCE_HISTORY_GRAPH                              :G. historial de Rendemento
@@ -319,7 +319,7 @@ STR_015A_COMPANY_LEAGUE_TABLE                                   :T
 STR_PERFORMANCE_DETAIL_MENU                                     :Puntuaci<63>n de rendemento detallado
 ############ range for menu	ends
 
-STR_015B_OPENTTD                                                :{WHITE}Acerca de OpenTTD
+STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Grabar Partida
 STR_015D_LOAD_GAME                                              :Cargar Partida
 STR_015E_QUIT_GAME                                              :Sa<53>r <20> menu principal
@@ -350,7 +350,7 @@ STR_SORT_BY_MAX_SPEED                                           :Velocidade M
 STR_0162_JAN                                                    :Xan
 STR_0163_FEB                                                    :Feb
 STR_0164_MAR                                                    :Mar
-STR_0165_APR                                                    :Abr
+STR_0165_APR                                                    :Apr
 STR_0166_MAY                                                    :Mai
 STR_0167_JUN                                                    :Xu<58>
 STR_0168_JUL                                                    :Xul
@@ -520,7 +520,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Configuraci
 STR_MESSAGE_HISTORY_MENU                                        :Historial de Mensaxes
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Amosa-la <20>ltima mensaxe/noticia, amosa-las opci<63>ns das mensaxes
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Opci<63>ns das mensaxes
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipos de mensaxes:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipos de mensaxes:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do 1<> veh<65>culo a estaci<63>n do xogador
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do 1<> veh<65>culo a estaci<63>n dun oponente
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidentes / desastres
@@ -533,7 +533,7 @@ STR_020E_SUBSIDIES                                              :{YELLOW}Subsidi
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Informaci<63>n xeral
 STR_MESSAGES_ALL                                                :{YELLOW}Configuraci<63>n para t<>dolos tipos de mesaxes (off/sumario/completo)
 STR_MESSAGE_SOUND                                               :{YELLOW}Reproducir son para mensaxes de noticias resumidas
-STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...demasiado lonxe do destino anterior
+STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...Demasiado lonxe do destino anterior
 STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Mellores compa<70><61>as que chegaron <20> {NUM}{}(Nivel {STRING})
 STR_TOP_COMPANIES_NETWORK_GAME                                  :{BIGFONT}{BLACK}T<>boa da Liga de Compa<70><61>as en {NUM}
 STR_0212                                                        :{BIGFONT}{COMMA}.
@@ -739,8 +739,6 @@ STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Capt.Pant. Xiga
 STR_02D9_ABOUT_OPENTTD                                          :Acerca de 'OpenTTD'
 ############ range ends	here
 
-STR_02DB_OFF                                                    :{BLACK}Off
-STR_02DA_ON                                                     :{BLACK}On
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Amosa-los subsidios
 STR_02DD_SUBSIDIES                                              :Subsidios
 STR_02DE_MAP_OF_WORLD                                           :Mapa do Mundo
@@ -810,7 +808,6 @@ STR_031C_SCREENSHOT_FAILED                                      :{WHITE}
 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Comprar terreo para futuro uso
 STR_032F_AUTOSAVE                                               :{RED}AUTOGUARDADO
 STR_SAVING_GAME                                                 :{RED}*  *  GRABANDO PARTIDA  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}<7D>Grabaci<63>n en progreso,{}por favor espera ata que termine!
 STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Selecciona-lo programa 'M<>sica Estilo Ezy Street'
 
 STR_0335_6                                                      :{BLACK}6
@@ -835,7 +832,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rumano
 STR_TOWNNAME_CZECH                                              :Checo
 STR_TOWNNAME_SWISS                                              :Su<53>zo
 STR_TOWNNAME_DANISH                                             :Dan<61>s
-STR_TOWNNAME_TURKISH                                            :Turco
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Libras (<28>)
@@ -858,8 +854,8 @@ STR_CURR_ITL                                                    :Lira Italiana (
 STR_CURR_NLG                                                    :Flor<6F>n Holand<6E>s (NLG)
 STR_CURR_NOK                                                    :Corona Noruguesa (NOK)
 STR_CURR_PLN                                                    :Zloty Polaco (PLN)
-STR_CURR_ROL                                                    :Leu Rumano (ROL)
-STR_CURR_RUR                                                    :Rublo Ruso (RUR)
+STR_CURR_ROL                                                    :Leu Rumano (Lei)
+STR_CURR_RUR                                                    :Rublo Ruso (rur)
 STR_CURR_SEK                                                    :Corona Sueca(SEK)
 
 STR_CURR_CUSTOM                                                 :Persoal...
@@ -941,7 +937,6 @@ STR_TRAIN_AUTORENEW_FAILED                                      :{WHITE}Autoreno
 STR_ROADVEHICLE_AUTORENEW_FAILED                                :{WHITE}Autorenovaci<63>n fallida para o veh<65>culo de estrada {COMMA} (l<>mite de di<64>eiro)
 STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Autorenovaci<63>n fallida para o barco {COMMA} (l<>mite de di<64>eiro)
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Autorenovaci<63>n fallida para a aeronave {COMMA} (l<>mite de di<64>eiro)
-STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}O tren {COMMA} e demasiado longo despois de substitu<74>r
 
 STR_CONFIG_PATCHES                                              :{BLACK}Configuraci<63>n dos Parches
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Configura-los parches
@@ -995,7 +990,6 @@ STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Altura da li<6C>a de neve: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Extensi<73>n Max. Estaci<63>n: {ORANGE}{STRING} {RED}Aviso: Valores altos reducen rendemento
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Face-lo servicio os helic<69>pteros no heliporto autom<6F>ticam.: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Inverti-la direcci<63>n de desplazamento: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}N<> m<>ximo de trens por xogador: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}N<> m<>ximo de veh<65>culos de estrada por xogador: {ORANGE}{STRING}
@@ -1008,7 +1002,6 @@ STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Deshabi
 STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Deshabilita-los barcos para o ordenador: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activar nova AI (alpha): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Permitir IAs en multixogador (experimental): {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Intervalo de servicio para os trens: {ORANGE}{STRING} d<>as
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Intervalo de servicio para os trens: {ORANGE}deshabilitado
@@ -1229,20 +1222,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (anunciar)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 xogadores
-STR_NETWORK_1_PLAYERS                                           :1 xogador
-STR_NETWORK_2_PLAYERS                                           :2 xogadores
-STR_NETWORK_3_PLAYERS                                           :3 xogadores
-STR_NETWORK_4_PLAYERS                                           :4 xogadores
-STR_NETWORK_5_PLAYERS                                           :5 xogadores
-STR_NETWORK_6_PLAYERS                                           :6 xogadores
-STR_NETWORK_7_PLAYERS                                           :7 xogadores
-STR_NETWORK_8_PLAYERS                                           :8 xogadores
-STR_NETWORK_9_PLAYERS                                           :9 xogadores
-STR_NETWORK_10_PLAYERS                                          :10 xogadores
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}N<> m<>x. de compa<70><61>as:
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}N<> m<>x. de espectadores:
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma falado:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Outros xogadores sabr<62>n cal <20> o idioma que se fala no servidor
@@ -1298,11 +1278,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Descargando informaci<63>n da partida..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Descargando informaci<63>n da compa<70><61>a..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} diante t<>a
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) diante t<>a
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descargados
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectar
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Introduce o texto a enviar
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduce a cantidade de di<64>eiro a dar
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}O servidor est<73> protexido. Introduce clave
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A coma<6D><61>a est<73> protexida. Introduce clave
@@ -1340,7 +1321,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrasinal inc
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :id de xogador err<72>nea en DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :pateado polo servidor
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :intentaba usar un truco
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor cheo
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :uniuse <20> partida
 STR_NETWORK_GIVE_MONEY                                          :deu a t<>a compa<70><61>a alg<6C>n di<64>eiro ({CURRENCY})
@@ -1757,9 +1737,7 @@ STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT
 STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}<7D>{INDUSTRY} incrementa a s<>a producci<63>n!
 STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}<7D>Nova veta de carb<72>n atopada en {INDUSTRY}!{}<7D>Esp<73>rase que a producci<63>n d<>brese!
 STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}<7D>Novas reservas de petr<74>leo atopadas en {INDUSTRY}!{}<7D>Esp<73>rase que a producci<63>n d<>brese!
-STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT}<7D>Esp<73>rase que a producci<63>n se dobre en {INDUSTRY} debido a m<>todos de cultivo mellorados!
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} baixa a producci<63>n nun 50%
-STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}<7D>Infestaci<63>n de insectos causa estragos en {INDUSTRY}!{}A producci<63>n baixa un 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}...s<> se pode emprazar cerca dos bordes do mapa
 STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}<7D>A producci<63>n de {STRING} en {INDUSTRY} sube un {COMMA}%!
 STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}<7D>A producci<63>n de {STRING} en {INDUSTRY} baixa un {COMMA}%!
@@ -2339,17 +2317,6 @@ STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Hai un t
 STR_8804                                                        :{SETX 10}{COMMA}: {STRING}
 STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING}
 STR_8806_GO_TO                                                  :Ir a {STATION}
-STR_8807_GO_TO_TRANSFER                                         :Ir a {STATION} (Transferir e coller carga)
-STR_8808_GO_TO_UNLOAD                                           :Ir a {STATION} (Descargar)
-STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Ir a {STATION} (Transferir e sair valeiro)
-STR_880A_GO_TO_LOAD                                             :Ir a {STATION} (Cargar)
-STR_880B_GO_TO_TRANSFER_LOAD                                    :Ir a {STATION} (Transferir e esperar a encher)
-STR_880C_GO_NON_STOP_TO                                         :Ir sen parar a {STATION}
-STR_880D_GO_TO_NON_STOP_TRANSFER                                :Ir sen parar a {STATION} (Transferir e coller carga)
-STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Ir sen parar a {STATION} (Descargar)
-STR_8810_GO_NON_STOP_TO_LOAD                                    :Ir sen parar a {STATION} (Cargar)
-STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Ir sen parar a {STATION} (Transferir e esperar a encher)
-STR_GO_TO_TRAIN_DEPOT                                           :Ir o Dep<65>sito De Trens de {TOWN}
 STR_SERVICE_AT_TRAIN_DEPOT                                      :Face-lo servicio no Dep<65>sito de Trens de {TOWN}
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Ir sen paradas o Dep<65>sito de Trens de {TOWN}
 STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Face-lo servicio sen paradas no Dep<65>sito de Trens de {TOWN}
@@ -2372,7 +2339,6 @@ STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Ve
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Veh<65>culos de Monorra<72>l
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Veh<65>culos de Maglev
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Constru<72>r Veh<65>culo
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Veh<65>culo
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esto constru<72>ra unha copia do veh<65>culo. CTRL+Click compartir<69> as ordes
 STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esto constru<72>ra unha copia do veh<65>culo. Pincha neste bot<6F>n e despois nun veh<65>culo dentro ou fora do dep<65>sito. CTRL+Click compartir<69> as ordes
 STR_CLONE_TRAIN                                                 :{BLACK}Clonar Tren
@@ -2583,7 +2549,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Reaxustar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona o tipo de mercador<6F>a que vai levar
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Reaxusta-lo barco para leva-lo tipo de mercacdor<6F>a seleccionada
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona-lo tipo de carga a levar:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona-lo tipo de carga a levar:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova Capacidade: {GOLD}{STRING}{}{BLACK}Coste do reaxuste: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Non se pode reaxusta-lo barco...
 STR_9842_REFITTABLE                                             :(reax.)
@@ -2595,8 +2561,6 @@ STR_A000_AIRPORTS                                               :{WHITE}Aeroport
 STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Nonse pode constru<72>-lo aeroporto a<>...
 STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}Hangar de Aeronaves de {STATION}
 STR_A003_NEW_AIRCRAFT                                           :{BLACK}Nova Aeronave
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esto construir<69> una copia da aeronave. CTRL-Click compartir<69> as ordes
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Nova Aeronave
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Constru<72>r Aeronave
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Non se pode constru<72>-lo av<61>on...
@@ -2643,7 +2607,6 @@ STR_A030_NAME_AIRCRAFT                                          :{WHITE}Renomear
 STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Non se pode renomea-la aeronave...
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Renomear aeronave
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Celebraci<63>n cidad<61> . . .{}<7D>Chega a primeira aeronave a {STATION}!
-STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}<7D>Accidente A<>reo!{}{COMMA} morren na bola de lume en {STATION}
 STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}<7D>Accidente de Aeronave!<21>A aeronave {} quedou sen combustible, hai {COMMA} mortos na explosi<73>n!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renomear
@@ -2655,7 +2618,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Reaxustar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Selecciona o tipo de carga que levar<61>
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Reaxusta-la aeronave para levar o tipo de carga seleccionada
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona o tipo de carga a levar:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Selecciona o tipo de carga a levar:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Cose do reaxuste: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Non se pode reaxusta-la aeronave...
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir <20> hangar de {STATION}

lang/german.txt

@@ -304,7 +304,7 @@ STR_MAPSIZE                                                     :{BLACK}Kartengr
 STR_BY                                                          :{BLACK}*
 STR_0148_GAME_OPTIONS                                           :{BLACK}Spieleinstellungen
 
-STR_0150_SOMEONE                                                :Jemand{SKIP}{SKIP}
+STR_0150_SOMEONE                                                :jemand{SKIP}{SKIP}
 STR_0151_MAP_OF_WORLD                                           :Weltkarte
 STR_0152_TOWN_DIRECTORY                                         :St<53>dteverzeichnis
 STR_0153_SUBSIDIES                                              :Subventionen
@@ -327,7 +327,7 @@ STR_015E_QUIT_GAME                                              :Spiel beenden
 STR_015F_QUIT                                                   :Beenden
 STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Bist du sicher, dass du das Spiel beenden willst?
 STR_0161_QUIT_GAME                                              :{WHITE}Spiel beenden
-STR_SORT_ORDER_TIP                                              :{BLACK}Sortierreihenfolge ausw<73>hlen (absteigend/aufsteigend)
+STR_SORT_ORDER_TIP                                              :{BLACK}Sortierreihenfolge ausw<73>hlen absteigend/aufsteigend
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Sortierkriterium ausw<73>hlen
 STR_SORT_BY                                                     :{BLACK}Sortieren nach
 
@@ -393,9 +393,9 @@ STR_0189                                                        :{BLACK}{SMALLDO
 STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Das Wartungsintervall kann nicht ge<67>ndert werden...
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Fenster schlie<69>en
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Titelleiste verschieben um das Fenster zu bewegen
-STR_STICKY_BUTTON                                               :{BLACK}Fenster wird nicht durch die "schlie<69>e alle Fenster"-Taste geschlossen
+STR_STICKY_BUTTON                                               :{BLACK}Fenster wird nicht durch
 STR_RESIZE_BUTTON                                               :{BLACK}Klicken und Ziehen zum Gr<47><72>e <20>ndern
-STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Hier klicken, um zum Standardspielstandsverzeichnis zu gehen
+STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Hier klicken, um zum Standard-Spielstands-Verzeichnis zu gehen
 STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Geb<65>ude usw. auf einem Planquadrat abrei<65>en
 STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Land absenken
 STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Land anheben
@@ -523,8 +523,8 @@ STR_MESSAGE_HISTORY_MENU                                        :Vergangene Nach
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Zeige letzte Mitteilung / Nachricht, Nachrichtenoptionen anzeigen
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Nachrichtenoptionen
 STR_0205_MESSAGE_TYPES                                          :{BLACK}Nachrichtenart:
-STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs in einer Station des Spielers
-STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs in einer Station eines Gegners
+STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs in der Station des Spielers
+STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankunft des ersten Fahrzeugs in der Station eines Gegners
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Unf<6E>lle / Katastrophen
 STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Firmendaten
 STR_020A_ECONOMY_CHANGES                                        :{YELLOW}<7D>nderungen der Wirtschaftslage
@@ -661,8 +661,8 @@ STR_0289_PLACE_SIGN                                             :{BLACK}Schild a
 STR_028A_RANDOM_TREES                                           :{BLACK}Zuf<75>llige B<>ume
 STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}B<>ume zuf<75>llig <20>ber die Landschaft verteilen
 STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Felsige Gebiete in der Landschaft platzieren
-STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Leuchtturm errichten
-STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Sender errichten
+STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Leuchtturm erstellen
+STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Sender erstellen
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Lege W<>stengebiet an.{}STRG dr<64>cken zum entfernen
 STR_CREATE_LAKE                                                 :{BLACK}Gebiet fluten.{}Auf Meeresh<73>he entsteht ein Gew<65>sser
 STR_0290_DELETE                                                 :{BLACK}L<>schen
@@ -735,7 +735,7 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Durchs
 ############ range for menu	starts
 STR_02D5_LAND_BLOCK_INFO                                        :Gebietsinformation
 STR_02D6                                                        :
-STR_CONSOLE_SETTING                                             :Konsole <EFBFBD>ffnen/schlie<69>en
+STR_CONSOLE_SETTING                                             :Konsole An/Aus
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Strg-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Riesiger Screenshot (Strg-G)
 STR_02D9_ABOUT_OPENTTD                                          :<3A>ber 'OpenTTD'
@@ -764,7 +764,7 @@ STR_02E4                                                        :{BLACK}{SKIP}{S
 STR_02E5_DISTANCE_UNITS_SELECTION                               :{BLACK}W<>hle Entfernungsmessung in
 STR_02E6_ROAD_VEHICLES                                          :{BLACK}Fahrzeuge
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}W<>hle auf welcher Stra<72>enseite der Verkehr fahren soll
+STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}W<>hle auf welcher Stra<72>enseite der Verkehr flie<EFBFBD>en soll
 STR_02E9_DRIVE_ON_LEFT                                          :Linksverkehr
 STR_02EA_DRIVE_ON_RIGHT                                         :Rechtsverkehr
 STR_02EB_TOWN_NAMES                                             :{BLACK}St<53>dtenamen
@@ -824,7 +824,7 @@ STR_0336_7                                                      :{BLACK}7
 STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Englisch
 STR_TOWNNAME_FRENCH                                             :Franz<6E>sisch
 STR_TOWNNAME_GERMAN                                             :Deutsch
-STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :Englisch (Zus<75>tzlich)
+STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :English (Zus<75>tzlich)
 STR_TOWNNAME_LATIN_AMERICAN                                     :Lateinamerikanisch
 STR_TOWNNAME_SILLY                                              :Verr<72>ckt
 STR_TOWNNAME_SWEDISH                                            :Schwedisch
@@ -839,7 +839,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rum
 STR_TOWNNAME_CZECH                                              :Tschechisch
 STR_TOWNNAME_SWISS                                              :Schweizerisch
 STR_TOWNNAME_DANISH                                             :D<>nisch
-STR_TOWNNAME_TURKISH                                            :T<>rkisch
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Pfund (<28>)
@@ -849,7 +848,7 @@ STR_CURR_YEN                                                    :Yen (
 STR_CURR_ATS                                                    :<3A>sterreich. Schilling (ATS)
 STR_CURR_BEF                                                    :Belgische Franc (BEF)
 STR_CURR_CHF                                                    :Schweizer Franken (CHF)
-STR_CURR_CZK                                                    :Tschechische Kronen (CZK)
+STR_CURR_CZK                                                    :Tschechische Koruna (CZK)
 STR_CURR_DEM                                                    :Deutsche Mark (DEM)
 STR_CURR_DKK                                                    :D<>nische Kronen (DKK)
 STR_CURR_ESP                                                    :Peseta (ESP)
@@ -862,9 +861,9 @@ STR_CURR_ITL                                                    :Italienische Li
 STR_CURR_NLG                                                    :Niederl<72>nd. Gulden (NLG)
 STR_CURR_NOK                                                    :Norwegische Kronen (NOK)
 STR_CURR_PLN                                                    :Polnische Zloty (PLN)
-STR_CURR_ROL                                                    :Rum<75>nische Lei (ROL)
-STR_CURR_RUR                                                    :Russische Rubel (RUR)
-STR_CURR_SEK                                                    :Schwedische Kronen (SEK)
+STR_CURR_ROL                                                    :Rum<75>nische Lei (Lei)
+STR_CURR_RUR                                                    :Russische Rubel (rur)
+STR_CURR_SEK                                                    :Swedische Kronen (SEK)
 
 STR_CURR_CUSTOM                                                 :Eigene...
 
@@ -875,9 +874,9 @@ STR_OPTIONS_LANG_TIP                                            :{BLACK}Sprache
 STR_OPTIONS_FULLSCREEN                                          :{BLACK}Vollbild
 STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}OpenTTD im Vollbildmodus spielen
 
-STR_OPTIONS_RES                                                 :{BLACK}Bildschirmaufl<EFBFBD>sung
+STR_OPTIONS_RES                                                 :{BLACK}Bildschirmgr<EFBFBD><EFBFBD>e
 STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_OPTIONS_RES_TIP                                             :{BLACK}Bildschirmaufl<EFBFBD>sung ausw<73>hlen
+STR_OPTIONS_RES_TIP                                             :{BLACK}Bildschirmgr<EFBFBD><EFBFBD>e ausw<73>hlen
 
 STR_OPTIONS_SCREENSHOT_FORMAT                                   :{BLACK}Screenshotformat
 STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -911,8 +910,7 @@ STR_LITERS                                                      :Liter
 STR_ITEMS                                                       :St<53>ck
 STR_CRATES                                                      :Kisten
 STR_RES_OTHER                                                   :Andere
-STR_NOTHING                                                     :
-
+STR_NOTHING                                                     :nichts
 
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Der Fahrplan kann nicht gemeinsam benutzt werden...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kann Fahrplan nicht kopieren...
@@ -1025,7 +1023,7 @@ STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED                    :{LTBLUE}Vorgege
 STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Vorgegebener Wartungsintervall f<>r Schiffe: {ORANGE}{STRING} Tage
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Vorgegebener Wartungsintervall f<>r Schiffe: {ORANGE}abgeschaltet
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Wartung deaktivieren, wenn Pannen abgeschaltet: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Ber<EFBFBD>cksichtige Waggonh<EFBFBD>chstgeschwindigkeit: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Aktiviere Waggon H<EFBFBD>chstgeschwindigkeit: {ORANGE}{STRING}
 
 STR_CONFIG_PATCHES_COLORED_NEWS_DATE                            :{LTBLUE}Farbige Nachrichten erscheinen ab: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_DATE                                :{LTBLUE}Startdatum: {ORANGE}{STRING}
@@ -1112,7 +1110,7 @@ STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Land aus
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Zuf<75>llige Baumart
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Zuf<75>llige Baumart pflanzen
+STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Zuf<75>llige Baumart platzieren
 
 STR_CANT_BUILD_CANALS                                           :{WHITE}Kann hier keinen Kanal bauen...
 STR_BUILD_CANALS_TIP                                            :{BLACK}Kanal bauen
@@ -1130,7 +1128,7 @@ STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kann den
 STR_CANT_CONVERT_RAIL                                           :{WHITE}Kann Gleistyp hier nicht ver<65>ndern...
 STR_CONVERT_RAIL_TIP                                            :{BLACK}Konvertiere / Erweitere den Typ des Gleises
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Lok hierher ziehen, um den ganzen Zug zu verkaufen
+STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Zugmaschine hierher ziehen, um den ganzen Zug zu verkaufen
 
 STR_DRAG_DROP                                                   :{BLACK}Drag & Drop
 STR_STATION_DRAG_DROP                                           :{BLACK}Bahnhof mittels 'Drag & Drop' bauen
@@ -1216,7 +1214,7 @@ STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverv
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Startdatum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aktuelles Datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Passwortgesch<EFBFBD>tzt!
+STR_NETWORK_PASSWORD                                            :{SILVER}passwortgesch<EFBFBD>tzt!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER VOLL
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}Versionskonflikt festgestellt
@@ -1275,7 +1273,7 @@ STR_NETWORK_LANG_FRENCH                                         :Franz
 STR_NETWORK_GAME_LOBBY                                          :{WHITE}Mehrspielerlobby
 
 STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Spieleintritt vorbereiten:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Eine Liste aller Firmen, die sich im Spiel befinden. Du kannst einer Firma beitreten oder eine eigene Firma gr<67>nden, sofern ein Platz frei ist.
+STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Eine Liste aller Firmen, die sich im Spiel befinden
 STR_NETWORK_NEW_COMPANY                                         :{BLACK}Neues Unternehmen
 STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Ein neues Unternehmen gr<67>nden
 STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Beim Spiel zusehen
@@ -1283,7 +1281,7 @@ STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Als Zusc
 STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Firma beitreten
 STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Beim Verwalten der Firma helfen
 STR_NETWORK_REFRESH                                             :{BLACK}Aktualisieren
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Aktualisiert die Serverinformationen
+STR_NETWORK_REFRESH_TIP                                         :{BLACK}Aktuallisiert die Serverinformationen
 
 STR_NETWORK_COMPANY_INFO                                        :{SILVER}Firmenprofil
 
@@ -1298,24 +1296,25 @@ STR_NETWORK_VEHICLES                                            :{SILVER}Fahrzeu
 STR_NETWORK_STATIONS                                            :{SILVER}Stationen:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
 STR_NETWORK_PLAYERS                                             :{SILVER}Spieler:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Verbinden...
+STR_NETWORK_CONNECTING                                          :{WHITE}Verbinde...
 
 ############ Leave those lines in this order!!
-STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Verbinden...
-STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Autorisieren...
-STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Warten...
+STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Verbinde..
+STR_NETWORK_CONNECTING_2                                        :{BLACK}(2/6) Autorisierung..
+STR_NETWORK_CONNECTING_3                                        :{BLACK}(3/6) Warten..
 STR_NETWORK_CONNECTING_4                                        :{BLACK}(4/6) Herunterladen der Karte..
-STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Spieldaten verarbeiten...
+STR_NETWORK_CONNECTING_5                                        :{BLACK}(5/6) Verarbeite Spieldaten..
 STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Registrieren...
 
-STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Spielinformationen holen...
-STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Firmeninformationen holen...
+STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Hole Spielinformationen..
+STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hole Firmeninformationen..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} Teilnehmer vor dir
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} Teilnehmer vor uns
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} KB bisher heruntergeladen
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Trennen
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Gib deine Nachricht ein
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Gib an, wieviel Geld du geben m<>chtest
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server ist gesch<63>tzt. Gib das Passwort ein
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma ist gesch<63>tzt! Passwort eingeben
@@ -1349,7 +1348,7 @@ STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nicht authorisi
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :Unerwartetes Paket empfangen
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :Falsche Version
 STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :Name wird bereits verwendet
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :Falsches Spielpasswort
+STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :Falsches Spiel-Passwort
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :Falsche-SpielerID in DoCommand (Verarbeitungsfehler)
 STR_NETWORK_ERR_CLIENT_KICKED                                   :gekickt
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :versuchte einen Cheat zu nutzen
@@ -1417,7 +1416,7 @@ STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Keine ge
 STR_1007_ALREADY_BUILT                                          :{WHITE}...ist bereits gebaut
 STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Gleise m<>ssen erst entfernt werden
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Gleis- / Bahnhofsbau
-STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Einschienenbahnbau
+STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Einschienbahnbau
 STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Magnetschwebebahnbau
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Eisenbahnbr<62>cke ausw<73>hlen
 STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Kann hier kein Zugdepot bauen...
@@ -1428,13 +1427,13 @@ STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Gleise k
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Kann die Signale hier nicht entfernen...
 STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Zugdepotausrichtung
 STR_1015_RAILROAD_CONSTRUCTION                                  :Eisenbahnbau
-STR_1016_MONORAIL_CONSTRUCTION                                  :Einschienenbahnbau
+STR_1016_MONORAIL_CONSTRUCTION                                  :Einschienbahnbau
 STR_1017_MAGLEV_CONSTRUCTION                                    :Magnetschwebebahnbau
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Gleise legen
 STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}Zugdepot bauen (zum Bau und zur Wartung von Z<>gen)
 STR_101A_BUILD_RAILROAD_STATION                                 :{BLACK}Bahnhof bauen
 STR_101B_BUILD_RAILROAD_SIGNALS                                 :{BLACK}Signale errichten
-STR_101C_BUILD_RAILROAD_BRIDGE                                  :{BLACK}Eisenbahnbr<EFBFBD>cke bauen
+STR_101C_BUILD_RAILROAD_BRIDGE                                  :{BLACK}Bahnbr<EFBFBD>cke bauen
 STR_101D_BUILD_RAILROAD_TUNNEL                                  :{BLACK}Eisenbahntunnel bauen
 STR_101E_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Umschalter f<>r Bau/Abriss von Gleisen und Signalen
 STR_101F_BRIDGE_SELECTION_CLICK                                 :{BLACK}Br<42>ckenauswahl - klicke auf die gew<65>nschte Br<42>cke, um sie zu bauen
@@ -1444,15 +1443,14 @@ STR_1023_RAILROAD_TRAIN_DEPOT                                   :Zugdepot
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...Gel<65>nde geh<65>rt jemand anderem
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Gleis mit normalen Signalen
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Gleis mit Vorsignalen
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Gleis mit Ausfahrsignalen
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Gleis mit kombinierten Vor-/Ausfahrsignalen
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Gleis mit Ausfahrtsignalen
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Gleis mit kombinierten Vor-/Ausfahrtsignalen
 
 
 
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Das Land neigt sich in die falsche Richtung
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Stra<72>e muss erst entfernt werden
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Stra<72>enarbeiten sind im Gange
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Stra<72>enbau
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Br<42>cke w<>hlen
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kann hier keine Stra<72>e bauen...
@@ -1746,7 +1744,7 @@ STR_481F_COLA_WELLS                                             :{G=w}Colaquelle
 STR_4820_TOY_SHOP                                               :{G=n}Spielwarengesch<63>ft
 STR_4821_TOY_FACTORY                                            :{G=w}Spielwarenfabrik
 STR_4822_PLASTIC_FOUNTAINS                                      :{G=m}Plastikbrunnen
-STR_4823_FIZZY_DRINK_FACTORY                                    :{G=w}Limonadenfabrik
+STR_4823_FIZZY_DRINK_FACTORY                                    :{G=w}Limonadefabrik
 STR_4824_BUBBLE_GENERATOR                                       :{G=m}Luftblasengenerator
 STR_4825_TOFFEE_QUARRY                                          :{G=w}Karamellgrube
 STR_4826_SUGAR_MINE                                             :{G=w}Zuckermine
@@ -1938,7 +1936,7 @@ STR_6830_IMMEDIATE                                              :Zusammen mit de
 STR_6831_3_MONTHS_AFTER_PLAYER                                  :3 Monate nach dem Spieler
 STR_6832_6_MONTHS_AFTER_PLAYER                                  :6 Monate nach dem Spieler
 STR_6833_9_MONTHS_AFTER_PLAYER                                  :9 Monate nach dem Spieler
-STR_6834_AT_END_OF_LINE_AND_AT_STATIONS                         :Am Streckenende und in Bahnh<6E>fen
+STR_6834_AT_END_OF_LINE_AND_AT_STATIONS                         :Am Streckenende und in Bahnh<6E>fe
 STR_6835_AT_END_OF_LINE_ONLY                                    :Nur am Streckenende
 STR_6836_OFF                                                    :Aus
 STR_6837_ON                                                     :An
@@ -2061,10 +2059,10 @@ STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Firmensi
 STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Errichte Firmensitz f<>r 1% des Firmenwertes an anderer Stelle neu.
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Kann keinen Firmensitz bauen ...
 STR_7072_VIEW_HQ                                                :{BLACK}Zeige Firmensitz
-STR_RELOCATE_HQ                                                 :{BLACK}Firmensitz verlegen
+STR_RELOCATE_HQ                                                 :{BLACK}HQ verlegen
 STR_COMPANY_PASSWORD                                            :{BLACK}Passwort
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Sch<63>tze deine Firma mit einem Passwort, um unautorisierten Spielern den Beitritt zu verwehren.
-STR_SET_COMPANY_PASSWORD                                        :Firmenpasswort setzen
+STR_SET_COMPANY_PASSWORD                                        :Firmen-Passwort setzen
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}Weltwirtschaftskrise!{}{}Finanzexperten bef<65>rchten schlimmsten Zusammenbruch der Wirtschaft!
 STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Wirtschaftskrise beendet!{}{}Aufschwung des Handels gibt Vertrauen in die Industrie und st<73>rkt die Wirtschaft!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Schalter f<>r gro<72>es/kleines Fenster
@@ -2338,13 +2336,13 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Tricario Hubsch
 STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2 Hubschrauber
 STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut Hubschrauber
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Nachricht vom Fahrzeughersteller
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Wir haben gerade ein{G en e ""} neue{G n "" s} {STRING} erstellt - sind Sie daran interessiert, das Fahrzeug ein Jahr lang exklusiv zu testen, so dass wir die Funktionen testen k<>nnen, bevor es allgemein zur Verf<72>gung gestellt wird?
-STR_8102_RAILROAD_LOCOMOTIVE                                    :{G=w}Lokomotive
-STR_8103_ROAD_VEHICLE                                           :{G=n}Fahrzeug
-STR_8104_AIRCRAFT                                               :{G=n}Flugzeug
-STR_8105_SHIP                                                   :{G=n}Schiff
-STR_8106_MONORAIL_LOCOMOTIVE                                    :{G=w}Einschienenbahn
-STR_8107_MAGLEV_LOCOMOTIVE                                      :{G=w}Magnetschwebebahn
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Wir haben gerade ein(e) neue(s) {STRING} erstellt - sind Sie daran interessiert, das Fahrzeug ein Jahr lang exklusiv zu testen, so dass wir die Funktionen testen k<>nnen, bevor es allgemein zur Verf<72>gung gestellt wird?
+STR_8102_RAILROAD_LOCOMOTIVE                                    :Lokomotive
+STR_8103_ROAD_VEHICLE                                           :Fahrzeug
+STR_8104_AIRCRAFT                                               :Flugzeug
+STR_8105_SHIP                                                   :Schiff
+STR_8106_MONORAIL_LOCOMOTIVE                                    :Einschienbahn
+STR_8107_MAGLEV_LOCOMOTIVE                                      :Magnetschwebebahn
 
 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Zugdepot
@@ -2385,7 +2383,7 @@ STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Zug zu l
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Z<>ge k<>nnen nur ver<65>ndert werden, wenn sie im Depot halten
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Z{P ug <20>ge}
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Neues Schienenfahrzeug
-STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Neue Einschienenbahnz<EFBFBD>ge
+STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Neue Einschienbahnz<6E>ge
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Neue Magnetz<74>ge
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Fahrzeug bauen
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Fahrzeug duplizieren
@@ -2418,7 +2416,7 @@ STR_8833_CAN_T_INSERT_NEW_ORDER                                 :{WHITE}Kann kei
 STR_8834_CAN_T_DELETE_THIS_ORDER                                :{WHITE}Kann den Auftrag nicht l<>schen...
 STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Kann den Auftrag nicht bearbeiten...
 STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Kann das Fahrzeug nicht bewegen...
-STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}Hintere Lok folgt immer der vorderen Lok
+STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}Hintere Lokomotive folgt immer der vorderen Lok
 STR_8838_N_A                                                    :k.A.{SKIP}
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kann Schienenfahrzeug nicht verkaufen...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kann keinen weg zum Depot finden
@@ -2520,7 +2518,7 @@ STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Fahrzeug
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Baue das ausgew<65>hlte Fahrzeug
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Neues Fahrzeug jetzt erh<72>ltlich!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kosten: {CURRENCY}{}Geschwindigk.: {VELOCITY}{}Betriebskosten: {CURRENCY}/Jahr{}Ladeverm<EFBFBD>gen: {STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Kosten: {CURRENCY}{}Geschwindigk.: {VELOCITY}{}Betriebskosten: {CURRENCY}/Jahr{}Capacity: {STRING}
 
 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Name des Fahrzeuges
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Kann das Fahrzeug nicht benennen...
@@ -2606,7 +2604,7 @@ STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kap
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kann das Schiff nicht umr<6D>sten...
 STR_9842_REFITTABLE                                             :(umr<6D>stbar)
 STR_GO_TO_SHIP_DEPOT                                            :Fahre zu {TOWN} Schiffswerft
-SERVICE_AT_SHIP_DEPOT                                           :Wartung in der {TOWN} Schiffswerft
+SERVICE_AT_SHIP_DEPOT                                           :Wartung bei {TOWN} Schiffswerft
 
 ##id 0xA000
 STR_A000_AIRPORTS                                               :{WHITE}Flugh<67>fen
@@ -2615,7 +2613,7 @@ STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION
 STR_A003_NEW_AIRCRAFT                                           :{BLACK}Neues Flugzeug
 STR_CLONE_AIRCRAFT                                              :{BLACK}Flugzeug duplizieren
 STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Baut eine Kopie des Flugzeuges. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Baut eine Kopie des Flugzeuges. Klicke auf diese Schaltfl<66>che und dann auf ein Flugzeug innerhalb oder au<61>erhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Baut eine Kopie des Flugzeuges. Klicke diese Schaltfl<66>che und dann auf eine Flugzeug innerhalb oder au<61>erhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
 STR_A005_NEW_AIRCRAFT                                           :{WHITE}Neues Flugzeug
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Flugzeug bauen
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kann das Flugzeug nicht bauen...
@@ -2678,7 +2676,7 @@ STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}W
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Neue Kapazit<69>t: {GOLD}{STRING}{}{BLACK}Kosten der Umr<6D>stung: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kann das Flugzeug nicht umr<6D>sten...
 STR_GO_TO_AIRPORT_HANGAR                                        :Fliege zu {STATION} Hangar
-SERVICE_AT_AIRPORT_HANGAR                                       :Wartung im {STATION} Hangar
+SERVICE_AT_AIRPORT_HANGAR                                       :Wartung bei {STATION} Hangar
 
 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}Zeppelinabsturz bei {STATION}!
@@ -2762,7 +2760,7 @@ STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Fahrzeug
 STR_NOT_REPLACING                                               :{BLACK}Keine Ersetzung
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Kein Fahrzeug gew<65>hlt
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}W<>hle das zu ersetzende Fahrzeug
-STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}W<>hle den Fahrzeugtyp, der anstelle des links gew<65>hlten Fahrzeugs verwendet werden soll
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}W<>hle den Fahrzeugtyp, der an Stelle des links gew<65>hlten Fahrzeugs verwendet werden soll
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Dr<44>cke diesen Button, wenn das Fahrzeug auf der linken Seite nicht ersetzt werden soll
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Dr<44>cke diesen Button, wenn das Fahrzeug auf der linken Seite durch das auf der rechten Seite gew<65>hlte ersetzt werden soll
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}W<>hle einen Schienentyp f<>r den Loks ersetzt werden sollen
@@ -2778,7 +2776,7 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Schilder
 ############ Lists rail types
 
 STR_RAIL_VEHICLES                                               :Eisenbahn
-STR_MONORAIL_VEHICLES                                           :Einschienenbahn
+STR_MONORAIL_VEHICLES                                           :Einschienbahn
 STR_MAGLEV_VEHICLES                                             :Magnetschwebebahn
 
 ############ End of list of rail types

lang/hungarian.txt

@@ -903,7 +903,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rom
 STR_TOWNNAME_CZECH                                              :Cseh
 STR_TOWNNAME_SWISS                                              :Sv<53>jci
 STR_TOWNNAME_DANISH                                             :D<>n
-STR_TOWNNAME_TURKISH                                            :T<>r<EFBFBD>k
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Font (<28>)
@@ -926,8 +925,8 @@ STR_CURR_ITL                                                    :Olasz L
 STR_CURR_NLG                                                    :Holland Guilder (NLG)
 STR_CURR_NOK                                                    :Norv<72>g Korona (NOK)
 STR_CURR_PLN                                                    :Legyel Zlotyi (PLN)
-STR_CURR_ROL                                                    :Rom<6F>n Lej (ROL)
-STR_CURR_RUR                                                    :Orosz Rubel (RUR)
+STR_CURR_ROL                                                    :Rom<6F>n Lej (Lej)
+STR_CURR_RUR                                                    :Orosz Rubel (rur)
 STR_CURR_SEK                                                    :Sv<53>d Korona (SEK)
 
 STR_CURR_CUSTOM                                                 :Saj<61>t...
@@ -977,7 +976,6 @@ STR_CRATES                                                      :l
 STR_RES_OTHER                                                   :egy<67>b
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nem lehet megosztani a menetrendet...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nem lehet m<>solni a menetrendet...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Megosztott menetrend v<>ge - -
@@ -1380,6 +1378,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Lebont<6E>s
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}<7D>rd be az elk<6C>ldend<6E> <20>zenetet
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}<7D>rd be mennyi p<>nzt akarsz adom<6F>nyozni
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}A szerver jelsz<73>val van v<>dve. <20>rd be
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A c<>g jelsz<73>val van v<>dve. <20>rd be
@@ -1516,7 +1515,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Vas
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Rossz ir<69>nyba lejt a f<>ld
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}El<45>bb le kell rombolnod az utat
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}<7D>tkarbantart<72>s folyamatban
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}<7D>t<EFBFBD>p<EFBFBD>t<EFBFBD>s
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}K<>z<EFBFBD>ti h<>d <20>p<EFBFBD>t<EFBFBD>se
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Nem <20>p<EFBFBD>thetsz ide utat...
@@ -1887,7 +1885,7 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND                                :{WHITE}Nem lehe
 STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}El<45>bb le kell rombolnod az alagutat
 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}El<45>bb le kell rombolnod a hidat
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Nem kezd<7A>dhet <20>s v<>gz<67>dhet ugyanott
-STR_5009_LEVEL_LAND_OR_WATER_REQUIRED                           :{WHITE}Sima talaj vagy v<>z kell, hogy legyen a h<>d alatt
+STR_5009_LEVEL_LAND_OR_WATER_REQUIRED                           :{WHITE}Sima f<EFBFBD>ld vagy v<>z kell, hogy legyen a h<>d alatt
 STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}A kezdet<65>nek <20>s a v<>g<EFBFBD>nek egy vonalban kell lennie
 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL                             :{WHITE}Nem alkalmas a hely alag<61>t bej<65>rat<61>nak
 STR_500D                                                        :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}

lang/icelandic.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Skilabo
 STR_MESSAGE_HISTORY_MENU                                        :Saga skilabo<62>a
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}S<>na s<><73>ustu skilabo<62>/fr<66>ttatilkynningu, s<>na skilabo<62>astillingar
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Skilabo<62>astillingar
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Skilabo<62>ategundir:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Skilabo<62>ategundir:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}A<>koma fyrsta farart<72>kis <20> st<73><74> leikmanns
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}A<>koma fyrsta farart<72>kis <20> st<73><74> andst<73><74>ings
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Slys / hamfarir
@@ -860,8 +860,8 @@ STR_CURR_ITL                                                    :
 STR_CURR_NLG                                                    :Hollensk Gyllini (NLG)
 STR_CURR_NOK                                                    :Norsk kr<6B>na (NOK)
 STR_CURR_PLN                                                    :P<>lsk Zloty (PLN)
-STR_CURR_ROL                                                    :R<>mensk Leu (ROL)
-STR_CURR_RUR                                                    :R<>ssnesk R<>bla (RUR)
+STR_CURR_ROL                                                    :R<>mensk Leu (Lei)
+STR_CURR_RUR                                                    :R<>ssnesk R<>bla (rur)
 STR_CURR_SEK                                                    :S<>nsk Kr<4B>na (SEK)
 
 STR_CURR_CUSTOM                                                 :S<>rvali<6C>...
@@ -1298,6 +1298,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Aftengjast
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Sl<53><6C>u inn skilabo<62> til a<> senda
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sl<53><6C>u inn upph<70><68> fj<66>r sem <20><> villt gefa
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}<7D>j<EFBFBD>nn er varinn. Sl<53><6C>u inn lykilor<6F>
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Fyrirt<72>ki er vari<72>. Sl<53><6C>u inn lykilor<6F>
@@ -1497,11 +1498,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}B
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Einkunnir flutningsfyrirt<72>kis:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Samstarfssamningar
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Samstarfssamningar <20> bo<62>i fyrir eftirfarandi <20>j<EFBFBD>nustur:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Samstarfssamningar <20> bo<62>i fyrir eftirfarandi <20>j<EFBFBD>nustur:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} fr<66> {STRING} til {STRING}
 STR_2028_BY                                                     :{YELLOW} (til {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Enginn
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Samningar <20>egar <20> gildi:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Samningar <20>egar <20> gildi:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} fr<66> {STATION} til {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, <20>anga<67> til {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Tilbo<62> til samstarfssamnings runni<6E> <20>t:{}{}{STRING} fr<66> {STRING} til {STRING} mun ekki vera samningsbundi<64>.
@@ -2580,7 +2581,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Breyta skipi
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu hvernig farm skipi<70> <20> a<> flytja
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Breyta skipi svo <20>a<EFBFBD> flytji valinn farm
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Veldu farm sem <20> a<> flytja:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Veldu farm sem <20> a<> flytja:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}N<> bur<75>argeta: {GOLD}{STRING}{}{BLACK}Breytingarkostna<6E>ur: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Get ekki breytt skipi...
 STR_9842_REFITTABLE                                             :(breytanlegt)
@@ -2653,7 +2654,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Breyta flugv<67>l
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Veldu farm sem flugv<67>l <20> a<> flytja
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Breyta flugv<67>l svo h<>n flytji valinn farm
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Veldu farm sem <20> a<> flytja:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Veldu farm sem <20> a<> flytja:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}N<> bur<75>argeta: {GOLD}{STRING}{}{BLACK}Breytingarkostna<6E>ur: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Get ekki breytt flugv<67>l...
 STR_GO_TO_AIRPORT_HANGAR                                        :Fara <20> {STATION} flugsk<73>li

lang/norwegian.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Meldingsinnstil
 STR_MESSAGE_HISTORY_MENU                                        :Tidligere meldinger
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Vis siste melding/nyhet, vis meldingsinnstillinger
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Meldingsinnstillinger
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Meldingstyper:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Meldingstyper:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankommst av f<>rste kj<6B>ret<65>y p<> spillers stasjon
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankommst av f<>rste kj<6B>ret<65>y p<> motstanders stasjon
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Ulykker / Katastrofer
@@ -734,7 +734,6 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Gjenno
 ############ range for menu	starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informasjon om felt.
 STR_02D6                                                        :
-STR_CONSOLE_SETTING                                             :Toggle Console
 STR_02D7_SCREENSHOT_CTRL_S                                      :Skjermdump (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Stor skjermdump (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Om 'OpenTTD'
@@ -838,7 +837,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rumensk
 STR_TOWNNAME_CZECH                                              :Tsjekkisk
 STR_TOWNNAME_SWISS                                              :Sveitsisk
 STR_TOWNNAME_DANISH                                             :Dansk
-STR_TOWNNAME_TURKISH                                            :Tyrkisk
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Pund (<28>)
@@ -861,11 +859,10 @@ STR_CURR_ITL                                                    :Italiensk Lira
 STR_CURR_NLG                                                    :Hollandsk Guilder (NLG)
 STR_CURR_NOK                                                    :Norsk Krone (NOK)
 STR_CURR_PLN                                                    :Polsk Zloty (PLN)
-STR_CURR_ROL                                                    :Rumensk Leu (ROL)
-STR_CURR_RUR                                                    :Russisk Rubel (RUR)
+STR_CURR_ROL                                                    :Rumensk Leu (Lei)
+STR_CURR_RUR                                                    :Russisk Rubel (rur)
 STR_CURR_SEK                                                    :S<>ta Brors Krona (SEK)
 
-STR_CURR_CUSTOM                                                 :Custom...
 
 STR_OPTIONS_LANG                                                :{BLACK}Spr<70>k
 STR_OPTIONS_LANG_CBO                                            :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -912,7 +909,6 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :annet
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan ikke dele ordre liste...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke kopiere ordre liste...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slutt p<> delte ordre - -
@@ -1239,22 +1235,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internett
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internett (annons<6E>r)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 Spillere
-STR_NETWORK_1_PLAYERS                                           :1 spiller
-STR_NETWORK_2_PLAYERS                                           :2 spillere
-STR_NETWORK_3_PLAYERS                                           :3 spillere
-STR_NETWORK_4_PLAYERS                                           :4 spillere
-STR_NETWORK_5_PLAYERS                                           :5 spillere
-STR_NETWORK_6_PLAYERS                                           :6 spillere
-STR_NETWORK_7_PLAYERS                                           :7 spillere
-STR_NETWORK_8_PLAYERS                                           :8 spillere
-STR_NETWORK_9_PLAYERS                                           :9 spillere
-STR_NETWORK_10_PLAYERS                                          :10 spillere
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks bedrifter:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begrens serveren til et bestemt antall bedrifter
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks Tilskuere
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begrens serveren til et bestemt antall seere
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Spr<70>k snakket p<> tjeneren:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Andre spiller skal kunne vite hvilket spr<70>k man snakker p<> denne tjeneren.
@@ -1310,11 +1291,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Henter spilloversikt..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter firmaoversikt..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} foran oss
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(er) foran oss
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} KB lastet ned s<> langt
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Koble fra
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Skriv inn teksten du vil sende
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv inn hvor mange penger du vil gi
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tjeneren er beskyttet. Skriv inn passord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firmaet er beskyttet. Skriv inn passord
@@ -1352,7 +1334,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :feil passord ti
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :feil spiller-id i DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :sparket ut av tjeneren
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :pr<70>vde <20> jukse
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :serveren er full
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :har blitt med i spillet
 STR_NETWORK_GIVE_MONEY                                          :gav deg penger ({CURRENCY})
@@ -1679,7 +1660,6 @@ STR_306B_HELIPORT                                               :{BLACK}Landings
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stasjonen er spredd for mye
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ikke-ensartede stasjoner deaktivert
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Skipdepot retning
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...m<> bygges i sj<73>en
@@ -2767,7 +2747,6 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Velg jer
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Dette viser hvilket lokomotiv som overtar for det valgte lokomotivet p<> venstresiden
 STR_REPLACE_HELP                                                :{BLACK}Dette verkt<6B>yet lar deg bytte ut en type lokomotiv med en annen. Dette blir gjort neste gang lokomotivet er innom et depot.
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vognfjerning: {ORANGE}{SKIP}{STRING}
-STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Motoren kan ikke bygges
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA} Skilt

lang/portuguese.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Op
 STR_MESSAGE_HISTORY_MENU                                        :Hist<73>rico de Mensagens
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Mostrar <20>ltima mensagem/not<6F>cia, mostrar op<6F><70>es de mensagens
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Op<4F><70>es de Mensagens
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipos de mensagens:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipos de mensagens:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do primeiro ve<76>culo <20> esta<74><61>o do jogador
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Chegada do primeiro ve<76>culo <20> esta<74><61>o de um oponente
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Acidentes / desastres
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Romeno
 STR_TOWNNAME_CZECH                                              :Checo
 STR_TOWNNAME_SWISS                                              :Sui<75>a
 STR_TOWNNAME_DANISH                                             :Dinamarqu<71>s
-STR_TOWNNAME_TURKISH                                            :Turco
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Libras (<28>)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Lira Italiana (
 STR_CURR_NLG                                                    :Guilda Holandesa (NLG)
 STR_CURR_NOK                                                    :Coroa Norueguesa (NOK)
 STR_CURR_PLN                                                    :Zloty Polaco (PLN)
-STR_CURR_ROL                                                    :Lei Romeno (ROL)
-STR_CURR_RUR                                                    :Rublo Russo (RUR)
+STR_CURR_ROL                                                    :Lei Romeno (Lei)
+STR_CURR_RUR                                                    :Rublo Russo (rur)
 STR_CURR_SEK                                                    :Coroa Sueca (SEK)
 
 STR_CURR_CUSTOM                                                 :Personalizado...
@@ -912,7 +911,6 @@ STR_CRATES                                                      :caixas
 STR_RES_OTHER                                                   :outros
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}N<>o <20> poss<73>vel partilhar a lista de ordens...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}N<>o <20> poss<73>vel copiar a lista de ordens...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Partilhadas - -
@@ -1053,7 +1051,7 @@ STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
 STR_CONFIG_PATCHES_QUERY_CAPT                                   :{WHITE}Alterar valor
 STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE                :{WHITE}Alguns ou todos os intervalo(s) de servi<76>o predefinidos abaixo s<>o incompat<61>veis com o valor escolhido! S<>o v<>lidos 5-90% e 30-800 dias
 
-STR_TEMPERATE_LANDSCAPE                                         :Terreno temperado
+STR_TEMPERATE_LANDSCAPE                                         :terreno temperado
 STR_SUB_ARCTIC_LANDSCAPE                                        :terreno sub<75>rctico
 STR_SUB_TROPICAL_LANDSCAPE                                      :terreno subtropical
 STR_TOYLAND_LANDSCAPE                                           :terreno 'toyland'
@@ -1239,22 +1237,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :Rede Local / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (divulgar)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 jogadores
-STR_NETWORK_1_PLAYERS                                           :1 jogador
-STR_NETWORK_2_PLAYERS                                           :2 jogadores
-STR_NETWORK_3_PLAYERS                                           :3 jogadores
-STR_NETWORK_4_PLAYERS                                           :4 jogadores
-STR_NETWORK_5_PLAYERS                                           :5 jogadores
-STR_NETWORK_6_PLAYERS                                           :6 jogadores
-STR_NETWORK_7_PLAYERS                                           :7 jogadores
-STR_NETWORK_8_PLAYERS                                           :8 jogadores
-STR_NETWORK_9_PLAYERS                                           :9 jogadores
-STR_NETWORK_10_PLAYERS                                          :10 jogadores
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}M<>ximo de Companhias:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limitar o servidor a um certo n<>mero de Companhias
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}M<>ximo de espectadores:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limitar o servidor a um certo n<>mero de espectadores
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma falado:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Outros jogadores ficar<61>o a conhecer o idioma utilizado no servidor.
@@ -1310,11 +1293,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) A
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}A obter a informa<6D><61>o de jogo..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}A obter a informa<6D><61>o da Companhia..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} <20> sua frente
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) <20> sua frente
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes obtidos at<61> agora
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desligar
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Introduza a mensagem de texto a enviar
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduza o valor do dinheiro que pretende dar
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Introduza palavra-chave
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companhia protegida. Introduza palavra-chave
@@ -1352,7 +1336,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :palavra-chave d
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :id do jogador incorrecta em DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :avisado pelo servidor
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :estava a tentar usar batota
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor cheio
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :entrou no jogo
 STR_NETWORK_GIVE_MONEY                                          :deu <20> sua empresa algum dinheiro ({CURRENCY})
@@ -1451,7 +1434,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Caminhos-de-fer
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Terreno inclinado na direc<65><63>o incorrecta para a estrada
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Dever<65> remover a estrada primeiro
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Trabalhos na estrada em curso
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Construir Estradas
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Seleccionar Ponte de Estrada
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}N<>o <20> poss<73>vel construir estrada aqui...
@@ -1516,11 +1498,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} a
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Avalia<69><61>es da companhia de transporte
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subs<62>dios
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Oferta de subs<62>dios para os servi<76>os:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Oferta de subs<62>dios para os servi<76>os:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} de {STRING} para {STRING}
 STR_2028_BY                                                     :{YELLOW} (por {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Nenhum
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Servi<76>os j<> subsidiados:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Servi<76>os j<> subsidiados:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, at<61> {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}A oferta do subs<62>dio expirou:{}{}{STRING} de {STRING} para {STRING} j<> n<>o <20> subsidiado.
@@ -2600,7 +2582,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Adaptar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga do barco
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Adaptar barco para transportar a carga seleccionada
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adapta<74><61>o: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}N<>o <20> poss<73>vel adaptar barco...
 STR_9842_REFITTABLE                                             :(adapt<70>vel)
@@ -2673,7 +2655,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Adaptar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccionar tipo de carga da aeronave
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Adaptar aeronave para transportar a carga seleccionada
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccionar tipo de carga:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova capacidade: {GOLD}{STRING}{}{BLACK}Custo da adapta<74><61>o: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}N<>o <20> poss<73>vel adaptar aeronave...
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir para o hangar de {STATION}
@@ -2768,8 +2750,6 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Seleccio
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Exibe o tipo de motor que substituir<69> o que est<73> seleccionado <20> esquerda, se algum
 STR_REPLACE_HELP                                                :{BLACK}Permite a substiui<75><69>o de um tipo de motor por outro, quando comboios do tipo original entram num dep<65>sito
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Remover vag<61>es: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}For<6F>ar a substitui<75><69>o autom<6F>tica a manter o comprimento do comb<6D>io, removendo vag<61>es (do in<69>cio), nas situa<75><61>es em que a substitui<75><69>o da locomotiva resultar num comb<6D>io maior.
-STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Locomotiva n<>o constru<72>vel
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de sinais - {COMMA} Sinais

lang/romanian.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Set
 STR_MESSAGE_HISTORY_MENU                                        :Lista ultimelor mesaje
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Afiseaza ultimul mesaj (ultima stire) si optiunile pentru mesaje
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Optiuni mesaje
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipuri mesaje:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Tipuri mesaje:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Sosirea primului vehicul la una din statiile tale
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Sosirea primului vehicul la una din statiile competitorilor
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Accidente/dezastre
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Romanesti
 STR_TOWNNAME_CZECH                                              :Cehe
 STR_TOWNNAME_SWISS                                              :Elvetian
 STR_TOWNNAME_DANISH                                             :Danez<65>
-STR_TOWNNAME_TURKISH                                            :Turc<72>
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Lira sterlina (<28>)
@@ -861,7 +860,7 @@ STR_CURR_ITL                                                    :Lir
 STR_CURR_NLG                                                    :Gulden olandez (NLG)
 STR_CURR_NOK                                                    :Coroan<61> norvegian<61> (NOK)
 STR_CURR_PLN                                                    :Zlot (PLN)
-STR_CURR_ROL                                                    :Leu rom<6F>nesc (ROL)
+STR_CURR_ROL                                                    :Leu rom<6F>nesc (Lei)
 STR_CURR_RUR                                                    :Rubl<62> ruseasc<73> (RUR)
 STR_CURR_SEK                                                    :Coroan<61> suedez<65> (SEK)
 
@@ -912,7 +911,6 @@ STR_CRATES                                                      :pachete
 STR_RES_OTHER                                                   :altele
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nu pot construi lista de comenzi comune...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nu pot copia lista de comenzi...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Sf<53>rsitul comenzilor comune - -
@@ -1239,22 +1237,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (fa reclama)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 juc<75>tori
-STR_NETWORK_1_PLAYERS                                           :1 juc<75>tor
-STR_NETWORK_2_PLAYERS                                           :2 juc<75>tori
-STR_NETWORK_3_PLAYERS                                           :3 juc<75>tori
-STR_NETWORK_4_PLAYERS                                           :4 juc<75>tori
-STR_NETWORK_5_PLAYERS                                           :5 juc<75>tori
-STR_NETWORK_6_PLAYERS                                           :6 juc<75>tori
-STR_NETWORK_7_PLAYERS                                           :7 juc<75>tori
-STR_NETWORK_8_PLAYERS                                           :8 juc<75>tori
-STR_NETWORK_9_PLAYERS                                           :9 juc<75>tori
-STR_NETWORK_10_PLAYERS                                          :10 juc<75>tori
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maximum companii:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limiteaz<61> serverle la un anumit num<75>r companii
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maxim spectatori:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limiteaz<61> serverul la un anumit num<75>r de spectatori
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Limba vorbita:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Ceilalti jucatori vor sti in ce limba se discuta per server.
@@ -1310,11 +1293,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) In
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Preluare info joc..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Preluare info companie..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" i} inaintea noastra
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client(i) inaintea noastra
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descarcati pana acum
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Deconectare
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Introdu textul de trimis
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introdu suma de bani pe care vrei sa o cedezi
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server protejat. Introdu parola
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companie protejata. Introdu parola
@@ -1352,7 +1336,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :parola gresita
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :player-id in DoCommand gresit
 STR_NETWORK_ERR_CLIENT_KICKED                                   :dat afara de pe server
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :a incercat sa foloseasca un cheat
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server plin
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :a intrat in joc
 STR_NETWORK_GIVE_MONEY                                          :ti-a dat o suma de bani ({CURRENCY})
@@ -1679,7 +1662,6 @@ STR_306B_HELIPORT                                               :{BLACK}Heliport
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...statie prea mare
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...statii neuniforme dezactivat
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Orientarea santierului naval
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...trebuie construit pe ap<61>
@@ -2515,7 +2497,6 @@ STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Autovehi
 STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Cump<6D>r<EFBFBD> un autovehicul
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Mut<75> un autovehicul aici pentru a-l vinde
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centreaz<61> imaginea pe locatia acestei autobaze
-STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Road vehicle selection list - click on vehicle for information
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Cump<6D>r<EFBFBD> autovehiculul selectat
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Un nou autovehicul disponibil!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
@@ -2600,7 +2581,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Schimb<6D> marfa transportat<61>
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege tipul de <20>nc<6E>rc<72>tur<75> ce va fi transportat de nav<61>
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Schimb<6D> tipul de <20>nc<6E>rc<72>tur<75> al acestei nave
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege tipul <20>nc<6E>rc<72>turii:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege tipul <20>nc<6E>rc<72>turii:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING}{}{BLACK}Costul transform<72>rii: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nu pot schimba tipul navei...
 STR_9842_REFITTABLE                                             :(suport<72> alte m<>rfuri)
@@ -2673,7 +2654,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Schimb<6D> tipul de <20>nc<6E>rc<72>tur<75> transportat
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Alege marfa care doresti s<> fie transportat<61>
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Schimb<6D> tipul de <20>nc<6E>rc<72>tur<75> al acestei aeronave
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege marfa de transportat:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Alege marfa de transportat:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Noua capacitate: {GOLD}{STRING}{}{BLACK}Costul transform<72>rii: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nu pot schimba tipul de <20>nc<6E>rc<72>tur<75>...
 STR_GO_TO_AIRPORT_HANGAR                                        :Mergi la Hangarul {STATION}
@@ -2768,9 +2749,6 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Alege un
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Afiseaza cu ce model vor fi inlocuite vehiculele din stanga
 STR_REPLACE_HELP                                                :{BLACK}Aceasta functie iti permite sa selectezi un model de vehicul si sa-l inlocuiesti cu altul. Schimbarea se va efectua automat la intrarea vehiculului intr-un depou.
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Retragere vagoane: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}F<> optiunea de auto<74>nlocuire s<> p<>streze identic<69> lungimea unui tren prin eliminarea vagoanelor (<28>ncep<65>nd din fat<61>), dac<61> <20>nlocuirea motorului ar face trenul mai lung.
-STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Motorul nu poate fi construit
-
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de semne - {COMMA} Semne

lang/slovak.txt

@@ -6,7 +6,7 @@
 ##id 0x0000
 STR_NULL                                                        :
 STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Za okrajom mapy
-STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Prilis blizko okraja mapy
+STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Prilis blizko okraju mapy
 STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Mala hotovost - potrebna {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY64}
 STR_0005                                                        :{RED}{CURRENCY64}
@@ -155,7 +155,7 @@ STR_00B3_MESSAGE_FROM                                           :{YELLOW}Sprava
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Takto sa to neda...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Oblast sa neda vycistit...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Povodny copyright: {COPYRIGHT} 1995 Chris Sawyer, vsetky prava vyhradene
-STR_00B7_VERSION                                                :{BLACK}OpenTTD verzia {REV}
+STR_00B7_VERSION                                                :{BLACK}OpenTTD version {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 team OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK} Preklad - gpsoft
 
@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Nastavenia spra
 STR_MESSAGE_HISTORY_MENU                                        :Historia Sprav
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Zobrazit poslednu spravu/novinku, nastavenia sprav
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Nastavenia sprav
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Typ sprav:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Typ sprav:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Prijazd prveho vozidla do stanice hraca
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Prijazd prveho vozidla do stanice konkurencie
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Havarie / Katastrofy
@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rumunske
 STR_TOWNNAME_CZECH                                              :Ceske
 STR_TOWNNAME_SWISS                                              :Svajciarske
 STR_TOWNNAME_DANISH                                             :Danske
-STR_TOWNNAME_TURKISH                                            :Tureck<63>
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Libry (<28>)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Talianske Liry
 STR_CURR_NLG                                                    :Danske Guldeny (NLG)
 STR_CURR_NOK                                                    :Norske Koruny (NOK)
 STR_CURR_PLN                                                    :Polske Zloty (PLN)
-STR_CURR_ROL                                                    :Rumunske Lei (ROL)
-STR_CURR_RUR                                                    :Rusle Ruble (RUR)
+STR_CURR_ROL                                                    :Rumunske Lei
+STR_CURR_RUR                                                    :Rusle Ruble (rur)
 STR_CURR_SEK                                                    :Svedske Koruny (SEK)
 
 STR_CURR_CUSTOM                                                 :Vlasne...
@@ -1240,15 +1239,6 @@ STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (oznam
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_0_PLAYERS                                           :0 hracov
 STR_NETWORK_1_PLAYERS                                           :1 hrac
-STR_NETWORK_2_PLAYERS                                           :2 hr<68>ci
-STR_NETWORK_3_PLAYERS                                           :3 hr<68>ci
-STR_NETWORK_4_PLAYERS                                           :4 hr<68>ci
-STR_NETWORK_5_PLAYERS                                           :5 hr<68>cov
-STR_NETWORK_6_PLAYERS                                           :6 hr<68>cov
-STR_NETWORK_7_PLAYERS                                           :7 hr<68>cov
-STR_NETWORK_8_PLAYERS                                           :8 hr<68>cov
-STR_NETWORK_9_PLAYERS                                           :9 hr<68>cov
-STR_NETWORK_10_PLAYERS                                          :10 hr<68>cov
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max. pocet spolocnosti:
 STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Obmedzi maximalny pocet spolocnosti na serveri
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1309,11 +1299,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Prijem informacii o hre..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Prijem informacii o spolocnosti..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" e i} pred nami
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(i) pred nami
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kB stiahnute
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Odpojit sa
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Napis spravu, ktoru chces poslat
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Napis sumu, ktoru chces poskytnut
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server je chraneny. Napis heslo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Spolocnost je chranena. Napis heslo
@@ -1514,11 +1505,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} M
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Hodnotenie dopravnych spolocnosti:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Dotacie
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Ponuknute dotacie:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Ponuknute dotacie:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} z {STRING} do {STRING}
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Nie je
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Uz dotovane:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Uz dotovane:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} z {STATION} do {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Dotacia skoncila:{}{}Preprava {STRING} z {STRING} do {STRING} uz nebude dotovana.
@@ -2415,7 +2406,6 @@ STR_8833_CAN_T_INSERT_NEW_ORDER                                 :{WHITE}Nemozno
 STR_8834_CAN_T_DELETE_THIS_ORDER                                :{WHITE}Nemozno vymazat tebnto prikaz...
 STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Nemozno zmenit tento prikaz...
 STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}nemozno posuvat vozdlo...
-STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}Zadn<64> stroj v<>dy doprev<65>dza svoj druh<75> stroj vpredu
 STR_8838_N_A                                                    :Nie je{SKIP}
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Nemozno predat automobil...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Nemoze najst cestu do depa
@@ -2598,7 +2588,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Prerobit lod
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vybrat typ nakladu pre lod
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Prerobit lod na vybrany typ nakladu
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vyber typ nakladu:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vyber typ nakladu:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nova kapacita: {GOLD}{STRING}{}{BLACK}Cena prerabky: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Nemozno prerobit lod...
 STR_9842_REFITTABLE                                             :(prerobitelna)
@@ -2671,7 +2661,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Prerobit lietadlo
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Vyber novy typ nakladu
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Prerobit lietadlo na novy typ nakladu
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vybrat typ noveho nakladu:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Vybrat typ noveho nakladu:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}nova kapacita: {GOLD}{STRING}{}{BLACK}cena prerobenia: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Nemozno prerobit na novy typ nakladu...
 STR_GO_TO_AIRPORT_HANGAR                                        :Chod do {STATION} Hangaru
@@ -2766,7 +2756,6 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vyber ty
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Tu sa zobrazuje, za ktoru lokomotiva sa lokomotiva v lavom zozname zamenuje
 STR_REPLACE_HELP                                                :{BLACK}Umoznuje vybrat typ lokomotivy, ktory automaticky sa zameni za iny typ, ak vlaky s takouto lokomotivou sa zastavia v depe
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Odstranenie vagonu: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Funkcia automatickeho vylepsovania vlakov moze udrzovat rovnaku dlzku vlakov odstranovanim vagonov (od zaciatku vlakov), pokial by zmena masiny vlak predlzila.
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Zoznam popisov - {COMMA} popisov

lang/spanish.txt

@@ -838,7 +838,6 @@ STR_TOWNNAME_ROMANIAN                                           :Rumano
 STR_TOWNNAME_CZECH                                              :Checo
 STR_TOWNNAME_SWISS                                              :Suizo
 STR_TOWNNAME_DANISH                                             :Danes
-STR_TOWNNAME_TURKISH                                            :Turco
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Libras (<28>)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Lira Italiana (
 STR_CURR_NLG                                                    :Flor<6F>n Holand<6E>s (NLG)
 STR_CURR_NOK                                                    :Corona Noruega(NOK)
 STR_CURR_PLN                                                    :Zloty Polaco (PLN)
-STR_CURR_ROL                                                    :Leu Rumano (ROL)
-STR_CURR_RUR                                                    :Rublo Ruso (RUR)
+STR_CURR_ROL                                                    :Leu Rumano (Lei)
+STR_CURR_RUR                                                    :Rublo Ruso (rur)
 STR_CURR_SEK                                                    :Corona Sueca (SEK)
 
 STR_CURR_CUSTOM                                                 :Personalizado...
@@ -1238,22 +1237,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (anuncio)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 jugadores
-STR_NETWORK_1_PLAYERS                                           :1 jugador
-STR_NETWORK_2_PLAYERS                                           :2 jugadores
-STR_NETWORK_3_PLAYERS                                           :3 jugadores
-STR_NETWORK_4_PLAYERS                                           :4 jugadores
-STR_NETWORK_5_PLAYERS                                           :5 jugadores
-STR_NETWORK_6_PLAYERS                                           :6 jugadores
-STR_NETWORK_7_PLAYERS                                           :7 jugadores
-STR_NETWORK_8_PLAYERS                                           :8 jugadores
-STR_NETWORK_9_PLAYERS                                           :9 jugadores
-STR_NETWORK_10_PLAYERS                                          :10 jugadores
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}M<>ximo compa<70><61>as:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limitar el servidor a un cierto n<>mero de compa<70><61>as
 STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Espectadores m<>ximos
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limitar el servidor a un cierto n<>mero de espectadores
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma hablado:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Otros jugadores sabr<62>n cual es el idioma hablado en este servidor.
@@ -1309,11 +1293,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}Recibiendo informaci<63>n del juego..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Recibiendo informaci<63>n empresa..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} delante de usted
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente(s) delante de usted
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbytes descargados
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectado
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Teclee el mensaje de texto a enviar
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduce la cantidad de dinero que desea dar
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Teclee la contrase<73>a
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introduce contrase<73>a
@@ -1351,7 +1336,6 @@ STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrase
 STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH                          :id de jugador incorrecto en DoCommand
 STR_NETWORK_ERR_CLIENT_KICKED                                   :expulsado por el servidor
 STR_NETWORK_ERR_CLIENT_CHEATER                                  :ha intentado usar un cheat (truco)
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor lleno
 ############ End of leave-in-this-order
 STR_NETWORK_CLIENT_JOINED                                       :se ha unido al juego
 STR_NETWORK_GIVE_MONEY                                          :te ha enviado dinero ({CURRENCY})
@@ -1514,11 +1498,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} a
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ranking de empresas de transporte:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subvenciones
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Se ofrecen subvenciones por llevar:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Se ofrecen subvenciones por llevar:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} desde {STRING} a {STRING}
 STR_2028_BY                                                     :{YELLOW} (antes de {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Ninguna
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}L<>neas ya subvencionadas:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}L<>neas ya subvencionadas:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} desde {STATION} a {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, hasta {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Oferta de subsidio caducada:{}{}{STRING} de {STRING} a {STRING} ya no conlleva una subvenci<63>n.
@@ -2005,7 +1989,7 @@ STR_7037_PRESIDENT                                              :{WHITE}{PLAYERN
 STR_7038_INAUGURATED                                            :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vehiculos:
 STR_TRAINS                                                      :{WHITE}{COMMA} tren{P "" es}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} veh{P "" s}. carret{P er ""}a
+STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} veh{P "" "s"}. carret{P "er" ""}a
 STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeroplano{P "" s}
 STR_SHIPS                                                       :{WHITE}{COMMA} barco{P "" s}
 STR_7042_NONE                                                   :{WHITE}Ninguno
@@ -2598,7 +2582,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Reformar barco
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccione tipo de carga para que el barco la lleve
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Reformar barco para que transporte el tipo de carga resaltado
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccione tipo de carga a llevar:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Seleccione tipo de carga a llevar:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{STRING}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}No se puede reformar barco...
 STR_9842_REFITTABLE                                             :(reformable)
@@ -2671,7 +2655,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Reformar aeronave
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Seleccione tipo de carga para que la aeronave la lleve
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Reformar aeronave para que lleve el tipo de carga resaltado
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Elige tipo de carga para llevar:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Elige tipo de carga para llevar:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nueva capacidad: {GOLD}{STRING}{}{BLACK}Coste de reforma: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}No se puede reformar aeronave...
 STR_GO_TO_AIRPORT_HANGAR                                        :Ir al hangar de {STATION}
@@ -2766,7 +2750,6 @@ STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Seleccio
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Muestra que locomotora ser<65> reemplazada
 STR_REPLACE_HELP                                                :{BLACK}Esta funci<63>n permite seleccionar un tipo de locomotora y reemplazarla por otra. El cambio se realizar<61> cuando el veh<65>culo llegue al dep<65>sito
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Quitar vag<61>n: {ORANGE}{SKIP}{STRING}
-STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Hacer que el cambio autom<6F>tico mantenga la longitud del tren quitando vagones (empezando por adelante), si el cambio de locomotora produce un tren m<>s largo.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}No es posible construir este motor
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}

lang/swedish.txt

@@ -308,7 +308,7 @@ STR_0151_MAP_OF_WORLD                                           :V
 STR_0152_TOWN_DIRECTORY                                         :Lista av st<73>der
 STR_0153_SUBSIDIES                                              :Subventioner
 
-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Graf <20>ver g<>ngbar inkomst
 STR_0155_INCOME_GRAPH                                           :Graf <20>ver inkomster
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Graf <20>ver levererat gods
@@ -317,7 +317,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Graf
 STR_0159_CARGO_PAYMENT_RATES                                    :Fraktf<74>rtj<74>nster
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Tabell <20>ver ledande f<>retag
 STR_PERFORMANCE_DETAIL_MENU                                     :Detaljerade prestandabetyg
-############ range for menu	ends
+############ range for menu ends
 
 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Spara spelet
@@ -431,7 +431,7 @@ STR_01A9_NONE                                                   :Ingen
 STR_01AA_NAME                                                   :{BLACK}Namn
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}
 
-############ range for days	starts
+############ range for days starts
 STR_01AC_1ST                                                    :1
 STR_01AD_2ND                                                    :2
 STR_01AE_3RD                                                    :3
@@ -463,7 +463,7 @@ STR_01C7_28TH                                                   :28
 STR_01C8_29TH                                                   :29
 STR_01C9_30TH                                                   :30
 STR_01CA_31ST                                                   :31
-############ range for days	ends
+############ range for days ends
 
 STR_01CB                                                        :{TINYFONT}{COMMA}
 
@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Meddelandeinst
 STR_MESSAGE_HISTORY_MENU                                        :Meddelandehistorik
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Visa senaste meddelandet/nyheten, visa meddelandeinst<73>llningar
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Meddelandeinst<73>llningar
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Meddelandetyper:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Meddelandetyper:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomst av f<>rsta fordonet vid spelarens stn.
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Ankomst av f<>rsta fordonet vid konkurrenternas stn.
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Olyckor / katastrofer
@@ -702,7 +702,7 @@ STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Spara eg
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Fordonens modellnamnssortiment
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Spara egna modellnamn f<>r fordon till disk
 
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spelinst<73>llningar
 STR_02C4_GAME_OPTIONS                                           :Spelinst<73>llningar
 STR_02C5_DIFFICULTY_SETTINGS                                    :Sv<53>righetsgrad
@@ -729,16 +729,16 @@ STR_02D3_TRANSPARENT_BUILDINGS                                  :{CHECKMARK}{SET
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Genomskinliga byggnader
 STR_TRANSPARENT_SIGNS_C                                         :{CHECKMARK}{SETX 12}Genomskinliga stationsskyltar
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Genomskinliga stationsskyltar
-############ range ends	here
+############ range ends here
 
-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Information om mark
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Visa/d<>lj konsolen
 STR_02D7_SCREENSHOT_CTRL_S                                      :Sk<53>rmdump (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Gigantisk sk<73>rmdump (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Om 'OpenTTD'
-############ range ends	here
+############ range ends here
 
 STR_02DB_OFF                                                    :{BLACK}Av
 STR_02DA_ON                                                     :{BLACK}P<>
@@ -795,7 +795,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}V
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}V<>lj 'leksaksland' som typ av landskap
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Bekosta byggnation av ny industri
 
-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industrif<69>rteckning
 STR_0313_FUND_NEW_INDUSTRY                                      :Bekosta ny industri
 ############ range ends here
@@ -838,8 +838,7 @@ STR_TOWNNAME_ROMANIAN                                           :Rum
 STR_TOWNNAME_CZECH                                              :Tjeckiska
 STR_TOWNNAME_SWISS                                              :Schweiziska
 STR_TOWNNAME_DANISH                                             :Danska
-STR_TOWNNAME_TURKISH                                            :Turkiska
-############ end of	townname region
+############ end of townname region
 
 STR_CURR_GBP                                                    :Pund (<28>)
 STR_CURR_USD                                                    :Dollar ($)
@@ -861,8 +860,8 @@ STR_CURR_ITL                                                    :Italienska lire
 STR_CURR_NLG                                                    :Holl<6C>ndska guilder (NLG)
 STR_CURR_NOK                                                    :Norska kronor (NOK)
 STR_CURR_PLN                                                    :Polska Zloty (PLN)
-STR_CURR_ROL                                                    :Rum<75>nsk Leu (ROL)
-STR_CURR_RUR                                                    :Ryska rubel (RUR)
+STR_CURR_ROL                                                    :Rum<75>nsk Leu
+STR_CURR_RUR                                                    :Ryska rubel (rur)
 STR_CURR_SEK                                                    :Svenska kronor (SEK)
 
 STR_CURR_CUSTOM                                                 :Egen...
@@ -912,7 +911,6 @@ STR_CRATES                                                      :l
 STR_RES_OTHER                                                   :annan
 STR_NOTHING                                                     :ingenting
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan inte dela orderlistan...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan inte kopiera orderlistan...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut p<> delade order - -
@@ -1250,9 +1248,9 @@ STR_NETWORK_7_PLAYERS                                           :7 spelare
 STR_NETWORK_8_PLAYERS                                           :8 spelare
 STR_NETWORK_9_PLAYERS                                           :9 spelare
 STR_NETWORK_10_PLAYERS                                          :10 spelare
+STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max f<>retag:
 STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begr<67>nsa antalet f<>retag p<> servern
-STR_NETWORK_COMBO3                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max observat<61>rer:
 STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begr<67>nsa antalet observat<61>rer p<> servern
 STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -1310,11 +1308,12 @@ STR_NETWORK_CONNECTING_6                                        :{BLACK}(6/6) Re
 STR_NETWORK_CONNECTING_SPECIAL_1                                :{BLACK}H<>mtar spelinfo..
 STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}H<>mtar f<>retagsinfo..
 ############ End of leave-in-this-order
-STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} f<>re oss
+STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient(er) f<>re oss
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} / {NUM} kbyte nerladdat hittills
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Fr<46>nkopplad
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Ange meddelandet du vill skicka
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Ange beloppet du vill ge
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servern <20>r skyddad. Ange l<>senord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}F<>retaget <20>r skyddat. Ange l<>senord
@@ -1515,11 +1514,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} k
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transportf<74>retags v<>rderingar:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}Subventioner
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Aktuella subventioner:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Aktuella subventioner:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} fr<66>n {STRING} till {STRING}
 STR_2028_BY                                                     :{YELLOW} (tills {DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Inga
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Redan subventionerade rutter:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Redan subventionerade rutter:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} fr<66>n {STATION} till {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, tills {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subventionen har g<>tt ut:{}{}{STRING} fr<66>n {STRING} till {STRING} <20>r inte l<>ngre subventionerad
@@ -1679,7 +1678,6 @@ STR_306B_HELIPORT                                               :{BLACK}Helikopt
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...station f<>r utspridd
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...ej enhetliga stationer inaktiverade
 
-
 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Skeppsdep<65> riktning
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...m<>ste byggas p<> vatten
@@ -1706,7 +1704,7 @@ STR_400B_CURRENTLY_SELECTED_NAME                                :{BLACK}Valt nam
 STR_400C_DELETE_THE_CURRENTLY_SELECTED                          :{BLACK}Ta bort markerat sparat spel
 STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Spara spelet med valt namn
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}V<>lj typ av nytt spel
-STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}V<>lj scenario (gr<EFBFBD>n), f<>rbest<73>mt spel (bl<EFBFBD>), eller slumpm<70>ssigt nytt spel
+STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}V<>lj scenario (green), f<>rbest<73>mt spel (blue), eller slumpm<70>ssigt nytt spel
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Skapa slumpm<70>ssigt nytt spel
 
 ##id 0x4800
@@ -1750,11 +1748,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Bubbelgenerator
 STR_4825_TOFFEE_QUARRY                                          :Kn<4B>ckbrott
 STR_4826_SUGAR_MINE                                             :Sockergruva
 
-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Kr<4B>ver: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Kr<4B>ver: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Kr<4B>ver: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends
 
 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion f<>rra m<>naden:
 STR_482B_TRANSPORTED                                            :{YELLOW}{STRING}{BLACK} ({COMMA}% transporterat)
@@ -1827,8 +1825,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Kan inte
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...du <20>ger den redan!
 
 
-############ WARNING, using	range 0x6000 for strings that are stored in	the	savegame
-############ These strings may never get a new id, or savegames	will break!
+############ WARNING, using range 0x6000 for strings that are stored in the savegame
+############ These strings may never get a new id, or savegames will break!
 ##id 0x6000
 STR_SV_EMPTY                                                    :
 STR_SV_UNNAMED                                                  :Inget namn
@@ -1871,7 +1869,7 @@ STR_SV_STNAME_LOWER                                             :Nedre {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Helikopterplats
 STR_SV_STNAME_FOREST                                            :{STRING} Skog
 
-############ end of	savegame specific region!
+############ end of savegame specific region!
 
 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Sv<53>righetsgrad
@@ -2600,7 +2598,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}Anpassa skepp
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}V<>lj typ av gods f<>r skepp att frakta
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Anpassa skepp att frakta markerad godstyp
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lj godstyp att frakta:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lj godstyp att frakta:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Kostnad av anpassning: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Kan inte anpassa skepp...
 STR_9842_REFITTABLE                                             :(anpassningsbart)
@@ -2673,7 +2671,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Anpassa flygplan
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}V<>lj godstyp f<>r flygplan att frakta
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Anpassa flygplan att frakta markerad godstyp
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lj godstyp att frakta:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}V<>lj godstyp att frakta:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Ny kapacitet: {GOLD}{STRING}{}{BLACK}Kostnad av anpassning: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Kan inte anpassa flygplan...
 STR_GO_TO_AIRPORT_HANGAR                                        :G<> till {STATION} Hangar
@@ -2771,7 +2769,6 @@ STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagnbort
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}G<>r s<> att automatiskt utbytning beh<65>ller ett t<>gs l<>ngd genom att ta bort vagnar (med b<>rjan l<>ngst fram) om utbytandet av loket skulle g<>ra t<>get l<>ngre.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Loket g<>r inte att bygga
 
-
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skyltlista - {COMMA} Skyltar
 

lang/turkish.txt

@@ -5,7 +5,7 @@
 
 ##id 0x0000
 STR_NULL                                                        :
-STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Harita kenarinda
+STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Harita siniri
 STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Sinira cok yakin
 STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Para Yetersiz - su kadar gerekli: {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY64}
@@ -39,7 +39,7 @@ STR_001F_PAPER                                                  :Kagit
 STR_0020_GOLD                                                   :Altin
 STR_0021_WATER                                                  :Su
 STR_0022_WHEAT                                                  :Un
-STR_0023_RUBBER                                                 :Kau<EFBFBD>uk
+STR_0023_RUBBER                                                 :Lastik
 STR_0024_SUGAR                                                  :Seker
 STR_0025_TOYS                                                   :Oyuncak
 STR_0026_CANDY                                                  :Tatli
@@ -71,7 +71,7 @@ STR_003F_PAPER                                                  :Kagit
 STR_0040_GOLD                                                   :Altin
 STR_0041_WATER                                                  :Su
 STR_0042_WHEAT                                                  :Un
-STR_0043_RUBBER                                                 :Kau<EFBFBD>uk
+STR_0043_RUBBER                                                 :Lastik
 STR_0044_SUGAR                                                  :Seker
 STR_0045_TOY                                                    :Oyuncak
 STR_0046_CANDY                                                  :Tatli
@@ -103,7 +103,7 @@ STR_QUANTITY_PAPER                                              :{COMMA} ton kag
 STR_QUANTITY_GOLD                                               :{COMMA} <20>anta altin
 STR_QUANTITY_WATER                                              :{VOLUME} su
 STR_QUANTITY_WHEAT                                              :{COMMA} ton un
-STR_QUANTITY_RUBBER                                             :{VOLUME} kau<EFBFBD>uk
+STR_QUANTITY_RUBBER                                             :{VOLUME} lastik
 STR_QUANTITY_SUGAR                                              :{COMMA} ton seker
 STR_QUANTITY_TOYS                                               :{COMMA} oyuncak
 STR_QUANTITY_SWEETS                                             :{COMMA} canta tatli
@@ -135,7 +135,7 @@ STR_ABBREV_PAPER                                                :{TINYFONT}KA
 STR_ABBREV_GOLD                                                 :{TINYFONT}ES
 STR_ABBREV_WATER                                                :{TINYFONT}SU
 STR_ABBREV_WHEAT                                                :{TINYFONT}UN
-STR_ABBREV_RUBBER                                               :{TINYFONT}KA
+STR_ABBREV_RUBBER                                               :{TINYFONT}LA
 STR_ABBREV_SUGAR                                                :{TINYFONT}SK
 STR_ABBREV_TOYS                                                 :{TINYFONT}OY
 STR_ABBREV_SWEETS                                               :{TINYFONT}TA
@@ -230,7 +230,7 @@ STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFON
 STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Elmas Madeni
 STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Bakir Madeni
 STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Meyve Aga<67>lari
-STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Kau<EFBFBD>uk Bah<61>esi
+STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Lastik Aga<67>lari
 STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Su Kaynagi
 STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Su Kulesi
 STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Keresteci
@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Mesaj ayarlari
 STR_MESSAGE_HISTORY_MENU                                        :Mesaj Ge<47>misi
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Son mesaji/haberi g<>ster, mesaj ayarlarini g<>ster
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Mesaj Se<53>enekleri
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Mesaj t<>rleri:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Mesaj t<>rleri:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Oyuncunun duragina ilk aracin gelisi
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Rakibin duragina ilk aracin gelisi
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Kazalar / felaketler
@@ -572,7 +572,7 @@ STR_0233_TOWN_GENERATION                                        :{WHITE}Sehir Ya
 STR_0234_NEW_TOWN                                               :{BLACK}Yeni Sehir
 STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Yeni sehir yap
 STR_0236_CAN_T_BUILD_TOWN_HERE                                  :{WHITE}Buraya sehir yapilamiyor...
-STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...haritanin kenarina <20>ok yakin
+STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...haritanin sinirina <20>ok yakin
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...baska bir sehre <20>ok yakin
 STR_0239_SITE_UNSUITABLE                                        :{WHITE}...yer uygun degil
 STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...<2E>ok fazla sehir var
@@ -601,7 +601,7 @@ STR_024E_PRINTING_WORKS                                         :{BLACK}Basimevi
 STR_024F_GOLD_MINE                                              :{BLACK}Altin Madeni
 STR_0250_LUMBER_MILL                                            :{BLACK}Oduncu
 STR_0251_FRUIT_PLANTATION                                       :{BLACK}Mehve Bah<61>esi
-STR_0252_RUBBER_PLANTATION                                      :{BLACK}Kau<EFBFBD>uk Bah<61>esi
+STR_0252_RUBBER_PLANTATION                                      :{BLACK}Lastik Bah<61>esi
 STR_0253_WATER_SUPPLY                                           :{BLACK}Su Kaynagi
 STR_0254_WATER_TOWER                                            :{BLACK}Su Kulesi
 STR_0255_DIAMOND_MINE                                           :{BLACK}G<>m<EFBFBD>s Madeni
@@ -636,7 +636,7 @@ STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Altin Ma
 STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Banka Kur (Sadece sehirlerde kurulabilir)
 STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Oduncu Yap (yagmurormanlarindan odun yapar)
 STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}Mehve Bah<61>esi A<>
-STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Kau<EFBFBD>uk Bah<61>esi Yap
+STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Lasik Bah<61>esi A<EFBFBD>
 STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Su Kaynagi Yap
 STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Su Kulesi Yap (Sadece sehirlere yapilabilir)
 STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Elmas Madeni Yap
@@ -734,7 +734,7 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Transp
 ############ range for menu	starts
 STR_02D5_LAND_BLOCK_INFO                                        :Arazi bilgisi
 STR_02D6                                                        :
-STR_CONSOLE_SETTING                                             :Konsol A<>/Kapa
+STR_CONSOLE_SETTING                                             :Konsola Ge<47>
 STR_02D7_SCREENSHOT_CTRL_S                                      :Ekran G<>r<EFBFBD>nt<6E>s<EFBFBD> (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Dev Ekran G<>r<EFBFBD>nt<6E>s<EFBFBD> (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :'OpenTTD' Hakkinda
@@ -838,11 +838,10 @@ STR_TOWNNAME_ROMANIAN                                           :Romanca
 STR_TOWNNAME_CZECH                                              :<3A>ek<65>e
 STR_TOWNNAME_SWISS                                              :isvi<76>rece
 STR_TOWNNAME_DANISH                                             :Danimarkaca
-STR_TOWNNAME_TURKISH                                            :T<>rk<72>e
 ############ end of	townname region
 
 STR_CURR_GBP                                                    :Sterlin (<28>)
-STR_CURR_USD                                                    :Dolar ($)
+STR_CURR_USD                                                    :Dolars ($)
 STR_CURR_EUR                                                    :Euro (<28>)
 STR_CURR_YEN                                                    :Yen (<28>)
 STR_CURR_ATS                                                    :Avusturya Silini (ATS)
@@ -912,7 +911,6 @@ STR_CRATES                                                      :kasa
 STR_RES_OTHER                                                   :diger
 STR_NOTHING                                                     :
 
-
 STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Talimat listesi paylasilamiyor...
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Talimat listesi kopyalanamiyor...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Paylasilmis talimat sonu - -
@@ -975,7 +973,7 @@ STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Sinyali
 STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Sene sonunda ekonomik durumu g<>ster: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch uyumlu ekspress trenler: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROADVEH_QUEUE                                :{LTBLUE}Karayolu tasitlari kuyruga girsin (i<>i<EFBFBD>e ge<67>erek): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Fare kenardayken pencere etkin: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Fare sinirdayken pencere etkin: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Belediye r<>sveti izinli: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}<7D>zel istasyonlar: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Yeni evrensel yol bulma (NPF, NTP <20>zerinde): {ORANGE}{STRING}
@@ -1150,7 +1148,7 @@ STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Altin Ma
 STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Elmas Madeni A<>
 STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Demir Madeni A<>
 STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Meyve Bah<61>esi A<>
-STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Kau<EFBFBD>uk Bah<61>esi Yap
+STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Lastik Ormani Kur
 STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Su Kaynagi islet
 STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Pamukhelvasi Ormani Kur
 STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Pil <20>iftligi Kur
@@ -1315,6 +1313,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Baglantiyi kes
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}G<>ndereceginiz mesaji girin
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vereceginiz para miktarini girin
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Sunucu korumali. Parola girin
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Sirket korumali. Parola girin
@@ -1451,7 +1450,6 @@ STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :
 ##id 0x1800
 STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Arazi yol yapimi i<>in uygun egimli degil
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}<7D>nce yol silinmeli
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Yol <20>alismalari
 STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Yol Yapimi
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}K<>pr<70> Se<53>
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Yol yapilamiyor...
@@ -1516,11 +1514,11 @@ STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} b
 STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Tasima sirketi reytingleri:
 STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
 STR_2025_SUBSIDIES                                              :{WHITE}ihaleler
-STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Beklenen ihaleler:
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Beklenen ihaleler:-
 STR_2027_FROM_TO                                                :{ORANGE}{STRING} {STRING} -> {STRING}
 STR_2028_BY                                                     :{YELLOW} ({DATE_SHORT})
 STR_202A_NONE                                                   :{ORANGE}Yok
-STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Verilen ihaleler:
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Verilen ihaleler:-
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} {STATION} -> {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, {DATE_SHORT})
 STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}ihale zamani doldu: {}{}{STRING} {STRING} -> {STRING} artik fazla gelir getirmeyecek.
@@ -1732,7 +1730,7 @@ STR_4812_BANK                                                   :Bankasi
 STR_4813_DIAMOND_MINE                                           :Elmas Madeni
 STR_4814_IRON_ORE_MINE                                          :Demir Madeni
 STR_4815_FRUIT_PLANTATION                                       :Meyve Bah<61>esi
-STR_4816_RUBBER_PLANTATION                                      :Kau<EFBFBD>uk Bah<61>esi
+STR_4816_RUBBER_PLANTATION                                      :Lastik Bah<61>esi
 STR_4817_WATER_SUPPLY                                           :Su Kaynagi
 STR_4818_WATER_TOWER                                            :Su Kulesi
 STR_4819_FACTORY                                                :Fabrikasi
@@ -1763,7 +1761,7 @@ STR_482D_NEW_UNDER_CONSTRUCTION                                 :{BLACK}{BIGFONT
 STR_482E_NEW_BEING_PLANTED_NEAR                                 :{BLACK}{BIGFONT}Yeni bir {STRING}, {TOWN} sehri yakinlarinda kuruldu!
 STR_482F_COST                                                   :{BLACK}Fiyat: {YELLOW}{CURRENCY}
 STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY                          :{WHITE}Buraya bu fabrikadan yapilamaz...
-STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...Orman sadece kar siniri <20>zerinde olabilir
+STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}...Orman kar siniri <20>zerine yapilabilir
 STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{INDUSTRY} t<>kendi, kapaniyor!
 STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}{INDUSTRY} kaynak sorunlari y<>z<EFBFBD>nden kapaniyor!
 STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Yakinda aga<67> olmadigi i<>in {INDUSTRY} kapaniyor!
@@ -2123,7 +2121,7 @@ STR_8027_PAPER_TRUCK                                            :Kagit Vagonu
 STR_8028_COPPER_ORE_HOPPER                                      :Bakir Vagonu
 STR_8029_WATER_TANKER                                           :Su Vagonu
 STR_802A_FRUIT_TRUCK                                            :Meyve Vagonu
-STR_802B_RUBBER_TRUCK                                           :Kau<EFBFBD>uk Vagonu
+STR_802B_RUBBER_TRUCK                                           :Lastik Vagonu
 STR_802C_SUGAR_TRUCK                                            :Seker Vagonu
 STR_802D_COTTON_CANDY_HOPPER                                    :Pamukhelva Vagonu
 STR_802E_TOFFEE_HOPPER                                          :Bonbon Vagonu
@@ -2153,7 +2151,7 @@ STR_8045_PAPER_TRUCK                                            :Kagit Vagonu
 STR_8046_COPPER_ORE_HOPPER                                      :Bakir Vagonu
 STR_8047_WATER_TANKER                                           :Su Tankeri
 STR_8048_FRUIT_TRUCK                                            :Meyve Vagonu
-STR_8049_RUBBER_TRUCK                                           :Kau<EFBFBD>uk Vagonu
+STR_8049_RUBBER_TRUCK                                           :Lastik Vagonu
 STR_804A_SUGAR_TRUCK                                            :Seker Vagonu
 STR_804B_COTTON_CANDY_HOPPER                                    :Pamukhelva Vagonu
 STR_804C_TOFFEE_HOPPER                                          :Bonbon Vagonu
@@ -2185,7 +2183,7 @@ STR_8065_PAPER_TRUCK                                            :Kagit Vagonu
 STR_8066_COPPER_ORE_HOPPER                                      :Bakir Vagonu
 STR_8067_WATER_TANKER                                           :Su Tankeri
 STR_8068_FRUIT_TRUCK                                            :Meyve Vagonu
-STR_8069_RUBBER_TRUCK                                           :Kau<EFBFBD>uk Vagonu
+STR_8069_RUBBER_TRUCK                                           :Lastik Vagonu
 STR_806A_SUGAR_TRUCK                                            :Seker Vagonu
 STR_806B_COTTON_CANDY_HOPPER                                    :Pamukhelva Vagonu
 STR_806C_TOFFEE_HOPPER                                          :Bonbon Vagonu
@@ -2251,9 +2249,9 @@ STR_80A7_MPS_WATER_TANKER                                       :MPS Su Tankeri
 STR_80A8_BALOGH_FRUIT_TRUCK                                     :Balogh Meyve Kamyonu
 STR_80A9_UHL_FRUIT_TRUCK                                        :Uhl Meyve Kamyonu
 STR_80AA_KELLING_FRUIT_TRUCK                                    :Kelling Meyve Kamyonu
-STR_80AB_BALOGH_RUBBER_TRUCK                                    :Balogh Kau<EFBFBD>uk Kamyonu
-STR_80AC_UHL_RUBBER_TRUCK                                       :Uhl Kau<EFBFBD>uk Kamyonu
-STR_80AD_RMT_RUBBER_TRUCK                                       :RMT Kau<EFBFBD>uk Kamyonu
+STR_80AB_BALOGH_RUBBER_TRUCK                                    :Balogh Lastik Kamyonu
+STR_80AC_UHL_RUBBER_TRUCK                                       :Uhl Lastik Kamyonu
+STR_80AD_RMT_RUBBER_TRUCK                                       :RMT Lastik Kamyonu
 STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :MightyMover Seker Kamyonu
 STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Powernaught Seker Kamyonu
 STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Wizzowow Seker Kamyonu
@@ -2600,7 +2598,7 @@ STR_983B_REFIT                                                  :{WHITE}{VEHICLE
 STR_983C_REFIT_SHIP                                             :{BLACK}modifiye
 STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Tasinacak kargoyu se<73>in
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Se<53>ili kargoyu tasimak i<>in modifiye et
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Tasinacak kargo t<>r<EFBFBD>n<EFBFBD> se<73>in:
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Tasinacak kargo t<>r<EFBFBD>n<EFBFBD> se<73>in:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Yeni kapasite: {GOLD}{STRING}{}{BLACK}Modifiye fiyati: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Modifiye edilemez...
 STR_9842_REFITTABLE                                             :(modifiyeli)
@@ -2673,7 +2671,7 @@ STR_A03C_REFIT                                                  :{WHITE}{VEHICLE
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Modifiye
 STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Tasinacak kargo t<>r<EFBFBD>n<EFBFBD> se<73>in
 STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Se<53>ili kargoyu tasimasi i<>in u<>agi modifiye et
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Tasinacak kargoyu se<73>in:
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Tasinacak kargoyu se<73>in:-
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Yeni kapasite: {GOLD}{STRING}{}{BLACK}Modifiye fiyati: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Modifiye edilemez...
 STR_GO_TO_AIRPORT_HANGAR                                        :{STATION} Hangarina git

lang/unfinished/latvian.txt

@@ -521,7 +521,7 @@ STR_0201_MESSAGE_SETTINGS                                       :Zin'ojumu rez'i
 STR_MESSAGE_HISTORY_MENU                                        :Zin'ojumu ve'sture
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Para'di't pe'de'jo zin'u, para'di't zin'as rez'i'mus
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Zin'ojuma rez'i'mi
-STR_0205_MESSAGE_TYPES                                          :{BLACK}Zin'ojumu veidi:
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Zin'ojumu veidi:-
 STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Spe'le'ta'ja stacija' ierodas pirmais transporta li'dzeklis
 STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Sa'ncens'a stacija' ierodas pirmais transporta li'dzeklis
 STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Negadijumi / ava'rijas

lang/unfinished/lithuanian.txt

@@ -1248,6 +1248,7 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{NUM} /
 
 STR_NETWORK_DISCONNECT                                          :{BLACK}Atsijungti
 
+STR_NETWORK_CHAT_QUERY_CAPTION                                  :{WHITE}Ivesk teksta kuri nori siusti
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Ivesk pinigu kieki kuri nori duoti
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveris apsaugotas. Ivesk slaptazodi
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanija apsaugota. Ivesk slaptazodi

macros.h

@@ -115,9 +115,9 @@ static inline int KillFirstBit2x64(int value)
 #define IS_INT_INSIDE(a,min,max) ((uint)((a)-(min)) < (uint)((max)-(min)))
 
 
-#define CHANCE16(a,b) ((uint16)Random() <= (uint16)((65536 * (a)) / (b)))
-#define CHANCE16R(a,b,r) ((uint16)(r=Random()) <= (uint16)((65536 * (a)) / (b)))
-#define CHANCE16I(a,b,v) ((uint16)(v) <= (uint16)((65536 * (a)) / (b)))
+#define CHANCE16(a,b) ((uint16)Random() <= (uint16)((65536 * a) / b))
+#define CHANCE16R(a,b,r) ((uint16)(r=Random()) <= (uint16)((65536 * a) / b))
+#define CHANCE16I(a,b,v) ((uint16)(v) <= (uint16)((65536 * a) / b))
 
 
 #define for_each_bit(_i,_b)										\

main_gui.c

@@ -76,6 +76,12 @@ void HandleOnEditText(WindowEvent *e)
 		DoCommandP(0, id, 0, NULL, CMD_RENAME_WAYPOINT | CMD_MSG(STR_CANT_CHANGE_WAYPOINT_NAME));
 		break;
 #ifdef ENABLE_NETWORK
+	case 2: /* Speak to.. */
+		if (!_network_server)
+			SEND_COMMAND(PACKET_CLIENT_CHAT)(NETWORK_ACTION_CHAT + (id & 0xFF), id & 0xFF, (id >> 8) & 0xFF, e->edittext.str);
+		else
+			NetworkServer_HandleChat(NETWORK_ACTION_CHAT + (id & 0xFF), id & 0xFF, (id >> 8) & 0xFF, e->edittext.str, NETWORK_SERVER_INDEX);
+		break;
 	case 3: { /* Give money, you can only give money in excess of loan */
 		const Player *p = GetPlayer(_current_player);
 		int32 money = min(p->money64 - p->current_loan, atoi(e->edittext.str) / _currency->rate);
@@ -321,6 +327,13 @@ static void MenuClickBuildAir(int index)
 
 #ifdef ENABLE_NETWORK
 
+void ShowNetworkChatQueryWindow(byte desttype, byte dest)
+{
+	_rename_id = desttype + (dest << 8);
+	_rename_what = 2;
+	ShowChatWindow(STR_EMPTY, STR_NETWORK_CHAT_QUERY_CAPTION, 150, 338, 1, 0);
+}
+
 void ShowNetworkGiveMoneyWindow(byte player)
 {
 	_rename_id = player;
@@ -1435,8 +1448,7 @@ void CcBuildTown(bool success, TileIndex tile, uint32 p1, uint32 p2)
 
 static void PlaceProc_Town(TileIndex tile)
 {
-	Window *w = FindWindowById(WC_SCEN_TOWN_GEN, 0);
-	DoCommandP(tile, 1 + FIND_FIRST_BIT(w->click_state >> 7), 0, CcBuildTown, CMD_BUILD_TOWN | CMD_MSG(STR_0236_CAN_T_BUILD_TOWN_HERE));
+	DoCommandP(tile, 0, 0, CcBuildTown, CMD_BUILD_TOWN | CMD_MSG(STR_0236_CAN_T_BUILD_TOWN_HERE));
 }
 
 
@@ -1458,14 +1470,11 @@ static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT:
+		w->click_state = (w->click_state & ~(1<<7 | 1<<8 | 1<<9) ) | (1 << (_new_town_size + 7));
 		DrawWindowWidgets(w);
 		DrawStringCentered(80, 56, STR_02A5_TOWN_SIZE, 0);
 		break;
 
-	case WE_CREATE:
-		w->click_state = 1 << 8; /* medium town size selected */
-		break;
-
 	case WE_CLICK:
 		switch (e->click.widget) {
 		case 4: /* new town */
@@ -1476,7 +1485,7 @@ static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
 
 			HandleButtonClick(w, 5);
 			_generating_world = true;
-			t = CreateRandomTown(20, 1 + FIND_FIRST_BIT(w->click_state >> 7));
+			t = CreateRandomTown(20);
 			_generating_world = false;
 
 			if (t == NULL) {
@@ -1491,13 +1500,18 @@ static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
 			HandleButtonClick(w, 6);
 
 			_generating_world = true;
-			if (!GenerateTowns()) ShowErrorMessage(STR_NO_SPACE_FOR_TOWN, STR_CANNOT_GENERATE_TOWN, 0, 0);
+			_game_mode = GM_NORMAL; // little hack to avoid towns of the same size
+			if (!GenerateTowns()) {
+				ShowErrorMessage(STR_NO_SPACE_FOR_TOWN, STR_CANNOT_GENERATE_TOWN, 0, 0);
+			}
 			_generating_world = false;
+
+			_game_mode = GM_EDITOR;
 			break;
 		}
 
 		case 7: case 8: case 9:
-			w->click_state = 1 << e->click.widget;
+			_new_town_size = e->click.widget - 7;
 			SetWindowDirty(w);
 			break;
 		}
@@ -1510,7 +1524,7 @@ static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
 		_place_proc(e->place.tile);
 		break;
 	case WE_ABORT_PLACE_OBJ:
-		w->click_state &= (1 << 7 | 1 << 8 | 1 << 9);
+		w->click_state = 0;
 		SetWindowDirty(w);
 		break;
 	}
@@ -2459,9 +2473,3 @@ void GameSizeChanged(void)
 	ScreenSizeChanged();
 	MarkWholeScreenDirty();
 }
-
-void InitializeMainGui(void)
-{
-	/* Clean old GUI values */
-	_last_built_railtype = 0;
-}

makefiledir/Makefile.config_writer

@@ -85,6 +85,29 @@ $(MAKE_CONFIG):
 	$(call CONFIG_LINE,MINGW:=$(MINGW))
 	$(call CONFIG_LINE,)
 
+	$(call CONFIG_LINE,\# Universal binary setup)
+	$(call CONFIG_LINE,\# use these settings for building universal binaries. Most systems should work with the default settings)
+	$(call CONFIG_LINE,SDL_PPC_CONFIG:=$(SDL_PPC_CONFIG))
+	$(call CONFIG_LINE,SDL_x86_CONFIG:=$(SDL_x86_CONFIG))
+
+	$(call CONFIG_LINE,\# if you got a fat libpng you should not need to change this. It is recommended to get a fat libpng lib)
+	$(call CONFIG_LINE,LIBPNG_PPC_CONFIG:=$(LIBPNG_PPC_CONFIG))
+	$(call CONFIG_LINE,LIBPNG_x86_CONFIG:=$(LIBPNG_x86_CONFIG))
+
+	$(call CONFIG_LINE,\# autodetected SDL lib path, but it is not detected in a reliable way, so verify it. It needs to be the x86 lib)
+	$(call CONFIG_LINE,x86_SDL_LIB:=$(x86_SDL_LIB))
+
+	$(call CONFIG_LINE,\# default values should be good enough for the rest of the universal binary flags, but check them anyway)
+	$(call CONFIG_LINE,SKIP_LIB_TEST:=$(SKIP_LIB_TEST))
+	$(call CONFIG_LINE,PPC_CC:=$(PPC_CC))
+	$(call CONFIG_LINE,CFLAGS_PPC:=$(CFLAGS_PPC))
+	$(call CONFIG_LINE,LDFLAGS_PPC:=$(LDFLAGS_PPC))
+
+	$(call CONFIG_LINE,x86_CC:=$(x86_CC))
+	$(call CONFIG_LINE,CFLAGS_x86:=$(CFLAGS_x86))
+	$(call CONFIG_LINE,LDFLAGS_x86:=$(LDFLAGS_x86))
+	$(call CONFIG_LINE,)
+
 	$(call CONFIG_LINE,\# For cross-compiling)
 	$(call CONFIG_LINE,CC_TARGET:=$(CC_TARGET))
 	$(call CONFIG_LINE,CC_HOST:=$(CC_HOST))
@@ -94,8 +117,8 @@ $(MAKE_CONFIG):
 	$(call CONFIG_LINE,)
 
 	$(call CONFIG_LINE,\# misc)
-	$(call CONFIG_LINE,SDL_CONFIG:=$(SDL_CONFIG))
-	$(call CONFIG_LINE,LIBPNG_CONFIG:=$(LIBPNG_CONFIG))
+	$(call CONFIG_LINE,SDL-CONFIG:=$(SDL-CONFIG))
+	$(call CONFIG_LINE,LIBPNG-CONFIG:=$(LIBPNG-CONFIG))
 	$(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER))
 	$(call CONFIG_LINE,CONFIG_INCLUDED:=yes)
 	$(call CONFIG_LINE,PATH_SET:=$(PATH_SET))

makefiledir/Makefile.libdetection

@@ -52,26 +52,23 @@ endif
 
 # FreeBSD uses sdl11 instead of sdl
 ifdef FREEBSD
-SDL_CONFIG:=sdl11-config
+SDL-CONFIG:=sdl11-config
 else
-SDL_CONFIG:=sdl-config
+SDL-CONFIG:=sdl-config
 endif
 
-# set libpng-config to the default value
-LIBPNG_CONFIG :=libpng-config
-
 # Networking, enabled by default
 WITH_NETWORK:=1
 
 # Library detections
-WITH_SDL:=$(shell $(SDL_CONFIG) --version 2>/dev/null)
+WITH_SDL:=$(shell $(SDL-CONFIG) --version 2>/dev/null)
 
 # libpng detection
-WITH_PNG:=$(shell $(LIBPNG_CONFIG) --version 2>/dev/null)
+WITH_PNG:=$(shell $(LIBPNG-CONFIG) --version 2>/dev/null)
 
 ifdef WITH_PNG
-	# LibPNG depends on Zlib
-	WITH_ZLIB:=1
+# LibPNG depends on Zlib
+WITH_ZLIB:=1
 else
 # We go looking for zlib with a little hack
 WITH_ZLIB:=$(shell ls /usr/include | grep "zlib.h" 2>/dev/null) \
@@ -81,22 +78,6 @@ WITH_ZLIB:=1
 endif
 endif
 
-ifdef WITH_ZLIB
-	TEMP:=$(shell ls /lib 2>/dev/null | grep "zlib.a")$(shell ls /lib 2>/dev/null | grep "libz.a")
-	ifdef TEMP
-		STATIC_ZLIB_PATH:=/lib/$(TEMP)
-	else
-		TEMP:=$(shell ls /usr/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/lib 2>/dev/null | grep "libz.a")
-		ifdef TEMP
-			STATIC_ZLIB_PATH:=/usr/lib/$(TEMP)
-		else
-			TEMP:=$(shell ls /usr/local/lib 2>/dev/null | grep "zlib.a")$(shell ls /usr/local/lib 2>/dev/null | grep "libz.a")
-			ifdef TEMP
-				STATIC_ZLIB_PATH:=/usr/local/lib/$(TEMP)
-			endif
-		endif
-	endif
-endif
 
 # sets the default paths
 ifdef UNIX

map.c

@@ -40,7 +40,7 @@ void AllocateMap(uint size_x, uint size_y)
 	_map_tile_mask = _map_size - 1;
 
 	free(_m);
-	_m = calloc(_map_size, sizeof(*_m));
+	_m = malloc(_map_size * sizeof(*_m));
 
 	// XXX TODO handle memory shortage more gracefully
 	if (_m == NULL) error("Failed to allocate memory for the map");

misc.c

@@ -101,7 +101,6 @@ void InitializeAirportGui(void);
 void InitializeDock(void);
 void InitializeDockGui(void);
 void InitializeIndustries(void);
-void InitializeMainGui(void);
 void InitializeLandscape(void);
 void InitializeTowns(void);
 void InitializeTrees(void);
@@ -166,7 +165,6 @@ void InitializeGame(int mode, uint size_x, uint size_y)
 	InitializeSigns();
 	InitializeStations();
 	InitializeIndustries();
-	InitializeMainGui();
 
 	InitializeNameMgr();
 	InitializeVehiclesGuiList();

misc_gui.c

@@ -194,7 +194,7 @@ static const char *credits[] = {
 	"  Matthijs Kooijman (blathijs) - Pathfinder-god",
 	"  Victor Fischer (Celestar) - Programming everywhere you need him to",
 	"  Tam<61>s Farag<61> (Darkvater) - Lead coder",
-	"  Attila B<>n (MiHaMiX) - WebTranslator, Nightlies, Wiki and bugtracker host",
+	"  Kerekes Miham (MiHaMiX) - Translator system, and Nightlies host",
 	"  Owen Rudge (orudge) - Forum- and masterserver host, OS/2 port",
 	"  Peter Nelson (peter1138) - Spiritual descendant from newgrf gods",
 	"  Christoph Mallon (Tron) - Programmer, code correctness police",
@@ -808,9 +808,8 @@ void DeleteTextBufferAll(Textbuf *tb)
 }
 
 /**
- * Insert a character to a textbuffer. If maxlength of the Textbuf is zero,
- * we don't care about the screenlength but only about the physical
- * length of the string
+ * Insert a character to a textbuffer. If maxlength is zero, we don't care about
+ * the screenlength but only about the physical length of the string
  * @param tb @Textbuf type to be changed
  * @param key Character to be inserted
  * @return Return true on successfull change of Textbuf, or false otherwise
@@ -818,7 +817,7 @@ void DeleteTextBufferAll(Textbuf *tb)
 bool InsertTextBufferChar(Textbuf *tb, byte key)
 {
 	const byte charwidth = GetCharacterWidth(key);
-	if (tb->length < (tb->maxlength - 1) && (tb->maxwidth == 0 || tb->width + charwidth <= tb->maxwidth)) {
+	if (tb->length < tb->maxlength && (tb->maxwidth == 0 || tb->width + charwidth <= tb->maxwidth)) {
 		memmove(tb->buf + tb->caretpos + 1, tb->buf + tb->caretpos, (tb->length - tb->caretpos) + 1);
 		tb->buf[tb->caretpos] = key;
 		tb->length++;
@@ -876,12 +875,12 @@ bool MoveTextBufferPos(Textbuf *tb, int navmode)
  */
 void UpdateTextBufferSize(Textbuf *tb)
 {
-	const char *buf;
+	const char* buf;
 
 	tb->length = 0;
 	tb->width = 0;
 
-	for (buf = tb->buf; *buf != '\0' && tb->length < (tb->maxlength - 1); buf++) {
+	for (buf = tb->buf; *buf != '\0' && tb->length <= tb->maxlength; buf++) {
 		tb->length++;
 		tb->width += GetCharacterWidth((byte)*buf);
 	}
@@ -1065,7 +1064,7 @@ void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth,
 	w = AllocateWindowDesc(&_query_string_desc);
 
 	GetString(_edit_str_buf, str);
-	_edit_str_buf[realmaxlen-1] = '\0';
+	_edit_str_buf[realmaxlen] = '\0';
 
 	if (maxlen & 0x1000) {
 		WP(w, querystr_d).orig = NULL;
@@ -1079,7 +1078,7 @@ void ShowQueryString(StringID str, StringID caption, uint maxlen, uint maxwidth,
 	WP(w, querystr_d).wnd_class = window_class;
 	WP(w, querystr_d).wnd_num = window_number;
 	WP(w, querystr_d).text.caret = false;
-	WP(w, querystr_d).text.maxlength = realmaxlen;
+	WP(w, querystr_d).text.maxlength = realmaxlen - 1;
 	WP(w, querystr_d).text.maxwidth = maxwidth;
 	WP(w, querystr_d).text.buf = _edit_str_buf;
 	UpdateTextBufferSize(&WP(w, querystr_d).text);
@@ -1464,7 +1463,7 @@ void ShowSaveLoadDialog(int mode)
 	w->resize.height = w->height - 14 * 10; // Minimum of 10 items
 	SETBIT(w->click_state, 7);
 	WP(w,querystr_d).text.caret = false;
-	WP(w,querystr_d).text.maxlength = lengthof(_edit_str_buf);
+	WP(w,querystr_d).text.maxlength = lengthof(_edit_str_buf) - 1;
 	WP(w,querystr_d).text.maxwidth = 240;
 	WP(w,querystr_d).text.buf = _edit_str_buf;
 	UpdateTextBufferSize(&WP(w, querystr_d).text);

namegen.c

@@ -593,34 +593,6 @@ static byte MakeDanishTownName(char *buf, uint32 seed)
 	return 0;
 }
 
-static byte MakeTurkishTownName(char *buf, uint32 seed)
-{
-	uint i;
-
-	// null terminates the string for strcat
-	strcpy(buf, "");
-
-	if ((i = SeedModChance(0, 5, seed)) == 0) {
-		strcat(buf, name_turkish_prefix[SeedModChance( 2, lengthof(name_turkish_prefix), seed)]);
-
-		// middle segment
-		strcat(buf, name_turkish_middle[SeedModChance( 4, lengthof(name_turkish_middle), seed)]);
-
-		// optional suffix
-		if (SeedModChance(0, 7, seed) == 0) {
-			strcat(buf, name_turkish_suffix[SeedModChance( 10, lengthof(name_turkish_suffix), seed)]);
-		}
-	} else {
-		if (i == 1 || i == 2) {
-			strcat(buf, name_turkish_prefix[SeedModChance( 2, lengthof(name_turkish_prefix), seed)]);
-			strcat(buf, name_turkish_suffix[SeedModChance( 4, lengthof(name_turkish_suffix), seed)]);
-		} else {
-			strcat(buf, name_turkish_real[SeedModChance( 4, lengthof(name_turkish_real), seed)]);
-		}
-	}
-	return 0;
-}
-
 TownNameGenerator * const _town_name_generators[] =
 {
 	MakeEnglishOriginalTownName,
@@ -641,7 +613,6 @@ TownNameGenerator * const _town_name_generators[] =
 	MakeCzechTownName,
 	MakeSwissTownName,
 	MakeDanishTownName,
-	MakeTurkishTownName,
 };
 
 // DO WE NEED THIS ANY MORE?

network.c

@@ -15,7 +15,7 @@
 	extern const char _openttd_revision[];
 #elif defined(WITH_REV_HACK)
 	#define WITH_REV
-	const char _openttd_revision[] = "0.4.8-RC1";
+	const char _openttd_revision[] = "0.4.6";
 #else
 	const char _openttd_revision[] = NOREV_STRING;
 #endif
@@ -96,11 +96,11 @@ NetworkClientState *NetworkFindClientStateFromIndex(uint16 client_index)
 //  if the user did not send it yet, Client #<no> is used.
 void NetworkGetClientName(char *client_name, size_t size, const NetworkClientState *cs)
 {
-	const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
-	if (*ci->client_name == '\0')
-		snprintf(client_name, size, "Client #%4d", cs->index);
+	NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
+	if (ci->client_name[0] == '\0')
+		snprintf(client_name, size, "Client #%d", cs->index);
 	else
-		ttd_strlcpy(client_name, ci->client_name, size);
+		snprintf(client_name, size, "%s", ci->client_name);
 }
 
 byte NetworkSpectatorCount(void)
@@ -256,40 +256,10 @@ static void NetworkClientError(byte res, NetworkClientState *cs) {
 	_networking = false;
 }
 
-/** Retrieve a string representation of an internal error number
- * @param buf buffer where the error message will be stored
- * @param err NetworkErrorCode (integer)
- * @return returns a pointer to the error message (buf) */
-char *GetNetworkErrorMsg(char *buf, NetworkErrorCode err)
-{
-	/* List of possible network errors, used by
-	 * PACKET_SERVER_ERROR and PACKET_CLIENT_ERROR */
-	static const StringID network_error_strings[] = {
-		STR_NETWORK_ERR_CLIENT_GENERAL,
-		STR_NETWORK_ERR_CLIENT_DESYNC,
-		STR_NETWORK_ERR_CLIENT_SAVEGAME,
-		STR_NETWORK_ERR_CLIENT_CONNECTION_LOST,
-		STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR,
-		STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED,
-		STR_NETWORK_ERR_CLIENT_NOT_EXPECTED,
-		STR_NETWORK_ERR_CLIENT_WRONG_REVISION,
-		STR_NETWORK_ERR_CLIENT_NAME_IN_USE,
-		STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD,
-		STR_NETWORK_ERR_CLIENT_PLAYER_MISMATCH,
-		STR_NETWORK_ERR_CLIENT_KICKED,
-		STR_NETWORK_ERR_CLIENT_CHEATER,
-		STR_NETWORK_ERR_CLIENT_SERVER_FULL,
-	};
-
-	if (err >= lengthof(network_error_strings)) err = 0;
-
-	return GetString(buf, network_error_strings[err]);
-}
-
 // Find all IP-aliases for this host
 static void NetworkFindIPs(void)
 {
-	int i;
+	int i, last;
 
 #if defined(BEOS_NET_SERVER) /* doesn't have neither getifaddrs or net/if.h */
 	/* Based on Andrew Bachmann's netstat+.c. Big thanks to him! */
@@ -311,7 +281,7 @@ static void NetworkFindIPs(void)
 	i = 0;
 
 	// If something fails, make sure the list is empty
-	_broadcast_list[0] = 0;
+	_network_ip_list[0] = 0;
 
 	if (sock < 0) {
 		DEBUG(net, 0)("Error creating socket!");
@@ -330,22 +300,15 @@ static void NetworkFindIPs(void)
 			uint32 n, fields, read;
 			uint8 i1, i2, i3, i4, j1, j2, j3, j4;
 			struct in_addr inaddr;
-			uint32 ip;
-			uint32 netmask;
-
 			fields = sscanf(*output, "%u: %hhu.%hhu.%hhu.%hhu, netmask %hhu.%hhu.%hhu.%hhu%n",
 												&n, &i1,&i2,&i3,&i4, &j1,&j2,&j3,&j4, &read);
 			read += 1;
 			if (fields != 9) {
 				break;
 			}
-
-			ip      = (uint32)i1 << 24 | (uint32)i2 << 16 | (uint32)i3 << 8 | (uint32)i4;
-			netmask = (uint32)j1 << 24 | (uint32)j2 << 16 | (uint32)j3 << 8 | (uint32)j4;
-
-			if (ip != INADDR_LOOPBACK && ip != INADDR_ANY) {
-				inaddr.s_addr = htonl(ip | ~netmask);
-				_broadcast_list[i] = inaddr.s_addr;
+			inaddr.s_addr = htonl((uint32)i1 << 24 | (uint32)i2 << 16 | (uint32)i3 << 8 | (uint32)i4);
+			if (inaddr.s_addr != 0) {
+				_network_ip_list[i] = inaddr.s_addr;
 				i++;
 			}
 			if (read < 0) {
@@ -362,99 +325,94 @@ static void NetworkFindIPs(void)
 	struct ifaddrs *ifap, *ifa;
 
 	// If something fails, make sure the list is empty
-	_broadcast_list[0] = 0;
+	_network_ip_list[0] = 0;
 
 	if (getifaddrs(&ifap) != 0)
 		return;
 
 	i = 0;
 	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
-		if (!(ifa->ifa_flags & IFF_BROADCAST)) continue;
-		if (ifa->ifa_broadaddr == NULL) continue;
-		if (ifa->ifa_broadaddr->sa_family != AF_INET) continue;
-		_broadcast_list[i] = ((struct sockaddr_in*)ifa->ifa_broadaddr)->sin_addr.s_addr;
+		if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET)
+			continue;
+		_network_ip_list[i] = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr;
 		i++;
 	}
 	freeifaddrs(ifap);
 
 #else /* not HAVE_GETIFADDRS */
+
+	unsigned long len = 0;
 	SOCKET sock;
-#ifdef WIN32
-	DWORD len = 0;
-	INTERFACE_INFO ifo[MAX_INTERFACES];
-	uint j;
-#else
-	char buf[4 * 1024]; // Arbitrary buffer size
-	struct ifconf ifconf;
-	const char* buf_end;
-	const char* p;
+	IFREQ ifo[MAX_INTERFACES];
+
+#ifndef WIN32
+	struct ifconf if_conf;
 #endif
 
 	// If something fails, make sure the list is empty
-	_broadcast_list[0] = 0;
+	_network_ip_list[0] = 0;
 
 	sock = socket(AF_INET, SOCK_DGRAM, 0);
 	if (sock == INVALID_SOCKET) return;
 
 #ifdef WIN32
+	// On windows it is easy
 	memset(&ifo[0], 0, sizeof(ifo));
 	if ((WSAIoctl(sock, SIO_GET_INTERFACE_LIST, NULL, 0, &ifo[0], sizeof(ifo), &len, NULL, NULL)) != 0) {
 		closesocket(sock);
 		return;
 	}
-
-	i = 0;
-	for (j = 0; j < len / sizeof(*ifo); j++) {
-		if (ifo[j].iiFlags & IFF_LOOPBACK) continue;
-		if (!(ifo[j].iiFlags & IFF_BROADCAST)) continue;
-		/* iiBroadcast is unusable, because it always seems to be set to
-		 * 255.255.255.255.
-		 */
-		_broadcast_list[i++] =
-			 ifo[j].iiAddress.AddressIn.sin_addr.s_addr |
-			~ifo[j].iiNetmask.AddressIn.sin_addr.s_addr;
-	}
 #else
-	ifconf.ifc_len = sizeof(buf);
-	ifconf.ifc_buf = buf;
-	if (ioctl(sock, SIOCGIFCONF, &ifconf) == -1) {
+	// On linux a bit harder
+	if_conf.ifc_len = (sizeof (struct ifreq)) * MAX_INTERFACES;
+	if_conf.ifc_buf = (char *)&ifo[0];
+	if ((ioctl(sock, SIOCGIFCONF, &if_conf)) == -1) {
 		closesocket(sock);
 		return;
 	}
+	len = if_conf.ifc_len;
+#endif /* WIN32 */
 
-	i = 0;
-	buf_end = buf + ifconf.ifc_len;
-	for (p = buf; p < buf_end;) {
-		const struct ifreq* req = (const struct ifreq*)p;
-
-		if (req->ifr_addr.sa_family == AF_INET) {
-			struct ifreq r;
-
-			strncpy(r.ifr_name, req->ifr_name, lengthof(r.ifr_name));
-			if (ioctl(sock, SIOCGIFFLAGS, &r) != -1 &&
-					r.ifr_flags & IFF_BROADCAST &&
-					ioctl(sock, SIOCGIFBRDADDR, &r) != -1) {
-				_broadcast_list[i++] =
-					((struct sockaddr_in*)&r.ifr_broadaddr)->sin_addr.s_addr;
-			}
+	// Now walk through all IPs and list them
+	for (i = 0; i < (int)(len / sizeof(IFREQ)); i++) {
+		// Request IP for this interface
+#ifdef WIN32
+		_network_ip_list[i] = *(&ifo[i].iiAddress.AddressIn.sin_addr.s_addr);
+#else
+		if ((ioctl(sock, SIOCGIFADDR, &ifo[i])) != 0) {
+			closesocket(sock);
+			return;
 		}
 
-		p += sizeof(struct ifreq);
-#ifdef AF_LINK
-		p += req->ifr_addr.sa_len - sizeof(struct sockaddr);
+		_network_ip_list[i] = ((struct sockaddr_in *)&ifo[i].ifr_addr)->sin_addr.s_addr;
 #endif
 	}
-#endif
 
 	closesocket(sock);
+
 #endif /* not HAVE_GETIFADDRS */
 
-	_broadcast_list[i] = 0;
+	_network_ip_list[i] = 0;
+	last = i - 1;
 
-	DEBUG(net, 3)("Detected broadcast addresses:");
+	DEBUG(net, 3)("Detected IPs:");
 	// Now display to the debug all the detected ips
-	for (i = 0; _broadcast_list[i] != 0; i++) {
-		DEBUG(net, 3)(" %d) %s", i, inet_ntoa(*(struct in_addr *)&_broadcast_list[i]));//inet_ntoa(inaddr));
+	i = 0;
+	while (_network_ip_list[i] != 0) {
+		// Also check for non-used ips (127.0.0.1)
+		if (_network_ip_list[i] == inet_addr("127.0.0.1")) {
+			// If there is an ip after thisone, put him in here
+			if (last > i)
+				_network_ip_list[i] = _network_ip_list[last];
+			// Clear the last ip
+			_network_ip_list[last] = 0;
+			// And we have 1 ip less
+			last--;
+			continue;
+		}
+
+		DEBUG(net, 3)(" %d) %s", i, inet_ntoa(*(struct in_addr *)&_network_ip_list[i]));//inet_ntoa(inaddr));
+		i++;
 	}
 }
 
@@ -561,12 +519,12 @@ void NetworkCloseClient(NetworkClientState *cs)
 		// We did not receive a leave message from this client...
 		NetworkErrorCode errorno = NETWORK_ERROR_CONNECTION_LOST;
 		char str[100];
-		char client_name[NETWORK_CLIENT_NAME_LENGTH];
+		char client_name[NETWORK_NAME_LENGTH];
 		NetworkClientState *new_cs;
 
 		NetworkGetClientName(client_name, sizeof(client_name), cs);
 
-		GetNetworkErrorMsg(str, errorno);
+		GetString(str, STR_NETWORK_ERR_CLIENT_GENERAL + errorno);
 
 		NetworkTextMessage(NETWORK_ACTION_LEAVE, 1, false, client_name, "%s", str);
 

network.h

@@ -3,7 +3,7 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#define NOREV_STRING "0.4.8-norev000"
+#define NOREV_STRING "0.4.6-norev000"
 
 #ifdef ENABLE_NETWORK
 
@@ -145,7 +145,7 @@ VARDEF NetworkGameInfo _network_game_info;
 VARDEF NetworkPlayerInfo _network_player_info[MAX_PLAYERS];
 VARDEF NetworkClientInfo _network_client_info[MAX_CLIENT_INFO];
 
-VARDEF char _network_player_name[NETWORK_CLIENT_NAME_LENGTH];
+VARDEF char _network_player_name[NETWORK_NAME_LENGTH];
 VARDEF char _network_default_ip[NETWORK_HOSTNAME_LENGTH];
 
 VARDEF uint16 _network_own_client_index;
@@ -157,7 +157,7 @@ VARDEF uint32 _frame_counter_max; // To where we may go with our clients
 VARDEF uint32 _last_sync_frame; // Used in the server to store the last time a sync packet was sent to clients.
 
 // networking settings
-VARDEF uint32 _broadcast_list[MAX_INTERFACES + 1];
+VARDEF uint32 _network_ip_list[MAX_INTERFACES + 1]; // Network IPs
 
 VARDEF uint _network_server_port;
 /* We use bind_ip and bind_ip_host, where bind_ip_host is the readable form of

network_client.c

@@ -683,12 +683,15 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT)
 
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR_QUIT)
 {
+	int errorno;
 	char str[100];
 	uint16 index;
 	NetworkClientInfo *ci;
 
 	index = NetworkRecv_uint16(MY_CLIENT, p);
-	GetNetworkErrorMsg(str, NetworkRecv_uint8(MY_CLIENT, p));
+	errorno = NetworkRecv_uint8(MY_CLIENT, p);
+
+	GetString(str, STR_NETWORK_ERR_CLIENT_GENERAL + errorno);
 
 	ci = NetworkFindClientInfoFromIndex(index);
 	if (ci != NULL) {

network_core.h

@@ -11,10 +11,13 @@
 
 #ifdef ENABLE_NETWORK
 
-#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_2)
+#if defined(__APPLE__)
+#include <AvailabilityMacros.h>
+#if (MAC_OS_X_VERSION_MAX_ALLOWED == MAC_OS_X_VERSION_10_2)
 	// OSX 10.2 don't have socklen_t defined, so we will define it here
 	typedef int socklen_t;
 #endif
+#endif
 
 // Windows stuff
 #if defined(WIN32) || defined(WIN64)
@@ -32,12 +35,14 @@
 #define EWOULDBLOCK WSAEWOULDBLOCK
 // Windows has some different names for some types..
 typedef unsigned long in_addr_t;
+typedef INTERFACE_INFO IFREQ;
 #endif // WIN32
 
 // UNIX stuff
 #if defined(UNIX)
 #	define SOCKET int
 #	define INVALID_SOCKET -1
+typedef struct ifreq IFREQ;
 #	if !defined(__MORPHOS__) && !defined(__AMIGA__)
 #		define ioctlsocket ioctl
 #	if !defined(BEOS_NET_SERVER)
@@ -98,6 +103,7 @@ typedef unsigned long in_addr_t;
 #if defined(__OS2__)
 #	define SOCKET int
 #	define INVALID_SOCKET -1
+typedef struct ifreq IFREQ;
 #	define ioctlsocket ioctl
 #	define closesocket close
 #	define GET_LAST_ERROR() (sock_errno())

network_data.c

@@ -125,7 +125,7 @@ static NetworkRecvStatus CloseConnection(NetworkClientState *cs)
 	NetworkCloseClient(cs);
 
 	// Clients drop back to the main menu
-	if (!_network_server && _networking) {
+	if (!_network_server) {
 		_switch_mode = SM_MENU;
 		_networking = false;
 		_switch_mode_errorstr = STR_NETWORK_ERR_LOSTCONNECTION;
@@ -273,7 +273,6 @@ uint64 NetworkRecv_uint64(NetworkClientState *cs, Packet *packet)
 void NetworkRecv_string(NetworkClientState *cs, Packet *p, char* buffer, size_t size)
 {
 	int pos;
-	char *bufp = buffer;
 
 	/* Don't allow reading from a closed socket */
 	if (cs->quited)
@@ -290,8 +289,6 @@ void NetworkRecv_string(NetworkClientState *cs, Packet *p, char* buffer, size_t
 		++pos;
 	}
 	p->pos = pos;
-
-	str_validate(bufp);
 }
 
 // If PacketSize changes of size, you have to change the 2 packet->size

network_data.h

@@ -230,7 +230,6 @@ NetworkClientInfo *NetworkFindClientInfoFromIndex(uint16 client_index);
 NetworkClientInfo *NetworkFindClientInfoFromIP(const char *ip);
 NetworkClientState *NetworkFindClientStateFromIndex(uint16 client_index);
 unsigned long NetworkResolveHost(const char *hostname);
-char *GetNetworkErrorMsg(char *buf, NetworkErrorCode err);
 
 #endif /* ENABLE_NETWORK */
 

network_gui.c

@@ -14,7 +14,6 @@
 #include "table/strings.h"
 #include "functions.h"
 #include "network_data.h"
-#include "network_client.h"
 #include "network_gamelist.h"
 #include "window.h"
 #include "gui.h"
@@ -52,7 +51,7 @@ typedef struct NetworkGameSorting {
 /* Global to remember sorting after window has been closed */
 static NetworkGameSorting _ng_sorting;
 
-static char _edit_str_buf[MAX_QUERYSTR_LEN];
+static char _edit_str_buf[MAX_QUERYSTR_LEN*2];
 static void ShowNetworkStartServerWindow(void);
 static void ShowNetworkLobbyWindow(NetworkGameList *ngl);
 
@@ -152,6 +151,12 @@ static int CDECL NGameAllowedSorter(const void *a, const void *b)
 	return (_internal_sort_order & 1) ? -r : r;
 }
 
+static NGameNameSortFunction* const _ngame_sorter[] = {
+	&NGameNameSorter,
+	&NGameClientSorter,
+	&NGameAllowedSorter
+};
+
 /** (Re)build the network game list as its amount has changed because
  * an item has been added or deleted for example
  * @param ngl list_d struct that contains all necessary information for sorting */
@@ -183,20 +188,13 @@ static void BuildNetworkGameList(network_ql_d *nqld)
 
 static void SortNetworkGameList(network_ql_d *nqld)
 {
-	static NGameNameSortFunction* const ngame_sorter[] = {
-		&NGameNameSorter,
-		&NGameClientSorter,
-		&NGameAllowedSorter
-	};
-
 	NetworkGameList *item;
 	uint i;
 
 	if (!(nqld->l.flags & VL_RESORT)) return;
-	if (nqld->l.list_length == 0) return;
 
 	_internal_sort_order = nqld->l.flags & VL_DESC;
-	qsort(nqld->sort_list, nqld->l.list_length, sizeof(nqld->sort_list[0]), ngame_sorter[nqld->l.sort_type]);
+	qsort(nqld->sort_list, nqld->l.list_length, sizeof(nqld->sort_list[0]), _ngame_sorter[nqld->l.sort_type]);
 
 	/* After sorting ngl->sort_list contains the sorted items. Put these back
 	 * into the original list. Basically nothing has changed, we are only
@@ -570,7 +568,7 @@ void ShowNetworkGameWindow(void)
 		w->vscroll.cap = 12;
 
 		querystr->text.caret = true;
-		querystr->text.maxlength = MAX_QUERYSTR_LEN;
+		querystr->text.maxlength = MAX_QUERYSTR_LEN - 1;
 		querystr->text.maxwidth = 120;
 		querystr->text.buf = _edit_str_buf;
 		UpdateTextBufferSize(&querystr->text);
@@ -784,7 +782,7 @@ static void ShowNetworkStartServerWindow(void)
 	w->vscroll.count = _fios_num+1;
 
 	WP(w, network_ql_d).q.text.caret = true;
-	WP(w, network_ql_d).q.text.maxlength = MAX_QUERYSTR_LEN;
+	WP(w, network_ql_d).q.text.maxlength = MAX_QUERYSTR_LEN - 1;
 	WP(w, network_ql_d).q.text.maxwidth = 160;
 	WP(w, network_ql_d).q.text.buf = _edit_str_buf;
 	UpdateTextBufferSize(&WP(w, network_ql_d).q.text);
@@ -1465,28 +1463,19 @@ void ShowJoinStatusWindowAfterJoin(void)
 }
 
 
-static byte _chat_type;
-static byte _chat_dest;
-
-
-static void SendChat(const char* buf)
-{
-	if (buf[0] == '\0') return;
-	if (!_network_server) {
-		SEND_COMMAND(PACKET_CLIENT_CHAT)(NETWORK_ACTION_CHAT + _chat_type, _chat_type, _chat_dest, buf);
-	} else {
-		NetworkServer_HandleChat(NETWORK_ACTION_CHAT + _chat_type, _chat_type, _chat_dest, buf, NETWORK_SERVER_INDEX);
-	}
-}
 
+#define MAX_QUERYSTR_LEN 64
 
 /* uses querystr_d WP macro */
 static void ChatWindowWndProc(Window *w, WindowEvent *e)
 {
+	static bool closed = false;
+
 	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;
 
 	case WE_PAINT:
@@ -1496,25 +1485,64 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e)
 
 	case WE_CLICK:
 		switch (e->click.widget) {
-			case 2: /* Send */ SendChat(WP(w, querystr_d).text.buf); /* FALLTHROUGH */
-			case 3: /* Cancel */ DeleteWindow(w); break;
+		case 3: DeleteWindow(w); break; // Cancel
+		case 2: // Send
+press_ok:;
+			if (strcmp(WP(w, querystr_d).text.buf, WP(w, querystr_d).text.buf + MAX_QUERYSTR_LEN) == 0) {
+				DeleteWindow(w);
+			} else {
+				char *buf = WP(w, querystr_d).text.buf;
+				WindowClass wnd_class = WP(w, querystr_d).wnd_class;
+				WindowNumber wnd_num = WP(w, querystr_d).wnd_num;
+				Window *parent;
+
+				// Mask the edit-box as closed, so we don't send out a CANCEL
+				closed = true;
+
+				DeleteWindow(w);
+
+				parent = FindWindowById(wnd_class, wnd_num);
+				if (parent != NULL) {
+					WindowEvent e;
+					e.event = WE_ON_EDIT_TEXT;
+					e.edittext.str = buf;
+					parent->wndproc(parent, &e);
+				}
+			}
+			break;
 		}
 		break;
 
-	case WE_MOUSELOOP:
+	case WE_MOUSELOOP: {
+		if (!FindWindowById(WP(w,querystr_d).wnd_class, WP(w,querystr_d).wnd_num)) {
+			DeleteWindow(w);
+			return;
+		}
 		HandleEditBox(w, &WP(w, querystr_d), 1);
-		break;
+	} break;
 
-	case WE_KEYPRESS:
+	case WE_KEYPRESS: {
 		switch (HandleEditBoxKey(w, &WP(w, querystr_d), 1, e)) {
-			case 1: /* Return */ SendChat(WP(w, querystr_d).text.buf); /* FALLTHROUGH */
-			case 2: /* Escape */ DeleteWindow(w); break;
+		case 1: // Return
+			goto press_ok;
+		case 2: // Escape
+			DeleteWindow(w);
+			break;
 		}
-		break;
+	} break;
 
 	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);
+			if (parent != NULL) {
+				WindowEvent e;
+				e.event = WE_ON_EDIT_TEXT_CANCEL;
+				parent->wndproc(parent, &e);
+			}
+		}
 		break;
 	}
 }
@@ -1535,27 +1563,29 @@ static const WindowDesc _chat_window_desc = {
 	ChatWindowWndProc
 };
 
-
-void ShowNetworkChatQueryWindow(byte desttype, byte dest)
+void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number)
 {
 	Window *w;
 
-	_chat_type = desttype;
-	_chat_dest = dest;
+#define _orig_edit_str_buf (_edit_str_buf+MAX_QUERYSTR_LEN)
 
 	DeleteWindowById(WC_SEND_NETWORK_MSG, 0);
 
-	_edit_str_buf[0] = '\0';
+	GetString(_orig_edit_str_buf, str);
+
+	_orig_edit_str_buf[maxlen] = '\0';
+
+	memcpy(_edit_str_buf, _orig_edit_str_buf, MAX_QUERYSTR_LEN);
 
 	w = AllocateWindowDesc(&_chat_window_desc);
 
 	w->click_state = 1 << 1;
-	WP(w,querystr_d).caption = STR_NULL;
-	WP(w,querystr_d).wnd_class = WC_MAIN_TOOLBAR;
-	WP(w,querystr_d).wnd_num = 0;
+	WP(w,querystr_d).caption = caption;
+	WP(w,querystr_d).wnd_class = window_class;
+	WP(w,querystr_d).wnd_num = window_number;
 	WP(w,querystr_d).text.caret = false;
-	WP(w,querystr_d).text.maxlength = lengthof(_edit_str_buf);
-	WP(w,querystr_d).text.maxwidth = w->widget[1].right - w->widget[1].left - 2; // widget[1] is the "text box"
+	WP(w,querystr_d).text.maxlength = maxlen - 1;
+	WP(w,querystr_d).text.maxwidth = maxwidth;
 	WP(w,querystr_d).text.buf = _edit_str_buf;
 	UpdateTextBufferSize(&WP(w, querystr_d).text);
 }

network_server.c

@@ -29,6 +29,8 @@ static void NetworkSendPatchSettings(NetworkClientState* cs);
 
 void NetworkPopulateCompanyInfo(void);
 
+// Is the network enabled?
+
 // **********
 // Sending functions
 //   DEF_SERVER_SEND_COMMAND has parameter: NetworkClientState *cs
@@ -146,11 +148,10 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_ERROR)(NetworkClientState *cs, Netwo
 	char client_name[NETWORK_CLIENT_NAME_LENGTH];
 
 	Packet *p = NetworkSend_Init(PACKET_SERVER_ERROR);
-
 	NetworkSend_uint8(p, error);
 	NetworkSend_Packet(p, cs);
 
-	GetNetworkErrorMsg(str, error);
+	GetString(str, STR_NETWORK_ERR_CLIENT_GENERAL + error);
 
 	// Only send when the current client was in game
 	if (cs->status > STATUS_AUTH) {
@@ -575,7 +576,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMPANY_INFO)
 
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
 {
-	char name[NETWORK_CLIENT_NAME_LENGTH];
+	char name[NETWORK_NAME_LENGTH];
 	char unique_id[NETWORK_NAME_LENGTH];
 	NetworkClientInfo *ci;
 	byte playas;
@@ -620,7 +621,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
 	}
 
 	// We need a valid name.. make it Player
-	if (*name == '\0') ttd_strlcpy(name, "Player", sizeof(name));
+	if (name[0] == '\0') snprintf(name, sizeof(name), "Player");
 
 	if (!NetworkFindName(name)) { // Change name if duplicate
 		// We could not create a name for this player
@@ -630,8 +631,8 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
 
 	ci = DEREF_CLIENT_INFO(cs);
 
-	ttd_strlcpy(ci->client_name, name, sizeof(ci->client_name));
-	ttd_strlcpy(ci->unique_id, unique_id, sizeof(ci->unique_id));
+	snprintf(ci->client_name, sizeof(ci->client_name), "%s", name);
+	snprintf(ci->unique_id, sizeof(ci->unique_id), "%s", unique_id);
 	ci->client_playas = playas;
 	ci->client_lang = client_lang;
 
@@ -889,8 +890,8 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_ERROR)
 	// This packets means a client noticed an error and is reporting this
 	//  to us. Display the error and report it to the other clients
 	NetworkClientState *new_cs;
+	byte errorno = NetworkRecv_uint8(cs, p);
 	char str[100];
-	NetworkErrorCode errorno = NetworkRecv_uint8(cs, p);
 	char client_name[NETWORK_CLIENT_NAME_LENGTH];
 
 	// The client was never joined.. thank the client for the packet, but ignore it
@@ -901,7 +902,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_ERROR)
 
 	NetworkGetClientName(client_name, sizeof(client_name), cs);
 
-	GetNetworkErrorMsg(str, errorno);
+	GetString(str, STR_NETWORK_ERR_CLIENT_GENERAL + errorno);
 
 	DEBUG(net, 2)("[NET] %s reported an error and is closing his connection (%s)", client_name, str);
 
@@ -1434,7 +1435,7 @@ bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH])
 	byte number = 0;
 	char original_name[NETWORK_CLIENT_NAME_LENGTH];
 
-	// We use NETWORK_CLIENT_NAME_LENGTH in here, because new_name is really a pointer
+	// We use NETWORK_NAME_LENGTH in here, because new_name is really a pointer
 	ttd_strlcpy(original_name, new_name, NETWORK_CLIENT_NAME_LENGTH);
 
 	while (!found_name) {

network_server.h

@@ -12,7 +12,7 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_SHUTDOWN);
 DEF_SERVER_SEND_COMMAND(PACKET_SERVER_NEWGAME);
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_RCON)(NetworkClientState *cs, uint16 color, const char *command);
 
-bool NetworkFindName(char new_name[NETWORK_CLIENT_NAME_LENGTH]);
+bool NetworkFindName(char new_name[NETWORK_NAME_LENGTH]);
 void NetworkServer_HandleChat(NetworkAction action, DestType desttype, int dest, const char *msg, uint16 from_index);
 
 bool NetworkServer_ReadPackets(NetworkClientState *cs);

network_udp.c

@@ -134,6 +134,9 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_SERVER_RESPONSE)
 			item->info.map_set       = NetworkRecv_uint8(&_udp_cs, p);
 			item->info.dedicated     = NetworkRecv_uint8(&_udp_cs, p);
 
+			str_validate(item->info.server_name);
+			str_validate(item->info.server_revision);
+			str_validate(item->info.map_name);
 			if (item->info.server_lang >= NETWORK_NUM_LANGUAGES) item->info.server_lang = 0;
 			if (item->info.map_set >= NUM_LANDSCAPE ) item->info.map_set = 0;
 
@@ -328,12 +331,8 @@ static void NetworkHandleUDPPacket(Packet* p, struct sockaddr_in* client_addr)
 
 	if (type < PACKET_UDP_END && _network_udp_packet[type] != NULL && !_udp_cs.quited) {
 		_network_udp_packet[type](p, client_addr);
-	} else {
-		if (!_udp_cs.quited) {
-			DEBUG(net, 0)("[NET][UDP] Received invalid packet type %d", type);
-		} else {
-			DEBUG(net, 0)("[NET][UDP] Received illegal packet");
-		}
+	}	else {
+		DEBUG(net, 0)("[NET][UDP] Received invalid packet type %d", type);
 	}
 }
 
@@ -472,25 +471,31 @@ static void NetworkUDPBroadCast(SOCKET udp)
 {
 	int i;
 	struct sockaddr_in out_addr;
+	byte *bcptr;
+	uint32 bcaddr;
 	Packet *p;
 
 	// Init the packet
 	p = NetworkSend_Init(PACKET_UDP_CLIENT_FIND_SERVER);
 
+	// Go through all the ips on this pc
 	i = 0;
-	while (_broadcast_list[i] != 0) {
+	while (_network_ip_list[i] != 0) {
+		bcaddr = _network_ip_list[i];
+		bcptr = (byte *)&bcaddr;
+		// Make the address a broadcast address
+		bcptr[3] = 255;
+
+		DEBUG(net, 6)("[NET][UDP] Broadcasting to %s", inet_ntoa(*(struct in_addr *)&bcaddr));
+
 		out_addr.sin_family = AF_INET;
 		out_addr.sin_port = htons(_network_server_port);
-		out_addr.sin_addr.s_addr = _broadcast_list[i];
-
-		DEBUG(net, 6)("[NET][UDP] Broadcasting to %s", inet_ntoa(out_addr.sin_addr));
+		out_addr.sin_addr.s_addr = bcaddr;
 
 		NetworkSendUDP_Packet(udp, p, &out_addr);
 
 		i++;
 	}
-
-	free(p);
 }
 
 

npf.c

@@ -11,7 +11,6 @@
 #include "station.h"
 #include "tile.h"
 #include "depot.h"
-#include "network.h"
 
 static AyStar _npf_aystar;
 
@@ -202,34 +201,31 @@ static uint NPFSlopeCost(AyStarNode* current)
 	 * there is only one level of steepness... */
 }
 
-/**
- * Mark tiles by mowing the grass when npf debug level >= 1.
- * Will not work for multiplayer games, since it can (will) cause desyncs.
- */
+/* Mark tiles by mowing the grass when npf debug level >= 1 */
 static void NPFMarkTile(TileIndex tile)
 {
 #ifdef NO_DEBUG_MESSAGES
 	return;
 #else
-	if (_debug_npf_level < 1 || _networking) return;
-	switch(GetTileType(tile)) {
-		case MP_RAILWAY:
-			/* DEBUG: mark visited tiles by mowing the grass under them
-			 * ;-) */
-			if (!IsTileDepotType(tile, TRANSPORT_RAIL)) {
-				SB(_m[tile].m2, 0, 4, 0);
-				MarkTileDirtyByTile(tile);
-			}
-			break;
-		case MP_STREET:
-			if (!IsTileDepotType(tile, TRANSPORT_ROAD)) {
-				SB(_m[tile].m4, 4, 3, 0);
-				MarkTileDirtyByTile(tile);
-			}
-			break;
-		default:
-			break;
-	}
+	if (_debug_npf_level >= 1)
+		switch(GetTileType(tile)) {
+			case MP_RAILWAY:
+				/* DEBUG: mark visited tiles by mowing the grass under them
+				 * ;-) */
+				if (!IsTileDepotType(tile, TRANSPORT_RAIL)) {
+					SB(_m[tile].m2, 0, 4, 0);
+					MarkTileDirtyByTile(tile);
+				}
+				break;
+			case MP_STREET:
+				if (!IsTileDepotType(tile, TRANSPORT_ROAD)) {
+					SB(_m[tile].m4, 4, 3, 0);
+					MarkTileDirtyByTile(tile);
+				}
+				break;
+			default:
+				break;
+		}
 #endif
 }
 
@@ -552,8 +548,6 @@ static void NPFFollowTrack(AyStar* aystar, OpenListNode* current)
 			} else {
 				dst_tile = INVALID_TILE; /* Road vehicle heading inwards: dead end */
 			}
-		} else {
-			dst_tile = AddTileIndexDiffCWrap(src_tile, TileIndexDiffCByDir(exitdir));
 		}
 	} else {
 		/* This a normal tile, a bridge, a tunnel exit, etc. */
@@ -576,7 +570,7 @@ static void NPFFollowTrack(AyStar* aystar, OpenListNode* current)
 	/* check correct rail type (mono, maglev, etc) */
 	if (type == TRANSPORT_RAIL) {
 		RailType dst_type = GetTileRailType(dst_tile, src_trackdir);
-		if (!HASBIT(aystar->user_data[NPF_RAILTYPES], dst_type))
+		if (!IsCompatibleRail(aystar->user_data[NPF_RAILTYPE], dst_type))
 			return;
 	}
 
@@ -649,7 +643,7 @@ static void NPFFollowTrack(AyStar* aystar, OpenListNode* current)
  * multiple targets that are spread around, we should perform a breadth first
  * search by specifiying CalcZero as our heuristic.
  */
-static NPFFoundTargetData NPFRouteInternal(AyStarNode* start1, AyStarNode* start2, NPFFindStationOrTileData* target, AyStar_EndNodeCheck target_proc, AyStar_CalculateH heuristic_proc, TransportType type, Owner owner, byte railtypes, uint reverse_penalty)
+static NPFFoundTargetData NPFRouteInternal(AyStarNode* start1, AyStarNode* start2, NPFFindStationOrTileData* target, AyStar_EndNodeCheck target_proc, AyStar_CalculateH heuristic_proc, TransportType type, Owner owner, RailType railtype, uint reverse_penalty)
 {
 	int r;
 	NPFFoundTargetData result;
@@ -691,7 +685,7 @@ static NPFFoundTargetData NPFRouteInternal(AyStarNode* start1, AyStarNode* start
 	/* Initialize user_data */
 	_npf_aystar.user_data[NPF_TYPE] = type;
 	_npf_aystar.user_data[NPF_OWNER] = owner;
-	_npf_aystar.user_data[NPF_RAILTYPES] = railtypes;
+	_npf_aystar.user_data[NPF_RAILTYPE] = railtype;
 
 	/* GO! */
 	r = AyStarMain_Main(&_npf_aystar);
@@ -709,7 +703,7 @@ static NPFFoundTargetData NPFRouteInternal(AyStarNode* start1, AyStarNode* start
 	return result;
 }
 
-NPFFoundTargetData NPFRouteToStationOrTileTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, NPFFindStationOrTileData* target, TransportType type, Owner owner, byte railtypes)
+NPFFoundTargetData NPFRouteToStationOrTileTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, NPFFindStationOrTileData* target, TransportType type, Owner owner, RailType railtype)
 {
 	AyStarNode start1;
 	AyStarNode start2;
@@ -723,15 +717,15 @@ NPFFoundTargetData NPFRouteToStationOrTileTwoWay(TileIndex tile1, Trackdir track
 	start2.direction = trackdir2;
 	start2.user_data[NPF_TRACKDIR_CHOICE] = INVALID_TRACKDIR;
 
-	return NPFRouteInternal(&start1, (IsValidTile(tile2) ? &start2 : NULL), target, NPFFindStationOrTile, NPFCalcStationOrTileHeuristic, type, owner, railtypes, 0);
+	return NPFRouteInternal(&start1, (IsValidTile(tile2) ? &start2 : NULL), target, NPFFindStationOrTile, NPFCalcStationOrTileHeuristic, type, owner, railtype, 0);
 }
 
-NPFFoundTargetData NPFRouteToStationOrTile(TileIndex tile, Trackdir trackdir, NPFFindStationOrTileData* target, TransportType type, Owner owner, byte railtypes)
+NPFFoundTargetData NPFRouteToStationOrTile(TileIndex tile, Trackdir trackdir, NPFFindStationOrTileData* target, TransportType type, Owner owner, RailType railtype)
 {
-	return NPFRouteToStationOrTileTwoWay(tile, trackdir, INVALID_TILE, 0, target, type, owner, railtypes);
+	return NPFRouteToStationOrTileTwoWay(tile, trackdir, INVALID_TILE, 0, target, type, owner, railtype);
 }
 
-NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, TransportType type, Owner owner, byte railtypes, uint reverse_penalty)
+NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, TransportType type, Owner owner, RailType railtype, uint reverse_penalty)
 {
 	AyStarNode start1;
 	AyStarNode start2;
@@ -747,15 +741,15 @@ NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Trackdir t
 
 	/* perform a breadth first search. Target is NULL,
 	 * since we are just looking for any depot...*/
-	return NPFRouteInternal(&start1, (IsValidTile(tile2) ? &start2 : NULL), NULL, NPFFindDepot, NPFCalcZero, type, owner, railtypes, reverse_penalty);
+	return NPFRouteInternal(&start1, (IsValidTile(tile2) ? &start2 : NULL), NULL, NPFFindDepot, NPFCalcZero, type, owner, railtype, reverse_penalty);
 }
 
-NPFFoundTargetData NPFRouteToDepotBreadthFirst(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, byte railtypes)
+NPFFoundTargetData NPFRouteToDepotBreadthFirst(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, RailType railtype)
 {
-	return NPFRouteToDepotBreadthFirstTwoWay(tile, trackdir, INVALID_TILE, 0, type, owner, railtypes, 0);
+	return NPFRouteToDepotBreadthFirstTwoWay(tile, trackdir, INVALID_TILE, 0, type, owner, railtype, 0);
 }
 
-NPFFoundTargetData NPFRouteToDepotTrialError(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, byte railtypes)
+NPFFoundTargetData NPFRouteToDepotTrialError(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, RailType railtype)
 {
 	/* Okay, what we're gonna do. First, we look at all depots, calculate
 	 * the manhatten distance to get to each depot. We then sort them by

npf.h

@@ -37,7 +37,7 @@ typedef struct NPFFindStationOrTileData { /* Meant to be stored in AyStar.target
 enum { /* Indices into AyStar.userdata[] */
 	NPF_TYPE = 0, /* Contains a TransportTypes value */
 	NPF_OWNER, /* Contains an Owner value */
-	NPF_RAILTYPES, /* Contains a bitmask the compatible RailTypes of the engine when NPF_TYPE == TRANSPORT_RAIL. Unused otherwise. */
+	NPF_RAILTYPE, /* Contains the RailType value of the engine when NPF_TYPE == TRANSPORT_RAIL. Unused otherwise. */
 };
 
 enum { /* Indices into AyStarNode.userdata[] */
@@ -63,27 +63,27 @@ typedef struct NPFFoundTargetData { /* Meant to be stored in AyStar.userpath */
 /* Will search from the given tile and direction, for a route to the given
  * station for the given transport type. See the declaration of
  * NPFFoundTargetData above for the meaning of the result. */
-NPFFoundTargetData NPFRouteToStationOrTile(TileIndex tile, Trackdir trackdir, NPFFindStationOrTileData* target, TransportType type, Owner owner, byte railtypes);
+NPFFoundTargetData NPFRouteToStationOrTile(TileIndex tile, Trackdir trackdir, NPFFindStationOrTileData* target, TransportType type, Owner owner, RailType railtype);
 /* Will search as above, but with two start nodes, the second being the
  * reverse. Look at the NPF_FLAG_REVERSE flag in the result node to see which
  * direction was taken (NPFGetBit(result.node, NPF_FLAG_REVERSE)) */
-NPFFoundTargetData NPFRouteToStationOrTileTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, NPFFindStationOrTileData* target, TransportType type, Owner owner, byte railtypes);
+NPFFoundTargetData NPFRouteToStationOrTileTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, NPFFindStationOrTileData* target, TransportType type, Owner owner, RailType railtype);
 
 /* Will search a route to the closest depot. */
 
 /* Search using breadth first. Good for little track choice and inaccurate
  * heuristic, such as railway/road.*/
-NPFFoundTargetData NPFRouteToDepotBreadthFirst(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, byte railtypes);
+NPFFoundTargetData NPFRouteToDepotBreadthFirst(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, RailType railtype);
 /* Same as above but with two start nodes, the second being the reverse. Call
  * NPFGetBit(result.node, NPF_FLAG_REVERSE) to see from which node the path
  * orginated. All pathfs from the second node will have the given
  * reverse_penalty applied (NPF_TILE_LENGTH is the equivalent of one full
  * tile).
  */
-NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, TransportType type, Owner owner, byte railtypes, uint reverse_penalty);
+NPFFoundTargetData NPFRouteToDepotBreadthFirstTwoWay(TileIndex tile1, Trackdir trackdir1, TileIndex tile2, Trackdir trackdir2, TransportType type, Owner owner, RailType railtype, uint reverse_penalty);
 /* Search by trying each depot in order of Manhattan Distance. Good for lots
  * of choices and accurate heuristics, such as water. */
-NPFFoundTargetData NPFRouteToDepotTrialError(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, byte railtypes);
+NPFFoundTargetData NPFRouteToDepotTrialError(TileIndex tile, Trackdir trackdir, TransportType type, Owner owner, RailType railtype);
 
 void NPFFillWithOrderData(NPFFindStationOrTileData* fstd, Vehicle* v);
 

openttd.c

@@ -141,7 +141,7 @@ static void showhelp(void)
 		"  -G seed             = Set random seed\n"
 		"  -n [ip#player:port] = Start networkgame\n"
 		"  -D                  = Start dedicated server\n"
-		#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32)
+		#if !defined(__MORPHOS__) && !defined(__AMIGA__)
 		"  -f                  = Fork into the background (dedicated only)\n"
 		#endif
 		"  -i                  = Force to use the DOS palette\n"
@@ -632,7 +632,6 @@ static void MakeNewEditorWorld(void)
 
 void StartupPlayers(void);
 void StartupDisasters(void);
-extern void StartupEconomy(void);
 
 /**
  * Start Scenario starts a new game based on a scenario.
@@ -670,7 +669,6 @@ static void StartScenario(void)
 	_opt.diff_level = _opt_newgame.diff_level;
 
 	// Inititalize data
-	StartupEconomy();
 	StartupPlayers();
 	StartupEngines();
 	StartupDisasters();

openttd.dsp

@@ -922,10 +922,6 @@ SOURCE=.\tree_cmd.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\tunnel_map.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\tunnelbridge_cmd.c
 # End Source File
 # Begin Source File

openttd.h

@@ -492,8 +492,7 @@ enum SpecialStrings {
 	SPECSTR_TOWNNAME_CZECH,
 	SPECSTR_TOWNNAME_SWISS,
 	SPECSTR_TOWNNAME_DANISH,
-	SPECSTR_TOWNNAME_TURKISH,
-	SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_TURKISH,
+	SPECSTR_TOWNNAME_LAST = SPECSTR_TOWNNAME_DANISH,
 
 	// special strings for player names on the form "TownName transport".
 	SPECSTR_PLAYERNAME_START = 0x70EA,

openttd.vcproj

@@ -724,9 +724,6 @@
 			<File
 				RelativePath=".\tree_cmd.c">
 			</File>
-			<File
-				RelativePath=".\tunnel_map.c">
-			</File>
 			<File
 				RelativePath=".\tunnelbridge_cmd.c">
 			</File>

order_cmd.c

@@ -323,7 +323,8 @@ int32 CmdInsertOrder(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	/* For ships, make sure that the station is not too far away from the
 	 * previous destination, for human players with new pathfinding disabled */
 	if (v->type == VEH_Ship && IS_HUMAN_PLAYER(v->owner) &&
-		sel_ord != 0 && GetVehicleOrder(v, sel_ord - 1)->type == OT_GOTO_STATION) {
+		sel_ord != 0 && GetVehicleOrder(v, sel_ord - 1)->type == OT_GOTO_STATION
+		&& !_patches.new_pathfinding_all) {
 
 		int dist = DistanceManhattan(
 			GetStation(GetVehicleOrder(v, sel_ord - 1)->station)->xy,

order_gui.c

@@ -191,9 +191,6 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
 	Order order;
 	int st_index;
 
-	order.next  = NULL;
-	order.index = 0;
-
 	// check depot first
 	if (_patches.gotodepot) {
 		switch (GetTileType(tile)) {

os/debian/changelog

@@ -1,4 +1,4 @@
-openttd (0.4.7-1) unstable; urgency=low
+openttd (0.4.6-1) unstable; urgency=low
 
   * Remove old terminal messages and make sure that debconf is always called.
 

os/linux/openttd.spec

@@ -5,7 +5,7 @@
 #------------------------------------------------------------------------------
 
 %define name openttd
-%define version 0.4.8
+%define version 0.4.6
 %define release 1mdk
 
 #------------------------------------------------------------------------------

os/macosx/G5_detector.c

@@ -1,29 +0,0 @@
-/* $Id$ */
-
-#include <mach/mach.h>
-#include <mach/mach_host.h>
-#include <mach/host_info.h>
-#include <mach/machine.h>
-#include <stdio.h>
-
-
-#ifndef CPU_SUBTYPE_POWERPC_970
-#define CPU_SUBTYPE_POWERPC_970 ((cpu_subtype_t) 100)
-#endif
-
-// this function is a lightly modified version of some code from Apple's developer homepage to detect G5 CPUs at runtime
-main()
-{
-	host_basic_info_data_t hostInfo;
-	mach_msg_type_number_t infoCount;
-	boolean_t is_G5;
-
-	infoCount = HOST_BASIC_INFO_COUNT;
-	host_info(mach_host_self(), HOST_BASIC_INFO,
-			  (host_info_t)&hostInfo, &infoCount);
-
-	 is_G5 = ((hostInfo.cpu_type == CPU_TYPE_POWERPC) &&
-			(hostInfo.cpu_subtype == CPU_SUBTYPE_POWERPC_970));
-	 if (is_G5)
-		 printf("1");
-}

os/macosx/Makefile

@@ -2,89 +2,36 @@
 # This makefile is not a standalone makefile, but is called from the general one
 # it contains targets specific to MacOS X
 
-ifdef NATIVE_OSX
-
-DEPS_MAGIC := $(shell mkdir -p $(sort $(dir $(OBJS:%.o=.OSX/%))))
-
-ifdef OTTD_PPC
-OTTD_PPC    :=.OSX/openttd.ppc
-OBJS_ppc    := $(OBJS:%.o=.OSX/%.o.ppc)
+ifdef FAT_BINARY
+FAT_BINARY:=build_universal_binary
 endif
 
-ifdef OTTD_i386
-OTTD_i386   :=.OSX/openttd.i386
-OBJS_i386   := $(OBJS:%.o=.OSX/%.o.i386)
+ifdef UNIVERSAL_x86_PART
+# the bundle is build by the PPC compile when making universal binaries
+BUILD_OSX_BUNDLE:=
+else
+BUILD_OSX_BUNDLE:=build_OSX_bundle
 endif
 
-ifdef OTTD_PPC970
-OTTD_PPC970 :=.OSX/openttd.ppc970
-OBJS_ppc970 := $(OBJS:%.o=.OSX/%.o.ppc970)
-endif
+# building an universal binary
+# since we can only compile for PPC or x86 at any one time, we compile one and then
+# we make clean and compile the other one. In the end we use lipo to join them together
+# when this is done, we can continue with the targets from the first run, which is build_OSX_bundle
 
-# targets to link OpenTTD
-$(TTD): $(OTTD_PPC) $(OTTD_i386) $(OTTD_PPC970)
-	@echo '===> Linking $@ into a single file'
-	$(Q)lipo -create -output $@ $(OTTD_PPC) $(OTTD_i386) $(OTTD_PPC970)
-
-$(OTTD_PPC): $(MAKE_CONFIG) $(OBJS_ppc)
-	@echo '[PowerPC] Linking $(TTD)'
-	$(Q)$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS_ppc) $(LIBS) $(LDFLAGS_PPC) -arch ppc -o $@
-
-$(OTTD_i386): $(MAKE_CONFIG) $(OBJS_i386)
-	@echo '[i386] Linking $(TTD)'
-	$(Q)$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS_i386) $(LIBS) $(LDFLAGS_i386) -arch i386 -o $@
-
-$(OTTD_PPC970): $(MAKE_CONFIG) $(OBJS_ppc970)
-	@echo '[PowerPC G5] Linking $(TTD)'
-	$(Q)$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS_ppc970) $(LIBS) $(LDFLAGS_PPC) $(G5_FLAGS) -arch ppc970 -o $@
-
-# targets to compile each c, m and cpp file
-.OSX/%.o.ppc: %.c      .deps/%.d
-	@echo '[PowerPC] Compiling $<'
-	$(Q)$(CC) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -arch ppc -c -o $@ $<
-
-.OSX/%.o.ppc: %.cpp    .deps/%.d
-	@echo '[PowerPC] Compiling $<'
-	$(Q)$(CPP) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -arch ppc -c -o $@ $<
-
-.OSX/%.o.ppc: %.m      .deps/%.d
-	@echo '[PowerPC] Compiling $<'
-	$(Q)$(CC) $(CFLAGS) $(CFLAGS_PPC) $(CDEFS) -arch ppc -c -o $@ $<
-
-.OSX/%.o.i386: %.c     .deps/%.d
-	@echo '[i386] Compiling $<'
-	$(Q)$(CC) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -arch i386 -c -o $@ $<
-
-.OSX/%.o.i386: %.cpp   .deps/%.d
-	@echo '[i386] Compiling $<'
-	$(Q)$(CPP) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -arch i386 -c -o $@ $<
-
-.OSX/%.o.i386: %.m     .deps/%.d
-	@echo '[i386] Compiling $<'
-	$(Q)$(CC) $(CFLAGS) $(CFLAGS_i386) $(CDEFS) -arch i386 -c -o $@ $<
-
-.OSX/%.o.ppc970: %.c   .deps/%.d
-	@echo '[PowerPC G5] Compiling $<'
-	$(Q)$(CC) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -arch ppc970 -c -o $@ $<
-
-.OSX/%.o.ppc970: %.cpp .deps/%.d
-	@echo '[PowerPC G5] Compiling $<'
-	$(Q)$(CPP) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -arch ppc970 -c -o $@ $<
-
-.OSX/%.o.ppc970: %.m   .deps/%.d
-	@echo '[PowerPC G5] Compiling $<'
-	$(Q)$(CC) $(CFLAGS) $(CFLAGS_PPC) $(G5_FLAGS) $(CDEFS) -arch ppc970 -c -o $@ $<
-
-endif
-
-ifdef JAGUAR
-JAGUAR_POSTFIX := -jaguar
-endif
+$(FAT_BINARY): $(TTD)
+	$(Q)mkdir -p temp_binary_dir
+	$(Q)cp $(TTD) temp_binary_dir/$(TTD)_a
+	$(Q)rm -rf $(TTD) $(OBJS) # delete all .o files so we can compile for a new endian
+	$(Q)make UNIVERSAL_x86_PART:=1
+	$(Q)cp $(TTD) temp_binary_dir/$(TTD)_b
+	@echo '===> Joining the PPC and x86 binaries into one universal one'
+	$(Q)lipo temp_binary_dir/$(TTD)_a temp_binary_dir/$(TTD)_b -create -output $(TTD)
+	$(Q)rm -rf temp_binary_dir
 
 # build the bundle. OSX wants to keep apps in bundles, so we will give it one
 # the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
 
-$(BUILD_OSX_BUNDLE): $(TTD)
+$(BUILD_OSX_BUNDLE): $(TTD) $(FAT_BINARY)
 	@echo '===> Building application bundle'
 	$(Q)rm -fr "$(OSXAPP)"
 	$(Q)mkdir -p "$(OSXAPP)"/Contents/MacOS
@@ -101,23 +48,23 @@ $(BUILD_OSX_BUNDLE): $(TTD)
 
 # make the release disk image. Should only be used with releases and is a good and fast way to make sure to remember all the needed files
 release: all
-	@echo '===> Building release disk image'
-	$(Q)mkdir -p "OpenTTD $(REV)"
-	$(Q)mkdir -p "OpenTTD $(REV)/docs"
-	$(Q)mkdir -p "OpenTTD $(REV)/scenario"
-	$(Q)cp -R $(OSXAPP) "OpenTTD $(REV)/"
-	$(Q)cp docs/OSX_install_instructions.txt "OpenTTD $(REV)/How to install (please read).txt"
-	$(Q)cp docs/OSX_why_multiple_applications.txt "OpenTTD $(REV)/why a special Jaguar download.txt"
-	$(Q)cp readme.txt "OpenTTD $(REV)/docs/"
-	$(Q)cp docs/console.txt "OpenTTD $(REV)/docs/"
-	$(Q)cp COPYING "OpenTTD $(REV)/docs/"
-	$(Q)cp changelog.txt "OpenTTD $(REV)/docs/"
-	$(Q)cp os/macosx/*.webloc "OpenTTD $(REV)"
-	$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
-	$(Q)cp scenario/* "OpenTTD $(REV)/scenario/"
-	$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
-	$(Q)rm -fr "OpenTTD $(REV)"
+	$(Q)mkdir -p "OpenTTD $(RELEASE)"
+	$(Q)mkdir -p "OpenTTD $(RELEASE)"/docs
+	$(Q)mkdir -p "OpenTTD $(RELEASE)"/scenario
+	$(Q)cp -R $(OSXAPP) "OpenTTD $(RELEASE)"/
+	$(Q)cp docs/OSX_install_instructions.txt "OpenTTD $(RELEASE)"/How\ to\ install\ (please\ read).txt
+	$(Q)cp readme.txt "OpenTTD $(RELEASE)"/docs/
+	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/readme\ if\ crashed\ on\ OSX.txt
+	$(Q)cp docs/console.txt "OpenTTD $(RELEASE)"/docs/
+	$(Q)cp COPYING "OpenTTD $(RELEASE)"/docs/
+	$(Q)cp changelog.txt "OpenTTD $(RELEASE)"/docs/
+	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/
+	$(Q)cp os/macosx/*.webloc "OpenTTD $(RELEASE)"
+	$(Q)cp known-bugs.txt "OpenTTD $(RELEASE)"/known-bugs.txt
+	$(Q)cp scenario/* "OpenTTD $(RELEASE)"/scenario/
+	$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(RELEASE)" openttd-"$(RELEASE)"-osx.dmg
+	$(Q)rm -fr "OpenTTD $(RELEASE)"
 
 $(OSX): $(TTD) $(BUILD_OSX_BUNDLE)
 
-.PHONY: release $(BUILD_OSX_BUNDLE) $(UNIVERSAL_BINARY)
+.PHONY: release $(BUILD_OSX_BUNDLE) $(FAT_BINARY)

os/macosx/Makefile.setup

@@ -11,29 +11,12 @@ endif
 endif
 
 ifdef RELEASE
-ifndef UNIVERSAL_BINARY
+ifndef FAT_BINARY
 $(warning Compiling a release build, that is not a universal binary)
 endif
 endif
 
-ifdef TRIPLE_BINARY
-ifdef DEBUG
-$(error no G5 optimisation is made in debug builds, so triple binaries aren't possible. Use UNIVERSAL_BINARY instead if you really want a universal debug build)
-endif
-UNIVERSAL_BINARY:=1
-endif
-
-ifndef UNIVERSAL_BINARY
-ifndef JAGUAR
-ifeq ($(shell uname), Darwin)
-# it's a hardware mac, not crosscompiling
-$(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector)
-IS_G5:=$(shell os/macosx/G5_detector)
-endif
-endif
-endif
-
-ifdef UNIVERSAL_BINARY
+ifdef FAT_BINARY
 ifndef STATIC
 $(warning Compiling a universal binary, that is not static. Adding static flag)
 STATIC:=1
@@ -46,84 +29,95 @@ $(warning Compiling a release build, that is a debug build)
 endif
 endif
 
-ifeq ($(shell uname), Darwin)
-	# it's a hardware mac, not crosscompiling
-	NATIVE_OSX:=1
+# setup flags if none are defined
+ifndef CFLAGS_PPC
+	CFLAGS_PPC:= -isysroot /Developer/SDKs/MacOSX10.2.8.sdk
 endif
-
-ifndef PPC_OSX_TARGET
-PPC_OSX_TARGET:=10.3.9
+ifndef LDFLAGS_PPC
+	LDFLAGS_PPC:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk
 endif
-ifndef i386_OSX_TARGET
-i386_OSX_TARGET:=10.4u
+ifndef PPC_CC
+	PPC_CC:=powerpc-apple-darwin8-gcc-4.0.0
 endif
-
-ifndef G5_FLAGS
-G5_FLAGS := -mtune=970 -mcpu=970 -mpowerpc-gpopt
+ifndef CFLAGS_x86
+	CFLAGS_x86:= -isysroot /Developer/SDKs/MacOSX10.4u.sdk
 endif
-
-ifdef UNIVERSAL_BINARY
-	OTTD_PPC:=1
-	OTTD_i386:=1
-	ifdef TRIPLE_BINARY
-		OTTD_PPC970:=1
+ifndef LDFLAGS_x86
+	LDFLAGS_x86:= -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
+endif
+ifndef x86_CC
+	x86_CC:=i686-apple-darwin8-gcc-4.0.0
+endif
+ifdef WITH_PNG
+	ifndef LIBPNG_PPC_CONFIG
+		LIBPNG_PPC_CONFIG:=$(LIBPNG-CONFIG)
+	endif
+	ifndef LIBPNG_x86_CONFIG
+		LIBPNG_x86_CONFIG:=$(LIBPNG-CONFIG)
 	endif
 endif
-
-# if any targets have been defined by now, we are crosscompiling and we will set up paths accordingly
-ifdef OTTD_PPC
-	CFLAGS_PPC   += -isysroot /Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
-	LDFLAGS_PPC  += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
-endif
-
-ifdef OTTD_i386
-	CFLAGS_i386  += -isysroot /Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk
-	LDFLAGS_i386 += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(i386_OSX_TARGET).sdk
-endif
-
-ifdef OTTD_PPC970
-	ifndef OTTD_PPC
-		CFLAGS_PPC   += -isysroot /Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
-		LDFLAGS_PPC  += -Wl,-syslibroot,/Developer/SDKs/MacOSX$(PPC_OSX_TARGET).sdk
+ifdef WITH_SDL
+	ifndef SDL_PPC_CONFIG
+		SDL_PPC_CONFIG:=$(SDL-CONFIG)
+	endif
+	ifndef SDL_x86_CONFIG
+		SDL_x86_CONFIG:=$(SDL-CONFIG)
+	endif
+	ifndef x86_SDL_LIB
+		x86_SDL_LIB:=$(shell echo "`$(SDL_x86_CONFIG) --prefix`/lib/libSDL-1.2.0.dylib")
 	endif
 endif
 
 ifdef JAGUAR
-	CFLAGS  += -isysroot /Developer/SDKs/MacOSX10.2.8.sdk
-	LDFLAGS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk
-	OTTD_PPC:=1
+	LIBPNG-CONFIG:=$(LIBPNG_PPC_CONFIG)
+	SDL-CONFIG:=$(SDL_PPC_CONFIG)
+	CC_TARGET:=$(PPC_CC)
+	CFLAGS:= $(CFLAGS_PPC) -arch ppc
+	LDFLAGS:= $(LDFLAGS_PPC)
+endif
+
+ifdef FAT_BINARY
+	# set up config files
+	ifndef SKIP_LIB_TEST
+		ifdef WITH_PNG
+			TEST:=$(shell lipo -info `$(LIBPNG_PPC_CONFIG) --prefix`/lib/libpng.a | xargs -n 1 | grep "ppc"))
+			ifndef TEST
+$(error no PPC libpng found)
+			endif
+			TEST:=$(shell lipo -info `$(LIBPNG_x86_CONFIG) --prefix`/lib/libpng.a | xargs -n 1 | grep "i386"))
+			ifndef TEST
+$(error no x86 libpng found)
+			endif
+		endif
+	endif
+
+	ifdef UNIVERSAL_x86_PART
+		LIBPNG-CONFIG:=$(LIBPNG_x86_CONFIG)
+		SDL-CONFIG:=$(SDL_x86_CONFIG)
+		CC_TARGET:=$(x86_CC)
+		# clear the cached list of PPC libs
+		LIBS:=
+		OBJS:=
+		CFLAGS:= $(CFLAGS_x86) -arch i386
+		LDFLAGS:= $(LDFLAGS_x86)
+	else
+		LIBPNG-CONFIG:=$(LIBPNG_PPC_CONFIG)
+		SDL-CONFIG:=$(SDL_PPC_CONFIG)
+		CC_TARGET:=$(PPC_CC)
+		CFLAGS:= $(CFLAGS_PPC) -arch ppc
+		LDFLAGS:= $(LDFLAGS_PPC)
+	endif
 endif
 
 # setting up flags to make a binary, that fits the system it builds on
-ifdef NATIVE_OSX
-	ifndef UNIVERSAL_BINARY
-		# we are not crosscompiling for other macs
-		ifndef JAGUAR
+ifndef FAT_BINARY
+	ifndef JAGUAR
+		ifeq ($(shell uname), Darwin)
+			# it's a hardware mac, not crosscompiling
 			ifeq ($(shell uname -r), 6.8)
 			# OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later
 				JAGUAR:=1
-				OTTD_PPC:=1
 			endif
 		endif
 	endif
 endif
-
-ifdef NATIVE_OSX
-	ifndef OTTD_PPC
-		ifndef OTTD_i386
-			ifndef OTTD_PPC970
-				# no flags have been set for target versions of OSX, so we will set it to compile for the current host
-				ifeq ($(shell uname -p), powerpc)
-					ifdef IS_G5
-						OTTD_PPC970:=1
-					else
-						OTTD_PPC:=1
-					endif
-				else
-					# we are not using a PowerPC CPU, so we assume that it's an Intel mac
-					OTTD_i386:=1
-				endif
-			endif
-		endif
-	endif
-endif

os/os2/openttd.wpj

@@ -43,8 +43,8 @@ WRect
 WFileName
 17
 ..\..\openttd.tgt
-61
-63
+0
+0
 11
 VComponent
 12

os/win32/installer/install.nsi

@@ -1,8 +1,8 @@
 ; Define your application name
 !define APPNAME "OpenTTD"
-!define APPNAMEANDVERSION "OpenTTD 0.4.8.0"
-!define APPVERSION "0.4.8.0"
-!define INSTALLERVERSION 20 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define APPNAMEANDVERSION "OpenTTD 0.4.6.0"
+!define APPVERSION "0.4.6.0"
+!define INSTALLERVERSION 18 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !define MUI_ICON "..\..\..\openttd.ico"
 !define MUI_UNICON "..\..\..\openttd.ico"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"

ottdres.rc

@@ -61,8 +61,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,8,0
- PRODUCTVERSION 0,4,8,0
+ FILEVERSION 0,4,6,0
+ PRODUCTVERSION 0,4,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -80,7 +80,7 @@ BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
             VALUE "CompanyName", "OpenTTD Development Team\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "0.4.8.0\0"
+            VALUE "FileVersion", "0.4.6.0\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright <20> OpenTTD Developers 2002-2006. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"

pathfind.c

@@ -2,16 +2,13 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "bridge_map.h"
 #include "functions.h"
 #include "map.h"
 #include "tile.h"
-#include "rail.h"
-#include "rail_map.h"
 #include "pathfind.h"
+#include "rail.h"
 #include "debug.h"
 #include "variables.h"
-#include "depot.h"
 
 // remember which tiles we have already visited so we don't visit them again.
 static bool TPFSetTileBit(TrackPathFinder *tpf, TileIndex tile, int dir)
@@ -296,9 +293,6 @@ static void TPFMode1(TrackPathFinder *tpf, TileIndex tile, uint direction)
 
 	/* Check in case of rail if the owner is the same */
 	if (tpf->tracktype == TRANSPORT_RAIL) {
-		// don't enter train depot from the back
-		if (IsTileDepotType(tile, TRANSPORT_RAIL) && GB(_m[tile].m5, 0, 2) == direction) return;
-
 		if (IsTileType(tile_org, MP_RAILWAY) || IsTileType(tile_org, MP_STATION) || IsTileType(tile_org, MP_TUNNELBRIDGE))
 			if (IsTileType(tile, MP_RAILWAY) || IsTileType(tile, MP_STATION) || IsTileType(tile, MP_TUNNELBRIDGE))
 				/* Check if we are on a bridge (middle parts don't have an owner */
@@ -444,8 +438,7 @@ typedef struct {
 	void *userdata;
 	TileIndex dest;
 
-	TransportType tracktype;
-	byte railtypes;
+	byte tracktype;
 	uint maxlength;
 
 	HashLink *new_link;
@@ -674,7 +667,6 @@ static const byte _length_of_track[16] = {
 	DIAG_FACTOR,DIAG_FACTOR,STR_FACTOR,STR_FACTOR,STR_FACTOR,STR_FACTOR,0,0
 };
 
-
 // new more optimized pathfinder for trains...
 // Tile is the tile the train is at.
 // direction is the tile the train is moving towards.
@@ -732,11 +724,6 @@ start_at:
 					/* We are not driving into the tunnel, or it
 					 * is an invalid tunnel */
 					continue;
-
-				if (!HASBIT(tpf->railtypes, GetRailType(tile))) {
-					bits = 0;
-					break;
-				}
 				flotr = FindLengthOfTunnel(tile, direction);
 				si.cur_length += flotr.length * DIAG_FACTOR;
 				tile = flotr.tile;
@@ -769,15 +756,6 @@ start_at:
 				// Check that the tile contains exactly one track
 				if (bits == 0 || KILL_FIRST_BIT(bits) != 0) break;
 
-				/* Check the rail type only if the train is *NOT* on top of
-				 * a bridge. */
-				if (!(IsBridgeTile(tile) && IsBridgeMiddle(tile) && GetBridgeAxis(tile) == DiagDirToAxis(direction))) {
-					if (IsTileType(tile, MP_STREET) ? !HASBIT(tpf->railtypes, GetRailTypeCrossing(tile)) : !HASBIT(tpf->railtypes, GetRailType(tile))) {
-						bits = 0;
-						break;
-					}
-				}
-
 				///////////////////
 				// If we reach here, the tile has exactly one track.
 				//   tile - index to a tile that is not rail tile, but still straight (with optional signals)
@@ -799,11 +777,6 @@ start_at:
 			 * bits, not just reachable ones, to prevent infinite loops. */
 			if (bits == 0 || TracksOverlap(allbits)) break;
 
-			if (!HASBIT(tpf->railtypes, GetRailType(tile))) {
-				bits = 0;
-				break;
-			}
-
 			/* If we reach here, the tile has exactly one track, and this
 			 track is reachable => Rail segment continues */
 
@@ -939,15 +912,14 @@ start_at:
 
 
 // new pathfinder for trains. better and faster.
-void NewTrainPathfind(TileIndex tile, TileIndex dest, byte railtypes, byte direction, NTPEnumProc *enum_proc, void *data)
+void NewTrainPathfind(TileIndex tile, TileIndex dest, byte direction, NTPEnumProc *enum_proc, void *data)
 {
 	NewTrackPathFinder tpf;
 
 	tpf.dest = dest;
 	tpf.userdata = data;
 	tpf.enum_proc = enum_proc;
-	tpf.tracktype = TRANSPORT_RAIL;
-	tpf.railtypes = railtypes;
+	tpf.tracktype = 0;
 	tpf.maxlength = min(_patches.pf_maxlength * 3, 10000);
 	tpf.nstack = 0;
 	tpf.new_link = tpf.links;

pathfind.h

@@ -66,6 +66,6 @@ typedef struct {
 } FindLengthOfTunnelResult;
 FindLengthOfTunnelResult FindLengthOfTunnel(TileIndex tile, uint direction);
 
-void NewTrainPathfind(TileIndex tile, TileIndex dest, byte railtypes, byte direction, NTPEnumProc *enum_proc, void *data);
+void NewTrainPathfind(TileIndex tile, TileIndex dest, byte direction, NTPEnumProc *enum_proc, void *data);
 
 #endif /* PATHFIND_H */

rail_cmd.c

@@ -4,14 +4,12 @@
 #include "openttd.h"
 #include "debug.h"
 #include "functions.h"
-#include "road_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
 #include "tile.h"
 #include "vehicle.h"
 #include "viewport.h"
-#include "window.h"
 #include "command.h"
 #include "pathfind.h"
 #include "engine.h"
@@ -130,7 +128,7 @@ static bool CheckTrackCombination(TileIndex tile, TrackBits to_build, uint flags
 }
 
 
-static const TrackBits _valid_tileh_slopes[][15] = {
+const TrackBits _valid_tileh_slopes[4][15] = {
 
 // set of normal ones
 {
@@ -345,8 +343,6 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 						(track == TRACK_DIAG1 && m5 == 0x05) ||
 						(track == TRACK_DIAG2 && m5 == 0x0A) // correct direction?
 					)) {
-				if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
-
 				if (flags & DC_EXEC) {
 					_m[tile].m3 = GetTileOwner(tile);
 					SetTileOwner(tile, _current_player);
@@ -606,8 +602,8 @@ static int32 CmdRailTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32 p2
 		ret = DoCommand(x, y, railtype, TrackdirToTrack(trackdir), flags, (mode == 0) ? CMD_BUILD_SINGLE_RAIL : CMD_REMOVE_SINGLE_RAIL);
 
 		if (CmdFailed(ret)) {
-			if ((_error_message != STR_1007_ALREADY_BUILT) && (mode == 0)) break;
-			_error_message = INVALID_STRING_ID;
+			if ((_error_message != STR_1007_ALREADY_BUILT) && (mode == 0))
+				break;
 		} else
 			total_cost += ret;
 
@@ -899,7 +895,6 @@ static int32 CmdSignalTrackHelper(int x, int y, uint32 flags, uint32 p1, uint32
 			 * This includes vehicles on track, competitor's tracks, etc. */
 			if (CmdFailed(ret)) {
 				if (_error_message != STR_1005_NO_SUITABLE_RAILROAD_TRACK && mode != 1) return CMD_ERROR;
-				_error_message = INVALID_STRING_ID;
 			} else {
 				error = false;
 				total_cost += ret;
@@ -989,15 +984,6 @@ static int32 DoConvertRail(TileIndex tile, uint totype, bool exec)
 	if (exec) {
 		SB(_m[tile].m3, 0, 4, totype);
 		MarkTileDirtyByTile(tile);
-
-		/* Update build vehicle window related to this depot */
-		if (IsTileDepotType(tile, TRANSPORT_RAIL)) {
-			Window *w = FindWindowById(WC_BUILD_VEHICLE, tile);
-			if (w != NULL) {
-				WP(w,buildtrain_d).railtype = totype;
-				SetWindowDirty(w);
-			}
-		}
 	}
 
 	return _price.build_rail / 2;

rail_map.h

@@ -1,14 +0,0 @@
-/* $Id$ */
-
-#ifndef RAIL_MAP_H
-#define RAIL_MAP_H
-
-#include "tile.h"
-
-// TODO remove this by moving to the same bits as GetRailType()
-static inline RailType GetRailTypeCrossing(TileIndex t)
-{
-	return (RailType)GB(_m[t].m4, 0, 4);
-}
-
-#endif

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2006-03-26
-Release version: 0.4.7
+Last updated:    2006-03-22
+Release version: 0.4.6
 ------------------------------------------------------------------------
 
 

road_cmd.c

@@ -2,7 +2,6 @@
 
 #include "stdafx.h"
 #include "openttd.h"
-#include "road_map.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "functions.h"
@@ -160,7 +159,7 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 
 	// owner for railroad crossing is stored somewhere else
 	// XXX - Fix this so for a given tiletype the owner of the type is in the same variable
-	owner = (IsTileType(tile, MP_STREET) && IsLevelCrossing(tile)) ? _m[tile].m3 : GetTileOwner(tile);
+	owner = IsLevelCrossing(tile) ? _m[tile].m3 : GetTileOwner(tile);
 
 	if (owner == OWNER_TOWN && _game_mode != GM_EDITOR) {
 		if (IsTileType(tile, MP_TUNNELBRIDGE)) { // index of town is not saved for bridge (no space)
@@ -211,8 +210,6 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 		if ((ti.map5 & 0xF0) == 0) { // normal road
 			byte c = pieces, t2;
 
-			if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
-
 			if (ti.tileh != 0  && (ti.map5 == 5 || ti.map5 == 10)) {
 				c |= (c & 0xC) >> 2;
 				c |= (c & 0x3) << 2;
@@ -375,8 +372,6 @@ int32 CmdBuildRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 
 	if (ti.type == MP_STREET) {
 		if (!(ti.map5 & 0xF0)) {
-			if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
-
 			if ((pieces & (byte)ti.map5) == pieces)
 				return_cmd_error(STR_1007_ALREADY_BUILT);
 			existing = ti.map5;
@@ -452,10 +447,10 @@ do_clear:;
 	}
 
 	cost = CheckRoadSlope(ti.tileh, &pieces, existing);
-	/* Return an error if we need to build a foundation (ret != 0) but the
-	 * current patch-setting is turned off (or stupid AI@work) */
-	if (CmdFailed(cost) || (cost != 0 && (!_patches.build_on_slopes || _is_old_ai_player)))
-		return_cmd_error(STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION);
+	if (CmdFailed(cost)) return_cmd_error(STR_1800_LAND_SLOPED_IN_WRONG_DIRECTION);
+
+	if (cost && (!_patches.build_on_slopes || _is_old_ai_player))
+		return CMD_ERROR;
 
 	if (ti.type != MP_STREET || (ti.map5 & 0xF0) != 0) {
 		cost += DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
@@ -551,7 +546,6 @@ int32 CmdBuildLongRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 		ret = DoCommandByTile(tile, bits, 0, flags, CMD_BUILD_ROAD);
 		if (CmdFailed(ret)) {
 			if (_error_message != STR_1007_ALREADY_BUILT) return CMD_ERROR;
-			_error_message = INVALID_STRING_ID;
 		} else {
 			cost += ret;
 		}

road_map.h

@@ -1,43 +0,0 @@
-/* $Id$ */
-
-#ifndef ROAD_MAP_H
-#define ROAD_MAP_H
-
-#include "macros.h"
-#include "tile.h"
-
-
-typedef enum RoadTileType {
-	ROAD_TILE_NORMAL,
-	ROAD_TILE_CROSSING,
-	ROAD_TILE_DEPOT
-} RoadTileType;
-
-static inline RoadTileType GetRoadTileType(TileIndex t)
-{
-	assert(IsTileType(t, MP_STREET));
-	return (RoadTileType)GB(_m[t].m5, 4, 4);
-}
-
-
-typedef enum Roadside {
-	ROADSIDE_BARREN           = 0,
-	ROADSIDE_GRASS            = 1,
-	ROADSIDE_PAVED            = 2,
-	ROADSIDE_STREET_LIGHTS    = 3,
-	ROADSIDE_TREES            = 5,
-	ROADSIDE_GRASS_ROAD_WORKS = 6,
-	ROADSIDE_PAVED_ROAD_WORKS = 7
-} Roadside;
-
-static inline Roadside GetRoadside(TileIndex tile)
-{
-	return (Roadside)GB(_m[tile].m4, 4, 3);
-}
-
-static inline bool HasRoadWorks(TileIndex t)
-{
-	return GetRoadside(t) >= ROADSIDE_GRASS_ROAD_WORKS;
-}
-
-#endif

roadveh.h

@@ -1,15 +0,0 @@
-/* $Id$ */
-
-#include "vehicle.h"
-
-
-static inline bool IsRoadVehInDepot(const Vehicle* v)
-{
-	assert(v->type == VEH_Road);
-	return v->u.road.state == 254;
-}
-
-static inline bool IsRoadVehInDepotStopped(const Vehicle* v)
-{
-	return IsRoadVehInDepot(v) && v->vehstatus & VS_STOPPED;
-}

roadveh_cmd.c

@@ -99,7 +99,7 @@ static int32 EstimateRoadVehCost(EngineID engine_type)
 /** Build a road vehicle.
  * @param x,y tile coordinates of depot where road vehicle is built
  * @param p1 bus/truck type being built (engine)
- * @param p2 bit 0 when set, the unitnumber will be 0, otherwise it will be a free number
+ * @param p2 unused
  */
 int32 CmdBuildRoadVeh(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 {
@@ -126,7 +126,7 @@ int32 CmdBuildRoadVeh(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 		return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
 
 	/* find the first free roadveh id */
-	unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Road);
+	unit_num = GetFreeUnitNumber(VEH_Road);
 	if (unit_num > _patches.max_roadveh)
 		return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
 

roadveh_gui.c

@@ -4,7 +4,6 @@
 #include "openttd.h"
 #include "debug.h"
 #include "functions.h"
-#include "roadveh.h"
 #include "table/sprites.h"
 #include "table/strings.h"
 #include "map.h"
@@ -331,7 +330,7 @@ static void RoadVehViewWndProc(Window *w, WindowEvent *e)
 			Vehicle *v;
 			uint32 h;
 			v = GetVehicle(w->window_number);
-			h = IsRoadVehInDepotStopped(v) ? 1 << 7 : 1 << 11;
+			h = IsTileDepotType(v->tile, TRANSPORT_ROAD) && (v->vehstatus&VS_STOPPED) ? (1<< 7) : (1 << 11);
 			if (h != w->hidden_state) {
 				w->hidden_state = h;
 				SetWindowDirty(w);

settings.c

@@ -811,7 +811,7 @@ static const SettingDesc gameopt_settings[] = {
   {"diff_custom", SDT_INTLIST | SDT_UINT32 | (sizeof(GameDifficulty)/4) << 16, NULL, &_opt_newgame.diff, NULL},
   {"currency",    SDT_UINT8 | SDT_ONEOFMANY,  (void*)0, &_opt_newgame.currency,   "GBP|USD|EUR|YEN|ATS|BEF|CHF|CZK|DEM|DKK|ESP|FIM|FRF|GRD|HUF|ISK|ITL|NLG|NOK|PLN|ROL|RUR|SEK|custom" },
   {"distances",   SDT_UINT8 | SDT_ONEOFMANY,  (void*)1, &_opt_newgame.kilometers, "imperial|metric" },
-  {"town_names",  SDT_UINT8 | SDT_ONEOFMANY,  (void*)0, &_opt_newgame.town_name,  "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss|danish|turkish" },
+  {"town_names",  SDT_UINT8 | SDT_ONEOFMANY,  (void*)0, &_opt_newgame.town_name,  "english|french|german|american|latin|silly|swedish|dutch|finnish|polish|slovakish|norwegian|hungarian|austrian|romanian|czech|swiss" },
   {"landscape",   SDT_UINT8 | SDT_ONEOFMANY,  (void*)0, &_opt_newgame.landscape,  "normal|hilly|desert|candy" },
   {"autosave",    SDT_UINT8 | SDT_ONEOFMANY,  (void*)1, &_opt_newgame.autosave,   "off|monthly|quarterly|half year|yearly" },
   {"road_side",   SDT_UINT8 | SDT_ONEOFMANY,  (void*)1, &_opt_newgame.road_side,  "left|right" },

settings_gui.c

@@ -587,7 +587,7 @@ static int32 PopulationInLabelActive(int32 p1)
 	return 0;
 }
 
-static int32 RedrawScreen(int32 p1)
+static int32 InvisibleTreesActive(int32 p1)
 {
 	MarkWholeScreenDirty();
 	return 0;
@@ -684,7 +684,7 @@ static const PatchEntry _patches_ui[] = {
 
 	{PE_UINT8,	PF_MULTISTRING | PF_PLAYERBASED, STR_CONFIG_PATCHES_TOOLBAR_POS, "toolbar_pos", &_patches.toolbar_pos,			0,  2,  1, &v_PositionMainToolbar},
 	{PE_UINT8,	PF_0ISDIS | PF_PLAYERBASED, STR_CONFIG_PATCHES_SNAP_RADIUS, "window_snap_radius", &_patches.window_snap_radius,     1, 32,  1, NULL},
-	{PE_BOOL,		PF_PLAYERBASED, STR_CONFIG_PATCHES_INVISIBLE_TREES,	"invisible_trees", &_patches.invisible_trees,					0,  1,  1, &RedrawScreen},
+	{PE_BOOL,		PF_PLAYERBASED, STR_CONFIG_PATCHES_INVISIBLE_TREES,	"invisible_trees", &_patches.invisible_trees,					0,  1,  1, &InvisibleTreesActive},
 	{PE_BOOL,		PF_PLAYERBASED, STR_CONFIG_PATCHES_POPULATION_IN_LABEL, "population_in_label", &_patches.population_in_label, 0, 1, 1, &PopulationInLabelActive},
 
 	{PE_INT32, 0, STR_CONFIG_PATCHES_MAP_X, "map_x", &_patches.map_x, 6, 11, 1, NULL},
@@ -697,7 +697,7 @@ static const PatchEntry _patches_construction[] = {
 	{PE_BOOL,		0, STR_CONFIG_PATCHES_BUILDONSLOPES,		"build_on_slopes",	&_patches.build_on_slopes,					0,  0,  0, NULL},
 	{PE_BOOL,		0, STR_CONFIG_PATCHES_EXTRADYNAMITE,		"extra_dynamite",		&_patches.extra_dynamite,						0,  0,  0, NULL},
 	{PE_BOOL,		0, STR_CONFIG_PATCHES_LONGBRIDGES,			"long_bridges",			&_patches.longbridges,							0,  0,  0, NULL},
-	{PE_BOOL,		0, STR_CONFIG_PATCHES_SIGNALSIDE,				"signal_side",			&_patches.signal_side,							0,  0,  0, &RedrawScreen},
+	{PE_BOOL,		0, STR_CONFIG_PATCHES_SIGNALSIDE,				"signal_side",			&_patches.signal_side,							0,  0,  0, NULL},
 
 	{PE_BOOL,		0, STR_CONFIG_PATCHES_SMALL_AIRPORTS,		"always_small_airport", &_patches.always_small_airport,			0,  0,  0, NULL},
 	{PE_UINT8,	PF_PLAYERBASED, STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY, "drag_signals_density", &_patches.drag_signals_density, 1, 20,  1, NULL},

ship_cmd.c

@@ -64,7 +64,7 @@ static const Depot* FindClosestShipDepot(const Vehicle* v)
 	uint best_dist = (uint)-1;
 	TileIndex tile;
 	TileIndex tile2 = v->tile;
-#if 0
+
 	if (_patches.new_pathfinding_all) {
 		NPFFoundTargetData ftd;
 		byte trackdir = GetVehicleTrackdir(v);
@@ -75,8 +75,6 @@ static const Depot* FindClosestShipDepot(const Vehicle* v)
 			best_depot = NULL; /* Did not find target */
 		}
 	} else {
-#else
-	{
 		FOR_ALL_DEPOTS(depot) {
 			tile = depot->xy;
 			if (IsValidDepot(depot) && IsTileDepotType(tile, TRANSPORT_WATER) && IsTileOwner(tile, v->owner)) {
@@ -88,7 +86,6 @@ static const Depot* FindClosestShipDepot(const Vehicle* v)
 			}
 		}
 	}
-#endif
 	return best_depot;
 }
 
@@ -537,7 +534,6 @@ static int ChooseShipTrack(Vehicle *v, TileIndex tile, int enterdir, uint tracks
 {
 	assert(enterdir>=0 && enterdir<=3);
 
-#if 0
 	if (_patches.new_pathfinding_all) {
 		NPFFindStationOrTileData fstd;
 		NPFFoundTargetData ftd;
@@ -559,8 +555,6 @@ static int ChooseShipTrack(Vehicle *v, TileIndex tile, int enterdir, uint tracks
 			return -1; /* Already at target, reverse? */
 		}
 	} else {
-#else
-	{
 		uint b;
 		uint tot_dist, dist;
 		int track;
@@ -583,7 +577,6 @@ static int ChooseShipTrack(Vehicle *v, TileIndex tile, int enterdir, uint tracks
 			return -1;
 		return track;
 	}
-#endif
 }
 
 static const byte _new_vehicle_direction_table[11] = {
@@ -721,7 +714,7 @@ static void ShipController(Vehicle *v)
 							st = GetStation(v->current_order.station);
 							if (st->facilities & FACIL_DOCK) { /* ugly, ugly workaround for problem with ships able to drop off cargo at wrong stations */
 								v->current_order.type = OT_LOADING;
-								v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD | OF_TRANSFER;
+								v->current_order.flags &= OF_FULL_LOAD | OF_UNLOAD;
 								v->current_order.flags |= OF_NON_STOP;
 								ShipArrivesAt(v, st);
 
@@ -824,7 +817,7 @@ void ShipsYearlyLoop(void)
 /** Build a ship.
  * @param x,y tile coordinates of depot where ship is built
  * @param p1 ship type being built (engine)
- * @param p2 bit 0 when set, the unitnumber will be 0, otherwise it will be a free number
+ * @param p2 unused
  */
 int32 CmdBuildShip(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 {
@@ -847,9 +840,8 @@ int32 CmdBuildShip(int x, int y, uint32 flags, uint32 p1, uint32 p2)
 	if (!IsTileOwner(tile, _current_player)) return CMD_ERROR;
 
 	v = AllocateVehicle();
-	unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Ship);
-
-	if (v == NULL || IsOrderPoolFull() || unit_num > _patches.max_ships)
+	if (v == NULL || IsOrderPoolFull() ||
+			(unit_num = GetFreeUnitNumber(VEH_Ship)) > _patches.max_ships)
 		return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);
 
 	if (flags & DC_EXEC) {