(svn r8640) -Release: 0.5.0-RC5.

(svn r8639) [0.5] -Update readme's, bugs, installers, changelogs etc. to prepare for 0.5.0-RC5.
(svn r8638) [0.5] -Backport from trunk (8637):
2025-08-13 17:49:10 +00:00 · 2007-02-08 16:25:17 +00:00 · 2007-02-08 16:18:11 +00:00 · 2007-02-08 16:17:15 +00:00 · 2007-02-08 14:10:14 +00:00 · 2007-02-08 11:26:09 +00:00
157 changed files with 31272 additions and 11511 deletions
--- a/37
+++ b/37
@@ -101,6 +101,8 @@
 # CYGWIN: build in Cygwin environment
 # MINGW: build with MingW compiler, link with MingW libraries
 #
+# CUSTOM_FONTCONFIG: use a custom name/path to the libfontconfig library. Useful for static linking
+#
 # VERBOSE: show full compiler invocations instead of brief progress messages
 #
 # Special for crosscompiling there are some commands available:
@@ -110,9 +112,6 @@
 # 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
 #
-# 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
-#
 # ENDIAN_FORCE: forces the endian-check to give a certain result. Can be BE, LE or PREPROCESSOR.
 #	PREPROCESSOR is always used on all OSX targets and will make the preprocessor pick the right endian.
 #	this means that you don't have to think about endianess when compiling for OSX.
@@ -269,14 +268,7 @@ ENDIAN_CHECK=endian_check$(EXE)
 STRGEN=strgen/strgen$(EXE)
 OSXAPP="OpenTTD.app"

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

 # define flag to use for -lrt (some OSes overwrites this later for compatibility)
 ifndef LRT
@@ -523,16 +515,21 @@ ifdef WITH_FONTCONFIG
 CDEFS += -DWITH_FONTCONFIG
 CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags)
 LDFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --libs)
+
+ifdef CUSTOM_FONTCONFIG
+# To allow usage of non-default libs, such as absolute path to static libs
+# not stored in Makefile.config
+LDFLAGS_FONTCONFIG := $(CUSTOM_FONTCONFIG)
+endif
+
 CFLAGS += $(CCFLAGS_FONTCONFIG)
 LIBS += $(LDFLAGS_FONTCONFIG)
 endif

 # iconv is enabled defaultly on OSX >= 10.3
 ifdef OSX
-	ifndef JAGUAR
-		WITH_ICONV=1
-		LIBS += -liconv
-	endif
+	WITH_ICONV=1
+	LIBS += -liconv
 endif

 ifdef WITH_ICONV
@@ -944,15 +941,17 @@ release: all
 	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/data"
 	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/lang"
 	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario/heightmap"
 	$(Q)cp -R $(TTD)                      "/t/openttd-$(RELEASE)-morphos/"
 	$(Q)cp data/*                         "/t/openttd-$(RELEASE)-morphos/data/"
 	$(Q)cp lang/*.lng                     "/t/openttd-$(RELEASE)-morphos/lang/"
-	$(Q)cp scenario/*                     "/t/openttd-$(RELEASE)-morphos/scenario/"
+	$(Q)-cp scenario/*.scn                "/t/openttd-$(RELEASE)-morphos/scenario/"
+	$(Q)-cp scenario/heightmap/*          "/t/openttd-$(RELEASE)-morphos/scenario/heightmap/"
 	$(Q)cp readme.txt                     "/t/openttd-$(RELEASE)-morphos/docs/ReadMe"
 	$(Q)cp docs/console.txt               "/t/openttd-$(RELEASE)-morphos/docs/Console"
 	$(Q)cp COPYING                        "/t/openttd-$(RELEASE)-morphos/docs/"
 	$(Q)cp changelog.txt                  "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog"
-	$(Q)cp known-bugs.txt				   "/t/openttd-$(RELEASE)-morphos/docs/known-bugs.txt"
+	$(Q)cp known-bugs.txt                 "/t/openttd-$(RELEASE)-morphos/docs/known-bugs.txt"
 	$(Q)cp os/morphos/icons/openttd.info  "/t/openttd-$(RELEASE)-morphos/$(TTD).info"
 	$(Q)cp os/morphos/icons/docs.info     "/t/openttd-$(RELEASE)-morphos/docs.info"
 	$(Q)cp os/morphos/icons/drawer.info   "/t/openttd-$(RELEASE)-morphos.info"
@@ -1031,8 +1030,12 @@ endif
 	install -m 644 lang/*.lng $(DATA_DIR_INSTALL)/lang
 	install -m 644 data/*.grf $(DATA_DIR_INSTALL)/data
 	install -m 644 data/opntitle.dat $(DATA_DIR_INSTALL)/data
+	# Generic menu icon
 	install -m 644 media/openttd.64.png $(ICON_DIR_INSTALL)
+	# Debian menu icon
 	install -m 644 media/openttd.32.xpm $(ICON_DIR_INSTALL)
+	# Window icon
+	install -m 644 media/openttd.32.bmp $(ICON_DIR_INSTALL)
 else	#MorphOS
 install:
 	$(error make install is not supported on MorphOS)
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -543,7 +543,6 @@ int32 CmdSendAircraftToHangar(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
 		if (!IsValidStation(st) || st->airport_tile == 0 || GetAirport(st->airport_type)->nof_depots == 0) {
 			StationID station;

-			if (!(p2 & DEPOT_LOCATE_HANGAR)) return CMD_ERROR;
 			// the aircraft has to search for a hangar on its own
 			station = FindNearestHangar(v);

@@ -561,7 +560,7 @@ int32 CmdSendAircraftToHangar(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
 			v->current_order.refit_cargo = CT_INVALID;
 			v->current_order.dest = next_airport_index;
 			InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
-			if (p2 & DEPOT_LOCATE_HANGAR || (p2 & DEPOT_SERVICE && v->u.air.state == FLYING && !next_airport_has_hangar)) {
+			if (v->u.air.state == FLYING && !next_airport_has_hangar) {
 				/* The aircraft is now heading for a different hangar than the next in the orders */
 				AircraftNextAirportPos_and_Order(v);
 				v->u.air.targetairport = next_airport_index;
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,7 +1,86 @@
+0.5.0-RC5 (2007-02-08)
+------------------------------------------------------------------------
+- Feature: requery gameservers that did not respond to their first query (r8520, r8542)
+- Feature: check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console (r8459, r8461)
+- Feature: logging of the IP address and port of invalid/illegal UDP packets (r8490)
+- Codechange: Add Korean, Simplified Chinese and Traditional Chinese languages as an official translation (r8286, r8324, r8616)
+- Codechange: Increase the size of the sound/video/music-drivers to 32 bytes (instead of 16) so their actual parameters can be passed. Sound has for example bufsize' and 'hz' (r8497)
+- Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's (r8253)
+- Codechange: Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock. (r8420, r8421)
+- Codechange: replace missing sprites with a red question mark (8634)
+- Regression: Help window was empty for UNICODE builds (r8239)
+- Regression: When the latest news was deleted, the news queue wrapped back to the oldest item, showing all news again (r8409)
+- Regression: ShowLastNewsMessage could show an out-of-bounds news item because it did not checked if a previous item actually existed the first time it is called (forced news is INVALID_NEWS) [FS#573] (r8409)
+- Fix: deleting a vehicle with shared orders, but no orders would fail to reset prev_shared and next_shared (r8294)
+- Fix: GenerateVehicleSortList()/CmdMassStartStopVehicle() tried to put a TileIndex into an uint16 (r8296)
+- Fix: [YAPF] Assert when buoy is placed on NE or NW map edge (r8540)
+- Fix: a road vehicle that is very close after another (slower) road vehicle gets its speed reset to 0 when entering a tunnel, which causes a traffic jam outside of the tunnel (r8609)
+- Fix: Road Vehicles now can obtain a slot even if the station is very spread out [FS#577] (r8536)
+- Fix: bridges do not get destroyed when the bridge head gets flooded and there is a vehicle on the bridge [FS#564] (r8593)
+- Fix: you were unable to build roads in the scenario editor when there is no town 0, even though there are other towns (r8608)
+- Fix: store the ownership of a water tile in the buoy tile and set the ownership of the water tile when the buoy is removed. This solves the issue of removing ownership from canal tiles thus making is possible for other players to remove the canal tile (r8619)
+- Fix: buoys on canal tiles do not flood anymore (r8620)
+- Fix: Put the output of -h to stdout and not to stderr (through ShowInfo) (r8240)
+- Fix: use ShowInfo over fprintf(stderr, as Windows doesn't always have a stderr visible/available (r8315)
+- Fix: return value from clamp was ignored (r8273)
+- Fix: When the currently selected player in the performance details window is no longer active, choose the first active player instead of the first player as that may also be inactive  [FS#582] (r8612)
+- Fix: segmentation fault when the toolbar gets removed and you have selected one of the items in a submenu of the toolbar (r8533)
+- Fix: [OSX] freetype and fontconfig detection (r8500)
+- Fix: draw canal edges under buoys that are in a canal (8635)
+- Fix: CTRL-clicking on a hangar in the order list segfaulted as hangars are part of a station instead of real depots (8637)
+
+0.5.0-RC4 (2007-01-18)
+------------------------------------------------------------------------
+- Feature: Increase spritecache size to 2MB, will increase performance in games using newgrf files (r8218)
+- Feature: OS/2 support with GCC (Watcom is dropped) (r8042)
+- Codechange: Add Japanese, Slovenian language as an official translation and split Norwegian into Bokmal and Nynorsk (r7987, r8084, r8069)
+- Codechange: Show error messages about our own data files as a popup, or to stderr if console is available (and not to stdout) (r8013, r8134)
+- Codechange: Change the ordering of the network list, compatible servers just missing grf files are below fully compatible servers, not on the bottom (r8118)
+- Fix: Return proper error value when unthreaded save fails, prevents server sending 0-sized files (r8171)
+- Fix: Network client crashes when a server sends a 0-sized savegame [FS#556] (r8167)
+- Fix: Several desync fixes (incorrect roadstop update of old games, autoreplace bugs) [FS#551] (r8137, r8147, r8157)
+- Fix: Some disaster-events fixed: combat chopper shoots from right position, submarine once again moves around (r8140, r8158)
+- Fix: "out of sprite memory" warning messages due to incorrect assumption of requested memory for sprites (r8133)
+- Fix: Bouys are now built and numbered 1..9 not 9..1 [FS#538] (r8123)
+- Fix: Clicking for more news properly cycles through the news history backwards, and doesn't show the first item doubly if it's already open (r8049)
+- Fix: Crash when removing a town in the scenario editor while the query window is open for one of the town's tiles (r8030)
+- Fix: Overflow of system-ticks was not handled properly, resulting in a possibly unresponsive server/client (r8028)
+- Fix: Automatic pause interfering with 'pause_on_join setting' in MP when <shift> is pressed [FS#486] (r8027)
+- Fix: Picking up en-route cargo will also have virtual profit deducted for trains aswell (r8026)
+- Fix: Out-of-bounds read access on _clients array (harmless) (r7984)
+
+0.5.0-RC3 (2007-01-07)
+------------------------------------------------------------------------
+- Codechange: Add Lithuanian language as an official translation (r7806)
+- Fix: The configure script did not work work for dash, a sh compatible shell [FS#485] (r7893)
+- Fix: [OSX] control + enter no longer fullscreens, interfered with team-chat (r7886)
+- Fix: Offset engines/wagons by half width in details window; fixes overflowing for display (r7864)
+- Fix: [OSX] Remove incorrect debug message about missing grf files. (r7766)
+- Fix: [sdl] sometimes ALT-TAB could trigger the fast forward (r7727)
+
+
+0.5.0-RC2 (2006-12-31)
+------------------------------------------------------------------------
+- General Removed support for OSX older than 10.3.9. Either upgrade, or use 0.4.8 (compatible with OSX 10.2)
+- Codechange: Drastically reduce the CPU usage in certain cases (AI using CheckStationSpreadOut()) (r7585)
+- Fix: Internal bug in updating the animated_tiles table caused desyncs between (different endian) machines in MP (r7631)
+- Fix: Signal update got propagated through incompatible railtypes and under certain circumstances tunnels and rail on top (r7620)
+- Fix: Remove landscaping toolbar option from road consturction toolbar in scenario editor [FS#473] (r7586)
+- Fix: The server could under certain circumstances tell a client too late to start syncing if it has been waiting to join (r7566)
+- Fix: Removing towns in scenario editor didn't remove their subsidies causing possible crashes [FS#468] (r7563)
+- Fix: Internal and (patches) GUI were disagreeing about autorenew settings [FS#431] (r7561)
+- Fix: No new company could be created if more than 8 clients were connected, even if not all 8 companies were used (r7560)
+- Fix; Clicking 'full load' could under certain circumstances change the current depot order [FS#456] (r7559)
+- Fix: Do not wait till a crashed vehicle is removed before starting to load other vehicles [FS#464] (r7558)
+- Fix: MorhpOS compile and install fixes (r7548)
+- Fix: Removing rail station cost was calculated on occupied area not on number of tiles with an actual station on (r7547)
+
+
 0.5.0-RC1 (2006-12-21)
 ------------------------------------------------------------------------

 - General fixes and improvements to TTDPatch's newgrf format, most noticable are newstations, newsounds, more callbacks and I18n
+- Added languages: Bulgarian, Esperanto, Russian, Ukrainian, Languages with proper diacretics: Czech, Hungarian, Turkish
 - Feature: Show NewGRF compatability of network games; green for full compatibility, yellow for missing newgrfs and red for invalid revision (r7505)
 - Feature: Load a list of NewGRFs from the config (in the [newgrf-static] section) that should always be loaded (r7490)
 - Feature: Double the length of the cargo and rating indicators in the station list window for better visibility (r7466)
@@ -50,7 +129,7 @@
 - Feature: Also allow horizontal and vertical rails on steep slopes (r5864)
 - Feature: Allow building of (certain) rails, roads and bridge ramps on steep sloped tiles (r5833)
 - Feature: Replacing from a train engine without cargo capacity to one with cargo capacity will now make autoreplace refit the engine to carry the cargo type from the last wagon in the train (r5465)
- Feature: [OSX] Macs with touchpads that support two finger scrolling can now use this feature to move around the map (r5460)
+- Feature: [OSX] Macs with touchpads that support two finger scrolling can now use this "scrollwheel" to scroll up/down (r5460)
 - Feature: Allow building canals at sea-level, using ctrl to toggle canal or plain water tile. This allows building of non-raisable sea-level water ways (useful in multiplayer) and dikes for low-level areas (r5403)
 - Feature: Add 4 new airports. 2 for aircraft, 2 for helicopters (r5346)
 - Feature: Implement smooth horizontal depot and, vehicle list scrolling for trains (r5046)
@@ -91,6 +170,7 @@
 - Codechange: [win32] Add native x64 target to VS2005 project files (r5813)
 - Codechange: [win32]The exception dialog showed the last modification-date of win32.c instead of the last compilation-date (r5801)
 - Codechange: Add owner attribute to canals and locks. This makes them more useful in multiplayer games, as only the owner can delete them. Does not affect usage (r5084)
+- Codechange: Add MSVC2005 support, project and solution files are in the _vs80.* files (r4581)
 - Codechange: [OSX] Shark (Xcode's profiling tool) can now relate CPU usage to lines (r3611)
 - Codechange: Rewrite the multistop slot assignment system. More resource-friendly, several slot-assignment improvements (r3730, r4259)
 - Codechange: Completely remove the deprecated -p parameter (is superseded by -n) (r3508)
--- a/command.c
+++ b/command.c
@@ -463,7 +463,11 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback,
 	_docommand_recursive = 1;

 	// cost estimation only?
-	if (!IsGeneratingWorld() && _shift_pressed && IsLocalPlayer() && !(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR))) {
+	if (!IsGeneratingWorld() &&
+			_shift_pressed &&
+			IsLocalPlayer() &&
+			!(cmd & (CMD_NETWORK_COMMAND | CMD_SHOW_NO_ERROR)) &&
+			(cmd & 0xFF) != CMD_PAUSE) {
 		// estimate the cost.
 		res = proc(tile, flags, p1, p2);
 		if (CmdFailed(res)) {
--- a/10
+++ b/10
@@ -3,7 +3,7 @@
 # This 'configure' script is a very easy wrapper around 'make updateconf'
 #  It allows cross-compilers to do their job much more easy.

-function showhelp() {
+showhelp() {
 	echo "Configure for OpenTTD"
 	echo ""
 	echo "Usage:"
@@ -48,7 +48,7 @@ function showhelp() {
 	echo " "
 }

-function handle() {
+handle() {
 	PARAM="$PARAM \"$1=`awk 'BEGIN { FS="="; $0="'"$2"'"; print $2;}'`\""
 }

@@ -309,9 +309,9 @@ fi
 # First remove the Makefile.config, else you can have double entries
 rm -f Makefile.config

-echo "make upgradeconf $PARAM" > Makefile.run
-. Makefile.run
-rm -f Makefile.run
+echo "make upgradeconf $PARAM" > ./Makefile.run
+. ./Makefile.run
+rm -f ./Makefile.run

 # Makefile.config currently doesn't support custom RELEASE (revision), so, we add the line
 # yourself!
--- a/console_cmds.c
+++ b/console_cmds.c
@@ -756,6 +756,11 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
 	ParseConnectionString(&player, &port, ip);

 	IConsolePrintF(_icolour_def, "Connecting to %s...", ip);
+	if (port != NULL) {
+		rport = atoi(port);
+		IConsolePrintF(_icolour_def, "    port: %s", port);
+	}
+
 	if (player != NULL) {
 		_network_playas = atoi(player);
 		IConsolePrintF(_icolour_def, "    player-no: %d", _network_playas);
@@ -767,10 +772,6 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
 			if (!IsValidPlayer(_network_playas)) return false;
 		}
 	}
-	if (port != NULL) {
-		rport = atoi(port);
-		IConsolePrintF(_icolour_def, "    port: %s", port);
-	}

 	NetworkClientConnectGame(ip, rport);

--- a/date.c
+++ b/date.c
@@ -92,9 +92,22 @@ void ConvertDateToYMD(Date date, YearMonthDay *ymd)
 	int rem = date % (365 * 400 + 97);
 	uint16 x;

-	/* There are 24 leap years in 100 years */
-	yr += 100 * (rem / (365 * 100 + 24));
-	rem = rem % (365 * 100 + 24);
+	if (rem >= 365 * 100 + 25) {
+		/* There are 25 leap years in the first 100 years after
+		 * every 400th year, as every 400th year is a leap year */
+		yr  += 100;
+		rem -= 365 * 100 + 25;
+
+		/* There are 24 leap years in the next couple of 100 years */
+		yr += 100 * (rem / (365 * 100 + 24));
+		rem = (rem % (365 * 100 + 24));
+	}
+
+	if (!IsLeapYear(yr) && rem >= 365 * 4) {
+		/* The first 4 year of the century are not always a leap year */
+		yr  += 4;
+		rem -= 365 * 4;
+	}

 	/* There is 1 leap year every 4 years */
 	yr += 4 * (rem / (365 * 4 + 1));
--- a/disaster_cmd.c
+++ b/disaster_cmd.c
@@ -477,7 +477,7 @@ static void DisasterTick_3(Vehicle *v)
 		TileIndex tile;
 		uint ind;

-		x = v->x_pos - 15 * TILE_SIZE;
+		x = v->x_pos + (15 * TILE_SIZE);
 		y = v->y_pos;

 		if ( (uint)x > MapMaxX() * TILE_SIZE - 1)
@@ -672,7 +672,7 @@ static void DisasterTick_5_and_6(Vehicle *v)

 	tile = v->tile + TileOffsByDiagDir(DirToDiagDir(v->direction));
 	if (IsValidTile(tile) &&
-			(r=GetTileTrackStatus(tile,TRANSPORT_WATER),(byte)(r+(r >> 8)) == 0x3F) &&
+			(r=GetTileTrackStatus(tile,TRANSPORT_WATER),(byte)(r|(r >> 8)) == 0x3F) &&
 			!CHANCE16(1,90)) {
 		GetNewVehiclePos(v, &gp);
 		SetDisasterVehiclePos(v, gp.x, gp.y, v->z_pos);
--- a/docs/HOWTO_compile_lang_files.txt
+++ b/docs/HOWTO_compile_lang_files.txt
@@ -0,0 +1,59 @@
+STRGEN USAGE
+------------
+This guide is only interesting for people who want to alter something
+themselves without access to WT2 (translator2.openttd.org). Please note that
+your compiled language file will only be compatible with the OpenTTD version
+you have downloaded english.txt, the master language file, for. While this is
+not always true, namely when changes in the code have not touched language
+files, your safest bet is to assume this 'limitation'.
+As a first step you need to compile strgen. This is as easy as typing
+'make strgen'. You can also download a precompiled binary from a release,
+nightly, etc.
+strgen takes as argument a txt file and translates it to a lng file, allowing
+it to be used inside OpenTTD. strgen needs the master language file
+english.txt to work. Below are some examples of strgen usage.
+
+EXAMPLES
+--------
+Example 1:
+if you are in the root of your working copy (svn code), you should type
+strgen/strgen -s lang lang/english.txt
+to compile englist.txt into english.lng. It will be placed in the lang dir
+
+Example 2:
+you only have the strgen executable (no working copy) and you want to compile
+a txt file in the same directory. You should type
+./strgen english.txt
+and you will get and english.lng in the same dir
+
+Example 3:
+you have strgen somewhere, english.txt in /usr/openttd/lang and you want the
+resulting language file to go to /tmp. Use
+./strgen -s /usr/openttd/lang -d /tmp english.txt
+
+You can interchange english.txt to whichever language you want to generate a
+.lng file for.
+
+STRGEN COMMAND SWITCHES
+-----------------------
+-v | --version
+strgen will tell what svn revision it was last modified
+
+-t | --todo
+strgen will add <TODO> to any untranslated/missing strings and use the english
+strings while compiling the language file
+
+-w | --warning
+strgen will print any missing strings or wrongly translated (bad format)
+to standard error output(stderr)
+
+-h | --help | -?
+Print out a summarized help message explaining these switches
+
+-s | --source_dir
+strgen will search for the master file english.txt in the directory specified
+by this switch instead of the current directory
+
+-d | --dest_dir
+strgen will put <language>.lng in the directory specified by this switch; if
+no dest_dir is given, output is the same as source_dir
--- a/docs/Howto_compile_lng_files_from_CLI.txt
+++ b/docs/Howto_compile_lng_files_from_CLI.txt
@@ -32,17 +32,3 @@ this will need english.txt to be present
 -w
 strgen will print any missing strings to standard error output(stderr)
 this will need english.txt to be present
-
-here are a very useful tool for translators:
-http://openttd.rulez.org/
-
-
-HOWTO compile strgen:
-(this should be useless as you can just type make)
-Goto the main dir
-Compile by typing
-gcc strgen/strgen.c -o strgen/strgen -DUNIX
-or if you want it to tell the revision too
-gcc strgen/strgen.c rev.o -o strgen/strgen -DUNIX -DWITH_REV (this is the one the makefile uses)
-
-you now have a program called strgen in the strgen directory
--- a/docs/Manual.txt
+++ b/docs/Manual.txt
@@ -18,7 +18,6 @@ Use make or gmake to compile OpenTTD. You can adjust Makefile.config to compile
 BeOS:
 On BeOS, run ./configure and then use jam. There are a variaty of options you can pass to your build tool, these are reported by ./configure.

-
 1.2 Installing OpenTTD.

 On Windows, insert your "Transport Tycoon Deluxe for Windows 95" disk. You can use a DOS version, but your graphics will be purple. NB: Even if your version of Transport Tycoon Deluxe ran on Windows 95, it may still be the DOS version. Then run the OpenTTD installer.
@@ -58,7 +57,6 @@ However, there is an even more noticable difference in rail station construction

 2.3 Checkpoint Stations

-
 Checkpoint stations (the small blue item in the rail construction window) are small 1x1 stations. They must be built on top of pre-existing track. They do not accept or produce carge of any kind. They exist solely for use as route points. They become useful when dealing with large networks  where trains may attempt to route themselves along undesirable or impossible routes. As an alternative to checkpoint stations, you can also direct trains to visit depots along the way. This has the advantage of also servicing the train and hence the train will rarely to never need to depart from its route to be serviced.

 2.4 Freeform Rail Laying.
--- a/docs/OSX_why_multiple_applications.txt
+++ b/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
--- a/docs/Readme_Mandrake_Linux.txt
+++ b/docs/Readme_Mandrake_Linux.txt
@@ -1,62 +0,0 @@
-Compiling and developing OpenTTD on MandrakeLinux 10.0 Official
-
-A quick guide to get started with OpenTTD development on Linux.
---------------------------------------------------------------
-
-1.) RPMs:
-
-Most packages that are required for development (like gcc) should already be installed on your box. You will require those RPMs additionally:
- libsdl1.2-devel-1.2.7-2mdk
- subversion-1.0.1-1mdk (+ dependencies)
- libsvn_ra_svn1_0-1.0.1-1mdk
-
-
-2.) Subversion:
-
-To obtain the source code from the subversion server type
-  $ svn co svn://svn.openttd.com/openttd/trunk openttd
-from command line to dump the code into the directory 'openttd'.
-
-To update your working copy to the latest revision use
-  $ svn update
-Don't worry, your version will be merged with the latest version.
-
-The command
-  $ svn diff > mypatch.diff
-creates a patch file (aka diff file) which you can submit to the developers to share your improvements.
-
-You can undo changes to a file with
-  $svn revert filename
-
-
-3.) Required data files:
-
-Copy the following files from Transport Tycoon Deluxe to openttd/data/
-  sample.cat
-  trg1r.grf
-  trgcr.grf
-  trghr.grf
-  trgir.grf
-  trgtr.grf
-
-(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
-
-
-4.) Compiling and running:
-
-Compile OpenTTD with
-  $ make
-and run it with
-  $ ./ttd
-
-
-5.) Playing the soundtrack:
-
-If you want the original TTD music you need to copy the whole /gm/ directory from Windows. Additionally the TiMidity driver is required:
-  TiMidity++-2.12.0-0.pre1.4mdk (+ dependencies)
-To run OpenTTD with music support type
-  $ ./ttd -m extmidi
-
-
-X.) Last Update: $Date: 2004-06-01 19:08:09 +0200 (Tue, 01 Jun 2004) $
-    Written for revision $Rev: 710 $
--- a/docs/Readme_OS2.txt
+++ b/docs/Readme_OS2.txt
@@ -67,16 +67,25 @@ BUILDING THE OS/2 VERSION
 Compiler
 --------

-Open Watcom 1.3 was used to build OpenTTD (earlier versions will
-NOT work). See http://www.openwatcom.org/ to download it. It may
-also be possible to build OpenTTD with GCC: I attempted this
-before using Open Watcom, but found the tools available for OS/2
-at the time to be a bit more tricky to get working.
+Innotek GCC, an OS/2 port of the popular GCC compiler, was used to build OpenTTD.
+See www.innotek.de for more information. You WILL need a reasonably UNIX-like
+build environment in order to build OpenTTD successfully - the following link
+may help to set one up (although some of the links from that page are broken):

-Due to complexities in my set-up, I actually used the Win32 version
-of Open Watcom to initially compile OpenTTD for OS/2. There should
-be no reason of course why the OS/2 version cannot be used, and I
-have subsequently built OpenTTD successfully this way.
+   http://www.mozilla.org/ports/os2/gccsetup.html
+
+To build, you should, if your environment is set up well enough, be able to just
+type `./configure' (or `sh configure' if you're using the OS/2 shell) and `make'.
+
+A note on Open Watcom
+---------------------
+
+Open Watcom C/C++ was previously used to build OpenTTD (version 0.4.x and earlier).
+However, due to advanced C++ features used in the YAPF portion of OpenTTD 0.5
+in particular, the compiler is no longer able to build the game at the moment.
+Hopefully one day Open Watcom will be able to catch up and we will be able to build
+the game once again (it's easier than getting an OS/2 UNIX-like environment set up
+in my opinion!), but until then, OpenTTD 0.5 and later can only be built with GCC.

 Libraries Required
 ------------------
@@ -87,42 +96,23 @@ to an IDE project file and built a library. Do not use the makefiles
 provided, they are not designed for Watcom (apart from SDL):

 - zlib
-  http://www.zlib.org/ - contains a makefile for OS/2, but is out
-  of date and uses EMX, ignore this
+  http://www.zlib.org/

 - libpng
-  http://www.libpng.org/ - contains an EMX/gcc makefile, ignore this
+  http://www.libpng.org/

 - SDL for OS/2
  ftp://ftp.netlabs.org/pub/sdl/sdl-1.2.7-src-20051222.zip used for
  0.4.7

-If you do not wish to build the libraries yourself, pre-built versions
-can be downloaded from the Files section at
+- Freetype
+  http://freetype.sourceforge.net/
+
+Currently, there are no pre-built libraries available for GCC. If you manage to get
+OpenTTD working on Watcom though (do let us know if this is the case!), pre-built
+versions can be downloaded from the Files section at
 http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".

-A Note About Subversion Revision Numbers
----------------------------------------
-
-The project file uses a bit of a hack to find out the SVN revision number and
-create an appropriate rev.c file. You'll need the SVN tools in your path
-(specifically, "svnversion"). If "svnversion" can't be found, a generic rev.c
-with the revision set to "norev000" will be created. To specifically force a
-version number, set the environment variable "RELEASE" to the number (eg, "0.3.6")
-before- starting the Open Watcom IDE (which must be launched from the same shell
-session). Also, beware, as you WILL cause incompatibilities if you try to
-play a multiplayer game with a different version.
-
-Compiling
---------
-
-To compile, open the os/os2/openttd.wpj file in the IDE and first build
-the strgen.exe target. This will build the .lng file generator, and will
-also attempt to build all the language files (plus the table\strings.h
-file which is required for openttd.exe to be built). Once strgen.exe and
-the language files are built successfully, you can build the openttd.exe
-target.
-
 Contact Information
 -------------------

@@ -130,4 +120,6 @@ If you have any questions regarding OS/2 issues, please contact me
 (owen@owenrudge.net) and I'll try to help you out. For general OpenTTD
 issues, see the Contacting section of readme.txt.

- Owen Rudge
+Thanks to Paul Smedley for his help with getting OpenTTD to compile under GCC on OS/2.
+
+- Owen Rudge, 8th January 2007
--- a/docs/Readme_Windows_MSVC.txt
+++ b/docs/Readme_Windows_MSVC.txt
@@ -1,104 +1,108 @@
-Compiling OpenTTD using Microsoft Visual C++ 6.0
+Compiling OpenTTD using Microsoft Visual C++
+December 28, 2006
+--------------------------------------------
+PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!

+SUPPORTED MSVC COMPILERS
+------------------------
+OpenTTD includes projects for MSVC 2003.NET and MSVC 2005.NET. Both will
+compile out of the box, providing you have the required libraries/headers;
+which ones, see below. There is no support for VS6, you are therefore
+strongly encouraged to either upgrade to MSVC 2005 Express (free) or use GCC.
+MSVC 2002 probably works as well, but it has not been tested.

-Step 1: Ingredients
-
+1) REQUIRED FILES
+-----------------
+You might already have some of the files already installed, so check before
+downloading; mostly because the DirectX SDK and Platform SDK are about
+500MB each.
 Download the following files:

-    * Openttd-useful.zip (http://sourceforge.net/project/showfiles.php?group_id=103924&amp;package_id=114307&amp;release_id=228633)
-    * DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
-    * The February 2003 Microsoft Platform SDK (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm) (newer SDK's do not work with MSVC6)
-    * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H) (maybe you not need this)
+	* openttd-useful.zip (http://sf.net/project/showfiles.php?group_id=103924&package_id=114307)
+	* DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
+	* MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
+	* afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)

 ...and of course the newest source from svn://svn.openttd.org/trunk

-You have to have a SVN-client to download the source:
+You need an SVN-client to download the source from subversion:

-    * Command line version (Subversion 1.2.3 Win32 binaries) (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
-    * GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
+	* CLI Subversion (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
+	* GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)

-Step 2: Includes and Libraries
+2) INCLUDES AND LIBRARIES
+-------------------------
+Put the newly downloaded files in the VC lib\ and include\ directories; where
+"C:\Program Files\Microsoft Visual Studio 8\VC" is your location of Visual C.
+If you are compiling for an x64 system, use the include\ and lib\ directories
+from the win64/ folder.

-Put the newly downloaded files in the VC lib and include directories (Where "C:\Program Files\Microsoft Visual Studio\VC98" is your local location of VC)
+	* openttd-useful.zip\include\*
+	* afxresh.h
+	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Include
+
+	* openttd-useful.zip\lib\*
+	to >	C:\Program Files\Microsoft Visual Studio 8\VC\Lib
+
+Custom directories might be recommended, check 2.2)


-    * zconf.h [useful.zip]
-    * zlib.h [useful.zip]
-    * png.h [useful.zip]
-    * pngconf.h [useful.zip]
-    * afxres.h
+2.1) INCLUDES AND LIBRARIES - DIRECTX/PLATFORM SDK
+--------------------------------------------------
+Basically the same procedure as with the useful zip file, providing
+you are not using the Microsoft installer. Put the include files in the
+include\ directory and the library files to the Lib\ directory.

-in
+It is recommended to use custom directories so you don't overwrite any
+default header or library files.

- C:\Program Files\Microsoft Visual Studio\VC98\Include
+2.2) CUSTOM DIRECTORIES
+-----------------------
+If you have put the above include and/or library files into custom folders,
+MSVC will not find them by default. You need to add these paths to VC through:

-and
+Tools > Options > Projects and Solutions > VC++ Directories > show directories for

-    * zlibstat.lib [useful.zip]
-    * libpng.lib [useful.zip]
+	* Include files: Add the DirectX/Platform SDK include dir you've created
+	* Library files: Add the path to the SDK custom lib dir

-in
-
- C:\Program Files\Microsoft Visual Studio\VC98\Lib
-
-
-Step 3: DirectX SDK
-
-(This should work with the latest DirectX SDK as well.)
-
-There are 2 folder in the compressed file: Include and Lib
-
-Copy all files from Include folder to
-
-C:\Program Files\Microsoft Visual Studio\VC98\Include
-
-and all files from Lib folder to
-
-C:\Program Files\Microsoft Visual Studio\VC98\Lib
-
-
-
-You can also make custom directories, which is recommended so you don't overwrite VS6 files, for libraries (.lib) and includes/header files (.h) and add it to the VC paths via:
-
-Tools -> Options -> Directories -> show directories for:
-
-a) include files (the include dir: C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\include )
-
-b) library files (the lib dir, C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\lib )
-
-NOTE: make sure that the directory for the DirectX SDK is the first one in the list, above all others, otherwise compilation will most likely fail!!
-
-Step 4: TTD Graphics files
+NOTE: make sure that the directory for the DirectX SDK is the first one in the
+list, above all others, otherwise compilation will most likely fail!!

+3) TTD GRAPHICS FILES
+---------------------
 Copy the following files from Transport Tycoon Deluxe to the data folder

-    * sample.cat
-    * trg1r.grf
-    * trgcr.grf
-    * trghr.grf
-    * trgir.grf
-    * trgtr.grf
+	* sample.cat
+	* trg1r.grf
+	* trgcr.grf
+	* trghr.grf
+	* trgir.grf
+	* trgtr.grf


-Step 5: Compiling
-
-Open trunk/openttd.dsw
-
-Build menu > Set active configuration > Select: "openttd - Win32 Release"
-
+4) COMPILING
+------------
+Open trunk/openttd[_vs80].sln
+Set the build mode to 'Release' in
+Build > Configuration manager > Active solution configuration > select "Release"
 Compile...

+If everything works well the binary should be in trunk/Release/openttd.exe

-Now it should work, it worked for me :)
+5) EDITING, CHANGING SOURCE CODE
+--------------------------------
+Set the build mode (back to) 'Debug'
+Change the startup project to openttd by right-clicking the 'openttd' project
+in the Solution Explorer and selecting 'Set as Startup Project'. The 'openttd'
+project should now show up bold instead of 'strgen'.

-From r1319 you can compile branch/map in Debug mode (by Bociusz)
+6) PROBLEMS?
+------------
+If compilation fails, double-check that you are using the latest SVN (!)
+source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
+to ask about reasons; or just wait. The problem will most likely solve itself
+within a few days as the problem is noticed and fixed.

-For compiling branch/cargo-packets you have to add cargo.c and .h to this tree's openttd.dsp
-
-If it's not working, and you checked that you using the newest SVN (!) report to Bociusz on IRC (irc://irc.freenode.net/openttd)
-
-Go ahead and make that patch! Happy Hacking! :)
-
-Originally written by Dribbel
-
-Project file updating by Bociusz
+An up-to-date version of this README can be found on the wiki:
+http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
--- a/docs/console.txt
+++ b/docs/console.txt
@@ -1,58 +0,0 @@
-OPENTTD INGAME CONSOLE DOCUMENTATION
-====================================
-http://wiki.openttd.org/index.php/OpenTTDDevBlackBook
-for detailed information
-
-*** WARNING **
- This document is out of date
-*** WARNING **
-
-HOTKEY: BACKQUOTE (aka tilde, the key left to "1")
-
-COMMANDS:
---------
-
-echo [string]
-echoc [color-code] [string]
-exit
-debug_level [0-9]
-dump_vars [filter]
-help
-list_cmds [filter]
-list_vars [filter]
-printf [formatstring] [var] [var] [var]....
-printfc [color-code] [formatstring] [var] [var] [var]....
-quit
-random
-screenshot ["big"/"no_con"]
-
-VARIABLES:
----------
-*con_developer
-> true = console debugging info
-> false = no output
-
-*developer
-> 0 = no output
-> 1 = console error output [like command not found]
-> 2 = console error and debug output
-
-*cursor_rate
-> 1-12 = defines the cursor blink interval
-
-
-VARIABLE HANDLING:
------------------
-
-developer = 0
-developer ++
-
-temp_string = test
-temp_string = "my little"
-
-printf "%s world" temp_string
-
-
---------------------------------------------------
-feel free to add more commands and use this in-game
-console for your debugging / enhancements
--- a/docs/directmusic.txt
+++ b/docs/directmusic.txt
@@ -1,20 +0,0 @@
-Notes about DirectMusic driver for Win32
----------------------------------------
-
-If compiling under MinGW32, you require the DirectX 7.0 files for MinGW32, available from
-http://alleg.sourceforge.net/files/dx70_mgw.zip.
-
-If compiling under MSVC 6.0, you require the equivalent for MSVC, available from
-http://alleg.sourceforge.net/files/dx70_min.zip. MSVC 7.0/7.1 include header files that
-are recent enough.
-
-If you do not want to compile the DirectMusic driver, undefine WIN32_ENABLE_DIRECTMUSIC_SUPPORT
-in stdafx.h.
-
-Bugs, etc
---------
-
- The volume control doesn't work properly. I'll fix this soon.
-
-Owen Rudge
-14th March 2004
--- a/docs/multiplayer.txt
+++ b/docs/multiplayer.txt
@@ -9,7 +9,7 @@ Multiplayer Manual for OpenTTD (0.3.5)
 - Type in a game name
 - Select the type of game ('LAN/Internet' or 'Internet (advertise)'. With the last one
    other people are able to see you online. Else they need your IP and port to join)
- - Click "start game" ,"load game" or "load scenario"
+ - Click "start game", "load game" or "load scenario"
 - Start playing


@@ -46,7 +46,7 @@ Multiplayer Manual for OpenTTD (0.3.5)

 - Open the console and type in the following command:

-    ]connect <ip/host>:<port>#<player-no>
+    connect <ip/host>:<port>#<player-no>


 4. Playing Internet-Games
@@ -54,7 +54,9 @@ Multiplayer Manual for OpenTTD (0.3.5)

 - Since OpenTTD 0.3.5 the network protocol has been rewritten and is very stable, even over slow connections.

- - Server with a red dot behind it have a different version then you have. You will not be able to join those servers.
+ - Servers with a red dot behind it have a different version then you have. You will not be able to join those servers.
+
+ - Servers with a yellow dot behind it have NewGRFs that you do not have. You will not be able to join those servers.

 - It can happen that a connection is that slow, or you have that many clients connected to your server, that your clients start to loose their connection. Some things you can do about it:

@@ -110,3 +112,10 @@ Multiplayer Manual for OpenTTD (0.3.5)
 - From 0.3.5, desyncs should not happen anymore

 - From 0.3.5, patch-settings are also synced. You can now play without deleting openttd.cfg, and with, for example, extra large trains enabled.
+
+7. Troubleshooting
+------------------
+
+ - My advertised server does not show up in the 'advertised server list' (servers.openttd.org)
+     Run openttd with the '-d net=2' parameter, as this will show whether it receives replies from the master server.
+     If it does not receive replies it is most likely that you need to configure your router to forward the OpenTTD ports 3979 (both TCP and UDP) to the computer that is hosting the game.
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd December 21, 2006
+.Dd February 8, 2007
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
--- a/economy.c
+++ b/economy.c
@@ -420,7 +420,8 @@ static void PlayersCheckBankrupt(Player *p)
 					p->bankrupt_timeout = 0x456;
 					break;
 				} else if (owner == _local_player) {
-					_local_player = _network_playas = PLAYER_SPECTATOR;
+					_network_playas = PLAYER_SPECTATOR;
+					SetLocalPlayer(PLAYER_SPECTATOR);
 				}

 #ifdef ENABLE_NETWORK
@@ -588,17 +589,16 @@ static void PlayersGenStatistics(void)

 	FOR_ALL_PLAYERS(p) {
 		if (p->is_active) {
-			memmove(&p->old_economy, &p->cur_economy, sizeof(p->old_economy));
+			memmove(&p->old_economy[1], &p->old_economy[0], sizeof(p->old_economy) - sizeof(p->old_economy[0]));
+			p->old_economy[0] = p->cur_economy;
 			memset(&p->cur_economy, 0, sizeof(p->cur_economy));

-			if (p->num_valid_stat_ent != 24)
-				p->num_valid_stat_ent++;
+			if (p->num_valid_stat_ent != 24) p->num_valid_stat_ent++;

 			UpdateCompanyRatingAndValue(p, true);
 			PlayersCheckBankrupt(p);

-			if (p->block_preview != 0)
-				p->block_preview--;
+			if (p->block_preview != 0) p->block_preview--;
 		}
 	}

@@ -847,6 +847,19 @@ Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode)
 	return tp;
 }

+void DeleteSubsidyWithTown(TownID index)
+{
+	Subsidy *s;
+
+	for (s = _subsidies; s != endof(_subsidies); s++) {
+		if (s->cargo_type != CT_INVALID && s->age < 12 &&
+				(((s->cargo_type == CT_PASSENGERS || s->cargo_type == CT_MAIL) && (index == s->from || index == s->to)) ||
+				((s->cargo_type == CT_GOODS || s->cargo_type == CT_FOOD) && index == s->to))) {
+			s->cargo_type = CT_INVALID;
+		}
+	}
+}
+
 void DeleteSubsidyWithIndustry(IndustryID index)
 {
 	Subsidy *s;
@@ -854,7 +867,7 @@ void DeleteSubsidyWithIndustry(IndustryID index)
 	for (s = _subsidies; s != endof(_subsidies); s++) {
 		if (s->cargo_type != CT_INVALID && s->age < 12 &&
 				s->cargo_type != CT_PASSENGERS && s->cargo_type != CT_MAIL &&
-				(index == s->from || (s->cargo_type!=CT_GOODS && s->cargo_type!=CT_FOOD && index==s->to))) {
+				(index == s->from || (s->cargo_type != CT_GOODS && s->cargo_type != CT_FOOD && index == s->to))) {
 			s->cargo_type = CT_INVALID;
 		}
 	}
@@ -1272,7 +1285,7 @@ static bool LoadWait(const Vehicle* v, const Vehicle* u)
 	FOR_ALL_VEHICLES(x) {
 		if ((x->type != VEH_Train || IsFrontEngine(x)) && // for all locs
 				u->last_station_visited == x->last_station_visited && // at the same station
-				!(x->vehstatus & VS_STOPPED) && // not stopped
+				!(x->vehstatus & (VS_STOPPED | VS_CRASHED)) && // not stopped or crashed
 				x->current_order.type == OT_LOADING && // loading
 				u != x) { // not itself
 			bool other_has_any_cargo = false;
@@ -1463,7 +1476,7 @@ int LoadUnloadVehicle(Vehicle *v, bool just_arrived)
 			feeder_profit_share = ge->feeder_profit * cargoshare / 10000;
 			v->cargo_count += cap;
 			ge->waiting_acceptance -= cap;
-			v->profit_this_year -= feeder_profit_share;
+			u->profit_this_year -= feeder_profit_share;
 			ge->feeder_profit -= feeder_profit_share;
 			unloading_time += cap;
 			st->time_since_load = 0;
--- a/economy.h
+++ b/economy.h
@@ -60,8 +60,9 @@ int UpdateCompanyRatingAndValue(Player *p, bool update);

 VARDEF Subsidy _subsidies[MAX_PLAYERS];
 Pair SetupSubsidyDecodeParam(const Subsidy* s, bool mode);
-void DeleteSubsidyWithIndustry(uint16 index);
-void DeleteSubsidyWithStation(uint16 index);
+void DeleteSubsidyWithTown(TownID index);
+void DeleteSubsidyWithIndustry(IndustryID index);
+void DeleteSubsidyWithStation(StationID index);

 int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type);
 uint MoveGoodsToStation(TileIndex tile, int w, int h, int type, uint amount);
--- a/genworld.c
+++ b/genworld.c
@@ -133,7 +133,7 @@ static void *_GenerateWorld(void *arg)
 	}

 	ResetObjectToPlace();
-	_local_player = _gw.lp;
+	SetLocalPlayer(_gw.lp);

 	SetGeneratingWorldProgress(GWP_GAME_START, 1);
 	/* Call any callback */
@@ -249,7 +249,7 @@ void GenerateWorld(int mode, uint size_x, uint size_y)
 	_gw.threaded      = true;

 	/* This disables some commands and stuff */
-	_local_player   = PLAYER_SPECTATOR;
+	SetLocalPlayer(PLAYER_SPECTATOR);
 	/* Make sure everything is done via OWNER_NONE */
 	_current_player = OWNER_NONE;

--- a/genworld_gui.c
+++ b/genworld_gui.c
@@ -43,7 +43,6 @@ typedef enum glwp_modes {
 	GLWP_END
 } glwp_modes;

-static char _edit_str_buf[LEN_RND_SEED];
 static uint _heightmap_x = 0;
 static uint _heightmap_y = 0;
 static StringID _heightmap_str = STR_NULL;
@@ -200,11 +199,22 @@ void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
 	static const StringID num_towns[]   = {STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
 	static const StringID num_inds[]    = {STR_26816_NONE, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};

+	/* Data used for the generate seed edit box */
+	static querystr_d _genseed_query;
+	static char _genseed_buffer[LEN_RND_SEED];
+
 	uint mode = w->window_number;
 	uint y;

 	switch (e->event) {
-	case WE_CREATE: LowerWindowWidget(w, _opt_newgame.landscape + 3); break;
+	case WE_CREATE:
+		LowerWindowWidget(w, _opt_newgame.landscape + 3);
+
+		snprintf(_genseed_buffer, sizeof(_genseed_buffer), "%u", _patches_newgame.generation_seed);
+		InitializeTextBuffer(&_genseed_query.text, _genseed_buffer, lengthof(_genseed_buffer), 120);
+		_genseed_query.caption = STR_NULL;
+		_genseed_query.afilter = CS_NUMERAL;
+		break;

 	case WE_PAINT:
 		/* You can't select smoothness if not terragenesis */
@@ -251,7 +261,7 @@ void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
 		}

 		DrawString( 12, 153 + y, STR_RANDOM_SEED, 0);
-		DrawEditBox(w, &WP(w, querystr_d), SEED_EDIT);
+		DrawEditBox(w, &_genseed_query, SEED_EDIT);

 		DrawString(182, 113 + y, STR_DATE, 0);
 		SetDParam(0, ConvertYMDToDate(_patches_newgame.starting_year, 0, 1));
@@ -322,8 +332,8 @@ void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
 			break;
 		case 16: // Random seed
 			_patches_newgame.generation_seed = InteractiveRandom();
-			snprintf(_edit_str_buf, lengthof(_edit_str_buf), "%u", _patches_newgame.generation_seed);
-			UpdateTextBufferSize(&WP(w, querystr_d).text);
+			snprintf(_genseed_buffer, lengthof(_genseed_buffer), "%u", _patches_newgame.generation_seed);
+			UpdateTextBufferSize(&_genseed_query.text);
 			SetWindowDirty(w);
 			break;
 		case 17: // Generate
@@ -388,17 +398,17 @@ void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
 		break;

 	case WE_MOUSELOOP:
-		HandleEditBox(w, &WP(w, querystr_d), SEED_EDIT);
+		HandleEditBox(w, &_genseed_query, SEED_EDIT);
 		break;

 	case WE_KEYPRESS:
-		HandleEditBoxKey(w, &WP(w, querystr_d), SEED_EDIT, e);
+		HandleEditBoxKey(w, &_genseed_query, SEED_EDIT, e);
 		/* the seed is unsigned, therefore atoi cannot be used.
 		 * As 2^32 - 1 (MAX_UVALUE(uint32)) is a 'magic' value
 		 * (use random seed) it should not be possible to be
 		 * entered into the input field; the generate seed
 		 * button can be used instead. */
-		_patches_newgame.generation_seed = minu(strtoul(_edit_str_buf, NULL, 10), MAX_UVALUE(uint32) - 1);
+		_patches_newgame.generation_seed = minu(strtoul(_genseed_buffer, NULL, sizeof(_genseed_buffer) - 1), MAX_UVALUE(uint32) - 1);
 		break;

 	case WE_DROPDOWN_SELECT:
@@ -506,13 +516,6 @@ static void _ShowGenerateLandscape(glwp_modes mode)
 	w = AllocateWindowDescFront((mode == GLWP_HEIGHTMAP) ? &_heightmap_load_desc : &_generate_landscape_desc, mode);

 	if (w != NULL) {
-		querystr_d *querystr = &WP(w, querystr_d);
-
-		snprintf(_edit_str_buf, lengthof(_edit_str_buf), "%u", _patches_newgame.generation_seed);
-
-		InitializeTextBuffer(&querystr->text, _edit_str_buf, lengthof(_edit_str_buf), 120);
-		querystr->caption = STR_NULL;
-		querystr->afilter = CS_NUMERAL;

 		InvalidateWindow(WC_GENERATE_LANDSCAPE, mode);
 	}
--- a/gfx.c
+++ b/gfx.c
@@ -449,6 +449,11 @@ end_of_inner_loop:
 	}
 }

+/** Draw a given string with the centre around the given x coordinates
+ * @param x Centre the string around this pixel width
+ * @param y Draw the string at this pixel height (first line's bottom)
+ * @param str String to draw
+ * @param max Maximum width the string can have before it is wrapped */
 void DrawStringMultiCenter(int x, int y, StringID str, int maxw)
 {
 	char buffer[512];
@@ -555,10 +560,10 @@ BoundingRect GetStringBoundingBox(const char *str)
 			br.width += GetCharacterWidth(size, c);
 		} else {
 			switch (c) {
-				case SCC_SETX: br.width += (byte)*++str; break;
+				case SCC_SETX: br.width += (byte)*str++; break;
 				case SCC_SETXY:
-					br.width += (byte)*++str;
-					br.height += (byte)*++str;
+					br.width += (byte)*str++;
+					br.height += (byte)*str++;
 					break;
 				case SCC_TINYFONT: size = FS_SMALL; break;
 				case SCC_BIGFONT:  size = FS_LARGE; break;
@@ -653,7 +658,7 @@ skip_cont:;
 		} else if (c == SCC_BIGFONT) { // {BIGFONT}
 			size = FS_LARGE;
 		} else {
-			printf("Unknown string command character %d\n", c);
+			DEBUG(misc, 0) ("[utf8] unknown string command character %d", c);
 		}
 	}
 }
--- a/gfxinit.c
+++ b/gfxinit.c
@@ -121,6 +121,20 @@ static bool FileMD5(const MD5File file, bool warn)
 	}
 #endif

+#if defined SECOND_DATA_DIR
+	/* If we failed to find the file in the first data directory, we will try the other one */
+
+	if (f == NULL) {
+		snprintf(buf, lengthof(buf), "%s%s", _paths.second_data_dir, file.filename);
+		f = fopen(buf, "rb");
+
+		if (f == NULL) {
+			strtolower(buf + strlen(_paths.second_data_dir) - 1);
+			f = fopen(buf, "rb");
+		}
+	}
+#endif
+
 	if (f != NULL) {
 		md5_state_t filemd5state;
 		md5_byte_t buffer[1024];
@@ -131,7 +145,7 @@ static bool FileMD5(const MD5File file, bool warn)
 		while ((len = fread(buffer, 1, sizeof(buffer), f)) != 0)
 			md5_append(&filemd5state, buffer, len);

-		if (ferror(f) && warn) fprintf(stderr, "Error Reading from %s \n", buf);
+		if (ferror(f) && warn) ShowInfoF("Error Reading from %s \n", buf);
 		fclose(f);

 		md5_finish(&filemd5state, digest);
@@ -160,11 +174,11 @@ void CheckExternalFiles(void)
 	for (i = 0; i < 3; i++) if (FileMD5(files_win.landscape[i], true)) win++;

 	if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false))
-		fprintf(stderr, "Your sample.cat file is corrupted or missing!\n");
+		ShowInfo("Your 'sample.cat' file is corrupted or missing!");

 	for (i = 0; i < lengthof(files_openttd); i++) {
 		if (!FileMD5(files_openttd[i], false)) {
-			fprintf(stderr, "Your %s file is corrupted or missing!\n", files_openttd[i].filename);
+			ShowInfoF("Your '%s' file is corrupted or missing!", files_openttd[i].filename);
 		}
 	}

--- a/graph_gui.c
+++ b/graph_gui.c
@@ -906,7 +906,7 @@ void ShowCompanyLeagueTable(void)

 static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
 {
-	static PlayerID _performance_rating_detail_player = 0;
+	static PlayerID _performance_rating_detail_player = INVALID_PLAYER;

 	switch (e->event) {
 		case WE_PAINT: {
@@ -919,6 +919,32 @@ static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
 			// Draw standard stuff
 			DrawWindowWidgets(w);

+			/* Check if the currently selected player is still active. */
+			if (_performance_rating_detail_player == INVALID_PLAYER || !GetPlayer(_performance_rating_detail_player)->is_active) {
+				if (_performance_rating_detail_player != INVALID_PLAYER) {
+					/* Raise and disable the widget for the previous selection. */
+					RaiseWindowWidget(w, _performance_rating_detail_player + 13);
+					DisableWindowWidget(w, _performance_rating_detail_player + 13);
+					SetWindowDirty(w);
+
+					_performance_rating_detail_player = INVALID_PLAYER;
+				}
+
+				for (i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
+					if (GetPlayer(i)->is_active) {
+						/* Lower the widget corresponding to this player. */
+						LowerWindowWidget(w, i + 13);
+						SetWindowDirty(w);
+
+						_performance_rating_detail_player = i;
+						break;
+					}
+				}
+			}
+
+			/* If there are no active players, don't display anything else. */
+			if (_performance_rating_detail_player == INVALID_PLAYER) break;
+
 			// Paint the player icons
 			for (i = 0; i < MAX_PLAYERS; i++) {
 				if (!GetPlayer(i)->is_active) {
@@ -926,16 +952,11 @@ static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
 					if (!IsWindowWidgetDisabled(w, i + 13)) {
 						// Bah, player gone :(
 						DisableWindowWidget(w, i + 13);
-						// Is this player selected? If so, select first player (always save? :s)
-						if (IsWindowWidgetLowered(w, i + 13)) {
-							RaiseWindowWidget(w, i + 13);
-							LowerWindowWidget(w, 13);
-							_performance_rating_detail_player = 0;
-						}
+
 						// We need a repaint
 						SetWindowDirty(w);
 					}
-				continue;
+					continue;
 				}

 				// Check if we have the player marked as inactive
@@ -1054,8 +1075,7 @@ static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
 			w->custom[0] = DAY_TICKS;
 			w->custom[1] = 5;

-			_performance_rating_detail_player = 0;
-			LowerWindowWidget(w, _performance_rating_detail_player + 13);
+			if (_performance_rating_detail_player != INVALID_PLAYER) LowerWindowWidget(w, _performance_rating_detail_player + 13);
 			SetWindowDirty(w);

 			break;
--- a/heightmap.c
+++ b/heightmap.c
@@ -225,6 +225,9 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
 	BmpData data;
 	BmpBuffer buffer;

+	// Init BmpData
+	memset(&data, 0, sizeof(data));
+
 	f = fopen(filename, "rb");
 	if (f == NULL) {
 		ShowErrorMessage(STR_PNGMAP_ERR_FILE_NOT_FOUND, STR_BMPMAP_ERROR, 0, 0);
@@ -300,11 +303,11 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map)
 	if ((img_width * num_div) / img_height > ((width * num_div) / height)) {
 		/* Image is wider than map - center vertically */
 		img_scale = (width * num_div) / img_width;
-		row_pad = (height - ((img_height * img_scale) / num_div)) / 2;
+		row_pad = (1 + height - ((img_height * img_scale) / num_div)) / 2;
 	} else {
 		/* Image is taller than map - center horizontally */
 		img_scale = (height * num_div) / img_height;
-		col_pad = (width - ((img_width * img_scale) / num_div)) / 2;
+		col_pad = (1 + width - ((img_width * img_scale) / num_div)) / 2;
 	}

 	/* Form the landscape */
@@ -318,8 +321,8 @@ static void GrayscaleToMapHeights(uint img_width, uint img_height, byte *map)

 			/* Check if current tile is within the 1-pixel map edge or padding regions */
 			if ((DistanceFromEdge(tile) <= 1) ||
-					(row < row_pad) || (row >= (height - row_pad)) ||
-					(col < col_pad) || (col >= (width - col_pad))) {
+					(row < row_pad) || (row >= (height - row_pad - 1)) ||
+					(col < col_pad) || (col >= (width  - col_pad - 1))) {
 				SetTileHeight(tile, 0);
 			} else {
 				/* Use nearest neighbor resizing to scale map data.
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -19,30 +19,49 @@ Bugs for 0.5.0
 ------------------------------------------------------------------------
 URL: http://bugs.openttd.org

-456	'Fullload' switches between 'stop'/'service' at depot
-455	Converting to monorail behaves badly
-454	Problem with goods transfer income
+-601	airports can't get flooded when they have planes in them
+-599	reloaded game lost company passwords
+-596	Cloning Maglev in UKRS forgets Mail refit
+-595	Sort by max cargo rating does not sort correctly
+-594	terraforming wipes out canals
+-591	Autorenew fails under certain conditions
+-585	Huge losses with transfer
+-583	Fatal fault or crash during startup
+-578	No loading at my industrial centre
+-574	Open TTD overiding Power Warnings
+-571	Problems with vehicle purchase lists with NewGRFs
+-569	'Game Load Failed' when trying to open scenarios
+-559	Front-/Rear-facing engines don't line up with each other
+-553	Autorenew doesn't warn when replacement isn't available
+-546	[0.5.0 RC3] Inflation overflow
+-542	Assertion with Vehicle list
+-540	Planes vanished when offered exclusive
+-539	Trains can cash the same cargo multiple times
+-529	newairport's sprite issue
+-524	OSX sometimes (not always) fails to find free disk space
+-522	overflow on vehicle costs
+-519	Bridge building results in 'missing' pieces
+-508	Destroying trees and replanting => raised rating
+-502	OSX can incorrectly print "dbg: [sl] Cannot open savegame 'data/opntitle.dat' for saving/loading."
+-501	Mouse pointer gets hidden, when draging out of window and back again. Only affects Wacom etc.
+-494	Get free money abusing a stock bug
+-489	[0.5.0rc1] Sound choppy on Vista
+-474	Overtaking car doesn't hit the against-riding car.
+-459	Merging is buggy
+-458	Crash when changing Resolution on Mac OS X (x86)
 -450	GUI selecting disabled numbers (newstations)
-445	unable to open previously saved game in r7425
-444	Compile issues (networking) on Sun and SGI platforms
 -442	Alt-tab behaviour flawed whilst full screen (win32)
-441	Low	Transparent stuff
+-441	Transparent stuff
 -435	Assertion window doesn't show when in fullscreen on Mac OS X
-432	Assertion failed: AircraftController in aircraft_cmd.c (line 771)
 -431	failure to autorenew (core/GUI desync)
 -423	Improved loading causes high CPU use with long trains
-415	Multiplayer Desync Error... (More)
 -410	Openttd in dedicated mode don't run without data files
 -404	Cargo never delivered to station after bribe and before first pickup
-391	Smth stange with train depots
-390	Multiplayer Desync Error...
-379	Integer overflow with huge cities
 -365	Blimp Stuck at airport
 -362	Changing signal type affects whole square
 -357	CPU spikes in game
 -355	graphics bugs with trains - water, tunnels
 -354	Maglev Trains faster than All Planes
-344	Nightly builds crash on Mac OS X PPC
 -339	Crash in Quicktime when exiting game
 -299	disable 90 deg turns patch - AI builds 90 deg turns
 -290	NPF - no path to depot from tunnel
@@ -51,13 +70,10 @@ URL: http://bugs.openttd.org
 -265	Subsidy awarded detection bug
 -259	AIs start unnamed companies that do nothing
 -216	AI build train vans one van less
-210	Incorrect semaphor beaviour
 -202	2 Locomotives in 1 Train - Selling one results in Age of the other one Being 0
-195	Cannot delete train
 -193	Inconsistent directory usage on Mac OS X
 -165	vehicle length not taken into account
 -163	Cargo: Station destroyed / High payment
-158	Crash with !v->type == VEH_Ship error
 -153	Language crash with app renaming OSX
 -119	Clipping problems with vehicles on slopes
 -115	inactive logins do not get auto kicked
@@ -69,35 +85,25 @@ URL: http://bugs.openttd.org
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse

-1616411	Game very slow when Xorg color depth is different than 8bpp
 -1573339	0.4.8.dmg Crash with intel 64bit
 -1460218	0.4.7 normal industry bug (non_smooth)
 -1459262	Towns building too many roads way too long now
 -1458995	Another bug with smooth_economy
-1436419	Vehicles profits gone negative.......bug
-1427531	Newspapers problem
-1417453	Makefile and Variables issue
-1397638	Economics bug?
 -1393415	NPF & one-way sigs
-1389986	Shares problem (nightly 3330)
 -1244842	Multiplayer interface bug (0.4.0.1)
 -1212267	station visited twice when servicing
 -1208170	Duplicate station names can be created
-1197116	Some stations are cargo-less
 -1116638	"More, but smaller changes" deficiency
 -1106356	re-offered prototypes
-1085486	Subsidies: Only count when station is in right suburb

 Minor Bugs for 0.5.0
 ------------------------------------------------------------------------
 URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse

-1488896	enable higher resolutions
 -1461629	[r4180]Subsidy calculated wrong
 -1412031	fast forward scrolling is also fast forward :)
 -1387424	overtake insolvent company is to cheap
 -1382782	Loan interest calculated 'wrong'
-1236320	Bug in main menu allows moving screen
 -1201284	permanent hilight in a depot
 -1185852	Scrollbars get arbitrarily small
 -1184634	Replace vehicles window bug
@@ -108,9 +114,8 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 -1084620	Minor bug considering buses/trucks
 -1034310	color mauve in diagrams
 -1030661	It's possible to build a tunnel under oil wells
-0993516	Canal + bouy -> wrong graphics.
-0987891	Large UFO destruction bug
-0987883	Aircraft landing/taking off
-0987880	company league table updating
-0985924	aircraft taxi speed
-0941694	Clipping problems stations/vehicles on slopes
+- 993516	Canal + bouy -> wrong graphics.
+- 987891	Large UFO destruction bug
+- 987883	Aircraft landing/taking off
+- 987880	company league table updating
+- 985924	aircraft taxi speed
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -1,6 +1,6 @@
 ##name American
 ##ownname English (US)
-##isocode en_US.UTF-8
+##isocode en_US
 ##plural 0

 ##id 0x0000
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Map - {S
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Game Options
 STR_00B2_MESSAGE                                                :{YELLOW}Message
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message from {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Caution!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Can't do this....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Can't clear this area....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
 STR_00B7_VERSION                                                :{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 The OpenTTD team
 STR_TRANSLATED_BY                                               :{BLACK}  Translator(s) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -294,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}New Game
 STR_0141_LOAD_GAME                                              :{BLACK}Load Game
 STR_SINGLE_PLAYER                                               :{BLACK}Single player
 STR_MULTIPLAYER                                                 :{BLACK}Multiplayer
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenario Editor

 STR_64                                                          :64
 STR_128                                                         :128
@@ -342,7 +344,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³lbf
 STR_UNITS_FORCE_METRIC                                          :{COMMA} tonne force
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Operating profit graph
 STR_0155_INCOME_GRAPH                                           :Income graph
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Delivered cargo graph
@@ -351,7 +353,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Company value g
 STR_0159_CARGO_PAYMENT_RATES                                    :Cargo payment rates
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Company league table
 STR_PERFORMANCE_DETAIL_MENU                                     :Detailed performance rating
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Save game
@@ -393,6 +395,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Cargo Capacity
 STR_NO_WAITING_CARGO                                            :{BLACK}No cargo of any type is waiting
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Select all facilities
 STR_SELECT_ALL_TYPES                                            :{BLACK}Select all cargo types (including no waiting cargo)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Available Trains
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Available Road Vehicles
+STR_AVAILABLE_SHIPS                                             :{BLACK}Available Ships
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Available Aircraft
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}See a list of available engine designs for this vehicle type.
 STR_MANAGE_LIST                                                 :{BLACK}Manage list
 STR_MANAGE_LIST_TIP                                             :{BLACK}Send instructions to all vehicles in this list
@@ -488,7 +494,7 @@ STR_01A9_NONE                                                   :None
 STR_01AA_NAME                                                   :{BLACK}Name
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

-############ range for days	starts
+############ range for days starts
 STR_01AC_1ST                                                    :1st
 STR_01AD_2ND                                                    :2nd
 STR_01AE_3RD                                                    :3rd
@@ -520,7 +526,7 @@ STR_01C7_28TH                                                   :28th
 STR_01C8_29TH                                                   :29th
 STR_01C9_30TH                                                   :30th
 STR_01CA_31ST                                                   :31st
-############ range for days	ends
+############ range for days ends

 STR_01CB                                                        :{TINYFONT}{COMMA}

@@ -608,22 +614,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} achieves '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} of {COMPANY} achieves '{STRING}' status!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Create Scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario Editor
 STR_0223_LAND_GENERATION                                        :{WHITE}Land Generation
 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_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generate random land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reset landscape
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Reset Landscape
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Use Heightmap
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Use Heightmap
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Are you sure you want to reset the landscape?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landscape generation
 STR_022F_TOWN_GENERATION                                        :{BLACK}Town generation
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industry generation
@@ -765,7 +765,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Vehicle
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Save customized vehicle design names

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Game options
 STR_02C5_DIFFICULTY_SETTINGS                                    :Difficulty settings
 STR_02C7_CONFIG_PATCHES                                         :Configure patches
@@ -779,16 +779,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Full a
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Full detail
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Transparent buildings
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Transparent station signs
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Land area information
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Toggle Console
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Giant Screenshot (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :About 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Off
 STR_02DA_ON                                                     :{BLACK}On
@@ -845,7 +845,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Select '
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Select 'toyland' landscape style
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Fund construction of new industry

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industry Directory
 STR_0313_FUND_NEW_INDUSTRY                                      :Fund new industry
 ############ range ends here
@@ -891,7 +891,7 @@ STR_TOWNNAME_DANISH                                             :Danish
 STR_TOWNNAME_TURKISH                                            :Turkish
 STR_TOWNNAME_ITALIAN                                            :Italian
 STR_TOWNNAME_CATALAN                                            :Catalan
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pounds (£)
 STR_CURR_USD                                                    :Dollars ($)
@@ -1308,6 +1308,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Passwor
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER FULL
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSION MISMATCH
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MISMATCH

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Join game

@@ -1412,6 +1413,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Client L
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} No network devices found or compiled without ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Could not find any network games
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} The server didn't answer the request
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Could not connect due to NewGRF mismatch
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Network-Game synchronization failed.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Network-Game connection lost.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Could not load server-savegame.
@@ -1433,6 +1435,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync error
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :could not load map
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connection lost
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protocol error
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF mismatch
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :not authorized
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :received strange packet
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :wrong revision
@@ -1853,11 +1856,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Bubble Generato
 STR_4825_TOFFEE_QUARRY                                          :Toffee Quarry
 STR_4826_SUGAR_MINE                                             :Sugar Mine

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Requires: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Requires: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Requires: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transported)
@@ -1930,8 +1933,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Can't pu
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...you already own it!


-############ 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                                                  :Unnamed
@@ -1974,7 +1977,7 @@ STR_SV_STNAME_LOWER                                             :Lower {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} Forest

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Difficulty Level
@@ -2888,6 +2891,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}There ar
 STR_NEWGRF_FILENAME                                             :{BLACK}Filename: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}You are about to make changes to a running game; this can crash OpenTTD.{}Are you absolutely sure about this?

 STR_NEWGRF_ADD                                                  :{BLACK}Add
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Add a NewGRF file to the list
@@ -2911,6 +2915,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Cannot a

 STR_NEWGRF_NOT_FOUND                                            :{RED}Matching file not found
 STR_NEWGRF_DISABLED                                             :{RED}Disabled
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Matching file not found (compatible GRF loaded)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Compatible GRF(s) loaded for missing files
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missing GRF file(s) have been disabled
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Missing GRF file(s) to be able to load game

 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
--- a/lang/bulgarian.txt
+++ b/lang/bulgarian.txt
@@ -1,7 +1,9 @@
 ##name Bulgarian
 ##ownname Български
-##isocode bg_BG.UTF-8
+##isocode bg_BG
 ##plural 0
+##case accusative dative vocative nominative instrumental locative genitive
+##gender мъжки женски среден

 ##id 0x0000
 STR_NULL                                                        :
@@ -154,11 +156,12 @@ STR_00B0_MAP                                                    :{WHITE}Карт
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Настройки
 STR_00B2_MESSAGE                                                :{YELLOW}Съобщение
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Съобщение от {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Внимание!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Това е невъзможно....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Изчистването е невъзможно....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Авторски права {COPYRIGHT} 1995 Крис Сойер (Chris Sawyer), Всички права са запазени
 STR_00B7_VERSION                                                :{BLACK}OpenTTD версия {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 The OpenTTD team
 STR_TRANSLATED_BY                                               :{BLACK}  Преводач(и) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -286,8 +289,10 @@ STR_013D_INFORMATION                                            :{BLACK}Инфо
 STR_013E_CAPACITIES                                             :{BLACK}Вместимости
 STR_013E_TOTAL_CARGO                                            :{BLACK}Общо товар
 STR_013F_CAPACITY                                               :{BLACK}Вместимост: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT                                               :{BLACK}Капацитет: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Обща товарна вместимост на влака:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Нова игра
 STR_0141_LOAD_GAME                                              :{BLACK}Отвори игра
 STR_SINGLE_PLAYER                                               :{BLACK}Сам играч
@@ -308,39 +313,39 @@ STR_0151_MAP_OF_WORLD                                           :Карта на
 STR_0152_TOWN_DIRECTORY                                         :Списък с градове
 STR_0153_SUBSIDIES                                              :Субсидии

-STR_UNITS_IMPERIAL                                              :Английска
-STR_UNITS_METRIC                                                :Метрическа
-STR_UNITS_SI                                                    :СИ
+STR_UNITS_IMPERIAL                                              :имперска
+STR_UNITS_METRIC                                                :метрична
+STR_UNITS_SI                                                    :международна (SI)

-STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} мили/ч
+STR_UNITS_VELOCITY_IMPERIAL                                     :{COMMA} м/ч
 STR_UNITS_VELOCITY_METRIC                                       :{COMMA} км/ч
-STR_UNITS_VELOCITY_SI                                           :{COMMA} m/s
+STR_UNITS_VELOCITY_SI                                           :{COMMA} м/с

 STR_UNITS_POWER_IMPERIAL                                        :{COMMA}к.с.
 STR_UNITS_POWER_METRIC                                          :{COMMA}кс
-STR_UNITS_POWER_SI                                              :{COMMA}кв
+STR_UNITS_POWER_SI                                              :{COMMA}kW

 STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}т.
 STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}т.
 STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}кг.

-STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} тон{P "" ове}
-STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} тон{P "" ове}
+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} тон{P "" а}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} тон{P "" а}
 STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} кг

-STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}галон
+STR_UNITS_VOLUME_SHORT_IMPERIAL                                 :{COMMA}гал.
 STR_UNITS_VOLUME_SHORT_METRIC                                   :{COMMA}л.
-STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}куб. м.
+STR_UNITS_VOLUME_SHORT_SI                                       :{COMMA}м³

 STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} галон{P "" а}
-STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} литър{P "" и}
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} лит{P ър ри}
 STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} куб. м.

-STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lbf
-STR_UNITS_FORCE_METRIC                                          :{COMMA} тон сила
+STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ фунта
+STR_UNITS_FORCE_METRIC                                          :{COMMA} тон{P "" а}
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Графика на капитала
 STR_0155_INCOME_GRAPH                                           :Графика на приходите
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Графика на доставките
@@ -349,7 +354,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Стойнос
 STR_0159_CARGO_PAYMENT_RATES                                    :Тарифи за доставка на стоки
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Класиране на компаниите
 STR_PERFORMANCE_DETAIL_MENU                                     :Рейтинг на представянето в детайли
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Относно OpenTTD
 STR_015C_SAVE_GAME                                              :Запази игра
@@ -391,7 +396,19 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Товарен
 STR_NO_WAITING_CARGO                                            :{BLACK}Няма чакащ товар
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Избор на всички съоръжения
 STR_SELECT_ALL_TYPES                                            :{BLACK}Избор на всички товари (включително нечакащите)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Налични влакове
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Налични коли
+STR_AVAILABLE_SHIPS                                             :{BLACK}Налични кораби
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Налични самолети
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Виж списъкът с наличните видове машини за този тип превозно средство.
+STR_MANAGE_LIST                                                 :{BLACK}Направи списък
+STR_MANAGE_LIST_TIP                                             :{BLACK}Прати инструкциите до всички машини в този лист
 STR_REPLACE_VEHICLES                                            :Замяна на превозни средства
+STR_SEND_TRAIN_TO_DEPOT                                         :Прати в депото
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Прати в сервиза
+STR_SEND_SHIP_TO_DEPOT                                          :Прати в дока
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Прати в хангара
+STR_SEND_FOR_SERVICING                                          :Прати за обслужване

 ############ range for months starts
 STR_0162_JAN                                                    :Ян
@@ -478,7 +495,7 @@ STR_01A9_NONE                                                   :Нищо
 STR_01AA_NAME                                                   :{BLACK}Име
 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-ти
@@ -510,7 +527,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}

@@ -598,22 +615,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} достигна статус '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} от {COMPANY} достигна статус '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Създай сценарий
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Редактор на сценарии
 STR_0223_LAND_GENERATION                                        :{WHITE}Генератор на терен
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Случаен терен
-STR_0227_RESET_LAND                                             :{BLACK}Изчисти терена
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Увеличи площа на терена, за да го понижиш/повишиш
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Намали площа на терена, за да го понижиш/повишиш
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Генерирай случаен терен
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Изчисти терена
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Изчисти терена
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Използване на височинна карта
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Използване на височинна карта
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Желаете ли да изчистите терена?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Създаване на терен
 STR_022F_TOWN_GENERATION                                        :{BLACK}Създаване на град
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Създаване на индустрия
@@ -715,13 +726,13 @@ STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Пост
 STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Избери пустинен терен.{}Задръж CTRL за да го премахнеш.
 STR_CREATE_LAKE                                                 :{BLACK}Посочване на водна зона.{}Ще наводни съседните ако са на морското ниво
 STR_0290_DELETE                                                 :{BLACK}Изтрий
-STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Премахни този град
-STR_0292_SAVE_SCENARIO                                          :
+STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Премахни напълно града
+STR_0292_SAVE_SCENARIO                                          :Запис на сценарий
 STR_0293_LOAD_SCENARIO                                          :Зареждане на сценарий
 STR_0294_QUIT_EDITOR                                            :Изход от редактора
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Изход
-STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Запис и зареждане на сценарий, затваряне редактора, изход
+STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Запис, зареждане на сценарий, затваряне на редактора, изход
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Зареждане на сценарии
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Запис на сценарии
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Играене на сценарий
@@ -755,7 +766,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Избо
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Запис на имена на превозни средства

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Игрови опции
 STR_02C5_DIFFICULTY_SETTINGS                                    :Опции за трудност
 STR_02C7_CONFIG_PATCHES                                         :Конфигурирай патчове
@@ -769,25 +780,25 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Пъл
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Пълни подробности
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Прозрачни сгради
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Прозрачни табели на станциите
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Информация за терена
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Показване/скриване на конзола
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Огромен Screenshot (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :За 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Изключен
 STR_02DA_ON                                                     :{BLACK}Включен
-STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}
-STR_02DD_SUBSIDIES                                              :
-STR_02DE_MAP_OF_WORLD                                           :
+STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Покажи субсидиите
+STR_02DD_SUBSIDIES                                              :Субсидии
+STR_02DE_MAP_OF_WORLD                                           :Карта на света
 STR_EXTRA_VIEW_PORT                                             :Допълнителна камера
 STR_SIGN_LIST                                                   :Списък с табели
-STR_02DF_TOWN_DIRECTORY                                         :
+STR_02DF_TOWN_DIRECTORY                                         :Списък със селищата
 STR_TOWN_POPULATION                                             :{BLACK}Световна популация: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Камера {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Преместване на камерата
@@ -795,26 +806,26 @@ STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Прем
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Преместване глобалната камера
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Преместване глобалната камера до тази

-STR_02E0_CURRENCY_UNITS                                         :{BLACK}Валутна единица
+STR_02E0_CURRENCY_UNITS                                         :{BLACK}Парична единица
 STR_02E1                                                        :{BLACK}{SKIP}{STRING}
-STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Избиране на валутна единица
+STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Избор на парична единица
 STR_MEASURING_UNITS                                             :{BLACK}Мерни единици
 STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
 STR_MEASURING_UNITS_SELECTION                                   :{BLACK}Избор на мерни единици
-STR_02E6_ROAD_VEHICLES                                          :{BLACK}Пътни превозни средства
+STR_02E6_ROAD_VEHICLES                                          :{BLACK}Движение по пътищата
 STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Избери посока на движение по пътищата
-STR_02E9_DRIVE_ON_LEFT                                          :Ляво движение
-STR_02EA_DRIVE_ON_RIGHT                                         :Дясно движение
+STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Избор посоката на движение по пътищата
+STR_02E9_DRIVE_ON_LEFT                                          :ляво
+STR_02EA_DRIVE_ON_RIGHT                                         :дясно
 STR_02EB_TOWN_NAMES                                             :{BLACK}Имена на градовете
 STR_02EC                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Избери стила на имената на градовете
+STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Избор стила на имената на градовете

-STR_02F4_AUTOSAVE                                               :{BLACK}Автозапазване
+STR_02F4_AUTOSAVE                                               :{BLACK}Автозаписване
 STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Избери интервала между две автозапазвания
-STR_02F7_OFF                                                    :Изключено
-STR_02F8_EVERY_3_MONTHS                                         :На всеки 3 месеца
+STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Интервала между две автозаписваня
+STR_02F7_OFF                                                    :изключено
+STR_02F8_EVERY_3_MONTHS                                         :на всеки 3 месеца
 STR_02F9_EVERY_6_MONTHS                                         :На всеки 6 месеца
 STR_02FA_EVERY_12_MONTHS                                        :На всеки 12 месеца
 STR_02FB_START_A_NEW_GAME                                       :{BLACK}Започни нова игра
@@ -835,7 +846,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Избе
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Избери "играчков" тип на картата
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Инвестирай в нова индустрия

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Списък на индустриите
 STR_0313_FUND_NEW_INDUSTRY                                      :Инвестирай в нова индустрия
 ############ range ends here
@@ -860,58 +871,58 @@ STR_0335_6                                                      :{BLACK}6
 STR_0336_7                                                      :{BLACK}7

 ############ start of townname region
-STR_TOWNNAME_ORIGINAL_ENGLISH                                   :Английски
-STR_TOWNNAME_FRENCH                                             :Френски
-STR_TOWNNAME_GERMAN                                             :Германски
-STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :Английски (допълнителни)
-STR_TOWNNAME_LATIN_AMERICAN                                     :Латиноамерикански
-STR_TOWNNAME_SILLY                                              :Глупави
-STR_TOWNNAME_SWEDISH                                            :Шведски
-STR_TOWNNAME_DUTCH                                              :Холандски
-STR_TOWNNAME_FINNISH                                            :Финландски
-STR_TOWNNAME_POLISH                                             :Полски
-STR_TOWNNAME_SLOVAKISH                                          :Словашки
-STR_TOWNNAME_NORWEGIAN                                          :Норвежки
-STR_TOWNNAME_HUNGARIAN                                          :Унгарски
-STR_TOWNNAME_AUSTRIAN                                           :Австрийски
-STR_TOWNNAME_ROMANIAN                                           :Румънски
-STR_TOWNNAME_CZECH                                              :Чешки
-STR_TOWNNAME_SWISS                                              :Швейцарски
-STR_TOWNNAME_DANISH                                             :Датски
-STR_TOWNNAME_TURKISH                                            :Турски
-STR_TOWNNAME_ITALIAN                                            :Италиански
-STR_TOWNNAME_CATALAN                                            :Каталонски
-############ end of	townname region
+STR_TOWNNAME_ORIGINAL_ENGLISH                                   :английски (оригинални)
+STR_TOWNNAME_FRENCH                                             :френски
+STR_TOWNNAME_GERMAN                                             :германски
+STR_TOWNNAME_ADDITIONAL_ENGLISH                                 :английски (допълнителни)
+STR_TOWNNAME_LATIN_AMERICAN                                     :латиноамерикански
+STR_TOWNNAME_SILLY                                              :глупави
+STR_TOWNNAME_SWEDISH                                            :шведски
+STR_TOWNNAME_DUTCH                                              :холандски
+STR_TOWNNAME_FINNISH                                            :финландски
+STR_TOWNNAME_POLISH                                             :полски
+STR_TOWNNAME_SLOVAKISH                                          :словашки
+STR_TOWNNAME_NORWEGIAN                                          :норвежки
+STR_TOWNNAME_HUNGARIAN                                          :унгарски
+STR_TOWNNAME_AUSTRIAN                                           :австрийски
+STR_TOWNNAME_ROMANIAN                                           :румънски
+STR_TOWNNAME_CZECH                                              :чешки
+STR_TOWNNAME_SWISS                                              :швейцарски
+STR_TOWNNAME_DANISH                                             :датски
+STR_TOWNNAME_TURKISH                                            :турски
+STR_TOWNNAME_ITALIAN                                            :италиански
+STR_TOWNNAME_CATALAN                                            :каталонски
+############ end of townname region

-STR_CURR_GBP                                                    :Паунд (£)
-STR_CURR_USD                                                    :Долар ($)
-STR_CURR_EUR                                                    :Евро (€)
-STR_CURR_YEN                                                    :Йена (¥)
-STR_CURR_ATS                                                    :Австрийски шилинг (ATS)
-STR_CURR_BEF                                                    :Белгийски франк (BEF)
-STR_CURR_CHF                                                    :Швейцарски франк (CHF)
-STR_CURR_CZK                                                    :Чешка крона (CZK)
-STR_CURR_DEM                                                    :Немска марка (DEM)
-STR_CURR_DKK                                                    :Данска крона (DKK)
-STR_CURR_ESP                                                    :Песета (ESP)
-STR_CURR_FIM                                                    :Финландска марка
-STR_CURR_FRF                                                    :Франк (FRF)
-STR_CURR_GRD                                                    :Гръцка драхма (GRD)
-STR_CURR_HUF                                                    :Унгарски форинт (HUF)
-STR_CURR_ISK                                                    :Исландска крона (ISK)
-STR_CURR_ITL                                                    :Италианска лира (ITL)
-STR_CURR_NLG                                                    :Немски гилдер (NLG)
-STR_CURR_NOK                                                    :Норвежка крона (NOK)
-STR_CURR_PLN                                                    :Полска злота (PLN)
-STR_CURR_ROL                                                    :Ромънска лея (ROL)
-STR_CURR_RUR                                                    :Руска рубла (RUR)
-STR_CURR_SIT                                                    :Словенски толар (SIT)
-STR_CURR_SEK                                                    :Шведска крона (SEK)
-STR_CURR_YTL                                                    :Турска лира (YTL)
-STR_CURR_SKK                                                    :Словашка коруна (SKK)
-STR_CURR_BRR                                                    :Бразилски реал (BRL)
+STR_CURR_GBP                                                    :британска лира (£)
+STR_CURR_USD                                                    :долар ($)
+STR_CURR_EUR                                                    :евро (€)
+STR_CURR_YEN                                                    :йена (¥)
+STR_CURR_ATS                                                    :австрийски шилинг (ATS)
+STR_CURR_BEF                                                    :белгийски франк (BEF)
+STR_CURR_CHF                                                    :швейцарски франк (CHF)
+STR_CURR_CZK                                                    :чешка крона (CZK)
+STR_CURR_DEM                                                    :германска марка (DEM)
+STR_CURR_DKK                                                    :датска крона (DKK)
+STR_CURR_ESP                                                    :песета (ESP)
+STR_CURR_FIM                                                    :финландска марка (FIM)
+STR_CURR_FRF                                                    :френски франк (FRF)
+STR_CURR_GRD                                                    :гръцка драхма (GRD)
+STR_CURR_HUF                                                    :унгарски форинт (HUF)
+STR_CURR_ISK                                                    :исландска крона (ISK)
+STR_CURR_ITL                                                    :италианска лира (ITL)
+STR_CURR_NLG                                                    :холандски гулден (NLG)
+STR_CURR_NOK                                                    :норвежка крона (NOK)
+STR_CURR_PLN                                                    :полска злота (PLN)
+STR_CURR_ROL                                                    :румънска лея (ROL)
+STR_CURR_RUR                                                    :руска рубла (RUR)
+STR_CURR_SIT                                                    :словенски толар (SIT)
+STR_CURR_SEK                                                    :шведска крона (SEK)
+STR_CURR_YTL                                                    :турска лира (YTL)
+STR_CURR_SKK                                                    :словашка крона (SKK)
+STR_CURR_BRR                                                    :бразилски реал (BRL)

-STR_CURR_CUSTOM                                                 :Поръчкова...
+STR_CURR_CUSTOM                                                 :Друга...

 STR_OPTIONS_LANG                                                :{BLACK}Език
 STR_OPTIONS_LANG_CBO                                            :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
@@ -994,7 +1005,7 @@ STR_SHIP_AUTORENEW_FAILED                                       :{WHITE}Авто
 STR_AIRCRAFT_AUTORENEW_FAILED                                   :{WHITE}Автообновяването на самолет е неуспешно {COMMA} (ограничени средства)
 STR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                            :{WHITE}Влак {COMMA} е прекалено дълъг след замяната

-STR_CONFIG_PATCHES                                              :{BLACK}Конфигурация на кръпки
+STR_CONFIG_PATCHES                                              :{BLACK}Настройка на кръпки
 STR_CONFIG_PATCHES_TIP                                          :{BLACK}Настройки на кръпките
 STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Настройка на кръпките

@@ -1010,6 +1021,7 @@ STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Заб
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Обединяване на гари построени една до друга: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Напускане на станцията когато някой товар е пълен, при 'пълно зареждане': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Подобрен алгоритъм за зареждане: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Постепенно зареждане на автомобилите: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Инфлация: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Доставяне на стока до станция само ако има търсене: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Строене на много дълги мостове: {ORANGE}{STRING}
@@ -1026,6 +1038,7 @@ STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Пре
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Подкупване на местната власт: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Нестандартни станции: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Нов глобален навигатор (NPF, отменя NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Теглови множител към товарите за симулация на тежки влакове: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Малки летища са винаги разрешени: {ORANGE}{STRING}

@@ -1047,7 +1060,7 @@ STR_CONFIG_PATCHES_LAND_GENERATOR                               :{LTBLUE}Ген
 STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Оригинал
 STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :ТераГенезис
 STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE                        :{LTBLUE}Максимално разстояние на нефтените рафинерии от краищата на картата {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Височина на снежната ивица: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Снежната ивица: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN                         :{LTBLUE}Ръбавост на терен (само за TerraGenesis) : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Много гладък
 STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Гладен
@@ -1101,11 +1114,11 @@ STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Без
 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Цветни нови се появяват през: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Начална година: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Край на играта през: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Плавна икономика (повече, по-малки промени)
+STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Плавна икономика (повече и по-малки промени)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Позволяване покупката на акции от други компании
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}При влачене, поставяне на семафори всеки: {ORANGE}{STRING} плочка(и)
 STR_CONFIG_PATCHES_TOOLBAR_POS                                  :{LTBLUE}Позиция на лента за инструменти: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Лево
+STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Ляво
 STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Център
 STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Дясно
 STR_CONFIG_PATCHES_SNAP_RADIUS                                  :{LTBLUE}Прилепване на прозорците: {ORANGE}{STRING} px
@@ -1128,7 +1141,7 @@ STR_CONFIG_PATCHES_YAPF_SHIPS                                   :{LTBLUE}YAPF з
 STR_CONFIG_PATCHES_YAPF_ROAD                                    :{LTBLUE}YAPF за автомобили: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_YAPF_RAIL                                    :{LTBLUE}YAPF за влакове: {ORANGE}{STRING}

-STR_TEMPERATE_LANDSCAPE                                         :Умерен климат
+STR_TEMPERATE_LANDSCAPE                                         :умерен климат
 STR_SUB_ARCTIC_LANDSCAPE                                        :Арктичен климат
 STR_SUB_TROPICAL_LANDSCAPE                                      :Тропически климат
 STR_TOYLAND_LANDSCAPE                                           :Земята на играчките
@@ -1296,6 +1309,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Защ
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}ИЗКЛЮЧЕН СЪРВЪР
 STR_NETWORK_SERVER_FULL                                         :{SILVER}ПЪЛЕН СЪРВЪР
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ГРЕШНА ВЕРСИЯ
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF БЪРКОТИЯ

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Присъединяване към игра

@@ -1400,8 +1414,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Спис
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Не са открити мрежови устройства или е компилирано без ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Не може да открия мрежови игри
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Сървърът не отговори на заявката
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Network-Game synchronisation failed
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Network-Game connection lost
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Не може да се свърже поради различие в NewGRF
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Не може да зареди играта
 STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Сървъра не може да бъде стартиран
 STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Не може да се свърже
@@ -1421,6 +1434,7 @@ 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_NEWGRF_MISMATCH                          :NewGRF се различават
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :не оторизиран
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :получен странен пакет
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :грешна ревизия
@@ -1841,11 +1855,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Генерат
 STR_4825_TOFFEE_QUARRY                                          :Карамелоломна
 STR_4826_SUGAR_MINE                                             :Захарна мина

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Нуждае се от: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Нуждае се от: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Нуждае се от: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Произведено миналия месец:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% превозено)
@@ -1911,15 +1925,15 @@ STR_5028_TUBULAR_ROAD_BRIDGE                                    :Тръбови
 STR_5800_OBJECT_IN_THE_WAY                                      :{WHITE}Обект на пътя
 STR_5801_TRANSMITTER                                            :Предавател
 STR_5802_LIGHTHOUSE                                             :Фар
-STR_5803_COMPANY_HEADQUARTERS                                   :Централен офис
-STR_5804_COMPANY_HEADQUARTERS_IN                                :{WHITE}...централен офис е на пътя
+STR_5803_COMPANY_HEADQUARTERS                                   :централа
+STR_5804_COMPANY_HEADQUARTERS_IN                                :{WHITE}...централата е на пътя
 STR_5805_COMPANY_OWNED_LAND                                     :Земя, притежавана от компанията
 STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Земята не може да бъде закупена...
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...вие вече притежавате това!


-############ 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                                                  :Неименован
@@ -1962,17 +1976,17 @@ STR_SV_STNAME_LOWER                                             :Долно {STR
 STR_SV_STNAME_HELIPORT                                          :{STRING} Хелипорт
 STR_SV_STNAME_FOREST                                            :{STRING} Дървета

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Ниво на трудност
 STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Запис

 ############ range for difficulty levels starts
-STR_6801_EASY                                                   :{BLACK}Лесно
-STR_6802_MEDIUM                                                 :{BLACK}Средно
-STR_6803_HARD                                                   :{BLACK}Трудно
-STR_6804_CUSTOM                                                 :{BLACK}По твой избор
+STR_6801_EASY                                                   :{BLACK}лесно
+STR_6802_MEDIUM                                                 :{BLACK}средно
+STR_6803_HARD                                                   :{BLACK}трудно
+STR_6804_CUSTOM                                                 :{BLACK}по поръчка
 ############ range for difficulty levels ends

 ############ range for difficulty settings starts
@@ -1985,11 +1999,11 @@ STR_680A_INITIAL_INTEREST_RATE                                  :{LTBLUE}Нач
 STR_680B_VEHICLE_RUNNING_COSTS                                  :{LTBLUE}Оперативни разходи на превозните средства: {ORANGE}{STRING}
 STR_680C_CONSTRUCTION_SPEED_OF_COMPETITOR                       :{LTBLUE}Скорост на строене на конкурентите: {ORANGE}{STRING}
 STR_680D_INTELLIGENCE_OF_COMPETITORS                            :{LTBLUE}Интелигентност на конкурентите: {ORANGE}{STRING}
-STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Повреди на превозното средство: {ORANGE}{STRING}
+STR_680E_VEHICLE_BREAKDOWNS                                     :{LTBLUE}Повреди на превозните средства: {ORANGE}{STRING}
 STR_680F_SUBSIDY_MULTIPLIER                                     :{LTBLUE}Множител на субсидиите: {ORANGE}{STRING}
 STR_6810_COST_OF_CONSTRUCTION                                   :{LTBLUE}Цена на строителството: {ORANGE}{STRING}
 STR_6811_TERRAIN_TYPE                                           :{LTBLUE}Тип на терена: {ORANGE}{STRING}
-STR_6812_QUANTITY_OF_SEA_LAKES                                  :{LTBLUE}Съотношение морета/езера: {ORANGE}{STRING}
+STR_6812_QUANTITY_OF_SEA_LAKES                                  :{LTBLUE}Количество морета/езера: {ORANGE}{STRING}
 STR_6813_ECONOMY                                                :{LTBLUE}Икономика: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Обръщане на влаковете: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Бедствия: {ORANGE}{STRING}
@@ -1997,60 +2011,60 @@ STR_16816_CITY_APPROVAL                                         :{LTBLUE}Отн
 ############ range for difficulty settings ends

 STR_26816_NONE                                                  :Николко
-STR_6816_LOW                                                    :Ниско/Малко
-STR_6817_NORMAL                                                 :Нормално
-STR_6818_HIGH                                                   :Високо/Много
+STR_6816_LOW                                                    :малко
+STR_6817_NORMAL                                                 :нормално
+STR_6818_HIGH                                                   :много
 STR_6819                                                        :{BLACK}{SMALLLEFTARROW}
 STR_681A                                                        :{BLACK}{SMALLRIGHTARROW}
-STR_681B_VERY_SLOW                                              :Много бавно
-STR_681C_SLOW                                                   :Бавно
-STR_681D_MEDIUM                                                 :Средно
-STR_681E_FAST                                                   :Бързо
-STR_681F_VERY_FAST                                              :Много бързо
+STR_681B_VERY_SLOW                                              :много бавно
+STR_681C_SLOW                                                   :бавно
+STR_681D_MEDIUM                                                 :средно
+STR_681E_FAST                                                   :бързо
+STR_681F_VERY_FAST                                              :много бързо
 STR_VERY_LOW                                                    :Много нисък
 STR_6820_LOW                                                    :Ниска/Малка
-STR_6821_MEDIUM                                                 :Средна
-STR_6822_HIGH                                                   :Висока/Голяма
-STR_6823_NONE                                                   :Без
-STR_6824_REDUCED                                                :Намалени
-STR_6825_NORMAL                                                 :Нормални
+STR_6821_MEDIUM                                                 :средна
+STR_6822_HIGH                                                   :висока/голяма
+STR_6823_NONE                                                   :без
+STR_6824_REDUCED                                                :намалени
+STR_6825_NORMAL                                                 :нормални
 STR_6826_X1_5                                                   :x1.5
 STR_6827_X2                                                     :x2
 STR_6828_X3                                                     :x3
 STR_6829_X4                                                     :x4
-STR_682A_VERY_FLAT                                              :Изключително равнинен
-STR_682B_FLAT                                                   :Равнинен
-STR_682C_HILLY                                                  :Хълмист
-STR_682D_MOUNTAINOUS                                            :Планински
-STR_682E_STEADY                                                 :Стабилна
-STR_682F_FLUCTUATING                                            :Променлива
-STR_6830_IMMEDIATE                                              :Веднага
+STR_682A_VERY_FLAT                                              :много равнинен
+STR_682B_FLAT                                                   :равнинен
+STR_682C_HILLY                                                  :хълмист
+STR_682D_MOUNTAINOUS                                            :планински
+STR_682E_STEADY                                                 :стабилна
+STR_682F_FLUCTUATING                                            :променлива
+STR_6830_IMMEDIATE                                              :веднага
 STR_6831_3_MONTHS_AFTER_PLAYER                                  :3 месеца след играча
 STR_6832_6_MONTHS_AFTER_PLAYER                                  :6 месеца след играча
 STR_6833_9_MONTHS_AFTER_PLAYER                                  :9 месеца след играча
-STR_6834_AT_END_OF_LINE_AND_AT_STATIONS                         :В края на линията и на станциите
-STR_6835_AT_END_OF_LINE_ONLY                                    :Само в края на линията
-STR_6836_OFF                                                    :Изключено
-STR_6837_ON                                                     :Включено
+STR_6834_AT_END_OF_LINE_AND_AT_STATIONS                         :в края на линията и на станциите
+STR_6835_AT_END_OF_LINE_ONLY                                    :само в края на линията
+STR_6836_OFF                                                    :изключено
+STR_6837_ON                                                     :включено
 STR_6838_SHOW_HI_SCORE_CHART                                    :{BLACK}Покажи класирането
-STR_6839_PERMISSIVE                                             :Разрешаващи
-STR_683A_TOLERANT                                               :Толерантни
-STR_683B_HOSTILE                                                :Враждебни
+STR_6839_PERMISSIVE                                             :разрешаващи
+STR_683A_TOLERANT                                               :толерантни
+STR_683B_HOSTILE                                                :враждебни

 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Играч {COMMA})
 STR_7004_NEW_FACE                                               :{BLACK}Ново лице
-STR_7005_COLOR_SCHEME                                           :{BLACK}Цветова схема
-STR_7006_COLOR_SCHEME                                           :{GOLD}Цветова гама:
-STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Нова цветова гама
-STR_7008_COMPANY_NAME                                           :{BLACK}Име на Компанията
-STR_7009_PRESIDENT_NAME                                         :{BLACK}Име на Управителят
-STR_700A_COMPANY_NAME                                           :Име на Компанията
-STR_700B_PRESIDENT_S_NAME                                       :Име на Управителя
-STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Не може да промениш името на компанията...
-STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Не може да промениш името на управителя...
+STR_7005_COLOR_SCHEME                                           :{BLACK}Цветове
+STR_7006_COLOR_SCHEME                                           :{GOLD}Цветове:
+STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Нова цветове
+STR_7008_COMPANY_NAME                                           :{BLACK}Име на компанията
+STR_7009_PRESIDENT_NAME                                         :{BLACK}Име на управителят
+STR_700A_COMPANY_NAME                                           :Име на компанията
+STR_700B_PRESIDENT_S_NAME                                       :Име на управителя
+STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Не може да бъде променено името на компанията...
+STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Не може да се промени името на управителя...
 STR_700E_FINANCES                                               :{WHITE}{COMPANY} Финанси {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Разходи/Приходи
 STR_7010                                                        :{WHITE}{NUM}
@@ -2496,19 +2510,23 @@ STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Рем

 STR_INVALID_ORDER                                               :{RED} (Невалидна заповед)

-STR_UNKNOWN_DESTINATION                                         :неизвестна дестинация
+STR_UNKNOWN_DESTINATION                                         :неизвестно назначение
 STR_8812_EMPTY                                                  :{LTBLUE}Празен
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} от {STATION}
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} от {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Влакът {COMMA} чака в депото
 STR_8815_NEW_VEHICLES                                           :{BLACK}Нови МПС-та
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Влакът е прекалено дълъг
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Влаковете могат да бъдат променяни само когато са спрени в депото
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Влак{P "" ове}
+
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Нови Машини за Двурелсов път
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Нови електрически влакове
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Нови Машини за Монорелсов път
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Нови Машини за Магниторелсов път
+STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}ЖП превозни средства
+
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Купи Машина
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Копиране на превозно средство
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Така ще бъде построено копие на пътното превозно средство. Натисни CTRL за да споделиш задачите
@@ -2863,6 +2881,7 @@ STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Сума
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Сума пари тази компания е всела от банката
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Натрупани точки от общия възможен брой

+STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF настройки
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Newgrf настройки
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Прилагане на промените
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Настройване на параметрите
@@ -2870,8 +2889,38 @@ STR_NEWGRF_TIP                                                  :{BLACK}Спис
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}В момента няма инсталирани newgrf файлове! Моля обърнете се към наръчника за инструкции по инсталирането на нова графика
 STR_NEWGRF_FILENAME                                             :{BLACK}Име на файл: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 сума: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}На път си да извършиш промени в активна игра; това може да крашне OpenTTD.{}Напълно ли си сигурен в това?

-STR_CURRENCY_WINDOW                                             :{WHITE}Поръчкова валута
+STR_NEWGRF_ADD                                                  :{BLACK}Добави
+STR_NEWGRF_ADD_TIP                                              :{BLACK}Добавяне на NewGRF файл към списъка
+STR_NEWGRF_REMOVE                                               :{BLACK}Махни
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Премахва избрания NewGRF файл от списъка
+STR_NEWGRF_MOVEUP                                               :{BLACK}Нагоре
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Премества избрания NewGRF файл нагоре в списъка
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Надолу
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Премества избрания NewGRF файл надолу в списъка
+STR_NEWGRF_FILE_TIP                                             :{BLACK}Списък на инсталираните NewGRF файлове. Изберете файл за да промените параметрите му
+STR_NEWGRF_PARAMETER                                            :{BLACK}Параметри: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Въвеждане на NewGRF параметри
+STR_NEWGRF_NO_INFO                                              :{BLACK}Няма налична информация
+
+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Налични NewGRF файлове
+STR_NEWGRF_ADD_FILE                                             :{BLACK}Добави избраните
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Добавя избраните NewGRF файлове към конфигурацията
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Обнови
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Обновява списъка с налични NewGRF файлове
+STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Не може да добавиш файл: дупликиран GRF ID
+
+STR_NEWGRF_NOT_FOUND                                            :{RED}Не е намерен отговарящ файл
+STR_NEWGRF_DISABLED                                             :{RED}Изключен
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Липсват файлове (заредени са съвместими GRF файлове)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Съвместими GRF файлове за заредени вместо липсващите
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Липсващите GRF файлове за изключени
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Липсващи GRF файлове при зареждане на игра
+
+STR_CURRENCY_WINDOW                                             :{WHITE}Парична единица
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Обменен курс: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Разделител:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Представка:
@@ -2879,7 +2928,7 @@ STR_CURRENCY_SUFFIX                                             :{LTBLUE}Над
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Преобразуване в евро: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Преобразуване в евро: {ORANGE}никога
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Преглед: {ORANGE}{CURRENCY}
-STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Промяна параметрите на поръчкова валута
+STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Промяна параметрите на парична единица

 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -1,6 +1,6 @@
 ##name Catalan
 ##ownname Català
-##isocode ca_ES.UTF-8
+##isocode ca_ES
 ##plural 0

 ##id 0x0000
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Mapa - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opcions del Joc
 STR_00B2_MESSAGE                                                :{YELLOW}Missatge
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Missatge de {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Alerta!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}No es pot fer això....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}No es pot netejar l'àrea....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Tots els drets reservats
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versió {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 L'equip d'OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 L'equip d'OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Traductor(s) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -166,7 +167,7 @@ STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Sortir
 STR_00C8_YES                                                    :{BLACK}Si
 STR_00C9_NO                                                     :{BLACK}No
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur de voler abandonar aquest joc i tornar a {STRING}?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}?
 STR_00CB_1                                                      :{BLACK}1
 STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
@@ -291,9 +292,10 @@ STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Càrrega
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Joc Nou
-STR_0141_LOAD_GAME                                              :{BLACK}Carrega el Joc
+STR_0141_LOAD_GAME                                              :{BLACK}Carrega un Joc
 STR_SINGLE_PLAYER                                               :{BLACK}Jugador individual
 STR_MULTIPLAYER                                                 :{BLACK}Multijugador
+STR_SCENARIO_EDITOR                                             :{BLACK}Editor d'Escenaris

 STR_64                                                          :64
 STR_128                                                         :128
@@ -342,7 +344,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} força per tona
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Gràfic de benefici operatiu
 STR_0155_INCOME_GRAPH                                           :Gràfic d'ingressos
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Gràfic d'entrega de càrrega
@@ -351,14 +353,14 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Gràfic de valo
 STR_0159_CARGO_PAYMENT_RATES                                    :Tarifes de pagament per càrrega
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Taula de la Lliga d'Empreses
 STR_PERFORMANCE_DETAIL_MENU                                     :Detall de ratis de rendiment
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Quant a OpenTTD
 STR_015C_SAVE_GAME                                              :Desa el joc
 STR_015D_LOAD_GAME                                              :Carrega el joc
 STR_015E_QUIT_GAME                                              :Abandona el joc
 STR_015F_QUIT                                                   :Sortir
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur de voler abandonar aquest joc?
+STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur que vols abandonar aquest joc?
 STR_0161_QUIT_GAME                                              :{WHITE}Abandona el Joc
 STR_SORT_ORDER_TIP                                              :{BLACK}Selecciona ordre de classificació (descendent/ascendent)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecciona criteri de classificació
@@ -393,6 +395,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacitat de c
 STR_NO_WAITING_CARGO                                            :{BLACK}No hi ha càrrega d'aquest tipus esperant
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar totes les instal·lacions
 STR_SELECT_ALL_TYPES                                            :{BLACK}Selecciona tots els tipus de càrrega (inloent carga sense espera)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trens Disponibles
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehicles Disponibles
+STR_AVAILABLE_SHIPS                                             :{BLACK}Vaixells Disponibles
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Avions Disponibles
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Veure una llista dels motors disponibles per aquest tipus de vehicle
 STR_MANAGE_LIST                                                 :{BLACK}Administra llista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Envia instruccions a tots els vehicles de la llista
@@ -422,7 +428,7 @@ STR_016E                                                        :{TINYFONT}{STRI
 STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
 STR_0170                                                        :{TINYFONT}{STRING}-
 STR_0171_PAUSE_GAME                                             :{BLACK}Para el joc
-STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Desa el joc, deixa el joc, sortir
+STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Desa el joc, abandona el joc, sortir
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Mostra la llista d'estacions de l'empresa
 STR_0174_DISPLAY_MAP                                            :{BLACK}Mostra el mapa
 STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Mostra el mapa, directori de poblacions
@@ -488,7 +494,7 @@ STR_01A9_NONE                                                   :Ningú
 STR_01AA_NAME                                                   :{BLACK}Nom
 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
@@ -520,7 +526,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}

@@ -608,22 +614,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} asoleix l'estat '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} asoleix l'estat '{STRING}' !
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Crea un Escenari
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor d'Escenaris
 STR_0223_LAND_GENERATION                                        :{WHITE}Generador de Terreny
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Terreny Aleatori
-STR_0227_RESET_LAND                                             :{BLACK}Restableix Terreny
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Augmenta la mida de l'àrea de terreny a rebaixar/elevar
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Disminueix la mida de l'àrea de terreny a rebaixar/elevar
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genera un terreny aleatori
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Restableix paisatge
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Restablir Paisatge
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Utilitza un mapa d'alçades
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Utilitza un mapa d'alçades
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Estàs segur de voler restablir el paisatge?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generació de Paisatges
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generació de Poblacions
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generació d'indústries
@@ -737,7 +737,7 @@ STR_0299_SAVE_SCENARIO                                          :{WHITE}Desa l'E
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Juga un Escenari
 STR_PLAY_HEIGHTMAP                                              :{BLACK}Juga un mapa d'alçades
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Comença un nou joc, utilitzant un mapa d'alçades com a terreny
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur de voler deixar aquest escenari ?
+STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Estàs segur que vols sortir d'aquest escenari ?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Sortir de l'Editor
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...només es pot construir en poblacions de més de 1200 hab.
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Retarda la data d'inici 1 any
@@ -765,7 +765,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Selecci
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Desa els noms de disseny de vehicles personalitzats al disc

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Opcions del Joc
 STR_02C5_DIFFICULTY_SETTINGS                                    :Paràmetres de dificultat
 STR_02C7_CONFIG_PATCHES                                         :Configura pedaços
@@ -779,16 +779,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Animac
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Detall complet
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Edificis Transparents
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Signes d'estació transparents
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informació de l'àrea de terreny
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Canvia a cònsola
 STR_02D7_SCREENSHOT_CTRL_S                                      :Còpia de Pantalla (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Còpia de Pantalla Gran (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Quant a 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Inactiu
 STR_02DA_ON                                                     :{BLACK}Actiu
@@ -845,7 +845,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Seleccio
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Selecciona l'estil de paisatge 'toyland'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Patrocina la construcció d'una nova indústria

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Directori d'indústries
 STR_0313_FUND_NEW_INDUSTRY                                      :Patrocina una nova indústria
 ############ range ends here
@@ -891,7 +891,7 @@ STR_TOWNNAME_DANISH                                             :Danès
 STR_TOWNNAME_TURKISH                                            :Turc
 STR_TOWNNAME_ITALIAN                                            :Italià
 STR_TOWNNAME_CATALAN                                            :Català
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Lliures (£)
 STR_CURR_USD                                                    :Dòlars ($)
@@ -1096,7 +1096,7 @@ STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Desacti
 STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Desactiva vaixells per l'ordinador: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Activa nova IA (alfa): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Permet AI en multijugador (experimental): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Permet IAs en multijugador (experimental): {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Interval de manteniment per defecte dels trens: {ORANGE}{STRING} dies/%
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Interval de manteniment per defecte dels trens: {ORANGE}desactivat
@@ -1185,7 +1185,7 @@ STR_BUILD_AUTORAIL_TIP                                          :{BLACK}Construe

 STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...no hi ha poblacions en aquest escenari

-STR_GENERATE_RANDOM_LANDSCAPE                                   :{WHITE}Estàs segur de voler crear un paisatge aleatori?
+STR_GENERATE_RANDOM_LANDSCAPE                                   :{WHITE}Estàs segur que vols crear un paisatge aleatori?
 STR_MANY_RANDOM_TOWNS                                           :{BLACK}Moltes poblacions aleatòries
 STR_RANDOM_TOWNS_TIP                                            :{BLACK}Omple el mapa amb poblacions situades aleatòriament
 STR_MANY_RANDOM_INDUSTRIES                                      :{BLACK}Moltes indústries aleatòries
@@ -1413,6 +1413,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Llista d
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} No s'han trobat dispositius de xarxa o s'ha compilat sense l'opció ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} No es pot trobar cap joc a la xarxa
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} El servidor no ha respós al requeriment
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} No s'ha pogut connectar degut a una diferència de NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Ha fallat la sincronització del joc de xarxa.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} S'ha perdut la connexió al joc de xarxa.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} No es pot carregar un joc desat al servidor.
@@ -1434,6 +1435,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :error de desinc
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :no es pot carregar el mapa
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connexió perduda
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :error de protocol
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Diferència NewGRF
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :no autoritzat
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :s'ha rebut un paquet de dades extrany
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisió incorrecta
@@ -1795,7 +1797,7 @@ STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...No es

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Desa el Joc
-STR_4001_LOAD_GAME                                              :{WHITE}Carrega el Joc
+STR_4001_LOAD_GAME                                              :{WHITE}Carrega un Joc
 STR_4002_SAVE                                                   :{BLACK}Desa
 STR_4003_DELETE                                                 :{BLACK}Esborra
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
@@ -1854,11 +1856,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Generador de Bo
 STR_4825_TOFFEE_QUARRY                                          :Cantera de Caramel
 STR_4826_SUGAR_MINE                                             :Mina de Sucre

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Necessita: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Necessita: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Necessita: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producció del darrer mes:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transportat)
@@ -1931,8 +1933,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}No pots
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...ja és propietat teva!


-############ 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                                                  :Sense Nom
@@ -1975,7 +1977,7 @@ STR_SV_STNAME_LOWER                                             :Baix {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} Bosc

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Nivell de Dificultat
@@ -2889,6 +2891,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Ara no h
 STR_NEWGRF_FILENAME                                             :{BLACK}Nom d'arxiu: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}Id de GRF: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Estàs a punt de fer canvis en un joc actiu; això pot fer que OpenTTD es pengi.{}Estàs completament segur que vols fer-los?

 STR_NEWGRF_ADD                                                  :{BLACK}Afegeix
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Afegeix un arxiu NewGRF a la llista
@@ -2912,6 +2915,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}No es po

 STR_NEWGRF_NOT_FOUND                                            :{RED}No s'ha trobat cap arxiu coincident
 STR_NEWGRF_DISABLED                                             :{RED}Desactivat
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}No s'ha trobat un arxiu coincident (els GRF compatibles s'han carregat)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}S'han carregat els GRF(s) compatibles pels arxius faltants
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Els arxius GRF(s) faltants han estat desactivats
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Arxius GRF(s) faltants per poder carregar el joc

 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalitzada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Canvi de moneda: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -3047,7 +3055,7 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Tots menys {GOL
 ########### String for New Landscape Generator

 STR_GENERATE                                                    :{WHITE}Genera
-STR_RANDOM                                                      :{BLACK}Randomise
+STR_RANDOM                                                      :{BLACK}Aleatoritza
 STR_RANDOM_HELP                                                 :{BLACK}Canvia el nombre aleatori utilitzat pel Generador de Terrenys
 STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generació del món
 STR_RANDOM_SEED                                                 :{BLACK}Nombre aleatori:
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -1,8 +1,9 @@
 ##name Czech
-##ownname Cesky
-##isocode cs_CS.UTF-8
+##ownname Česky
+##isocode cs_CS
 ##plural 6
-##case big gen news subs
+##case nom gen acc dat voc loc ins big news subs
+##gender m f n

 ##id 0x0000
 STR_NULL                                                        :
@@ -267,11 +268,12 @@ STR_00B0_MAP                                                    :{WHITE}Mapa - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Možnosti hry
 STR_00B2_MESSAGE                                                :{YELLOW}Zpráva
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Zpráva od {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varování!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Tohle neumůžeš udělat...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nemůžeš vyčistit tuto oblast...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Původní copyright: {COPYRIGHT} 1995 Chris Sawyer, všechna práva vyhrazena
 STR_00B7_VERSION                                                :{BLACK}OpenTTD verze {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Tým OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 Tým OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Překladatel(é) - Hadez, iSteve

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -407,6 +409,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nová hr
 STR_0141_LOAD_GAME                                              :{BLACK}Nahrát hru
 STR_SINGLE_PLAYER                                               :{BLACK}1 hráč
 STR_MULTIPLAYER                                                 :{BLACK}Více hráčů
+STR_SCENARIO_EDITOR                                             :{BLACK}Editor scénáře

 STR_64                                                          :64
 STR_128                                                         :128
@@ -455,16 +458,16 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} megapond{P "" y ů}
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Graf provozního zisku
 STR_0155_INCOME_GRAPH                                           :Graf příjmů
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Graf doručeného zboží
 STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Graf historie výkonu
 STR_0158_COMPANY_VALUE_GRAPH                                    :Graf hodnoty společnosti
-STR_0159_CARGO_PAYMENT_RATES                                    :Graf ceny plateb
+STR_0159_CARGO_PAYMENT_RATES                                    :Graf přepravních sazeb
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Tabulka společností
 STR_PERFORMANCE_DETAIL_MENU                                     :Podrobné hodnocení výkonu
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}O OpenTTD
 STR_015C_SAVE_GAME                                              :Uložit hru
@@ -506,7 +509,19 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Přepravní kap
 STR_NO_WAITING_CARGO                                            :{BLACK}Nečeká žádná komodita jakéhokoli druhu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Označit všechny druhy stanic
 STR_SELECT_ALL_TYPES                                            :{BLACK}Označit všechny druhy komodit (včetne žádného čekajícího nákladu)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupné vlaky
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupná vozidla
+STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupné lodě
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupná letadla
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ukázat seznam dostupných variant pro tento typ vozidla.
+STR_MANAGE_LIST                                                 :{BLACK}Upravit seznam
+STR_MANAGE_LIST_TIP                                             :{BLACK}Poslat příkazy všem vozidlům v tomto seznamu
 STR_REPLACE_VEHICLES                                            :Vyměňování vozidel
+STR_SEND_TRAIN_TO_DEPOT                                         :Poslat do depa
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Poslat do depa
+STR_SEND_SHIP_TO_DEPOT                                          :Poslat do depa
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Poslat do hangáru
+STR_SEND_FOR_SERVICING                                          :Provést údržbu

 ############ range for months starts
 STR_0162_JAN                                                    :led
@@ -593,7 +608,7 @@ STR_01A9_NONE                                                   :Nic
 STR_01AA_NAME                                                   :{BLACK}Jméno
 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.
@@ -625,7 +640,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}

@@ -713,22 +728,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} získal titul '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} získal titul '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Vytvořit mapu
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor mapy
 STR_0223_LAND_GENERATION                                        :{WHITE}Generovat zemi
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Náhodná země
-STR_0227_RESET_LAND                                             :{BLACK}Vymaž zemi
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Zvětšit oblast země pro snížení/zvýšení
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Zmenšit oblast země pro snížení/zvýšení
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generovat náhodnou zemi
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Smazat krajinu
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Smazat krajinu
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Použít výškovou mapu
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Použít výškovou mapu
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Urcite chceš smazat krajinu?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generování krajiny
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generování měst
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generování průmyslu
@@ -792,7 +801,7 @@ STR_0268_CONSTRUCT_FACTORY                                      :{BLACK}Postavit
 STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Postavit ocelárnu
 STR_026A_CONSTRUCT_FARM                                         :{BLACK}Založit farmu
 STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Postavit důl na železnou rudu
-STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Postavit ropné vrty
+STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Postavit ropný vrt
 STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Postavit banku (lze vybudovat jen ve městech s populací vetší než 1200)
 STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Postavit papírnu
 STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Postavit továrnu na zpracování potravin
@@ -870,7 +879,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Výběr
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Uložit uživatelské názvy dopravních prostředků na disk

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Možnosti hry
 STR_02C5_DIFFICULTY_SETTINGS                                    :Nastavení obtížnosti
 STR_02C7_CONFIG_PATCHES                                         :Nastavení patchů
@@ -884,16 +893,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Plné
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Plné detaily
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Průhledné budovy
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Průhledná jména stanic
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informace o zemi
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Zobrazit / skrýt konzoli
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Obrovský screenshot (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :O 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Vypnuto
 STR_02DA_ON                                                     :{BLACK}Zapnuto
@@ -950,7 +959,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Subtropi
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Země hraček
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Průmysl

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Seznam průmyslu
 STR_0313_FUND_NEW_INDUSTRY                                      :Investovat do průmyslu
 ############ range ends here
@@ -996,7 +1005,7 @@ STR_TOWNNAME_DANISH                                             :Dánská
 STR_TOWNNAME_TURKISH                                            :Turecká
 STR_TOWNNAME_ITALIAN                                            :Italská
 STR_TOWNNAME_CATALAN                                            :Katalánská
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Libra (£)
 STR_CURR_USD                                                    :Dolar ($)
@@ -1125,6 +1134,7 @@ STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Zakáza
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Spojovat stanice postavené vedle sebe: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Odjet, když je plně naložen jakýkoli náklad při 'naložit': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Použij vylepšený algoritmus nakládání: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Nakládat vozidla postupně: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflace: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Vozit zboží do stanice jen když je poptávka: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Povolit stavbu velmi dlouhých mostů: {ORANGE}{STRING}
@@ -1369,7 +1379,7 @@ STR_CONFIG_PATCHES_SERVINT_ISPERCENT                            :{LTBLUE}Interva
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Změnit produkci

 TEMP_AI_IN_PROGRESS                                             :{WHITE}Představujeme ti novou umělou inteligenci (pracovní). Není ještě OK, takže s ní jsou problémy. Kdykoli můžeš, udělej screenshot a přispěj s ním do fóra. Ať se ti líbí!
-TEMP_AI_ACTIVATED                                               :{WHITE}Pozor: tato nová umělá inteligence je ještě v alpha verzi (= nebyla moc testována)! Zatím umí pracovat jen se silničními vozidly!
+TEMP_AI_ACTIVATED                                               :{WHITE}Pozor: tato nová umělá inteligence je ještě v alfa verzi (= nebyla moc testována)! Zatím umí pracovat jen se silničními vozidly!
 TEMP_AI_MULTIPLAYER                                             :{WHITE}Varování: tato funkce je stále experimentální. Prosím posílejte jakékoli problémy na truelight@openttd.org.

 ############ network gui strings
@@ -1412,6 +1422,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Chrán
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER JE OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER JE PLNÝ
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}NESOUHLASÍ VERZE
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NESOUHLASÍ GRAFIKY

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Přidat se

@@ -1516,6 +1527,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Seznam h
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Žádná síťová zařízení nebyla nalezena (nebo je hra zkompilována bez ENABLE_NETWORK)
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nenalezena žádná síťová hra
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Server neodpověděl na požadavek
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Nelze se připojit kvůli rozdílným GRF souborům
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Síť - synchronizace hry selhala
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Síť - spojení ztraceno
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nemohu nahrát uloženou hru ze serveru
@@ -1537,6 +1549,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :chyba v synchro
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nemohu nahrát hru
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :spojení ztraceno
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :chyba v protokolu
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Nesouhlasí grafiky
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nevydáno povolení
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :přišel neplatný paket
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :špatná revize hry
@@ -1730,9 +1743,9 @@ STR_202A_NONE                                                   :{ORANGE}Nic
 STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Již přiznané dotace:
 STR_202C_FROM_TO                                                :{ORANGE}{STRING.big} z {STATION} do {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
-STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Nabídka dotace přepravy vypršela:{}{}Dotace dopravy {STRING.gen} z {STRING} do {STRING} nebude dále nabízena.
-STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Ukončení dotování dopravy:{}{}Dotace pro {STRING} z {STATION} do {STATION} již nebude dále poskytována.
-STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nabídka dotace:{}{}Doprava {STRING} z {STRING} do {STRING} bude jeden rok dotována místní správou!
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Nabídka dotace přepravy vypršela:{}{}Dotace dopravy {STRING.gen} z{NBSP}{STRING} do {STRING} nebude dále nabízena.
+STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Ukončení dotování dopravy:{}{}Dotace pro {STRING} z{NBSP}{STATION} do {STATION} již nebude dále poskytována.
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Nabídka dotace:{}{}Doprava {STRING} z{NBSP}{STRING} do {STRING} bude jeden rok dotována místní správou!
 STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace přidělena společnosti {COMPANY}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet 150 % normální ceny.
 STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace přidělena společnosti {COMPANY}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet dvojnásobek normální ceny!
 STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Dotace přidělena společnosti {COMPANY}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet trojnásobek normální ceny!
@@ -1930,7 +1943,7 @@ STR_4809_PRINTING_WORKS                                         :Tiskárna
 STR_480A_STEEL_MILL                                             :Ocelárna
 STR_480B_FARM                                                   :Farma
 STR_480C_COPPER_ORE_MINE                                        :Důl na měděnou rudu
-STR_480D_OIL_WELLS                                              :Ropné vrty
+STR_480D_OIL_WELLS                                              :Ropný vrt
 STR_480E_BANK                                                   :Banka
 STR_480F_FOOD_PROCESSING_PLANT                                  :Továrna na zpracování jídla
 STR_4810_PAPER_MILL                                             :Papírna
@@ -1957,11 +1970,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Generátor bubl
 STR_4825_TOFFEE_QUARRY                                          :Karamelolom
 STR_4826_SUGAR_MINE                                             :Cukerný důl

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Vyžaduje: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Vyžaduje: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Vyžaduje: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produkce minulý měsíc:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA} % přepraveno)
@@ -2034,8 +2047,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Nelze za
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}... již ji vlastníš!


-############ 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                                                  :Beze jména
@@ -2078,7 +2091,7 @@ STR_SV_STNAME_LOWER                                             :dolní {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} heliport
 STR_SV_STNAME_FOREST                                            :{STRING} les

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Obtížnost
@@ -2573,13 +2586,16 @@ STR_80FD_TRICARIO_HELICOPTER                                    :Vrtulník Trica
 STR_80FE_GURU_X2_HELICOPTER                                     :Vrtulník Guru X2
 STR_80FF_POWERNAUT_HELICOPTER                                   :Vrtulník Powernaut
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Zpráva od výrobce dopravních prostředků
-STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Právě jsme vyvinuli nový dopravní prostředek - {STRING}. Měl byste zájem o roční výhradní právo na používání tohoto prostředku, aby byl otestován před uvedením na trh?
-STR_8102_RAILROAD_LOCOMOTIVE                                    :lokomotivu
-STR_8103_ROAD_VEHICLE                                           :silniční vozidlo
-STR_8104_AIRCRAFT                                               :letadlo
-STR_8105_SHIP                                                   :loď
-STR_8106_MONORAIL_LOCOMOTIVE                                    :lokomotivu pro monorail
-STR_8107_MAGLEV_LOCOMOTIVE                                      :lokomotivu Maglev
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Právě jsme vyvinuli nov{G ý ou é} {STRING.dat}. Měl byste zájem o roční výhradní právo na používání tohoto prostředku, aby byl otestován před uvedením na trh?
+STR_8102_RAILROAD_LOCOMOTIVE                                    :{G=f}lokomotiva
+STR_8102_RAILROAD_LOCOMOTIVE.dat                                :{G=f}lokomotivu
+STR_8103_ROAD_VEHICLE                                           :{G=n}silniční vozidlo
+STR_8104_AIRCRAFT                                               :{G=n}letadlo
+STR_8105_SHIP                                                   :{G=f}loď
+STR_8106_MONORAIL_LOCOMOTIVE                                    :{G=f}lokomotiva pro monorail
+STR_8106_MONORAIL_LOCOMOTIVE.dat                                :{G=f}lokomotivu pro monorail
+STR_8107_MAGLEV_LOCOMOTIVE                                      :{G=f}lokomotiva Maglev
+STR_8107_MAGLEV_LOCOMOTIVE.dat                                  :{G=f}lokomotivu Maglev

 ##id 0x8800
 STR_8800_TRAIN_DEPOT                                            :{WHITE}Železniční depo {TOWN}
@@ -2983,13 +2999,44 @@ STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Současn
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Má společnost velký dluh?
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Celkový počet bodů z 1000 možných

-STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavení nových grafických souborů
+STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Nastavení grafik
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavení grafických souborů
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Potvrdit změny
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Nastavit parametry
 STR_NEWGRF_TIP                                                  :{BLACK}Tady je seznam všech nainstalovaných grafických setů. Nastavení změníš kliknutím na set.
-STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Žádné soubory s novou grafikou nejsou nainstalovány! Pro instrukce, jak nainstalovat nové grafické soubory, se podívej do manuálu.
+STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Žádné soubory s grafikou nejsou nainstalovány! Pro instrukce, jak nainstalovat grafické soubory, se podívej do manuálu.
 STR_NEWGRF_FILENAME                                             :{BLACK}Jméno souboru: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Právě se chystáš změnit nastavení grafik za běžící hry; může to shodit OpenTTD.{}Jsi si s tím opravdu jist/a?
+
+STR_NEWGRF_ADD                                                  :{BLACK}Přidat
+STR_NEWGRF_ADD_TIP                                              :{BLACK}Přidat NewGRF soubor do seznamu
+STR_NEWGRF_REMOVE                                               :{BLACK}Odebrat
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstranit označený NewGRF soubor ze seznamu
+STR_NEWGRF_MOVEUP                                               :{BLACK}Nahoru
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Posunout označený NewGRF soubor nahoru
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Dolů
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Posunout označený NewGRF soubor dolů
+STR_NEWGRF_FILE_TIP                                             :{BLACK}Seznam NewGRF souborů, které jsou nainstalovány. Parametry souboru můžeš změnit kliknutím na něj.
+STR_NEWGRF_PARAMETER                                            :{BLACK}Parametry: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Zadej parametry NewGRF souboru
+STR_NEWGRF_NO_INFO                                              :{BLACK}Není dostupná žádná informace
+
+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupné NewGRF soubory
+STR_NEWGRF_ADD_FILE                                             :{BLACK}Přidat do výběru
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Přidat vybraný NewGRF soubor do tvého nastavení
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Načíst soubory
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Aktualizovat seznam dostupných NewGRF souborů
+STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nelze přidat soubor: duplicitní GRF ID
+
+STR_NEWGRF_NOT_FOUND                                            :{RED}Nenalezen odpovídající soubor
+STR_NEWGRF_DISABLED                                             :{RED}Vypnuto
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Odpovídající soubor nenalezen (načten kompatibilní GRF)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilní GRF načteny místo chybějících
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Chybějící soubory GRF byly vyřazeny
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Pro načtení hry chybí GRF soubory

 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastní měna
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz měny: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -3154,7 +3201,7 @@ STR_GENERATION_WORLD                                            :{WHITE}Vytvář
 STR_GENERATION_ABORT                                            :{BLACK}Přerušit
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Přerušit generování krajiny
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Opravdu chceš přerušit tento proces?
-STR_PROGRESS                                                    :Z {WHITE}{NUM} % hotovo
+STR_PROGRESS                                                    :{WHITE}Z {NUM} % hotovo
 STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
 STR_WORLD_GENERATION                                            :{BLACK}Tvorba krajiny
 STR_TREE_GENERATION                                             :{BLACK}Výsadba stromů
--- a/lang/danish.txt
+++ b/lang/danish.txt
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -1,6 +1,6 @@
 ##name Dutch
 ##ownname Nederlands
-##isocode nl_NL.UTF-8
+##isocode nl_NL
 ##plural 0

 ##id 0x0000
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Kaart -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spelopties
 STR_00B2_MESSAGE                                                :{YELLOW}Bericht
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Bericht van {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Waarschuwing!
 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}Originele 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_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 Het OpenTTD team
 STR_TRANSLATED_BY                                               :{BLACK}  Vertaler(s) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -294,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nieuw sp
 STR_0141_LOAD_GAME                                              :{BLACK}Laad spel
 STR_SINGLE_PLAYER                                               :{BLACK}Een speler
 STR_MULTIPLAYER                                                 :{BLACK}Multiplayer
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenario Bewerken

 STR_64                                                          :64
 STR_128                                                         :128
@@ -342,7 +344,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10^3 lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} ton trekkracht
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Winstgrafiek
 STR_0155_INCOME_GRAPH                                           :Inkomenstegrafiek
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Afgeleverde lading-grafiek
@@ -351,7 +353,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Bedrijfswaardeg
 STR_0159_CARGO_PAYMENT_RATES                                    :Ladingsprijzen
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Bedrijfscompetitietabel
 STR_PERFORMANCE_DETAIL_MENU                                     :Detail prestatiewaarde
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Spel opslaan
@@ -393,6 +395,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Vracht capacite
 STR_NO_WAITING_CARGO                                            :{BLACK}Er wacht geen vracht van enig type
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Kies alle faciliteiten
 STR_SELECT_ALL_TYPES                                            :{BLACK}Kies alle vracht typen (inclusief niet wachtende vracht)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Beschikbare Treinen
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Beschikbare Voertuigen
+STR_AVAILABLE_SHIPS                                             :{BLACK}Beschikbare Schepen
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Beschikbare Vliegtuigen
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Bekijk een lijst van beschikbare ontwerpen voor dit type voertuig.
 STR_MANAGE_LIST                                                 :{BLACK}Beheer lijst
 STR_MANAGE_LIST_TIP                                             :{BLACK}Stuur instructies naar alle voertuigen in de lijst
@@ -488,7 +494,7 @@ STR_01A9_NONE                                                   :Geen
 STR_01AA_NAME                                                   :{BLACK}Naam
 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
@@ -520,7 +526,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}

@@ -608,22 +614,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} bereikt '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} van {COMPANY} bereikt '{STRING}' status!
 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_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Willekeurig land
-STR_0227_RESET_LAND                                             :{BLACK}Verwijder land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Vergroot het stuk land om te verhogen/verlagen
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Verklein het stuk land om te verhogen/verlagen
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genereer willekeurig land
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Verwijder landschap
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Verwijder landschap
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Gebruik hoogtekaart
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Gebruik hoogtekaart
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Weet je zeker dat je het land wilt verwijderen?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landschapproductie
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stadproductie
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrieproductie
@@ -765,7 +765,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Keuze va
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Sla aangepaste voertuignamen op

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spelopties
 STR_02C5_DIFFICULTY_SETTINGS                                    :Moeilijkheidsgraad
 STR_02C7_CONFIG_PATCHES                                         :Kies patches
@@ -779,16 +779,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Alle a
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Alle details
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Transparante gebouwen
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Transparant station bord
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ 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_02D9_ABOUT_OPENTTD                                          :Over OpenTTD
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Uit
 STR_02DA_ON                                                     :{BLACK}Aan
@@ -845,7 +845,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Kies sub
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Kies 'speelgoedland'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Betaal plaatsing van nieuwe industrie

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industrielijst
 STR_0313_FUND_NEW_INDUSTRY                                      :Subsidieer nieuwe industrie
 ############ range ends here
@@ -891,7 +891,7 @@ STR_TOWNNAME_DANISH                                             :Deens
 STR_TOWNNAME_TURKISH                                            :Turks
 STR_TOWNNAME_ITALIAN                                            :Italiaans
 STR_TOWNNAME_CATALAN                                            :Catalaans
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pond (£)
 STR_CURR_USD                                                    :Dollar ($)
@@ -1308,6 +1308,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Beveili
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER VOL
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ANDERE VERSIE
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF NIET GELIJK

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Meespelen

@@ -1412,6 +1413,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Spelers
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Geen netwerkapparaten gevonden of gecompileerd zonder ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kon geen enkel netwerkspel vinden
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} De server beantwoorde het verzoek niet
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kan geen verbinding maken vanwege niet gelijke NewGRF instelling
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Netwerkspel synchronisatie mislukt.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Netwerkspel verbinding kwijt.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kon server-opgeslagen spel niet laden
@@ -1433,6 +1435,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :desynchronisati
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kan kaart niet laden
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :verbinding verbroken
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protocol fout
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Niet gelijke NewGRF instelling
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :niet toegelaten
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :raar pakket ontvangen
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :foute revisie
@@ -1853,11 +1856,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Bellenblazer
 STR_4825_TOFFEE_QUARRY                                          :Toffeegroeve
 STR_4826_SUGAR_MINE                                             :Suikermijn

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Vereist: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Vereist: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Vereist: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Productie vorige maand:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% getransporteerd)
@@ -1930,8 +1933,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Kan dit
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...het is al van jou!


-############ 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                                                  :Geen naam
@@ -1974,7 +1977,7 @@ STR_SV_STNAME_LOWER                                             :Lager {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Helihaven
 STR_SV_STNAME_FOREST                                            :{STRING} Bossen

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Moeilijksheidsgraad
@@ -2888,6 +2891,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Er zijn
 STR_NEWGRF_FILENAME                                             :{BLACK}Bestandsnaam: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Je staat op het punt om wijzigingen te maken aan een lopend spel; dit dan OpenTTD laten crashen.{}Weet je het heel zeker?

 STR_NEWGRF_ADD                                                  :{BLACK}Toevoegen
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Voeg een NewGRF bestand toe aan te lijst
@@ -2911,6 +2915,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan best

 STR_NEWGRF_NOT_FOUND                                            :{RED}Bestand niet gevonden
 STR_NEWGRF_DISABLED                                             :{RED}Uitgeschakeld
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Bijbehorend bestand niet gevonden (compatibel GRF geladen)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Compatibele GRF(s) geladen voor ontbrekende bestanden
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Ontbrekende GRF bestand(en) zijn uitgeschakeld
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}GRF bestand(en) om dit spel te kunnen laden ontbreken

 STR_CURRENCY_WINDOW                                             :{WHITE}Aangepaste valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -1,6 +1,6 @@
 ##name English
 ##ownname English (UK)
-##isocode en_GB.UTF-8
+##isocode en_GB
 ##plural 0

 ##id 0x0000
@@ -159,7 +159,7 @@ STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Can't do
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Can't clear this area....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
 STR_00B7_VERSION                                                :{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 The OpenTTD team
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 The OpenTTD team
 STR_TRANSLATED_BY                                               :{BLACK}  Translator(s) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -295,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}New Game
 STR_0141_LOAD_GAME                                              :{BLACK}Load Game
 STR_SINGLE_PLAYER                                               :{BLACK}Single player
 STR_MULTIPLAYER                                                 :{BLACK}Multiplayer
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenario Editor

 STR_64                                                          :64
 STR_128                                                         :128
@@ -343,7 +344,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} ton force
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Operating profit graph
 STR_0155_INCOME_GRAPH                                           :Income graph
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Delivered cargo graph
@@ -352,7 +353,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Company value g
 STR_0159_CARGO_PAYMENT_RATES                                    :Cargo payment rates
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Company league table
 STR_PERFORMANCE_DETAIL_MENU                                     :Detailed performance rating
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}About OpenTTD
 STR_015C_SAVE_GAME                                              :Save game
@@ -394,6 +395,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Cargo Capacity
 STR_NO_WAITING_CARGO                                            :{BLACK}No cargo of any type is waiting
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Select all facilities
 STR_SELECT_ALL_TYPES                                            :{BLACK}Select all cargo types (including no waiting cargo)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Available Trains
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Available Vehicles
+STR_AVAILABLE_SHIPS                                             :{BLACK}Available Ships
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Available Aircraft
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}See a list of available engine designs for this vehicle type.
 STR_MANAGE_LIST                                                 :{BLACK}Manage list
 STR_MANAGE_LIST_TIP                                             :{BLACK}Send instructions to all vehicles in this list
@@ -489,7 +494,7 @@ STR_01A9_NONE                                                   :None
 STR_01AA_NAME                                                   :{BLACK}Name
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

-############ range for days	starts
+############ range for days starts
 STR_01AC_1ST                                                    :1st
 STR_01AD_2ND                                                    :2nd
 STR_01AE_3RD                                                    :3rd
@@ -521,7 +526,7 @@ STR_01C7_28TH                                                   :28th
 STR_01C8_29TH                                                   :29th
 STR_01C9_30TH                                                   :30th
 STR_01CA_31ST                                                   :31st
-############ range for days	ends
+############ range for days ends

 STR_01CB                                                        :{TINYFONT}{COMMA}

@@ -766,7 +771,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Vehicle
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Save customised vehicle design names

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Game options
 STR_02C5_DIFFICULTY_SETTINGS                                    :Difficulty settings
 STR_02C7_CONFIG_PATCHES                                         :Configure patches
@@ -780,16 +785,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Full a
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Full detail
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Transparent buildings
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Transparent station signs
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Land area information
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Toggle Console
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Giant Screenshot (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :About 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Off
 STR_02DA_ON                                                     :{BLACK}On
@@ -846,7 +851,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Select '
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Select 'toyland' landscape style
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Fund construction of new industry

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industry Directory
 STR_0313_FUND_NEW_INDUSTRY                                      :Fund new industry
 ############ range ends here
@@ -892,7 +897,7 @@ STR_TOWNNAME_DANISH                                             :Danish
 STR_TOWNNAME_TURKISH                                            :Turkish
 STR_TOWNNAME_ITALIAN                                            :Italian
 STR_TOWNNAME_CATALAN                                            :Catalan
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pounds (£)
 STR_CURR_USD                                                    :Dollars ($)
@@ -1414,6 +1419,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Client L
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} No network devices found or compiled without ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Could not find any network games
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} The server didn't answer the request
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Could not connect due to NewGRF mismatch
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Network-Game synchronisation failed
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Network-Game connection lost
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Could not load savegame
@@ -1435,6 +1441,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync error
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :could not load map
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connection lost
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protocol error
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF mismatch
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :not authorized
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :received strange packet
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :wrong revision
@@ -1855,11 +1862,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Bubble Generato
 STR_4825_TOFFEE_QUARRY                                          :Toffee Quarry
 STR_4826_SUGAR_MINE                                             :Sugar Mine

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Requires: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Requires: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Requires: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production last month:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transported)
@@ -1932,8 +1939,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Can't pu
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...you already own it!


-############ 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                                                  :Unnamed
@@ -1976,7 +1983,7 @@ STR_SV_STNAME_LOWER                                             :Lower {STRING1}
 STR_SV_STNAME_HELIPORT                                          :{STRING1} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING1} Forest

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Difficulty Level
@@ -2914,6 +2921,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Cannot a

 STR_NEWGRF_NOT_FOUND                                            :{RED}Matching file not found
 STR_NEWGRF_DISABLED                                             :{RED}Disabled
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Matching file not found (compatible GRF loaded)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Compatible GRF(s) loaded for missing files
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missing GRF file(s) have been disabled
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Missing GRF file(s) to be able to load game

 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/esperanto.txt
+++ b/lang/esperanto.txt
@@ -1,6 +1,6 @@
 ##name Esperanto
 ##ownname Esperanto
-##isocode eo_EO.UTF-8
+##isocode eo_EO
 ##plural 0
 ##case n

@@ -17,8 +17,8 @@ STR_0008_WAITING                                                :{BLACK}Atendas:
 STR_0009                                                        :{WHITE}{CARGO}
 STR_000A_EN_ROUTE_FROM                                          :{WHITE}{CARGO}{YELLOW}  (survoje de
 STR_000B                                                        :{YELLOW}{STATION})
-STR_000C_ACCEPTS                                                :{BLACK}Akceptas: {WHITE}
-STR_000D_ACCEPTS                                                :{BLACK}Akceptas: {GOLD}
+STR_000C_ACCEPTS                                                :{BLACK}Akceptiĝas: {WHITE}
+STR_000D_ACCEPTS                                                :{BLACK}Akceptiĝas: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :Pasaĝeroj
 STR_0010_COAL                                                   :Karbo
@@ -155,11 +155,12 @@ STR_00B0_MAP                                                    :{WHITE}Mapo - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Ludaj Opcioj
 STR_00B2_MESSAGE                                                :{YELLOW}Mesaĝo
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mesaĝo de {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Atentu!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Ne eblas fari ĉi tion....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Ne eblas malplenigi la regionon....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Origina kopirajto {COPYRIGHT} 1995 Chris Sawyer, Ĉiuj rajtoj rezervitaj
 STR_00B7_VERSION                                                :{BLACK}OpenTTD-versio {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 La teamo de OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 La teamo de OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Tradukanto(j) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -295,6 +296,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nova Lud
 STR_0141_LOAD_GAME                                              :{BLACK}Ŝarĝu ludon
 STR_SINGLE_PLAYER                                               :{BLACK}Unu Ludanto
 STR_MULTIPLAYER                                                 :{BLACK}Pluraj Ludantoj
+STR_SCENARIO_EDITOR                                             :{BLACK}Scenarkreilo

 STR_64                                                          :64
 STR_128                                                         :128
@@ -327,28 +329,32 @@ STR_UNITS_WEIGHT_SHORT_IMPERIAL                                 :{COMMA}t
 STR_UNITS_WEIGHT_SHORT_METRIC                                   :{COMMA}t
 STR_UNITS_WEIGHT_SHORT_SI                                       :{COMMA}kg

+STR_UNITS_WEIGHT_LONG_IMPERIAL                                  :{COMMA} angla{P "" j} tuno{P "" j}
+STR_UNITS_WEIGHT_LONG_METRIC                                    :{COMMA} tuno{P "" j}
 STR_UNITS_WEIGHT_LONG_SI                                        :{COMMA} kg

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

+STR_UNITS_VOLUME_LONG_IMPERIAL                                  :{COMMA} galjono{P "" j}
+STR_UNITS_VOLUME_LONG_METRIC                                    :{COMMA} litro{P "" j}
 STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³

 STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lbf
 STR_UNITS_FORCE_METRIC                                          :{COMMA} tuna forto
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Gajna grafiko
 STR_0155_INCOME_GRAPH                                           :Enspeza grafiko
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Liveriteca grafiko
-STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Kvalithistoria grafiko
+STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Rendimenta grafiko
 STR_0158_COMPANY_VALUE_GRAPH                                    :Kompanivalora grafiko
 STR_0159_CARGO_PAYMENT_RATES                                    :Ŝarĝpaga grafiko
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Kompaniara tabelo
-STR_PERFORMANCE_DETAIL_MENU                                     :Detala kvalittakso
-############ range for menu	ends
+STR_PERFORMANCE_DETAIL_MENU                                     :Detala rendimento
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Pri OpenTTD
 STR_015C_SAVE_GAME                                              :Konservu ludon
@@ -390,6 +396,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Ŝarĝkapablo
 STR_NO_WAITING_CARGO                                            :{BLACK}Nenia ŝarĝo atendas
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Elektu ĉiujn konstruaĵojn
 STR_SELECT_ALL_TYPES                                            :{BLACK}Elektu ĉiujn ŝarĝotipojn (inkluzive de ne atendanta ŝarĝo)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Haveblaj Trajnoj
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Haveblaj Veturiloj
+STR_AVAILABLE_SHIPS                                             :{BLACK}Haveblaj Ŝipoj
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Haveblaj Aviadiloj
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Vidu liston da ĉiuj haveblaj maŝinoj por ĉi tiu veturilspeco.
 STR_MANAGE_LIST                                                 :{BLACK}Manaĝu liston
 STR_MANAGE_LIST_TIP                                             :{BLACK}Sendu instrukciojn al ĉiuj veturiloj en la listo
@@ -438,7 +448,7 @@ STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Konstruu
 STR_0182_BUILD_ROADS                                            :{BLACK}Konstruu vojojn
 STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Konstruu havenojn
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}Konstruu flughavenojn
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Plantu arbojn, metu signojn ktp.
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Plantu arbojn, metu afiŝojn ktp.
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Landregionaj informoj
 STR_0187_OPTIONS                                                :{BLACK}Opcioj
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
@@ -485,7 +495,7 @@ STR_01A9_NONE                                                   :Neniu
 STR_01AA_NAME                                                   :{BLACK}Nomo
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

-############ range for days	starts
+############ range for days starts
 STR_01AC_1ST                                                    :1a de
 STR_01AD_2ND                                                    :2a de
 STR_01AE_3RD                                                    :3a de
@@ -517,7 +527,7 @@ STR_01C7_28TH                                                   :28a de
 STR_01C8_29TH                                                   :29a de
 STR_01C9_30TH                                                   :30a de
 STR_01CA_31ST                                                   :31a de
-############ range for days	ends
+############ range for days ends

 STR_01CB                                                        :{TINYFONT}{COMMA}

@@ -605,22 +615,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} atingis staton de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} atingis staton de '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Kreu Scenaron
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarkreilon
 STR_0223_LAND_GENERATION                                        :{WHITE}Landa Generado
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Hazarda Lando
-STR_0227_RESET_LAND                                             :{BLACK}Reigu Landon
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Grandigu landparton por (mal)altigi
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Malgrandigu landparton por (mal)altigi
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Kreu landon hazarde
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reigu landaspekton
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Reigu Landaspekton
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Uzu Altecmapon
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Uzu Altecmapon
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Ĉu vi certas ke vi volas reigi la landaspekton?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landaspekta generado
 STR_022F_TOWN_GENERATION                                        :{BLACK}Urba generado
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industria generado
@@ -713,7 +717,7 @@ STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Ne povas
 STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...antaŭe konstruu urbon
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...nur unu permesiĝas en ĉiu urbo
 STR_0288_PLANT_TREES                                            :{BLACK}Plantu arbojn
-STR_0289_PLACE_SIGN                                             :{BLACK}Metu signon
+STR_0289_PLACE_SIGN                                             :{BLACK}Metu afiŝon
 STR_028A_RANDOM_TREES                                           :{BLACK}Hazardaj Arboj
 STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}Hazarde plantu arbojn en la tuta lando
 STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Metu rokecajn lokojn en la lando
@@ -762,7 +766,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Elekto d
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Konservu ŝanĝitajn veturilajn nomojn

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Ludaj opcioj
 STR_02C5_DIFFICULTY_SETTINGS                                    :Malfacilec-agordoj
 STR_02C7_CONFIG_PATCHES                                         :Agordu flikojn
@@ -770,22 +774,22 @@ STR_NEWGRF_SETTINGS                                             :Agordoj de NewG
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Urbonomoj montriĝas
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Staciaj nomoj montriĝas
-STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Signoj montriĝas
+STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Afiŝoj montriĝas
 STR_WAYPOINTS_DISPLAYED2                                        :{SETX 12}Trairejoj montriĝas
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Plena animado
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Plenaj detaloj
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Travideblaj konstruaĵoj
-STR_TRANSPARENT_SIGNS                                           :{SETX 12}Travideblaj staciaj signoj
-############ range ends	here
+STR_TRANSPARENT_SIGNS                                           :{SETX 12}Travideblaj staciaj afiŝoj
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Landkvadrataj informoj
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Ŝaltu Tekstmodon
 STR_02D7_SCREENSHOT_CTRL_S                                      :Ekranfoto (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Giganta Ekranfoto (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Pri 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Malaktiva
 STR_02DA_ON                                                     :{BLACK}Aktiva
@@ -793,7 +797,7 @@ STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Montru s
 STR_02DD_SUBSIDIES                                              :Subvencioj
 STR_02DE_MAP_OF_WORLD                                           :Mondomapo
 STR_EXTRA_VIEW_PORT                                             :Plia videjo
-STR_SIGN_LIST                                                   :Signolisto
+STR_SIGN_LIST                                                   :Afiŝa listo
 STR_02DF_TOWN_DIRECTORY                                         :Urbaro
 STR_TOWN_POPULATION                                             :{BLACK}Monda enloĝantaro: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Videjo {COMMA}
@@ -842,7 +846,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Elektu '
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Elektu 'ludlandan' landstilon
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Fondu konstruadon de nova industrio

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industriaro
 STR_0313_FUND_NEW_INDUSTRY                                      :Fondu novan industrion
 ############ range ends here
@@ -888,7 +892,7 @@ STR_TOWNNAME_DANISH                                             :Dane
 STR_TOWNNAME_TURKISH                                            :Turke
 STR_TOWNNAME_ITALIAN                                            :Itale
 STR_TOWNNAME_CATALAN                                            :Katalune
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pundoj (£)
 STR_CURR_USD                                                    :Dolaroj ($)
@@ -1013,12 +1017,13 @@ STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Permesu
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Permesu forigon de pli da urbaj vojoj, pontoj ktp: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Permesu konstrui tre longajn trajnojn: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Permesu realecan rapidigon por trajnoj: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Malpermesu trajnojn kaj ŝipojn ort-turniĝi: {ORANGE}{STRING} {LTBLUE} (bezonas NPF)
+STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Trajnoj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING} {LTBLUE} (bezonas NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Ligu stacidomojn konstruatajn unu apud la alia: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Ĉe 'plene ŝarĝu' ekiru se ajna ŝarĝo estas plena: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Uzu plibonigitan ŝarĝalgoritmon: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Laŭgrade ŝarĝu veturilojn: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacio: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Nur liveru ŝarĝon al stacio se estas peto: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permesu konstruadon de tre longaj pontoj: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Permesu ordenojn por iri al deponejo: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Permesu konstruadon de fontmalerialaj industrioj: {ORANGE}{STRING}
@@ -1045,7 +1050,7 @@ STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :de ĉiuj veturi
 STR_CONFIG_PATCHES_WARN_INCOME_LESS                             :{LTBLUE}Avertu se trajno negative enspezas: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES                        :{LTBLUE}Veturiloj neniam eluziĝas: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_AUTORENEW_VEHICLE                            :{LTBLUE}Aŭtomate anstataŭu veturilon se malnoviĝas
-STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Anstataŭu {ORANGE}{STRING}{LTBLUE} monatojn antaŭ/post maksimuma aĝo de veturilo
+STR_CONFIG_PATCHES_AUTORENEW_MONTHS                             :{LTBLUE}Anstataŭu {ORANGE}{STRING}{LTBLUE} monatojn antaŭ/post pleja veturilaĝo
 STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Minimuma mono por anstataŭado: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Daŭro de erar-mesaĝo: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Montru enloĝantaron en urbnomindikilo: {ORANGE}{STRING}
@@ -1072,9 +1077,9 @@ STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Kiom al

 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maksimuma stacivasteco: {ORANGE}{STRING} {RED}Atentu: Pli alte, malpli rapide
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Aŭtomate prizorgu helikopterojn sur helikopterejoj: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Ligu landaspekta breto al rela, voja, akva kaj flughavena bretoj: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Ligu landaspektan breton al konstruadaj bretoj: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Inversigu skroldirekton: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Montru mezuran konsilbalonon ĉe uzo de konstruaj iloj: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Montru mezuran konsilbalonon ĉe uzo de konstruiloj: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Montru kompaniajn liverojn: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Neniuj
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Propra kompanio
@@ -1092,7 +1097,7 @@ STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT                           :{LTBLUE}Malebli
 STR_CONFIG_PATCHES_AI_BUILDS_SHIPS                              :{LTBLUE}Malebligu ŝipojn por la komputilo: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_AINEW_ACTIVE                                 :{LTBLUE}Aktivigu novan AI (alfa): {ORANGE}{STRING}
-STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Permesu komputilludantojn ĉe pluraj ludantoj (eksperimente): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER                            :{LTBLUE}Komputilludantoj ĉe pluraj ludantoj (eksperimente): {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SERVINT_TRAINS                               :{LTBLUE}Defaŭlta prizorgintervalo por trajnoj: {ORANGE}{STRING} tagoj/%
 STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED                      :{LTBLUE}Defaŭlta prizorgintervalo por trajnoj: {ORANGE}malaktiva
@@ -1304,6 +1309,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Protekt
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVILO NE SURRETAS
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVILO PLENAS
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIOJ NE KONGRUAS
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}MISO PRI NEWGRF

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Aliĝu al la ludo

@@ -1408,6 +1414,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientli
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ne trovis retstirilojn aŭ kompiliĝis sen ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Ne troveblas ajna reta ludo
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} La servilo ne respondis al la peto
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Ne povis konekti pro miso pri NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Retluda sinkronigado fiaskis
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Perdis konekton al Retludo
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Ne povis ŝarĝi konservitan ludon
@@ -1429,6 +1436,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :sensinkroneca e
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :ne povis ŝarĝi mapon
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :konekto perdiĝis
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokola eraro
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Miso pri NewGRF
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ne rajtigite
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ricevis strangan pakaĵon
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :malĝusta revidaĵo
@@ -1492,11 +1500,13 @@ STR_0802_INCOME                                                 :{TINYFONT}{GREE
 STR_0803_INCOME                                                 :{GREEN}Enspezo: {CURRENCY}
 STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Transigo: {CURRENCY}
 STR_FEEDER                                                      :{YELLOW}Transigo: {CURRENCY}
-STR_0805_ESTIMATED_COST                                         :{WHITE}Estimated Cost: {CURRENCY}
+STR_0805_ESTIMATED_COST                                         :{WHITE}Atendata Kosto: {CURRENCY}
 STR_0807_ESTIMATED_INCOME                                       :{WHITE}Atendata enspezo: {CURRENCY}
 STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Ne povas altigi landon ĉi tie...
 STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Ne povas malaltigi landon ĉi tie...
 STR_080A_ROCKS                                                  :Rokoj
+STR_080B_ROUGH_LAND                                             :Malglata lando
+STR_080C_BARE_LAND                                              :Nuda lando
 STR_080D_GRASS                                                  :Herbo
 STR_080E_FIELDS                                                 :Kampoj
 STR_080F_SNOW_COVERED_LAND                                      :Neĝkovrita lando
@@ -1522,7 +1532,7 @@ STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Ne povas
 STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Ne povas konstrui relojn ĉi tie...
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Ne povas forigi relojn de ĉi tie...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Ne povas forigi signalojn de ĉi tie...
-STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Trajndeponeja Orientado
+STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Deponeja Direkto
 STR_1015_RAILROAD_CONSTRUCTION                                  :Fervoja Konstruado
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Elektrofervoja konstruado
 STR_1016_MONORAIL_CONSTRUCTION                                  :Unurelfervoja konstruado
@@ -1553,7 +1563,7 @@ STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Vojkonst
 STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Elektu Vojan Ponton
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Ne povas konstrui vojon ĉi tie...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Ne povas forigi vojon de ĉi tie...
-STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Deponeja Orientado
+STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Deponeja Direkto
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Ne povas konstrui vojveturilan deponejon ĉi tie...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Ne povas konstrui bushaltejon...
 STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Ne povas konstrui ŝarĝstacion...
@@ -1574,6 +1584,10 @@ STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Kruciĝo inter

 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Urboj
+STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
+STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
+STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
+STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
 STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
 STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Antaŭe forigu konstruaĵon
 STR_2005                                                        :{WHITE}{TOWN}
@@ -1647,6 +1661,7 @@ STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :Fondu lokan voj
 STR_204A_BUILD_STATUE_OF_COMPANY                                :Konstruu statuon de la kompaniestro
 STR_204B_FUND_NEW_BUILDINGS                                     :Fondu novajn konstruaĵojn
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Aĉetu ekskluzivan transportrajton
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Subaĉetu la lokajn estrojn
 STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Komencu malgrandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{}  Kosto: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Komencu mezgrandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{}  Kosto: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Komencu grandan lokan reklamadon, por altiri pli da pasaĝeroj kaj ŝarĝoj al viaj transportservoj.{}  Kosto: {CURRENCY}
@@ -1654,6 +1669,7 @@ STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Konstruu statuon honore al via kompanio.{} Kosto: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Fondu la konstruadon de novaj komercaj konstruaĵoj en la urbo.{}  Kosto: {CURRENCY}
 STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Aĉetu ekskluzivan transportrajton en la urbo por 1 jaro. La urbo nur permesos pasaĝerojn kaj ŝarĝojn uzi viajn staciojn {} Cost: {CURRENCY}
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY_DESC                         :{WHITE}{STRING}{}{YELLOW} Subaĉetu la lokajn estrojn por pliigi vian rendimenton, riskante grandan punon je kapto.{} Kosto: {CURRENCY}
 STR_2055_TRAFFIC_CHAOS_IN_ROAD_REBUILDING                       :{BIGFONT}{BLACK}Trafika ĥaoso en {TOWN}!{}{}Vojrekonstruada programo komencita de {COMPANY} alportas 6-monatan mizeron al vojuzantoj!
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
@@ -1664,22 +1680,24 @@ STR_205B_TEAPOT_HOUSE                                           :Tekruĉa Domo
 STR_205C_PIGGY_BANK                                             :Porko-Banko

 STR_INDUSTRY                                                    :{INDUSTRY}
+STR_TOWN                                                        :{TOWN}
 STR_INDUSTRY_FORMAT                                             :{TOWN} {STRING}
+STR_STATION                                                     :{STATION}

 ##id 0x2800
 STR_LANDSCAPING                                                 :Landaspektigi
 STR_2800_PLANT_TREES                                            :Plantu arbojn
-STR_2801_PLACE_SIGN                                             :Metu signon
+STR_2801_PLACE_SIGN                                             :Metu afiŝon
 STR_2802_TREES                                                  :{WHITE}Arboj
 STR_2803_TREE_ALREADY_HERE                                      :{WHITE}...jam estas arbo
 STR_2804_SITE_UNSUITABLE                                        :{WHITE}...loko ne uzeblas
 STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}Ne povas planti arbon ĉi tie...
 STR_2806                                                        :{WHITE}{STRING}
-STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...tro da signoj
-STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Ne povas meti signon ĉi tie...
-STR_280A_SIGN                                                   :Signo
-STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Ŝanĝu signo-tekston
-STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Ne povas ŝanĝi signan nomon...
+STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...tro da afiŝoj
+STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}Ne povas meti afiŝon ĉi tie...
+STR_280A_SIGN                                                   :Afiŝo
+STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Ŝanĝu afiŝan tekston
+STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}Ne povas ŝanĝi afiŝan nomon...
 STR_280D_SELECT_TREE_TYPE_TO_PLANT                              :{BLACK}Elektu arbo-tipon por plant
 STR_280E_TREES                                                  :Arboj
 STR_280F_RAINFOREST                                             :Praarbaro
@@ -1729,6 +1747,7 @@ STR_3042_BUS_STATION_ORIENTATION                                :{WHITE}Bushalte
 STR_3043_TRUCK_STATION_ORIENT                                   :{WHITE}Ŝarĝstacia Direkto
 STR_3046_MUST_DEMOLISH_BUS_STATION                              :{WHITE}Antaŭe forigu bushaltejon
 STR_3047_MUST_DEMOLISH_TRUCK_STATION                            :{WHITE}Antaŭe forigu ŝarĝstacion
+STR_3048_STATIONS                                               :{WHITE}{COMPANY} - {COMMA} Stacio{P "" j}
 STR_3049_0                                                      :{YELLOW}{STATION} {STATIONFEATURES}
 STR_304A_NONE                                                   :{YELLOW}- Neniu -
 STR_304B_SITE_UNSUITABLE                                        :{WHITE}...loko ne uzeblas
@@ -1746,6 +1765,7 @@ STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Montru l
 STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Staciaj nomoj - alklaku nomon por centre de la ĉefvido vidi ĝin
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Elektu grandecon/tipon de flughaveno
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
 STR_305E_RAILROAD_STATION                                       :Stacidomo
 STR_305F_AIRCRAFT_HANGAR                                        :Aviadila hangaro
 STR_3060_AIRPORT                                                :Flughaveno
@@ -1760,7 +1780,11 @@ STR_3069_BUOY                                                   :Buo
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...buo okupas la lokon
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stacio tro vastas
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...nekonformaj stacioj neebligitaj
+STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Tenu la CTRL-klavon por elekti pliajn erojn

+STR_UNDEFINED                                                   :(nedifinita tekstero)
+STR_STAT_CLASS_DFLT                                             :Defaŭlta stacio
+STR_STAT_CLASS_WAYP                                             :Transirejoj

 ##id 0x3800
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Ŝipdeponeja Direkto
@@ -1778,6 +1802,7 @@ STR_4001_LOAD_GAME                                              :{WHITE}Ŝarĝu
 STR_4002_SAVE                                                   :{BLACK}Konservu
 STR_4003_DELETE                                                 :{BLACK}Forviŝu
 STR_4004                                                        :{COMPANY} je {DATE_LONG}
+STR_4005_BYTES_FREE                                             :{BLACK}{COMMA} megabitoko{P "" j} libera{P "" j}
 STR_4006_UNABLE_TO_READ_DRIVE                                   :{BLACK}Ne eblas legi diskon
 STR_4007_GAME_SAVE_FAILED                                       :{WHITE}Ludkonservado Fiaskis
 STR_4008_UNABLE_TO_DELETE_FILE                                  :{WHITE}Ne eblas forviŝi dosieron
@@ -1832,11 +1857,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Vezikgenerilo
 STR_4825_TOFFEE_QUARRY                                          :Tofeminejo
 STR_4826_SUGAR_MINE                                             :Sukerminejo

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Bezonas: {YELLOW}{STRING.n}
 STR_4828_REQUIRES                                               :{BLACK}Bezonas: {YELLOW}{STRING.n}, {STRING.n}
 STR_4829_REQUIRES                                               :{BLACK}Bezonas: {YELLOW}{STRING.n}, {STRING.n}, {STRING.n}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Lastmonata produktado:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transportiĝis)
@@ -1909,12 +1934,51 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Ne povas
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...vi jam posedas ĝin!


-############ 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                                                  :Sennoma
+STR_SV_TRAIN_NAME                                               :Trajno {COMMA}
+STR_SV_ROADVEH_NAME                                             :Vojveturilo {COMMA}
+STR_SV_SHIP_NAME                                                :Ŝipo {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Aviadilo {COMMA}

+STR_SV_STNAME                                                   :{STRING}
+STR_SV_STNAME_NORTH                                             :Norda {STRING}
+STR_SV_STNAME_SOUTH                                             :Suda {STRING}
+STR_SV_STNAME_EAST                                              :Orienta {STRING}
+STR_SV_STNAME_WEST                                              :Okcidenta {STRING}
+STR_SV_STNAME_CENTRAL                                           :Centra {STRING}
+STR_SV_STNAME_TRANSFER                                          :Transiga {STRING}
+STR_SV_STNAME_HALT                                              :Halteja {STRING}
+STR_SV_STNAME_VALLEY                                            :Valo de {STRING}
+STR_SV_STNAME_HEIGHTS                                           :Alta {STRING}
+STR_SV_STNAME_WOODS                                             :{STRING} Arbaro
+STR_SV_STNAME_LAKESIDE                                          :Lago ĉe {STRING}
+STR_SV_STNAME_EXCHANGE                                          :Interŝanĝa {STRING}
+STR_SV_STNAME_AIRPORT                                           :Flughaveno de {STRING}
+STR_SV_STNAME_OILFIELD                                          :Olefonto de {STRING}
+STR_SV_STNAME_MINES                                             :Minejo de {STRING}
+STR_SV_STNAME_DOCKS                                             :Haveno de {STRING}
+STR_SV_STNAME_BUOY_1                                            :{STRING} Buo 1
+STR_SV_STNAME_BUOY_2                                            :{STRING} Buo 2
+STR_SV_STNAME_BUOY_3                                            :{STRING} Buo 3
+STR_SV_STNAME_BUOY_4                                            :{STRING} Buo 4
+STR_SV_STNAME_BUOY_5                                            :{STRING} Buo 5
+STR_SV_STNAME_BUOY_6                                            :{STRING} Buo 6
+STR_SV_STNAME_BUOY_7                                            :{STRING} Buo 7
+STR_SV_STNAME_BUOY_8                                            :{STRING} Buo 8
+STR_SV_STNAME_BUOY_9                                            :{STRING} Buo 9
+STR_SV_STNAME_ANNEXE                                            :Ekstera {STRING}
+STR_SV_STNAME_SIDINGS                                           :Flanka {STRING}
+STR_SV_STNAME_BRANCH                                            :Branĉa {STRING}
+STR_SV_STNAME_UPPER                                             :Supra {STRING}
+STR_SV_STNAME_LOWER                                             :Malsupra {STRING}
+STR_SV_STNAME_HELIPORT                                          :{STRING} Helikopterejo
+STR_SV_STNAME_FOREST                                            :Arbaro de {STRING}

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Malfacilec-nivelo
@@ -1959,6 +2023,7 @@ STR_681C_SLOW                                                   :Malrapide
 STR_681D_MEDIUM                                                 :Meze
 STR_681E_FAST                                                   :Rapide
 STR_681F_VERY_FAST                                              :Tre Rapide
+STR_VERY_LOW                                                    :Tre Malalte
 STR_6820_LOW                                                    :Malalte
 STR_6821_MEDIUM                                                 :Meze
 STR_6822_HIGH                                                   :Alte
@@ -1990,6 +2055,16 @@ STR_683B_HOSTILE                                                :Gastige

 ##id 0x7000
 STR_7000                                                        :
+STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
+STR_7002_PLAYER                                                 :(Ludanto {COMMA})
+STR_7004_NEW_FACE                                               :{BLACK}Nova Vizaĝo
+STR_7005_COLOR_SCHEME                                           :{BLACK}Kolorskemo
+STR_7006_COLOR_SCHEME                                           :{GOLD}Kolorskemo:
+STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Nova Kolorskemo
+STR_7008_COMPANY_NAME                                           :{BLACK}Kompaninomo
+STR_7009_PRESIDENT_NAME                                         :{BLACK}Manaĝantnomo
+STR_700A_COMPANY_NAME                                           :Kompania Nomo
+STR_700B_PRESIDENT_S_NAME                                       :Nomo de la Manaĝanto
 STR_700C_CAN_T_CHANGE_COMPANY_NAME                              :{WHITE}Ne povas ŝanĝi kompaninomon...
 STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Ne povas ŝanĝi manaĝantnomon...
 STR_700E_FINANCES                                               :{WHITE}Financoj de {COMPANY} {BLACK}{PLAYERNAME}
@@ -2033,7 +2108,20 @@ STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Ŝanĝu
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Ŝanĝu la nomon de la manaĝanto
 STR_7033_CHANGE_THE_COMPANY_NAME                                :{BLACK}Ŝanĝu la nomon de la kompanio
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Alklaku la deziratan kolorskemon
+STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Grandigu prunton
+STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Repagu pruntparton
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Manaĝanto)
+STR_7038_INAUGURATED                                            :{GOLD}Enaŭguris: {WHITE}{NUM}
+STR_7039_VEHICLES                                               :{GOLD}Veturiloj:
+STR_TRAINS                                                      :{WHITE}{COMMA} trajno{P "" j}
+STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} vojveturilo{P "" j}
 STR_AIRCRAFT                                                    :{WHITE}{COMMA} aviadiloj
+STR_SHIPS                                                       :{WHITE}{COMMA} ŝipo{P "" j}
+STR_7042_NONE                                                   :{WHITE}Neniu
+STR_7043_FACE_SELECTION                                         :{WHITE}Vizaĝelekto
+STR_7044_MALE                                                   :{BLACK}Vira
+STR_7045_FEMALE                                                 :{BLACK}Virina
+STR_7046_NEW_FACE                                               :{BLACK}Nova Vizaĝo
 STR_7047_CANCEL_NEW_FACE_SELECTION                              :{BLACK}Nuligu elekton de nova vizaĝo
 STR_7048_ACCEPT_NEW_FACE_SELECTION                              :{BLACK}Akceptu elekton de nova vizaĝo
 STR_7049_SELECT_MALE_FACES                                      :{BLACK}Elektu virajn vizaĝojn
@@ -2076,20 +2164,23 @@ STR_706D_PRESIDENT                                              :Potenculo
 STR_706E_TYCOON                                                 :Plejpotenculo
 STR_706F_BUILD_HQ                                               :{BLACK}Faru HQ
 STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Konstruu kompanian ĉefkonstruaĵon / vidu kompanian ĉefkonstruaĵon
+STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Rekonstruu kompanian ĉefkonstruaĵon aliloke por 1% de kompanivaloro
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Ne povas konstrui kompanian ĉefkonstruaĵon...
 STR_7072_VIEW_HQ                                                :{BLACK}Vidu HQ
+STR_RELOCATE_HQ                                                 :{BLACK}Relokigu HQ
 STR_COMPANY_PASSWORD                                            :{BLACK}Pasvorto
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Pasvorte protektu vian kompanion por eviti ke eksteruloj aliĝu.
+STR_SET_COMPANY_PASSWORD                                        :Agordu kompanian pasvorton
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}Monda Recesio!{}{}Financaj spertuloj timas ke malpliboniĝas treege! Ekonomio malboniĝadas!
 STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Recesio finiĝis!{}{}Komerca pliboniĝos donas konfidon al industrioj! Ekonomio pliboniĝas!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Ŝaltu inter granda kaj malgranda fenestro
 STR_7076_COMPANY_VALUE                                          :{GOLD}Kompania valoro: {WHITE}{CURRENCY64}
-STR_7077_BUY_25_SHARE_IN_COMPANY                                :{BLACK}Aĉetu 25%-an dividaĵon en kompanio
-STR_7078_SELL_25_SHARE_IN_COMPANY                               :{BLACK}Vendu 25%-an dividaĵon en kompanio
+STR_7077_BUY_25_SHARE_IN_COMPANY                                :{BLACK}Aĉetu 25%-an dividaĵon
+STR_7078_SELL_25_SHARE_IN_COMPANY                               :{BLACK}Vendu 25%-an dividaĵon
 STR_7079_BUY_25_SHARE_IN_THIS_COMPANY                           :{BLACK}Aĉetu 25%-an dividaĵon en ĉi tiu kompanio
 STR_707A_SELL_25_SHARE_IN_THIS_COMPANY                          :{BLACK}Vendu 25%-an dividaĵon en ĉi tiu kompanio
-STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Ne povas aĉeti 25%-an dividaĵon en ĉi tiu kompanio...
-STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Ne povas vendi 25%-an dividaĵon en ĉi tiu kompanio...
+STR_707B_CAN_T_BUY_25_SHARE_IN_THIS                             :{WHITE}Ne povas aĉeti 25%-an dividaĵon...
+STR_707C_CAN_T_SELL_25_SHARE_IN                                 :{WHITE}Ne povas vendi 25%-an dividaĵon...
 STR_707D_OWNED_BY                                               :{WHITE}({COMMA}% posedataj de {COMPANY})
 STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}% posedataj de {COMPANY}{}   {COMMA}% posedataj de {COMPANY})
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} estas transprenita de {COMPANY}!
@@ -2257,6 +2348,16 @@ STR_8080_PERRY_MAIL_TRUCK                                       :Poŝtaŭto "Per
 STR_8081_MIGHTYMOVER_MAIL_TRUCK                                 :Poŝtaŭto "MightyMover"
 STR_8082_POWERNAUGHT_MAIL_TRUCK                                 :Poŝtaŭto "Powernaught"
 STR_8083_WIZZOWOW_MAIL_TRUCK                                    :Poŝtaŭto "Wizzowow"
+STR_8084_WITCOMBE_OIL_TANKER                                    :Oleŝarĝaŭto "Witcombe"
+STR_8085_FOSTER_OIL_TANKER                                      :Oleŝarĝaŭto "Foster"
+STR_8086_PERRY_OIL_TANKER                                       :Oleŝarĝaŭto "Perry"
+STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Brutŝarĝaŭto "Talbott"
+STR_8088_UHL_LIVESTOCK_VAN                                      :Brutŝarĝaŭto "Uhl"
+STR_8089_FOSTER_LIVESTOCK_VAN                                   :Brutŝarĝaŭto "Foster"
+STR_808A_BALOGH_GOODS_TRUCK                                     :Varŝarĝaŭto "Balogh"
+STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Varŝarĝaŭto "Craighead"
+STR_808C_GOSS_GOODS_TRUCK                                       :Varŝarĝaŭto "Goss"
+STR_808D_HEREFORD_GRAIN_TRUCK                                   :Grenŝarĝaŭto "Hereford"
 STR_808E_THOMAS_GRAIN_TRUCK                                     :Grenŝarĝaŭto "Thomas"
 STR_808F_GOSS_GRAIN_TRUCK                                       :Grenŝarĝaŭto "Goss"
 STR_8090_WITCOMBE_WOOD_TRUCK                                    :Lignoŝarĝaŭto "Witcombe"
@@ -2319,6 +2420,7 @@ STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Plastikŝarĝa
 STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :Vezikŝarĝaŭto "MightyMover"
 STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Vezikŝarĝaŭto "Powernaught"
 STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Vezikŝarĝaŭto "Wizzowow"
+STR_80CC_MPS_OIL_TANKER                                         :Oleŝipo "MPS"
 STR_80CD_CS_INC_OIL_TANKER                                      :Oleŝipo "CS-Inc."
 STR_80CE_MPS_PASSENGER_FERRY                                    :Pasaĝerŝipo "MPS"
 STR_80CF_FFP_PASSENGER_FERRY                                    :Pasaĝerŝipo "FFP"
@@ -2399,7 +2501,9 @@ STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Iru senhalte al
 STR_8810_GO_NON_STOP_TO_LOAD                                    :Iru senhalte al {STATION} (Ŝarĝu)
 STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Iru senhalte al {STATION} (Transigu kaj atendu ĝis plena ŝarĝo)
 STR_GO_TO_TRAIN_DEPOT                                           :Iru al {TOWN} Trajndeponejo
+STR_SERVICE_AT_TRAIN_DEPOT                                      :Prizorgo ĉe {TOWN} Trajndeponejo
 STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Iru senhalte al {TOWN} Trajndeponejo
+STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT                             :Prizorgo senhalte ĉe {TOWN} Trajndeponejo

 STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Irante al {TOWN} Trajndeponejo
 STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Irante al {TOWN} Trajndeponejo, {VELOCITY}
@@ -2408,6 +2512,7 @@ STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Prizorg

 STR_INVALID_ORDER                                               :{RED} (Nevalida Ordeno)

+STR_UNKNOWN_DESTINATION                                         :nekonata destino
 STR_8812_EMPTY                                                  :{LTBLUE}Malplena
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
 STR_FROM_MULT                                                   :{LTBLUE}{CARGO} de {STATION} (x{NUM})
@@ -2416,6 +2521,7 @@ STR_8815_NEW_VEHICLES                                           :{BLACK}Novaj Ve
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Trajno tro longas
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Trajno nut povas esti adaptataj kiam halte en deponejo
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trajno{P "" j}

 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novaj Relaj Veturiloj
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Novaj Elektraj Relaj Veturiloj
@@ -2435,16 +2541,21 @@ STR_8823_SKIP                                                   :{BLACK}Plusaltu
 STR_8824_DELETE                                                 :{BLACK}Forviŝu
 STR_8825_NON_STOP                                               :{BLACK}Senhalte
 STR_8826_GO_TO                                                  :{BLACK}Iru al
-STR_8827_FULL_LOAD                                              :{BLACK}Plene ŝarĝu
+STR_8827_FULL_LOAD                                              :{BLACK}Plenigu
 STR_8828_UNLOAD                                                 :{BLACK}Deŝarĝu
+STR_REFIT                                                       :{BLACK}Transformu
+STR_REFIT_TIP                                                   :{BLACK}Elektu ŝarĝtipon por transformo en ĉi tiu ordeno. CTRL+klako por forigi instrukcion
+STR_REFIT_ORDER                                                 :(Transformu al {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Ordenoj)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Fino de Ordenoj - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
+STR_SERVICE                                                     :{BLACK}Prizorgo
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Ne povas krei relan veturilon...
 STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Valoro: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Ŝarĝante / Deŝarĝante
+STR_TRAIN_MUST_BE_STOPPED                                       :{WHITE}Trajno estu halta en deponejo
 STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Ne povas sendi trajnon al deponejo...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Ne plu spaco por ordenoj
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Tro da ordenoj
@@ -2452,11 +2563,13 @@ STR_8833_CAN_T_INSERT_NEW_ORDER                                 :{WHITE}Ne povas
 STR_8834_CAN_T_DELETE_THIS_ORDER                                :{WHITE}Ne povas forviŝi ĉi tiun ordenon...
 STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Ne povas ŝanĝi ĉi tiun ordenon...
 STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Ne povas movi veturilon
+STR_REAR_ENGINE_FOLLOW_FRONT_ERROR                              :{WHITE}La malantaŭa maŝino ĉiam sekvos la antaŭan
 STR_8838_N_A                                                    :N/A{SKIP}
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Ne povas vendi relan veturilon...
 STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Ne eblas trovi lokan deponejon
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Ne povas haltigi/starti trajnon...
 STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}tagoj{BLACK}   Lasta prizorgo: {LTBLUE}{DATE_LONG}
+STR_SERVICING_INTERVAL_PERCENT                                  :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}%{BLACK}   Lasta prizorgo: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trajnoj - alklaku trajnon por pliaj informoj
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Kreu novajn trajnojn (bezonas trajndeponejon)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Trajnoj - alklaku trajnon por scii pli, tiru veturilon por aldoni aŭ forigi de trajno
@@ -2486,10 +2599,13 @@ STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Senhalti
 STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Enigu novan ordenon antaŭ la elektita ordeno, aŭ aldonu fine de la listo
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}La elektita ordeno igu la veturilon atendi ĝis plena ŝarĝo
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}La elektita ordeno igu la veturilon deŝarĝi
+STR_SERVICE_HINT                                                :{BLACK}Transsaltu ordenon ĝis prizorgo necesos
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nova {STRING} nun haveblas!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kosto: {CURRENCY} Pezo: {WEIGHT_S}{}Rapideco: {VELOCITY}  Forto: {POWER}{}Irkosto: po {CURRENCY} jare{}Kapablo: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Rompite
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Aĝo: {LTBLUE}{STRING}{BLACK}   Irkosto: {LTBLUE}po {CURRENCY} jare
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Pezo: {LTBLUE}{WEIGHT_S}  {BLACK}Forto: {LTBLUE}{POWER}{BLACK} Pleja rapideco: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Ĉi-jara gajno: {LTBLUE}{CURRENCY}  (lastjara: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Fidebleco: {LTBLUE}{COMMA}%  {BLACK}Rompiĝoj post lasta prizorgo: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Haltis
@@ -2506,10 +2622,15 @@ STR_886B_CAN_T_RENAME_TRAIN_VEHICLE                             :{WHITE}Ne povas
 STR_886D_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}La elektita ordeno igu la veturilon demeti la ŝarĝon
 STR_886F_TRANSFER                                               :{BLACK}Transigu

+STR_TRAIN_STOPPING                                              :{RED}Haltiĝas
+STR_TRAIN_STOPPING_VEL                                          :{RED}Haltiĝas, {VELOCITY}
 STR_INCOMPATIBLE_RAIL_TYPES                                     :Neinterŝanĝeblaj reltipoj
+STR_TRAIN_NO_POWER                                              :{RED}Senforte
+STR_TRAIN_START_NO_CATENARY                                     :Mankas ĉi-trake supera elektro, do la trajno ne povas starti

 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vojveturilo okupas la lokon
+STR_9001_ROAD_VEHICLES                                          :{WHITE}{COMPANY} - {COMMA} Vojveturilo{P "" j}
 STR_9002                                                        :{WHITE}{VEHICLE}
 STR_9003_ROAD_VEHICLE_DEPOT                                     :{WHITE}{TOWN} Vojveturila Deponejo
 STR_9004_NEW_VEHICLES                                           :{BLACK}Novaj Veturiloj
@@ -2565,7 +2686,13 @@ STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Renomu v
 STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Renomu vojveturilan tipon
 STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ne povas renomi vojveturilan tipon...
 STR_9038_GO_TO_ROADVEH_DEPOT                                    :Iru al {TOWN} Vojveturila Deponejo
+STR_SERVICE_AT_ROADVEH_DEPOT                                    :Prizorgo ĉe {TOWN} Vojveturila Deponejo

+STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Transformu vojveturilon por porti alian ŝarĝon
+STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Transformu vojveturilon
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Transformu vojveturilon por porti elektitan ŝarĝon
+STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Ne povas transformi vojveturilon...
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Elektu portotan ŝarĝon de la vojveturilo

 ##id 0x9800
 STR_9800_DOCK_CONSTRUCTION                                      :Havenkonstruado
@@ -2573,6 +2700,7 @@ STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}Havenkon
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Ne povas konstrui havenon ĉi tie...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Ŝipdeponejo
 STR_9804_NEW_SHIPS                                              :{BLACK}Novaj Ŝipoj
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Ŝipo{P "" j}
 STR_9808_NEW_SHIPS                                              :{WHITE}Novaj Ŝipoj
 STR_9809_BUILD_SHIP                                             :{BLACK}Kreu Ŝipon
 STR_CLONE_SHIP                                                  :{BLACK}Klonu Ŝipon
@@ -2696,6 +2824,7 @@ STR_A031_CAN_T_NAME_AIRCRAFT                                    :{WHITE}Ne povas
 STR_A032_NAME_AIRCRAFT                                          :{BLACK}Nomu aviadilon
 STR_A033_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Enloĝantoj festas . . .{}Unua aviadilo alvenas en {STATION}!
 STR_A034_PLANE_CRASH_DIE_IN_FIREBALL                            :{BLACK}{BIGFONT}Aviadilo Kraŝas!{}{COMMA} mortas pro fajro en {STATION}
+STR_PLANE_CRASH_OUT_OF_FUEL                                     :{BLACK}{BIGFONT}Aviadila Kraŝo!{}Aviadilo ne havis sufiĉan brulaĵon, {COMMA} mortas pro fajro!
 STR_A036                                                        :{TINYFONT}{BLACK}{STATION}
 STR_A037_RENAME                                                 :{BLACK}Renomu
 STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Renomu aviadiltipon
@@ -2729,22 +2858,33 @@ STR_PERFORMANCE_DETAIL                                          :{WHITE}Detala r
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaloj
 STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY                          :{BLACK}({CURRCOMPACT}/{CURRCOMPACT})
 STR_PERFORMANCE_DETAIL_AMOUNT_INT                               :{BLACK}({COMMA}/{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}Veturiloj:
+STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Stacioj:
 STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Malpleja gajno:
 STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Malpleja enspezo:
 STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Pleja enspezo:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Liverite:
 STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Ŝarĝo:
+STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Mono:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Prunto:
+STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Entute:
 ############ End of order list
+STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Nombro da veturiloj; tio enkalkulas vojveturilojn, trajnojn, ŝipojn kaj aviadilojn
+STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Nombro da staciaj eroj. Ĉiu parto de stacio (ekz. stacidomo, bushaltejo, flughaveno) kalkuliĝas, eĉ se konektite kiel unu stacio
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}La gajno de la malplejenspeza veturilo (de ĉiuj veturiloj pli aĝaj ol 2 jaroj)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Enspezite en la plej malaltenspeza monato de la lasta 12 kvaronoj
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Enspezite en la plej altenspeza monato de la lasta 12 kvaronoj
 STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Ŝarĝunuoj liveritaj en la lastaj 4 kvaronoj
 STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Nombro da ŝarĝtipoj liveritaj en la lasta kvarono
+STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Monkvanto de ĉi tiu kompanio en la banko
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}La monkvanto pruntita de ĉi tiu kompanio
+STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Entuta poentaro el eblaj poentoj

 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Agordoj de NewGRF
+STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Agordoj de NewGRF
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Apliku ŝanĝojn
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Agordu parametrojn
 STR_NEWGRF_TIP                                                  :{BLACK}Listo da ĉiuj instalitaj Newgrf-aj aroj. Alklaku aron por ŝanĝi la agordojn
@@ -2752,14 +2892,15 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Nun ne e
 STR_NEWGRF_FILENAME                                             :{BLACK}Dosiernomo: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vi ĉi tiel ŝanĝos al kuranta ludo; tio povas kraŝigi la ludon.{}Ĉu vi nepre volas fari tion?

 STR_NEWGRF_ADD                                                  :{BLACK}Aldonu
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Aldonu NewGRF-dosieron al la listo
 STR_NEWGRF_REMOVE                                               :{BLACK}Forviŝu
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Remove the selected NewGRF file from the list
-STR_NEWGRF_MOVEUP                                               :{BLACK}Movu Supren
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Forviŝu la elektitan dosieron de NewGRF el la listo
+STR_NEWGRF_MOVEUP                                               :{BLACK}Supren
 STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Movu la elektitan NewGRF-dosieron supren en la listo
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Movu Malsupren
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Malsupren
 STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Movu la elektitan NewGRF-dosieron malsupren en la listo
 STR_NEWGRF_FILE_TIP                                             :{BLACK}Listo da instalitaj NewGRF-dosieroj. Alklaku dosieron por ŝanĝi la parametrojn
 STR_NEWGRF_PARAMETER                                            :{BLACK}Parametroj: {SILVER}{STRING}
@@ -2775,6 +2916,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ne povas

 STR_NEWGRF_NOT_FOUND                                            :{RED}Ne trovis apartenan dosieron
 STR_NEWGRF_DISABLED                                             :{RED}Malaktiva
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Ne troviĝis apartena dosiero (ŝarĝis taŭgan GRF)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Taŭga(j) GRF(oj) ŝarĝiĝis por mankaj dosieroj
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Manka(j) GRF-dosiero(j) malŝaltiĝis
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Mankas GRF-dosiero(j) por povi ŝarĝi la ludon

 STR_CURRENCY_WINDOW                                             :{WHITE}Alia monunuo
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Interŝanĝa valoro: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2786,11 +2932,24 @@ STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Ŝanĝu
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Antaŭvido: {ORANGE}{CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Ŝanĝu parametron por alia monunuo

+STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
 STR_LORRY                                                       :{BLACK}{LORRY}
+STR_PLANE                                                       :{BLACK}{PLANE}
+STR_SHIP                                                        :{BLACK}{SHIP}

+STR_SCHEDULED_TRAINS                                            :{WHITE}{STATION} - {COMMA} Trajno{P "" j}
+STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION} - {COMMA} Vojveturilo{P "" j}
+STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Aviadilo{P "" j}
+STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Ŝipo{P "" j}

+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Montru ĉiujn trajnojn kun ĉi tiu stacio en la plano
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Montru ĉiujnvojveturilojn kun ĉi tiu stacio en la plano
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Montru ĉiujn aviadilojn kun ĉi tiu stacio en la plano
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Montru ĉiujn ŝipojn kun ĉi tiu stacio en la plano

+STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Dividitaj ordenoj de {COMMA} Veturilo{P "" j}
+STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Montru ĉiujn veturilojn kiuj dividas ĉi tiun planon

 ### depot strings

@@ -2822,12 +2981,31 @@ STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Aŭtomat
 STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Aŭtomate anstataŭu ĉiujn ŝipojn en la deponejo
 STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Aŭtomate anstataŭu ĉiujn aviadilojn en la hangaro

+STR_VEHICLE_LIST_TRAIN_DEPOT                                    :{BLACK}{STRING} - {COMMA} Trajno{P "" j}
+STR_VEHICLE_LIST_ROADVEH_DEPOT                                  :{BLACK}{STRING} - {COMMA} Vojveturilo{P "" j}
+STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING} - {COMMA} Ŝipo{P "" j}
+STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} Aviadilo{P "" j}

+STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Anstataŭu {STRING.n}
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Komencu Anstataŭi
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Ĉesu Anstataŭi
 STR_NOT_REPLACING                                               :{BLACK}Ne anstataŭante
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ne elektiĝis veturilo
+STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Elektu maŝinon por anstataŭi
+STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Elektu novan maŝinon por uzi anstataŭ la maldekstre elektitan
+STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Premu por ĉesi anstataŭi la maldekstre elektitan maŝinon
+STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Premu por komenci anstataŭi la maldekstre elektitan maŝinon per la dekstre elektitan
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Elektu fervojtipon por kiu vi volas anstataŭigi maŝinojn
+STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Montras ontan maŝinecon de la maldekstra maŝino, se anstataŭote
+STR_REPLACE_HELP                                                :{BLACK}Ĉi tio permesas vin anstataŭi maŝinojn de unu al alia tipo, kiam trajnoj de la unu tipo eniras la deponejon
+STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vagonforigo: {ORANGE}{SKIP}{STRING}
+STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ĉe aŭtomata anstataŭigo tenu saman longecon de la trajno per forigo de vagonoj (defronte), se per nova maŝino la trajno plilongiĝas
+STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Anstataŭante: {ORANGE}{SKIP}{SKIP}{STRING}
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} EKSPERIMENTA AĴO {}Ŝaltu inter maŝina kaj vagona anstataŭigo.{}Vagona anstataŭigo nur okazos se la nova vagono povas transformiĝi por porti saman ŝarĝon kiel la malnova. Por ĉiu vagono tio kontroliĝos dum anstataŭado.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Maŝino ne kreeblas

 STR_ENGINES                                                     :Maŝinoj
+STR_WAGONS                                                      :Vagonoj

 STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Alklaku por haltigi ĉiujn trajnojn en la deponejo
 STR_MASS_STOP_DEPOT_ROADVEH_TIP                                 :{BLACK}Alklaku por haltigi ĉiujn vojveturilojn en la deponejo
@@ -2842,6 +3020,8 @@ STR_MASS_START_HANGAR_TIP                                       :{BLACK}Alklaku
 STR_MASS_STOP_LIST_TIP                                          :{BLACK}Alklaku por haltigi ĉiujn veturilojn en la listo
 STR_MASS_START_LIST_TIP                                         :{BLACK}Alklaku por starti ĉiujn veturilojn en la listo

+STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
+STR_SIGN_LIST_CAPTION                                           :{WHITE}Afiŝa listo - {COMMA} Afiŝo{P "" j}

 STR_ORDER_REFIT_FAILED                                          :{WHITE}Fiasko de ordeno transformi haltigis {STRING.n} {COMMA}

@@ -2854,37 +3034,83 @@ STR_MAGLEV_VEHICLES                                             :Maglevaj Veturi

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

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

+STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosto: {GOLD}{CURRENCY}{BLACK} Pezo: {GOLD}{WEIGHT_S}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rapido: {GOLD}{VELOCITY}{BLACK}   Forto: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED                                         :{BLACK}Rapido: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Irkosto: {GOLD}po {CURRENCY} jare
+STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapablo: {GOLD}{CARGO} {STRING}
+STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Pripensite: {GOLD}{NUM}{BLACK} Vivlongo: {GOLD}{COMMA} jaroj
+STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Pleja Fidebleco: {GOLD}{COMMA}%
+STR_PURCHASE_INFO_COST                                          :{BLACK}Kosto: {GOLD}{CURRENCY}
+STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pezo: {GOLD}{WEIGHT_S}  ({WEIGHT_S})
+STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosto: {GOLD}{CURRENCY}{BLACK} Rapido: {GOLD}{VELOCITY}
+STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapablo: {GOLD}{COMMA} pasaĝeroj, {COMMA} sakoj da poŝto
+STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagonfortoj: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_S}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Transformebla al: {GOLD}
+STR_PURCHASE_INFO_ALL_TYPES                                     :Ĉiaj ŝarĝoj
+STR_PURCHASE_INFO_ALL_BUT                                       :Ĉio krom {GOLD}

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

 STR_GENERATE                                                    :{WHITE}Generu
+STR_RANDOM                                                      :{BLACK}Hazardigu
+STR_RANDOM_HELP                                                 :{BLACK}Ŝanĝu la hazardan enigon uzatan de la terengenerilo
+STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Mondgenerado
+STR_RANDOM_SEED                                                 :{BLACK}Hazarda Enigo:
+STR_RANDOM_SEED_HELP                                            :{BLACK}Klaku por enigi hazardan enigon
 STR_LAND_GENERATOR                                              :{BLACK}Landgenerilo:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Altecmapa turniĝo:
+STR_TREE_PLACER                                                 :{BLACK}Arba algoritmo:
+STR_HEIGHTMAP_ROTATION                                          :{BLACK}Mapa turniĝo:
+STR_TERRAIN_TYPE                                                :{BLACK}Terentipo:
+STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Marnivelo:
+STR_SMOOTHNESS                                                  :{BLACK}Reguleco:
+STR_SNOW_LINE_HEIGHT                                            :{BLACK}Neĝlinia alteco:
 STR_DATE                                                        :{BLACK}Dato:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}Kiom da urboj:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Kiom da industrioj:
 STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_SNOW_LINE_UP                                                :{BLACK}Altigu la neĝlinion per unu
+STR_SNOW_LINE_DOWN                                              :{BLACK}Malaltigu la neĝlinion per unu
+STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ŝanĝu altecon de la neĝlinio
+STR_START_DATE_QUERY_CAPT                                       :{WHITE}Ŝanĝu komencjaron
 STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skala averto
 STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Ne rekomendindas tro ŝanĝi la grandecon de la mapo. Ĉu daŭrigi la generadon?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Altecmapa nomo:
+STR_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
+STR_HEIGHTMAP_NAME                                              :{BLACK}Mapa nomo:
 STR_HEIGHTMAP_SIZE                                              :{BLACK}Grandeco: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Generante mondon...
 STR_GENERATION_ABORT                                            :{BLACK}Ĉesu
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Ĉesu generi mondon
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ĉu vi vere volas ĉesi generi mondon?
+STR_PROGRESS                                                    :{WHITE}{NUM}% komplete
 STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
+STR_WORLD_GENERATION                                            :{BLACK}Mondgenerado
+STR_TREE_GENERATION                                             :{BLACK}Arba generado
+STR_UNMOVABLE_GENERATION                                        :{BLACK}Nemoveblaĵa generado
+STR_CLEARING_TILES                                              :{BLACK}Generado de malglataj kaj rokaj regionoj
+STR_SETTINGUP_GAME                                              :{BLACK}Agordante ludon
+STR_PREPARING_TILELOOP                                          :{BLACK}Trakurante kvadratojn
+STR_PREPARING_GAME                                              :{BLACK}Preparante ludon
 STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Ĉi tiu ago ŝanĝis la malfacilec-nivelon al 'ŝanĝite'
+STR_SE_FLAT_WORLD                                               :{WHITE}Ebena lando
+STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generu ebenan landon
+STR_SE_RANDOM_LAND                                              :{WHITE}Hazarda lando
+STR_SE_NEW_WORLD                                                :{BLACK}Kreu novan scenaron
+STR_SE_CAPTION                                                  :{WHITE}Scenara tipo
 STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Malaltigu la altecon de ebena lando per unu
 STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Altigu la altecon de ebena lando per unu
 STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Ŝanĝu altecon de ebena lando
 STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Alteco de ebena lando:
 STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}

+STR_SMALLMAP_CENTER                                             :{BLACK}Centrigu la mapeton al la nuna loko

 ########### String for new airports
-STR_CITY_AIRPORT                                                :{BLACK}Urbo
-STR_METRO_AIRPORT                                               :{BLACK}Ĉefurba Flughaveno
+STR_SMALL_AIRPORT                                               :{BLACK}Malgranda flughaveno
+STR_CITY_AIRPORT                                                :{BLACK}Urba flughaveno
+STR_METRO_AIRPORT                                               :{BLACK}Ĉefurba flughaveno
 STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Internacia flughaveno
 STR_COMMUTER_AIRPORT                                            :{BLACK}Urbeta flughaveno
 STR_INTERCONTINENTAL_AIRPORT                                    :{BLACK}Interkontinenta
@@ -2892,6 +3118,7 @@ STR_HELIPORT                                                    :{BLACK}Helikopt
 STR_HELIDEPOT                                                   :{BLACK}Helikopterdeponejo
 STR_HELISTATION                                                 :{BLACK}Helikopterstacio

+STR_SMALL_AIRPORTS                                              :{BLACK}Malgrandaj flughavenoj
 STR_LARGE_AIRPORTS                                              :{BLACK}Grandaj flughavenoj
 STR_HUB_AIRPORTS                                                :{BLACK}Nabaj flughavenoj
 STR_HELIPORTS                                                   :{BLACK}Helikopterhaveno
--- a/lang/estonian.txt
+++ b/lang/estonian.txt
--- a/lang/finnish.txt
+++ b/lang/finnish.txt
@@ -1,6 +1,6 @@
 ##name Finnish
 ##ownname Suomi
-##isocode fi_FI.UTF-8
+##isocode fi_FI
 ##plural 0

 ##id 0x0000
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Kartta -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Pelin asetukset
 STR_00B2_MESSAGE                                                :{YELLOW}Viesti
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Viesti: {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varoitus!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Ei onnistu....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Aluetta ei voi tyhjentää....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Alkuperäiset oikeudet {COPYRIGHT} 1995 Chris Sawyer, kaikki oikeudet pidätetään
 STR_00B7_VERSION                                                :{BLACK}OpenTTD-versio {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD-yhteisö
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 The OpenTTD team
 STR_TRANSLATED_BY                                               :{BLACK}  Kääntäjä(t) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -166,7 +167,7 @@ STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Sulje
 STR_00C8_YES                                                    :{BLACK}Kyllä
 STR_00C9_NO                                                     :{BLACK}Ei
-STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Hylätäänkö peli ja palataan {STRING}-järjestelmään?
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Lopetetaanko peli ja palataan {STRING}-järjestelmään?
 STR_00CB_1                                                      :{BLACK}1
 STR_00CC_2                                                      :{BLACK}2
 STR_00CD_3                                                      :{BLACK}3
@@ -201,21 +202,21 @@ 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ä/satama
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Asemat/lentokentät/satamat
 STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Rakennus
-STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Liikenneväline
+STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Liikennevälineet
 STR_00F0_100M                                                   :{BLACK}{TINYFONT}100 m
 STR_00F1_200M                                                   :{BLACK}{TINYFONT}200 m
 STR_00F2_300M                                                   :{BLACK}{TINYFONT}300 m
 STR_00F3_400M                                                   :{BLACK}{TINYFONT}400 m
 STR_00F4_500M                                                   :{BLACK}{TINYFONT}500 m
-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ölaitos
+STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Voimala
 STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Metsä
 STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Saha
 STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Öljynjalostamo
@@ -229,7 +230,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}timanttikaivos
+STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Timanttikaivos
 STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Kuparikaivos
 STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Hedelmäviljelmä
 STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Kumiviljelmä
@@ -242,7 +243,7 @@ STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFON
 STR_0113_COLA_WELLS                                             :{BLACK}{TINYFONT}Limsakenttä
 STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}Lelukauppa
 STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}Lelutehdas
-STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}Muovikaivo
+STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}Muovilähde
 STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}Sihijuomatehdas
 STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}Kuplageneraattori
 STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Toffeelouhos
@@ -269,8 +270,8 @@ STR_012D                                                        :{WHITE}{STRING}
 STR_012E_CANCEL                                                 :{BLACK}Peruuta
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Nimeä uud.
-STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Liian monta nimeä määritelty.
-STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Nimi on jo käytössä.
+STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Liian monta nimeä määritelty
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Nimi on jo käytössä

 STR_0133_WINDOWS                                                :Windows
 STR_0134_UNIX                                                   :Unix
@@ -282,7 +283,7 @@ STR_OSNAME_OS2                                                  :OS/2

 STR_013B_OWNED_BY                                               :{WHITE}...omistaja: {STRING}
 STR_013C_CARGO                                                  :{BLACK}Rahti
-STR_013D_INFORMATION                                            :{BLACK}Tietoja
+STR_013D_INFORMATION                                            :{BLACK}Tietoa
 STR_013E_CAPACITIES                                             :{BLACK}Kapasiteetit
 STR_013E_TOTAL_CARGO                                            :{BLACK}Rahtia yhteensä
 STR_013F_CAPACITY                                               :{BLACK}Kapaisteetti: {LTBLUE}{CARGO}
@@ -294,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Uusi pel
 STR_0141_LOAD_GAME                                              :{BLACK}Lataa peli
 STR_SINGLE_PLAYER                                               :{BLACK}Yksinpeli
 STR_MULTIPLAYER                                                 :{BLACK}Moninpeli
+STR_SCENARIO_EDITOR                                             :{BLACK}Maisemaeditori

 STR_64                                                          :64
 STR_128                                                         :128
@@ -308,7 +310,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                                              :Tukiaiset

 STR_UNITS_IMPERIAL                                              :Englantilainen
 STR_UNITS_METRIC                                                :Metrinen
@@ -342,18 +344,18 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} tf
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
-STR_0154_OPERATING_PROFIT_GRAPH                                 :Käyttökatekuvaaja
-STR_0155_INCOME_GRAPH                                           :Ansiotulon kuvaaja
-STR_0156_DELIVERED_CARGO_GRAPH                                  :Kuljetetun rahdin kuvaaja
-STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Suoritehistoriakuvaaja
-STR_0158_COMPANY_VALUE_GRAPH                                    :Yhtiön arvon kuvaaja
+############ range for menu starts
+STR_0154_OPERATING_PROFIT_GRAPH                                 :Liikevoitto
+STR_0155_INCOME_GRAPH                                           :Tulot
+STR_0156_DELIVERED_CARGO_GRAPH                                  :Kuljetettu rahti
+STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Suoritehistoria
+STR_0158_COMPANY_VALUE_GRAPH                                    :Yhtiön arvo
 STR_0159_CARGO_PAYMENT_RATES                                    :Rahtimaksutaksat
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Yhtiökilpataulukko
 STR_PERFORMANCE_DETAIL_MENU                                     :Suoritearviointi
-############ range for menu	ends
+############ range for menu ends

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

 ############ range for months starts
 STR_0162_JAN                                                    :01.
@@ -417,7 +431,7 @@ STR_0171_PAUSE_GAME                                             :{BLACK}Tauko
 STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Pelin tallennus, hylkääminen ja lopetus.
 STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Näytä luettelo yhtiön asemista.
 STR_0174_DISPLAY_MAP                                            :{BLACK}Näytä kartta.
-STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Näytä kartta, kaupunkihakemisto
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Näytä kartta, kaupunkihakemisto.
 STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Näytä kaupunkihakemisto.
 STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Näytä yhtiön taloustiedot.
 STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Näytä yhtiön yleiset tiedot.
@@ -438,7 +452,7 @@ STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Maa-alue
 STR_0187_OPTIONS                                                :{BLACK}Asetukset
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
 STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
-STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Huoltoväliä ei voi muuttaa...
+STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Huoltoväliä ei voi muuttaa.
 STR_018B_CLOSE_WINDOW                                           :{BLACK}Sulje ikkuna
 STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Ikkunan otsake - vedä tästä siirtääksesi ikkunaa
 STR_STICKY_BUTTON                                               :{BLACK}Merkitse ikkuna tahmeaksi; 'Sulje kaikki ikkunat'-nappi ei vaikuta tahmeisiin ikkunoihin.
@@ -468,11 +482,11 @@ 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ää pikaisesti korvata.
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} on todella vanha.
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} on todella vanha ja täytyy korvata pikaisesti.
 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 hinta: {LTBLUE}-
+STR_01A5_COST_TO_CLEAR                                          :{BLACK}Puhdistuksen hinta: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :-
 STR_01A7_OWNER                                                  :{BLACK}Omistaja: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Kunta: {LTBLUE}{STRING}
@@ -480,7 +494,7 @@ STR_01A9_NONE                                                   :Ei mitään
 STR_01AA_NAME                                                   :{BLACK}Nimi
 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.
@@ -512,7 +526,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 +535,7 @@ STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Vastaano
 STR_01D1_8                                                      :({COMMA}/8 {STRING})
 STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz-jukeboksi
 STR_01D3_SOUND_MUSIC                                            :Ääni/musiikki
-STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Näytä ääniasetukset.
+STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Näytä ääni- ja musiikkiasetukset
 STR_01D5_ALL                                                    :{TINYFONT}Kaikki
 STR_01D6_OLD_STYLE                                              :{TINYFONT}Vanha tyyli
 STR_01D7_NEW_STYLE                                              :{TINYFONT}Uusi tyyli
@@ -535,7 +549,7 @@ STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Hyppää
 STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Hyppää seuraavaan raitaan.
 STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Pysäytä musiikki.
 STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Aloita musiikki.
-STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Aseta liukusäätimiä vetämällä sopiva äänenvoimakkuus musiikille ja äänitehosteille.
+STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Aseta liukusäätimillä sopiva äänenvoimakkuus musiikille ja tehosteille.
 STR_01E3                                                        :{DKGREEN}{TINYFONT}--
 STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
@@ -543,23 +557,23 @@ STR_01E6                                                        :{DKGREEN}{TINYF
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Raita{SETX 88}Nimi
 STR_01E9_SHUFFLE                                                :{TINYFONT}Sekoita
-STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Ohjelmoi
+STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Soittolista
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Soittolistan valinta
 STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
 STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA} "{STRING}"
 STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Raita
 STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Soittolista - '{STRING}'
-STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Tyhjää
+STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Tyhjennä
 STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Tallenna
-STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Raitojen nykyinen soittolista
+STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Nykyinen soittolista
 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äjän määritettävissä)
 STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Valitse 'oma 2' (käyttäjän määritettävissä)
-STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Tyhjää nykyinen soittolista (vain Oma1 tai Oma2)
+STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Tyhjennä nykyinen soittolista (vain Oma1 tai Oma2)
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Tallenna musiikkiasetukset
-STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Napsauta musiikkiraitaa lisätäksesi sen nykyiseen soittolistaan (vain Oma1 tai Oma2).
+STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Valitse musiikkiraita lisätäksesi sen nykyiseen soittolistaan (vain Oma1 tai Oma2).
 STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Klikkaa raitaa poistaaksesi se nykyisestä ohjelmasta (ainoastaan Custom1 tai Custom2)
 STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Sekoittaminen päälle/pois
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Näytä musiikkiraitojen valintaikkuna
@@ -600,22 +614,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} saavuttaa arvon '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} yhtiöstä {COMPANY} saavuttaa arvon '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Luo skenaario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Skenaariomuokkain
-STR_0223_LAND_GENERATION                                        :{WHITE}Maan luominen
+STR_0223_LAND_GENERATION                                        :{WHITE}Maanrakennus
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Satunnainen maa
-STR_0227_RESET_LAND                                             :{BLACK}Nollaa maa
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Suurenna madallettavan/korotettavan maa-alueen kokoa.
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Pienennä madallettavan/korotettavan maa-alueen kokoa.
-STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Luo satunnainen maa.
+STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Luo satunnainen maa
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Nollaa maasto
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Nollaa maasto
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Käytä korkeuskarttaa
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Käytä korkeuskarttaa
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Nollataanko maasto?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Luo maasto
 STR_022F_TOWN_GENERATION                                        :{BLACK}Luo kaupunkeja
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Luo teollisuutta
@@ -633,10 +641,10 @@ 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 paikkaan
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Luo teollisuutta
 STR_0240_COAL_MINE                                              :{BLACK}Hiilikaivos
-STR_0241_POWER_STATION                                          :{BLACK}Sähkölaitos
+STR_0241_POWER_STATION                                          :{BLACK}Voimala
 STR_0242_SAWMILL                                                :{BLACK}Saha
 STR_0243_FOREST                                                 :{BLACK}Metsä
 STR_0244_OIL_REFINERY                                           :{BLACK}Öljynjalostamo
@@ -757,7 +765,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Liikenne
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Tallenna omat liikennevälineiden mallien nimet levylle.

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Pelin asetukset
 STR_02C5_DIFFICULTY_SETTINGS                                    :Vaikeusasetukset
 STR_02C7_CONFIG_PATCHES                                         :Muokkaa paikkauksia
@@ -771,16 +779,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Täysi
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Kaikki yksityiskohdat
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Läpinäkyvät rakennukset
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Läpinäkyvät asemakyltit
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Maa-alueen tiedot
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Konsoli
 STR_02D7_SCREENSHOT_CTRL_S                                      :Kuvakaappaus (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Valtava kuvakaapp. (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Tietoja "OpenTTD":stä
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}pois
 STR_02DA_ON                                                     :{BLACK}päällä
@@ -837,7 +845,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Valitse
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Valitse 'lelumaan' ilmasto.
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Rahoita uuden teollisuuden rakentamista.

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Teollisuushakemisto
 STR_0313_FUND_NEW_INDUSTRY                                      :Rakenna uutta teollisuutta
 ############ range ends here
@@ -883,7 +891,7 @@ STR_TOWNNAME_DANISH                                             :Tanskalainen
 STR_TOWNNAME_TURKISH                                            :turkkilainen
 STR_TOWNNAME_ITALIAN                                            :Italialainen
 STR_TOWNNAME_CATALAN                                            :Katalonialainen
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Punta (£)
 STR_CURR_USD                                                    :Dollari ($)
@@ -1029,6 +1037,7 @@ STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Vierit
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Salli viranomaisten lahjominen: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Epäyhtenäiset asemat: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Uusi globaali tienhakualgor. (NPF, korvaa NTP:n): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Kerroin rahdin painolle raskaiden junien simuilointiin: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Salli aina pienet lentokentät: {ORANGE}{STRING}

@@ -1074,6 +1083,7 @@ STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Näytä
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Ei yhtään
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Oma yritys
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Kaikki yritykset
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Suosi ryhmäkeskustelua <ENTER> {ORANGE}{STRING} kanssa

 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Junia/pelaaja: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Ajoneuvoja/pelaaja: {ORANGE}{STRING}
@@ -1298,6 +1308,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Salasan
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}PALVELIN KIINNI
 STR_NETWORK_SERVER_FULL                                         :{SILVER}PALVELIN TÄYNNÄ
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIO EI TÄSMÄÄ
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF YHTEENSOPIMATTOMUUS

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Liity peliin

@@ -1843,11 +1854,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Kuplageneraatto
 STR_4825_TOFFEE_QUARRY                                          :Toffeelouhos
 STR_4826_SUGAR_MINE                                             :Sokerikaivos

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Tarvitsee: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Tarvitsee: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Tarvitsee: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Tuotto viime kuussa:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}{NBSP}% kuljetettu)
@@ -1920,8 +1931,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Maa-alue
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...omistat sen jo!


-############ 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                                                  :Nimetön
@@ -1964,7 +1975,7 @@ STR_SV_STNAME_LOWER                                             :Ala-{STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING}, helikopterikenttä
 STR_SV_STNAME_FOREST                                            :{STRING}, metsä

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Vaikeusaste
@@ -2177,7 +2188,7 @@ STR_LIVERY_STEAM                                                :Höyryveturi
 STR_LIVERY_DIESEL                                               :Dieselveturi
 STR_LIVERY_ELECTRIC                                             :Sähköveturi
 STR_LIVERY_MONORAIL                                             :Yksiraiteinen veturi
-STR_LIVERY_MAGLEV                                               :Maglev veturi
+STR_LIVERY_MAGLEV                                               :Maglev-veturi
 STR_LIVERY_DMU                                                  :DMU
 STR_LIVERY_EMU                                                  :EMU
 STR_LIVERY_PASSENGER_WAGON_STEAM                                :Matkustajavaunu (höyry)
@@ -2199,7 +2210,7 @@ STR_LIVERY_SHIP_TIP                                             :{BLACK}Näytä
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Näytä lentokoneiden väriteemat
 STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Valitse valitulle teemalle ensisijainen väri
 STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Valitse valitulle teemalle toissijainen väri
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Valitse muutettava väriteema, tai valitse useita CTRL+klikkaus. Klikkaa valintalaatikkoa valitaksesi teeman
+STR_LIVERY_PANEL_TIP                                            :{BLACK}Valitse muutettava väriteema, tai valitse useita CTRL pohjassa. Paina valintalaatikkoa valitaksesi teeman

 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (höyry)
@@ -2878,16 +2889,35 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Yhtään
 STR_NEWGRF_FILENAME                                             :{BLACK}Tiedostonimi: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5-summa: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Olet tekemässä muutoksia käynnissä olevaan peliin. OpenTTD voi kaatua.{}Oletko varma?

 STR_NEWGRF_ADD                                                  :{BLACK}Lisää
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Lisää NewGRF-tiedosto listaan
 STR_NEWGRF_REMOVE                                               :{BLACK}Poista
 STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Poista valittu NewGRF-tiedosto listalta
 STR_NEWGRF_MOVEUP                                               :{BLACK}Siirrä ylös
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa ylöspäin
 STR_NEWGRF_MOVEDOWN                                             :{BLACK}Siirrä alas
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa alaspäin
+STR_NEWGRF_FILE_TIP                                             :{BLACK}Lista asennetuista NewGRF-tiedostoista. Valitse tiedosto muokataksesi sen parametreja.
 STR_NEWGRF_PARAMETER                                            :{BLACK}Parametrit: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Anna NewGRF-parametrit
+STR_NEWGRF_NO_INFO                                              :{BLACK}Ei tietoa

+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}NewGRF-tiedostot
+STR_NEWGRF_ADD_FILE                                             :{BLACK}Lisää valintaan
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Lisää valittu NewGRF-tiedosto peliin
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Päivitä
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Päivitä saatavilla olevien NewGRF-tiedostojen lista
+STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ei voi lisätä tiedostoa: duplicate GRF ID

+STR_NEWGRF_NOT_FOUND                                            :{RED}Sopivaa tiedostoa ei löydy
+STR_NEWGRF_DISABLED                                             :{RED}Ei käytössä
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Sopivaa tiedostoa ei löytynyt (korvaava GRF ladattu)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Yhteensopivat GRF:t ladattu puuttuvien tiedostojen korvaamiseksi
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Puuttuvat GRF tiedostot ovat poistettu käytöstä
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Puuttuvat GRF tiedostot tarvitaan pelin lataamiseksi.

 STR_CURRENCY_WINDOW                                             :{WHITE}Oma valuutta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vaihtokurssi: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2997,7 +3027,7 @@ STR_ORDER_REFIT_FAILED                                          :{WHITE}Käskyn

 STR_RAIL_VEHICLES                                               :Rautatiejunat
 STR_ELRAIL_VEHICLES                                             :Sähköjunat
-STR_MONORAIL_VEHICLES                                           :Yksiraidejunat
+STR_MONORAIL_VEHICLES                                           :Yksiraiteiset
 STR_MAGLEV_VEHICLES                                             :Maglev-junat

 ############ End of list of rail types
--- a/lang/french.txt
+++ b/lang/french.txt
@@ -1,6 +1,6 @@
 ##name French
 ##ownname Français
-##isocode fr_FR.UTF-8
+##isocode fr_FR
 ##plural 2
 ##gender m m2 f

@@ -155,11 +155,12 @@ STR_00B0_MAP                                                    :{WHITE}Carte -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Options
 STR_00B2_MESSAGE                                                :{YELLOW}Message
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Message de {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Attention!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Impossible d'exécuter....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Impossible de balayer....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Tous droits réservés
 STR_00B7_VERSION                                                :{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 L'équipe OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 L'équipe OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Traducteur(s) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -295,6 +296,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nouvelle
 STR_0141_LOAD_GAME                                              :{BLACK}Charger une Partie
 STR_SINGLE_PLAYER                                               :{BLACK}Un joueur
 STR_MULTIPLAYER                                                 :{BLACK}Multijoueurs
+STR_SCENARIO_EDITOR                                             :{BLACK}Éditeur de Scénario

 STR_64                                                          :64
 STR_128                                                         :128
@@ -343,7 +345,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} ton-force
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Profit d'opération
 STR_0155_INCOME_GRAPH                                           :Revenu
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Cargaison livrée
@@ -352,7 +354,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Valeur de la co
 STR_0159_CARGO_PAYMENT_RATES                                    :Valeur des marchandises
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Classement des compagnies
 STR_PERFORMANCE_DETAIL_MENU                                     :Détail des performances
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Sauvegarder la partie
@@ -394,6 +396,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacité
 STR_NO_WAITING_CARGO                                            :{BLACK}Pas de marchandises en attente
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Tous les types de station
 STR_SELECT_ALL_TYPES                                            :{BLACK}Tous les types de marchandise (y compris pas en attente)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trains disponibles
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Véhicules disponibles
+STR_AVAILABLE_SHIPS                                             :{BLACK}Navires disponibles
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aéronefs disponibles
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Voir la liste des modèles disponibles pour ce type de véhicules.
 STR_MANAGE_LIST                                                 :{BLACK}Gérer la liste
 STR_MANAGE_LIST_TIP                                             :{BLACK}Envoyer les instructions à tous les véhicules de cette liste
@@ -489,7 +495,7 @@ STR_01A9_NONE                                                   :Aucun
 STR_01AA_NAME                                                   :{BLACK}Nom
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

-############ range for days	starts
+############ range for days starts
 STR_01AC_1ST                                                    :1er
 STR_01AD_2ND                                                    :2
 STR_01AE_3RD                                                    :3
@@ -521,7 +527,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}

@@ -609,22 +615,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} atteint le niveau de '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} atteint le niveau de '{STRING}' !
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Créer Scénario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Éditeur de Scénario
 STR_0223_LAND_GENERATION                                        :{WHITE}Génération de terrain
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Générer un terrain
-STR_0227_RESET_LAND                                             :{BLACK}RAZ du terrain
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Augmenter la quantité de terre à modifier
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Diminuer la quantité de terre à modifier
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Générer une terre aléatoire
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Réinitialiser le terrain
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Réinitialiser le terrain
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Carte d'altitude
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Utiliser une carte d'altitude
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Voulez-vous vraiment réinitialiser le terrain?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Créer le terrain
 STR_022F_TOWN_GENERATION                                        :{BLACK}Créer les villes
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Créer les industries
@@ -642,7 +642,7 @@ STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...Il n'
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Augmenter la taille de la ville
 STR_023C_EXPAND                                                 :{BLACK}Agrandir
 STR_023D_RANDOM_TOWN                                            :{BLACK}Générer une ville
-STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Construire une ville dans un emplacement aléatoire
+STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Construire une ville à un emplacement aléatoire
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Créer les industries
 STR_0240_COAL_MINE                                              :{BLACK}Mine de Charbon
 STR_0241_POWER_STATION                                          :{BLACK}Centrale Électrique
@@ -678,41 +678,41 @@ STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}Usine de
 STR_025F_BUBBLE_GENERATOR                                       :{BLACK}Générateur de Bulles
 STR_0260_TOFFEE_QUARRY                                          :{BLACK}Carrière de Caramel
 STR_0261_SUGAR_MINE                                             :{BLACK}Mine de Sucre
-STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Construire Mine de Charbon
-STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Construire Centrale Électrique
-STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Construire Scierie
+STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Construire une mine de charbon
+STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Construire une centrale électrique
+STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Construire une scierie
 STR_0265_PLANT_FOREST                                           :{BLACK}Planter une Forêt
 STR_0266_CONSTRUCT_OIL_REFINERY                                 :{BLACK}Construire une raffinerie pétrolière
 STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY                             :{BLACK}La construire d'une plate-forme pétrolière ne peut se faire qu'aux bords de la carte
-STR_0268_CONSTRUCT_FACTORY                                      :{BLACK}Construire Usine
-STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Construire Aciérie
-STR_026A_CONSTRUCT_FARM                                         :{BLACK}Construire Ferme
-STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Construire Mine de Fer
-STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Construire puits de pétrole
-STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Construire Banque (Peut seulement être construite dans les villes ayant plus de 1200 habitants)
-STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Construire Usine papetière
-STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Construire Usine Agroalimentaire
-STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Construire Imprimerie
-STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Construire Mine d'Or
-STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Construire Banque (Peut seulement être construite en ville)
-STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Construire Scierie (pour la coupe de forêt tropicale et la production de Bois)
+STR_0268_CONSTRUCT_FACTORY                                      :{BLACK}Construire une usine
+STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Construire une aciérie
+STR_026A_CONSTRUCT_FARM                                         :{BLACK}Construire une ferme
+STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Construire une mine de fer
+STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Construire un puit de pétrole
+STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Construire une banque (Peut seulement être construite dans les villes ayant plus de 1200 habitants)
+STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Construire une usine papetière
+STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Construire une usine agroalimentaire
+STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Construire une imprimerie
+STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Construire une mine d'or
+STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Construire une banque (Peut seulement être construite en ville)
+STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Construire une scierie (pour la coupe de forêt tropicale et la production de Bois)
 STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}Semer une Plantation de Fruits
 STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Semer une Plantation de Caoutchouc
-STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Construire Source d'eau
-STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Construire Château d'eau (Peut seulement être construite en ville)
-STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Construire Mine de Diamant
-STR_0279_CONSTRUCT_COPPER_ORE_MINE                              :{BLACK}Construire Mine de Cuivre
+STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Construire une source d'eau
+STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Construire un château d'eau (Peut seulement être construite en ville)
+STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Construire une mine de diamants
+STR_0279_CONSTRUCT_COPPER_ORE_MINE                              :{BLACK}Construire une mine de cuivre
 STR_027A_PLANT_COTTON_CANDY_FOREST                              :{BLACK}Semer une Forêt de Barbe à Papa
-STR_027B_CONSTRUCT_CANDY_FACTORY                                :{BLACK}Construire Usine de Sucreries
-STR_027C_CONSTRUCT_BATTERY_FARM                                 :{BLACK}Construire Ferme de Batteries
-STR_027D_CONSTRUCT_COLA_WELLS                                   :{BLACK}Construire Puits de Cola
-STR_027E_CONSTRUCT_TOY_SHOP                                     :{BLACK}Construire Boutique de Jouets
-STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}Construire Usine de Jouets
-STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}Construire Fontaines de Plastique
-STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}Construire Usine de Boissons Gazeuses
-STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Construire Générateur de Bulles
-STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Construire Carrière de Caramel
-STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Construire Mine de Sucre
+STR_027B_CONSTRUCT_CANDY_FACTORY                                :{BLACK}Construire une usine de sucreries
+STR_027C_CONSTRUCT_BATTERY_FARM                                 :{BLACK}Construire une ferme de batteries
+STR_027D_CONSTRUCT_COLA_WELLS                                   :{BLACK}Construire un puit de cola
+STR_027E_CONSTRUCT_TOY_SHOP                                     :{BLACK}Construire une boutique de jouets
+STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}Construire une usine de jouets
+STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}Construire une fontaine de plastique
+STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}Construire une usine de boissons gazeuses
+STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Construire un générateur de bulles
+STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Construire une carrière de caramel
+STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Construire une mine de sucre
 STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Impossible de construire {STRING} ici...
 STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...doit d'abord construire une ville
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...Droit à un par ville seulement
@@ -766,7 +766,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Sélecti
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Sauvegarder noms personnalisés de conception de véhicule

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Options du Jeu
 STR_02C5_DIFFICULTY_SETTINGS                                    :Niveau de Difficulté
 STR_02C7_CONFIG_PATCHES                                         :Configuration Avancée
@@ -780,16 +780,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Animat
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Détails maximums
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Édifices transparents
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Nom de station transparent
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Outil d'Inspection
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Inverser Console
 STR_02D7_SCREENSHOT_CTRL_S                                      :Copie d'écran (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Copie géante d'écran (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :À Propos de 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Inactif
 STR_02DA_ON                                                     :{BLACK}Actif
@@ -846,7 +846,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Sélecti
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Sélectionner l'environnement 'Jouets'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Financer la construction de nouvelles industries

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Annuaire des industries
 STR_0313_FUND_NEW_INDUSTRY                                      :Financer une nouvelle industrie
 ############ range ends here
@@ -879,7 +879,7 @@ STR_TOWNNAME_LATIN_AMERICAN                                     :Latino-Americai
 STR_TOWNNAME_SILLY                                              :Drôles
 STR_TOWNNAME_SWEDISH                                            :Suédois
 STR_TOWNNAME_DUTCH                                              :Hollandais
-STR_TOWNNAME_FINNISH                                            :Finnish
+STR_TOWNNAME_FINNISH                                            :Finlandais
 STR_TOWNNAME_POLISH                                             :Polonais
 STR_TOWNNAME_SLOVAKISH                                          :Slovaques
 STR_TOWNNAME_NORWEGIAN                                          :Norvégiens
@@ -892,7 +892,7 @@ STR_TOWNNAME_DANISH                                             :Danois
 STR_TOWNNAME_TURKISH                                            :Turques
 STR_TOWNNAME_ITALIAN                                            :Italien
 STR_TOWNNAME_CATALAN                                            :Catalan
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Livre (£)
 STR_CURR_USD                                                    :Dollar ($)
@@ -1076,7 +1076,7 @@ STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :Horaire
 STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}Le terrain d'un scénario plat a pour altitude : {ORANGE}{STRING}

 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Etendue max. des stations: {ORANGE}{STRING} {RED}Attention: Valeur élevée = jeu lent
-STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Entretenir automatiquement les hélicoptères à l'heliport: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Entretenir automatiquement les hélicoptères à l'héliport: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Relier la barre d'outils Paysage avec celle des rails/routes/eau et aéroport: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Inverser la direction lors du défilement avec la souris : {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Montrer une infobulle de mesure lors de l'utilisation de divers outils de construction: {ORANGE}{STRING}
@@ -1241,7 +1241,7 @@ STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Construi
 STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Construire une mine de fer
 STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Financer une plantation de fruits
 STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Financer une plantation de caoutchouc
-STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Financer la construction d'une Source d'eau
+STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Financer la construction d'une source d'eau
 STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Planter une forêt de barbe à papa
 STR_CONSTRUCT_BATTERY_FARM_TIP                                  :{BLACK}Financer une ferme de piles
 STR_CONSTRUCT_COLA_WELLS_TIP                                    :{BLACK}Forer pour trouver du cola
@@ -1414,6 +1414,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste de
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Aucun périphérique réseau trouvé ou programme compilé sans ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Aucune partie réseau n'a été trouvée
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Le serveur n'a pas répondu à la requête
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Echec de la connexion à cause de NewGRF différents
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} La synchronisation de la partie réseau a échouée.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} La connection de la partie réseau a été perdue.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} La sauvegarde serveur n'a pas pu être chargée.
@@ -1435,6 +1436,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :erreur de désy
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :chargement de la carte impossible
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connection perdue
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :erreur de protocole
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF différents
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :non autorisé
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :paquet étrange reçu
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :révision incorrecte
@@ -1838,7 +1840,7 @@ STR_4813_DIAMOND_MINE                                           :{G=f}Mine de di
 STR_4814_IRON_ORE_MINE                                          :{G=f}Mine de fer
 STR_4815_FRUIT_PLANTATION                                       :{G=f}Plantation de fruits
 STR_4816_RUBBER_PLANTATION                                      :{G=f}Plantation de caoutchouc
-STR_4817_WATER_SUPPLY                                           :{G=m}Réservoir d'eau
+STR_4817_WATER_SUPPLY                                           :{G=f}Source d'eau
 STR_4818_WATER_TOWER                                            :{G=m}Château d'eau
 STR_4819_FACTORY                                                :{G=f}Usine
 STR_481A_FARM                                                   :{G=f}Ferme
@@ -1855,11 +1857,11 @@ STR_4824_BUBBLE_GENERATOR                                       :{G=m}Générate
 STR_4825_TOFFEE_QUARRY                                          :{G=f}Carrière de caramel
 STR_4826_SUGAR_MINE                                             :{G=f}Mine de sucre

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Nécessite: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Nécessite: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Nécessite: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Production le mois dernier:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transporté)
@@ -1932,8 +1934,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Impossib
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...il vous appartient déjà!


-############ 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                                                  :Non nommé
@@ -1973,10 +1975,10 @@ 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éli-port
+STR_SV_STNAME_HELIPORT                                          :{STRING} Héliport
 STR_SV_STNAME_FOREST                                            :{STRING} Forêt

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Niveau de difficulté
@@ -2467,9 +2469,9 @@ STR_80F9_PLODDYPHUT_500                                         :Ploddyphut 500
 STR_80FA_FLASHBANG_X1                                           :Flashbang X1
 STR_80FB_JUGGERPLANE_M1                                         :Juggerplane M1
 STR_80FC_FLASHBANG_WIZZER                                       :Flashbang Wizzer
-STR_80FD_TRICARIO_HELICOPTER                                    :Tricario Hélicoptère
-STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2 Hélicoptère
-STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut Hélicoptère
+STR_80FD_TRICARIO_HELICOPTER                                    :Hélicoptère Tricario
+STR_80FE_GURU_X2_HELICOPTER                                     :Hélicoptère Guru X2
+STR_80FF_POWERNAUT_HELICOPTER                                   :Hélicoptère Powernaut
 STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Communiqué du fabriquant d'engins
 STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Nous venons juste d'inventer: {STRING} - Voulez vous l'exclusivité de ce véhicule pendant un an, afin que nous puissions le tester avant sa mise sur le marché ?
 STR_8102_RAILROAD_LOCOMOTIVE                                    :{G=f}locomotive
@@ -2890,6 +2892,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Il n'y a
 STR_NEWGRF_FILENAME                                             :{BLACK}Nom de fichier: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vous êtes sur le point de faire des changements dans une partie en cours; cela peut faire planter OpenTTD.{}Etes-vous absolument sûr ?

 STR_NEWGRF_ADD                                                  :{BLACK}Ajouter
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Ajouter un fichier NewGRF à la liste
@@ -2913,6 +2916,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ajout im

 STR_NEWGRF_NOT_FOUND                                            :{RED}Fichier correspondant non trouvé
 STR_NEWGRF_DISABLED                                             :{RED}Désactivé
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Fichier exact non trouvé (GRF compatible chargé)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}GRF(s) compatible(s) chargé(s) pour les fichiers absents
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Fichier(s) GRF absent(s) désactivés
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Fichier(s) GRF absent(s) pour pouvoir charger la partie

 STR_CURRENCY_WINDOW                                             :{WHITE}Devise personnalisée
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taux de change : {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2944,7 +2952,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordres p
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Afficher tous les véhicules partageant ce programme

 ### depot strings
-
 STR_SELL                                                        :{BLACK}Vendre
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Vous êtes sur le point de vendre tous les véhicules du dépot
 STR_ARE_YOU_SURE                                                :{BLACK}Etes-vous sûr?
@@ -3107,14 +3114,14 @@ STR_METRO_AIRPORT                                               :{BLACK}Aéropor
 STR_INTERNATIONAL_AIRPORT                                       :{BLACK}International
 STR_COMMUTER_AIRPORT                                            :{BLACK}de Banlieue
 STR_INTERCONTINENTAL_AIRPORT                                    :{BLACK}Intercontinental
-STR_HELIPORT                                                    :{BLACK}Héli-tour
-STR_HELIDEPOT                                                   :{BLACK}Héli-dépôt
-STR_HELISTATION                                                 :{BLACK}Héli-station
+STR_HELIPORT                                                    :{BLACK}Hélitour
+STR_HELIDEPOT                                                   :{BLACK}Hélidépôt
+STR_HELISTATION                                                 :{BLACK}Hélistation

 STR_SMALL_AIRPORTS                                              :{BLACK}Petits aéroports
 STR_LARGE_AIRPORTS                                              :{BLACK}Grands aéroports
 STR_HUB_AIRPORTS                                                :{BLACK}Aéroports Internodaux
-STR_HELIPORTS                                                   :{BLACK}Héli-ports
+STR_HELIPORTS                                                   :{BLACK}Héliports

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

--- a/lang/galician.txt
+++ b/lang/galician.txt
@@ -1,6 +1,6 @@
 ##name Galician
 ##ownname Galego
-##isocode gl_ES.UTF-8
+##isocode gl_ES
 ##plural 0

 ##id 0x0000
@@ -158,7 +158,7 @@ STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Non pode
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Non podes limpar esta área....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright Orixinal {COPYRIGHT} 1995 Chris Sawyer, Tódolos dereitos reservados
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versión {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 O Equipo de OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 O Equipo de OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Traductor(es) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -286,8 +286,10 @@ STR_013D_INFORMATION                                            :{BLACK}Informac
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
 STR_013E_TOTAL_CARGO                                            :{BLACK}Carga Total
 STR_013F_CAPACITY                                               :{BLACK}Capacidade: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT                                               :{BLACK}Capacidade: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidade) deste tren:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nova Partida
 STR_0141_LOAD_GAME                                              :{BLACK}Cargar Partida
 STR_SINGLE_PLAYER                                               :{BLACK}Un Xogador
@@ -339,7 +341,7 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lbf
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :G. beneficios operativos
 STR_0155_INCOME_GRAPH                                           :Gráfica de ingresos
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Gráfica de carga entregada
@@ -348,7 +350,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Gráfica do Val
 STR_0159_CARGO_PAYMENT_RATES                                    :Taxas de pago polas cargas
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Táboa da Liga de compañías
 STR_PERFORMANCE_DETAIL_MENU                                     :Puntuación de rendemento detallado
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Acerca de OpenTTD
 STR_015C_SAVE_GAME                                              :Grabar Partida
@@ -384,7 +386,13 @@ STR_ENGINE_SORT_INTRO_DATE                                      :Data de Present
 STR_ENGINE_SORT_RUNNING_COST                                    :Coste Mantemento
 STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Potencia/Coste Mantemento
 STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacidade De Carga
+STR_NO_WAITING_CARGO                                            :{BLACK}Non queda ningún tipo de carga en espera
+STR_MANAGE_LIST                                                 :{BLACK}Xestionar lista
 STR_REPLACE_VEHICLES                                            :Reemplazar Vehículos
+STR_SEND_TRAIN_TO_DEPOT                                         :Enviar o Depósito
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar o Depósito
+STR_SEND_SHIP_TO_DEPOT                                          :Enviar o Depósito
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar o Hangar

 ############ range for months starts
 STR_0162_JAN                                                    :Xan
@@ -470,7 +478,7 @@ STR_01A9_NONE                                                   :Ningún
 STR_01AA_NAME                                                   :{BLACK}Nome
 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º
@@ -502,7 +510,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}

@@ -589,20 +597,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}¡{COMPANY} logra o status de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}¡{PLAYERNAME} de {COMPANY} logra o status '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Crear Escenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de Escenario
 STR_0223_LAND_GENERATION                                        :{WHITE}Xeración de Terreo
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Terreo Aleatorio
-STR_0227_RESET_LAND                                             :{BLACK}Reiniciar Terreo
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Aumenta-lo tamaño de terreo a baixar/subir
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Disminuí-lo tamaño de terreo a baixar/subir
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Xerar terreo aleatorio
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reiniciar paisaxe
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Reiniciar paisaxe
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}¿Está seguro de querer reinicia-la paisaxe?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Xeración de paisaxe
 STR_022F_TOWN_GENERATION                                        :{BLACK}Xeración de cidades
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Xeración de industrias
@@ -742,7 +746,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Selecci
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Graba-los nomes dos deseños dos vehículos persoalizados no disco

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Opcións da Partida
 STR_02C5_DIFFICULTY_SETTINGS                                    :Configuración de Dificultade
 STR_02C7_CONFIG_PATCHES                                         :Configuración dos Parches
@@ -756,16 +760,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Animac
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Detalle completo
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Edificios transparentes
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Sinais de estación transparentes
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Información de área de terreo
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Des/Activar Consola
 STR_02D7_SCREENSHOT_CTRL_S                                      :Captura de Pantalla (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Capt.Pant. Xigante (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Acerca de 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Off
 STR_02DA_ON                                                     :{BLACK}On
@@ -821,7 +825,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Seleccio
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Selecciona-lo estilo da paisaxe 'Xoguetelandia'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Fundar unha nova industria

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Directorio de Industrias
 STR_0313_FUND_NEW_INDUSTRY                                      :Fundar unha nova industria
 ############ range ends here
@@ -867,7 +871,7 @@ STR_TOWNNAME_DANISH                                             :Danés
 STR_TOWNNAME_TURKISH                                            :Turco
 STR_TOWNNAME_ITALIAN                                            :Italiano
 STR_TOWNNAME_CATALAN                                            :Catalán
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Libras (£)
 STR_CURR_USD                                                    :Dólares ($)
@@ -894,6 +898,7 @@ STR_CURR_RUR                                                    :Rublo Ruso (RUR
 STR_CURR_SIT                                                    :Tolar Esloveno (SIT)
 STR_CURR_SEK                                                    :Corona Sueca(SEK)
 STR_CURR_YTL                                                    :Lira Turca (YTL)
+STR_CURR_BRR                                                    :Real Brasileño (BRL)

 STR_CURR_CUSTOM                                                 :Persoal...

@@ -1173,6 +1178,7 @@ STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Arrastra

 STR_DRAG_DROP                                                   :{BLACK}Arrastrar e Soltar
 STR_STATION_DRAG_DROP                                           :{BLACK}Construír estación arrastrando e soltando
+STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Selecciona o tipo da estación a construir

 STR_FAST_FORWARD                                                :{BLACK}Avance rápido da partida
 STR_MESSAGE_HISTORY                                             :{WHITE}Historial de Mensaxes
@@ -1409,6 +1415,7 @@ STR_NETWORK_SERVER_REBOOT                                       :{WHITE} O servi

 STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
+STR_NETWORK_SPECTATORS                                          :Espectadores

 STR_NETWORK_CLIENTLIST_NONE                                     :(ningún)
 STR_NETWORK_CLIENTLIST_KICK                                     :Patear
@@ -1794,11 +1801,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Xerador de Burb
 STR_4825_TOFFEE_QUARRY                                          :Canteira de Toffee
 STR_4826_SUGAR_MINE                                             :Mina de Azucre

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Require: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Require: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Require: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producción no último mes:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transportado)
@@ -1871,8 +1878,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Non se p
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...¡xa é da túa propiedade!


-############ 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                                                  :Sen Nome
@@ -1915,7 +1922,7 @@ STR_SV_STNAME_LOWER                                             :Inferior {STRIN
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliporto
 STR_SV_STNAME_FOREST                                            :{STRING} Bosque

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Nivel de Dificultade
@@ -2129,6 +2136,12 @@ STR_LIVERY_MONORAIL                                             :Máquina Monorr
 STR_LIVERY_MAGLEV                                               :Máquina Maglev
 STR_LIVERY_DMU                                                  :DMU
 STR_LIVERY_EMU                                                  :EMU
+STR_LIVERY_PASSENGER_WAGON_STEAM                                :Vagón De Pasaxeiros (Vapor)
+STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Vagón De Pasaxeiros (Diésel)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Vagón De Pasaxeiros (Eléctrico)
+STR_LIVERY_FREIGHT_WAGON                                        :Vagón de Carga
+STR_LIVERY_BUS                                                  :Autobús
+STR_LIVERY_TRUCK                                                :Camión
 STR_LIVERY_PASSENGER_SHIP                                       :Barco de Pasaxeiros
 STR_LIVERY_FREIGHT_SHIP                                         :Barco de Carga
 STR_LIVERY_HELICOPTER                                           :Helicóptero
@@ -2436,15 +2449,18 @@ STR_INVALID_ORDER                                               :{RED} (Orde Inv
 STR_UNKNOWN_DESTINATION                                         :destino descoñecido
 STR_8812_EMPTY                                                  :{LTBLUE}Valeiro
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} de {STATION}
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}O tren {COMMA} está a esperar no depósito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Novos Vehículos
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}O tren é demasiado longo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Os trens só se poden alterar cando estean parados nunha estación
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trens
+
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Novos Vehículos de Ferrocarril
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Novos Vehículos de Monorraíl
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Novos Vehículos de Maglev
+
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Construír Vehículo
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Vehículo
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esto construíra unha copia do vehículo. CTRL+Click compartirá as ordes
@@ -2794,6 +2810,19 @@ STR_NEWGRF_TIP                                                  :{BLACK}Unha lis
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}¡Non hai ficheiros newgrf instalados! Consulta no manual as instruccións para instalar novos gráficos
 STR_NEWGRF_FILENAME                                             :{BLACK}Ficheiro: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM                                               :{BLACK}Suma MD5: {SILVER}{STRING}
+
+STR_NEWGRF_ADD                                                  :{BLACK}Engadir
+STR_NEWGRF_REMOVE                                               :{BLACK}Eliminar
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Elimina-lo arquivo NewGRF seleccionado da lista
+STR_NEWGRF_MOVEUP                                               :{BLACK}Mover Arriba
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Move-lo arquivo NewGRF seleccionado arriba na lista
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mover Abaixo
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Move-lo arquivo NewGRF seleccionado abaixo na lista
+STR_NEWGRF_PARAMETER                                            :{BLACK}Parámetros: {SILVER}{STRING}
+
+
+STR_NEWGRF_DISABLED                                             :{RED}Desactivado

 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda persoalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de cambio: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2825,11 +2854,9 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostrar

 ### depot strings

-STR_SELL                                                        :{BLACK}Vender
-STR_ARE_YOU_SURE                                                :{BLACK}¿Estás seguro?
-
-
-
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vender tódolos trens do depósito
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vender tódolos barcos no depósito
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vender tódalas aeronaves do hangar


 STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autorreemprazar tódolos trens no depósito
@@ -2900,9 +2927,11 @@ STR_RANDOM                                                      :{BLACK}Aleatori
 STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Xeración do mundo
 STR_RANDOM_SEED                                                 :{BLACK}Semilla Aleatoria:
 STR_RANDOM_SEED_HELP                                            :{BLACK}Pincha para introducir unha semilla
+STR_LAND_GENERATOR                                              :{BLACK}Xerador de terreo:
 STR_TERRAIN_TYPE                                                :{BLACK}Tipo de terreo:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivel do mar:
 STR_SMOOTHNESS                                                  :{BLACK}Suavidade:
+STR_SNOW_LINE_HEIGHT                                            :{BLACK}Altura da liña de neve:
 STR_DATE                                                        :{BLACK}Data:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}Num. de cidades:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Num. de industrias:
@@ -2945,5 +2974,7 @@ STR_HELIPORTS                                                   :{BLACK}Aeroport

 STR_MEASURE_LENGTH                                              :{BLACK}Lonxitude: {NUM}
 STR_MEASURE_AREA                                                :{BLACK}Área: {NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lonxitude: {NUM}{}Diferencia de altura: {NUM} m
+STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Área: {NUM} x {NUM}{}Diferencia de altura: {NUM} m

 ########
--- a/lang/german.txt
+++ b/lang/german.txt
@@ -1,6 +1,6 @@
 ##name German
 ##ownname Deutsch
-##isocode de_DE.UTF-8
+##isocode de_DE
 ##plural 0
 ##gender m w n

@@ -155,11 +155,12 @@ STR_00B0_MAP                                                    :{WHITE}Karte -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spieleinstellungen
 STR_00B2_MESSAGE                                                :{YELLOW}Nachricht
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Nachricht von {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Achtung!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kann dies nicht tun....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kann das Gebiet nicht räumen....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle Rechte vorbehalten
 STR_00B7_VERSION                                                :{BLACK}OpenTTD Version {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD-Team
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 OpenTTD-Team
 STR_TRANSLATED_BY                                               :{BLACK}  Übersetzer -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -295,6 +296,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Neues Sp
 STR_0141_LOAD_GAME                                              :{BLACK}Spiel laden
 STR_SINGLE_PLAYER                                               :{BLACK}Einzelspieler
 STR_MULTIPLAYER                                                 :{BLACK}Mehrspieler
+STR_SCENARIO_EDITOR                                             :{BLACK}Szenario Editor

 STR_64                                                          :64
 STR_128                                                         :128
@@ -343,7 +345,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} t Zugkraft
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Betriebsgewinndiagramm
 STR_0155_INCOME_GRAPH                                           :Einkommensdiagramm
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Frachtlieferungsdiagramm
@@ -352,7 +354,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Firmenwertdiagr
 STR_0159_CARGO_PAYMENT_RATES                                    :Frachtratendiagramm
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Firmentabelle
 STR_PERFORMANCE_DETAIL_MENU                                     :Leistungsaufschlüsselung
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Spiel speichern
@@ -394,6 +396,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Frachtkapazitä
 STR_NO_WAITING_CARGO                                            :{BLACK}Keine Fracht wartet
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Wähle alle Anlagen
 STR_SELECT_ALL_TYPES                                            :{BLACK}Wähle alle Frachtarten (einschließlich ohne wartender Fracht)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Verfügbare Züge
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Verfügbare Fahrzeuge
+STR_AVAILABLE_SHIPS                                             :{BLACK}Verfügbare Schiffe
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Verfügbare Flugzeuge
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Zeige eine Liste von verfügbaren Fahrzeugen für diesen Fahrzeugtyp
 STR_MANAGE_LIST                                                 :{BLACK}Verwalte die Liste
 STR_MANAGE_LIST_TIP                                             :{BLACK}Aufträge an alle Fahrzeuge in der Liste verschicken
@@ -489,7 +495,7 @@ STR_01A9_NONE                                                   :Keine
 STR_01AA_NAME                                                   :{BLACK}Name
 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.
@@ -521,7 +527,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}

@@ -609,22 +615,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} erreicht '{STRING}' Status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} von {COMPANY} erreicht '{STRING}' Status!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Szenario erstellen
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Szenario bearbeiten
 STR_0223_LAND_GENERATION                                        :{WHITE}Land erstellen
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Zufälliges Land
-STR_0227_RESET_LAND                                             :{BLACK}Land wiederherstellen
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Landfläche zum Anheben / Absenken vergrößern
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Landfläche zum Anheben / Absenken verkleinern
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Erzeuge Land durch Zufall
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Landfläche wiederherstellen
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Landfläche wiederherstellen
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Reliefkarte nutzen
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Reliefkarte nutzen
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Bist du sicher, dass die Landschaft zurückgesetzt werden soll?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landfläche erzeugen
 STR_022F_TOWN_GENERATION                                        :{BLACK}Stadt errichten
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrie errichten
@@ -766,7 +766,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Auswahl
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Eigene Namen abspeichern

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spieleinstellungen
 STR_02C5_DIFFICULTY_SETTINGS                                    :Schwierigkeitsgrad
 STR_02C7_CONFIG_PATCHES                                         :Einstellungen der Patches
@@ -780,16 +780,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Vollst
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Vollständige Detailansicht
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Durchsichtige Gebäude
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Durchsichtige Stationsnamen
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Gebietsinformation
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Konsole öffnen/schließen
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Strg-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Riesiger Screenshot (Strg-G)
 STR_02D9_ABOUT_OPENTTD                                          :Über 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}aus
 STR_02DA_ON                                                     :{BLACK}an
@@ -846,7 +846,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}'subtrop
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}'fantastische' Landschaft auswählen
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Errichtung und Finanzierung einer neuen Industrie

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industrieverzeichnis
 STR_0313_FUND_NEW_INDUSTRY                                      :Neue Industrie finanzieren
 ############ range ends here
@@ -892,35 +892,35 @@ STR_TOWNNAME_DANISH                                             :Dänisch
 STR_TOWNNAME_TURKISH                                            :Türkisch
 STR_TOWNNAME_ITALIAN                                            :italienisch
 STR_TOWNNAME_CATALAN                                            :Katalanisch
-############ end of	townname region
+############ end of townname region

-STR_CURR_GBP                                                    :Pfund (£)
-STR_CURR_USD                                                    :Dollar ($)
-STR_CURR_EUR                                                    :Euro (€)
-STR_CURR_YEN                                                    :Yen (¥)
+STR_CURR_GBP                                                    :Engl. Pfund (GBP)
+STR_CURR_USD                                                    :US-Dollar (USD)
+STR_CURR_EUR                                                    :Euro (EUR)
+STR_CURR_YEN                                                    :Jap. Yen (JPY)
 STR_CURR_ATS                                                    :Österreich. Schilling (ATS)
-STR_CURR_BEF                                                    :Belgische Franc (BEF)
+STR_CURR_BEF                                                    :Belgische Francs (BEF)
 STR_CURR_CHF                                                    :Schweizer Franken (CHF)
 STR_CURR_CZK                                                    :Tschechische Kronen (CZK)
 STR_CURR_DEM                                                    :Deutsche Mark (DEM)
 STR_CURR_DKK                                                    :Dänische Kronen (DKK)
-STR_CURR_ESP                                                    :Peseta (ESP)
-STR_CURR_FIM                                                    :Finnmark (FIM)
-STR_CURR_FRF                                                    :Franc (FRF)
+STR_CURR_ESP                                                    :Span. Peseten (ESP)
+STR_CURR_FIM                                                    :Finnische Mark(FIM)
+STR_CURR_FRF                                                    :Frz. Francs (FRF)
 STR_CURR_GRD                                                    :Griech. Drachmen (GRD)
 STR_CURR_HUF                                                    :Ungarische Forint (HUF)
-STR_CURR_ISK                                                    :Isländische Krona (ISK)
-STR_CURR_ITL                                                    :Italienische Lira (ITL)
+STR_CURR_ISK                                                    :Isländische Kronen (ISK)
+STR_CURR_ITL                                                    :Italienische Lire (ITL)
 STR_CURR_NLG                                                    :Niederländ. Gulden (NLG)
 STR_CURR_NOK                                                    :Norwegische Kronen (NOK)
 STR_CURR_PLN                                                    :Polnische Zloty (PLN)
-STR_CURR_ROL                                                    :RumÃ€nische Lei (ROL)
+STR_CURR_ROL                                                    :Rumänische Lei (ROL)
 STR_CURR_RUR                                                    :Russische Rubel (RUR)
-STR_CURR_SIT                                                    :Slovenischer Tolar (SIT)
+STR_CURR_SIT                                                    :Slovenische Taler (SIT)
 STR_CURR_SEK                                                    :Schwedische Kronen (SEK)
-STR_CURR_YTL                                                    :türkische Lira (YTL)
-STR_CURR_SKK                                                    :Slowakische Krone
-STR_CURR_BRR                                                    :Brasilianischer Real
+STR_CURR_YTL                                                    :Türkische Lire (YTL)
+STR_CURR_SKK                                                    :Slowakische Kronen (SKK)
+STR_CURR_BRR                                                    :Brasilianische Reais (BRL)

 STR_CURR_CUSTOM                                                 :Eigene...

@@ -1309,6 +1309,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Passwor
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER VOLL
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}Versionskonflikt festgestellt
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF KONFLIKT

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Spiel betreten

@@ -1413,6 +1414,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Teilnehm
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Keine Netzwerkschnittstellen gefunden oder ohne ENABLE_NETWORK kompiliert
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Keine Netzwerkspiele gefunden
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Der Server antwortete nicht auf die Anfrage
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Konnte Verbindung nicht herstellen, da die NewGRF Versionen nicht übereinstimmen.
 STR_NETWORK_ERR_DESYNC                                          :{WHITE}Synchronisation des Netzwerkspiels fehlgeschlagen
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Verbindung zum Netzwerkspiel verloren
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Spielstand konnte nicht vom Server geladen werden
@@ -1434,6 +1436,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :Synchronisation
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :Karte konnte nicht geladen werden.
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :Verbindung verloren
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :Protokollfehler
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF Versionen stimmen nicht überein
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nicht authorisiert
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :Unerwartetes Paket empfangen
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :Falsche Version
@@ -1854,11 +1857,11 @@ STR_4824_BUBBLE_GENERATOR                                       :{G=m}Luftblasen
 STR_4825_TOFFEE_QUARRY                                          :{G=w}Karamellgrube
 STR_4826_SUGAR_MINE                                             :{G=w}Zuckermine

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Benötigt: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Benötigt: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Benötigt: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produktion im letzten Monat:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% befördert)
@@ -1931,8 +1934,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Das Land
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...Sie besitzen es bereits!


-############ 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                                                  :Unbenannt
@@ -1975,7 +1978,7 @@ STR_SV_STNAME_LOWER                                             :Unter-{STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} Wald

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Schwierigkeitsgrad
@@ -2768,11 +2771,11 @@ SERVICE_AT_SHIP_DEPOT                                           :Wartung in der
 STR_A000_AIRPORTS                                               :{WHITE}Flughäfen
 STR_A001_CAN_T_BUILD_AIRPORT_HERE                               :{WHITE}Flughafen kann hier nicht gebaut werden...
 STR_A002_AIRCRAFT_HANGAR                                        :{WHITE}{STATION} Flugzeughangar
-STR_A003_NEW_AIRCRAFT                                           :{BLACK}Neues Flugzeug
+STR_A003_NEW_AIRCRAFT                                           :{BLACK}Neue Flugzeuge
 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äche und dann auf ein Flugzeug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_A005_NEW_AIRCRAFT                                           :{WHITE}Neues Flugzeug
+STR_A005_NEW_AIRCRAFT                                           :{WHITE}Neue Flugzeuge
 STR_A006_BUILD_AIRCRAFT                                         :{BLACK}Flugzeug bauen
 STR_A008_CAN_T_BUILD_AIRCRAFT                                   :{WHITE}Kann das Flugzeug nicht bauen...
 STR_A009_AIRCRAFT                                               :{WHITE}{COMPANY} - {COMMA} Flugzeug{P "" e}
@@ -2889,6 +2892,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Keine Ne
 STR_NEWGRF_FILENAME                                             :{BLACK}Dateiname: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5-Summe: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du bist dabei Änderungen während eines laufenden Spiels zu machen. Dies kann zum Absturz von OpenTTD führen.{}Bist du Dir wirklich sicher?

 STR_NEWGRF_ADD                                                  :{BLACK}Hinzufügen
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Füge eine neue NewGRF Datei zu Liste hinzu
@@ -2912,6 +2916,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kann die

 STR_NEWGRF_NOT_FOUND                                            :{RED}Zugehörige Datei nicht gefunden
 STR_NEWGRF_DISABLED                                             :{RED}Ausgeschaltet
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Passende Datei nicht gefunden (kompatible GRF geladen)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatible GRF(s) für fehlende Dateien geladen
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Fehlende GRF-Dateien wurden deaktiviert.
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Es fehlen GRF-Dateien um das Spiel zu laden

 STR_CURRENCY_WINDOW                                             :{WHITE}Eigene Währung
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wechselkurs: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2944,20 +2953,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Zeige al

 ### depot strings

-STR_SELL                                                        :{BLACK}Verkaufen
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Du bist dabei alle Fahrzeuge im Depot zu verkaufen
-STR_ARE_YOU_SURE                                                :{BLACK}Bist du sicher?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Bestätige bitte dass du alle Züge im Depot verkaufen möchtest
-STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Bestätige bitte dass du alle Fahrzeuge im Depot verkaufen möchtest
-STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Bestätige bitte dass du alle Schiffe in der Werft verkaufen möchtest
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Bestätige bitte dass du alle Flugzeuge im Hangar verkaufen möchtest
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Verkaufe nicht alle Züge im Depot
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Verkaufe nicht alle Fahrzeuge im Depot
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Verkaufe nicht alle Schiffe in der Werft
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Verkaufe nicht alle Flugzeuge im Hangar
-
 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Verkaufe alle Züge im Depot
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Verkaufe alle Fahrzeuge im Depot
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Verkaufe alle Schiffe in der Werft
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -1,6 +1,6 @@
 ##name Hungarian
 ##ownname Magyar
-##isocode hu_HU.UTF-8
+##isocode hu_HU
 ##plural 1
 ##case t ba

@@ -187,11 +187,12 @@ STR_00B0_MAP                                                    :{WHITE}Térkép
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Beállítások
 STR_00B2_MESSAGE                                                :{YELLOW}Üzenet
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}{STRING} üzenete
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Figyelem!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Nem teheted ezt...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nem tisztíthatod meg a területet...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva
 STR_00B7_VERSION                                                :{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Az OpenTTD csapat
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 Az OpenTTD csapat
 STR_TRANSLATED_BY                                               :{BLACK}  Fordítók -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -360,6 +361,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Új ját
 STR_0141_LOAD_GAME                                              :{BLACK}Játék betöltése
 STR_SINGLE_PLAYER                                               :{BLACK}Egyjátékos
 STR_MULTIPLAYER                                                 :{BLACK}Hálózati játék
+STR_SCENARIO_EDITOR                                             :{BLACK}Pályaszerkesztő

 STR_64                                                          :64
 STR_128                                                         :128
@@ -408,7 +410,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} 9.81*10³ N
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Működési nyereség grafikon
 STR_0155_INCOME_GRAPH                                           :Jövedelem grafikon
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Elszállított rakomány grafikon
@@ -417,7 +419,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Vállalat ért
 STR_0159_CARGO_PAYMENT_RATES                                    :Rakományok szállítási díja
 STR_015A_COMPANY_LEAGUE_TABLE                                   :A cégek helyezése
 STR_PERFORMANCE_DETAIL_MENU                                     :Teljesítményértékelések részletezése
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Játék mentése
@@ -459,6 +461,11 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Teherkapacitás
 STR_NO_WAITING_CARGO                                            :{BLACK}Semmilyen áru nem várakozik
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Minden szállítóegység kiválasztása
 STR_SELECT_ALL_TYPES                                            :{BLACK}Minden rakománytípus mutatása (beleértve ha nincs várakozó rakomány)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Elérhető vonatok
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Elérhető közúti járművek
+STR_AVAILABLE_SHIPS                                             :{BLACK}Elérhető hajók
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Elérhető repülők
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Tekintsd meg az ehhez a járműtípushoz választható mozdonyok listáját
 STR_MANAGE_LIST                                                 :{BLACK}Lista kezelése
 STR_MANAGE_LIST_TIP                                             :{BLACK}A listán szereplő járműveknek utasítás küldése
 STR_REPLACE_VEHICLES                                            :Járművek lecserélése
@@ -553,7 +560,7 @@ STR_01A9_NONE                                                   :Nincs
 STR_01AA_NAME                                                   :{BLACK}Név
 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.
@@ -585,7 +592,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}

@@ -673,22 +680,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} elérte a '{STRING}' rangot!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} - {COMPANY} elérte a '{STRING}' rangot!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Saját pálya készítése
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}pályaszerkesztő
 STR_0223_LAND_GENERATION                                        :{WHITE}Táj szerkesztése
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Véletlenszerű táj
-STR_0227_RESET_LAND                                             :{BLACK}Táj törlése
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Az emelendő/süllyesztendő földterület növelése
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Az emelendő/süllyesztendő földterület csökkentése
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Véletlenszerű táj készítése
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}A táj törlése
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Táj törlése
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Magasságtérkép használata
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Magasságtérkép használata
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Biztosan le akarod törölni az egész tájat?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Táj szerkesztése
 STR_022F_TOWN_GENERATION                                        :{BLACK}Városkészítés
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Gazdasági épület készítése
@@ -830,7 +831,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}A járm
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}A saját jármű-márkanevek elmentése lemezre

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Beállítások
 STR_02C5_DIFFICULTY_SETTINGS                                    :Nehézségi beállítások
 STR_02C7_CONFIG_PATCHES                                         :Foltok beállítása
@@ -844,16 +845,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Teljes
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Minden részlet
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Átlátszó épületek
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Állomásnevek keret nélkül
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Terület-információ
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Átváltás Konzolra
 STR_02D7_SCREENSHOT_CTRL_S                                      :Képmentés (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Óriás képmentés (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Az  'OpenTTD'-ről
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Ki
 STR_02DA_ON                                                     :{BLACK}Be
@@ -910,7 +911,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Szubtró
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Játékvilág táj kiválasztása
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Gazdasági épület építése

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Gazdasági épületek listája
 STR_0313_FUND_NEW_INDUSTRY                                      :Új gazdasági épület építése
 ############ range ends here
@@ -956,7 +957,7 @@ STR_TOWNNAME_DANISH                                             :Dán
 STR_TOWNNAME_TURKISH                                            :Török
 STR_TOWNNAME_ITALIAN                                            :Olasz
 STR_TOWNNAME_CATALAN                                            :Katalán
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Font (£)
 STR_CURR_USD                                                    :Dollár ($)
@@ -1373,6 +1374,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Jelszó
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SZERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SZERVER TELE
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERZIÓ ELTÉRÉS
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF ELTÉRÉS

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Csatlakozás

@@ -1477,6 +1479,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Kliens l
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Nem található a hálózati csatoló, vagy nincs hálózati támogatás (ENABLE_NETWORK)
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nem található semmilyen hálózati játék
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} A szerver nem reagált a kérésre
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} NewGRF eltérés(ek) miatt nem sikerült kapcsolódni
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Hálózat - Játék szinkronizáció sikertelen.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Hálózat - Játék kapcsolat elveszett.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nem sikerült a szerver játékmentés betöltése.
@@ -1498,6 +1501,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :szinkronizálá
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :térkép betöltési hiba
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :elveszett a kapcsolat
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokoll hiba
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF eltérés(ek)
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nem engedélyezett
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ismeretlen csomag érkezett
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :rossz verzió
@@ -1955,11 +1959,11 @@ STR_4825_TOFFEE_QUARRY.t                                        :tejkaramella fe
 STR_4826_SUGAR_MINE                                             :cukorbánya
 STR_4826_SUGAR_MINE.t                                           :cukorbányát

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Felhasznál: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Felhasznál: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Felhasznál: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Múlt havi termelés:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% elszállítva)
@@ -2032,8 +2036,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Nem vehe
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...már a tiéd!


-############ 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                                                  :Névtelen
@@ -2076,7 +2080,7 @@ STR_SV_STNAME_LOWER                                             :{STRING}-alsó
 STR_SV_STNAME_HELIPORT                                          :{STRING}i helikopter-leszálló
 STR_SV_STNAME_FOREST                                            :{STRING}i erdőség

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Nehézségi szint
@@ -2613,6 +2617,7 @@ STR_INVALID_ORDER                                               :{RED} (Hibás m
 STR_UNKNOWN_DESTINATION                                         :ismeretlen célpont
 STR_8812_EMPTY                                                  :{LTBLUE}Üres
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} {STATION} állomásról
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} {STATION} állomásról (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}{COMMA}. vonat a járműtelepen várakozik
 STR_8815_NEW_VEHICLES                                           :{BLACK}Új járművek
 STR_8816                                                        :{BLACK}-
@@ -2642,6 +2647,7 @@ STR_8827_FULL_LOAD                                              :{BLACK}Telepako
 STR_8828_UNLOAD                                                 :{BLACK}Lepakol
 STR_REFIT                                                       :{BLACK}Átalakít
 STR_REFIT_TIP                                                   :{BLACK}Válaszd ki minek a szállítására álljunk át. Ctrl+kattintással eltávolítod az átalakítási utasítást.
+STR_REFIT_ORDER                                                 :(Átalakít erre: {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} menetrendje
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Menetrend vége - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
@@ -2988,6 +2994,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Jelenleg
 STR_NEWGRF_FILENAME                                             :{BLACK}Fájlnév: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Te éppen a jelenleg futó játékot akarod megváltoztatni; ettől elszállhat az OpenTTD.{}Teljesen biztos vagy benne, hogy ezt akarod?

 STR_NEWGRF_ADD                                                  :{BLACK}Hozzáad
 STR_NEWGRF_ADD_TIP                                              :{BLACK}A NewGRF-et hozzáadja a listához
@@ -3011,6 +3018,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nem lehe

 STR_NEWGRF_NOT_FOUND                                            :{RED}File nem található
 STR_NEWGRF_DISABLED                                             :{RED}Kikapcsolva
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Pontosan megegyező fájlt nem találtam (kompatibilis GRF-fel helyettesítve)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilis GRF(ek) betöltve a hiányzó fájl(ok) helyett
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Hiányzó GRF fájl(oka)t kikapcsoltam
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Kritikus GRF fájl(ok) hiányoznak, a játék nem betölthető

 STR_CURRENCY_WINDOW                                             :{WHITE}Saját pénznem
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Értékarány: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -3042,7 +3054,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA}
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Megmutatja az összes járművet, aminek ugyanaz a menetrendje

 ### depot strings
-
 STR_SELL                                                        :{BLACK}Elad
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Te éppen a depotban lévő járműveket készülsz eladni
 STR_ARE_YOU_SURE                                                :{BLACK}Biztos vagy benne?
--- a/lang/icelandic.txt
+++ b/lang/icelandic.txt
@@ -1,6 +1,6 @@
 ##name Icelandic
 ##ownname Íslenska
-##isocode is_IS.UTF-8
+##isocode is_IS
 ##plural 0
 ##gender karlkyn kvenkyn hvorugkyn

@@ -159,7 +159,7 @@ STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Get ekki
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Get ekki hreinsað þetta svæði....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Upphaflegur höfundarréttur {COPYRIGHT} 1995 Chris Sawyer, Öll réttindi áskilin
 STR_00B7_VERSION                                                :{BLACK}OpenTTD útgáfa {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD hópurinn
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 OpenTTD hópurinn
 STR_TRANSLATED_BY                                               :{BLACK}  Þýðendur -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -341,7 +341,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ pu
 STR_UNITS_FORCE_METRIC                                          :{COMMA} tonnkraftur
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Línurit: Rekstrarhagnaður
 STR_0155_INCOME_GRAPH                                           :Línurit: Tekjur
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Línurit: Fluttur farmur
@@ -350,7 +350,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Línurit: Verð
 STR_0159_CARGO_PAYMENT_RATES                                    :Línurit: Flutningsgróði
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Stigatafla fyrirtækja
 STR_PERFORMANCE_DETAIL_MENU                                     :Nákvæm frammistöðumæling
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Um OpenTTD
 STR_015C_SAVE_GAME                                              :Vista leik
@@ -472,7 +472,7 @@ STR_01A9_NONE                                                   :Enginn
 STR_01AA_NAME                                                   :{BLACK}Nafn
 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
@@ -504,7 +504,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}

@@ -592,20 +592,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} öðlast '{STRING}' titil!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} úr {COMPANY} öðlast '{STRING}' titil!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Búa til kort
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Kortagerð
 STR_0223_LAND_GENERATION                                        :{WHITE}Landslagsgerð
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Handahófskennt land
-STR_0227_RESET_LAND                                             :{BLACK}Eyða landi
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Stækka svæði til að lækka/hækka
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Minnka svæði til að lækka/hækka
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Mynda til land af handahófi
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Eyða landi
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Eyða landi
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Ertu viss um að þú viljir eyða landinu?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landslagsgerð
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bæjargerð
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Iðnaðargerð
@@ -745,7 +741,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Nöfn fa
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Vista breytt tegundanöfn farartækja

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Stillingar
 STR_02C5_DIFFICULTY_SETTINGS                                    :Erfiðleikastig
 STR_02C7_CONFIG_PATCHES                                         :Viðbætur
@@ -759,16 +755,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Fullar
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Full nákvæmni
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Gegnsæjar byggingar
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Gegnsæ stöðvanöfn
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Landssvæðisupplýsingar
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Kveikja á stjórnborði
 STR_02D7_SCREENSHOT_CTRL_S                                      :Skjámynd (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Risa skjámynd (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Um 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Fela
 STR_02DA_ON                                                     :{BLACK}Sýna
@@ -825,7 +821,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Velja ey
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Leikfangalandslag
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Fjármagna byggingu nýs iðnaðars

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Iðnaðalisti
 STR_0313_FUND_NEW_INDUSTRY                                      :Fjármagna nýjan iðnað
 ############ range ends here
@@ -870,7 +866,7 @@ STR_TOWNNAME_SWISS                                              :Svissnesk
 STR_TOWNNAME_DANISH                                             :Dönsk
 STR_TOWNNAME_TURKISH                                            :Tyrknesk
 STR_TOWNNAME_ITALIAN                                            :Ítölsk
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pund (£)
 STR_CURR_USD                                                    :Bandaríkjadalur ($)
@@ -1802,11 +1798,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Kúluframleiðs
 STR_4825_TOFFEE_QUARRY                                          :Karamellunáma
 STR_4826_SUGAR_MINE                                             :Sykurnáma

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Tekur við: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Tekur við: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Tekur við: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Framleiðsla síðasta mánaðar:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% flutt)
@@ -1879,8 +1875,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Þú get
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...þú átt það nú þegar!


-############ 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                                                  :Ónefnt
@@ -1923,7 +1919,7 @@ STR_SV_STNAME_LOWER                                             :Neðri {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Þyrlupallur
 STR_SV_STNAME_FOREST                                            :{STRING} Skógur

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Erfiðleikastig
--- a/lang/italian.txt
+++ b/lang/italian.txt
--- a/lang/japanese.txt
+++ b/lang/japanese.txt
--- a/lang/korean.txt
+++ b/lang/korean.txt
--- a/lang/unfinished/lithuanian.txt
+++ b/lang/unfinished/lithuanian.txt
--- a/lang/norwegian_bokmal.txt
+++ b/lang/norwegian_bokmal.txt
@@ -1,6 +1,6 @@
 ##name Norwegian
 ##ownname Norsk, bokmål
-##isocode nb_NO.UTF-8
+##isocode nb_NO
 ##plural 0

 ##id 0x0000
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Kart - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spillinnstillinger
 STR_00B2_MESSAGE                                                :{YELLOW}Melding
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Melding fra {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Advarsel!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan ikke gjøre dette...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan ikke rydde dette området...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Opprinnelig opphavsbeskyttet {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheter reservert
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versjon {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD-teamet
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 OpenTTD-teamet
 STR_TRANSLATED_BY                                               :{BLACK}  Oversetter(e) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -286,8 +287,10 @@ STR_013D_INFORMATION                                            :{BLACK}Informas
 STR_013E_CAPACITIES                                             :{BLACK}Kapasitet
 STR_013E_TOTAL_CARGO                                            :{BLACK}Total last
 STR_013F_CAPACITY                                               :{BLACK}Kapasitet: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT                                               :{BLACK}Kapasitet: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Total kapasitet på dette toget:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nytt spill
 STR_0141_LOAD_GAME                                              :{BLACK}Last inn spill
 STR_SINGLE_PLAYER                                               :{BLACK}Énspiller
@@ -340,7 +343,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} tonn kraft
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Fortjenestegraf
 STR_0155_INCOME_GRAPH                                           :Inntektsgraf
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Graf over leverte varer
@@ -349,7 +352,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Graf over firma
 STR_0159_CARGO_PAYMENT_RATES                                    :Prisliste for varer
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Firmarangeringstabell
 STR_PERFORMANCE_DETAIL_MENU                                     :Detaljert prestasjonsnivå
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Om OpenTTD
 STR_015C_SAVE_GAME                                              :Lagre spill
@@ -381,6 +384,7 @@ STR_SORT_BY_VALUE                                               :Verdi
 STR_SORT_BY_FACILITY                                            :Stasjonstype
 STR_SORT_BY_WAITING                                             :Verdi av ventende last
 STR_SORT_BY_RATING_MAX                                          :Vurdering av last
+STR_ENGINE_SORT_ENGINE_ID                                       :MaskinID (klassisk type)
 STR_ENGINE_SORT_COST                                            :Kostnad
 STR_ENGINE_SORT_POWER                                           :Kraft
 STR_ENGINE_SORT_INTRO_DATE                                      :Introduksjonsdato
@@ -390,7 +394,15 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Lastkapasitet
 STR_NO_WAITING_CARGO                                            :{BLACK}Ingen last venter
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Velg alle anlegg
 STR_SELECT_ALL_TYPES                                            :{BLACK}Velg alle lasttyper (inkludert last som ikke venter)
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Se en liste over tilgjengelige maskindesigner for dette kjøretøyet.
+STR_MANAGE_LIST                                                 :{BLACK}Behandl liste
+STR_MANAGE_LIST_TIP                                             :{BLACK}Send instruksjoner til alle kjøretøyer i denne listen
 STR_REPLACE_VEHICLES                                            :Bytt ut kjøretøy
+STR_SEND_TRAIN_TO_DEPOT                                         :Send til depoet
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til depoet
+STR_SEND_SHIP_TO_DEPOT                                          :Send til depoet
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til hangar
+STR_SEND_FOR_SERVICING                                          :Send til vedlikehold

 ############ range for months starts
 STR_0162_JAN                                                    :Jan
@@ -477,7 +489,7 @@ STR_01A9_NONE                                                   :Ingen
 STR_01AA_NAME                                                   :{BLACK}Navn
 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.
@@ -509,7 +521,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}

@@ -597,22 +609,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} oppnår '{STRING}'-status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} fra {COMPANY} oppnår '{STRING}'-status!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Lag scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenarioredigerer
 STR_0223_LAND_GENERATION                                        :{WHITE}Landgenerering
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Tilfeldig landforming
-STR_0227_RESET_LAND                                             :{BLACK}Tilbakestill land
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Øk størrelse av landareal å heve/senke
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Mink størrelse av landareal å heve/senke
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generer tilfeldig landskap
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Tilbakestill landskap
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Tilbakestill landskap
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Bruk høydekart
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Bruk høydekart
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Er du sikkert på du vil tilbakestille landskapet?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Landskapsgenerering
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bygenerering
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Industrigenerering
@@ -754,7 +760,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Velg nav
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Lagre egendefinerte navn på kjøretøy

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spillinnstillinger
 STR_02C5_DIFFICULTY_SETTINGS                                    :Vanskelighetsgrad
 STR_02C7_CONFIG_PATCHES                                         :Konfigurer patcher
@@ -768,16 +774,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Fullst
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Maksimalt med detaljer
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Gjennomsiktige bygninger
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Gjennomsiktige stasjonsnavn
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informasjon om felt
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Vis/skjul konsoll
 STR_02D7_SCREENSHOT_CTRL_S                                      :Skjermdump (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Stor skjermdump (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Om 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Av
 STR_02DA_ON                                                     :{BLACK}På
@@ -834,7 +840,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Velg sub
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Velg leketøyland-miljø
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Finansier bygging av ny industri

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Oversikt over industrier
 STR_0313_FUND_NEW_INDUSTRY                                      :Finansier ny industri
 ############ range ends here
@@ -880,7 +886,7 @@ STR_TOWNNAME_DANISH                                             :Dansk
 STR_TOWNNAME_TURKISH                                            :Tyrkisk
 STR_TOWNNAME_ITALIAN                                            :Italiensk
 STR_TOWNNAME_CATALAN                                            :Katalansk
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pund (£)
 STR_CURR_USD                                                    :Dollar ($)
@@ -907,6 +913,8 @@ STR_CURR_RUR                                                    :Russisk rubel (
 STR_CURR_SIT                                                    :Slovensk tolar (SIT)
 STR_CURR_SEK                                                    :Svensk krone (SEK)
 STR_CURR_YTL                                                    :Tyrkiske lire (YTL)
+STR_CURR_SKK                                                    :Slovakisk Koruna (SKK)
+STR_CURR_BRR                                                    :Brasiliansk Real (BRL)

 STR_CURR_CUSTOM                                                 :Egendefinert...

@@ -1007,6 +1015,7 @@ STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Forby t
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Slå sammen stasjoner som blir bygget på siden av hverandre: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Forlat stasjonen når én type varevogn er full, hvis 'full last' er på: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Bruk forbedret lastingsalgoritme: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Last kjøretøy gradvis: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflasjon: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Lever varer til en stasjon bare når varen trengs: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillat bygging av veldig lange broer: {ORANGE}{STRING}
@@ -1023,9 +1032,11 @@ STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Flytt p
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Tillat bestikkelser av bystyret: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Ikke-ensartede stasjoner: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Ny global rutesøking (NGR, overstyrer NTK): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Vektmultiplikator for frakt til å simulere tunge tog: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Alltid tillat bygging av små flyplasser: {ORANGE}{STRING}

+STR_CONFIG_PATCHES_WARN_LOST_TRAIN                              :{LTBLUE}Vis en advarsel hvis et tog har kjørt seg vill{ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW                                 :{LTBLUE}Inspiser kjøretøyenes ordrer: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :nei
 STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT                         :ja, men ekskluder stoppede kjøretøy
@@ -1062,10 +1073,12 @@ STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Maks st
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Utfør vedlikehold på helikopter automatisk på helikopterlandingsteder: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Koble landskapsverktøylinja til tog-/vei-/vann- og flyplassverktøylinjene: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Ved rulling med musen, flytt synsvinkelen i den motsatte retning: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Vis et målings-verktøytips når forskjellige "build-tools" brukes: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Vis firmaovertakelser: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Ingen
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Eget firma
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Alle firmaer
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Foretrekk lagchat med <ENTER>: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Maks antall tog per spiller: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Maks antall kjøretøy per spiller: {ORANGE}{STRING}
@@ -1090,6 +1103,7 @@ STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Standar
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Standard vedlikeholdsintervall for skip: {ORANGE}deaktivert
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Deaktiver vedlikehold når havarier er slått av: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Aktiver fartsgrenser for vogner: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Deaktiver elektriske tog: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Farge i avisen kommer i: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Start spillet i år: {ORANGE}{STRING}
@@ -1289,6 +1303,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Passord
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}TJENEREN ER KOBLET AV
 STR_NETWORK_SERVER_FULL                                         :{SILVER}TJENEREN ER FULL
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}DU HAR EN ANNEN VERSJON EN TJENEREN
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MATCHER IKKE

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Bli med på spill

@@ -1834,11 +1849,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Boblegenerator
 STR_4825_TOFFEE_QUARRY                                          :Karamellbrudd
 STR_4826_SUGAR_MINE                                             :Sukkergruve

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Trenger: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Trenger: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Trenger: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produksjon forrige måned:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA} % transportert)
@@ -1911,8 +1926,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Kan ikke
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...du eier det allerede!


-############ 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                                                  :Uten navn
@@ -1955,7 +1970,7 @@ STR_SV_STNAME_LOWER                                             :Nedre {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} helikopterstasjon
 STR_SV_STNAME_FOREST                                            :{STRING}skogen

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Vanskelighetsgrad
@@ -2492,16 +2507,20 @@ STR_INVALID_ORDER                                               :{RED} (Ugyldig
 STR_UNKNOWN_DESTINATION                                         :ukjent destinasjon
 STR_8812_EMPTY                                                  :{LTBLUE}Tom
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} fra {STATION}
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} fra {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Tog {COMMA} venter i togstallen
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nye tog/vogner
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Toget er for langt
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Tog kan kun endres når det står stille i togstallen
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Tog
+
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nye tog/vogner for jernbane
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nytt elektrisk tog
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nye tog/vogner for monorail
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nye tog/vogner for maglev
+STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Skinnekjøretøy
+
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Kjøp tog/vogn
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon et kjøretøy
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil skape en kopi av et kjøretøy. CTRL-klikk vil også sørge for delte ordrer
@@ -2665,6 +2684,7 @@ STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Bygg om
 STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Bygg om bil
 STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Bygg om kjøretøyet til å ta den valgte lasten
 STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan ikke bygge om bil...
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Velg en type varer som kjøretøyet skal lastes med

 ##id 0x9800
 STR_9800_DOCK_CONSTRUCTION                                      :Bygg havn
@@ -2855,6 +2875,7 @@ STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Hvor mye
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Størrelsen på firmaets lån
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total poeng av mulige poeng

+STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF Instillinger
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Innstillinger for ny grafikk
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Bruk forandringene
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Sett parametre
@@ -2862,6 +2883,36 @@ STR_NEWGRF_TIP                                                  :{BLACK}En liste
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Der er for tiden ikke noen nye grafikkfiler installert! Manualen inneholder instruksjoner for installering av ny grafikk
 STR_NEWGRF_FILENAME                                             :{BLACK}Filnavn: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du er i ferd med å gjøre forandringer i et kjørende spill; Dette kan krasje OpenTTD.{}Er du helt sikker på at du vil gjøre dette?
+
+STR_NEWGRF_ADD                                                  :{BLACK}Legg til
+STR_NEWGRF_ADD_TIP                                              :{BLACK}Legg en ny NewGRF-fil til listen
+STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Fjern den valgte NewGRF filen fra listen
+STR_NEWGRF_MOVEUP                                               :{BLACK}Flytt opp
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Flytt den valgte NewGRF-filen oppover listen
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Flytt ned
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Flytt den valgte NewGRF-filen nedover listen
+STR_NEWGRF_FILE_TIP                                             :{BLACK}En liste over NewGRF-filene som er installert. Klikk på en fil for å forandre parameterene
+STR_NEWGRF_PARAMETER                                            :{BLACK}Parametere: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Skriv NewGRF parameterene
+STR_NEWGRF_NO_INFO                                              :{BLACK}Ingen informasjon tilgjengelig
+
+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tilgjengelige NewGRF-filer
+STR_NEWGRF_ADD_FILE                                             :{BLACK}Legg til i seleksjonen
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Legg den valgte NewGRF filen til i konfigurasjonen din
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Søk på nytt
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Oppdater listen over tilgjengelige NewGRF filer
+STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan ikke legge til fil: to eller flere GFR ID-er
+
+STR_NEWGRF_NOT_FOUND                                            :{RED}Ingen passende fil funnet
+STR_NEWGRF_DISABLED                                             :{RED}Deaktivert
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Matchende fil ikke funnet(kompatibel GRF lastet)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatible GRF(er) lastet for manglene filer
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Manglende GRF fil(er) har blitt avslått
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Mangler GRF fil(er) for å kunne laste spill

 STR_CURRENCY_WINDOW                                             :{WHITE}Vanlig valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Valutakurs: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2894,19 +2945,8 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle

 ### depot strings

-STR_SELL                                                        :{BLACK}Selg
-STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Du er i ferd med å selge alle kjøretøyene i depotet
-STR_ARE_YOU_SURE                                                :{BLACK}Er du sikker?
-
-STR_DEPOT_SELL_ALL_TRAIN_TIP                                    :{BLACK}Bekreft at du vil selge alle togene i depotet
-STR_DEPOT_SELL_ALL_ROADVEH_TIP                                  :{BLACK}Bekreft at du vil selge alle bilene i depotet
-STR_DEPOT_SELL_ALL_SHIP_TIP                                     :{BLACK}Bekreft at du vil selge alle skipene i depotet
-STR_DEPOT_SELL_ALL_AIRCRAFT_TIP                                 :{BLACK}Bekreft at du vil slge all flyene i hangaren
-
-STR_DEPOT_SELL_ALL_CANCEL_TRAIN_TIP                             :{BLACK}Ikke selg alle skip i depodet
-STR_DEPOT_SELL_ALL_CANCEL_ROADVEH_TIP                           :{BLACK}Ikke selg alle bilene i garasjen
-STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Ikke selg alle skip i depodet
-STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Ikke selg alle flyene i hangaren
+STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Du er nå i ferd med å selge alle kjøretøyene i depoet.
+STR_ARE_YOU_SURE                                                :{BLACK}Er du sikker på at du vil dette?

 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Selg alle tog i depodet
 STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Selg alle kjøretøy i garasjen
@@ -2965,6 +3005,7 @@ STR_MASS_START_LIST_TIP                                         :{BLACK}Klikk fo
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA} skilt

+STR_ORDER_REFIT_FAILED                                          :{WHITE}Ombygningsordre stoppet pga. en feil {STRING} {COMMA}

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

@@ -2989,6 +3030,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vekt: {G
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Hastighet: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasitet: {GOLD}{COMMA} passasjerer, {COMMA} sekker post
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Lokomotivvogner: {GOLD}+{POWER}{BLACK} Vekt: {GOLD}+{WEIGHT_S}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Utstyrbart til: {GOLD}
+STR_PURCHASE_INFO_ALL_TYPES                                     :Alle varetyper
+STR_PURCHASE_INFO_ALL_BUT                                       :Alt utenom {GOLD}

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

@@ -3063,5 +3107,9 @@ STR_HELIPORTS                                                   :{BLACK}Helikopt

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

+STR_MEASURE_LENGTH                                              :{BLACK}Lengde: {NUM}
+STR_MEASURE_AREA                                                :{BLACK}Område: {NUM} x {NUM}
+STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengde: {NUM}{}Høydeforskjell: {NUM} m
+STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Område: {NUM} x {NUM}{}Høydeforskjell: {NUM} m

 ########
--- a/lang/norwegian_nynorsk.txt
+++ b/lang/norwegian_nynorsk.txt
--- a/lang/origveh.txt
+++ b/lang/origveh.txt
@@ -1,261 +1,261 @@
 ##name Original vehicle names (ENG)
 ##ownname Original vehicle names (ENG)
-##isocode xx.UTF-8
+##isocode xx

 ##id 0x8000
-STR_8000_KIRBY_PAUL_TANK_STEAM			:Collett Pannier Tank (Steam)
-STR_8001_MJS_250_DIESEL					:MJS 250 (Diesel)
-STR_8002_PLODDYPHUT_CHOO_CHOO			:Ploddyphut Choo-Choo
-STR_8003_POWERNAUT_CHOO_CHOO			:Powernaut Choo-Choo
-STR_8004_MIGHTYMOVER_CHOO_CHOO			:Mightymover Choo-Choo
-STR_8005_PLODDYPHUT_DIESEL				:Ploddyphut Diesel
-STR_8006_POWERNAUT_DIESEL				:Powernaut Diesel
-STR_8007_WILLS_2_8_0_STEAM				:Wills 2-8-0 (Steam)
-STR_8008_CHANEY_JUBILEE_STEAM			:Stanier 'Jubilee' (Steam)
-STR_8009_GINZU_A4_STEAM					:Gresley 'A4' (Steam)
-STR_800A_SH_8P_STEAM					:BR '8P' (Steam)
-STR_800B_MANLEY_MOREL_DMU_DIESEL		:Metro Cammell DMU (Diesel)
-STR_800C_DASH_DIESEL					:'Sprinter' (Diesel)
-STR_800D_SH_HENDRY_25_DIESEL			:BR/Sulzer '25' (Diesel)
-STR_800E_UU_37_DIESEL					:EE '37'
-STR_800F_FLOSS_47_DIESEL				:Brush '47' (Diesel)
-STR_8010_CS_4000_DIESEL					:CS 4000 (Diesel)
-STR_8011_CS_2400_DIESEL					:CS 2400 (Diesel)
-STR_8012_CENTENNIAL_DIESEL				:Centennial (Diesel)
-STR_8013_KELLING_3100_DIESEL			:Kelling 3100 (Diesel)
-STR_8014_TURNER_TURBO_DIESEL			:Turner Turbo (Diesel)
-STR_8015_MJS_1000_DIESEL				:MJS 1000 (Diesel)
-STR_8016_SH_125_DIESEL					:BR 'IC125' (Diesel)
-STR_8017_SH_30_ELECTRIC					:BR '86' (Electric)
-STR_8018_SH_40_ELECTRIC					:BR '87' (Electric)
-STR_8019_T_I_M_ELECTRIC					:'T.G.V.' (Electric)
-STR_801A_ASIASTAR_ELECTRIC				:'Eurostar' (Electric)
-STR_801B_PASSENGER_CAR					:Passenger Carriage
-STR_801C_MAIL_VAN						:Mail Van
-STR_801D_COAL_CAR						:Coal Truck
-STR_801E_OIL_TANKER						:Oil Tanker
-STR_801F_LIVESTOCK_VAN					:Livestock Van
-STR_8020_GOODS_VAN						:Goods Van
-STR_8021_GRAIN_HOPPER					:Grain Hopper
-STR_8022_WOOD_TRUCK						:Wood Truck
-STR_8023_IRON_ORE_HOPPER				:Iron Ore Hopper
-STR_8024_STEEL_TRUCK					:Steel Truck
-STR_8025_ARMORED_VAN					:Armoured Van
-STR_8026_FOOD_VAN						:Food Van
-STR_8027_PAPER_TRUCK					:Paper Truck
-STR_8028_COPPER_ORE_HOPPER				:Copper Ore Hopper
-STR_8029_WATER_TANKER					:Water Tanker
-STR_802A_FRUIT_TRUCK					:Fruit Truck
-STR_802B_RUBBER_TRUCK					:Rubber Truck
-STR_802C_SUGAR_TRUCK					:Sugar Truck
-STR_802D_COTTON_CANDY_HOPPER			:Candyfloss Hopper
-STR_802E_TOFFEE_HOPPER					:Toffee Hopper
-STR_802F_BUBBLE_VAN						:Bubble Van
-STR_8030_COLA_TANKER					:Cola Tanker
-STR_8031_CANDY_VAN						:Sweets Van
-STR_8032_TOY_VAN						:Toy Van
-STR_8033_BATTERY_TRUCK					:Battery Truck
-STR_8034_FIZZY_DRINK_TRUCK				:Fizzy Drink Truck
-STR_8035_PLASTIC_TRUCK					:Plastic Truck
-STR_8036_X2001_ELECTRIC					:'X2001' (Electric)
-STR_8037_MILLENNIUM_Z1_ELECTRIC			:'Millennium Z1' (Electric)
-STR_8038_WIZZOWOW_Z99					:Wizzowow Z99
-STR_8039_PASSENGER_CAR					:Passenger Carriage
-STR_803A_MAIL_VAN						:Mail Van
-STR_803B_COAL_CAR						:Coal Truck
-STR_803C_OIL_TANKER						:Oil Tanker
-STR_803D_LIVESTOCK_VAN					:Livestock Van
-STR_803E_GOODS_VAN						:Goods Van
-STR_803F_GRAIN_HOPPER					:Grain Hopper
-STR_8040_WOOD_TRUCK						:Wood Truck
-STR_8041_IRON_ORE_HOPPER				:Iron Ore Hopper
-STR_8042_STEEL_TRUCK					:Steel Truck
-STR_8043_ARMORED_VAN					:Armoured Van
-STR_8044_FOOD_VAN						:Food Van
-STR_8045_PAPER_TRUCK					:Paper Truck
-STR_8046_COPPER_ORE_HOPPER				:Copper Ore Hopper
-STR_8047_WATER_TANKER					:Water Tanker
-STR_8048_FRUIT_TRUCK					:Fruit Truck
-STR_8049_RUBBER_TRUCK					:Rubber Truck
-STR_804A_SUGAR_TRUCK					:Sugar Truck
-STR_804B_COTTON_CANDY_HOPPER			:Candyfloss Hopper
-STR_804C_TOFFEE_HOPPER					:Toffee Hopper
-STR_804D_BUBBLE_VAN						:Bubble Van
-STR_804E_COLA_TANKER					:Cola Tanker
-STR_804F_CANDY_VAN						:Sweets Van
-STR_8050_TOY_VAN						:Toy Van
-STR_8051_BATTERY_TRUCK					:Battery Truck
-STR_8052_FIZZY_DRINK_TRUCK				:Fizzy Drink Truck
-STR_8053_PLASTIC_TRUCK					:Plastic Truck
-STR_8054_LEV1_LEVIATHAN_ELECTRIC		:Lev1 'Leviathan' (Electric)
-STR_8055_LEV2_CYCLOPS_ELECTRIC			:Lev2 'Cyclops' (Electric)
-STR_8056_LEV3_PEGASUS_ELECTRIC			:Lev3 'Pegasus' (Electric)
-STR_8057_LEV4_CHIMAERA_ELECTRIC			:Lev4 'Chimaera' (Electric)
-STR_8058_WIZZOWOW_ROCKETEER				:Wizzowow Rocketeer
-STR_8059_PASSENGER_CAR					:Passenger Car
-STR_805A_MAIL_VAN						:Mail Van
-STR_805B_COAL_CAR						:Coal Car
-STR_805C_OIL_TANKER						:Oil Tanker
-STR_805D_LIVESTOCK_VAN					:Livestock Van
-STR_805E_GOODS_VAN						:Goods Van
-STR_805F_GRAIN_HOPPER					:Grain Hopper
-STR_8060_WOOD_TRUCK						:Wood Truck
-STR_8061_IRON_ORE_HOPPER				:Iron Ore Hopper
-STR_8062_STEEL_TRUCK					:Steel Truck
-STR_8063_ARMORED_VAN					:Armored Van
-STR_8064_FOOD_VAN						:Food Van
-STR_8065_PAPER_TRUCK					:Paper Truck
-STR_8066_COPPER_ORE_HOPPER				:Copper Ore Hopper
-STR_8067_WATER_TANKER					:Water Tanker
-STR_8068_FRUIT_TRUCK					:Fruit Truck
-STR_8069_RUBBER_TRUCK					:Rubber Truck
-STR_806A_SUGAR_TRUCK					:Sugar Truck
-STR_806B_COTTON_CANDY_HOPPER			:Candyfloss Hopper
-STR_806C_TOFFEE_HOPPER					:Toffee Hopper
-STR_806D_BUBBLE_VAN						:Bubble Van
-STR_806E_COLA_TANKER					:Cola Tanker
-STR_806F_CANDY_VAN						:Sweets Van
-STR_8070_TOY_VAN						:Toy Van
-STR_8071_BATTERY_TRUCK					:Battery Truck
-STR_8072_FIZZY_DRINK_TRUCK				:Fizzy Drink Truck
-STR_8073_PLASTIC_TRUCK					:Plastic Truck
-STR_8074_MPS_REGAL_BUS					:AEC Regal Bus
-STR_8075_HEREFORD_LEOPARD_BUS			:Leyland Leopard Bus
-STR_8076_FOSTER_BUS						:Volvo Bus
-STR_8077_FOSTER_MKII_SUPERBUS			:Volvo MkII Superbus
-STR_8078_PLODDYPHUT_MKI_BUS				:Ploddyphut MkI Bus
-STR_8079_PLODDYPHUT_MKII_BUS			:Ploddyphut MkII Bus
-STR_807A_PLODDYPHUT_MKIII_BUS			:Ploddyphut MkIII Bus
-STR_807B_BALOGH_COAL_TRUCK				:Bedford Coal Lorry
-STR_807C_UHL_COAL_TRUCK					:Ford Coal Lorry
-STR_807D_DW_COAL_TRUCK					:DW Coal Lorry
-STR_807E_MPS_MAIL_TRUCK					:AEC Mail Truck
-STR_807F_REYNARD_MAIL_TRUCK				:Renault Mail Truck
-STR_8080_PERRY_MAIL_TRUCK				:Perry Mail Truck
-STR_8081_MIGHTYMOVER_MAIL_TRUCK			:MightyMover Mail Truck
-STR_8082_POWERNAUGHT_MAIL_TRUCK			:Powernaught Mail Truck
-STR_8083_WIZZOWOW_MAIL_TRUCK			:Wizzowow Mail Truck
-STR_8084_WITCOMBE_OIL_TANKER			:Scammell Oil Tanker
-STR_8085_FOSTER_OIL_TANKER				:Volvo Oil Tanker
-STR_8086_PERRY_OIL_TANKER				:Perry Oil Tanker
-STR_8087_TALBOTT_LIVESTOCK_VAN			:Dennis Livestock Van
-STR_8088_UHL_LIVESTOCK_VAN				:Ford Livestock Van
-STR_8089_FOSTER_LIVESTOCK_VAN			:Foster Livestock Van
-STR_808A_BALOGH_GOODS_TRUCK				:Bedford Goods Lorry
-STR_808B_CRAIGHEAD_GOODS_TRUCK			:Fiat Goods Lorry
-STR_808C_GOSS_GOODS_TRUCK				:Goss Goods Lorry
-STR_808D_HEREFORD_GRAIN_TRUCK			:Leyland Grain Truck
-STR_808E_THOMAS_GRAIN_TRUCK				:Peugeot Grain Truck
-STR_808F_GOSS_GRAIN_TRUCK				:Goss Grain Truck
-STR_8090_WITCOMBE_WOOD_TRUCK			:Scammell Wood Truck
-STR_8091_FOSTER_WOOD_TRUCK				:Volvo Wood Truck
-STR_8092_MORELAND_WOOD_TRUCK			:Moreland Wood Truck
-STR_8093_MPS_IRON_ORE_TRUCK				:AEC Iron Ore Truck
-STR_8094_UHL_IRON_ORE_TRUCK				:Ford Iron Ore Truck
-STR_8095_CHIPPY_IRON_ORE_TRUCK			:Chippy Iron Ore Truck
-STR_8096_BALOGH_STEEL_TRUCK				:Bedford Steel Truck
-STR_8097_UHL_STEEL_TRUCK				:Ford Steel Truck
-STR_8098_KELLING_STEEL_TRUCK			:Kelling Steel Truck
-STR_8099_BALOGH_ARMORED_TRUCK			:Bedford Armoured Truck
-STR_809A_UHL_ARMORED_TRUCK				:Ford Armoured Truck
-STR_809B_FOSTER_ARMORED_TRUCK			:Foster Armored Truck
-STR_809C_FOSTER_FOOD_VAN				:Foster Food Van
-STR_809D_PERRY_FOOD_VAN					:Perry Food Van
-STR_809E_CHIPPY_FOOD_VAN				:Chippy Food Van
-STR_809F_UHL_PAPER_TRUCK				:Uhl Paper Truck
-STR_80A0_BALOGH_PAPER_TRUCK				:Balogh Paper Truck
-STR_80A1_MPS_PAPER_TRUCK				:MPS Paper Truck
-STR_80A2_MPS_COPPER_ORE_TRUCK			:MPS Copper Ore Truck
-STR_80A3_UHL_COPPER_ORE_TRUCK			:Uhl Copper Ore Truck
-STR_80A4_GOSS_COPPER_ORE_TRUCK			:Goss Copper Ore Truck
-STR_80A5_UHL_WATER_TANKER				:Uhl Water Tanker
-STR_80A6_BALOGH_WATER_TANKER			:Balogh Water Tanker
-STR_80A7_MPS_WATER_TANKER				:MPS Water Tanker
-STR_80A8_BALOGH_FRUIT_TRUCK				:Balogh Fruit Truck
-STR_80A9_UHL_FRUIT_TRUCK				:Uhl Fruit Truck
-STR_80AA_KELLING_FRUIT_TRUCK			:Kelling Fruit Truck
-STR_80AB_BALOGH_RUBBER_TRUCK			:Balogh Rubber Truck
-STR_80AC_UHL_RUBBER_TRUCK				:Uhl Rubber Truck
-STR_80AD_RMT_RUBBER_TRUCK				:RMT Rubber Truck
-STR_80AE_MIGHTYMOVER_SUGAR_TRUCK		:MightyMover Sugar Truck
-STR_80AF_POWERNAUGHT_SUGAR_TRUCK		:Powernaught Sugar Truck
-STR_80B0_WIZZOWOW_SUGAR_TRUCK			:Wizzowow Sugar Truck
-STR_80B1_MIGHTYMOVER_COLA_TRUCK			:MightyMover Cola Truck
-STR_80B2_POWERNAUGHT_COLA_TRUCK			:Powernaught Cola Truck
-STR_80B3_WIZZOWOW_COLA_TRUCK			:Wizzowow Cola Truck
-STR_80B4_MIGHTYMOVER_COTTON_CANDY		:MightyMover Candyfloss Truck
-STR_80B5_POWERNAUGHT_COTTON_CANDY		:Powernaught Candyfloss Truck
-STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK	:Wizzowow Candyfloss Truck
-STR_80B7_MIGHTYMOVER_TOFFEE_TRUCK		:MightyMover Toffee Truck
-STR_80B8_POWERNAUGHT_TOFFEE_TRUCK		:Powernaught Toffee Truck
-STR_80B9_WIZZOWOW_TOFFEE_TRUCK			:Wizzowow Toffee Truck
-STR_80BA_MIGHTYMOVER_TOY_VAN			:MightyMover Toy Van
-STR_80BB_POWERNAUGHT_TOY_VAN			:Powernaught Toy Van
-STR_80BC_WIZZOWOW_TOY_VAN				:Wizzowow Toy Van
-STR_80BD_MIGHTYMOVER_CANDY_TRUCK		:MightyMover Sweet Lorry
-STR_80BE_POWERNAUGHT_CANDY_TRUCK		:Powernaught Sweet Lorry
-STR_80BF_WIZZOWOW_CANDY_TRUCK			:Wizzowow Sweet Lorry
-STR_80C0_MIGHTYMOVER_BATTERY_TRUCK		:MightyMover Battery Truck
-STR_80C1_POWERNAUGHT_BATTERY_TRUCK		:Powernaught Battery Truck
-STR_80C2_WIZZOWOW_BATTERY_TRUCK			:Wizzowow Battery Truck
-STR_80C3_MIGHTYMOVER_FIZZY_DRINK		:MightyMover Fizzy Drink Truck
-STR_80C4_POWERNAUGHT_FIZZY_DRINK		:Powernaught Fizzy Drink Truck
-STR_80C5_WIZZOWOW_FIZZY_DRINK_TRUCK		:Wizzowow Fizzy Drink Truck
-STR_80C6_MIGHTYMOVER_PLASTIC_TRUCK		:MightyMover Plastic Truck
-STR_80C7_POWERNAUGHT_PLASTIC_TRUCK		:Powernaught Plastic Truck
-STR_80C8_WIZZOWOW_PLASTIC_TRUCK			:Wizzowow Plastic Truck
-STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK		:MightyMover Bubble Truck
-STR_80CA_POWERNAUGHT_BUBBLE_TRUCK		:Powernaught Bubble Truck
-STR_80CB_WIZZOWOW_BUBBLE_TRUCK			:Wizzowow Bubble Truck
-STR_80CC_MPS_OIL_TANKER					:MPS Oil Tanker
-STR_80CD_CS_INC_OIL_TANKER				:CS-Inc. Oil Tanker
-STR_80CE_MPS_PASSENGER_FERRY			:MPS Passenger Ferry
-STR_80CF_FFP_PASSENGER_FERRY			:FFP Passenger Ferry
-STR_80D0_BAKEWELL_300_HOVERCRAFT		:Bakewell 300 Hovercraft
-STR_80D1_CHUGGER_CHUG_PASSENGER			:Chugger-Chug Passenger Ferry
-STR_80D2_SHIVERSHAKE_PASSENGER_FERRY	:Shivershake Passenger Ferry
-STR_80D3_YATE_CARGO_SHIP				:Yate Cargo ship
-STR_80D4_BAKEWELL_CARGO_SHIP			:Bakewell Cargo ship
-STR_80D5_MIGHTYMOVER_CARGO_SHIP			:Mightymover Cargo ship
-STR_80D6_POWERNAUT_CARGO_SHIP			:Powernaut Cargo ship
-STR_80D7_SAMPSON_U52					:Junkers JU52
-STR_80D8_COLEMAN_COUNT					:Vickers Viscount
-STR_80D9_FFP_DART						:Aërospatiale SE-310 Caravelle
-STR_80DA_YATE_HAUGAN					:BAC-Aërospatiale Concorde
-STR_80DB_BAKEWELL_COTSWALD_LB_3			:Douglas DC-3 Dakota
-STR_80DC_BAKEWELL_LUCKETT_LB_8			:McDonnell Douglas DC-8
-STR_80DD_BAKEWELL_LUCKETT_LB_9			:McDonnell Douglas DC-9
-STR_80DE_BAKEWELL_LUCKETT_LB80			:McDonnell Douglas MD80
-STR_80DF_BAKEWELL_LUCKETT_LB_10			:McDonnell Douglas DC-10
-STR_80E0_BAKEWELL_LUCKETT_LB_11			:McDonnell Douglas MD-11
-STR_80E1_YATE_AEROSPACE_YAC_1_11		:British Aerospace BAC 1-11
-STR_80E2_DARWIN_100						:Boeing 727
-STR_80E3_DARWIN_200						:Boeing 737
-STR_80E4_DARWIN_300						:Boeing 747
-STR_80E5_DARWIN_400						:Boeing 757
-STR_80E6_DARWIN_500						:Boeing 767
-STR_80E7_DARWIN_600						:Boeing 777
-STR_80E8_GURU_GALAXY					:Lockheed Tristar
-STR_80E9_AIRTAXI_A21					:Airbus A300
-STR_80EA_AIRTAXI_A31					:Airbus A310
-STR_80EB_AIRTAXI_A32					:Airbus A320
-STR_80EC_AIRTAXI_A33					:Airbus A330
-STR_80ED_YATE_AEROSPACE_YAE46			:British Aerospace BAe46
-STR_80EE_DINGER_100						:Fokker 100
-STR_80EF_AIRTAXI_A34_1000				:AirTaxi A34-1000
-STR_80F0_YATE_Z_SHUTTLE					:Yate Z-Shuttle
-STR_80F1_KELLING_K1						:Kelling K1
-STR_80F2_KELLING_K6						:Kelling K6
-STR_80F3_KELLING_K7						:Kelling K7
-STR_80F4_DARWIN_700						:Darwin 700
-STR_80F5_FFP_HYPERDART_2				:FFP Hyperdart 2
-STR_80F6_DINGER_200						:Dinger 200
-STR_80F7_DINGER_1000					:Dinger 1000
-STR_80F8_PLODDYPHUT_100					:Ploddyphut 100
-STR_80F9_PLODDYPHUT_500					:Ploddyphut 500
-STR_80FA_FLASHBANG_X1					:Flashbang X1
-STR_80FB_JUGGERPLANE_M1					:Juggerplane M1
-STR_80FC_FLASHBANG_WIZZER				:Flashbang Wizzer
-STR_80FD_TRICARIO_HELICOPTER			:Sikorsky Helicopter
-STR_80FE_GURU_X2_HELICOPTER				:Guru X2 Helicopter
-STR_80FF_POWERNAUT_HELICOPTER			:Powernaut Helicopter
+STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Collett Pannier Tank (Steam)
+STR_8001_MJS_250_DIESEL                                         :MJS 250 (Diesel)
+STR_8002_PLODDYPHUT_CHOO_CHOO                                   :Ploddyphut Choo-Choo
+STR_8003_POWERNAUT_CHOO_CHOO                                    :Powernaut Choo-Choo
+STR_8004_MIGHTYMOVER_CHOO_CHOO                                  :Mightymover Choo-Choo
+STR_8005_PLODDYPHUT_DIESEL                                      :Ploddyphut Diesel
+STR_8006_POWERNAUT_DIESEL                                       :Powernaut Diesel
+STR_8007_WILLS_2_8_0_STEAM                                      :Wills 2-8-0 (Steam)
+STR_8008_CHANEY_JUBILEE_STEAM                                   :Stanier 'Jubilee' (Steam)
+STR_8009_GINZU_A4_STEAM                                         :Gresley 'A4' (Steam)
+STR_800A_SH_8P_STEAM                                            :BR '8P' (Steam)
+STR_800B_MANLEY_MOREL_DMU_DIESEL                                :Metro Cammell DMU (Diesel)
+STR_800C_DASH_DIESEL                                            :'Sprinter' (Diesel)
+STR_800D_SH_HENDRY_25_DIESEL                                    :BR/Sulzer '25' (Diesel)
+STR_800E_UU_37_DIESEL                                           :EE '37'
+STR_800F_FLOSS_47_DIESEL                                        :Brush '47' (Diesel)
+STR_8010_CS_4000_DIESEL                                         :CS 4000 (Diesel)
+STR_8011_CS_2400_DIESEL                                         :CS 2400 (Diesel)
+STR_8012_CENTENNIAL_DIESEL                                      :Centennial (Diesel)
+STR_8013_KELLING_3100_DIESEL                                    :Kelling 3100 (Diesel)
+STR_8014_TURNER_TURBO_DIESEL                                    :Turner Turbo (Diesel)
+STR_8015_MJS_1000_DIESEL                                        :MJS 1000 (Diesel)
+STR_8016_SH_125_DIESEL                                          :BR 'IC125' (Diesel)
+STR_8017_SH_30_ELECTRIC                                         :BR '86' (Electric)
+STR_8018_SH_40_ELECTRIC                                         :BR '87' (Electric)
+STR_8019_T_I_M_ELECTRIC                                         :'T.G.V.' (Electric)
+STR_801A_ASIASTAR_ELECTRIC                                      :'Eurostar' (Electric)
+STR_801B_PASSENGER_CAR                                          :Passenger Carriage
+STR_801C_MAIL_VAN                                               :Mail Van
+STR_801D_COAL_CAR                                               :Coal Truck
+STR_801E_OIL_TANKER                                             :Oil Tanker
+STR_801F_LIVESTOCK_VAN                                          :Livestock Van
+STR_8020_GOODS_VAN                                              :Goods Van
+STR_8021_GRAIN_HOPPER                                           :Grain Hopper
+STR_8022_WOOD_TRUCK                                             :Wood Truck
+STR_8023_IRON_ORE_HOPPER                                        :Iron Ore Hopper
+STR_8024_STEEL_TRUCK                                            :Steel Truck
+STR_8025_ARMORED_VAN                                            :Armoured Van
+STR_8026_FOOD_VAN                                               :Food Van
+STR_8027_PAPER_TRUCK                                            :Paper Truck
+STR_8028_COPPER_ORE_HOPPER                                      :Copper Ore Hopper
+STR_8029_WATER_TANKER                                           :Water Tanker
+STR_802A_FRUIT_TRUCK                                            :Fruit Truck
+STR_802B_RUBBER_TRUCK                                           :Rubber Truck
+STR_802C_SUGAR_TRUCK                                            :Sugar Truck
+STR_802D_COTTON_CANDY_HOPPER                                    :Candyfloss Hopper
+STR_802E_TOFFEE_HOPPER                                          :Toffee Hopper
+STR_802F_BUBBLE_VAN                                             :Bubble Van
+STR_8030_COLA_TANKER                                            :Cola Tanker
+STR_8031_CANDY_VAN                                              :Sweets Van
+STR_8032_TOY_VAN                                                :Toy Van
+STR_8033_BATTERY_TRUCK                                          :Battery Truck
+STR_8034_FIZZY_DRINK_TRUCK                                      :Fizzy Drink Truck
+STR_8035_PLASTIC_TRUCK                                          :Plastic Truck
+STR_8036_X2001_ELECTRIC                                         :'X2001' (Electric)
+STR_8037_MILLENNIUM_Z1_ELECTRIC                                 :'Millennium Z1' (Electric)
+STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99
+STR_8039_PASSENGER_CAR                                          :Passenger Carriage
+STR_803A_MAIL_VAN                                               :Mail Van
+STR_803B_COAL_CAR                                               :Coal Truck
+STR_803C_OIL_TANKER                                             :Oil Tanker
+STR_803D_LIVESTOCK_VAN                                          :Livestock Van
+STR_803E_GOODS_VAN                                              :Goods Van
+STR_803F_GRAIN_HOPPER                                           :Grain Hopper
+STR_8040_WOOD_TRUCK                                             :Wood Truck
+STR_8041_IRON_ORE_HOPPER                                        :Iron Ore Hopper
+STR_8042_STEEL_TRUCK                                            :Steel Truck
+STR_8043_ARMORED_VAN                                            :Armoured Van
+STR_8044_FOOD_VAN                                               :Food Van
+STR_8045_PAPER_TRUCK                                            :Paper Truck
+STR_8046_COPPER_ORE_HOPPER                                      :Copper Ore Hopper
+STR_8047_WATER_TANKER                                           :Water Tanker
+STR_8048_FRUIT_TRUCK                                            :Fruit Truck
+STR_8049_RUBBER_TRUCK                                           :Rubber Truck
+STR_804A_SUGAR_TRUCK                                            :Sugar Truck
+STR_804B_COTTON_CANDY_HOPPER                                    :Candyfloss Hopper
+STR_804C_TOFFEE_HOPPER                                          :Toffee Hopper
+STR_804D_BUBBLE_VAN                                             :Bubble Van
+STR_804E_COLA_TANKER                                            :Cola Tanker
+STR_804F_CANDY_VAN                                              :Sweets Van
+STR_8050_TOY_VAN                                                :Toy Van
+STR_8051_BATTERY_TRUCK                                          :Battery Truck
+STR_8052_FIZZY_DRINK_TRUCK                                      :Fizzy Drink Truck
+STR_8053_PLASTIC_TRUCK                                          :Plastic Truck
+STR_8054_LEV1_LEVIATHAN_ELECTRIC                                :Lev1 'Leviathan' (Electric)
+STR_8055_LEV2_CYCLOPS_ELECTRIC                                  :Lev2 'Cyclops' (Electric)
+STR_8056_LEV3_PEGASUS_ELECTRIC                                  :Lev3 'Pegasus' (Electric)
+STR_8057_LEV4_CHIMAERA_ELECTRIC                                 :Lev4 'Chimaera' (Electric)
+STR_8058_WIZZOWOW_ROCKETEER                                     :Wizzowow Rocketeer
+STR_8059_PASSENGER_CAR                                          :Passenger Car
+STR_805A_MAIL_VAN                                               :Mail Van
+STR_805B_COAL_CAR                                               :Coal Car
+STR_805C_OIL_TANKER                                             :Oil Tanker
+STR_805D_LIVESTOCK_VAN                                          :Livestock Van
+STR_805E_GOODS_VAN                                              :Goods Van
+STR_805F_GRAIN_HOPPER                                           :Grain Hopper
+STR_8060_WOOD_TRUCK                                             :Wood Truck
+STR_8061_IRON_ORE_HOPPER                                        :Iron Ore Hopper
+STR_8062_STEEL_TRUCK                                            :Steel Truck
+STR_8063_ARMORED_VAN                                            :Armored Van
+STR_8064_FOOD_VAN                                               :Food Van
+STR_8065_PAPER_TRUCK                                            :Paper Truck
+STR_8066_COPPER_ORE_HOPPER                                      :Copper Ore Hopper
+STR_8067_WATER_TANKER                                           :Water Tanker
+STR_8068_FRUIT_TRUCK                                            :Fruit Truck
+STR_8069_RUBBER_TRUCK                                           :Rubber Truck
+STR_806A_SUGAR_TRUCK                                            :Sugar Truck
+STR_806B_COTTON_CANDY_HOPPER                                    :Candyfloss Hopper
+STR_806C_TOFFEE_HOPPER                                          :Toffee Hopper
+STR_806D_BUBBLE_VAN                                             :Bubble Van
+STR_806E_COLA_TANKER                                            :Cola Tanker
+STR_806F_CANDY_VAN                                              :Sweets Van
+STR_8070_TOY_VAN                                                :Toy Van
+STR_8071_BATTERY_TRUCK                                          :Battery Truck
+STR_8072_FIZZY_DRINK_TRUCK                                      :Fizzy Drink Truck
+STR_8073_PLASTIC_TRUCK                                          :Plastic Truck
+STR_8074_MPS_REGAL_BUS                                          :AEC Regal Bus
+STR_8075_HEREFORD_LEOPARD_BUS                                   :Leyland Leopard Bus
+STR_8076_FOSTER_BUS                                             :Volvo Bus
+STR_8077_FOSTER_MKII_SUPERBUS                                   :Volvo MkII Superbus
+STR_8078_PLODDYPHUT_MKI_BUS                                     :Ploddyphut MkI Bus
+STR_8079_PLODDYPHUT_MKII_BUS                                    :Ploddyphut MkII Bus
+STR_807A_PLODDYPHUT_MKIII_BUS                                   :Ploddyphut MkIII Bus
+STR_807B_BALOGH_COAL_TRUCK                                      :Bedford Coal Lorry
+STR_807C_UHL_COAL_TRUCK                                         :Ford Coal Lorry
+STR_807D_DW_COAL_TRUCK                                          :DW Coal Lorry
+STR_807E_MPS_MAIL_TRUCK                                         :AEC Mail Truck
+STR_807F_REYNARD_MAIL_TRUCK                                     :Renault Mail Truck
+STR_8080_PERRY_MAIL_TRUCK                                       :Perry Mail Truck
+STR_8081_MIGHTYMOVER_MAIL_TRUCK                                 :MightyMover Mail Truck
+STR_8082_POWERNAUGHT_MAIL_TRUCK                                 :Powernaught Mail Truck
+STR_8083_WIZZOWOW_MAIL_TRUCK                                    :Wizzowow Mail Truck
+STR_8084_WITCOMBE_OIL_TANKER                                    :Scammell Oil Tanker
+STR_8085_FOSTER_OIL_TANKER                                      :Volvo Oil Tanker
+STR_8086_PERRY_OIL_TANKER                                       :Perry Oil Tanker
+STR_8087_TALBOTT_LIVESTOCK_VAN                                  :Dennis Livestock Van
+STR_8088_UHL_LIVESTOCK_VAN                                      :Ford Livestock Van
+STR_8089_FOSTER_LIVESTOCK_VAN                                   :Foster Livestock Van
+STR_808A_BALOGH_GOODS_TRUCK                                     :Bedford Goods Lorry
+STR_808B_CRAIGHEAD_GOODS_TRUCK                                  :Fiat Goods Lorry
+STR_808C_GOSS_GOODS_TRUCK                                       :Goss Goods Lorry
+STR_808D_HEREFORD_GRAIN_TRUCK                                   :Leyland Grain Truck
+STR_808E_THOMAS_GRAIN_TRUCK                                     :Peugeot Grain Truck
+STR_808F_GOSS_GRAIN_TRUCK                                       :Goss Grain Truck
+STR_8090_WITCOMBE_WOOD_TRUCK                                    :Scammell Wood Truck
+STR_8091_FOSTER_WOOD_TRUCK                                      :Volvo Wood Truck
+STR_8092_MORELAND_WOOD_TRUCK                                    :Moreland Wood Truck
+STR_8093_MPS_IRON_ORE_TRUCK                                     :AEC Iron Ore Truck
+STR_8094_UHL_IRON_ORE_TRUCK                                     :Ford Iron Ore Truck
+STR_8095_CHIPPY_IRON_ORE_TRUCK                                  :Chippy Iron Ore Truck
+STR_8096_BALOGH_STEEL_TRUCK                                     :Bedford Steel Truck
+STR_8097_UHL_STEEL_TRUCK                                        :Ford Steel Truck
+STR_8098_KELLING_STEEL_TRUCK                                    :Kelling Steel Truck
+STR_8099_BALOGH_ARMORED_TRUCK                                   :Bedford Armoured Truck
+STR_809A_UHL_ARMORED_TRUCK                                      :Ford Armoured Truck
+STR_809B_FOSTER_ARMORED_TRUCK                                   :Foster Armored Truck
+STR_809C_FOSTER_FOOD_VAN                                        :Foster Food Van
+STR_809D_PERRY_FOOD_VAN                                         :Perry Food Van
+STR_809E_CHIPPY_FOOD_VAN                                        :Chippy Food Van
+STR_809F_UHL_PAPER_TRUCK                                        :Uhl Paper Truck
+STR_80A0_BALOGH_PAPER_TRUCK                                     :Balogh Paper Truck
+STR_80A1_MPS_PAPER_TRUCK                                        :MPS Paper Truck
+STR_80A2_MPS_COPPER_ORE_TRUCK                                   :MPS Copper Ore Truck
+STR_80A3_UHL_COPPER_ORE_TRUCK                                   :Uhl Copper Ore Truck
+STR_80A4_GOSS_COPPER_ORE_TRUCK                                  :Goss Copper Ore Truck
+STR_80A5_UHL_WATER_TANKER                                       :Uhl Water Tanker
+STR_80A6_BALOGH_WATER_TANKER                                    :Balogh Water Tanker
+STR_80A7_MPS_WATER_TANKER                                       :MPS Water Tanker
+STR_80A8_BALOGH_FRUIT_TRUCK                                     :Balogh Fruit Truck
+STR_80A9_UHL_FRUIT_TRUCK                                        :Uhl Fruit Truck
+STR_80AA_KELLING_FRUIT_TRUCK                                    :Kelling Fruit Truck
+STR_80AB_BALOGH_RUBBER_TRUCK                                    :Balogh Rubber Truck
+STR_80AC_UHL_RUBBER_TRUCK                                       :Uhl Rubber Truck
+STR_80AD_RMT_RUBBER_TRUCK                                       :RMT Rubber Truck
+STR_80AE_MIGHTYMOVER_SUGAR_TRUCK                                :MightyMover Sugar Truck
+STR_80AF_POWERNAUGHT_SUGAR_TRUCK                                :Powernaught Sugar Truck
+STR_80B0_WIZZOWOW_SUGAR_TRUCK                                   :Wizzowow Sugar Truck
+STR_80B1_MIGHTYMOVER_COLA_TRUCK                                 :MightyMover Cola Truck
+STR_80B2_POWERNAUGHT_COLA_TRUCK                                 :Powernaught Cola Truck
+STR_80B3_WIZZOWOW_COLA_TRUCK                                    :Wizzowow Cola Truck
+STR_80B4_MIGHTYMOVER_COTTON_CANDY                               :MightyMover Candyfloss Truck
+STR_80B5_POWERNAUGHT_COTTON_CANDY                               :Powernaught Candyfloss Truck
+STR_80B6_WIZZOWOW_COTTON_CANDY_TRUCK                            :Wizzowow Candyfloss Truck
+STR_80B7_MIGHTYMOVER_TOFFEE_TRUCK                               :MightyMover Toffee Truck
+STR_80B8_POWERNAUGHT_TOFFEE_TRUCK                               :Powernaught Toffee Truck
+STR_80B9_WIZZOWOW_TOFFEE_TRUCK                                  :Wizzowow Toffee Truck
+STR_80BA_MIGHTYMOVER_TOY_VAN                                    :MightyMover Toy Van
+STR_80BB_POWERNAUGHT_TOY_VAN                                    :Powernaught Toy Van
+STR_80BC_WIZZOWOW_TOY_VAN                                       :Wizzowow Toy Van
+STR_80BD_MIGHTYMOVER_CANDY_TRUCK                                :MightyMover Sweet Lorry
+STR_80BE_POWERNAUGHT_CANDY_TRUCK                                :Powernaught Sweet Lorry
+STR_80BF_WIZZOWOW_CANDY_TRUCK                                   :Wizzowow Sweet Lorry
+STR_80C0_MIGHTYMOVER_BATTERY_TRUCK                              :MightyMover Battery Truck
+STR_80C1_POWERNAUGHT_BATTERY_TRUCK                              :Powernaught Battery Truck
+STR_80C2_WIZZOWOW_BATTERY_TRUCK                                 :Wizzowow Battery Truck
+STR_80C3_MIGHTYMOVER_FIZZY_DRINK                                :MightyMover Fizzy Drink Truck
+STR_80C4_POWERNAUGHT_FIZZY_DRINK                                :Powernaught Fizzy Drink Truck
+STR_80C5_WIZZOWOW_FIZZY_DRINK_TRUCK                             :Wizzowow Fizzy Drink Truck
+STR_80C6_MIGHTYMOVER_PLASTIC_TRUCK                              :MightyMover Plastic Truck
+STR_80C7_POWERNAUGHT_PLASTIC_TRUCK                              :Powernaught Plastic Truck
+STR_80C8_WIZZOWOW_PLASTIC_TRUCK                                 :Wizzowow Plastic Truck
+STR_80C9_MIGHTYMOVER_BUBBLE_TRUCK                               :MightyMover Bubble Truck
+STR_80CA_POWERNAUGHT_BUBBLE_TRUCK                               :Powernaught Bubble Truck
+STR_80CB_WIZZOWOW_BUBBLE_TRUCK                                  :Wizzowow Bubble Truck
+STR_80CC_MPS_OIL_TANKER                                         :MPS Oil Tanker
+STR_80CD_CS_INC_OIL_TANKER                                      :CS-Inc. Oil Tanker
+STR_80CE_MPS_PASSENGER_FERRY                                    :MPS Passenger Ferry
+STR_80CF_FFP_PASSENGER_FERRY                                    :FFP Passenger Ferry
+STR_80D0_BAKEWELL_300_HOVERCRAFT                                :Bakewell 300 Hovercraft
+STR_80D1_CHUGGER_CHUG_PASSENGER                                 :Chugger-Chug Passenger Ferry
+STR_80D2_SHIVERSHAKE_PASSENGER_FERRY                            :Shivershake Passenger Ferry
+STR_80D3_YATE_CARGO_SHIP                                        :Yate Cargo ship
+STR_80D4_BAKEWELL_CARGO_SHIP                                    :Bakewell Cargo ship
+STR_80D5_MIGHTYMOVER_CARGO_SHIP                                 :Mightymover Cargo ship
+STR_80D6_POWERNAUT_CARGO_SHIP                                   :Powernaut Cargo ship
+STR_80D7_SAMPSON_U52                                            :Junkers JU52
+STR_80D8_COLEMAN_COUNT                                          :Vickers Viscount
+STR_80D9_FFP_DART                                               :Aërospatiale SE-310 Caravelle
+STR_80DA_YATE_HAUGAN                                            :BAC-Aërospatiale Concorde
+STR_80DB_BAKEWELL_COTSWALD_LB_3                                 :Douglas DC-3 Dakota
+STR_80DC_BAKEWELL_LUCKETT_LB_8                                  :McDonnell Douglas DC-8
+STR_80DD_BAKEWELL_LUCKETT_LB_9                                  :McDonnell Douglas DC-9
+STR_80DE_BAKEWELL_LUCKETT_LB80                                  :McDonnell Douglas MD80
+STR_80DF_BAKEWELL_LUCKETT_LB_10                                 :McDonnell Douglas DC-10
+STR_80E0_BAKEWELL_LUCKETT_LB_11                                 :McDonnell Douglas MD-11
+STR_80E1_YATE_AEROSPACE_YAC_1_11                                :British Aerospace BAC 1-11
+STR_80E2_DARWIN_100                                             :Boeing 727
+STR_80E3_DARWIN_200                                             :Boeing 737
+STR_80E4_DARWIN_300                                             :Boeing 747
+STR_80E5_DARWIN_400                                             :Boeing 757
+STR_80E6_DARWIN_500                                             :Boeing 767
+STR_80E7_DARWIN_600                                             :Boeing 777
+STR_80E8_GURU_GALAXY                                            :Lockheed Tristar
+STR_80E9_AIRTAXI_A21                                            :Airbus A300
+STR_80EA_AIRTAXI_A31                                            :Airbus A310
+STR_80EB_AIRTAXI_A32                                            :Airbus A320
+STR_80EC_AIRTAXI_A33                                            :Airbus A330
+STR_80ED_YATE_AEROSPACE_YAE46                                   :British Aerospace BAe46
+STR_80EE_DINGER_100                                             :Fokker 100
+STR_80EF_AIRTAXI_A34_1000                                       :AirTaxi A34-1000
+STR_80F0_YATE_Z_SHUTTLE                                         :Yate Z-Shuttle
+STR_80F1_KELLING_K1                                             :Kelling K1
+STR_80F2_KELLING_K6                                             :Kelling K6
+STR_80F3_KELLING_K7                                             :Kelling K7
+STR_80F4_DARWIN_700                                             :Darwin 700
+STR_80F5_FFP_HYPERDART_2                                        :FFP Hyperdart 2
+STR_80F6_DINGER_200                                             :Dinger 200
+STR_80F7_DINGER_1000                                            :Dinger 1000
+STR_80F8_PLODDYPHUT_100                                         :Ploddyphut 100
+STR_80F9_PLODDYPHUT_500                                         :Ploddyphut 500
+STR_80FA_FLASHBANG_X1                                           :Flashbang X1
+STR_80FB_JUGGERPLANE_M1                                         :Juggerplane M1
+STR_80FC_FLASHBANG_WIZZER                                       :Flashbang Wizzer
+STR_80FD_TRICARIO_HELICOPTER                                    :Sikorsky Helicopter
+STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2 Helicopter
+STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut Helicopter
--- a/lang/polish.txt
+++ b/lang/polish.txt
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -1,6 +1,6 @@
 ##name Portuguese
 ##ownname Português
-##isocode pt_PT.UTF-8
+##isocode pt_PT
 ##plural 0

 ##id 0x0000
@@ -147,18 +147,19 @@ STR_ABBREV_BATTERIES                                            :{TINYFONT}BA
 STR_ABBREV_PLASTIC                                              :{TINYFONT}PL
 STR_ABBREV_FIZZY_DRINKS                                         :{TINYFONT}FZ
 STR_ABBREV_NONE                                                 :{TINYFONT}NÃO
-STR_ABBREV_ALL                                                  :{TINYFONT}TODOS
+STR_ABBREV_ALL                                                  :{TINYFONT}TUDO
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Mapa - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opções do Jogo
 STR_00B2_MESSAGE                                                :{YELLOW}Mensagem
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensagem de {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Cuidado!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Não é possível fazer isto....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Não é possível limpar esta área....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versão {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 A equipa do OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 A equipa do OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Tradutor(es) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -294,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Novo Jog
 STR_0141_LOAD_GAME                                              :{BLACK}Abrir Jogo
 STR_SINGLE_PLAYER                                               :{BLACK}1 jogador
 STR_MULTIPLAYER                                                 :{BLACK}Multi-jogador
+STR_SCENARIO_EDITOR                                             :{BLACK}Editor de Cenário

 STR_64                                                          :64
 STR_128                                                         :128
@@ -301,7 +303,7 @@ STR_256                                                         :256
 STR_512                                                         :512
 STR_1024                                                        :1024
 STR_2048                                                        :2048
-STR_MAPSIZE                                                     :{BLACK}Dimensões do mapa:
+STR_MAPSIZE                                                     :{BLACK}Dim. do mapa:
 STR_BY                                                          :{BLACK}*
 STR_0148_GAME_OPTIONS                                           :{BLACK}Opções do Jogo

@@ -342,7 +344,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} ton force
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Benefícios operativos
 STR_0155_INCOME_GRAPH                                           :Rendimentos
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Carga entregue
@@ -351,7 +353,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Valor da empres
 STR_0159_CARGO_PAYMENT_RATES                                    :Tarifas por carga
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Classificação de empresas
 STR_PERFORMANCE_DETAIL_MENU                                     :Avaliação detalhada
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Sobre o OpenTTD...
 STR_015C_SAVE_GAME                                              :Guardar jogo
@@ -393,6 +395,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacidade de C
 STR_NO_WAITING_CARGO                                            :{BLACK}Nenhuma carga em espera
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar todas as acções
 STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar todos os tipos de carga (incluindo carga sem espera)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Comboios Disponíveis
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Veículos Disponíveis
+STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos Disponíveis
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aviões Disponíveis
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ver lista de designs disponíveis de locomotivas para este tipo de veículo.
 STR_MANAGE_LIST                                                 :{BLACK}Gerir lista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Enviar instruções a todos os veículos desta lista
@@ -488,7 +494,7 @@ STR_01A9_NONE                                                   :Nenhum
 STR_01AA_NAME                                                   :{BLACK}Nome
 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
@@ -520,7 +526,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}

@@ -608,22 +614,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} conquista '{STRING}' desempenho!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} conquista '{STRING}' desempenho!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Criar Cenário
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de Cenário
 STR_0223_LAND_GENERATION                                        :{WHITE}Gerar Terreno
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Terreno Aleatório
-STR_0227_RESET_LAND                                             :{BLACK}Repor Terreno
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Aumentar área de terreno a baixar/levantar
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Diminuir área de terreno a baixar/levantar
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Gerar terreno aleatório
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Repor terreno
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Repor Terreno
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Usar mapa de alturas
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Usar mapa de alturas
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Tem a certeza que deseja repor o terreno?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}A gerar terreno
 STR_022F_TOWN_GENERATION                                        :{BLACK}A gerar cidades
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}A gerar indústrias
@@ -765,7 +765,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Selecç
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Guardar nomes dos veículos personalizados no disco

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Opções do Jogo
 STR_02C5_DIFFICULTY_SETTINGS                                    :Configurações de dificuldade
 STR_02C7_CONFIG_PATCHES                                         :Configurar correcções
@@ -779,16 +779,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Anima
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Máximo de detalhes
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Edifícios transparentes
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Sinais transparentes nas estações
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informações do terreno
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Activar Consola
 STR_02D7_SCREENSHOT_CTRL_S                                      :Captura de ecrã (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Captura gigante (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Sobre o OpenTTD...
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Off
 STR_02DA_ON                                                     :{BLACK}On
@@ -800,7 +800,7 @@ STR_SIGN_LIST                                                   :Lista de sinais
 STR_02DF_TOWN_DIRECTORY                                         :Lista de cidades
 STR_TOWN_POPULATION                                             :{BLACK}População Mundial: {COMMA}
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Visualizador {COMMA}
-STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiar para o visualizador
+STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Copiar p/ o visualizador
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Copiar a localização do visualizador global para este visualizador
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Colar do visualizador
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT                             :{BLACK}Colar a localização deste visualizador para o visualizador global
@@ -845,7 +845,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Seleccio
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Seleccionar cenário do estilo 'toyland'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Financiar a construção de uma nova indústria

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Lista de Indústrias
 STR_0313_FUND_NEW_INDUSTRY                                      :Financiar nova indústria
 ############ range ends here
@@ -891,7 +891,7 @@ STR_TOWNNAME_DANISH                                             :Dinamarquês
 STR_TOWNNAME_TURKISH                                            :Turco
 STR_TOWNNAME_ITALIAN                                            :Italiano
 STR_TOWNNAME_CATALAN                                            :Catalão
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Libras (£)
 STR_CURR_USD                                                    :Dólar ($)
@@ -1078,7 +1078,7 @@ STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Tamanho
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Manutenção automática de helicópteros em heliportos: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Ligar ferramentas de paisagem com as de construção: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Ao deslizar com o rato, mover a vista na direcção oposta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Mostrar as medidas quando se usam ferramentas de construção: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Mostrar medidas ao usar ferramentas de construção: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Mostrar estampagens da companhia: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Nenhum
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Própria companhia
@@ -1413,6 +1413,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Não foram encontradas interfaces de rede ou o jogo foi compilado sem ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Não foram encontrados jogos de rede
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} O servidor não respondeu ao pedido
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Impossível ligar devido a incompatibilidade de NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} A sincronização do jogo de rede falhou.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} A conexão do jogo de rede perdeu-se.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Não foi possível abrir o jogo.
@@ -1434,6 +1435,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :erro de dessinc
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :não foi possível carregar o mapa
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :ligação perdida
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :erro de protocolo
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF incompatível
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :Não autorizado
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :recebido um pacote estranho
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisão incorrecta
@@ -1854,11 +1856,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Produtor de Bol
 STR_4825_TOFFEE_QUARRY                                          :Extracção de Caramelo
 STR_4826_SUGAR_MINE                                             :Mina de Açúcar

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Necessário: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Necessário: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Necessário: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produção no último mês:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transportado)
@@ -1931,8 +1933,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Não é
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...já a possui!


-############ 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                                                  :Sem nome
@@ -1975,7 +1977,7 @@ STR_SV_STNAME_LOWER                                             :{STRING} de bai
 STR_SV_STNAME_HELIPORT                                          :Heliporto de {STRING}
 STR_SV_STNAME_FOREST                                            :Floresta de {STRING}

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :Nível de Dificuldade{WHITE}
@@ -2861,8 +2863,8 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 STR_PERFORMANCE_DETAIL_VEHICLES                                 :{BLACK}Veículos:
 STR_PERFORMANCE_DETAIL_STATIONS                                 :{BLACK}Estações:
 STR_PERFORMANCE_DETAIL_MIN_PROFIT                               :{BLACK}Min. lucros:
-STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Min. rendimentos:
-STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Máx. rendimentos:
+STR_PERFORMANCE_DETAIL_MIN_INCOME                               :{BLACK}Min. rendim.:
+STR_PERFORMANCE_DETAIL_MAX_INCOME                               :{BLACK}Máx. rendim.:
 STR_PERFORMANCE_DETAIL_DELIVERED                                :{BLACK}Entregue:
 STR_PERFORMANCE_DETAIL_CARGO                                    :{BLACK}Carga:
 STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Dinheiro:
@@ -2889,6 +2891,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Não exi
 STR_NEWGRF_FILENAME                                             :{BLACK}Nome do ficheiro: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vai alterar um jogo em andamento; o OpenTTD pode terminar abruptamente.{}Tem a certeza que quer continuar?

 STR_NEWGRF_ADD                                                  :{BLACK}Adicionar
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Adicionar um ficheiro NewGRF à lista
@@ -2912,6 +2915,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Impossí

 STR_NEWGRF_NOT_FOUND                                            :{RED}Ficheiro correspondente não encontrado
 STR_NEWGRF_DISABLED                                             :{RED}Desactivado
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Ficheiro correspondente não encontrado (carregado GRF compatível)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}GRF(s) compatíveis carregados para ficheiros ausentes
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Ficheiro(s) GRF ausentes foram desactivados
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Falta(m) ficheiro(s) GRF para carregar jogo

 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de troca: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2943,7 +2951,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordens p
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostra todos os veículos que seguem o mesmo trajecto

 ### depot strings
-
 STR_SELL                                                        :{BLACK}Vender
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Está prestes a vender todos os veículos no depósito
 STR_ARE_YOU_SURE                                                :{BLACK}Tem a certeza?
@@ -2979,8 +2986,8 @@ STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} Aeronave{P "" s}

 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
-STR_REPLACE_VEHICLES_START                                      :{BLACK}Iniciar Substituição de Veículos
-STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar Substituição de Veículos
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Iniciar Subst. de Veículos
+STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar Subst. de Veículos
 STR_NOT_REPLACING                                               :{BLACK}Não substituindo
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nenhum veículo seleccionado
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Seleccione o tipo de motor a substituir
@@ -3020,7 +3027,7 @@ STR_ORDER_REFIT_FAILED                                          :{WHITE}Erro na
 ############ Lists rail types

 STR_RAIL_VEHICLES                                               :Comboios
-STR_ELRAIL_VEHICLES                                             :Combóios para carris electrificados
+STR_ELRAIL_VEHICLES                                             :Comboios eléctricos
 STR_MONORAIL_VEHICLES                                           :Monocarris
 STR_MAGLEV_VEHICLES                                             :Maglevs

--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -1,6 +1,6 @@
 ##name Romanian
 ##ownname Românã
-##isocode ro_RO.UTF-8
+##isocode ro_RO
 ##plural 0

 ##id 0x0000
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Harta -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Optiuni
 STR_00B2_MESSAGE                                                :{YELLOW}Mesaj
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mesaj de la {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Atentie!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Nu pot face asta....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Nu pot curãta terenul....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, toate drepturile rezervate
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versiunea {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Echipa OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 Echipa OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Translator(i) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -342,7 +343,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} tone fortã
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Profitul operational
 STR_0155_INCOME_GRAPH                                           :Cifra de afaceri
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Numãr încãrcãturi livrate
@@ -351,7 +352,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Valoarea compan
 STR_0159_CARGO_PAYMENT_RATES                                    :Valorile plãtilor pe încãrcãturi
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Clasamentul companiilor
 STR_PERFORMANCE_DETAIL_MENU                                     :Rating de performantã detaliat
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Despre OpenTTD
 STR_015C_SAVE_GAME                                              :Salveazã jocul (F3)
@@ -389,10 +390,13 @@ STR_ENGINE_SORT_POWER                                           :Putere
 STR_ENGINE_SORT_INTRO_DATE                                      :Data lansarii
 STR_ENGINE_SORT_RUNNING_COST                                    :Cost exploatare
 STR_ENGINE_SORT_POWER_VS_RUNNING_COST                           :Cost exploatare/putere
-STR_ENGINE_SORT_CARGO_CAPACITY                                  :Cargo Capacity
 STR_NO_WAITING_CARGO                                            :{BLACK}Nu este în asteptare nici un fel de încãrcãturã
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alege toate facilitãtile
 STR_SELECT_ALL_TYPES                                            :{BLACK}Alege toate tipurile de încãrcãturi (inclusiv încãrcãturile care nu sunt în asteptare)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trenuri disponibile
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehicule disponibile
+STR_AVAILABLE_SHIPS                                             :{BLACK}Nave disponibile
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronave disponibile
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Vezi o lista de proiecte disponibile de motoare pentru acest tip de vehicul.
 STR_MANAGE_LIST                                                 :{BLACK}Gestioneaza lista
 STR_MANAGE_LIST_TIP                                             :{BLACK}Trimite instructiunile tuturor vehiculelor din aceasta lista
@@ -488,7 +492,7 @@ STR_01A9_NONE                                                   :nici una
 STR_01AA_NAME                                                   :{BLACK}Nume
 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
@@ -520,7 +524,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}

@@ -608,22 +612,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} a dobandit titlul de '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} al {COMPANY} dobandeste titlul de '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Creeazã scenariu
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor scenarii
 STR_0223_LAND_GENERATION                                        :{WHITE}Generator suprafatã uscat
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Uscat aleatoriu
-STR_0227_RESET_LAND                                             :{BLACK}Reseteazã terenul
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Mãreste aria de editare a terenului
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Micsoreazã aria de editare a terenului
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Genereazã teren aleator
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Reseteazã peisajul
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Resetare peisaj
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Foloseste harta de inaltimi
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Foloseste harta inaltimi
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Esti sigur cã vrei sa resetezi peisajul?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generare peisaj
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generare oras
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generare industrii
@@ -765,7 +763,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Selectea
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Salveazã pe disc numele personalizate de mãrci si modele

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Optiunile jocului (F2)
 STR_02C5_DIFFICULTY_SETTINGS                                    :Setãri dificultate
 STR_02C7_CONFIG_PATCHES                                         :Configurare patch
@@ -779,16 +777,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Animat
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Detalii grafice complete
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Peisaj transparent (X)
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Numele statiilor transparente
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informatii despre teren
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Consola On/Off
 STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Screenshot gigant(Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Despre 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}inactiv
 STR_02DA_ON                                                     :{BLACK}activ
@@ -845,7 +843,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Alege pe
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Alege peisajul 'tara jucãriilor'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Finanteazã constructia de industrii noi

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Lista industriilor
 STR_0313_FUND_NEW_INDUSTRY                                      :Obiectiv industrial nou
 ############ range ends here
@@ -891,7 +889,7 @@ STR_TOWNNAME_DANISH                                             :Danezã
 STR_TOWNNAME_TURKISH                                            :Turcã
 STR_TOWNNAME_ITALIAN                                            :Italian
 STR_TOWNNAME_CATALAN                                            :Catalan
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Lira sterlina (£)
 STR_CURR_USD                                                    :Dolar ($)
@@ -1308,6 +1306,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Proteja
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER PLIN
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIUNE DIFERITA
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF NEPOTRIVIRE

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Intrã în joc

@@ -1853,11 +1852,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Generator de ba
 STR_4825_TOFFEE_QUARRY                                          :Carierã de caramel
 STR_4826_SUGAR_MINE                                             :Minã de zahãr

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Are nevoie de: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Are nevoie de: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Are nevoie de: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Productia luna trecutã:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transportat)
@@ -1930,8 +1929,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Nu poti
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...este deja in posesia ta!


-############ 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                                                  :NoName
@@ -1974,7 +1973,7 @@ STR_SV_STNAME_LOWER                                             :{STRING} de Jos
 STR_SV_STNAME_HELIPORT                                          :Heliportul {STRING}
 STR_SV_STNAME_FOREST                                            :Pãdurea {STRING}

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Nivel de dificultate
@@ -2662,7 +2661,6 @@ STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Autovehi
 STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Cumpãrã un autovehicul
 STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Mutã un autovehicul aici pentru a-l vinde
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centreazã 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ãrã autovehiculul selectat
 STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Un nou autovehicul disponibil!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
@@ -2888,6 +2886,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Nu exist
 STR_NEWGRF_FILENAME                                             :{BLACK}Nume fisier: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Esti pe cale sa faci modificari intr-un joc activ. Aceasta poate destabiliza OpenTTD.{}Esti absolut sigur ca vrei sa faci asta?

 STR_NEWGRF_ADD                                                  :{BLACK}Adauga
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Adauga un fisier NewGRF in lista
@@ -2911,6 +2910,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nu pot a

 STR_NEWGRF_NOT_FOUND                                            :{RED}Nici un fisier potrivit
 STR_NEWGRF_DISABLED                                             :{RED}Dezactivat
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Nu am gasit niciun fisier corespunzator (am incarcat un GRF compatibil)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Fisier(e) GRF compatibil(e) incarcate pentru fisierele lipsa
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Fisierele GRF lipsa au fost dezactivate
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Fisierele GRF lipsa pentru permiterea incarcarii jocului

 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda proprie
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Curs de schimb: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/russian.txt
+++ b/lang/russian.txt
--- a/lang/simplified_chinese.txt
+++ b/lang/simplified_chinese.txt
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -1,6 +1,6 @@
 ##name Slovak
 ##ownname Slovensky
-##isocode sk_SK.UTF-8
+##isocode sk_SK
 ##plural 6
 ##case g
 ##gender m z s
@@ -218,11 +218,12 @@ STR_00B0_MAP                                                    :{WHITE}Mapa - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Nastavenia hry
 STR_00B2_MESSAGE                                                :{YELLOW}Sprava
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Sprava od {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Upozornenie!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Nie je mozne vykonat ...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Oblast nie je mozne vycistit ...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Povodny copyright: {COPYRIGHT} 1995 Chris Sawyer, vsetky prava vyhradene
 STR_00B7_VERSION                                                :{BLACK}OpenTTD verzia {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 team OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 team OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK} Preklad - Lukas Lengyel & gpsoft

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -358,6 +359,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Nová hr
 STR_0141_LOAD_GAME                                              :{BLACK}Nahrat hru
 STR_SINGLE_PLAYER                                               :{BLACK}Jeden hrac
 STR_MULTIPLAYER                                                 :{BLACK}Viacero hrácov
+STR_SCENARIO_EDITOR                                             :{BLACK}Editor scenárov

 STR_64                                                          :64
 STR_128                                                         :128
@@ -406,7 +408,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} megapond{P "" y ov}
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Graf prevadzkoveho zisku
 STR_0155_INCOME_GRAPH                                           :Graf trzieb
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Graf prepraveneho nakladu
@@ -415,7 +417,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Graf hodnoty sp
 STR_0159_CARGO_PAYMENT_RATES                                    :Ceny prepravy
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Hodnotenie spolocnosti
 STR_PERFORMANCE_DETAIL_MENU                                     :Detailny rating vykonu
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD
 STR_015C_SAVE_GAME                                              :Ulozit hru
@@ -457,6 +459,10 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Kapacita nákla
 STR_NO_WAITING_CARGO                                            :{BLACK}Necaka ziadny typ nakladu
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Oznacit vsetky moznosti
 STR_SELECT_ALL_TYPES                                            :{BLACK}Oznacit vsetky druhy nakladu (vratane druhu, kt. necaka na prepravu)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupné vlaky
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupné vozidlá
+STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupné lode
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupné lietadlá
 STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Zobrazit zoznam dostupných dizajnov rušňov pre tento typ.
 STR_MANAGE_LIST                                                 :{BLACK}Možnosti
 STR_MANAGE_LIST_TIP                                             :{BLACK}Zadat príkazy všetkým vozidlám v zozname
@@ -552,7 +558,7 @@ STR_01A9_NONE                                                   :Nezname
 STR_01AA_NAME                                                   :{BLACK}Meno
 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
@@ -584,7 +590,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}

@@ -672,22 +678,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} ziskal oznacenie '{STRING}' !
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} z {COMPANY} ziskal oznacenie '{STRING}' !
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Vytvorit scenar
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor scenarov
 STR_0223_LAND_GENERATION                                        :{WHITE}Generovanie uzemia
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Nahodne uzemie
-STR_0227_RESET_LAND                                             :{BLACK}Zresetovat uzemie
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Pre zvysenie/znizenie oblasti je potrebne zvacsit uzemie
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Pre zvysenie/znizenie oblasti je potrebne zmensit uzemie
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Vygenerovat nahodne uzemie
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Zresetovat uzemie
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Zresetovat Uzemie
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Pouzit vyskovu mapu
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Pouzit vyskovu mapu
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Si si isty ze chces zresetovat uzemie ?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Vytvorenie uzemia
 STR_022F_TOWN_GENERATION                                        :{BLACK}Vytvorenie mesta
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Vytvorenie priemyslu
@@ -720,7 +720,7 @@ STR_0249_IRON_ORE_MINE                                          :{BLACK}Zelezoru
 STR_024A_OIL_WELLS                                              :{BLACK}Vrtna veza
 STR_024B_BANK                                                   :{BLACK}Banka
 STR_024C_PAPER_MILL                                             :{BLACK}Vyroba papiera
-STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}Vyroba jedla
+STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}Potravinársky podnik
 STR_024E_PRINTING_WORKS                                         :{BLACK}Tlaciaren
 STR_024F_GOLD_MINE                                              :{BLACK}Zlata bana
 STR_0250_LUMBER_MILL                                            :{BLACK}Pila
@@ -754,7 +754,7 @@ STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Postavit
 STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Postavit ropny vrt
 STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Postavit banku (len v mestach kde je populacia vacsia ako 1200)
 STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Postavit vyrobu papiera
-STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Postavit vyrobu jedla
+STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Postavit potravinársky podnik
 STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Postavit tlaciaren
 STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Postavit zlatu banu
 STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Postavit banku (len v mestach)
@@ -829,7 +829,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Vyber na
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Ulozit vlastne nazvy vozidiel na disk

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Nastavenia hry
 STR_02C5_DIFFICULTY_SETTINGS                                    :Nastavenia obtiaznosti
 STR_02C7_CONFIG_PATCHES                                         :Nastavenia patchov
@@ -843,16 +843,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Plna a
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Plne detaily
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Priesvitne budovy
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Transparentne nazvy stanic
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Informacie o pozemku
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Zobrazit / skryt konzolu
 STR_02D7_SCREENSHOT_CTRL_S                                      :ScreenShot (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Velky ScreenShot (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :O hre 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Vyp.
 STR_02DA_ON                                                     :{BLACK}Zap.
@@ -909,7 +909,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Subtropi
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Detska krajina
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Financovat vystavbu noveho priemyslu

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Zoznam priemyslu
 STR_0313_FUND_NEW_INDUSTRY                                      :Financovat novy priemysel
 ############ range ends here
@@ -955,7 +955,7 @@ STR_TOWNNAME_DANISH                                             :Danske
 STR_TOWNNAME_TURKISH                                            :Turecké
 STR_TOWNNAME_ITALIAN                                            :Talianske
 STR_TOWNNAME_CATALAN                                            :Katalanske
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Libry (£)
 STR_CURR_USD                                                    :Dolare ($)
@@ -1372,6 +1372,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Heslo:
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER JE OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER JE PLNY
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ROZNE VERZIE
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF Chyba

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Pripojit sa

@@ -1476,6 +1477,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Zoznam k
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Nie su ziadne sietove zariadenie alebo hra je kompilovana bez ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nebola najdena ziadna sietova hra
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Server neodpoveda na ziadost
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Pripojenie zlyhalo kvoli nespravnemu NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Siet - Chyba synchronizacie hry
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Siet - Stratene spojenie
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nedokazem nahrat hru zo servera
@@ -1497,6 +1499,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :chyba synchroni
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :neviem nahrat mapu
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :spojenie prerusene
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :chyba protokolu
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Nespravne NewGRF
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :overenie odmietnute
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :neplatny packet prijaty
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :chybna revizia hry
@@ -1610,7 +1613,7 @@ STR_1021_RAILROAD_TRACK                                         :Zeleznicne kola
 STR_1023_RAILROAD_TRAIN_DEPOT                                   :Zeleznicne depo
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}... oblast vlastni ina spolocnost
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Zeleznicne kolaje so standartnym semaforom
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Zeleznicne kolaje s pre-signami
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Zeleznicne kolaje s pre-signalmi
 STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Zeleznicne kolaje s exit-signalmi
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Zeleznicne kolaje s combo-signalmi

@@ -1892,7 +1895,7 @@ STR_480B_FARM                                                   :Farma
 STR_480C_COPPER_ORE_MINE                                        :Medenna bana
 STR_480D_OIL_WELLS                                              :Ropna plosina
 STR_480E_BANK                                                   :Banka
-STR_480F_FOOD_PROCESSING_PLANT                                  :Vyroba jedla
+STR_480F_FOOD_PROCESSING_PLANT                                  :Potravinársky podnik
 STR_4810_PAPER_MILL                                             :Vyroba papiera
 STR_4811_GOLD_MINE                                              :Zlata bana
 STR_4812_BANK                                                   :Banka
@@ -1917,11 +1920,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Bublifuk
 STR_4825_TOFFEE_QUARRY                                          :Karamelovy lom
 STR_4826_SUGAR_MINE                                             :Cukrova bana

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Potrebuje: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Potrebuje: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Potrebuje: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produkcia za posledny mesiac:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% prepravenych)
@@ -1934,15 +1937,15 @@ STR_4831_FOREST_CAN_ONLY_BE_PLANTED                             :{WHITE}... les
 STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT}{INDUSTRY} oznamuje skore uzavretie!
 STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Zasobovacie problemy donutili {INDUSTRY} oznamit skore uzavretie!
 STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Nedostatok dostupnej drevnej suroviny donutil {INDUSTRY} oznamit skore uzavretie!
-STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} zvysuje produkciu!
+STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} zvyšuje produkciu!
 STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}Nove nalezisko uhlia sa objavilo v {INDUSTRY}!{}Ocakava sa zdvojnasobenie produkcie!
 STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}Nove nalezisko ropy sa objavilo na {INDUSTRY}!{}Ocakava sa zdvojnasobenie produkcie!
 STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT}Na {INDUSTRY} zlepsili pouzivane metody!Ocakava sa zdvojnasobenie produkcie!
-STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} znizuje produkciu o 50%
+STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} znižuje produkciu o 50%
 STR_483A_INSECT_INFESTATION_CAUSES                              :{BLACK}{BIGFONT}Premnozenie skodcov sposobilo znicenie urody na {INDUSTRY}!{}Produkcia sa znizila o 50%
 STR_483B_CAN_ONLY_BE_POSITIONED                                 :{WHITE}... moze byt umiestnene len pri okraji mapy
-STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{1:INDUSTRY} zvysuje produkciu {0:STRING.g} o {2:COMMA}%!
-STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{1:INDUSTRY} znizuje produkciu {0:STRING.g} o {2:COMMA}%!
+STR_INDUSTRY_PROD_GOUP                                          :{BLACK}{BIGFONT}{1:INDUSTRY} zvyšuje produkciu {0:STRING.g} o {2:COMMA}%!
+STR_INDUSTRY_PROD_GODOWN                                        :{BLACK}{BIGFONT}{1:INDUSTRY} znižuje produkciu {0:STRING.g} o {2:COMMA}%!

 ##id 0x5000
 STR_5000_TRAIN_IN_TUNNEL                                        :{WHITE}Vlak v tuneli
@@ -1994,8 +1997,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Tento po
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}... uz to vlastnis!


-############ 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                                                  :Bez mena
@@ -2038,7 +2041,7 @@ STR_SV_STNAME_LOWER                                             :Dolny {STRING}
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} Les

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Uroven obtiaznosti
@@ -2147,7 +2150,7 @@ STR_701E                                                        :{BLACK}-{CURREN
 STR_701F                                                        :{BLACK}+{CURRENCY64}
 STR_7020_TOTAL                                                  :{WHITE}Spolu:
 STR_7021                                                        :{COMPANY}{PLAYERNAME}
-STR_7022_INCOME_GRAPH                                           :{WHITE}Graf zisku
+STR_7022_INCOME_GRAPH                                           :{WHITE}Graf príjmov
 STR_CURRCOMPACT                                                 :{CURRCOMPACT64}
 STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graf prevadzkoveho zisku
@@ -2575,7 +2578,7 @@ STR_INVALID_ORDER                                               :{RED} (Neplatny
 STR_UNKNOWN_DESTINATION                                         :neznamy ciel
 STR_8812_EMPTY                                                  :{LTBLUE}Prazdny
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} z {STATION}
-STR_FROM_MULT                                                   :{LTBLUE}{CARGO} from {STATION} (x{NUM})
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} z {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Vlak {COMMA} caka v depe
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nove vozidla
 STR_8816                                                        :{BLACK}-
@@ -2611,7 +2614,7 @@ STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Ko
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Oprava
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Nemozno kupit vlak...
-STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} cena: {LTBLUE}{CURRENCY}
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_882E                                                        :{WHITE}{VEHICLE}
 STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Naklada/Vyklada
@@ -2662,10 +2665,10 @@ STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Na oznac
 STR_SERVICE_HINT                                                :{BLACK}Vynechat tento prikaz pokial nie je potrebna oprava
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nove {STRING} je uz dostupne!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Nosnost: {WEIGHT_S}{}Rychlost: {VELOCITY}  Vykon: {POWER}{}Naklady na prevadzku: {CURRENCY}/rok{}Kapacita: {CARGO}
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rýchlost: {VELOCITY}  Výkon: {POWER}{}Náklady na prevádzku: {CURRENCY}/rok{}Kapacita: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Pokazene
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Naklady na prevadzku: {LTBLUE}{CURRENCY}/rok
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Nosnost: {LTBLUE}{WEIGHT_S}  {BLACK}Vykon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_S}  {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rýchlost: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zisk tento rok: {LTBLUE}{CURRENCY}  (predchadzajuci rok: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Spolahlivost: {LTBLUE}{COMMA}%  {BLACK}Pocet poruch od posledneho servisu: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Zastavene
@@ -2952,11 +2955,12 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Nie sú
 STR_NEWGRF_FILENAME                                             :{BLACK}Názov súboru: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Chystáte sa vykonat zmeny v spustenej hre, co može sposobit pád hry.{}Naozaj ich chcete vykonat?

 STR_NEWGRF_ADD                                                  :{BLACK}Pridat
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Pridat NewGRF súbor do zoznamu
-STR_NEWGRF_REMOVE                                               :{BLACK}Odstrániť
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstrániť vybraný NewGRF súbor zo zoznamu
+STR_NEWGRF_REMOVE                                               :{BLACK}Odstránit
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstránit vybraný NewGRF súbor zo zoznamu
 STR_NEWGRF_MOVEUP                                               :{BLACK}Vyššie
 STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Posunút vybraný NewGRF súbor v zozname vyššie
 STR_NEWGRF_MOVEDOWN                                             :{BLACK}Nižšie
@@ -2975,6 +2979,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nie je m

 STR_NEWGRF_NOT_FOUND                                            :{RED}Príslušný súbor nenájdený
 STR_NEWGRF_DISABLED                                             :{RED}Nedostupný
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Príslušný súbor nenájdený (použitý kompatibilný GRF)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilné GRF použité namiesto chýbajúcich súborov
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Chýbajúce GRF súbory boli vypnuté
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Cýbajú GRF súbory potrebné pre nahratie hry

 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastná mena
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz meny: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/slovenian.txt
+++ b/lang/slovenian.txt
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -1,6 +1,6 @@
 ##name Spanish
 ##ownname Español (ES)
-##isocode es_ES.UTF-8
+##isocode es_ES
 ##plural 0
 ##gender masculino femenino

@@ -155,11 +155,12 @@ STR_00B0_MAP                                                    :{WHITE}Mapa - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Opciones del juego
 STR_00B2_MESSAGE                                                :{YELLOW}Mensaje
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mensaje de {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Precaución!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}No se puede hacer eso....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}No se puede desbrozar esta zona....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Copyright Original {COPYRIGHT} 1995 Chris Sawyer, Todos los derechos reservados
 STR_00B7_VERSION                                                :{BLACK}OpenTTD versión {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 El equipo OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 El equipo OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Traductor(es) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -287,12 +288,15 @@ STR_013D_INFORMATION                                            :{BLACK}Informac
 STR_013E_CAPACITIES                                             :{BLACK}Capacidades
 STR_013E_TOTAL_CARGO                                            :{BLACK}Carga total
 STR_013F_CAPACITY                                               :{BLACK}Capacidad: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT                                               :{BLACK}Capacidad: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Carga total (capacidad) de este tren:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_0140_NEW_GAME                                               :{BLACK}Nuevo Juego
 STR_0141_LOAD_GAME                                              :{BLACK}Cargar Juego
 STR_SINGLE_PLAYER                                               :{BLACK}Un jugador
 STR_MULTIPLAYER                                                 :{BLACK}Multijugador
+STR_SCENARIO_EDITOR                                             :{BLACK}Editor de Escenario

 STR_64                                                          :64
 STR_128                                                         :128
@@ -341,7 +345,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} ton. fuerza
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Gráfico de benefício operativo
 STR_0155_INCOME_GRAPH                                           :Gráfico de ingresos
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Gráfico de carga entregada
@@ -350,7 +354,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Gráfico del va
 STR_0159_CARGO_PAYMENT_RATES                                    :Tarifas de pagos por carga
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Tabla de ranking de empresas
 STR_PERFORMANCE_DETAIL_MENU                                     :Detalles del rendimiento
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Acerca de OpenTTD
 STR_015C_SAVE_GAME                                              :Guardar juego
@@ -392,7 +396,19 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Capacidad de ca
 STR_NO_WAITING_CARGO                                            :{BLACK}Ningún tipo de carga está esperando
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar todas las facilidades
 STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar todos los tipos de carga (incluidas las que no están en espera)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Trenes disponibles
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehículos disponibles
+STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos disponibles
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aviones disponibles
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ver la lista de los motores disponibles para este tipo de vehículo.
+STR_MANAGE_LIST                                                 :{BLACK}Administrar lista
+STR_MANAGE_LIST_TIP                                             :{BLACK}Enviar instrucciones a todos los vehículos de la lista
 STR_REPLACE_VEHICLES                                            :Reemplazar vehículos
+STR_SEND_TRAIN_TO_DEPOT                                         :Enviar a Depósito
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar a Depósito
+STR_SEND_SHIP_TO_DEPOT                                          :Enviar a Depósito
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar al Hangar
+STR_SEND_FOR_SERVICING                                          :Enviar para Servicio

 ############ range for months starts
 STR_0162_JAN                                                    :Ene
@@ -479,7 +495,7 @@ STR_01A9_NONE                                                   :Ninguna
 STR_01AA_NAME                                                   :{BLACK}Nombre
 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
@@ -511,7 +527,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}

@@ -599,22 +615,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} logra el estado '{STRING}'!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} de {COMPANY} logra el estado '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Crear Escenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Editor de escenarios
 STR_0223_LAND_GENERATION                                        :{WHITE}Generación de terrenos
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Terreno al azar
-STR_0227_RESET_LAND                                             :{BLACK}Reponer terreno
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Aumentar el tamaño del bloque de terreno a bajar/subir
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Reducir tamaño del bloque de terreno a bajar/subir
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generar terreno al azar
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Hacer reset del paisaje
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Hacer reset del paisaje
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Usar Mapa de alturas
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Usar Mapa de alturas
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}¿Está seguro que desea realizar un reset al paisaje?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Generación de paisaje
 STR_022F_TOWN_GENERATION                                        :{BLACK}Generación de poblaciones
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Generación de industria
@@ -756,7 +766,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Selecci
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Guardar nombres personalizados en disco

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Opciones de juego
 STR_02C5_DIFFICULTY_SETTINGS                                    :Configuración de dificultad
 STR_02C7_CONFIG_PATCHES                                         :Configurar parches
@@ -770,16 +780,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Animac
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Detalle completo
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Edificios transparentes
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Señales transparentes
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Información sobre terreno
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Activar consola
 STR_02D7_SCREENSHOT_CTRL_S                                      :Captura de pantalla (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Captura Gigante (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Acerca de 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Apagado
 STR_02DA_ON                                                     :{BLACK}Encendido
@@ -836,7 +846,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Elegir e
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Elegir estilo de escenario 'fantasía'
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Aportar fondos para construir una nueva industria

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Directorio de Industrias
 STR_0313_FUND_NEW_INDUSTRY                                      :Fundar nueva industria
 ############ range ends here
@@ -882,7 +892,7 @@ STR_TOWNNAME_DANISH                                             :Danes
 STR_TOWNNAME_TURKISH                                            :Turco
 STR_TOWNNAME_ITALIAN                                            :Italiano
 STR_TOWNNAME_CATALAN                                            :Catalán
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Libras (£)
 STR_CURR_USD                                                    :Dólares ($)
@@ -1011,6 +1021,7 @@ STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Prohibi
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Unir estaciones de tren unas junto a otras: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Abandona est. con alguna carga completa, en 'carga completa': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Usar algoritmo mejorado de carga: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Cargar vehículos gradualmente: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflacción: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Entregar mercancía a una estación sólo si hay demanda: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Permitir la construcción de puentes muy largos: {ORANGE}{STRING}
@@ -1027,6 +1038,7 @@ STR_CONFIG_PATCHES_AUTOSCROLL                                   :{LTBLUE}Desplaz
 STR_CONFIG_PATCHES_BRIBE                                        :{LTBLUE}Permitir sobornos a la autoridad local: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NONUNIFORM_STATIONS                          :{LTBLUE}Estaciones no uniformes: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_PATHFINDING_ALL                          :{LTBLUE}Nuevo sistema de busq. de rutas global (NPF, anula a NTP): {ORANGE}{STRING}
+STR_CONFIG_PATCHES_FREIGHT_TRAINS                               :{LTBLUE}Carga el multiplicador de peso para simular trenes pesados: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_SMALL_AIRPORTS                               :{LTBLUE}Permitir siempre aeropuertos pequeños: {ORANGE}{STRING}

@@ -1067,11 +1079,12 @@ STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Expansi
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Mantener los helicópteros en helipuertos automáticamente: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Une la caja de paisaje a la barra de rail/carretera...: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}El scroll de ratón mueve la vista en dirección opuesta: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Muestra información de medidas cuando usamos herramientras construcción: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}Muestra medidas con las herramientras construcción: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Ver estaciones de la empresa: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Ninguno
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Propia empresa
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Todas las empresas
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}Charla de equipo preferida con <ENTER>: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Máx trenes por jugador: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Máx vehículos de carretera por jugador: {ORANGE}{STRING}
@@ -1096,6 +1109,7 @@ STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Interva
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Intervalo de despacho por defecto para barcos: {ORANGE}no
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Desactivar servicio cuando las averías están desactivadas: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Activar límites de velocidad en vagones: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Desactivar railes electricos: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Noticias en color aparecen en: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Fecha de inicio: {ORANGE}{STRING}
@@ -1295,6 +1309,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Protegi
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR APAGADO
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR LLENO
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}INCOMPATIBILIDAD DE VERSIONES
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}PROBLEMA CON NEWGRF

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Unirme al juego

@@ -1399,6 +1414,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} No se han encontrado dispositivos de red o juego compilado sin ENABLE_NETWORK
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} No se puede encontrar ningún juego en red
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} El servidor no responde a la petición
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} No se puede conectar debido a un problema con los NewGRF
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} La sincronización del juego ha fallado.
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} La conexión con el juego en red se ha perdido.
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} No es posible cargar el juego multijugador.
@@ -1420,6 +1436,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :error de desync
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :no se puede cargar el mapa
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :conexión perdida
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :error protocolo
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF erroneo
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :no autorizado
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :recibido paquete extraño
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :versión incorrecta
@@ -1678,7 +1695,7 @@ STR_2805_CAN_T_PLANT_TREE_HERE                                  :{WHITE}No se pu
 STR_2806                                                        :{WHITE}{STRING}
 STR_2808_TOO_MANY_SIGNS                                         :{WHITE}...demasiadas señales
 STR_2809_CAN_T_PLACE_SIGN_HERE                                  :{WHITE}No se puede colocar una señal aquí...
-STR_280A_SIGN                                                   :Sign
+STR_280A_SIGN                                                   :
 STR_280B_EDIT_SIGN_TEXT                                         :{WHITE}Editar texto de la señal
 STR_280C_CAN_T_CHANGE_SIGN_NAME                                 :{WHITE}No se puede cambiar el nombre de la señal...
 STR_280D_SELECT_TREE_TYPE_TO_PLANT                              :{BLACK}Seleccione el tipo de árboles a plantar
@@ -1840,11 +1857,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Generador de Bu
 STR_4825_TOFFEE_QUARRY                                          :Cantera de caramelos
 STR_4826_SUGAR_MINE                                             :Mina de Azúcar

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Requiere: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Requiere: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Requiere: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Producción mes anterior:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% transportado)
@@ -1917,8 +1934,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}No es po
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...ya es de su propiedad!


-############ 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                                                  :Sin nombre
@@ -1961,7 +1978,7 @@ STR_SV_STNAME_LOWER                                             :{STRING} Bajo
 STR_SV_STNAME_HELIPORT                                          :Helipuerto de {STRING}
 STR_SV_STNAME_FOREST                                            :Bosque de {STRING}

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Nivel de dificultad
@@ -2498,16 +2515,20 @@ STR_INVALID_ORDER                                               :{RED} (Orden in
 STR_UNKNOWN_DESTINATION                                         :destino desconocido
 STR_8812_EMPTY                                                  :{LTBLUE}Vacío
 STR_8813_FROM                                                   :{LTBLUE}{CARGO} desde {STATION}
+STR_FROM_MULT                                                   :{LTBLUE}{CARGO} desde {STATION} (x{NUM})
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}El tren {COMMA} está esperando en el depósito
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nuevos Vehículos
 STR_8816                                                        :{BLACK}-
 STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Tren demasiado largo
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Los trenes únicamente puede ser modificados en el interior de los depósitos
 STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trenes
+
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nuevos vehículos de raíl
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nuevo Vehículo Eléctrico de Railes
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nuevos vehículos de monorraíl
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nuevos vehículos de levitación magnética
+STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Vehículos de Rail
+
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Contruir Vehículo
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar vehículo
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esto construirá una copia del vehículo. Control-click compartirá las ordenes
@@ -2862,6 +2883,7 @@ STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Cantidad
 STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}¿Tienes un préstamo muy elevado?
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total de puntos ganados del máximo posible

+STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}Configuración NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Configuración de Newgrf
 STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplicar cambios
 STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Establecer parámetros
@@ -2869,6 +2891,36 @@ STR_NEWGRF_TIP                                                  :{BLACK}Un lista
 STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}¡No tiene ningún fichero newgrf instalado! Por favor, lea las instrucciones en el manual para instalar nuevos gráficos.
 STR_NEWGRF_FILENAME                                             :{BLACK}Fichero: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Se van a realizar cambios a un juego en ejecución; esto puede cerrar OpenTTD.{}¿Estás completamente seguro de realizar esto?
+
+STR_NEWGRF_ADD                                                  :{BLACK}Añadir
+STR_NEWGRF_ADD_TIP                                              :{BLACK}Añadir un NewGRF a la lista
+STR_NEWGRF_REMOVE                                               :{BLACK}Quitar
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Quitar el NewGRF seleccionado de la lista
+STR_NEWGRF_MOVEUP                                               :{BLACK}Mover Arriba
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Mueve el NewGRF seleccionado arriba en la lista
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mover Abajo
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Mueve el NewGRF seleccionado abajo en la lista
+STR_NEWGRF_FILE_TIP                                             :{BLACK}Una lista de los NewGRF instalados. Pulsa en el fichero para cambiar sus parámetros
+STR_NEWGRF_PARAMETER                                            :{BLACK}Parametros: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Introduce los parámetros del NewGRF
+STR_NEWGRF_NO_INFO                                              :{BLACK}No tiene información disponible
+
+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Ficheros NewGRF disponibles
+STR_NEWGRF_ADD_FILE                                             :{BLACK}Añadir a la selección
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Añade el NewGRF seleccionado a tu configuración
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Actualizar ficheros
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Actualiza la lista de ficheros NewGRF disponibles
+STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}No se puede añadir: GRF ID duplicado
+
+STR_NEWGRF_NOT_FOUND                                            :{RED}Fichero no encontrado
+STR_NEWGRF_DISABLED                                             :{RED}Desactivado
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Fichero no encontrado (GRF compatible cargado)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}GRF(s) compatibles cargos para ficheros que faltan
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Fichero(s) GRF perdidos han sido desactivados
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Fichero(s) GRF para poder cargar el juego

 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2900,7 +2952,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordenes
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Ver todos los vehículos que tienen el mismo calendario

 ### depot strings
-
 STR_SELL                                                        :{BLACK}Vender
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Estás a punto de vender todos los vehículos del depósito
 STR_ARE_YOU_SURE                                                :{BLACK}¿Estás seguro?
@@ -3015,7 +3066,7 @@ STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotació
 STR_TERRAIN_TYPE                                                :{BLACK}Tipo de terreno
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivel del mar:
 STR_SMOOTHNESS                                                  :{BLACK}Suavidad:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Altura línea nieve
+STR_SNOW_LINE_HEIGHT                                            :{BLACK}Altura línea nieve:
 STR_DATE                                                        :{BLACK}Fecha:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}No. de ciudades:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. de industrias:
@@ -3039,7 +3090,7 @@ STR_WORLD_GENERATION                                            :{BLACK}Generaci
 STR_TREE_GENERATION                                             :{BLACK}Generación de árboles
 STR_UNMOVABLE_GENERATION                                        :{BLACK}Generación inamovible
 STR_CLEARING_TILES                                              :{BLACK}Generación de area áspera y rocosa
-STR_SETTINGUP_GAME                                              :{BLACK}Setting up game
+STR_SETTINGUP_GAME                                              :{BLACK}Configurar juego
 STR_PREPARING_TILELOOP                                          :{BLACK}Ejecutar tile-loop
 STR_PREPARING_GAME                                              :{BLACK}Preparando juego
 STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Esta acción cambia el nivel de dificultad a personalizado
--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -1,6 +1,6 @@
 ##name Swedish
 ##ownname Svenska
-##isocode sv_SE.UTF-8
+##isocode sv_SE
 ##plural 0

 ##id 0x0000
@@ -57,7 +57,7 @@ STR_0031_MAIL                                                   :Post
 STR_0032_OIL                                                    :Olja
 STR_0033_LIVESTOCK                                              :Boskap
 STR_0034_GOODS                                                  :Gods
-STR_0035_GRAIN                                                  :Spannmål
+STR_0035_GRAIN                                                  :Vete
 STR_0036_WOOD                                                   :Timmer
 STR_0037_IRON_ORE                                               :Järnmalm
 STR_0038_STEEL                                                  :Stål
@@ -70,7 +70,7 @@ STR_003E_FOOD                                                   :Mat
 STR_003F_PAPER                                                  :Papper
 STR_0040_GOLD                                                   :Guld
 STR_0041_WATER                                                  :Vatten
-STR_0042_WHEAT                                                  :Vete
+STR_0042_WHEAT                                                  :Spannmål
 STR_0043_RUBBER                                                 :Gummi
 STR_0044_SUGAR                                                  :Socker
 STR_0045_TOY                                                    :Leksaker
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Karta -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spelinställningar
 STR_00B2_MESSAGE                                                :{YELLOW}Meddelande
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Meddelande från {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varning!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan inte utföra detta...
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan inte röja området...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Ursprunglig äganderätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter reserverade
 STR_00B7_VERSION                                                :{BLACK}OpenTTD version {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD-teamet
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 OpenTTD-teamet
 STR_TRANSLATED_BY                                               :{BLACK}  Översättare -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -307,7 +308,7 @@ STR_0148_GAME_OPTIONS                                           :{BLACK}Spelinst

 STR_0150_SOMEONE                                                :någon{SKIP}{SKIP}
 STR_0151_MAP_OF_WORLD                                           :Världskarta
-STR_0152_TOWN_DIRECTORY                                         :Lista med städer
+STR_0152_TOWN_DIRECTORY                                         :Stadslista
 STR_0153_SUBSIDIES                                              :Subventioner

 STR_UNITS_IMPERIAL                                              :Engelsk
@@ -342,7 +343,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10^3 lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} ton
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Graf över gångbar inkomst
 STR_0155_INCOME_GRAPH                                           :Graf över inkomster
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Graf över levererat gods
@@ -351,7 +352,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Graf över för
 STR_0159_CARGO_PAYMENT_RATES                                    :Fraktförtjänster
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Tabell ö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
@@ -378,12 +379,12 @@ STR_SORT_BY_AGE                                                 :Ålder
 STR_SORT_BY_RELIABILITY                                         :Pålitlighet
 STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE                        :Total kapacitet per godstyp
 STR_SORT_BY_MAX_SPEED                                           :Maximal hastighet
-STR_SORT_BY_MODEL                                               :
-STR_SORT_BY_VALUE                                               :
+STR_SORT_BY_MODEL                                               :Modell
+STR_SORT_BY_VALUE                                               :Värde
 STR_SORT_BY_FACILITY                                            :Stationstyp
 STR_SORT_BY_WAITING                                             :Väntande last-värde
-STR_SORT_BY_RATING_MAX                                          :Last Värdering
-STR_ENGINE_SORT_ENGINE_ID                                       :Lok ID (normal sortering)
+STR_SORT_BY_RATING_MAX                                          :Lasts-värdering
+STR_ENGINE_SORT_ENGINE_ID                                       :MotorID (Klassisk Sort)
 STR_ENGINE_SORT_COST                                            :Kostnad
 STR_ENGINE_SORT_POWER                                           :Elektriskt
 STR_ENGINE_SORT_INTRO_DATE                                      :Introduktionsdatum
@@ -393,7 +394,19 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Lastkapacitet
 STR_NO_WAITING_CARGO                                            :{BLACK}Ingen sorts last väntar
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Markera alla inrättningar
 STR_SELECT_ALL_TYPES                                            :{BLACK}Välj alla last-typer (inklusive icke väntande last)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Tillgängliga tåg
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tillgängliga fordon
+STR_AVAILABLE_SHIPS                                             :{BLACK}Tillgängliga skepp
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tillgängliga flyplan
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Se lista med tillgängliga motordesigner för denna fordonstyp
+STR_MANAGE_LIST                                                 :{BLACK}Behandlingslista
+STR_MANAGE_LIST_TIP                                             :{BLACK}Skicka instruktioner till alla fordon på denna lista
 STR_REPLACE_VEHICLES                                            :Byt ut fordon
+STR_SEND_TRAIN_TO_DEPOT                                         :Skicka till Depå
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Skicka till Depå
+STR_SEND_SHIP_TO_DEPOT                                          :Skicka till Depå
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Skicka till Hangar
+STR_SEND_FOR_SERVICING                                          :Skicka till Service

 ############ range for months starts
 STR_0162_JAN                                                    :jan
@@ -480,7 +493,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
@@ -512,7 +525,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}

@@ -600,22 +613,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} uppnår '{STRING}' status!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} från {COMPANY} uppnår '{STRING}' status!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Nytt scenario
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Scenario-editor
 STR_0223_LAND_GENERATION                                        :{WHITE}Skapa mark
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Slumpmässig mark
-STR_0227_RESET_LAND                                             :{BLACK}Återställ mark
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Öka storlek av yta att höja/sänka
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Minska storlek av yta att höja/sänka
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Generera slumpmässig mark
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Återställ landskapet
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Återställ landskapet
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Använd höjdkarta
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Använd höjdkarta
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Vill du verkligen återställa landskapet?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Skapa landskap
 STR_022F_TOWN_GENERATION                                        :{BLACK}Bygg städer
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Bygg industrier
@@ -727,13 +734,13 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Spara sc
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Öppna scenario
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Spara scenario
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Spela scenario
-STR_PLAY_HEIGHTMAP                                              :{BLACK}Spela höjdkarta
+STR_PLAY_HEIGHTMAP                                              :{BLACK}Kör höjdkarta
 STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Starta ett nytt spel, och använd en höjdkarta som landskap
 STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Vill du verkligen avsluta detta scenario?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Avsluta editor
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kan bara byggas i städer med minst 1200 invånare
-STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytta bak startdatumet 1 år
-STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytta fram startdatumet 1 år
+STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytta startdatumet 1 år bakåt
+STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Flytta startdatumet 1 år framåt
 STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...brons ändar måste båda vara på land
 STR_02A1_SMALL                                                  :{BLACK}Liten
 STR_02A2_MEDIUM                                                 :{BLACK}Mellan
@@ -757,11 +764,11 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Fordonen
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Spara egna modellnamn för fordon till disk

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spelinställningar
 STR_02C5_DIFFICULTY_SETTINGS                                    :Svårighetsgrad
-STR_02C7_CONFIG_PATCHES                                         :Konfigurera patchar
-STR_NEWGRF_SETTINGS                                             :Newgrf inställningar
+STR_02C7_CONFIG_PATCHES                                         :Ändra Patchar
+STR_NEWGRF_SETTINGS                                             :NewGRF inställningar
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Stadsnamn visas
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Stationsnamn visas
@@ -771,27 +778,27 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Full a
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Full detaljnivå
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Genomskinliga byggnader
 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ärmdump (Ctrl-S)
-STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Gigantisk skärmdump (Ctrl-G)
+STR_02D7_SCREENSHOT_CTRL_S                                      :Screenshot (Ctrl-S)
+STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Gigantisk Screenshot (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Om 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Av
 STR_02DA_ON                                                     :{BLACK}På
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Visa subventioner
 STR_02DD_SUBSIDIES                                              :Subventioner
 STR_02DE_MAP_OF_WORLD                                           :Världskarta
-STR_EXTRA_VIEW_PORT                                             :Nytt vy fönster
+STR_EXTRA_VIEW_PORT                                             :Nytt vyfönster
 STR_SIGN_LIST                                                   :Skyltlista
-STR_02DF_TOWN_DIRECTORY                                         :Lista med städer
+STR_02DF_TOWN_DIRECTORY                                         :Stadslista
 STR_TOWN_POPULATION                                             :{BLACK}Världsbefolkning: {COMMA}
-STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vy fönster {COMMA}
+STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Vyfönster {COMMA}
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopiera till vy
 STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT                             :{BLACK}Kopiera kartans position till detta Vyfönster
 STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW                                :{BLACK}Klistra in vyn
@@ -819,10 +826,10 @@ STR_02F7_OFF                                                    :Avstängd
 STR_02F8_EVERY_3_MONTHS                                         :Var 3:e månad
 STR_02F9_EVERY_6_MONTHS                                         :Var 6:e månad
 STR_02FA_EVERY_12_MONTHS                                        :Var 12:e månad
-STR_02FB_START_A_NEW_GAME                                       :{BLACK}Börja ett nytt spel
-STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Ladda sparat spel
-STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Skapa ett eget nytt spel värld/scenario
-STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Välj en spelare
+STR_02FB_START_A_NEW_GAME                                       :{BLACK}Starta ett nytt spel
+STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Ladda ett sparat spel
+STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Skapa en egen spelvärld/scenario
+STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Välj Single-Player spel
 STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Välj nätverksspel med 2-8 spelare
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Visa spelinställningar
 STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Visa inställningar för svårighetsgrad
@@ -835,9 +842,9 @@ STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Välj 't
 STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Välj 'sub-arktiskt' typ av landskap
 STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Välj 'sub-tropiskt' typ av landskap
 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
+STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Bekosta bygget av en ny industri

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industriförteckning
 STR_0313_FUND_NEW_INDUSTRY                                      :Bekosta ny industri
 ############ range ends here
@@ -849,8 +856,8 @@ STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...kan b
 STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...kan bara byggas i öken
 STR_0319_PAUSED                                                 :{YELLOW}* *  PAUSAD  *  *

-STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Skärmdump sparades som '{STRING}'
-STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Skärmdump misslyckades!
+STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Screenshot sparades som '{STRING}'
+STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Screenshot misslyckades!

 STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Köp mark för framtida användning
 STR_032F_AUTOSAVE                                               :{RED}AUTOSPARNING
@@ -874,8 +881,8 @@ STR_TOWNNAME_FINNISH                                            :Finska
 STR_TOWNNAME_POLISH                                             :Polska
 STR_TOWNNAME_SLOVAKISH                                          :Slovakiska
 STR_TOWNNAME_NORWEGIAN                                          :Norska
-STR_TOWNNAME_HUNGARIAN                                          :Hungarianska
-STR_TOWNNAME_AUSTRIAN                                           :Australienska
+STR_TOWNNAME_HUNGARIAN                                          :Ungerska
+STR_TOWNNAME_AUSTRIAN                                           :Österrikisk
 STR_TOWNNAME_ROMANIAN                                           :Rumänska
 STR_TOWNNAME_CZECH                                              :Tjeckiska
 STR_TOWNNAME_SWISS                                              :Schweiziska
@@ -883,7 +890,7 @@ STR_TOWNNAME_DANISH                                             :Danska
 STR_TOWNNAME_TURKISH                                            :Turkiska
 STR_TOWNNAME_ITALIAN                                            :Italienska
 STR_TOWNNAME_CATALAN                                            :Katalanska
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pund (£)
 STR_CURR_USD                                                    :Dollar ($)
@@ -905,13 +912,13 @@ STR_CURR_ITL                                                    :Italienska lire
 STR_CURR_NLG                                                    :Holländska guilder (NLG)
 STR_CURR_NOK                                                    :Norska kronor (NOK)
 STR_CURR_PLN                                                    :Polska Zloty (PLN)
-STR_CURR_ROL                                                    :RumÃ€nsk Leu (ROL)
+STR_CURR_ROL                                                    :Rumänsk Leu (ROL)
 STR_CURR_RUR                                                    :Ryska rubel (RUR)
 STR_CURR_SIT                                                    :Slovenska Tolar (SIT)
 STR_CURR_SEK                                                    :Svenska kronor (SEK)
 STR_CURR_YTL                                                    :Turkisk Lire (YTL)
-STR_CURR_SKK                                                    :Slovakiska Koruna (SKK)
-STR_CURR_BRR                                                    :Brasilianska Real (BRL)
+STR_CURR_SKK                                                    :Slovakisk Koruna (SKK)
+STR_CURR_BRR                                                    :Brasiliansk Real (BRL)

 STR_CURR_CUSTOM                                                 :Egen...

@@ -966,8 +973,8 @@ STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan inte
 STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan inte kopiera orderlistan...
 STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delade order - -

-STR_TRAIN_IS_LOST                                               :{WHITE}Tåg {COMMA} har tappat bort sig.
-STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Tåg {COMMA}s vinst förra året var {CURRENCY}
+STR_TRAIN_IS_LOST                                               :{WHITE}Tåg {COMMA} är vilse
+STR_TRAIN_IS_UNPROFITABLE                                       :{WHITE}Förra året fölorade Tåg {COMMA}  {CURRENCY}
 STR_EURO_INTRODUCE                                              :{BLACK}{BIGFONT}Europeiska Valutasystemet!{}{}Euron introduceras och ditt land går över till den som dess enda valuta!

 # Start of order review system.
@@ -1012,6 +1019,7 @@ STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Förbju
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Kombinera tågstationer som byggs bredvid varandra: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Lämna stationen när något gods är fullt, om 'full load': {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Använd förbättrad algoritm: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Lasta fordon gradvis: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflation: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Leverera gods till en station enbart om någon frågar efter det: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Tillåt väldigt långa broar: {ORANGE}{STRING}
@@ -1103,7 +1111,7 @@ STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Stäng

 STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Färgade nyheter visas i: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Startdatum: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Avsluta spelet om: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Avsluta spelet år: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Lugn ekonomi (flera små ändringar)
 STR_CONFIG_PATCHES_ALLOW_SHARES                                 :{LTBLUE}Tillåt inköp av aktier från andra företag
 STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY                         :{LTBLUE}Vid utdragning av signaler, placera en signal var: {ORANGE}{STRING} ruta
@@ -1138,19 +1146,19 @@ STR_TOYLAND_LANDSCAPE                                           :Leksakslandskap

 STR_CHEATS                                                      :{WHITE}Fusk
 STR_CHEATS_TIP                                                  :{BLACK}Checkboxar indikerar om du använt det här fusket förut
-STR_CHEATS_WARNING                                              :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att en sådan förkasstlig handling aldrig glöms bort.
-STR_CHEAT_MONEY                                                 :{LTBLUE}Öka pengar genom att {CURRENCY64}
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spelar som: {ORANGE}{COMMA}
-STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}trimmad bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING}
+STR_CHEATS_WARNING                                              :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att detta inte kommer glömmas.
+STR_CHEAT_MONEY                                                 :{LTBLUE}Öka pengar med {CURRENCY64}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Spela som Spelare: {ORANGE}{COMMA}
+STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Magisk Bulldozer (ta bort industrier, fyrar etc.): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnlar kan korsa varandra: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Byggnation i pause-läge: {ORANGE}{STRING}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bygga i pause-läge: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetplan kommer inte att störta (frekvent) på små flygplatser: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Byt klimat: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Byt datum: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktivera modifierande produceringsvärden: {ORANGE}{STRING}

 STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}På väg mot {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}På väg mot {WAYPOINT}, {VELOCITY}
+STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}På väg mot {WAYPOINT} i {VELOCITY}

 STR_GO_TO_WAYPOINT                                              :Gå via {WAYPOINT}
 STR_GO_NON_STOP_TO_WAYPOINT                                     :Gå via {WAYPOINT} utan att stanna
@@ -1210,14 +1218,14 @@ STR_CONVERT_RAIL_TIP                                            :{BLACK}Konverte
 STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Drag loket här för att sälja hela tåget

 STR_DRAG_DROP                                                   :{BLACK}Drag & Släpp
-STR_STATION_DRAG_DROP                                           :{BLACK}Bygg en station genom drag & släpp
+STR_STATION_DRAG_DROP                                           :{BLACK}Bygg en station genom att dra & släppa
 STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Välj vilken stationsklass som ska visas
 STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Välj stationstyp att bygga

 STR_FAST_FORWARD                                                :{BLACK}Snabbspola spelet
 STR_MESSAGE_HISTORY                                             :{WHITE}Meddelandehistorik
 STR_MESSAGE_HISTORY_TIP                                         :{BLACK}En lista av dom senaste nyheterna
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Avaktivera alla
+STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Deaktivera alla
 STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Aktivera alla

 STR_CONSTRUCT_COAL_MINE_TIP                                     :{BLACK}Bygg kolgruva
@@ -1225,11 +1233,11 @@ STR_CONSTRUCT_FOREST_TIP                                        :{BLACK}Plantera
 STR_CONSTRUCT_OIL_RIG_TIP                                       :{BLACK}Bygg oljerigg
 STR_CONSTRUCT_FARM_TIP                                          :{BLACK}Bygg farm
 STR_CONSTRUCT_COPPER_ORE_MINE_TIP                               :{BLACK}Bygg koppargruva
-STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Bygg oljekälla
+STR_CONSTRUCT_OIL_WELLS_TIP                                     :{BLACK}Borra efter olja
 STR_CONSTRUCT_GOLD_MINE_TIP                                     :{BLACK}Bygg guldgruva
 STR_CONSTRUCT_DIAMOND_MINE_TIP                                  :{BLACK}Bygg diamantgruva
 STR_CONSTRUCT_IRON_ORE_MINE_TIP                                 :{BLACK}Bygg järnmalmsgruva
-STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Plantera fruktplantage
+STR_CONSTRUCT_FRUIT_PLANTATION_TIP                              :{BLACK}Finansiera fruktplantage
 STR_CONSTRUCT_RUBBER_PLANTATION_TIP                             :{BLACK}Plantera gummiplantage
 STR_CONSTRUCT_WATER_SUPPLY_TIP                                  :{BLACK}Bygg vattentillgång
 STR_CONSTRUCT_COTTON_CANDY_TIP                                  :{BLACK}Plantera sockervaddskog
@@ -1264,7 +1272,7 @@ TEMP_AI_MULTIPLAYER                                             :{WHITE}Varning:
 STR_NETWORK_MULTIPLAYER                                         :{WHITE}Flera spelare

 STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spelarnamn:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Namnet som andra spelare kommer se dig under
+STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Namnet som andra spelare kommer se dej som
 STR_NETWORK_CONNECTION                                          :{BLACK}Anslutning:
 STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Välj mellan att spela över internet eller det lokala nätverket

@@ -1273,7 +1281,7 @@ STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Starta e

 STR_NETWORK_GAME_NAME                                           :{BLACK}Namn
 STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Namn på nätverksspelet
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Språk, server version, mm
+STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Språk, serverversion, mm
 STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klicka på ett spel från listan för att välja det

 STR_NETWORK_FIND_SERVER                                         :{BLACK}Leta server
@@ -1295,10 +1303,11 @@ STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverv
 STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adress:  {WHITE}{STRING} : {NUM}
 STR_NETWORK_START_DATE                                          :{SILVER}Startdatum:  {WHITE}{DATE_SHORT}
 STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuvarande datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Lösenordsskyddad!
+STR_NETWORK_PASSWORD                                            :{SILVER}Lösenordsskyddat!
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER AVSTÄNGD
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER FULL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIONERNA FUNKAR INTE IHOP
+STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIONERNA MATCHAR EJ
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NewGRF Matchar Ej

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Gå med i spelet

@@ -1307,7 +1316,7 @@ STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Starta e

 STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Namn:
 STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Namnet på nätverksspelet kommer att synas för andra spelare i multiplayer menyn
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Ange lösenord
+STR_NETWORK_SET_PASSWORD                                        :{BLACK}Bestäm lösenord
 STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Skydda spelet med ett lösenord så att inte andra än dom som har lösenordet kan gå med i spelet
 STR_NETWORK_SELECT_MAP                                          :{BLACK}Välj karta:
 STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Vilken karta vill du spela?
@@ -1319,7 +1328,7 @@ STR_NETWORK_INTERNET                                            :Internet
 STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
 STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (publik)
 STR_NETWORK_COMBO2                                              :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_0_PLAYERS                                           :0 spelare
+STR_NETWORK_0_PLAYERS                                           :Inga spelare
 STR_NETWORK_1_PLAYERS                                           :1 spelare
 STR_NETWORK_2_PLAYERS                                           :2 spelare
 STR_NETWORK_3_PLAYERS                                           :3 spelare
@@ -1451,7 +1460,7 @@ STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Servern

 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
-STR_NETWORK_SPECTATORS                                          :Åskådare
+STR_NETWORK_SPECTATORS                                          :Publik

 STR_NETWORK_CLIENTLIST_NONE                                     :(ingen)
 STR_NETWORK_CLIENTLIST_KICK                                     :Kasta ut
@@ -1485,14 +1494,14 @@ STR_0800_COST                                                   :{TINYFONT}{RED}
 STR_0801_COST                                                   :{RED}Kostnad: {CURRENCY}
 STR_0802_INCOME                                                 :{TINYFONT}{GREEN}Inkomst: {CURRENCY}
 STR_0803_INCOME                                                 :{GREEN}Inkomst: {CURRENCY}
-STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Omlastning: {CURRENCY}
-STR_FEEDER                                                      :{YELLOW}Omlastning: {CURRENCY}
+STR_FEEDER_TINY                                                 :{TINYFONT}{YELLOW}Överförning: {CURRENCY}
+STR_FEEDER                                                      :{YELLOW}Överförning: {CURRENCY}
 STR_0805_ESTIMATED_COST                                         :{WHITE}Uppskattad kostnad: {CURRENCY}
 STR_0807_ESTIMATED_INCOME                                       :{WHITE}Uppskattad inkomst: {CURRENCY}
 STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Kan inte höja marken här...
 STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Kan inte sänka marken här...
 STR_080A_ROCKS                                                  :Stenar
-STR_080B_ROUGH_LAND                                             :Obearbetad mark
+STR_080B_ROUGH_LAND                                             :Ojämn mark
 STR_080C_BARE_LAND                                              :Barmark
 STR_080D_GRASS                                                  :Gräs
 STR_080E_FIELDS                                                 :Fält
@@ -1511,7 +1520,7 @@ STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Måste t
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Bygg järnväg
 STR_TITLE_ELRAIL_CONSTRUCTION                                   :{WHITE}Elektrifierad järnvägskonstruktion
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Bygg monorail
-STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Bygg maglev
+STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}Bygg MagLev
 STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Välj järnvägsbro
 STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Kan inte bygga depå här...
 STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Kan inte bygga järnvägsstation här...
@@ -1523,7 +1532,7 @@ STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Riktning
 STR_1015_RAILROAD_CONSTRUCTION                                  :Bygg järnväg
 STR_TOOLB_ELRAIL_CONSTRUCTION                                   :Elektrifierad järnvägskonstruktion
 STR_1016_MONORAIL_CONSTRUCTION                                  :Bygg monorail
-STR_1017_MAGLEV_CONSTRUCTION                                    :Bygg maglev
+STR_1017_MAGLEV_CONSTRUCTION                                    :Bygg MagLev
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Bygg järnväg
 STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}Bygg depå (för att bygga eller reparera tåg)
 STR_101A_BUILD_RAILROAD_STATION                                 :{BLACK}Bygg järnvägsstation
@@ -1538,7 +1547,7 @@ STR_1023_RAILROAD_TRAIN_DEPOT                                   :Järnvägsdepå
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...området ägs av ett annat företag
 STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Järnväg med vanliga signaler
 STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Järnväg med för-signaler
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Järnväg med exit-signaler
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Järnväg med utgående signaler
 STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Järnväg med kombinerade signaler


@@ -1553,12 +1562,12 @@ STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kan inte
 STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Riktning för bussgarage
 STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kan inte bygga bussgarage här...
 STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kan inte bygga busshållplats...
-STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan inte bygga lastbilsbrygga...
+STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kan inte bygga lastbilsstation...
 STR_180A_ROAD_CONSTRUCTION                                      :Bygg väg
 STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bygg väg
 STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bygg bussgarage (för att bygga eller reparera vägfordon)
 STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bygg busshållplats
-STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bygg lastbilsbrygga
+STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bygg lastbilsstation
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bygg vägbro
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bygg vägtunnel
 STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Växla mellan att bygga/ta bort väg
@@ -1599,10 +1608,10 @@ STR_2017_FOUNTAIN                                               :Fontän
 STR_2018_PARK                                                   :Park
 STR_2019_OFFICE_BLOCK                                           :Kontorslokaler
 STR_201A_SHOPS_AND_OFFICES                                      :Affärer och kontor
-STR_201B_MODERN_OFFICE_BUILDING                                 :Moderna kontorsbyggnader
+STR_201B_MODERN_OFFICE_BUILDING                                 :Modern kontorsbyggnad
 STR_201C_WAREHOUSE                                              :Varuhus
-STR_201D_OFFICE_BLOCK                                           :Kontor
-STR_201E_STADIUM                                                :Stadium
+STR_201D_OFFICE_BLOCK                                           :Kontorsbyggnad
+STR_201E_STADIUM                                                :Arena
 STR_201F_OLD_HOUSES                                             :Gamla hus
 STR_2020_LOCAL_AUTHORITY                                        :{BLACK}Lokala myndigheter
 STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Visa information om de lokala myndigheterna
@@ -1628,15 +1637,15 @@ STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} d
 STR_2036_COTTAGES                                               :Stuga
 STR_2037_HOUSES                                                 :Hus
 STR_2038_FLATS                                                  :Lägenheter
-STR_2039_TALL_OFFICE_BLOCK                                      :Höga kontor
+STR_2039_TALL_OFFICE_BLOCK                                      :Hög kontorsbyggnad
 STR_203A_SHOPS_AND_OFFICES                                      :Affärer och kontor
 STR_203B_SHOPS_AND_OFFICES                                      :Affärer och kontor
-STR_203C_THEATER                                                :Teater
-STR_203D_STADIUM                                                :Stadium
+STR_203C_THEATER                                                :Biograf
+STR_203D_STADIUM                                                :Arena
 STR_203E_OFFICES                                                :Kontor
 STR_203F_HOUSES                                                 :Hus
 STR_2040_CINEMA                                                 :Biograf
-STR_2041_SHOPPING_MALL                                          :Shoppingcentrum
+STR_2041_SHOPPING_MALL                                          :Shoppingcentra
 STR_2042_DO_IT                                                  :{BLACK}Utför
 STR_2043_LIST_OF_THINGS_TO_DO_AT                                :{BLACK}Lista av åtgärder att utföra i staden - klicka på en rad för ytterligare detaljer
 STR_2044_CARRY_OUT_THE_HIGHLIGHTED                              :{BLACK}Utför markerad åtgärd i ovanstående lista
@@ -1700,8 +1709,8 @@ STR_3005_TOO_CLOSE_TO_ANOTHER_RAILROAD                          :{WHITE}För nä
 STR_3006_ADJOINS_MORE_THAN_ONE_EXISTING                         :{WHITE}Angränsar till mer än en station/hållplats
 STR_3007_TOO_MANY_STATIONS_LOADING                              :{WHITE}För många stationer/hållplatser i staden
 STR_3008_TOO_MANY_STATIONS_LOADING                              :{WHITE}För många stationer/hållplatser
-STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}För många buss hållplatser
-STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}För många lastbils stationer
+STR_3008A_TOO_MANY_BUS_STOPS                                    :{WHITE}För många busshållplatser
+STR_3008B_TOO_MANY_TRUCK_STOPS                                  :{WHITE}För många lastbilsstationer
 STR_3009_TOO_CLOSE_TO_ANOTHER_STATION                           :{WHITE}För nära en annan stationer/hållplatser
 STR_300A_0                                                      :{WHITE}{STATION} {STATIONFEATURES}
 STR_300B_MUST_DEMOLISH_RAILROAD                                 :{WHITE}Måste riva järnvägsstation först
@@ -1715,7 +1724,7 @@ STR_3033_ACCEPTS                                                :{BLACK}Accepter
 STR_3034_LOCAL_RATING_OF_TRANSPORT                              :{BLACK}Lokal värdering av transporttjänster:

 ############ range for rating starts
-STR_3035_APPALLING                                              :Skrämmande
+STR_3035_APPALLING                                              :Hemskt Dålig
 STR_3036_VERY_POOR                                              :Väldigt dålig
 STR_3037_POOR                                                   :Dålig
 STR_3038_MEDIOCRE                                               :Medelmåttig
@@ -1777,15 +1786,15 @@ STR_STAT_CLASS_WAYP                                             :Vägpunkter
 STR_3800_SHIP_DEPOT_ORIENTATION                                 :{WHITE}Skeppsdepå riktning
 STR_3801_MUST_BE_BUILT_ON_WATER                                 :{WHITE}...måste byggas på vatten
 STR_3802_CAN_T_BUILD_SHIP_DEPOT                                 :{WHITE}Kan inte bygga skeppsdepå här...
-STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Välj skeppsdepå riktning
+STR_3803_SELECT_SHIP_DEPOT_ORIENTATION                          :{BLACK}Välj skeppsdepåns riktning
 STR_3804_WATER                                                  :Vatten
 STR_3805_COAST_OR_RIVERBANK                                     :Kust eller flodbank
-STR_3806_SHIP_DEPOT                                             :skeppsdepå
+STR_3806_SHIP_DEPOT                                             :Skeppsdepå
 STR_3807_CAN_T_BUILD_ON_WATER                                   :{WHITE}...Kan inte bygga på vatten

 ##id 0x4000
 STR_4000_SAVE_GAME                                              :{WHITE}Spara spel
-STR_4001_LOAD_GAME                                              :{WHITE}Öppna spel
+STR_4001_LOAD_GAME                                              :{WHITE}Ladda spel
 STR_4002_SAVE                                                   :{BLACK}Spara
 STR_4003_DELETE                                                 :{BLACK}Ta bort
 STR_4004                                                        :{COMPANY}, {DATE_LONG}
@@ -1844,11 +1853,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Bubbelgenerator
 STR_4825_TOFFEE_QUARRY                                          :Knäckbrott
 STR_4826_SUGAR_MINE                                             :Sockergruva

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Kräver: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Kräver: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Krä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}{CARGO}{BLACK} ({COMMA}% transporterat)
@@ -1908,7 +1917,7 @@ STR_5024_REINFORCED_CONCRETE_SUSPENSION                         :Vägbro med fö
 STR_5025_WOODEN_ROAD_BRIDGE                                     :Vägbro av trä
 STR_5026_CONCRETE_ROAD_BRIDGE                                   :Vägbro av betong
 STR_5027_TUBULAR_RAIL_BRIDGE                                    :Järnvägsrörbro
-STR_5028_TUBULAR_ROAD_BRIDGE                                    :Vägrörbro
+STR_5028_TUBULAR_ROAD_BRIDGE                                    :Rörbro

 ##id 0x5800
 STR_5800_OBJECT_IN_THE_WAY                                      :{WHITE}Objekt i vägen
@@ -1921,8 +1930,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Kan inte
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...du ä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
@@ -1932,22 +1941,22 @@ STR_SV_SHIP_NAME                                                :Skepp {COMMA}
 STR_SV_AIRCRAFT_NAME                                            :Flygplan {COMMA}

 STR_SV_STNAME                                                   :{STRING}
-STR_SV_STNAME_NORTH                                             :{STRING} norr
+STR_SV_STNAME_NORTH                                             :{STRING} norra
 STR_SV_STNAME_SOUTH                                             :{STRING} söder
-STR_SV_STNAME_EAST                                              :{STRING} öster
-STR_SV_STNAME_WEST                                              :{STRING} väster
-STR_SV_STNAME_CENTRAL                                           :{STRING} central
+STR_SV_STNAME_EAST                                              :{STRING} östra
+STR_SV_STNAME_WEST                                              :{STRING} västra
+STR_SV_STNAME_CENTRAL                                           :{STRING} centralstation
 STR_SV_STNAME_TRANSFER                                          :{STRING} transfer
-STR_SV_STNAME_HALT                                              :{STRING} stopp
-STR_SV_STNAME_VALLEY                                            :{STRING} dalgång
+STR_SV_STNAME_HALT                                              :{STRING} hållplats
+STR_SV_STNAME_VALLEY                                            :{STRING}dal
 STR_SV_STNAME_HEIGHTS                                           :{STRING} höjder
-STR_SV_STNAME_WOODS                                             :{STRING} skogar
-STR_SV_STNAME_LAKESIDE                                          :{STRING} sjö
+STR_SV_STNAME_WOODS                                             :{STRING} skog
+STR_SV_STNAME_LAKESIDE                                          :{STRING} sjöstrand
 STR_SV_STNAME_EXCHANGE                                          :{STRING} växel
 STR_SV_STNAME_AIRPORT                                           :{STRING} flygplats
 STR_SV_STNAME_OILFIELD                                          :{STRING} oljefält
 STR_SV_STNAME_MINES                                             :{STRING} gruva
-STR_SV_STNAME_DOCKS                                             :{STRING} Hamnar
+STR_SV_STNAME_DOCKS                                             :{STRING} Kaj
 STR_SV_STNAME_BUOY_1                                            :{STRING} boj 1
 STR_SV_STNAME_BUOY_2                                            :{STRING} boj 2
 STR_SV_STNAME_BUOY_3                                            :{STRING} boj 3
@@ -1958,14 +1967,14 @@ STR_SV_STNAME_BUOY_7                                            :{STRING} boj 7
 STR_SV_STNAME_BUOY_8                                            :{STRING} boj 8
 STR_SV_STNAME_BUOY_9                                            :{STRING} boj 9
 STR_SV_STNAME_ANNEXE                                            :{STRING} annex
-STR_SV_STNAME_SIDINGS                                           :{STRING} sida
-STR_SV_STNAME_BRANCH                                            :{STRING} område
+STR_SV_STNAME_SIDINGS                                           :{STRING} förort
+STR_SV_STNAME_BRANCH                                            :{STRING} förgrening
 STR_SV_STNAME_UPPER                                             :Övre {STRING}
 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årighetsgrad
@@ -2151,10 +2160,10 @@ STR_706D_PRESIDENT                                              :Verkställande
 STR_706E_TYCOON                                                 :Tycoon
 STR_706F_BUILD_HQ                                               :{BLACK}Bygg Högkvarter
 STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Bygg huvudkontor / visa företagets huvudkontor
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Bygg om huvudkontor på annan plats (kostar 1% av företagets värde)
+STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Bygg om högkvarter på annan plats (kostar 1% av företagets värde)
 STR_7071_CAN_T_BUILD_COMPANY_HEADQUARTERS                       :{WHITE}Kan inte bygga huvudkontor här...
 STR_7072_VIEW_HQ                                                :{BLACK}Visa högkvarter
-STR_RELOCATE_HQ                                                 :{BLACK}Flytta huvudkontoret
+STR_RELOCATE_HQ                                                 :{BLACK}Flytta högkvarter
 STR_COMPANY_PASSWORD                                            :{BLACK}Lösenord
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Lösenordsskydda ditt företag för att förhindra att obehöriga spelare ansluter.
 STR_SET_COMPANY_PASSWORD                                        :Ange företagets lösenord
@@ -2173,25 +2182,25 @@ STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} har tagits över av {COMPANY}!
 STR_7080_PROTECTED                                              :{WHITE}Det här företaget bedriver inte aktiehandel ännu....

-STR_LIVERY_DEFAULT                                              :Standard färger
+STR_LIVERY_DEFAULT                                              :Normalt Färgschema
 STR_LIVERY_STEAM                                                :Ånglok
-STR_LIVERY_DIESEL                                               :Disellok
-STR_LIVERY_ELECTRIC                                             :Elektriskt lok
-STR_LIVERY_MONORAIL                                             :Monoraillok
-STR_LIVERY_MAGLEV                                               :Maglevlok
+STR_LIVERY_DIESEL                                               :Dieseltåg
+STR_LIVERY_ELECTRIC                                             :Elektriskt tåg
+STR_LIVERY_MONORAIL                                             :Monorail-Tåg
+STR_LIVERY_MAGLEV                                               :Maglev-Tåg
 STR_LIVERY_DMU                                                  :DMU
 STR_LIVERY_EMU                                                  :EMU
-STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passagerarvagn (Ånglok)
-STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passagerarvagn (Disel)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passagerarvagn (Elektrisk)
-STR_LIVERY_FREIGHT_WAGON                                        :Godsvagn
+STR_LIVERY_PASSENGER_WAGON_STEAM                                :Passagerarvagn (Ånga)
+STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passagervagn (Diesel)
+STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passagerarvagn (Elektricitet)
+STR_LIVERY_FREIGHT_WAGON                                        :Fraktvagn
 STR_LIVERY_BUS                                                  :Buss
 STR_LIVERY_TRUCK                                                :Lastbil
 STR_LIVERY_PASSENGER_SHIP                                       :Passagerarfärja
 STR_LIVERY_FREIGHT_SHIP                                         :Fraktskepp
 STR_LIVERY_HELICOPTER                                           :Helikopter
 STR_LIVERY_SMALL_PLANE                                          :Litet flygplan
-STR_LIVERY_LARGE_PLANE                                          :Stort flygplan
+STR_LIVERY_LARGE_PLANE                                          :Stort Flygplan

 STR_LIVERY_GENERAL_TIP                                          :{BLACK}Visa generellt färgschema
 STR_LIVERY_TRAIN_TIP                                            :{BLACK}Visa färgscheman för tåg
@@ -2531,7 +2540,7 @@ STR_8826_GO_TO                                                  :{BLACK}Gå Till
 STR_8827_FULL_LOAD                                              :{BLACK}Lasta
 STR_8828_UNLOAD                                                 :{BLACK}Lasta av
 STR_REFIT                                                       :{BLACK}Anpassa
-STR_REFIT_TIP                                                   :{BLACK}Till vilken godstyp ska anpassningen ska göras i denna order. CTRL+klick för att tabort anpassningsordern
+STR_REFIT_TIP                                                   :{BLACK}Välj vilken godstyp anpassningen ska göras i denna order. CTRL+ klicka för att ta bort anpassningsordern
 STR_REFIT_ORDER                                                 :(Anpassa för {STRING})
 STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Order)
 STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Slut på order - -
@@ -2589,10 +2598,10 @@ STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Gör mar
 STR_SERVICE_HINT                                                :{BLACK}Skippa den här ordern om inte servning behövs
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Nytt {STRING} nu tillgängligt!
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kostnad: {CURRENCY} Vikt: {WEIGHT_S}{}Hastighet: {VELOCITY}  Effekt: {POWER}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {CARGO}
+STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kostnad: {CURRENCY} Vikt: {WEIGHT_S}{}Hastighet: {VELOCITY}  Kraft {POWER}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {CARGO}
 STR_885C_BROKEN_DOWN                                            :{RED}Motorstopp
 STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Löpande kostnad: {LTBLUE}{CURRENCY}/år
-STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Vikt: {LTBLUE}{WEIGHT_S}  {BLACK}Effekt: {LTBLUE}{POWER}{BLACK} Tophastighet: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Vikt: {LTBLUE}{WEIGHT_S}  {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Tophastighet: {LTBLUE}{VELOCITY}
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Vinst detta år: {LTBLUE}{CURRENCY}  (förra året: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Tillförlitlighet: {LTBLUE}{COMMA}%  {BLACK}Motorstopp sedan senaste service: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Stoppat
@@ -2612,8 +2621,8 @@ STR_886F_TRANSFER                                               :{BLACK}Lasta om
 STR_TRAIN_STOPPING                                              :{RED}Stannar
 STR_TRAIN_STOPPING_VEL                                          :{RED}Stannar, {VELOCITY}
 STR_INCOMPATIBLE_RAIL_TYPES                                     :Fel järnvägstyp
-STR_TRAIN_NO_POWER                                              :{RED}Ingen ström
-STR_TRAIN_START_NO_CATENARY                                     :Loket kan inte starta för att detta spår saknar elledningar
+STR_TRAIN_NO_POWER                                              :{RED}Ingen Kraft
+STR_TRAIN_START_NO_CATENARY                                     :

 ##id 0x9000
 STR_9000_ROAD_VEHICLE_IN_THE_WAY                                :{WHITE}Vägfordon i vägen
@@ -2636,9 +2645,9 @@ STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan inte
 STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kan inte stoppa/starta vägfordon...
 STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Vägfordon {COMMA} väntar i depån
 STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}På väg mot {TOWN}s vägdepå
-STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}På väg mot {TOWN}s vägdepå, {VELOCITY}
+STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}På väg mot {TOWN}s vägdepå i {VELOCITY}
 STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Service vid {TOWN}s vägdepå
-STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Service vid {TOWN}s vägdepå, {VELOCITY}
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Service vid {TOWN}s vägdepå i {VELOCITY}
 STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kan inte skicka fordon till depå...
 STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan inte hitta till lokal depå
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Vägfordon - klicka på fordon för information
@@ -2675,10 +2684,10 @@ STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Kan inte
 STR_9038_GO_TO_ROADVEH_DEPOT                                    :Gå till {TOWN} vägfordonsdepå
 STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servning vid {TOWN} vägfordonsdepå Depot

-STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Anpassa fordon att frakta annat gods
-STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Anpassa fordon
-STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Anpassa fordon att frakta markerat gods
-STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan inte anpassa fordon
+STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Anpassa vägfordon till att bära en annan sorts last
+STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Anpassa Vägfordon
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Anpassa vägfordon till att bära markerad last
+STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Kan inte anpassa vägfordon...
 STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Välj lasttyp för fordon

 ##id 0x9800
@@ -2709,9 +2718,9 @@ STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan inte
 STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan inte skicka skepp till depå...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan inte finna en lokal depå
 STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}På väg mot {TOWN}s Skeppsdepå
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}På väg mot {TOWN}s Skeppsdepå, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}På väg mot {TOWN}s Skeppsdepå i {VELOCITY}
 STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service vid {TOWN}s skeppsdepå
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service vid {TOWN}s skeppsdepå, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service vid {TOWN}s skeppsdepå, i{VELOCITY}
 STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Skepp {COMMA} väntar i depå
 STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Bygg hamn
 STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Bygg skeppsdepå (för byggnad och lagning av skepp)
@@ -2778,7 +2787,7 @@ STR_A012_CAN_T_SEND_AIRCRAFT_TO                                 :{WHITE}Kan inte
 STR_HEADING_FOR_HANGAR                                          :{ORANGE}På väg mot {STATION}s hangar
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}På väg mot {STATION}s hangar, {VELOCITY}
 STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service vid {STATION}s hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service vid {STATION}s hangar, {VELOCITY}
+STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service vid {STATION}s hangar i {VELOCITY}
 STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Flygplan {COMMA} väntar i flygplanshangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Flygplan i vägen
 STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan inte stoppa/starta flygplan...
@@ -2867,7 +2876,7 @@ STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Mängden
 STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Enheter av gods levererat de senaste fyra kvartalen.
 STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Typer av gods levererat det senaste kvartalet.
 STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Mängden pengar på hand
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Har du ett stort lån?
+STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Mängd pengar detta företag har lånat
 STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Totalt antal poäng utav möjligt antal poäng

 STR_NEWGRF_SETTINGS_BUTTON                                      :{BLACK}NewGRF Inställningar
@@ -2879,6 +2888,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Det finn
 STR_NEWGRF_FILENAME                                             :{BLACK}Filnamn: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du håller på att göra ändringar i ett spel som används; detta kan krascha OpenTTD.{}Är du helt säker på detta?

 STR_NEWGRF_ADD                                                  :{BLACK}Lägg till
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Lägg till en ny NewGRF-fil till listan
@@ -2886,7 +2896,7 @@ STR_NEWGRF_REMOVE                                               :{BLACK}Ta bort
 STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Ta bort den markerade NewGRF-filen från listan
 STR_NEWGRF_MOVEUP                                               :{BLACK}Flytta upp
 STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Flytta upp den markerade NewGRF-filen i listan
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Fytta ned
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Flytta ned
 STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Flytta ner den markerade NewGRF-filen i listan
 STR_NEWGRF_FILE_TIP                                             :{BLACK}En lista med installerade NewGRF-filer . Välj en fil för att ändra dess parametrar
 STR_NEWGRF_PARAMETER                                            :{BLACK}Paramerar: {SILVER}{STRING}
@@ -2896,16 +2906,23 @@ STR_NEWGRF_NO_INFO                                              :{BLACK}Ingen in
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tillgängliga NewGRF filer
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Lägg till markering
 STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Lägg till den markerade NewGRF-filen till din konfiguration
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Läs om filer
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Scanna om filer
 STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Uppdatera listan med tillgängliga NewGRF-filer
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan inte lägga till filen: redan existerande GRF ID

+STR_NEWGRF_NOT_FOUND                                            :{RED}Matchande fil hittades ej
+STR_NEWGRF_DISABLED                                             :{RED}Avstängd
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Matchande fil saknas (kompatibel GRF laddad)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibel GRF laddad för saknade filer
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Saknad GRF fil har stängts av
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Saknas GRF fil för att kunna ladda spel

 STR_CURRENCY_WINDOW                                             :{WHITE}Egen valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = £ {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Avskiljare:
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix:
-STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix:
+STR_CURRENCY_SUFFIX                                             :{LTBLUE}Ändelse:
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Går över till Euro: {ORANGE}{NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Går över till Euro: {ORANGE}aldrig
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Förhandsgranska: {ORANGE}{CURRENCY}
@@ -2927,8 +2944,8 @@ STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Visa all
 STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Visa alla flygplan där denna station finns med i rutten
 STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Visa alla skepp där denna station finns med i rutten

-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delade order med {COMMA} Fordon{P "" s}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Visa alla fordon med samma körschema
+STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delade instruktioner med {COMMA} Fordon{P "" s}
+STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Visa alla fordon som har samma schema

 ### depot strings

@@ -2947,7 +2964,7 @@ STR_DEPOT_SELL_ALL_CANCEL_SHIP_TIP                              :{BLACK}Sälj in
 STR_DEPOT_SELL_ALL_CANCEL_AIRCRAFT_TIP                          :{BLACK}Sälj inte alla flygplan i hangaren

 STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sälj alla tåg i depån
-STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Sälj alla fordon i depån
+STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP                           :{BLACK}Sälj alla vägfordon i depån
 STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sälj alla skepp i depån
 STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sälj alla flygplan i hangaren

@@ -2956,10 +2973,10 @@ STR_DEPOT_VEHICLE_ORDER_LIST_ROADVEH_TIP                        :{BLACK}Ge en li
 STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Ge en lista av alla fartyg som har denna depå i dess körschema
 STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Ge en lista av alla flygplan som har denna flygplats-hangar i dess körschema

-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Ersätt alla tåg i depån
-STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Ersätt alla fordon i depån
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Ersätt alla skepp i depån
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Ersätt alla flygplan i hangaren
+STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Byt ut alla tåg i depån
+STR_DEPOT_AUTOREPLACE_ROADVEH_TIP                               :{BLACK}Byt ut alla vägfordon i depån
+STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Byt ut alla skepp i depån
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Byt ut alla flygplan i hangaren

 STR_VEHICLE_LIST_TRAIN_DEPOT                                    :{BLACK}{STRING} - {COMMA} Tåg
 STR_VEHICLE_LIST_ROADVEH_DEPOT                                  :{BLACK}{STRING} - {COMMA} Vägfordon
@@ -3017,7 +3034,7 @@ STR_MAGLEV_VEHICLES                                             :Maglevfordon
 STR_TINY_BLACK                                                  :{BLACK}{TINYFONT}{COMMA}

 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vikt: {GOLD}{WEIGHT_S}
-STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{POWER}
+STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK}   Kraft: {GOLD}{POWER}
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Hastighet: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Driftkostnader: {GOLD}{CURRENCY}/år
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapacitet: {GOLD}{CARGO} {STRING}
@@ -3030,31 +3047,31 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacite
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motoriserade vagnar: {GOLD}+{POWER}{BLACK} Vikt: {GOLD}+{WEIGHT_S}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Upprustningsbar till: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Alla typer av last
-STR_PURCHASE_INFO_ALL_BUT                                       :Alla utom {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Allt utom {GOLD}

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

 STR_GENERATE                                                    :{WHITE}Generera
 STR_RANDOM                                                      :{BLACK}Slumpa
 STR_RANDOM_HELP                                                 :{BLACK}Ändra slump-nummer som används för terräng-generering
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Världsgenerering
+STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generera Värld
 STR_RANDOM_SEED                                                 :{BLACK}Slump-nummer:
 STR_RANDOM_SEED_HELP                                            :{BLACK}Klicka för att mata in ett slump-nummer
 STR_LAND_GENERATOR                                              :{BLACK}Landgenerator:
-STR_TREE_PLACER                                                 :{BLACK}Träd algoritm:
+STR_TREE_PLACER                                                 :{BLACK}Träd Algoritm:
 STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotation på höjdkarta:
-STR_TERRAIN_TYPE                                                :{BLACK}Typ av terräng:
+STR_TERRAIN_TYPE                                                :{BLACK}Terrängtyp:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Havsnivå
-STR_SMOOTHNESS                                                  :{BLACK}Framkomlighet:
+STR_SMOOTHNESS                                                  :{BLACK}Jämnhet:
 STR_SNOW_LINE_HEIGHT                                            :{BLACK}Snölinjens höjd:
 STR_DATE                                                        :{BLACK}Datum:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}Antal städer:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Antal industrier:
 STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Flytta snölinjens höjd upp ett steg
-STR_SNOW_LINE_DOWN                                              :{BLACK}Flytta snölinjens höjd ner ett steg
+STR_SNOW_LINE_UP                                                :{BLACK}Höj snölinjens höjd ett upp
+STR_SNOW_LINE_DOWN                                              :{BLACK}Sänk snölinjens höjd ett ner
 STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ändra snölinjens höjd
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Byt år för start
+STR_START_DATE_QUERY_CAPT                                       :{WHITE}Ändra Startår
 STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skala-varning
 STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}För stora storleksändringar av källkarta är inte rekomenderat. Fortsätt med generering?
 STR_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
@@ -3066,9 +3083,9 @@ STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Avbryt g
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Vill du verkligen avbryta genereringen?
 STR_PROGRESS                                                    :{WHITE}{NUM}% färdigt
 STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Världsgenerering
-STR_TREE_GENERATION                                             :{BLACK}Träd generering
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Icke flyttbar generering
+STR_WORLD_GENERATION                                            :{BLACK}Generera Värld
+STR_TREE_GENERATION                                             :{BLACK}Generera Träd
+STR_UNMOVABLE_GENERATION                                        :{BLACK}Oflyttbar generera
 STR_CLEARING_TILES                                              :{BLACK}Svår och stenig markgenerering
 STR_SETTINGUP_GAME                                              :{BLACK}Ställer in spel
 STR_PREPARING_TILELOOP                                          :{BLACK}Kör tile-loop
@@ -3079,10 +3096,10 @@ STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generera
 STR_SE_RANDOM_LAND                                              :{WHITE}Slumpat land
 STR_SE_NEW_WORLD                                                :{BLACK}Skapa ett nytt scenario
 STR_SE_CAPTION                                                  :{WHITE}Scenarotyp
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Flytta den platta landytan ner ett steg
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Flytta den platta landytan upp ett steg
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Ändra höjden på den platta landytan
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Landhöjd (endast platt):
+STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Sänk höjden av platt land ett ner
+STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Öka höjden av platt land ett upp
+STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Ändra höjd av platt land
+STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Höjd av platt land:
 STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}

 STR_SMALLMAP_CENTER                                             :{BLACK}Centrera den lilla kartan på den nuvarande positionen
@@ -3090,17 +3107,17 @@ STR_SMALLMAP_CENTER                                             :{BLACK}Centrera
 ########### String for new airports
 STR_SMALL_AIRPORT                                               :{BLACK}Liten
 STR_CITY_AIRPORT                                                :{BLACK}Stad
-STR_METRO_AIRPORT                                               :{BLACK}Metropolflygplats
-STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Internationell flygplats
+STR_METRO_AIRPORT                                               :{BLACK}Storstads-Flygplats
+STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Internationell Flygplats
 STR_COMMUTER_AIRPORT                                            :{BLACK}Pendlare
 STR_INTERCONTINENTAL_AIRPORT                                    :{BLACK}Interkontinental
 STR_HELIPORT                                                    :{BLACK}Helikopterplatta
 STR_HELIDEPOT                                                   :{BLACK}Helikopterhangar
-STR_HELISTATION                                                 :{BLACK}Helikopterplatta
+STR_HELISTATION                                                 :{BLACK}Helikopterstation

 STR_SMALL_AIRPORTS                                              :{BLACK}Små flygfält
-STR_LARGE_AIRPORTS                                              :{BLACK}Stora flygplatser
-STR_HUB_AIRPORTS                                                :{BLACK}Flygterminaler
+STR_LARGE_AIRPORTS                                              :{BLACK}Stora Flygplatser
+STR_HUB_AIRPORTS                                                :{BLACK}Centrala Flygplatser
 STR_HELIPORTS                                                   :{BLACK}Helikopterfält

 ############ Tooltip measurment
--- a/lang/traditional_chinese.txt
+++ b/lang/traditional_chinese.txt
--- a/lang/turkish.txt
+++ b/lang/turkish.txt
@@ -1,6 +1,6 @@
 ##name Turkish
 ##ownname Türkçe
-##isocode tr_TR.UTF-8
+##isocode tr_TR
 ##plural 1

 ##id 0x0000
@@ -88,7 +88,7 @@ STR_QUANTITY_COAL                                               :{WEIGHT} kömü
 STR_QUANTITY_MAIL                                               :{COMMA} çanta posta
 STR_QUANTITY_OIL                                                :{VOLUME} petrol
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} tane hayvan
-STR_QUANTITY_GOODS                                              :{COMMA} kasa esya
+STR_QUANTITY_GOODS                                              :{COMMA} kasa eşya
 STR_QUANTITY_GRAIN                                              :{WEIGHT} tahıl
 STR_QUANTITY_WOOD                                               :{WEIGHT} odun
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT} demir
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Harita -
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Seçenekler
 STR_00B2_MESSAGE                                                :{YELLOW}Mesaj
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Mesaj: {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Uyarı!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Yapılamaz....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Burası temizlenemez....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Orjinal kopyalama hakkı {COPYRIGHT} 1995 Chris Sawyer, Her Hakkı Saklıdır
 STR_00B7_VERSION                                                :{BLACK}OpenTTD sürüm {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD takımı
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 OpenTTD takımı
 STR_TRANSLATED_BY                                               :{BLACK}  Çevirenler -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -294,6 +295,7 @@ STR_0140_NEW_GAME                                               :{BLACK}Yeni Oyu
 STR_0141_LOAD_GAME                                              :{BLACK}Oyun Yükle
 STR_SINGLE_PLAYER                                               :{BLACK}Tek Oyunculu
 STR_MULTIPLAYER                                                 :{BLACK}Çok Oyunculu
+STR_SCENARIO_EDITOR                                             :{BLACK}Senaryo Düzenleyici

 STR_64                                                          :64
 STR_128                                                         :128
@@ -342,7 +344,7 @@ STR_UNITS_FORCE_IMPERIAL                                        :{COMMA}x10³ lb
 STR_UNITS_FORCE_METRIC                                          :{COMMA} ton
 STR_UNITS_FORCE_SI                                              :{COMMA} kN

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Kar grafiği
 STR_0155_INCOME_GRAPH                                           :Gelir grafiği
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Taşınan kargo grafiği
@@ -351,7 +353,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Şirket değeri
 STR_0159_CARGO_PAYMENT_RATES                                    :Kargo ödeme tablosu
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Şirketler ligi
 STR_PERFORMANCE_DETAIL_MENU                                     :Ayrıntılı Performans
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}OpenTTD Hakkinda
 STR_015C_SAVE_GAME                                              :Kaydet
@@ -393,8 +395,13 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Kapasite
 STR_NO_WAITING_CARGO                                            :{BLACK}Hiç kargo yok
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Tüm türleri seç
 STR_SELECT_ALL_TYPES                                            :{BLACK}Tüm kargo türlerini seç (hiç beklemeyenler dahil)
+STR_AVAILABLE_TRAINS                                            :{BLACK}Kullanılabilir Trenler
+STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Kullanılabilir Arabalar
+STR_AVAILABLE_SHIPS                                             :{BLACK}Kullanılabilir Gemiler
+STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Kullanılabilir Uçaklar
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Bu araç türü için mümkün olan lokomotif tasarimlari
 STR_MANAGE_LIST                                                 :{BLACK}Listeyi yönet
-STR_MANAGE_LIST_TIP                                             :{BLACK}Listedeki tüm araçlara komut ver
+STR_MANAGE_LIST_TIP                                             :{BLACK}Listedeki tüm araçlara talimat ver
 STR_REPLACE_VEHICLES                                            :Araçları Değiştir
 STR_SEND_TRAIN_TO_DEPOT                                         :Gara Gönder
 STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Garaja Gönder
@@ -487,7 +494,7 @@ STR_01A9_NONE                                                   :Hiçbiri
 STR_01AA_NAME                                                   :{BLACK}İsim
 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
@@ -519,7 +526,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}

@@ -548,7 +555,7 @@ STR_01E4_0                                                      :{DKGREEN}{TINYF
 STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
-STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Sarki{SETX 88}Basligi
+STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Sarki{SETX 88}Başlığı
 STR_01E9_SHUFFLE                                                :{TINYFONT}Rastgele
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Program
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Müzik Programi Seçimi
@@ -607,22 +614,16 @@ STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRI
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} '{STRING}' ünvanını kazandı!
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} - {COMPANY} '{STRING}' unvanını kazandı!
 STR_021F                                                        :{BLUE}{COMMA}
-STR_0220_CREATE_SCENARIO                                        :{BLACK}Senaryo Yap
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
 STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Senaryo Editörü
 STR_0223_LAND_GENERATION                                        :{WHITE}Yer Yapımı
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
-STR_0226_RANDOM_LAND                                            :{BLACK}Rastgele Yerler
-STR_0227_RESET_LAND                                             :{BLACK}Yerleri Sıfırla
 STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}yükseltme/alçaltma alanını arttır
 STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}yükseltme/alçaltma alanını arttır
 STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Rastgele harita yap
 STR_022B_RESET_LANDSCAPE                                        :{BLACK}Haritayı sıfırla
 STR_022C_RESET_LANDSCAPE                                        :{WHITE}Haritayı Sıfırla
-STR_LOAD_GAME_HEIGHTMAP                                         :{WHITE}Yükseklik Haritasi Kullan
-STR_LOAD_SCEN_HEIGHTMAP                                         :{BLACK}Yükseklik Haritasi Kullan
-STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Her taraf su olsun mu?
 STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Harita yapımı
 STR_022F_TOWN_GENERATION                                        :{BLACK}Şehir yapımı
 STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Fabrika yapımı
@@ -739,8 +740,8 @@ STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Yüksekl
 STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Bu senaryodan çıkmak istediğinizden emin misiniz ?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Editörden Çık
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...nüfusu en az 1200 olan şehirlere yapılabilir
-STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Baslama yılını düşür
-STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Baslama yılını arttır
+STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Başlama yılını düşür
+STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Başlama yılını arttır
 STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...köprünün uçları karada olmalı
 STR_02A1_SMALL                                                  :{BLACK}Küçük
 STR_02A2_MEDIUM                                                 :{BLACK}Orta
@@ -764,7 +765,7 @@ STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Araç is
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Özelleştirilmiş araç isimlerini kaydet

 STR_CHECKMARK                                                   :{CHECKMARK}
-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Seçenekler
 STR_02C5_DIFFICULTY_SETTINGS                                    :Zorluk Ayarları
 STR_02C7_CONFIG_PATCHES                                         :Yamaları Düzenle
@@ -778,16 +779,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Tam ha
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Tam detay
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Transparan binalar
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Transparan istasyon tabelaları
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Arazi bilgisi
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Konsol Aç/Kapa
 STR_02D7_SCREENSHOT_CTRL_S                                      :Ekran Görüntüsü (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Dev Ekran Görüntüsü (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :'OpenTTD' Hakkında
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Kapalı
 STR_02DA_ON                                                     :{BLACK}Açık
@@ -844,7 +845,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}'tropik'
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}'oyuncak' yer stilini seç
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Yeni bir fabrika aç

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Fabrika Listesi
 STR_0313_FUND_NEW_INDUSTRY                                      :Yeni fabrika aç
 ############ range ends here
@@ -890,7 +891,7 @@ STR_TOWNNAME_DANISH                                             :Danimarkaca
 STR_TOWNNAME_TURKISH                                            :Türkçe
 STR_TOWNNAME_ITALIAN                                            :Italyanca
 STR_TOWNNAME_CATALAN                                            :Katalanca
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Sterlin (£)
 STR_CURR_USD                                                    :Dolar ($)
@@ -1010,7 +1011,7 @@ STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Yamalar
 STR_CONFIG_PATCHES_OFF                                          :Kapalı
 STR_CONFIG_PATCHES_ON                                           :Açık
 STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Durum çubuğunda arabanın hızını göster: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Sahil ve eğimli araziye inşaat: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Sahile ve eğimli araziye inşaat: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Daha gerçekçi kapsama alanı: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Şehrin yollarını, köprülerini yıkma izinli: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAMMOTHTRAINS                                :{LTBLUE}Çok uzun trenlere izin ver: {ORANGE}{STRING}
@@ -1019,6 +1020,7 @@ STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Tren ve
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Yan yana yapılan tren istasyonlarını birleştir: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}'tam doldur' etkinse istasyonu tam dolunca terket: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Geliştirilmiş yükleme algoritması kullan: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_GRADUAL_LOADING                              :{LTBLUE}Araçlar yavaş yavaş dolsun: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Enflasyon: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Sadece istek varsa kargo kabul edilsin: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Çok uzun köprülere izin ver: {ORANGE}{STRING}
@@ -1077,9 +1079,11 @@ STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Helikop
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Arazi araç çubuğunu diğer araç çubuklarına bağla: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Fareyle kaydırma hareketini ters çevir: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MEASURE_TOOLTIP                              :{LTBLUE}İnşa araçları kullanılırken ölçüm ipucu göster: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Şirketin renklerini göster: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LIVERIES_NONE                                :Hiçbiri
 STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Şirketi al
 STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Tüm şirketler
+STR_CONFIG_PATCHES_PREFER_TEAMCHAT                              :{LTBLUE}<ENTER> tuşu takım içi sohbette kullanılsın: {ORANGE}{STRING}

 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Her oyuncu için en fazla tren: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Her oyuncu için en fazla araba: {ORANGE}{STRING}
@@ -1145,7 +1149,7 @@ STR_CHEATS                                                      :{WHITE}Hileler
 STR_CHEATS_TIP                                                  :{BLACK}Onay kutuları bu hilenin daha önce kullanılıp kullanmadığını bildirir.
 STR_CHEATS_WARNING                                              :{BLACK}Uyarı! Rakiplerine ihanet etmek üzeresin. Böyle bir davranışı sonsuza dek unutmayacaklarını akılda tut.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Parayı {CURRENCY64} kadar arttır
-STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Oyuncunun yerine geçme: {ORANGE}{COMMA}
+STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Oyuncunun yerine geç: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Sihirli buldözer (normalde silinemeyen binaları siler): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tüneller kesişebilir: {ORANGE}{STRING}
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Duraklama zamanında inşaat yap: {ORANGE}{STRING}
@@ -1304,6 +1308,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Şifre
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SUNUCU KAPALI
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SUNUCU DOLU
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}SÜRÜM UYUŞMAZLIĞI
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF UYUŞMAZLIĞI

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Oyuna gir

@@ -1344,7 +1349,7 @@ STR_NETWORK_COMBO4                                              :{BLACK}{SKIP}{S
 STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Konuşulan dil:
 STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Diğer oyuncular sunucuda hangi dilin konuşulacağını bilecek
 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}Oyunu Baslat
+STR_NETWORK_START_GAME                                          :{BLACK}Oyunu Başlat
 STR_NETWORK_START_GAME_TIP                                      :{BLACK}Rastgele harita ya da senaryoda network oyunu aç
 STR_NETWORK_LOAD_GAME                                           :{BLACK}Oyun Yükle
 STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Kayıtlı oyunu devam ettir (doğru oyuncu olarak bağlandığından emin ol)
@@ -1408,6 +1413,7 @@ STR_NETWORK_CLIENT_LIST                                         :{WHITE}Oyuncu l
 STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Network aygıtı bulunamadı veya ENABLE_NETWORK olmadan derlendi
 STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Network oyunu bulunamadı
 STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Sunucu isteğe cevap vermedi
+STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} NewGRF uyuşmazlığı yüzünden bağlanılamadı
 STR_NETWORK_ERR_DESYNC                                          :{WHITE} Network-Oyunu senkronizasyonu başarısız
 STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Network-Oyunu bağlatısı düştü
 STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kayıtlı oyun yüklenemedi
@@ -1429,6 +1435,7 @@ STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync hatası
 STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :harita yüklenemiyor
 STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :bağlantı kaybedildi
 STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokol hatası
+STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF uyuşmazlığı
 STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :izin Verilmedi
 STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ilginç paket alındı
 STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :yanlış düzeltme
@@ -1849,11 +1856,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Balon Yapıcıs
 STR_4825_TOFFEE_QUARRY                                          :Bonbon Madeni
 STR_4826_SUGAR_MINE                                             :Şeker Madeni

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}İstenen: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}İstenenler: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}İstenenler: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Geçen ayki üretim:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} (%{COMMA} tasindi)
@@ -1926,8 +1933,8 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Burası
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...zaten senin!


-############ 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                                                  :İsimsiz
@@ -1970,7 +1977,7 @@ STR_SV_STNAME_LOWER                                             :Asağı {STRING
 STR_SV_STNAME_HELIPORT                                          :{STRING} Heliport
 STR_SV_STNAME_FOREST                                            :{STRING} Ormanı

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Zorluk seviyesi
@@ -2048,9 +2055,9 @@ STR_683B_HOSTILE                                                :Katı
 ##id 0x7000
 STR_7000                                                        :
 STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
-STR_7002_PLAYER                                                 :(Oyuncu {COMMA})
+STR_7002_PLAYER                                                 :({COMMA}. Oyuncu)
 STR_7004_NEW_FACE                                               :{BLACK}Yeni Surat
-STR_7005_COLOR_SCHEME                                           :{BLACK}Renk
+STR_7005_COLOR_SCHEME                                           :{BLACK}Renkler
 STR_7006_COLOR_SCHEME                                           :{GOLD}Renk:
 STR_7007_NEW_COLOR_SCHEME                                       :{WHITE}Yeni Renk
 STR_7008_COMPANY_NAME                                           :{BLACK}Şirket ismi
@@ -2100,9 +2107,9 @@ STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Araç re
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Müdürün ismini değiştir
 STR_7033_CHANGE_THE_COMPANY_NAME                                :{BLACK}Şirket ismini değiştir
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}İstediginiz rengi seçin
-STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Kredi miktarını arttır
+STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Kredi ödünç al
 STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Krediyi öde
-STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Manager)
+STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Yönetici)
 STR_7038_INAUGURATED                                            :{GOLD}Kuruluş: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Araçlar:
 STR_TRAINS                                                      :{WHITE}{COMMA} tren
@@ -2131,7 +2138,7 @@ STR_7054                                                        :{WHITE}{STRING}
 STR_7055                                                        :{YELLOW}{STRING}{SETX 45}{ORANGE}{COMPANY} {BLACK}{PLAYERNAME}  '{STRING}'
 STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT}Şirket tehlikede!
 STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY}, performansı artmazsa satılacak ya da yok olacak!
-STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Manager)
+STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Yönetici)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Şirketler birleşti!
 STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY}, {COMPANY} tarafından {CURRENCY} fiyatıyla alındı!
 STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Şirketimizi satın alacak birilerini arıyoruz.{}{} {COMPANY} şirketini şu fiyata almak ister misiniz: {CURRENCY}?
@@ -2150,9 +2157,9 @@ STR_7067_TRAFFIC_MANAGER                                        :Trafik Müdür
 STR_7068_TRANSPORT_COORDINATOR                                  :Nakliyeci
 STR_7069_ROUTE_SUPERVISOR                                       :Rota Yöneticisi
 STR_706A_DIRECTOR                                               :Yönetmen
-STR_706B_CHIEF_EXECUTIVE                                        :Bas Yönetici
+STR_706B_CHIEF_EXECUTIVE                                        :Baş Yönetici
 STR_706C_CHAIRMAN                                               :Başkan
-STR_706D_PRESIDENT                                              :Basbakan
+STR_706D_PRESIDENT                                              :Başbakan
 STR_706E_TYCOON                                                 :Kodaman(Tycoon)
 STR_706F_BUILD_HQ                                               :{BLACK}Bina Yap
 STR_7070_BUILD_COMPANY_HEADQUARTERS                             :{BLACK}Şirket binasi yap / şirket binasina bak
@@ -2178,7 +2185,7 @@ STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}(%{COMMA
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY}, {COMPANY} tarafından alındı!
 STR_7080_PROTECTED                                              :{WHITE}Bu şirket hisselerini satacak kadar eski değil...

-STR_LIVERY_DEFAULT                                              :Standart Araç
+STR_LIVERY_DEFAULT                                              :Şirket Rengi
 STR_LIVERY_STEAM                                                :Buharlı Lokomotif
 STR_LIVERY_DIESEL                                               :Dizel Lokomotif
 STR_LIVERY_ELECTRIC                                             :Elektrikli Lokomotif
@@ -2205,6 +2212,7 @@ STR_LIVERY_SHIP_TIP                                             :{BLACK}Gemi ren
 STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Uçakların renk şemalarını göster
 STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Seçili düzen için birincil rengi seç
 STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Seçili düzen için ikincil rengi seç
+STR_LIVERY_PANEL_TIP                                            :{BLACK}Rengini değiştirmek için bir araç türü seçin. CTRL+tıklama birden fazla araç seçebilir. Rengi kullanmak için kutucukları içaretleyin

 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (Buhar)
@@ -2535,8 +2543,10 @@ STR_8826_GO_TO                                                  :{BLACK}Git
 STR_8827_FULL_LOAD                                              :{BLACK}Doldur
 STR_8828_UNLOAD                                                 :{BLACK}Boşalt
 STR_REFIT                                                       :{BLACK}Modifiye
-STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Komutlar)
-STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Komutların Sonu - -
+STR_REFIT_TIP                                                   :{BLACK}Bu talimatta değiştirilecek kargo türünü seçin. Değiştirmeyi kaldırmak için CTRL ile tıklayın
+STR_REFIT_ORDER                                                 :(Moifiye ile > {STRING})
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Talimatlar)
+STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Talimatların Sonu - -
 STR_FULLLOAD_OR_SERVICE                                         :{SKIP}{SKIP}{STRING}
 STR_SERVICE                                                     :{BLACK}Bakım
 STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Tren satın alınamaz...
@@ -2581,13 +2591,13 @@ STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Taşına
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Trenin ayrıntıları
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Her aracın kapasitesi
 STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Trenin kargo türlerine ayrilmis toplam kapasitesini göster
-STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Komut listesi - seçmek için komutu tıklayın. CTRL + tıklama istasyona kaydırir
-STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Şimdiki komutu atlayıp sıradakine geç
-STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Seçili komutu sil
-STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili komutu durmadan yap
-STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Seçili komutun önüne ya da listenin sonuna komut ekle
-STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili komutu yaparken tren dolana kadar beklesin
-STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili komutu yaparken tren mutlaka yükünü boşaltsın
+STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Talimat listesi - seçmek için komutu tıklayın. CTRL + tıklama istasyona kaydırir
+STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Şimdiki talimatı atlayıp sıradakine geç
+STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Seçili talimatı sil
+STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili talimatı durmadan yap
+STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Seçili talimatın önüne ya da listenin sonuna komut ekle
+STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili talimatı yaparken tren dolana kadar beklesin
+STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Seçili talimatı yaparken tren mutlaka yükünü boşaltsın
 STR_SERVICE_HINT                                                :{BLACK}Bakım gerekmiyorsa bunu atla
 STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Yeni bir araç üretildi: {STRING}
 STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
@@ -2646,7 +2656,7 @@ STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Yerel ga
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Arabalar - bilgi için arabaya tıklayın
 STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Yeni araba al (araba garajı gerekir)
 STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Aracın durumu - durdurmak/başlatmak için tıklayın
-STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Aracın komutlarını görmek için tıklayın
+STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Aracın talimatlarını görmek için tıklayın
 STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Arabayı göster
 STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Aracı garaja gönder
 STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Aracı etrafta dolaşmaya zorla
@@ -2832,7 +2842,7 @@ SERVICE_AT_AIRPORT_HANGAR                                       :Servis: {STATIO

 ##id 0xB000
 STR_B000_ZEPPELIN_DISASTER_AT                                   :{BLACK}{BIGFONT}Zeplin düştü - {STATION}!
-STR_B001_ROAD_VEHICLE_DESTROYED                                 :{BLACK}{BIGFONT}UFO'ya çarpan araba parçalandı!
+STR_B001_ROAD_VEHICLE_DESTROYED                                 :{BLACK}{BIGFONT}UFO'yla çarpışan araba parçalandı!
 STR_B002_OIL_REFINERY_EXPLOSION                                 :{BLACK}{BIGFONT}{TOWN} yakınlarındaki petrol rafinerisi patladı!
 STR_B003_FACTORY_DESTROYED_IN_SUSPICIOUS                        :{BLACK}{BIGFONT}{TOWN} yakınlarındaki fabrika kundaklandı!
 STR_B004_UFO_LANDS_NEAR                                         :{BLACK}{BIGFONT}{TOWN} yakınlarına UFO kondu!
@@ -2881,6 +2891,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Yüklenm
 STR_NEWGRF_FILENAME                                             :{BLACK}Dosya adı: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
 STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Çalışan bir oyunu değiştirmek üzeresiniz; bu OpenTTD'yi çökertebilir.{}Emin misiniz?

 STR_NEWGRF_ADD                                                  :{BLACK}Ekle
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Listeye NewGRF dosyası ekle
@@ -2904,6 +2915,11 @@ STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Dosya ek

 STR_NEWGRF_NOT_FOUND                                            :{RED}Eşleşen dosya bulunamadı
 STR_NEWGRF_DISABLED                                             :{RED}Etkisiz
+STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Eşleşen dosya bulunamadı (uyumlu GRF yüklendi)
+
+STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Eksik dosyalar için uyumlu GRF(ler) yüklendi
+STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Eksik GRF dosyaları etkisizleştirildi
+STR_NEWGRF_NOT_FOUND_WARNING                                    :{WHITE}Oyunu yüklemek için gerekli olan GRF dosyaları eksik

 STR_CURRENCY_WINDOW                                             :{WHITE}Özel Para Birimi
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Çarpan: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2926,16 +2942,15 @@ STR_SCHEDULED_ROAD_VEHICLES                                     :{WHITE}{STATION
 STR_SCHEDULED_AIRCRAFT                                          :{WHITE}{STATION} - {COMMA} Uçaklar
 STR_SCHEDULED_SHIPS                                             :{WHITE}{STATION} - {COMMA} Gemiler

-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Komut listesinde bu durak olan trenleri listele
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Komut listesinde bu durak olan arabaları listele
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Komut listesinde bu durak olan uçakları listele
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Komut listesinde bu durak olan gemileri listele
+STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Talimat listesinde bu durak olan trenleri listele
+STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Talimat listesinde bu durak olan arabaları listele
+STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Talimat listesinde bu durak olan uçakları listele
+STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Talimat listesinde bu durak olan gemileri listele

 STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} Aracın paylaşılan talimatları
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Aynı talimatlara sahip bütün araçları göster

 ### depot strings
-
 STR_SELL                                                        :{BLACK}Sat
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Garajdaki tüm araçları satmak üzeresiniz.
 STR_ARE_YOU_SURE                                                :{BLACK}Emin misiniz?
@@ -2971,7 +2986,7 @@ STR_VEHICLE_LIST_SHIP_DEPOT                                     :{BLACK}{STRING}
 STR_VEHICLE_LIST_AIRCRAFT_DEPOT                                 :{BLACK}{STRING} - {COMMA} Uçak

 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING} Değiştir
-STR_REPLACE_VEHICLES_START                                      :{BLACK}Araçları Değiştirmeye Basla
+STR_REPLACE_VEHICLES_START                                      :{BLACK}Araçları Değiştirmeye Başla
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Araçları değiştirmeyi durdur
 STR_NOT_REPLACING                                               :{BLACK}Değiştirilmiyor
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Hiç Araç Seçilmedi
@@ -3007,6 +3022,7 @@ STR_MASS_START_LIST_TIP                                         :{BLACK}Listedek
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Tabela Listesi - {COMMA} Tabela

+STR_ORDER_REFIT_FAILED                                          :{WHITE}Talimat değiştirme başarısız durduruldu {STRING} {COMMA}

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

@@ -3031,6 +3047,7 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Ağırl
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Fiyat: {GOLD}{CURRENCY}{BLACK} Hız: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapasite: {GOLD}{COMMA} yolcu, {COMMA} çanta posta
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Güç Veren Vagonlar: {GOLD}+{POWER}{BLACK} Ağırlık: {GOLD}+{WEIGHT_S}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Modifiye edilebilir: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Tüm kargo türleri
 STR_PURCHASE_INFO_ALL_BUT                                       :{GOLD} hariç hepsi

@@ -3056,7 +3073,7 @@ STR_GENERATE_DATE                                               :{BLACK}{DATE_LO
 STR_SNOW_LINE_UP                                                :{BLACK}Kar yüksekliğini bir arttır
 STR_SNOW_LINE_DOWN                                              :{BLACK}Kar yüksekliğini bir azalt
 STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Kar yüksekliğini değiştir
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Baslangic yılını değiştir
+STR_START_DATE_QUERY_CAPT                                       :{WHITE}Başlangıç yılını değiştir
 STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Ölcek uyarısı
 STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Kaynak haritanin boyutunu değiştirmek önerilmez. Harita oluşturmaya devam edilsin mi?
 STR_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
--- a/lang/ukrainian.txt
+++ b/lang/ukrainian.txt
--- a/lang/unfinished/afrikaans.txt
+++ b/lang/unfinished/afrikaans.txt
@@ -1,6 +1,6 @@
 ##name Afrikaans
 ##ownname Afrikaans
-##isocode af_ZA.UTF-8
+##isocode af_ZA
 ##plural 0

 ##id 0x0000
@@ -81,20 +81,20 @@ STR_0049_BUBBLE                                                 :Borrel
 STR_004A_TOFFEE                                                 :Tameletjie
 STR_004B_BATTERY                                                :Battery
 STR_004C_PLASTIC                                                :Plastiek
-STR_004D_FIZZY_DRINK                                            :Koeldranke
+STR_004D_FIZZY_DRINK                                            :Koeldrank
 STR_ABBREV_NOTHING                                              :
 STR_ABBREV_PASSENGERS                                           :{TINYFONT}PS
 STR_ABBREV_COAL                                                 :{TINYFONT}SK
 STR_ABBREV_MAIL                                                 :{TINYFONT}PS
 STR_ABBREV_OIL                                                  :{TINYFONT}OL
 STR_ABBREV_LIVESTOCK                                            :{TINYFONT}LH
-STR_ABBREV_GOODS                                                :{TINYFONT}GD
+STR_ABBREV_GOODS                                                :{TINYFONT}GS
 STR_ABBREV_GRAIN                                                :{TINYFONT}GR
 STR_ABBREV_WOOD                                                 :{TINYFONT}HT
 STR_ABBREV_IRON_ORE                                             :{TINYFONT}YE
 STR_ABBREV_STEEL                                                :{TINYFONT}ST
 STR_ABBREV_VALUABLES                                            :{TINYFONT}KH
-STR_ABBREV_COPPER_ORE                                           :{TINYFONT}CE
+STR_ABBREV_COPPER_ORE                                           :{TINYFONT}KE
 STR_ABBREV_MAIZE                                                :{TINYFONT}GR
 STR_ABBREV_FRUIT                                                :{TINYFONT}VR
 STR_ABBREV_DIAMONDS                                             :{TINYFONT}DM
@@ -121,7 +121,7 @@ STR_00AF                                                        :{WHITE}{DATE_LO
 STR_00B0_MAP                                                    :{WHITE}Kaart - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spel Opsies
 STR_00B2_MESSAGE                                                :{YELLOW}Boodskap
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Boodskap vanaf {STRING}
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Boodskap van {STRING}
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kan nie dit doen nie....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan nie die area reinig nie....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Oorspronklik kopiereg {COPYRIGHT} 1995 Chris Sawyer, Alle regte voorbehou
@@ -145,7 +145,7 @@ STR_00D2_PALE_GREEN                                             :Bleek Groen
 STR_00D3_PINK                                                   :Pienk
 STR_00D4_YELLOW                                                 :Geel
 STR_00D5_RED                                                    :Rooi
-STR_00D6_LIGHT_BLUE                                             :Lighte Blou
+STR_00D6_LIGHT_BLUE                                             :Ligte Blou
 STR_00D7_GREEN                                                  :Groen
 STR_00D8_DARK_GREEN                                             :Donker Groen
 STR_00D9_BLUE                                                   :Blou
@@ -156,7 +156,7 @@ STR_00DD_ORANGE                                                 :Oranje
 STR_00DE_BROWN                                                  :Bruin
 STR_00DF_GREY                                                   :Grys
 STR_00E0_WHITE                                                  :Wit
-STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Te veel voertuie in die spel
+STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Te veel voertuie in spel
 STR_00E2                                                        :{BLACK}{COMMA}
 STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Plek
@@ -226,7 +226,7 @@ STR_0123_FIELDS                                                 :{BLACK}{TINYFON
 STR_0124_TREES                                                  :{BLACK}{TINYFONT}Boome
 STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Rotse
 STR_0126_WATER                                                  :{BLACK}{TINYFONT}Water
-STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Geen Besitter
+STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Geen Eienaar
 STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Stede
 STR_0129_INDUSTRIES                                             :{BLACK}{TINYFONT}Nywerheide
 STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Woestyn
@@ -237,7 +237,7 @@ STR_012E_CANCEL                                                 :{BLACK}Kanselle
 STR_012F_OK                                                     :{BLACK}OK
 STR_0130_RENAME                                                 :{BLACK}Hernaam
 STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Te veel naame bepaal
-STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Verkieste naam alreeds in gebruik
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Verkieste naam reeds in gebruik

 STR_0133_WINDOWS                                                :Vensters
 STR_0134_UNIX                                                   :Unix
@@ -270,8 +270,9 @@ STR_BY                                                          :{BLACK}*
 STR_0148_GAME_OPTIONS                                           :{BLACK}Spel Opsies

 STR_0150_SOMEONE                                                :iemand{SKIP}{SKIP}
+STR_0151_MAP_OF_WORLD                                           :
 STR_0152_TOWN_DIRECTORY                                         :Stad index
-STR_0153_SUBSIDIES                                              :Subsidie
+STR_0153_SUBSIDIES                                              :Subsidiëe



@@ -281,7 +282,7 @@ STR_0153_SUBSIDIES                                              :Subsidie



-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Opereer profyt grafiek
 STR_0155_INCOME_GRAPH                                           :Inkoms grafiek
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Afgelewerde vrag grafiek
@@ -289,17 +290,18 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Prestasie geski
 STR_0158_COMPANY_VALUE_GRAPH                                    :Maatskappy waarde grafiek
 STR_0159_CARGO_PAYMENT_RATES                                    :Vrag betaaling grade
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Maatskappy verbond tafel
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Omtrent OpenTTD
 STR_015C_SAVE_GAME                                              :Bewaar spel
 STR_015D_LOAD_GAME                                              :Laai spel
 STR_015E_QUIT_GAME                                              :Verlaat Spel
 STR_015F_QUIT                                                   :Uitgang
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Is jy seker jy wil die spel verlaat?
+STR_ABANDON_GAME_QUERY                                          :{YELLOW}Is jy seker jy wil die spel verlaat?
 STR_0161_QUIT_GAME                                              :{WHITE}Verlaat Spel

 STR_NO_WAITING_CARGO                                            :{BLACK}Geen vrag van enige tipe is op wag
+STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Wys 'n lys van beskikbaare enjin tipes vir die voertiug tipe.

 ############ range for months starts
 STR_0162_JAN                                                    :Jan
@@ -339,7 +341,7 @@ STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Bou spoo
 STR_0182_BUILD_ROADS                                            :{BLACK}Bou Paaie
 STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Bou skip hawe
 STR_0184_BUILD_AIRPORTS                                         :{BLACK}Bou lughawe
-STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Plant boome, plaas teken ens.
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Plant boome, plaas tekens ens.
 STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Land area inligting
 STR_0187_OPTIONS                                                :{BLACK}Opsies
 STR_0188                                                        :{BLACK}{SMALLUPARROW}
@@ -357,7 +359,7 @@ STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Vertoon
 STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Vertoon nywerheide op kaart
 STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Vertoon vervoer roete op kaart
 STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Vertoon plantegroei op kaart
-STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Vertoon land besitters op kaart
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Vertoon land eienaars op kaart
 STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Skakel stad naame aan/af op kaart
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Profyt die jaar: {CURRENCY} (verlede jaar: {CURRENCY})

@@ -377,13 +379,13 @@ STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Land Are
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Prys om te reinig: {LTBLUE}N/A
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Prys om te reinig: {LTBLUE}{CURRENCY}
 STR_01A6_N_A                                                    :N/A
-STR_01A7_OWNER                                                  :{BLACK}Besitter: {LTBLUE}{STRING}
+STR_01A7_OWNER                                                  :{BLACK}Eienaar: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Plaaslike raad: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Geen
 STR_01AA_NAME                                                   :{BLACK}Naam
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

-############ range for days	starts
+############ range for days starts
 STR_01AC_1ST                                                    :1ste
 STR_01AD_2ND                                                    :2de
 STR_01AE_3RD                                                    :3de
@@ -415,7 +417,7 @@ STR_01C7_28TH                                                   :28ste
 STR_01C8_29TH                                                   :29ste
 STR_01C9_30TH                                                   :30ste
 STR_01CA_31ST                                                   :31ste
-############ range for days	ends
+############ range for days ends

 STR_01CB                                                        :{TINYFONT}{COMMA}

@@ -463,6 +465,7 @@ STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Kies 'Ge
 STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Reinig huidige musiek keuse (slegs Gewoonte 1 of Gewoonte 2)
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Bewaar musiek stellings
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Kliek op musiek liedjie om by huidige musiek lys in te sit (slegs Gewoonte 1 of Gewoonte 2)
+STR_CLICK_ON_TRACK_TO_REMOVE                                    :{BLACK}Kliek op musiek lied om te verwyder van huidige program (Slegs Gewoonte1 of Gewoonte2)
 STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Skakel musiek lys skuimel aan/af
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Vertoon musiek liedjie keuse venster
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Kliek op diens om uitsig te senter op nywerheid/stad
@@ -614,7 +617,7 @@ STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}Bepaal w
 STR_CREATE_LAKE                                                 :{BLACK}Bepaal water area.{}Dit sal die omgewing vloed as dit teen seevlak is
 STR_0290_DELETE                                                 :{BLACK}Uitwis
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Uitwis hele stad
-STR_0292_SAVE_SCENARIO                                          :Bewaar Draaiboek
+STR_0292_SAVE_SCENARIO                                          :Bewaar draaiboek
 STR_0293_LOAD_SCENARIO                                          :Laai draaiboek
 STR_0294_QUIT_EDITOR                                            :Verlaat redakteur
 STR_0295                                                        :
@@ -623,7 +626,6 @@ STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Bewaar d
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Laai Draaiboek
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Bewaar Draaiboek
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Speel Draaiboek
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Is jy seker jy wil die draaboek verlaat ?
 STR_029C_QUIT_EDITOR                                            :{WHITE}Verlaat Redakteur
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kan slegs in stede met 'n populasie van te minste 1200 gebou word
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Beweeg die begin datum terug 1 jaar
@@ -647,34 +649,36 @@ STR_02BE_DEFAULT                                                :Gebrekte
 STR_02BF_CUSTOM                                                 :Gewoonte
 STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Bewaar gewoonte naame
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Voertuig ontwerp name keuse
-STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Bewaar doelgeboude vortuig ontwerp naame
+STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Bewaar doelgeboude voertuig ontwerp naame

-############ range for menu	starts
+STR_CHECKMARK                                                   :{CHECKMARK}
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spel opsies
 STR_02C5_DIFFICULTY_SETTINGS                                    :Moeilikheid stellings
 STR_NEWGRF_SETTINGS                                             :Newgrf stellings
+STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Stad naame vertoon
 STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Stasie naame vertoon
 STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Tekens vertoon
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Volle animasie
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Volle aanwyse
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Deurskynend geboue
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Land area inligting
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Skakel troos
 STR_02D7_SCREENSHOT_CTRL_S                                      :Skermskut (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Reuse Skermskut (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Rakend 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Af
 STR_02DA_ON                                                     :{BLACK}An
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Vertoon subsidiee
 STR_02DD_SUBSIDIES                                              :Subsidiee
-STR_02DE_MAP_OF_WORLD                                           :Kaart van wereld
+STR_02DE_MAP_OF_WORLD                                           :Kaart van wêreld
 STR_EXTRA_VIEW_PORT                                             :Ekstra gesigswerf
 STR_02DF_TOWN_DIRECTORY                                         :Stad indeks
 STR_EXTRA_VIEW_PORT_TITLE                                       :{WHITE}Gesigswerf {COMMA}
@@ -705,7 +709,7 @@ STR_02F9_EVERY_6_MONTHS                                         :Elke 6 maande
 STR_02FA_EVERY_12_MONTHS                                        :Elke 12 maande
 STR_02FB_START_A_NEW_GAME                                       :{BLACK}Begin nuwe spel
 STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Laai 'n bewaarde spel
-STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Skep 'n doelgeboude spel w<EFBFBD>eld/draaiboek
+STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Skep 'n doelgeboude spel wêreld/draaiboek
 STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Kies enkel-spele spel
 STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Kies veelspeler spel met 2-8 spelers
 STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Vertoon spel opsies
@@ -721,7 +725,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Kies 'on
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Kies 'speelgoedland' landerye styl
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Befonds gebou van nuwe nywerheid

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Nywerheid Indeks
 STR_0313_FUND_NEW_INDUSTRY                                      :Befonds nuwe nywerheid
 ############ range ends here
@@ -744,7 +748,7 @@ STR_0335_6                                                      :{BLACK}6
 STR_0336_7                                                      :{BLACK}7

 ############ start of townname region
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Pounds ()
 STR_CURR_USD                                                    :Dollars ($)
@@ -838,7 +842,7 @@ STR_CONFIG_PATCHES_REALISTICACCEL                               :{LTBLUE}Stel in
 STR_CONFIG_PATCHES_FORBID_90_DEG                                :{LTBLUE}Verbied triene en skepe om 90 graad draaie te maak: {ORANGE}{STRING} {LTBLUE} (benodig NPF)
 STR_CONFIG_PATCHES_JOINSTATIONS                                 :{LTBLUE}Verbind trein stasies wat langsaan gebou is: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Verlaat stasie as enige vrag vol is, as 'volle gelaai': {ORANGE}{STRING}
-STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Geruik verebeterde laai algoritme: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_IMPROVEDLOAD                                 :{LTBLUE}Gebruik verebeterde laai algoritme: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INFLATION                                    :{LTBLUE}Inflasie: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SELECTGOODS                                  :{LTBLUE}Aflewer vrag na 'n stasie slegs as daar 'n aanvrag is:: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LONGBRIDGES                                  :{LTBLUE}Toelaat opbou van baie lank bruge: {ORANGE}{STRING}
@@ -869,11 +873,21 @@ STR_CONFIG_PATCHES_AUTORENEW_MONEY                              :{LTBLUE}Outoher
 STR_CONFIG_PATCHES_ERRMSG_DURATION                              :{LTBLUE}Tydgrens van fout boodskap: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_POPULATION_IN_LABEL                          :{LTBLUE}Wys stad populasie in stad naam teken: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_INVISIBLE_TREES                              :{LTBLUE}Onsigbaar boome (met deurskynend geboue): {ORANGE}{STRING}
+
+STR_CONFIG_PATCHES_LAND_GENERATOR                               :{LTBLUE}Land ontwikkelaar: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Oorspronklik
+STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS                 :TerraGenesis
 STR_CONFIG_PATCHES_SNOWLINE_HEIGHT                              :{LTBLUE}Sneeu lyn hoogte: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION                           :{LTBLUE}Hoogtekaart rotasie: {ORANGE}{STRING}
+
 STR_CONFIG_PATCHES_STATION_SPREAD                               :{LTBLUE}Max stasie omvang: {ORANGE}{STRING} {RED}Waarskuwing: Ho<48>stelling vertraag spel
 STR_CONFIG_PATCHES_SERVICEATHELIPAD                             :{LTBLUE}Versien helikopters by helihawes outomaties: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR                       :{LTBLUE}Verbind landereye werktuigbaan na spoor/pad/water/lughawe werktuigbaan: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_REVERSE_SCROLLING                            :{LTBLUE}Omkeer rol rigting: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Wys maatskappy lewerye: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LIVERIES_NONE                                :Geen
+STR_CONFIG_PATCHES_LIVERIES_OWN                                 :Eie maatskappy
+STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Alle maatskappye

 STR_CONFIG_PATCHES_MAX_TRAINS                                   :{LTBLUE}Max treine per speler: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAX_ROADVEH                                  :{LTBLUE}Max pad voertuie per speler: {ORANGE}{STRING}
@@ -898,8 +912,9 @@ STR_CONFIG_PATCHES_SERVINT_SHIPS                                :{LTBLUE}Gebrekt
 STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED                       :{LTBLUE}Gebrekte versien tussentyd vir skepe: {ORANGE}gestrem
 STR_CONFIG_PATCHES_NOSERVICE                                    :{LTBLUE}Gestrem versiening wanneer oponthoude is na geen gestel: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_WAGONSPEEDLIMITS                             :{LTBLUE}Stel wa spoed limite in staak: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_DISABLE_ELRAILS                              :{LTBLUE}Gestrem elektriese spoore: {ORANGE}{STRING}

-STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Gekleur nuus verskyn in: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_COLORED_NEWS_YEAR                            :{LTBLUE}Gekleurde nuus verskyn in: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_STARTING_YEAR                                :{LTBLUE}Begins datum: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_ENDING_YEAR                                  :{LTBLUE}Eindig spel in: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SMOOTH_ECONOMY                               :{LTBLUE}Stel vloeiende ekonomie in staak (meer, kleiner veranderings)
@@ -936,7 +951,7 @@ STR_CHEAT_MONEY                                                 :{LTBLUE}Vermeer
 STR_CHEAT_CHANGE_PLAYER                                         :{LTBLUE}Speel as speler: {ORANGE}{COMMA}
 STR_CHEAT_EXTRA_DYNAMITE                                        :{LTBLUE}Tower stootskraper (uitwis nywerheide, onbeweegbares): {ORANGE}{STRING}
 STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tonnels mag vir mekaar kruis: {ORANGE}{STRING}
-STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bou terwyl in pouseer metode: {ORANGE}{STRING}
+STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bou terwyl in pouseer: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Straalvliegtuie sal nie (dikwels) op klein lughawe bots nie: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Skakel klimaat: {ORANGE} {STRING}
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Verander datum: {ORANGE} {DATE_SHORT}
@@ -974,7 +989,7 @@ STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Vlakte l


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

 STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan nie sluite hier bou nie...
@@ -1236,6 +1251,13 @@ STR_NETWORK_SEND                                                :{BLACK}Stuur
 STR_CONFIG_PATCHES_MAP_X                                        :{LTBLUE}X-groote van kaart: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MAP_Y                                        :{LTBLUE}Y-groote van kaart: {ORANGE}{STRING}

+
+##### PNG-MAP-Loader
+
+
+STR_BMPMAP_ERROR                                                :{WHITE}Kan nie landerye van BMP laai nie...
+STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan nie prent tipe verdoel nie.
+
 ##id 0x0800
 STR_0800_COST                                                   :{TINYFONT}{RED}Prys: {CURRENCY}
 STR_0801_COST                                                   :{RED}Koste: {CURRENCY}
@@ -1537,6 +1559,7 @@ STR_400D_SAVE_THE_CURRENT_GAME_USING                            :{BLACK}Bewaar d
 STR_400E_SELECT_NEW_GAME_TYPE                                   :{WHITE}Kies Nuwe Spel Tipe
 STR_400F_SELECT_SCENARIO_GREEN_PRE                              :{BLACK}Kies draaiboek (groen), voor-gestelde spel (blou), of lukraak nuwe spel
 STR_4010_GENERATE_RANDOM_NEW_GAME                               :Onwikkel lukraak nuwe spel
+STR_4011_LOAD_HEIGHTMAP                                         :{WHITE}Laai Hoogtekaart

 ##id 0x4800
 STR_4800_IN_THE_WAY                                             :{WHITE}{STRING} in die pad
@@ -1574,16 +1597,16 @@ STR_481F_COLA_WELLS                                             :Cola Bron
 STR_4820_TOY_SHOP                                               :Speelgoed Winkel
 STR_4821_TOY_FACTORY                                            :Speelgoed Fabriek
 STR_4822_PLASTIC_FOUNTAINS                                      :Plastiek Fonteine
-STR_4823_FIZZY_DRINK_FACTORY                                    :Koeldranke Fabriek
+STR_4823_FIZZY_DRINK_FACTORY                                    :Koeldrank Fabriek
 STR_4824_BUBBLE_GENERATOR                                       :Borrel Ontwikkelaar
 STR_4825_TOFFEE_QUARRY                                          :Tamletjie Prooi
 STR_4826_SUGAR_MINE                                             :Suiker Myn

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Vereis: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Vereis: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Vereis: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Produksie verlede maand:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% uitgevoer)
@@ -1597,7 +1620,7 @@ STR_4832_ANNOUNCES_IMMINENT_CLOSURE                             :{BLACK}{BIGFONT
 STR_4833_SUPPLY_PROBLEMS_CAUSE_TO                               :{BLACK}{BIGFONT}Lewering probleme veroorsaak {INDUSTRY} om dreigend sluting te aankondig!
 STR_4834_LACK_OF_NEARBY_TREES_CAUSES                            :{BLACK}{BIGFONT}Gemis van naby boome veroorsaak {INDUSTRY} om dreigend sluiting te aankondig!
 STR_4835_INCREASES_PRODUCTION                                   :{BLACK}{BIGFONT}{INDUSTRY} vermeerder produksie!
-STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}Nuwe steenkool laag vevind by {INDUSTRY}!{}Produksie is verwag om te verdubbel!
+STR_4836_NEW_COAL_SEAM_FOUND_AT                                 :{BLACK}{BIGFONT}Nuwe steenkool laag gevind by {INDUSTRY}!{}Produksie is verwag om te verdubbel!
 STR_4837_NEW_OIL_RESERVES_FOUND                                 :{BLACK}{BIGFONT}Nuwe olie reserwes gevind by {INDUSTRY}!{}Produksie is verwag om te verdubbel!
 STR_4838_IMPROVED_FARMING_METHODS                               :{BLACK}{BIGFONT}Verbeterde boerdery metodes by {INDUSTRY} sal produksie verdubbel!
 STR_4839_PRODUCTION_DOWN_BY_50                                  :{BLACK}{BIGFONT}{INDUSTRY} produksie verminder 50%
@@ -1615,7 +1638,7 @@ STR_5006_MUST_DEMOLISH_TUNNEL_FIRST                             :{WHITE}Moet eer
 STR_5007_MUST_DEMOLISH_BRIDGE_FIRST                             :{WHITE}Moet eers brug afbreek
 STR_5008_CANNOT_START_AND_END_ON                                :{WHITE}Kan nie in die selfde plek begin en eindig nie
 STR_5009_LEVEL_LAND_OR_WATER_REQUIRED                           :{WHITE}Platte land of water nooding onder brug
-STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}Begin en eindig moet in lyn wees
+STR_500A_START_AND_END_MUST_BE_IN                               :{WHITE}Begin en einde moet in lyn wees
 STR_500B_SITE_UNSUITABLE_FOR_TUNNEL                             :{WHITE}Plek ongeskik vir tonnel ingang
 STR_500D                                                        :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_500E_SUSPENSION_STEEL                                       :Staking, Staal
@@ -1656,12 +1679,12 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Land are
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...jy besit dit alreeds!


-############ 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


-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Moeilikheids Vlakte
@@ -1752,10 +1775,10 @@ STR_700D_CAN_T_CHANGE_PRESIDENT                                 :{WHITE}Bestuurd
 STR_700E_FINANCES                                               :{WHITE}{COMPANY} Finansies {BLACK}{PLAYERNAME}
 STR_700F_EXPENDITURE_INCOME                                     :{WHITE}Onkoste/Inkome
 STR_7010                                                        :{WHITE}{NUM}
-STR_7011_CONSTRUCTION                                           :{GOLD}Kostruksie
-STR_7012_NEW_VEHICLES                                           :{GOLD}Nuwe Voetuie
+STR_7011_CONSTRUCTION                                           :{GOLD}Konstruksie
+STR_7012_NEW_VEHICLES                                           :{GOLD}Nuwe Voertuie
 STR_7013_TRAIN_RUNNING_COSTS                                    :{GOLD}Trein Loopkoste
-STR_7014_ROAD_VEH_RUNNING_COSTS                                 :{GOLD}Pad Voetuig Loopkoste
+STR_7014_ROAD_VEH_RUNNING_COSTS                                 :{GOLD}Pad Voertuig Loopkoste
 STR_7015_AIRCRAFT_RUNNING_COSTS                                 :{GOLD}Vliegtuig Loopkoste
 STR_7016_SHIP_RUNNING_COSTS                                     :{GOLD}Skip loopkoste
 STR_7017_PROPERTY_MAINTENANCE                                   :{GOLD}Eiendom Onderhoud
@@ -1787,7 +1810,7 @@ STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Kan nie
 STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan nie geld wat van die bank geleen is weggee nie...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Kies nuwe gesig vir bestuurder
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Verander die maatskappy voertuig lewery
-STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}verander bestuurder se naam
+STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Verander bestuurder se naam
 STR_7033_CHANGE_THE_COMPANY_NAME                                :{BLACK}Verander die maatskappy se naam
 STR_7034_CLICK_ON_SELECTED_NEW_COLOR                            :{BLACK}Kliek op verkieste kleur skema
 STR_7035_INCREASE_SIZE_OF_LOAN                                  :{BLACK}Vermeer groote van lening
@@ -1805,7 +1828,7 @@ STR_7047_CANCEL_NEW_FACE_SELECTION                              :{BLACK}Kanselle
 STR_7048_ACCEPT_NEW_FACE_SELECTION                              :{BLACK}Aanvar nuwe gesig keuse
 STR_7049_SELECT_MALE_FACES                                      :{BLACK}Kies manlik gesige
 STR_704A_SELECT_FEMALE_FACES                                    :{BLACK}Kies vroulik gesige
-STR_704B_GENERATE_RANDOM_NEW_FACE                               :{BLACK}Ontwikkel lukrake Nuwe Gesig
+STR_704B_GENERATE_RANDOM_NEW_FACE                               :{BLACK}Ontwikkel lukrake nuwe gesig
 STR_704C_KEY                                                    :{BLACK}Sleutel
 STR_704D_SHOW_KEY_TO_GRAPHS                                     :{BLACK}Wys sleutel na grafieke
 STR_704E_KEY_TO_COMPANY_GRAPHS                                  :{WHITE}Sleutel na maatskappy grafieke
@@ -1820,7 +1843,7 @@ STR_7056_TRANSPORT_COMPANY_IN_TROUBLE                           :{BLACK}{BIGFONT
 STR_7057_WILL_BE_SOLD_OFF_OR_DECLARED                           :{BLACK}{BIGFONT}{COMPANY} sal binnekort afverkoop of bankrospeler verklaar word tensy prestasie verbeter!
 STR_7058_PRESIDENT                                              :{BLACK}{PLAYERNAME}{}(Bestuurder)
 STR_7059_TRANSPORT_COMPANY_MERGER                               :{BLACK}{BIGFONT}Vervoer maatskappy samesmelting!
-STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} is na {COMPANY} vir  {CURRENCY}! verkoop
+STR_705A_HAS_BEEN_SOLD_TO_FOR                                   :{BLACK}{BIGFONT}{COMPANY} is na {COMPANY} vir  {CURRENCY} verkoop!
 STR_705B_WE_ARE_LOOKING_FOR_A_TRANSPORT                         :{WHITE}Ons is opsoek na 'n vervoer maatskappy wat ons se maatskappy sal oorvat.{}{}Wil jy {COMPANY} koop vir {CURRENCY}?
 STR_705C_BANKRUPT                                               :{BLACK}{BIGFONT}Bankrotspeler!
 STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT}{COMPANY} is deur skuldeisers toegemaak en alle bates is afverkoop!
@@ -1847,7 +1870,7 @@ STR_7072_VIEW_HQ                                                :{BLACK}Wys HK
 STR_COMPANY_PASSWORD                                            :{BLACK}Wagwoord
 STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Wagwoord-beskerm jou maatskappy om onmagtig gebruikers te belet van verbinding
 STR_7073_WORLD_RECESSION_FINANCIAL                              :{BIGFONT}{BLACK}W<>eld Insinking!{}{}Finansieel eksperte vrees ergste as ekconomie inmekaar sak!
-STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Insinking Oor!{}{}Oplewing in sake gee vertroue na nywerheide as ekonomie Versterk!
+STR_7074_RECESSION_OVER_UPTURN_IN                               :{BIGFONT}{BLACK}Insinking Oor!{}{}Oplewing in sake gee vertroue na nywerheide as ekonomie versterk!
 STR_7075_TOGGLE_LARGE_SMALL_WINDOW                              :{BLACK}Skakel groot/klein venster groote
 STR_7076_COMPANY_VALUE                                          :{GOLD}Maatskappy waarde: {WHITE}{CURRENCY64}
 STR_7077_BUY_25_SHARE_IN_COMPANY                                :{BLACK}Koop 25% aandeel in maatskappy
@@ -1861,6 +1884,8 @@ STR_707E_OWNED_BY_OWNED_BY                                      :{WHITE}({COMMA}
 STR_707F_HAS_BEEN_TAKEN_OVER_BY                                 :{BLACK}{BIGFONT}{COMPANY} is deur {COMPANY}! oorgevat!
 STR_7080_PROTECTED                                              :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...

+
+
 ##id 0x8000
 STR_8000_KIRBY_PAUL_TANK_STEAM                                  :Kirby Paul Tank (Stoom)
 STR_8001_MJS_250_DIESEL                                         :MJS 250 (Diesel)
@@ -2159,13 +2184,16 @@ STR_8813_FROM                                                   :{LTBLUE}{CARGO}
 STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Trein {COMMA} wag in depot
 STR_8815_NEW_VEHICLES                                           :{BLACK}Nuwe Voertuie
 STR_8816                                                        :{BLACK}-
-STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Trein te lang
+STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Trein te lank
 STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Treine kan slegs verander word as hulle in die depot gestop is
-STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trein{P "" s}
+STR_881B_TRAINS                                                 :{WHITE}{COMPANY} - {COMMA} Trein{P "" e}
+
 STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nuwe Spoor Voertuie
 STR_NEW_ELRAIL_VEHICLES                                         :{WHITE}Nuwe Elektries Spoor Voertuie
 STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nuwe Eenspoor Voertuie
 STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nuwe Maglev Voertuie
+STR_ALL_AVAIL_RAIL_VEHICLES                                     :{WHITE}Spoorweg Voertuie
+
 STR_881F_BUILD_VEHICLE                                          :{BLACK}Bou Voertuig
 STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloon Voertuig
 STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dit sal 'n afskrywing van die pad voertuig bou. Control-kliek sal die opdrae deel
@@ -2197,35 +2225,35 @@ STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Die opdr
 STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Voertuig kan nie beweeg nie...
 STR_8838_N_A                                                    :N/A{SKIP}
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Kan nie spoorweg voertuig verkoop nie...
-STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kan nie roete vind na plaaslike depot nie
-STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Trein kan nie stop/ry word nie...
+STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Kan nie roete na plaaslike depot vind nie
+STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Trein kan nie stop/aanvang word nie...
 STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Diens tussentyd: {LTBLUE}{COMMA}dae{BLACK}   Laaste diens: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treine - kliek op trein vir inligting
 STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Bou nuwe treine (vereis trein depot)
 STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Treine - kliek op trein vir info., sleep voertuig om te bysit/verwyder van trein
 STR_8840_BUILD_NEW_TRAIN_VEHICLE                                :{BLACK}Bou nuwe trein voertuig
 STR_8841_DRAG_TRAIN_VEHICLE_TO_HERE                             :{BLACK}Sleep trein voertuig hier om dit te verkoop
-STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}senter skerm op trein depot
+STR_8842_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Senter skerm op trein depot
 STR_8843_TRAIN_VEHICLE_SELECTION                                :{BLACK}Trein voertuig keuse lys - kliek op voertuig vir inligting
 STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN                            :{BLACK}Bou die beklemtoonde trein voertuig
 STR_8845_RENAME_TRAIN_VEHICLE_TYPE                              :{BLACK}Hernaam trein voertuig tipe
 STR_8846_CURRENT_TRAIN_ACTION_CLICK                             :{BLACK}Huidige trein aksie - kliek hier om trein te stop/aanvang trein
 STR_8847_SHOW_TRAIN_S_ORDERS                                    :{BLACK}Wys trein se opdrae
 STR_8848_CENTER_MAIN_VIEW_ON_TRAIN                              :{BLACK}Senter skerm op trein
-STR_8849_SEND_TRAIN_TO_DEPOT                                    :{BLACK}Stuur trein na depot
+STR_8849_SEND_TRAIN_TO_DEPOT                                    :{BLACK}Stuur trein na depot. CTRL+kliek sal net diens
 STR_884A_FORCE_TRAIN_TO_PROCEED                                 :{BLACK}Dwing trein om voort te gaan sonder om vir seine te wag
 STR_884B_REVERSE_DIRECTION_OF_TRAIN                             :{BLACK}Omkeer rigting van trein
 STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Wys trein se aanwyse
-STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Verhoog diens tussentyd
+STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Vergroot diens tussentyd
 STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Verminder diens tussentyd
 STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Wys aanwyse van vrag gedra
 STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES                         :{BLACK}Wys aanwyse van trein voertuie
 STR_8851_SHOW_CAPACITIES_OF_EACH                                :{BLACK}Wys kapasiteite van elke voertuig
-STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}wys totaale kapasitiet van trein, verdeel by vrag tipe
+STR_8852_SHOW_TOTAL_CARGO                                       :{BLACK}Wys totaale kapasitiet van trein, verdeel by vrag tipe
 STR_8852_ORDERS_LIST_CLICK_ON_ORDER                             :{BLACK}Opdraglys - kliek op 'n opdrag om dit te beklemtoon. CTRL + kliek senter op stasie
 STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Sprong die huidige opdrag, en begin die volgende
 STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Uitwis die beklemtoonde opdrag
-STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die beklemtoonde opdrag deaugaande
+STR_8855_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die beklemtoonde opdrag deurgaande
 STR_8856_INSERT_A_NEW_ORDER_BEFORE                              :{BLACK}Invoeg 'n nuwe opdrag voor die beklemtoonde opdrag, of byvoeg na einde van lys
 STR_8857_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die beklemtoonde opdrag dwing die voertuig om vir 'n volle lading te wag
 STR_8858_MAKE_THE_HIGHLIGHTED_ORDER                             :{BLACK}Maak die beklemtoonde opdrag dwing die voertuig te aflaai
@@ -2236,7 +2264,7 @@ STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Ouderdom
 STR_885F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profyt die jaar: {LTBLUE}{CURRENCY}  (verlede jaar: {CURRENCY})
 STR_8860_RELIABILITY_BREAKDOWNS                                 :{BLACK}Deeglikheid: {LTBLUE}{COMMA}%  {BLACK}Oponthoude sedert laaste diens: {LTBLUE}{COMMA}
 STR_8861_STOPPED                                                :{RED}Gestop
-STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan nie tein dwing om sein te vermy op gevaar...
+STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL                           :{WHITE}Kan nie trein dwing om sein te vermy op gevaar...
 STR_8863_CRASHED                                                :{RED}Botsing!

 STR_8865_NAME_TRAIN                                             :{WHITE}Benaam trein
@@ -2267,9 +2295,9 @@ STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profyt d
 STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Deeglikheid: {LTBLUE}{COMMA}%  {BLACK}Oponthoude sedert laaste diens: {LTBLUE}{COMMA}
 STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_9012_CAPACITY                                               :{BLACK}Kapasitiet: {LTBLUE}{CARGO}
-STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...moet gestop binne 'n pad depot wees
+STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...moet gestop binne 'n pad voertuig depot wees
 STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Kan nie pad voertuig verkoop nie
-STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kani nie pad voertuig stop/ry nie...
+STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Kani nie pad voertuig stop/aanvang nie...
 STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Pad voertuig {COMMA} wag in depot
 STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Op pad na {TOWN} Pad Depot
 STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Pad Depot, {VELOCITY}
@@ -2277,10 +2305,10 @@ STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Kan nie
 STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan nie plaaslike depot vind nie
 STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Pad voertuie - kliek op voertuig vir inligting
 STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Bou nuwe pad voertuie (vereis pad voertuig depot)
-STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Huidige voertuig aksie - kliek hier om voertuig to stop/ry
+STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Huidige voertuig aksie - kliek hier om voertuig to stop/aanvang
 STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Wys voertuig se opdrae
 STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Senter skerm op voertuig
-STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Stuur voertuig na depot
+STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Stuur voertuig na depot. CTRL+kliek sal net diens
 STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Dwing voertuig om om te draai
 STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Wys pad voertuig aanwyse
 STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Voertuie - kliek op voertuig vir inligting
@@ -2289,9 +2317,9 @@ STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Sleep pa
 STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Senter skerm op pad voertuig depot
 STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Pad voertuig keuse lys - kliek op voertuig vir inligting
 STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Bou die beklemtoonde pad voertuig
-STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nuwe pad voertuig is nou beskikbaar!
+STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Nuwe pad voertuig nou beskikbaar!
 STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
-STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koste: {CURRENCY}{}Speod: {VELOCITY}{}Loopkoste: {CURRENCY}/yr{}Kapasitiet: {CARGO}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Koste: {CURRENCY}{}Spoed: {VELOCITY}{}Loopkoste: {CURRENCY}/yr{}Kapasitiet: {CARGO}

 STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Benaam pad voertuig
 STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Pad voertuig kan nie benaam word nie...
@@ -2310,12 +2338,12 @@ STR_9038_GO_TO_ROADVEH_DEPOT                                    :Gaan na {TOWN}


 ##id 0x9800
-STR_9800_DOCK_CONSTRUCTION                                      :Werf Konstruksie
+STR_9800_DOCK_CONSTRUCTION                                      :Werf konstruksie
 STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}Werf konstruksie
 STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Kan nie werf hier bou nie...
 STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Skip Depot
 STR_9804_NEW_SHIPS                                              :{BLACK}Nuwe Skepe
-STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Skeep{P "" s}
+STR_9805_SHIPS                                                  :{WHITE}{COMPANY} - {COMMA} Skeep{P "" e}
 STR_9808_NEW_SHIPS                                              :{WHITE}Nuwe Skepe
 STR_9809_BUILD_SHIP                                             :{BLACK}Bou Skip
 STR_CLONE_SHIP                                                  :{BLACK}Kloon Skip
@@ -2333,8 +2361,8 @@ STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Profyt d
 STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Deeglikheid: {LTBLUE}{COMMA}%  {BLACK}Oponthoude sedert laaste diens: {LTBLUE}{COMMA}
 STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_9817_CAPACITY                                               :{BLACK}Kapasitiet: {LTBLUE}{CARGO}
-STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan nie skip stop/ry nie
-STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan nie skip na depot sttur nie...
+STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Kan nie skip stop/aanvang nie
+STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Kan nie skip na depot stuur nie...
 STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Kan nie plaaslike depot vind nie
 STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Op pad na {TOWN} Skip Depot
 STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Skip Depot, {VELOCITY}
@@ -2349,7 +2377,7 @@ STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Skepe -
 STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Bou nuwe skepe (vereis skip depot)
 STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Skip keuse lys - kliek op skip vir inligting
 STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Bou die beklemtoonde skip
-STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Huidige skip aksie - kliek hier om skip te stop/ry
+STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Huidige skip aksie - kliek hier om skip te stop/aanvang
 STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Wys skip se opdrae
 STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Senter skerm op skip
 STR_982A_SEND_SHIP_TO_DEPOT                                     :{BLACK}Stuur skip na depot
@@ -2368,12 +2396,12 @@ STR_9836_RENAME                                                 :{BLACK}Hernaam
 STR_9837_RENAME_SHIP_TYPE                                       :{BLACK}Hernaam skip tipe
 STR_9838_RENAME_SHIP_TYPE                                       :{WHITE}Hernaam skip tipe
 STR_9839_CAN_T_RENAME_SHIP_TYPE                                 :{WHITE}Kan nie skip tipe hernaam nie...
-STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Herstel vrag skip om 'n ander vrag tipe te vervoer
+STR_983A_REFIT_CARGO_SHIP_TO_CARRY                              :{BLACK}Herstel vrag skip om 'n ander vrag tipe te ontvoer
 STR_983B_REFIT                                                  :{WHITE}{VEHICLE} (Herstel)
 STR_983C_REFIT_SHIP                                             :{BLACK}Herstel skip
-STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies vrag tipe vir skip te vervoer
-STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Herstel skip om die beklemtoonde vrag tipe te vervoer
-STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Kies vrag tipe vir skip te vervoer:
+STR_983D_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies vrag tipe vir skip te ontvoer
+STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED                        :{BLACK}Herstel skip om die beklemtoonde vrag tipe te ontvoer
+STR_983F_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Kies vrag tipe vir skip te ontvoer:
 STR_9840_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuwe kapasiteit: {GOLD}{CARGO}{}{BLACK}Herstelkoste: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP                                       :{WHITE}Skip kan nie herstel word nie...
 STR_9842_REFITTABLE                                             :(herstelbaar)
@@ -2405,7 +2433,7 @@ STR_HEADING_FOR_HANGAR                                          :{ORANGE}Op pad
 STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
 STR_A014_AIRCRAFT_IS_WAITING_IN                                 :{WHITE}Vliegtuig {COMMA} wag in die vliegtuig hangar
 STR_A015_AIRCRAFT_IN_THE_WAY                                    :{WHITE}Vliegtuig in die pad
-STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan nie vliegtuig staak/aanvang nie...
+STR_A016_CAN_T_STOP_START_AIRCRAFT                              :{WHITE}Kan nie vliegtuig stop/aanvang nie...
 STR_A017_AIRCRAFT_IS_IN_FLIGHT                                  :{WHITE}Vliegtuig is opvlug
 STR_A019_CAPACITY                                               :{BLACK}Kapasiteit: {LTBLUE}{CARGO}, {CARGO}
 STR_A01A_CAPACITY                                               :{BLACK}Kapasiteit: {LTBLUE}{CARGO}
@@ -2421,10 +2449,10 @@ STR_A023_DRAG_AIRCRAFT_TO_HERE_TO                               :{BLACK}Sleep vl
 STR_A024_CENTER_MAIN_VIEW_ON_HANGAR                             :{BLACK}Senter skerm op hangar
 STR_A025_AIRCRAFT_SELECTION_LIST                                :{BLACK}Vliegtuig keuse lys - kliek op vliegtuig vir inligting
 STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT                         :{BLACK}Bou die beklemtoonde vliegtuig
-STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Huidige vliegtuig aksie - kliek hier on vliegtuig te stop/ry
-STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Wys vliegtuig se bestellings
+STR_A027_CURRENT_AIRCRAFT_ACTION                                :{BLACK}Huidige vliegtuig aksie - kliek hier on vliegtuig te stop/aanvang
+STR_A028_SHOW_AIRCRAFT_S_ORDERS                                 :{BLACK}Wys vliegtuig se opdrae
 STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT                           :{BLACK}Senter skerm op vliegtuig
-STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Stuur vliegtuig na hangar
+STR_A02A_SEND_AIRCRAFT_TO_HANGAR                                :{BLACK}Stuur vliegtuig na hangar. CTRL+kliek sal net diens
 STR_A02B_SHOW_AIRCRAFT_DETAILS                                  :{BLACK}Wys vliegtuig aanwyse
 STR_A02C_NEW_AIRCRAFT_NOW_AVAILABLE                             :{BLACK}{BIGFONT}Nuwe vliegtuig nou beskikbaar!
 STR_A02D                                                        :{BLACK}{BIGFONT}{STRING}
@@ -2440,12 +2468,12 @@ STR_A037_RENAME                                                 :{BLACK}Hernaam
 STR_A038_RENAME_AIRCRAFT_TYPE                                   :{BLACK}Hernaam vliegtuig tipe
 STR_A039_RENAME_AIRCRAFT_TYPE                                   :{WHITE}Hernaam vliegtuig tipe
 STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE                             :{WHITE}Kan nie vliegtuig tipe hernaam nie...
-STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Hestel vliegtuig om 'n ander vrag tipe te vervoer
+STR_A03B_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Hestel vliegtuig om 'n ander vrag tipe te ontvoer
 STR_A03C_REFIT                                                  :{WHITE}{VEHICLE} (Herstel)
 STR_A03D_REFIT_AIRCRAFT                                         :{BLACK}Herstel vliegtuig
-STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies vrag tipe vir vliegtuig om te vervoer
-STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Herstel vliegtuig om beklemtoonde vrag tipe te vervoer
-STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Kies vrag tipe om te vervoer:
+STR_A03E_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Kies vrag tipe vir vliegtuig om te ontvoer
+STR_A03F_REFIT_AIRCRAFT_TO_CARRY                                :{BLACK}Herstel vliegtuig om beklemtoonde vrag tipe te ontvoer
+STR_A040_SELECT_CARGO_TYPE_TO_CARRY                             :{GOLD}Kies vrag tipe om te ontvoer:
 STR_A041_NEW_CAPACITY_COST_OF_REFIT                             :{BLACK}Nuwe kapasiteit: {GOLD}{STRING}{}{BLACK}Herstelkoste: {GOLD}{CURRENCY}
 STR_A042_CAN_T_REFIT_AIRCRAFT                                   :{WHITE}Vliegtuig kan nie herstel word nie...
 STR_GO_TO_AIRPORT_HANGAR                                        :Gaan na {STATION} Hangar
@@ -2494,6 +2522,10 @@ STR_NEWGRF_TIP                                                  :{BLACK}'n Lys v
 STR_NEWGRF_FILENAME                                             :{BLACK}Leernaam: {SILVER}{STRING}
 STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}

+
+
+
+
 STR_CURRENCY_WINDOW                                             :{WHITE}Gewoonte koers
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{CURRENCY} =  {COMMA}
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Afskeier
@@ -2510,6 +2542,13 @@ STR_PLANE                                                       :{BLACK}{PLANE}



+
+### depot strings
+
+
+
+
+
 STR_NOT_REPLACING                                               :{BLACK}Word nie vervang nie
 STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Geen voertuig gekies
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Enjin is nie boubaar nie
@@ -2517,6 +2556,10 @@ STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}Enjin is
 STR_ENGINES                                                     :Enjine


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

 STR_ELRAIL_VEHICLES                                             :Elektrifiseerde Spoor Voertuie
@@ -2527,6 +2570,11 @@ STR_MAGLEV_VEHICLES                                             :Maglev voertuie



+########### String for New Landscape Generator
+
+STR_CLEARING_TILES                                              :{BLACK}Ru en rotserig area ontwikkeling
+
+
 ########### String for new airports
 STR_CITY_AIRPORT                                                :{BLACK}Stad
 STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Internasionaale lughawe
@@ -2538,4 +2586,8 @@ STR_HELISTATION                                                 :{BLACK}Helistas

 STR_LARGE_AIRPORTS                                              :{BLACK}Groot Lughawe
 STR_HELIPORTS                                                   :{BLACK}Helikopter lughawe
+
+############ Tooltip measurment
+
+
 ########
--- a/lang/unfinished/croatian.txt
+++ b/lang/unfinished/croatian.txt
--- a/lang/unfinished/frisian.txt
+++ b/lang/unfinished/frisian.txt
--- a/lang/unfinished/greek.txt
+++ b/lang/unfinished/greek.txt
@@ -1,13 +1,13 @@
 ##name Greek
 ##ownname Ελληνικά
-##isocode el_GR.UTF-8
+##isocode el_GR
 ##plural 0
 ##gender m f n

 ##id 0x0000
 STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Απο την άκρη του χάρτη
 STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Πολυ κοντά στην άκρη του χάρτη
-STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Δεν υπάρχουν αρκετά χρήματα - απαιτεί {CURRENCY}
+STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Δεν υπάρχουν αρκετά χρήματα - απαιτούνται {CURRENCY}
 STR_0004                                                        :{WHITE}{CURRENCY64}.
 STR_0005                                                        :{RED}{CURRENCY64}.
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Απαιτείται επίπεδο εδαφος
@@ -59,7 +59,7 @@ STR_0034_GOODS                                                  :Αγαθό
 STR_0035_GRAIN                                                  :Σιτάρι
 STR_0036_WOOD                                                   :Ξύλο
 STR_0037_IRON_ORE                                               :Μετάλλευμα Σιδήρου
-STR_0038_STEEL                                                  :
+STR_0038_STEEL                                                  :Χάλυβας
 STR_0039_VALUABLES                                              :Τιμαλφή
 STR_003A_COPPER_ORE                                             :Μετάλλευμα Χαλκού
 STR_003B_MAIZE                                                  :Αραβόσιτος
@@ -81,22 +81,47 @@ STR_004A_TOFFEE                                                 :Τόφυ
 STR_004B_BATTERY                                                :Μπαταρία
 STR_004C_PLASTIC                                                :Πλαστικό
 STR_004D_FIZZY_DRINK                                            :Αναψυκτικό
+STR_QUANTITY_WOOD                                               :{WEIGHT} ξύλου
+STR_QUANTITY_IRON_ORE                                           :{WEIGHT} μεταλλεύματος σιδήρου
+STR_QUANTITY_STEEL                                              :{WEIGHT} ατσαλιού
+STR_QUANTITY_VALUABLES                                          :{COMMA} τσάντ{P α ες} με τιμαλφή
+STR_QUANTITY_COPPER_ORE                                         :{WEIGHT} μεταλλεύματος χαλκού
+STR_QUANTITY_MAIZE                                              :{WEIGHT} αραβόσιτου
+STR_QUANTITY_FRUIT                                              :{WEIGHT} φρούτων
+STR_QUANTITY_DIAMONDS                                           :{COMMA} τσάντ{P α ες} με διαμάντια
+STR_QUANTITY_FOOD                                               :{WEIGHT} τροφίμων
+STR_QUANTITY_PAPER                                              :{WEIGHT} χαρτιού
+STR_QUANTITY_GOLD                                               :{COMMA} τσάντ{P α ες} με χρυσό
+STR_QUANTITY_WATER                                              :{VOLUME} νερού
+STR_QUANTITY_WHEAT                                              :{WEIGHT} σιταριού
+STR_QUANTITY_RUBBER                                             :{VOLUME} καουτσούκ
+STR_QUANTITY_SUGAR                                              :{WEIGHT} ζάχαρης
+STR_QUANTITY_TOYS                                               :{COMMA} παιχνίδι{P "" α}
+STR_QUANTITY_SWEETS                                             :{COMMA} τσάντ{P α ες} με γλυκά
+STR_QUANTITY_COLA                                               :{VOLUME} κόλας
+STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT} μαλλί της γριάς
+STR_QUANTITY_BUBBLES                                            :{COMMA} φυσαλίδ{P α ες}
+STR_QUANTITY_BATTERIES                                          :{COMMA} μπαταρί{P α ες}
+STR_QUANTITY_PLASTIC                                            :{VOLUME} πλαστικού
+STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} αναψυκτικ{P ό ά}
 STR_00AE                                                        :{WHITE}{DATE_SHORT}
 STR_00AF                                                        :{WHITE}{DATE_LONG}
 STR_00B0_MAP                                                    :{WHITE}Χάρτης - {STRING}
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Επιλογές Παιχνιδιού
 STR_00B2_MESSAGE                                                :{YELLOW}Μήνυμα
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Μήνυμα από {STRING}
-STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Δεν μπορεί να γίνει αυτό....
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Προσχή!
+STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Αυτό δεν γίνεται....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Αυτή η περιοχή είναι αδύνατο να καθαριστεί...
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Αρχικά Πνευματικά Δικαιώματα {COPYRIGHT} 1995 Chris Sawyer, Όλα τα δικαιώματα διατηρούνται
 STR_00B7_VERSION                                                :{BLACK}OpenTTD έκδοση {REV}
 STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Η ομάδα του OpenTTD
+STR_TRANSLATED_BY                                               :{BLACK}  Μεταφραστής\ές -

 STR_00C5                                                        :{BLACK}{CROSS}
 STR_00C6                                                        :{SILVER}{CROSS}
 STR_00C7_QUIT                                                   :{WHITE}Έξοδος
-STR_00C8_YES                                                    :{BLACK}Ναί
+STR_00C8_YES                                                    :{BLACK}Ναι
 STR_00C9_NO                                                     :{BLACK}Όχι
 STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Είστε σίγουρος/η ότι θέλετε να παρατήσετε το παιχνίδι και να επιστρέψετε στο {STRING};
 STR_00CB_1                                                      :{BLACK}1
@@ -121,7 +146,7 @@ STR_00DD_ORANGE                                                 :Πορτοκα
 STR_00DE_BROWN                                                  :Καφέ
 STR_00DF_GREY                                                   :Γκρι
 STR_00E0_WHITE                                                  :Λευκό
-STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Πάρα πολλά οχήματα στο παιχνίδι
+STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Πάρα πολλά οχήματα στον χάρτη
 STR_00E2                                                        :{BLACK}{COMMA}
 STR_00E3                                                        :{RED}{COMMA}
 STR_00E4_LOCATION                                               :{BLACK}Τοποθεσία
@@ -214,10 +239,13 @@ STR_013D_INFORMATION                                            :{BLACK}Πληρ
 STR_013E_CAPACITIES                                             :{BLACK}Χωρητικότητες
 STR_013E_TOTAL_CARGO                                            :{BLACK}Συνολικό Φορτίο
 STR_013F_CAPACITY                                               :{BLACK}Χωρητικότητα: {LTBLUE}{CARGO}
+STR_CAPACITY_MULT                                               :{BLACK}Χωριτηκότητα: {LTBLUE}{CARGO} (x{NUM})
 STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Συνολική χωρητικότητα φορτίου του τραίνου:
 STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
 STR_0140_NEW_GAME                                               :{BLACK}Νέο Παιχνίδι
 STR_0141_LOAD_GAME                                              :{BLACK}Φόρτωση Παιχνιδιού
+STR_SINGLE_PLAYER                                               :{BLACK}Ένας παίκτης
+STR_MULTIPLAYER                                                 :{BLACK}Πολοί παίκτες

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

 STR_0150_SOMEONE                                                :κάποιος{SKIP}{SKIP}
@@ -233,6 +262,7 @@ STR_0152_TOWN_DIRECTORY                                         :Κατάλογ
 STR_0153_SUBSIDIES                                              :Επιχορηγήσεις


+STR_UNITS_VELOCITY_METRIC                                       :{COMMA} χλμ/ώρα



@@ -240,7 +270,7 @@ STR_0153_SUBSIDIES                                              :Επιχορη



-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Γράφημα λειτουργικού κέρδους
 STR_0155_INCOME_GRAPH                                           :Γράφημα εισοδήματος
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Γράφημα παραδοθέντος φορτίου
@@ -248,16 +278,39 @@ STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Γράφημα
 STR_0158_COMPANY_VALUE_GRAPH                                    :Γράφημα εταιρικής αξίας
 STR_0159_CARGO_PAYMENT_RATES                                    :Ποσοστά πληρωμής φορτίου
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Πίνακας κατάταξης επιχείρησης
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Σχετικά με το OpenTTD
 STR_015C_SAVE_GAME                                              :Αποθήκευση παιχνιδιού
 STR_015D_LOAD_GAME                                              :Φόρτωση παιχνιδιού
 STR_015E_QUIT_GAME                                              :Παραίτηση από το παιχνίδι
 STR_015F_QUIT                                                   :Έξοδος
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Είστε βέβαιοι ότι θέλετε να παραιτηθείτε από το παιχνίδι;
 STR_0161_QUIT_GAME                                              :{WHITE}Παραίτηση από το Παιχνίδι

+STR_SORT_BY_PRODUCTION                                          :{BLACK}Παραγωγή
+STR_SORT_BY_TYPE                                                :{BLACK}Τύπος
+STR_SORT_BY_NAME                                                :{BLACK}Όνομα
+STR_SORT_BY_DROPDOWN_NAME                                       :Όνομα
+STR_SORT_BY_DATE                                                :{BLACK}Μέρα
+STR_SORT_BY_NUMBER                                              :Αριθμός
+STR_SORT_BY_PROFIT_LAST_YEAR                                    :Κέρδος προηγούμενου χρόνου
+STR_SORT_BY_PROFIT_THIS_YEAR                                    :Κέρδος αυτού του χρόνου
+STR_SORT_BY_AGE                                                 :Ηλικία
+STR_SORT_BY_RELIABILITY                                         :αξιοπιστία
+STR_SORT_BY_MAX_SPEED                                           :Μέγιστη ταχύτητα
+STR_SORT_BY_MODEL                                               :Μοντέλο
+STR_SORT_BY_VALUE                                               :Αξία
+STR_SORT_BY_FACILITY                                            :Τύπος σταθμού
+STR_ENGINE_SORT_COST                                            :Κόστος
+STR_ENGINE_SORT_POWER                                           :Δύναμη
+STR_NO_WAITING_CARGO                                            :{BLACK}Κανένα εμπόρευμα κανενός τύπου δεν περιμένει
+STR_MANAGE_LIST_TIP                                             :{BLACK}Στείλε οδηγίες σε όλα τα οχήματα σε αυτή λίστα
+STR_REPLACE_VEHICLES                                            :Αντικατέστησε τα οχήματα
+STR_SEND_TRAIN_TO_DEPOT                                         :Στείλε στο υπόστεγο
+STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Στείλε στο υπόστεγο
+STR_SEND_SHIP_TO_DEPOT                                          :Στείλε στο υπόστεγο
+STR_SEND_AIRCRAFT_TO_HANGAR                                     :Στείλε στο υπόστεγο
+STR_SEND_FOR_SERVICING                                          :Στείλε για επισκευή

 ############ range for months starts
 STR_0162_JAN                                                    :Ιαν
@@ -319,15 +372,17 @@ STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Εναλ
 STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Κέρδος αυτό το έτος: {CURRENCY} (προηγούμενο έτος: {CURRENCY})

 ############ range for service numbers starts
+STR_AGE                                                         :{COMMA} χρόν{P ος ια} ({COMMA})
+STR_AGE_RED                                                     :{RED}{COMMA} χρόν{P ος ια} ({COMMA})
 ############ range for service numbers ends

 STR_019C_ROAD_VEHICLE                                           :Όχημα δρόμου
 STR_019D_AIRCRAFT                                               :Αεροσκάφος
 STR_019E_SHIP                                                   :Πλοίο
 STR_019F_TRAIN                                                  :Τρένο
-STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} παλιώνει
-STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} παλιώνει πολύ
-STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} παλιώνει πολύ και χρειάζεται αντικατάσταση
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}Το {STRING} {COMMA} παλιώνει
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}Το {STRING} {COMMA} παλιώνει πολύ
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}Το {STRING} {COMMA} παλιώνει πολύ και χρειάζεται επειγόντωςαντικατάσταση
 STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}Πληροφορίες Περιοχής Εδάφους
 STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Κόστος καθαρισμού: {LTBLUE}Μ/Δ
 STR_01A5_COST_TO_CLEAR                                          :{BLACK}Κόστος καθαρισμού: {LTBLUE}{CURRENCY}
@@ -335,42 +390,42 @@ STR_01A6_N_A                                                    :Μ/Δ
 STR_01A7_OWNER                                                  :{BLACK}Ιδιοκτήτης: {LTBLUE}{STRING}
 STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Τοπική αρχή: {LTBLUE}{STRING}
 STR_01A9_NONE                                                   :Κανένα
-STR_01AA_NAME                                                   :{BLACK}'Ονομα
+STR_01AA_NAME                                                   :{BLACK}Όνομα
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

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

 STR_01CB                                                        :{TINYFONT}{COMMA}

@@ -388,7 +443,7 @@ STR_01D9_CUSTOM_1                                               :{TINYFONT}Πρ
 STR_01DA_CUSTOM_2                                               :{TINYFONT}Προσαρμοσμένο 2
 STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Ένταση Μουσικής
 STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Ένταση Εφφέ
-STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}ΕΛ  '  '  ' '  '  '  ΜΕΓ
+STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}ΕΛΑΧ  '  '  ' '  '  '  ΜΕΓ
 STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Πλοήγηση στο προηγούμενο κομμάτι της συλλογής
 STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Πλοήγηση στο επόμενο κομμάτι στη συλλογή
 STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Σταμάτημα αναπαραγωγής
@@ -400,7 +455,7 @@ STR_01E5                                                        :{DKGREEN}{TINYF
 STR_01E6                                                        :{DKGREEN}{TINYFONT}------
 STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
 STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Κομμάτι{SETX 88}Τίτλος
-STR_01E9_SHUFFLE                                                :{TINYFONT}Shuffle
+STR_01E9_SHUFFLE                                                :{TINYFONT}Τυχαία αναπαραγωγή
 STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Πρόγραμμα
 STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Επιλογή Μουσικού Προγράμματος
 STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
@@ -413,18 +468,19 @@ STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Τρέχ
 STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Επιλογή προγράμματος 'όλα τα κομμάτια'
 STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Επιλογή προγράμματος 'παλιό στυλ'
 STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Επιλογή προγράμματος 'νέο στυλ'
-STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Επιλογή προγράμματος 'προσαρμοσμένο 1'
-STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Επιλογή προγράμματος 'προσαρμοσμένο 2'
+STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Επιλογή προγράμματος 'Προσαρμοσμένο 1'
+STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Επιλογή προγράμματος 'Προσαρμοσμένο 2'
 STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Καθαρισμός τρέχοντος προγράμματος (Προσαρμοσμένο1 ή Προσαρμοσμένο2 μόνο)
 STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Αποθήκευση επιλογών μουσικής
 STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Κάντε κλίκ στο μουσικό κομμάτι για προσθήκη στο τρέχον πρόγραμμα (Προσαρμοσμένο1 ή Προσαρμοσμένο2 μόνο)
-STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Εναλλαγή shuffle on/off στο πρόγραμμα
+STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Εναλλαγή τυχαίας αναπαραγωγής on/off στο πρόγραμμα
 STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Εμφάνιση παραθύρου επιλογής μουσικού κομματιού
 STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Κάντε κλίκ στην υπηρεσία για κεντράρισμα στην βιομηχανία/πόλη
-STR_01FE_DIFFICULTY                                             :{BLACK}Δυσκολία ({STRING})
+STR_01FE_DIFFICULTY                                             :{BLACK}{G=f}Δυσκολία ({STRING})
 STR_01FF                                                        :{TINYFONT}{BLACK}{DATE_LONG}
 STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Τελευταίο μήνυμα/αναφορά νέων
 STR_0201_MESSAGE_SETTINGS                                       :Ρυθμίσεις μηνυμάτων
+STR_MESSAGE_HISTORY_MENU                                        :
 STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Εμφάνιση τελευταίου μηνύματος/αναφοράς νέων, επιλογές μηνυμάτων
 STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Επιλογές Μηνυμάτων
 STR_0205_MESSAGE_TYPES                                          :{BLACK}Τύποι μηνυμάτων:
@@ -439,7 +495,7 @@ STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Αλλ
 STR_020E_SUBSIDIES                                              :{YELLOW}Επιχορηγήσεις
 STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Γενικές πληροφορίες
 STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...πολύ μακριά από τον προηγούμενο προορισμό
-STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Οι καλύτερες εταιρείες που έφτασαν {NUM}{}({STRING} Επίπεδο)
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Οι καλύτερες εταιρείες που έφτασαν το {NUM}{}({STRING} Επίπεδο)
 STR_0212                                                        :{BIGFONT}{COMMA},
 STR_0213_BUSINESSMAN                                            :Επαγγελματίας
 STR_0214_ENTREPRENEUR                                           :Επιχειρηματίας
@@ -448,13 +504,15 @@ STR_0216_CAPITALIST                                             :Κεφαλαι
 STR_0217_MAGNATE                                                :Μεγιστάνας
 STR_0218_MOGUL                                                  :Τυχοδιώκτης
 STR_0219_TYCOON_OF_THE_CENTURY                                  :Μεγιστάνας του Αιώνα
+STR_HIGHSCORE_NAME                                              :{BIGFONT}{PLAYERNAME}, {COMPANY}
+STR_HIGHSCORE_STATS                                             :{BIGFONT}'{STRING}'   ({COMMA})
 STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} έφτασε  στο επίπεδο '{STRING}'
 STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} της εταιρείας {COMPANY} έφτασε στο επίπεδο '{STRING}'!
 STR_021F                                                        :{BLUE}{COMMA}
 STR_0220_CREATE_SCENARIO                                        :{BLACK}Δημιουργία Σεναρίου
 STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
-STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Συντάκτης Σεναρίου
-STR_0223_LAND_GENERATION                                        :{WHITE}Γεννήτρια Γης
+STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Πρόγραμμα Επεξερτασίας Σεναρίου
+STR_0223_LAND_GENERATION                                        :{WHITE}Δημιουργία Γης
 STR_0224                                                        :{BLACK}{UPARROW}
 STR_0225                                                        :{BLACK}{DOWNARROW}
 STR_0226_RANDOM_LAND                                            :{BLACK}Τυχαία Γη
@@ -477,25 +535,26 @@ STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...πο
 STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...πολύ κοντά σε άλλη πόλη
 STR_0239_SITE_UNSUITABLE                                        :{WHITE}...ακατάλληλη περιοχή
 STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...πάρα πολλές πόλεις
+STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...δεν υπάρχει αλλος χώρος στον χάρτη
 STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Αύξηση μεγέθους πόλεως
 STR_023C_EXPAND                                                 :{BLACK}Επέκταση
 STR_023D_RANDOM_TOWN                                            :{BLACK}Τυχαία Πόλη
 STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Χτίσιμο πόλης σε τυχαία τοποθεσία
 STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Δημιουργία Βιομηχανίας
-STR_0240_COAL_MINE                                              :{BLACK}Ορυχείο Άνθρακα
-STR_0241_POWER_STATION                                          :{BLACK}Σταθμός Παραγωγής Ηλεκτρισμού
-STR_0242_SAWMILL                                                :{BLACK}Πριονιστήριο
-STR_0243_FOREST                                                 :{BLACK}Δάσος
-STR_0244_OIL_REFINERY                                           :{BLACK}Διυλιστήριο
-STR_0245_OIL_RIG                                                :{BLACK}Πλατφόρμα Πετρελαίου
-STR_0246_FACTORY                                                :{BLACK}Εργοστάσιο
-STR_0247_STEEL_MILL                                             :{BLACK}Μύλος Χάλυβα
-STR_0248_FARM                                                   :{BLACK}Φάρμα
-STR_0249_IRON_ORE_MINE                                          :{BLACK}Ορυχείο Μεταλλεύματος Σιδήρου
+STR_0240_COAL_MINE                                              :{BLACK}{G=n}Ορυχείο Άνθρακα
+STR_0241_POWER_STATION                                          :{BLACK}{G=m}Σταθμός Παραγωγής Ηλεκτρισμού
+STR_0242_SAWMILL                                                :{BLACK}{G=n}Πριονιστήριο
+STR_0243_FOREST                                                 :{BLACK}{G=n}Δάσος
+STR_0244_OIL_REFINERY                                           :{BLACK}{G=n}Διυλιστήριο
+STR_0245_OIL_RIG                                                :{BLACK}{G=f}Πλατφόρμα Πετρελαίου
+STR_0246_FACTORY                                                :{BLACK}{G=n}Εργοστάσιο
+STR_0247_STEEL_MILL                                             :{BLACK}{G=m}Μύλος Χάλυβα
+STR_0248_FARM                                                   :{BLACK}{G=f}Φάρμα
+STR_0249_IRON_ORE_MINE                                          :{BLACK}{G=n}Ορυχείο Μεταλλεύματος Σιδήρου
 STR_024A_OIL_WELLS                                              :{BLACK}Πηγάδια Πετρελαίου
-STR_024B_BANK                                                   :{BLACK}Τράπεζα
-STR_024C_PAPER_MILL                                             :{BLACK}Μύλος Χαρτιού
-STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}Εργοστάσιο Επεξεργασίας Τροφίμων
+STR_024B_BANK                                                   :{BLACK}{G=f}Τράπεζα
+STR_024C_PAPER_MILL                                             :{BLACK}{G=m}Μύλος Χαρτιού
+STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}{G=n}Εργοστάσιο Επεξεργασίας Τροφίμων
 STR_024E_PRINTING_WORKS                                         :{BLACK}Εργασίες Εκτύπωσης
 STR_024F_GOLD_MINE                                              :{BLACK}Ορυχείο Χρυσού
 STR_0250_LUMBER_MILL                                            :{BLACK}Μύλος Ξυλείας
@@ -551,7 +610,7 @@ STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}Κατα
 STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Κατασκευή Γεννήτριας Φυσαλίδων
 STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Κατασκευή Λατομείου Τόφυ
 STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Κατασκευή Ορυχείου Ζάχαρης
-STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Αδύνατο να χτιστεί {STRING} εδώ...
+STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Αδύνατο να χτιστεί {G ο η το} {STRING} εδώ...
 STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...πρέπει να χτιστεί πόλη πρώτα
 STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}...επιτρέπεται μόνο μία ανά πόλη
 STR_0288_PLANT_TREES                                            :{BLACK}Φύτευση Δέντρων
@@ -566,15 +625,15 @@ STR_0290_DELETE                                                 :{BLACK}Διαγ
 STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Πλήρης διαγραφή πόλεως
 STR_0292_SAVE_SCENARIO                                          :Απποθήκευση σεναρίου
 STR_0293_LOAD_SCENARIO                                          :Φόρτωση σεναρίου
-STR_0294_QUIT_EDITOR                                            :Έξοδος από το Συντάκτη
+STR_0294_QUIT_EDITOR                                            :Έξοδος από το πρόγραμμα επεξεργασίας
 STR_0295                                                        :
 STR_0296_QUIT                                                   :Έξοδος
-STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Αποθήκευση σεναρίου, φόρτωση, παραίτηση συντάκτη, έξοδος
+STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Αποθήκευση σεναρίου, φόρτωση, παραίτηση πρόγραμμα επεξεργασίας, έξοδος
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Φόρτωση Σεναρίου
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Αποθήκευση Σεναρίου
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Παιξτε το Σενάριο
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Είστε σίγουρος ότι θέλετε να κάνετε έξοδο;
-STR_029C_QUIT_EDITOR                                            :{WHITE}Έξοδος από Συντάκτη
+STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Είστε σίγουροι οτι θέλετε ναφύγετε από το πίστα;
+STR_029C_QUIT_EDITOR                                            :{WHITE}Έξοδος από το Πρόγραμμα Επεξεργασίας
 STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...μπορεί να χτιστεί μόνο σε πόλεις με πληθυσμό άνω των 1200
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Μετακίνηση ημ/νίας εκκίνησης 1 χρόνο πίσω
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Μετακίνηση ημ/νίας εκκίνησης 1 χρόνο μπροστά
@@ -591,13 +650,13 @@ STR_02BA                                                        :{SILVER}- -  {C
 STR_02BB_TOWN_DIRECTORY                                         :Καταλογος πόλεων
 STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Ονόματα σχεδίων οχημάτων
 STR_02BD                                                        :{BLACK}{STRING}
-STR_02BE_DEFAULT                                                :Προεπιλεγμένο
-STR_02BF_CUSTOM                                                 :Προσαρμοσμένο
+STR_02BE_DEFAULT                                                :Προεπιλεγμέν{G ος η ο}
+STR_02BF_CUSTOM                                                 :Προσαρμοσμέν{G ος η ο}
 STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Αποθήκευση προσαρμοσμένων ονομάτων
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Επιλογή ονομάτων σχεδίασης οχημάτων
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Αποθήκευση προσαρμοσμένων ονομάτων σχεδίασης οχημάτων

-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Επιλογές παιχνιδιού
 STR_02C5_DIFFICULTY_SETTINGS                                    :Ρυθμίσεις δυσκολίας
 STR_02C7_CONFIG_PATCHES                                         :Ρύθμιση διορθώσεων
@@ -607,21 +666,23 @@ STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Πιν
 STR_02D0_FULL_ANIMATION                                         :{SETX 12}Πλήρες animation
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Πλήρης λεπτομέρεια
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Διαφανή κτίρια
-############ range ends	here
+STR_TRANSPARENT_SIGNS                                           :{SETX 12}Διαφανές ταμπέλες σταθμών
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Πληροφορίες περιοχής εδάφους
 STR_02D6                                                        :
 STR_02D7_SCREENSHOT_CTRL_S                                      :Φωτογραφία εικόνας (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Γιγαντιαία Φωτογραφία Εικόνας (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Σχετικά με το 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Ανενεργό
 STR_02DA_ON                                                     :{BLACK}Ενεργό
 STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Εμφάνιση χρηματοδοτήσεων
 STR_02DD_SUBSIDIES                                              :Χρηματοδοτήσεις
 STR_02DE_MAP_OF_WORLD                                           :Χάρτης του κόσμου
+STR_SIGN_LIST                                                   :Λίστα ταμπελών
 STR_02DF_TOWN_DIRECTORY                                         :Κατάλογος πόλεων

 STR_02E0_CURRENCY_UNITS                                         :{BLACK}Νομισματικές μονάδες
@@ -662,7 +723,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Επιλ
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Επιλογή 'παιχνιδούπολης' στυλ τοπίου
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Χρηματοδοτήστε την κατασκευή νέας βιομηχανίας

-############ range for menu	starts
+############ range for menu starts
 STR_0313_FUND_NEW_INDUSTRY                                      :Χρηματοδότηση νέας βιομηχανίας
 ############ range ends here

@@ -683,60 +744,138 @@ STR_0335_6                                                      :{BLACK}6
 STR_0336_7                                                      :{BLACK}7

 ############ start of townname region
-############ end of	townname region
-
-
-
-
-
-
-
-
-
+############ end of townname region
+
+STR_CURR_GBP                                                    :Αγγλική Λίρα (£)
+STR_CURR_GRD                                                    :Δραχμή(δρχ.)


+STR_OPTIONS_LANG_CBO                                            :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_OPTIONS_FULLSCREEN                                          :{BLACK}Σε όλη την οθόνη
+STR_OPTIONS_FULLSCREEN_TIP                                      :{BLACK}Τσεκάρεται αυτό το κουτάκι ωστε να παίξετε το OpenTTD σε όλη την οθόνη
+
+STR_OPTIONS_RES                                                 :{BLACK}Ανάλυση οθόνης
+STR_OPTIONS_RES_CBO                                             :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_OPTIONS_RES_TIP                                             :{BLACK}Διαλέξτε την ανάλυση της οθόνης που θέλετε
+
+STR_OPTIONS_SCREENSHOT_FORMAT_CBO                               :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_AUTOSAVE_1_MONTH                                            :Κάθε μήνα
+STR_AUTOSAVE_FAILED                                             :{WHITE}Το αυτόματο σώσιμο απέτυχε
+
+STR_MONTH_JAN                                                   :Ιανουάριος
+STR_MONTH_FEB                                                   :Φεβρουάριος
+STR_MONTH_MAR                                                   :Μάρτιος
+STR_MONTH_APR                                                   :Απρίλιος
+STR_MONTH_MAY                                                   :Μάιος
+STR_MONTH_JUN                                                   :Ιούνιος
+STR_MONTH_JUL                                                   :Ιούλιος
+STR_MONTH_AUG                                                   :Άυγουστος
+STR_MONTH_SEP                                                   :Σεπτέμβριος
+STR_MONTH_OCT                                                   :Οκτόβριος
+STR_MONTH_NOV                                                   :Νοέμβριος
+STR_MONTH_DEC                                                   :Δεκέμβριος
+
+STR_HEADING_FOR_STATION                                         :{LTBLUE}Πάει προς {STATION}
+STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Πάει προς {STATION}, {VELOCITY}
+STR_NO_ORDERS                                                   :{LTBLUE}Δεν έχει οδηγίες
+STR_NO_ORDERS_VEL                                               :{LTBLUE}Δεν έχει οδηγίες, {VELOCITY}
+
+STR_PASSENGERS                                                  :Επιβάτες
+STR_BAGS                                                        :Τσάντες
+STR_TONS                                                        :Τόνοι
+STR_LITERS                                                      :Λίτρα
+STR_CRATES                                                      :Κουτιά
+STR_RES_OTHER                                                   :άλλα
+STR_NOTHING                                                     :
+
+STR_SMALL_RIGHT_ARROW                                           :{TINYFONT}{RIGHTARROW}


+STR_TRAIN_IS_LOST                                               :{WHITE}Το τραίνο {COMMA} Χάθηκε

 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
+STR_TRAIN_HAS_TOO_FEW_ORDERS                                    :{WHITE}Το τραίνο {COMMA} έχει τόσες λίγες οδηγίες
+STR_ROADVEHICLE_HAS_TOO_FEW_ORDERS                              :{WHITE}Το Οδικό όχημα {COMMA} έχει τόσες λίγες οδηγίες
+STR_SHIP_HAS_TOO_FEW_ORDERS                                     :{WHITE}Το πλοίο {COMMA} έχει τόσες λίγες οδηγίες
+STR_AIRCRAFT_HAS_TOO_FEW_ORDERS                                 :{WHITE}Το αεροσκάφος {COMMA} has too few orders in the schedule
 # end of order system





+STR_CONFIG_PATCHES_ORDER_REVIEW_OFF                             :όχι
+STR_CONFIG_PATCHES_ORDER_REVIEW_ON                              :από όλα τα οχήματα
+
+STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL                      :Αυθεντικό
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH             :Πολύ απαλός
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH                  :Απαλός
+STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH              :Πολύ ανώμαλος
+STR_CONFIG_PATCHES_TREE_PLACER_NONE                             :Κανένας
+STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL                         :Αυθεντικό
+STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED                         :Βελτιωμένος
+STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE                 :Δεξιόστροφα
+
+STR_CONFIG_PATCHES_LIVERIES_NONE                                :Κανένας
+STR_CONFIG_PATCHES_LIVERIES_ALL                                 :Όλες οι εταιρίες
+
+
+
+
+
+STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT                             :Αριστερά
+STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER                           :Κέντρο
+STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT                            :Δεξιά
+
+STR_CONFIG_PATCHES_AI                                           :{BLACK}Ανταγωνιστές
+
+STR_CONFIG_PATCHES_INT32                                        :{NUM}
+STR_CONFIG_PATCHES_CURRENCY                                     :{CURRENCY}
+
+
+STR_TEMPERATE_LANDSCAPE                                         :Συγκρατημένο τοπίο
+STR_SUB_ARCTIC_LANDSCAPE                                        :Πολικό τοπίο
+STR_SUB_TROPICAL_LANDSCAPE                                      :Υποτροπικό τοπίο
+STR_TOYLAND_LANDSCAPE                                           :Παιχνιδιάστικο τοπίο
+
+STR_CHEATS                                                      :{WHITE}Κλεψιές
+
+STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Καθ' οδόν {WAYPOINT}
+
+STR_GO_TO_WAYPOINT                                              :Πήγαινε δια μέσου {WAYPOINT}






+STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...δεν υπάρχει καμία πόλη στην πίστα
+
+STR_MANY_RANDOM_TOWNS                                           :{BLACK}Πολλές τυχαίες πόλεις
+STR_MANY_RANDOM_INDUSTRIES                                      :{BLACK}Πολλές τυχαίες βιομηχανίες



+STR_TREES_RANDOM_TYPE                                           :{BLACK}Δέντρα τυχαίου τύπου
+STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Βάλε δέντρα τυχαίου τύπου
+
+STR_CANT_BUILD_CANALS                                           :{WHITE}Δεν μπορεί να χτιστεί κανάλι εδώ
+STR_LANDINFO_CANAL                                              :Κανάλι


+STR_BUOY_IS_IN_USE                                              :{WHITE}...σημαδούρα σε χρήση
+
+STR_LANDINFO_COORDS                                             :{BLACK}Συντεταγμένες: {LTBLUE}{NUM}x{NUM} ({STRING})
+
+STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Δεν μπορεί να διαλειθεί μέρος του σταθμού...
+STR_CONVERT_RAIL_TIP                                            :{BLACK}Μετατρέψτε/Αλλάξτε τον τύπο της γραμμής


-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+STR_DRAG_DROP                                                   :{BLACK}Έλξη & πτώση
+STR_STATION_DRAG_DROP                                           :{BLACK}Φτιάξε ένα σταθμό χρησιμοποιόντας έλξη & πτώση



@@ -1127,11 +1266,11 @@ STR_4824_BUBBLE_GENERATOR                                       :Γεννήτρ
 STR_4825_TOFFEE_QUARRY                                          :Λατομείο Τόφυ
 STR_4826_SUGAR_MINE                                             :Ορυχείο Ζάχαρης

-############ range for requires	starts
+############ range for requires starts
 STR_4827_REQUIRES                                               :{BLACK}Απαιτεί: {YELLOW}{STRING}
 STR_4828_REQUIRES                                               :{BLACK}Απαιτεί: {YELLOW}{STRING}, {STRING}
 STR_4829_REQUIRES                                               :{BLACK}Απαιτεί: {YELLOW}{STRING}, {STRING}, {STRING}
-############ range for requires	ends
+############ range for requires ends

 STR_482A_PRODUCTION_LAST_MONTH                                  :{BLACK}Παραγωγή προηγούμενου μήνα:
 STR_482B_TRANSPORTED                                            :{YELLOW}{CARGO}{BLACK} ({COMMA}% μεταφέρθηκαν)
@@ -1201,12 +1340,12 @@ STR_5806_CAN_T_PURCHASE_THIS_LAND                               :{WHITE}Αδύν
 STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...είστε ήδη ιδιοκτήτης!


-############ 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


-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Βαθμός Δυσκολίας
@@ -1468,6 +1607,8 @@ STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99



+
+
 ##id 0x9000


@@ -1493,8 +1634,6 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.



-### looks odd, but trainslators requested this as depots aren't the same for all vehicles in all translations
-### we can use there whenever we want a depot mentioned in another string to avoid making 4 versions of all strings



@@ -1512,9 +1651,6 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.



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


@@ -1528,4 +1664,8 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.

 ########### String for new airports

+
+############ Tooltip measurment
+
+
 ########
--- a/lang/unfinished/japanese.txt
+++ b/lang/unfinished/japanese.txt
@@ -1,2 +0,0 @@
-##name Japanese
-##ownname æ¥æ
--- a/lang/unfinished/latvian.txt
+++ b/lang/unfinished/latvian.txt
@@ -1,6 +1,6 @@
 ##name Latvian
 ##ownname Latviešu valoda
-##isocode lv_LV.UTF-8
+##isocode lv_LV
 ##plural 3

 ##id 0x0000
@@ -306,7 +306,7 @@ STR_0151_MAP_OF_WORLD                                           :Pasaules karte
 STR_0152_TOWN_DIRECTORY                                         :Pilse'tu saraksts
 STR_0153_SUBSIDIES                                              :Subsi'dijas

-############ range for menu	starts
+############ range for menu starts
 STR_0154_OPERATING_PROFIT_GRAPH                                 :Pana'kumu grafiks
 STR_0155_INCOME_GRAPH                                           :Iena'kumu grafiks
 STR_0156_DELIVERED_CARGO_GRAPH                                  :Transporte'ta's kravas grafiks
@@ -315,7 +315,7 @@ STR_0158_COMPANY_VALUE_GRAPH                                    :Kompa'nijas ve'
 STR_0159_CARGO_PAYMENT_RATES                                    :Kravas apmaksas cenas
 STR_015A_COMPANY_LEAGUE_TABLE                                   :Kompa'nijas li'gu tabula
 STR_PERFORMANCE_DETAIL_MENU                                     :Detalize'ti uzn'e'me'jdarbi'bas rezulta'ti
-############ range for menu	ends
+############ range for menu ends

 STR_015B_OPENTTD                                                :{WHITE}Par OpenTTD
 STR_015C_SAVE_GAME                                              :Saglaba't spe'li
@@ -428,7 +428,7 @@ STR_01A9_NONE                                                   :Neviens/neviena
 STR_01AA_NAME                                                   :{BLACK}Va'rds
 STR_01AB                                                        :{BLACK}{TINYFONT}{STRING}

-############ range for days	starts
+############ range for days starts
 STR_01AC_1ST                                                    :Pirmais
 STR_01AD_2ND                                                    :Otrais
 STR_01AE_3RD                                                    :Tres'ais
@@ -460,7 +460,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}

@@ -699,7 +699,7 @@ STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Saglaba'
 STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Transporta li'dzekl'u dizaina nosaukumu izve'le
 STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Saglaba't specia'los transporta li'dzekl'a dizaina nosaukumus

-############ range for menu	starts
+############ range for menu starts
 STR_02C3_GAME_OPTIONS                                           :Spe'les rez'i'mi
 STR_02C5_DIFFICULTY_SETTINGS                                    :Gru'ti'bas paka'pes
 STR_02C7_CONFIG_PATCHES                                         :Konfigure't labojumus (pac'us)
@@ -713,16 +713,16 @@ STR_02D0_FULL_ANIMATION                                         :{SETX 12}Pilna
 STR_02D2_FULL_DETAIL                                            :{SETX 12}Pilnas detal'as
 STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Caurspi'di'gas e'kas
 STR_TRANSPARENT_SIGNS                                           :{SETX 12}Caurspidi'gas staciju zi'mes
-############ range ends	here
+############ range ends here

-############ range for menu	starts
+############ range for menu starts
 STR_02D5_LAND_BLOCK_INFO                                        :Zemes apgabala informa'cija
 STR_02D6                                                        :
 STR_CONSOLE_SETTING                                             :Pa'rsle'gt konsoli
 STR_02D7_SCREENSHOT_CTRL_S                                      :Ekra'na kopija (Ctrl-S)
 STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Liela ekra'na kopija (Ctrl-G)
 STR_02D9_ABOUT_OPENTTD                                          :Par 'OpenTTD'
-############ range ends	here
+############ range ends here

 STR_02DB_OFF                                                    :{BLACK}Nav
 STR_02DA_ON                                                     :{BLACK}Ir
@@ -777,7 +777,7 @@ STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Izve'le'
 STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Izve'le'ties ' rotal'u ' zemes stilu
 STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Finanse't jaunas industrijas bu'vnieci'bu

-############ range for menu	starts
+############ range for menu starts
 STR_INDUSTRY_DIR                                                :Industriju saraksts
 STR_0313_FUND_NEW_INDUSTRY                                      :Finanse't jaunu industriju
 ############ range ends here
@@ -820,7 +820,7 @@ STR_TOWNNAME_ROMANIAN                                           :Ruma'nijas
 STR_TOWNNAME_CZECH                                              :C'ehijas
 STR_TOWNNAME_SWISS                                              :S'veices
 STR_TOWNNAME_DANISH                                             :Da'n'u
-############ end of	townname region
+############ end of townname region

 STR_CURR_GBP                                                    :Ma'rcin'as (£)
 STR_CURR_USD                                                    :Dola'ri ($)
@@ -1190,8 +1190,8 @@ STR_480B_FARM                                                   :Ferma
 STR_4812_BANK                                                   :Banka
 STR_4819_FACTORY                                                :Rûpnîca

-############ range for requires	starts
-############ range for requires	ends
+############ range for requires starts
+############ range for requires ends


 ##id 0x5000
@@ -1203,8 +1203,8 @@ STR_500E_SUSPENSION_STEEL                                       :Vanšu, Terauda
 STR_5803_COMPANY_HEADQUARTERS                                   :Firmas Ofiss


-############ 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_TRAIN_NAME                                               :Vilciens {COMMA}
@@ -1212,7 +1212,7 @@ STR_SV_TRAIN_NAME                                               :Vilciens {COMMA
 STR_SV_STNAME                                                   :{STRING}
 STR_SV_STNAME_FOREST                                            :{STRING} Mežs

-############ end of	savegame specific region!
+############ end of savegame specific region!

 ##id 0x6800
 STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Saglabât
--- a/lang/unfinished/serbian.txt
+++ b/lang/unfinished/serbian.txt
@@ -1,3 +1,3 @@
 ##name Serbian
 ##ownname Srpski
-##isocode sr_YU.UTF-8
+##isocode sr_YU
--- a/lang/unfinished/simplified_chinese.txt
+++ b/lang/unfinished/simplified_chinese.txt
--- a/lang/unfinished/slovenian.txt
+++ b/lang/unfinished/slovenian.txt
--- a/langs.vcproj
+++ b/langs.vcproj
@@ -133,6 +133,18 @@
 					Outputs="lang\english.lng"/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\lang\esperanto.txt">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating esperanto language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
+"
+					Outputs="lang\esperanto.lng"/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath=".\lang\estonian.txt">
 			<FileConfiguration
@@ -230,10 +242,25 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\lang\lithuanian.txt">
+			RelativePath="lang\japanese.txt"
+			>
 			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="TRUE">
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating japanese language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
+"
+					AdditionalDependencies=""
+					Outputs="lang\japanese.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="lang\lithuanian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
@@ -243,15 +270,27 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\lang\norwegian.txt">
+			RelativePath=".\lang\norwegian_bokmal.txt">
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating norwegian language file"
+					Description="Generating norwegian_bokmal language file"
 					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
 "
-					Outputs="lang\norwegian.lng"/>
+					Outputs="lang\norwegian_bokmal.lng"/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath=".\lang\norwegian_nynorsk.txt">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating norwegian_nynorsk language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
+"
+					Outputs="lang\norwegian_nynorsk.lng"/>
 			</FileConfiguration>
 		</File>
 		<File
@@ -327,7 +366,23 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\lang\spanish.txt">
+			RelativePath="lang\slovenian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating slovenian language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;
+"
+					AdditionalDependencies=""
+					Outputs="lang\slovenian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="lang\spanish.txt"
+			>
 			<FileConfiguration
 				Name="Debug|Win32">
 				<Tool
--- a/langs_vs80.vcproj
+++ b/langs_vs80.vcproj
@@ -157,6 +157,20 @@
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath=".\lang\esperanto.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating esperanto language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="lang\esperanto.lng"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath=".\lang\estonian.txt"
 			>
@@ -270,11 +284,24 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\lang\lithuanian.txt"
+			RelativePath="lang\japanese.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating japanese language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="lang\japanese.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="lang\lithuanian.txt"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
@@ -285,16 +312,30 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\lang\norwegian.txt"
+			RelativePath=".\lang\norwegian_bokmal.txt"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating norwegian language file"
+					Description="Generating norwegian_bokmal language file"
 					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
-					Outputs="lang\norwegian.lng"
+					Outputs="lang\norwegian_bokmal.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath=".\lang\norwegian_nynorsk.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating norwegian_nynorsk language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					Outputs="lang\norwegian_nynorsk.lng"
 				/>
 			</FileConfiguration>
 		</File>
@@ -383,7 +424,21 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath=".\lang\spanish.txt"
+			RelativePath="lang\slovenian.txt"
+			>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating slovenian language file"
+					CommandLine="strgen\debug\strgen.exe -s lang -d lang &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+					AdditionalDependencies=""
+					Outputs="lang\slovenian.lng"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="lang\spanish.txt"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
--- a/main_gui.c
+++ b/main_gui.c
@@ -2308,6 +2308,8 @@ static void MainWindowWndProc(Window *w, WindowEvent *e)
 					const NetworkClientInfo *cio = NetworkFindClientInfoFromIndex(_network_own_client_index);
 					bool teamchat = false;

+					if (cio == NULL) break;
+
 					/* Only players actually playing can speak to team. Eg spectators cannot */
 					if (_patches.prefer_teamchat && IsValidPlayer(cio->client_playas)) {
 						const NetworkClientInfo *ci;
@@ -2329,8 +2331,10 @@ static void MainWindowWndProc(Window *w, WindowEvent *e)

 			case WKC_CTRL | WKC_RETURN: case WKC_CTRL | 'T': // send text to all team mates
 				if (_networking) {
-					const NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(_network_own_client_index);
-					ShowNetworkChatQueryWindow(DESTTYPE_TEAM, ci->client_playas);
+					const NetworkClientInfo *cio = NetworkFindClientInfoFromIndex(_network_own_client_index);
+					if (cio == NULL) break;
+
+					ShowNetworkChatQueryWindow(DESTTYPE_TEAM, cio->client_playas);
 				}
 				break;
 #endif
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -67,7 +67,9 @@ SDL_CONFIG:=sdl-config
 LIBPNG_CONFIG :=libpng-config

 # set freetype-config to the default value
+ifndef FREETYPE_CONFIG
 FREETYPE_CONFIG:=freetype-config
+endif

 # set pkg-config to the default value
 FONTCONFIG_CONFIG:=pkg-config fontconfig
@@ -131,6 +133,11 @@ endif
 endif

 ifdef OSX
+# OSX always has freetype, even though it can fail to be detected with our previous test
+# fontconfig is also present by default, but the default one is too old for OpenTTD
+# if the user installed a newer one, he/she can modify Makefile.config to enable it
+WITH_FREETYPE:=1
+WITH_FONTCONFIG:=
 # we prefer to use cocoa drivers rather than SDL drivers
 # if you really want SDL drivers, you can always modify Makefile.config
 ifndef DEDICATED
--- a/misc.c
+++ b/misc.c
@@ -266,16 +266,18 @@ void InitializeLandscapeVariables(bool only_constants)

 int FindFirstBit(uint32 value)
 {
-	// This is much faster than the one that was before here.
-	//  Created by Darkvater.. blame him if it is wrong ;)
-	// Btw, the macro FINDFIRSTBIT is better to use when your value is
-	//  not more than 128.
+	// The macro FIND_FIRST_BIT is better to use when your value is
+	// not more than 128.
 	byte i = 0;
-	if (value & 0xffff0000) { value >>= 16; i += 16; }
-	if (value & 0x0000ff00) { value >>= 8;  i +=  8; }
-	if (value & 0x000000f0) { value >>= 4;  i +=  4; }
-	if (value & 0x0000000c) { value >>= 2;  i +=  2; }
-	if (value & 0x00000002) { i += 1; }
+
+	if (value == 0) return 0;
+
+	if ((value & 0x0000ffff) == 0) { value >>= 16; i += 16; }
+	if ((value & 0x000000ff) == 0) { value >>= 8;  i += 8;  }
+	if ((value & 0x0000000f) == 0) { value >>= 4;  i += 4;  }
+	if ((value & 0x00000003) == 0) { value >>= 2;  i += 2;  }
+	if ((value & 0x00000001) == 0) { i += 1; }
+
 	return i;
 }

--- a/misc_gui.c
+++ b/misc_gui.c
@@ -42,85 +42,25 @@ extern void SwitchMode(int new_mode);
 static bool _fios_path_changed;
 static bool _savegame_sort_dirty;

-typedef struct LandInfoData {
-	Town *town;
-	int32 costclear;
-	AcceptedCargo ac;
-	TileIndex tile;
-	TileDesc td;
-} LandInfoData;
+enum {
+	LAND_INFO_LINES          =   7,
+	LAND_INFO_LINE_BUFF_SIZE = 512,
+};
+
+static char _landinfo_data[LAND_INFO_LINES][LAND_INFO_LINE_BUFF_SIZE];

 static void LandInfoWndProc(Window *w, WindowEvent *e)
 {
 	if (e->event == WE_PAINT) {
-		const LandInfoData *lid;
-		StringID str;
-		int i;
-
 		DrawWindowWidgets(w);

-		lid = WP(w,void_d).data;
-
-		SetDParam(0, lid->td.dparam[0]);
-		DrawStringCentered(140, 16, lid->td.str, 13);
-
-		SetDParam(0, STR_01A6_N_A);
-		if (lid->td.owner != OWNER_NONE && lid->td.owner != OWNER_WATER)
-			GetNameOfOwner(lid->td.owner, lid->tile);
-		DrawStringCentered(140, 27, STR_01A7_OWNER, 0);
-
-		str = STR_01A4_COST_TO_CLEAR_N_A;
-		if (!CmdFailed(lid->costclear)) {
-			SetDParam(0, lid->costclear);
-			str = STR_01A5_COST_TO_CLEAR;
-		}
-		DrawStringCentered(140, 38, str, 0);
-
-		snprintf(_userstring, lengthof(_userstring), "0x%.4X", lid->tile);
-		SetDParam(0, TileX(lid->tile));
-		SetDParam(1, TileY(lid->tile));
-		SetDParam(2, STR_SPEC_USERSTRING);
-		DrawStringCentered(140, 49, STR_LANDINFO_COORDS, 0);
-
-		SetDParam(0, STR_01A9_NONE);
-		if (lid->town != NULL) {
-			SetDParam(0, STR_TOWN);
-			SetDParam(1, lid->town->index);
-		}
-		DrawStringCentered(140,60, STR_01A8_LOCAL_AUTHORITY, 0);
-
-		{
-			char buf[512];
-			char *p = GetString(buf, STR_01CE_CARGO_ACCEPTED, lastof(buf));
-			bool found = false;
-
-			for (i = 0; i < NUM_CARGO; ++i) {
-				if (lid->ac[i] > 0) {
-					// Add a comma between each item.
-					if (found) {
-						*p++ = ',';
-						*p++ = ' ';
-					}
-					found = true;
-
-					// If the accepted value is less than 8, show it in 1/8:ths
-					if (lid->ac[i] < 8) {
-						SetDParam(0, lid->ac[i]);
-						SetDParam(1, _cargoc.names_s[i]);
-						p = GetString(p, STR_01D1_8, lastof(buf));
-					} else {
-						p = GetString(p, _cargoc.names_s[i], lastof(buf));
-					}
-				}
-			}
-
-			if (found) DrawStringMultiCenter(140, 76, BindCString(buf), 276);
-		}
-
-		if (lid->td.build_date != 0) {
-			SetDParam(0,lid->td.build_date);
-			DrawStringCentered(140,71, STR_BUILD_DATE, 0);
-		}
+		DoDrawStringCentered(140, 16, _landinfo_data[0], 13);
+		DoDrawStringCentered(140, 27, _landinfo_data[1], 0);
+		DoDrawStringCentered(140, 38, _landinfo_data[2], 0);
+		DoDrawStringCentered(140, 49, _landinfo_data[3], 0);
+		DoDrawStringCentered(140, 60, _landinfo_data[4], 0);
+		if (_landinfo_data[5][0] != '\0') DrawStringMultiCenter(140, 76, BindCString(_landinfo_data[5]), 276);
+		if (_landinfo_data[6][0] != '\0') DoDrawStringCentered(140, 71, _landinfo_data[6], 0);
 	}
 }

@@ -142,31 +82,94 @@ static const WindowDesc _land_info_desc = {
 static void Place_LandInfo(TileIndex tile)
 {
 	Player *p;
-	static LandInfoData lid;
 	Window *w;
+	Town *t;
 	int64 old_money;
+	int64 costclear;
+	AcceptedCargo ac;
+	TileDesc td;
+	StringID str;

 	DeleteWindowById(WC_LAND_INFO, 0);

 	w = AllocateWindowDesc(&_land_info_desc);
-	WP(w,void_d).data = &lid;
-
-	lid.tile = tile;
-	lid.town = ClosestTownFromTile(tile, _patches.dist_local_authority);
+	WP(w, void_d).data = &_landinfo_data;

 	p = GetPlayer(IsValidPlayer(_local_player) ? _local_player : 0);
+	t = ClosestTownFromTile(tile, _patches.dist_local_authority);

 	old_money = p->money64;
 	p->money64 = p->player_money = 0x7fffffff;
-	lid.costclear = DoCommand(tile, 0, 0, 0, CMD_LANDSCAPE_CLEAR);
+	costclear = DoCommand(tile, 0, 0, 0, CMD_LANDSCAPE_CLEAR);
 	p->money64 = old_money;
 	UpdatePlayerMoney32(p);

-	// Becuase build_date is not set yet in every TileDesc, we make sure it is empty
-	lid.td.build_date = 0;
+	/* Because build_date is not set yet in every TileDesc, we make sure it is empty */
+	td.build_date = 0;
+	GetAcceptedCargo(tile, ac);
+	GetTileDesc(tile, &td);

-	GetAcceptedCargo(tile, lid.ac);
-	GetTileDesc(tile, &lid.td);
+	SetDParam(0, td.dparam[0]);
+	GetString(_landinfo_data[0], td.str, lastof(_landinfo_data[0]));
+
+	SetDParam(0, STR_01A6_N_A);
+	if (td.owner != OWNER_NONE && td.owner != OWNER_WATER) GetNameOfOwner(td.owner, tile);
+	GetString(_landinfo_data[1], STR_01A7_OWNER, lastof(_landinfo_data[1]));
+
+	str = STR_01A4_COST_TO_CLEAR_N_A;
+	if (!CmdFailed(costclear)) {
+		SetDParam(0, costclear);
+		str = STR_01A5_COST_TO_CLEAR;
+	}
+	GetString(_landinfo_data[2], str, lastof(_landinfo_data[2]));
+
+	snprintf(_userstring, lengthof(_userstring), "0x%.4X", tile);
+	SetDParam(0, TileX(tile));
+	SetDParam(1, TileY(tile));
+	SetDParam(2, STR_SPEC_USERSTRING);
+	GetString(_landinfo_data[3], STR_LANDINFO_COORDS, lastof(_landinfo_data[3]));
+
+	SetDParam(0, STR_01A9_NONE);
+	if (t != NULL && IsValidTown(t)) {
+		SetDParam(0, STR_TOWN);
+		SetDParam(1, t->index);
+	}
+	GetString(_landinfo_data[4], STR_01A8_LOCAL_AUTHORITY, lastof(_landinfo_data[4]));
+
+	{
+		int i;
+		char *p = GetString(_landinfo_data[5], STR_01CE_CARGO_ACCEPTED, lastof(_landinfo_data[5]));
+		bool found = false;
+
+		for (i = 0; i < NUM_CARGO; ++i) {
+			if (ac[i] > 0) {
+				/* Add a comma between each item. */
+				if (found) {
+					*p++ = ',';
+					*p++ = ' ';
+				}
+				found = true;
+
+				/* If the accepted value is less than 8, show it in 1/8:ths */
+				if (ac[i] < 8) {
+					SetDParam(0, ac[i]);
+					SetDParam(1, _cargoc.names_s[i]);
+					p = GetString(p, STR_01D1_8, lastof(_landinfo_data[5]));
+				} else {
+					p = GetString(p, _cargoc.names_s[i], lastof(_landinfo_data[5]));
+				}
+			}
+		}
+
+		if (!found) _landinfo_data[5][0] = '\0';
+	}
+
+	if (td.build_date != 0) {
+		SetDParam(0, td.build_date);
+		GetString(_landinfo_data[6], STR_BUILD_DATE, lastof(_landinfo_data[6]));
+	} else {
+		_landinfo_data[6][0] = '\0';
+	}

 #if defined(_DEBUG)
 #	define LANDINFOD_LEVEL 0
@@ -210,7 +213,7 @@ static const char *credits[] = {
 	"  Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)",
 	"  Attila Bán (MiHaMiX) - WebTranslator, Nightlies, Wiki and bugtracker host",
 	"  Peter Nelson (peter1138) - Spiritual descendant from newgrf gods",
-	"  Remko Bijker (Rubidium) - Belugas code scrutinizer",
+	"  Remko Bijker (Rubidium) - THE desync hunter",
 	"  Christoph Mallon (Tron) - Programmer, code correctness police",
 	"  Patric Stout (TrueLight) - Coder, network guru, SVN- and website host",
 	"",
@@ -942,12 +945,13 @@ void UpdateTextBufferSize(Textbuf *tb)
 	WChar c = Utf8Consume(&buf);

 	tb->width = 0;
+	tb->length = 0;

 	for (; c != '\0' && tb->length < (tb->maxlength - 1); c = Utf8Consume(&buf)) {
 		tb->width += GetCharacterWidth(FS_NORMAL, c);
+		tb->length += Utf8CharLen(c);
 	}

-	tb->length = buf - tb->buf - 1;
 	tb->caretpos = tb->length;
 	tb->caretxoffs = tb->width;
 }
@@ -1647,7 +1651,8 @@ static int32 ClickChangePlayerCheat(int32 p1, int32 p2)
 {
 	while (IsValidPlayer((PlayerID)p1)) {
 		if (_players[p1].is_active) {
-			_local_player = (PlayerID)p1;
+			SetLocalPlayer((PlayerID)p1);
+
 			MarkWholeScreenDirty();
 			return _local_player;
 		}
@@ -1817,7 +1822,7 @@ static void CheatsWndProc(Window *w, WindowEvent *e)

 				/* Increase or decrease the value and clamp it to extremes */
 				value += (x >= 30) ? step : -step;
-				clamp(value, ce->min, ce->max);
+				value = clamp(value, ce->min, ce->max);

 				// take whatever the function returns
 				value = ce->proc(value, (x >= 30) ? 1 : -1);
--- a/music_gui.c
+++ b/music_gui.c
@@ -288,7 +288,7 @@ static void MusicTrackSelectionWndProc(Window *w, WindowEvent *e)

 #if 0
 		case 12: // save
-			ShowInfo("MusicTrackSelectionWndProc:save not implemented\n");
+			ShowInfo("MusicTrackSelectionWndProc:save not implemented");
 			break;
 #endif

--- a/network.c
+++ b/network.c
@@ -7,7 +7,7 @@
 	extern const char _openttd_revision[];
 #elif defined(WITH_REV_HACK)
 	#define WITH_REV
-	const char _openttd_revision[] = WITH_REV_HACK;
+	const char _openttd_revision[] = "0.5.0-RC5";
 #else
 	const char _openttd_revision[] = NOREV_STRING;
 #endif
@@ -82,7 +82,7 @@ NetworkClientState *NetworkFindClientStateFromIndex(uint16 client_index)
 {
 	NetworkClientState *cs;

-	for (cs = _clients; cs != &_clients[MAX_CLIENT_INFO]; cs++) {
+	for (cs = _clients; cs != endof(_clients); cs++) {
 		if (cs->index == client_index) return cs;
 	}

@@ -235,9 +235,10 @@ static void NetworkClientError(NetworkRecvStatus res, NetworkClientState* cs)
 	}

 	switch (res) {
-		case NETWORK_RECV_STATUS_DESYNC:   errorno = NETWORK_ERROR_DESYNC; break;
-		case NETWORK_RECV_STATUS_SAVEGAME: errorno = NETWORK_ERROR_SAVEGAME_FAILED; break;
-		default:                           errorno = NETWORK_ERROR_GENERAL; break;
+		case NETWORK_RECV_STATUS_DESYNC:          errorno = NETWORK_ERROR_DESYNC; break;
+		case NETWORK_RECV_STATUS_SAVEGAME:        errorno = NETWORK_ERROR_SAVEGAME_FAILED; break;
+		case NETWORK_RECV_STATUS_NEWGRF_MISMATCH: errorno = NETWORK_ERROR_NEWGRF_MISMATCH; break;
+		default:                                  errorno = NETWORK_ERROR_GENERAL; break;
 	}
 	// This means we fucked up and the server closed the connection
 	if (res != NETWORK_RECV_STATUS_SERVER_ERROR && res != NETWORK_RECV_STATUS_SERVER_FULL &&
@@ -267,6 +268,7 @@ char* GetNetworkErrorMsg(char* buf, NetworkErrorCode err, const char* last)
 		STR_NETWORK_ERR_CLIENT_SAVEGAME,
 		STR_NETWORK_ERR_CLIENT_CONNECTION_LOST,
 		STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR,
+		STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH,
 		STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED,
 		STR_NETWORK_ERR_CLIENT_NOT_EXPECTED,
 		STR_NETWORK_ERR_CLIENT_WRONG_REVISION,
@@ -513,24 +515,25 @@ unsigned long NetworkResolveHost(const char *hostname)
 	return ip;
 }

-// Converts a string to ip/port/player
-//  Format: IP#player:port
-//
-// connection_string will be re-terminated to seperate out the hostname, and player and port will
-// be set to the player and port strings given by the user, inside the memory area originally
-// occupied by connection_string.
+/** Converts a string to ip/port/player
+ *  Format: IP#player:port
+ *
+ * connection_string will be re-terminated to seperate out the hostname, and player and port will
+ * be set to the player and port strings given by the user, inside the memory area originally
+ * occupied by connection_string. */
 void ParseConnectionString(const char **player, const char **port, char *connection_string)
 {
 	char *p;
 	for (p = connection_string; *p != '\0'; p++) {
-		if (*p == '#') {
-			*p = '\0';
-			*player = ++p;
-			while (IsValidChar(*p, CS_NUMERAL)) p++;
-			if (*p == '\0') break;
-		} else if (*p == ':') {
-			*port = p + 1;
-			*p = '\0';
+		switch (*p) {
+			case '#':
+				*player = p + 1;
+				*p = '\0';
+				break;
+			case ':':
+				*port = p + 1;
+				*p = '\0';
+				break;
 		}
 	}
 }
@@ -1264,6 +1267,7 @@ void NetworkUDPGameLoop(void)
 	} else if (_udp_client_socket != INVALID_SOCKET) {
 		NetworkUDPReceive(_udp_client_socket);
 		if (_network_udp_broadcast > 0) _network_udp_broadcast--;
+		NetworkGameListRequery();
 	}
 }

--- a/network.h
+++ b/network.h
@@ -130,6 +130,7 @@ typedef struct NetworkGameList {
 	uint16 port;
 	bool online;                                    // False if the server did not respond (default status)
 	bool manually;                                  // True if the server was added manually
+	uint8 retries;
 	struct NetworkGameList *next;
 } NetworkGameList;

--- a/network_client.c
+++ b/network_client.c
@@ -77,6 +77,18 @@ DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_JOIN)
 	NetworkSend_Packet(p, MY_CLIENT);
 }

+DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)
+{
+	//
+	// Packet: CLIENT_NEWGRFS_CHECKED
+	// Function: Tell the server that we have the required GRFs
+	// Data:
+	//
+
+	Packet *p = NetworkSend_Init(PACKET_CLIENT_NEWGRFS_CHECKED);
+	NetworkSend_Packet(p, MY_CLIENT);
+}
+
 DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_PASSWORD)(NetworkPasswordType type, const char *password)
 {
 	//
@@ -407,6 +419,39 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR)
 	return NETWORK_RECV_STATUS_SERVER_ERROR;
 }

+DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHECK_NEWGRFS)
+{
+	uint grf_count = NetworkRecv_uint8(MY_CLIENT, p);
+	NetworkRecvStatus ret = NETWORK_RECV_STATUS_OKAY;
+
+	/* Check all GRFs */
+	for (; grf_count > 0; grf_count--) {
+		GRFConfig c;
+		const GRFConfig *f;
+
+		NetworkRecv_GRFIdentifier(MY_CLIENT, p, &c);
+
+		/* Check whether we know this GRF */
+		f = FindGRFConfig(c.grfid, c.md5sum);
+		if (f == NULL) {
+			/* We do not know this GRF, bail out of initialization */
+			char buf[sizeof(c.md5sum) * 2 + 1];
+			md5sumToString(buf, lastof(buf), c.md5sum);
+			DEBUG(grf, 0)("NewGRF %08X not found; checksum %s", BSWAP32(c.grfid), buf);
+			ret = NETWORK_RECV_STATUS_NEWGRF_MISMATCH;
+		}
+	}
+
+	if (ret == NETWORK_RECV_STATUS_OKAY) {
+		/* Start receiving the map */
+		SEND_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)();
+	} else {
+		/* NewGRF mismatch, bail out */
+		_switch_mode_errorstr = STR_NETWORK_ERR_NEWGRF_MISMATCH;
+	}
+	return ret;
+}
+
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_NEED_PASSWORD)
 {
 	NetworkPasswordType type = NetworkRecv_uint8(MY_CLIENT, p);
@@ -467,9 +512,18 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)

 		_frame_counter = _frame_counter_server = _frame_counter_max = NetworkRecv_uint32(MY_CLIENT, p);

-		_network_join_status = NETWORK_JOIN_STATUS_DOWNLOADING;
 		_network_join_kbytes = 0;
 		_network_join_kbytes_total = NetworkRecv_uint32(MY_CLIENT, p) / 1024;
+
+		/* If the network connection has been closed due to loss of connection
+		 * or when _network_join_kbytes_total is 0, the join status window will
+		 * do a division by zero. When the connection is lost, we just return
+		 * that. If kbytes_total is 0, the packet must be malformed as a
+		 * savegame less than 1 kilobyte is practically impossible. */
+		if (MY_CLIENT->has_quit) return NETWORK_RECV_STATUS_CONN_LOST;
+		if (_network_join_kbytes_total == 0) return NETWORK_RECV_STATUS_MALFORMED_PACKET;
+
+		_network_join_status = NETWORK_JOIN_STATUS_DOWNLOADING;
 		InvalidateWindow(WC_NETWORK_STATUS_WINDOW, 0);

 		// The first packet does not contain any more data
@@ -509,7 +563,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
 		if (_network_playas == PLAYER_NEW_COMPANY || !IsValidPlayer(_network_playas) ||
 				!GetPlayer(_network_playas)->is_active) {

-			_local_player = PLAYER_SPECTATOR;
+			SetLocalPlayer(PLAYER_SPECTATOR);

 			if (_network_playas == PLAYER_SPECTATOR) {
 				// The client wants to be a spectator..
@@ -521,10 +575,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
 			}
 		} else {
 			// take control over an existing company
-			_local_player = _network_playas;
-			_patches.autorenew = GetPlayer(_local_player)->engine_renew;
-			_patches.autorenew_months = GetPlayer(_local_player)->engine_renew_months;
-			_patches.autorenew_money = GetPlayer(_local_player)->engine_renew_money;
+			SetLocalPlayer(_network_playas);
 			DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 		}
 	}
@@ -782,6 +833,8 @@ static NetworkClientPacket* const _network_client_packet[] = {
 	RECEIVE_COMMAND(PACKET_SERVER_NEWGAME),
 	RECEIVE_COMMAND(PACKET_SERVER_RCON),
 	NULL, /*PACKET_CLIENT_RCON,*/
+	RECEIVE_COMMAND(PACKET_SERVER_CHECK_NEWGRFS),
+	NULL, /*PACKET_CLIENT_NEWGRFS_CHECKED,*/
 };

 // If this fails, check the array above with network_data.h
--- a/network_data.c
+++ b/network_data.c
@@ -293,6 +293,36 @@ void NetworkRecv_string(NetworkClientState *cs, Packet *p, char *buffer, size_t
 // (the line: 'p->size = (uint16)p->buffer[0];' and below)
 assert_compile(sizeof(PacketSize) == 2);

+
+/**
+ * Serializes the GRFIdentifier (GRF ID and MD5 checksum) to the packet
+ * @param p the packet to write the data to
+ * @param c the configuration to write the GRF ID and MD5 checksum from
+ */
+void NetworkSend_GRFIdentifier(Packet *p, const GRFConfig *c)
+{
+	uint j;
+	NetworkSend_uint32(p, c->grfid);
+	for (j = 0; j < sizeof(c->md5sum); j++) {
+		NetworkSend_uint8 (p, c->md5sum[j]);
+	}
+}
+
+/**
+ * Deserializes the GRFIdentifier (GRF ID and MD5 checksum) from the packet
+ * @param p the packet to read the data from
+ * @param c the configuration to write the GRF ID and MD5 checksum to
+ */
+void NetworkRecv_GRFIdentifier(NetworkClientState *cs, Packet *p, GRFConfig *c)
+{
+	uint j;
+	c->grfid = NetworkRecv_uint32(cs, p);
+	for (j = 0; j < sizeof(c->md5sum); j++) {
+		c->md5sum[j] = NetworkRecv_uint8(cs, p);
+	}
+}
+
+
 Packet *NetworkRecv_Packet(NetworkClientState *cs, NetworkRecvStatus *status)
 {
 	ssize_t res;
--- a/network_data.h
+++ b/network_data.h
@@ -10,6 +10,8 @@
 // Is the network enabled?
 #ifdef ENABLE_NETWORK

+#include "newgrf_config.h"
+
 #define SEND_MTU 1460
 #define MAX_TEXT_MSG_LEN 1024 /* long long long long sentences :-) */

@@ -64,6 +66,7 @@ typedef enum {
 typedef enum {
 	NETWORK_RECV_STATUS_OKAY,
 	NETWORK_RECV_STATUS_DESYNC,
+	NETWORK_RECV_STATUS_NEWGRF_MISMATCH,  ///< We did not have the required NewGRFs
 	NETWORK_RECV_STATUS_SAVEGAME,
 	NETWORK_RECV_STATUS_CONN_LOST,
 	NETWORK_RECV_STATUS_MALFORMED_PACKET,
@@ -81,6 +84,7 @@ typedef enum {
 	NETWORK_ERROR_SAVEGAME_FAILED,
 	NETWORK_ERROR_CONNECTION_LOST,
 	NETWORK_ERROR_ILLEGAL_PACKET,
+	NETWORK_ERROR_NEWGRF_MISMATCH,

 	// Signals from servers
 	NETWORK_ERROR_NOT_AUTHORIZED,
@@ -166,6 +170,8 @@ typedef enum {
 	PACKET_SERVER_NEWGAME,
 	PACKET_SERVER_RCON,
 	PACKET_CLIENT_RCON,
+	PACKET_SERVER_CHECK_NEWGRFS,
+	PACKET_CLIENT_NEWGRFS_CHECKED,
 	PACKET_END // Should ALWAYS be on the end of this list!! (period)
 } PacketType;

@@ -217,6 +223,9 @@ uint64 NetworkRecv_uint64(NetworkClientState *cs, Packet *packet);
 void NetworkRecv_string(NetworkClientState *cs, Packet *packet, char* buffer, size_t size);
 Packet *NetworkRecv_Packet(NetworkClientState *cs, NetworkRecvStatus *status);

+void NetworkSend_GRFIdentifier(Packet *p, const GRFConfig *c);
+void NetworkRecv_GRFIdentifier(NetworkClientState *cs, Packet *p, GRFConfig *c);
+
 bool NetworkSend_Packets(NetworkClientState *cs);
 void NetworkExecuteCommand(CommandPacket *cp);
 void NetworkAddCommandQueue(NetworkClientState *cs, CommandPacket *cp);
--- a/network_gamelist.c
+++ b/network_gamelist.c
@@ -6,6 +6,10 @@
 #include "debug.h"
 #include "network_data.h"
 #include "newgrf_config.h"
+#include "network_udp.h"
+
+/** Should we stop/contiue requerying of offline servers? */
+static bool _stop_requerying = false;

 // This file handles the GameList
 // Also, it handles the request to a server for data about the server
@@ -39,6 +43,7 @@ NetworkGameList *NetworkGameListAddItem(uint32 ip, uint16 port)
 	DEBUG(net, 4) ("[NET][GameList] Added server to list");

 	UpdateNetworkGameWindow(false);
+	_stop_requerying = false;

 	return item;
 }
@@ -71,4 +76,38 @@ void NetworkGameListRemoveItem(NetworkGameList *remove)
 	}
 }

+enum {
+	MAX_GAME_LIST_REQUERY_COUNT =  5,
+	REQUERY_EVERY_X_GAMELOOPS   = 60,
+};
+
+/** Requeries the (game) servers we have not gotten a reply from */
+void NetworkGameListRequery(void)
+{
+	static uint8 requery_cnt = 0;
+	struct in_addr ip;
+	NetworkGameList *item;
+
+	if (_stop_requerying || ++requery_cnt < REQUERY_EVERY_X_GAMELOOPS) return;
+
+	requery_cnt = 0;
+	_stop_requerying = true;
+
+	for (item = _network_game_list; item != NULL; item = item->next) {
+		uint8 retries;
+
+		if (item->online || item->retries >= MAX_GAME_LIST_REQUERY_COUNT) continue;
+
+		ip.s_addr = item->ip;
+
+		/* item gets mostly zeroed by NetworkUDPQueryServer */
+		retries = item->retries;
+		NetworkUDPQueryServer(inet_ntoa(ip), item->port);
+		item->retries = retries + 1;
+
+		_stop_requerying = false;
+	}
+
+}
+
 #endif /* ENABLE_NETWORK */
--- a/network_gamelist.h
+++ b/network_gamelist.h
@@ -7,5 +7,6 @@ void NetworkGameListClear(void);
 NetworkGameList *NetworkGameListAddItem(uint32 ip, uint16 port);
 void NetworkGameListRemoveItem(NetworkGameList *remove);
 void NetworkGameListAddQueriedItem(const NetworkGameInfo *info, bool server_online);
+void NetworkGameListRequery(void);

 #endif /* NETWORK_GAMELIST_H */
--- a/network_gui.c
+++ b/network_gui.c
@@ -141,10 +141,17 @@ static int CDECL NGameAllowedSorter(const void *a, const void *b)
 {
 	const NetworkGameList *cmp1 = *(const NetworkGameList**)a;
 	const NetworkGameList *cmp2 = *(const NetworkGameList**)b;
-	/* Reverse default as we are interested in compatible clients first */
-	int r = cmp2->info.compatible - cmp1->info.compatible;

+	/* The servers we do not know anything about (the ones that did not reply) should be at the bottom) */
+	int r = (cmp1->info.server_revision[0] == '\0') - (cmp2->info.server_revision[0] == '\0');
+
+	/* Reverse default as we are interested in version-compatible clients first */
+	if (r == 0) r = cmp2->info.version_compatible - cmp1->info.version_compatible;
+	/* The version-compatible ones are then sorted with NewGRF compatible first, incompatible last */
+	if (r == 0) r = cmp2->info.compatible - cmp1->info.compatible;
+	/* Passworded servers should be below unpassworded servers */
 	if (r == 0) r = cmp1->info.use_password - cmp2->info.use_password;
+	/* Finally sort on the name of the server */
 	if (r == 0) r = strcasecmp(cmp1->info.server_name, cmp2->info.server_name);

 	return _internal_sort_order ? -r : r;
@@ -1409,7 +1416,7 @@ static void NetworkJoinStatusWindowWndProc(Window *w, WindowEvent *e)
 				DrawStringCentered(125, 46, STR_NETWORK_CONNECTING_DOWNLOADING, 14);
 				/* Fallthrough */
 			default: /* Waiting is 15%, so the resting receivement of map is maximum 70% */
-				progress = 15 + _network_join_kbytes * (100 - 15) / _network_join_kbytes_total;
+				progress = 15 + _network_join_kbytes * (100 - 15) / (_network_join_kbytes_total+1);
 		}

 		/* Draw nice progress bar :) */
--- a/network_server.c
+++ b/network_server.c
@@ -180,6 +180,32 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_ERROR)(NetworkClientState *cs, Netwo
 	NetworkCloseClient(cs);
 }

+DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_CHECK_NEWGRFS)(NetworkClientState *cs)
+{
+	//
+	// Packet: PACKET_SERVER_CHECK_NEWGRFS
+	// Function: Sends info about the used GRFs to the client
+	// Data:
+	//      uint8:  Amount of GRFs
+	//    And then for each GRF:
+	//      uint32: GRF ID
+	// 16 * uint8:  MD5 checksum of the GRF
+	//
+
+	Packet *p = NetworkSend_Init(PACKET_SERVER_CHECK_NEWGRFS);
+	const GRFConfig *c;
+	uint grf_count = 0;
+
+	for (c = _grfconfig; c != NULL; c = c->next) grf_count++;
+
+	NetworkSend_uint8 (p, grf_count);
+	for (c = _grfconfig; c != NULL; c = c->next) {
+		NetworkSend_GRFIdentifier(p, c);
+	}
+
+	NetworkSend_Packet(p, cs);
+}
+
 DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_NEED_PASSWORD)(NetworkClientState *cs, NetworkPasswordType type)
 {
 	//
@@ -287,6 +313,8 @@ DEF_SERVER_SEND_COMMAND(PACKET_SERVER_MAP)
 		file_pointer = fopen(filename, "rb");
 		fseek(file_pointer, 0, SEEK_END);

+		if (ftell(file_pointer) == 0) error("network savedump failed - zero sized savegame?");
+
 		// Now send the _frame_counter and how many packets are coming
 		p = NetworkSend_Init(PACKET_SERVER_MAP);
 		NetworkSend_uint8(p, MAP_PACKET_START);
@@ -565,6 +593,22 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMPANY_INFO)
 	SEND_COMMAND(PACKET_SERVER_COMPANY_INFO)(cs);
 }

+DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)
+{
+	NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
+
+	/* We now want a password from the client else we do not allow him in! */
+	if (_network_game_info.use_password) {
+		SEND_COMMAND(PACKET_SERVER_NEED_PASSWORD)(cs, NETWORK_GAME_PASSWORD);
+	} else {
+		if (IsValidPlayer(ci->client_playas) && _network_player_info[ci->client_playas].password[0] != '\0') {
+			SEND_COMMAND(PACKET_SERVER_NEED_PASSWORD)(cs, NETWORK_COMPANY_PASSWORD);
+		} else {
+			SEND_COMMAND(PACKET_SERVER_WELCOME)(cs);
+		}
+	}
+}
+
 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
 {
 	char name[NETWORK_CLIENT_NAME_LENGTH];
@@ -631,20 +675,14 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
 	ci->client_playas = playas;
 	ci->client_lang = client_lang;

-	// We now want a password from the client
-	//  else we do not allow him in!
-	if (_network_game_info.use_password) {
-		SEND_COMMAND(PACKET_SERVER_NEED_PASSWORD)(cs, NETWORK_GAME_PASSWORD);
-	} else {
-		if (IsValidPlayer(ci->client_playas) && _network_player_info[ci->client_playas].password[0] != '\0') {
-			SEND_COMMAND(PACKET_SERVER_NEED_PASSWORD)(cs, NETWORK_COMPANY_PASSWORD);
-		} else {
-			SEND_COMMAND(PACKET_SERVER_WELCOME)(cs);
-		}
-	}
-
 	/* Make sure companies to which people try to join are not autocleaned */
 	if (IsValidPlayer(playas)) _network_player_info[playas].months_empty = 0;
+
+	if (_grfconfig == NULL) {
+		RECEIVE_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)(cs, NULL);
+	} else {
+		SEND_COMMAND(PACKET_SERVER_CHECK_NEWGRFS)(cs);
+	}
 }

 DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_PASSWORD)
@@ -862,7 +900,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_COMMAND)
 	// Queue the command for the clients (are send at the end of the frame
 	//   if they can handle it ;))
 	FOR_ALL_CLIENTS(new_cs) {
-		if (new_cs->status > STATUS_AUTH) {
+		if (new_cs->status >= STATUS_MAP) {
 			// Callbacks are only send back to the client who sent them in the
 			//  first place. This filters that out.
 			cp->callback = (new_cs != cs) ? 0 : callback;
@@ -1179,6 +1217,8 @@ static NetworkServerPacket* const _network_server_packet[] = {
 	NULL, /*PACKET_SERVER_NEWGAME,*/
 	NULL, /*PACKET_SERVER_RCON,*/
 	RECEIVE_COMMAND(PACKET_CLIENT_RCON),
+	NULL, /*PACKET_CLIENT_CHECK_NEWGRFS,*/
+	RECEIVE_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED),
 };

 // If this fails, check the array above with network_data.h
--- a/network_udp.c
+++ b/network_udp.c
@@ -45,34 +45,6 @@ static void NetworkSendUDP_Packet(SOCKET udp, Packet* p, struct sockaddr_in* rec

 static NetworkClientState _udp_cs;

-/**
- * Serializes the GRFIdentifier (GRF ID and MD5 checksum) to the packet
- * @param p the packet to write the data to
- * @param c the configuration to write the GRF ID and MD5 checksum from
- */
-static void NetworkSend_GRFIdentifier(Packet *p, const GRFConfig *c)
-{
-	uint j;
-	NetworkSend_uint32(p, c->grfid);
-	for (j = 0; j < sizeof(c->md5sum); j++) {
-		NetworkSend_uint8 (p, c->md5sum[j]);
-	}
-}
-
-/**
- * Deserializes the GRFIdentifier (GRF ID and MD5 checksum) from the packet
- * @param p the packet to read the data from
- * @param c the configuration to write the GRF ID and MD5 checksum to
- */
-static void NetworkRecv_GRFIdentifier(Packet *p, GRFConfig *c)
-{
-	uint j;
-	c->grfid = NetworkRecv_uint32(&_udp_cs, p);
-	for (j = 0; j < sizeof(c->md5sum); j++) {
-		c->md5sum[j] = NetworkRecv_uint8(&_udp_cs, p);
-	}
-}
-
 DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_FIND_SERVER)
 {
 	Packet *packet;
@@ -173,7 +145,7 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_SERVER_RESPONSE)

 			for (i = 0; i < num_grfs; i++) {
 				c = calloc(1, sizeof(*c));
-				NetworkRecv_GRFIdentifier(p, c);
+				NetworkRecv_GRFIdentifier(&_udp_cs, p, c);

 				/* Find the matching GRF file */
 				f = FindGRFConfig(c->grfid, c->md5sum);
@@ -457,7 +429,7 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_CLIENT_GET_NEWGRFS)
 		GRFConfig c;
 		const GRFConfig *f;

-		NetworkRecv_GRFIdentifier(p, &c);
+		NetworkRecv_GRFIdentifier(&_udp_cs, p, &c);

 		/* Find the matching GRF file */
 		f = FindGRFConfig(c.grfid, c.md5sum);
@@ -512,7 +484,7 @@ DEF_UDP_RECEIVE_COMMAND(PACKET_UDP_SERVER_NEWGRFS)
 		char name[NETWORK_GRF_NAME_LENGTH];
 		GRFConfig c;

-		NetworkRecv_GRFIdentifier(p, &c);
+		NetworkRecv_GRFIdentifier(&_udp_cs, p, &c);
 		NetworkRecv_string(&_udp_cs, p, name, sizeof(name));

 		/* An empty name is not possible under normal circumstances
@@ -566,9 +538,11 @@ static void NetworkHandleUDPPacket(Packet* p, struct sockaddr_in* client_addr)
 		_network_udp_packet[type](p, client_addr);
 	} else {
 		if (!_udp_cs.has_quit) {
-			DEBUG(net, 0)("[NET][UDP] Received invalid packet type %d", type);
+			DEBUG(net, 0)("[NET][UDP] Received invalid packet type %d from %s:%d",
+					type, inet_ntoa(client_addr->sin_addr), ntohs(client_addr->sin_port));
 		} else {
-			DEBUG(net, 0)("[NET][UDP] Received illegal packet");
+			DEBUG(net, 0)("[NET][UDP] Received illegal packet from %s:%d",
+					inet_ntoa(client_addr->sin_addr), ntohs(client_addr->sin_port));
 		}
 	}
 }
--- a/newgrf.c
+++ b/newgrf.c
@@ -1438,6 +1438,34 @@ static void FeatureChangeInfo(byte *buf, int len)
 	}
 }

+/* Action 0x00 (GLS_SAFETYSCAN) */
+static void SafeChangeInfo(byte *buf, int len)
+{
+	uint8 feature;
+	uint8 numprops;
+	uint8 numinfo;
+	uint8 index;
+
+	check_length(len, 6, "SafeChangeInfo");
+	buf++;
+	feature  = grf_load_byte(&buf);
+	numprops = grf_load_byte(&buf);
+	numinfo  = grf_load_byte(&buf);
+	index    = grf_load_byte(&buf);
+
+	if (feature == GSF_BRIDGE && numprops == 1) {
+		uint8 prop = grf_load_byte(&buf);
+		/* Bridge property 0x0D is redefinition of sprite layout tables, which
+		 * is considered safe. */
+		if (prop == 0x0D) return;
+	}
+
+	SETBIT(_cur_grfconfig->flags, GCF_UNSAFE);
+
+	/* Skip remainder of GRF */
+	_skip_sprites = -1;
+}
+
 #undef FOR_EACH_OBJECT

 /**
@@ -2380,67 +2408,63 @@ static void SkipIf(byte *buf, int len)
 		return;
 	}

-	if (param == 0x88 && GetFileByGRFID(cond_val) == NULL) {
-		DEBUG(grf, 7) ("GRFID 0x%08X unknown, skipping test", BSWAP32(cond_val));
-		return;
-	}
-
 	param_val = GetParamVal(param, &cond_val);

 	DEBUG(grf, 7) ("Test condtype %d, param 0x%08X, condval 0x%08X", condtype, param_val, cond_val);
-	switch (condtype) {
-		case 0: result = !!(param_val & (1 << cond_val));
-			break;
-		case 1: result = !(param_val & (1 << cond_val));
-			break;
-		case 2: result = (param_val & mask) == cond_val;
-			break;
-		case 3: result = (param_val & mask) != cond_val;
-			break;
-		case 4: result = (param_val & mask) < cond_val;
-			break;
-		case 5: result = (param_val & mask) > cond_val;
-			break;

-		/* Tests 6 to 10 are only for param 0x88, GRFID checks */
-		case 6: { /* Is GRFID active? */
-			const GRFConfig *c = GetGRFConfig(cond_val);
-			if (c == NULL) return;
-			result = HASBIT(c->flags, GCF_ACTIVATED);
-			break;
-		}
+	if (param == 0x88) {
+		/* GRF ID checks */

-		case 7: { /* Is GRFID non-active? */
-			const GRFConfig *c = GetGRFConfig(cond_val);
-			if (c == NULL) return;
-			result = !HASBIT(c->flags, GCF_ACTIVATED);
-			break;
-		}
+		const GRFConfig *c = GetGRFConfig(cond_val);

-		case 8: { /* GRFID is not but will be active? */
-			const GRFConfig *c = GetGRFConfig(cond_val);
-			if (c == NULL) return;
-			result = !HASBIT(c->flags, GCF_ACTIVATED) && !HASBIT(c->flags, GCF_DISABLED);
-			break;
-		}
-
-		case 9: { /* GRFID is or will be active? */
-			const GRFConfig *c = GetGRFConfig(cond_val);
-			if (c == NULL) return;
-			result = !HASBIT(c->flags, GCF_NOT_FOUND) && !HASBIT(c->flags, GCF_DISABLED);
-			break;
-		}
-
-		case 10: { /* GRFID is not nor will be active */
-			const GRFConfig *c = GetGRFConfig(cond_val);
-			/* This is the only condtype that doesn't get ignored if the GRFID is not found */
-			result = c == NULL || HASBIT(c->flags, GCF_DISABLED) || HASBIT(c->flags, GCF_NOT_FOUND);
-			break;
-		}
-
-		default:
-			grfmsg(GMS_WARN, "Unsupported test %d. Ignoring.", condtype);
+		if (condtype != 10 && c == NULL) {
+			DEBUG(grf, 7) ("GRFID 0x%08X unknown, skipping test", BSWAP32(cond_val));
 			return;
+		}
+
+		switch (condtype) {
+			/* Tests 6 to 10 are only for param 0x88, GRFID checks */
+			case 6: /* Is GRFID active? */
+				result = HASBIT(c->flags, GCF_ACTIVATED);
+				break;
+
+			case 7: /* Is GRFID non-active? */
+				result = !HASBIT(c->flags, GCF_ACTIVATED);
+				break;
+
+			case 8: /* GRFID is not but will be active? */
+				result = !HASBIT(c->flags, GCF_ACTIVATED) && !HASBIT(c->flags, GCF_DISABLED);
+				break;
+
+			case 9: /* GRFID is or will be active? */
+				result = !HASBIT(c->flags, GCF_NOT_FOUND) && !HASBIT(c->flags, GCF_DISABLED);
+				break;
+
+			case 10: /* GRFID is not nor will be active */
+				/* This is the only condtype that doesn't get ignored if the GRFID is not found */
+				result = c == NULL || HASBIT(c->flags, GCF_DISABLED) || HASBIT(c->flags, GCF_NOT_FOUND);
+				break;
+
+			default: grfmsg(GMS_WARN, "Unsupported GRF test %d. Ignoring", condtype); return;
+		}
+	} else {
+		/* Parameter or variable tests */
+		switch (condtype) {
+			case 0: result = !!(param_val & (1 << cond_val));
+				break;
+			case 1: result = !(param_val & (1 << cond_val));
+				break;
+			case 2: result = (param_val & mask) == cond_val;
+				break;
+			case 3: result = (param_val & mask) != cond_val;
+				break;
+			case 4: result = (param_val & mask) < cond_val;
+				break;
+			case 5: result = (param_val & mask) > cond_val;
+				break;
+
+			default: grfmsg(GMS_WARN, "Unsupported test %d. Ignoring", condtype); return;
+		}
 	}

 	if (!result) {
@@ -2484,8 +2508,8 @@ static void SkipIf(byte *buf, int len)
 }


-/* Action 0x08 (GLS_SAFETYSCAN) */
-static void SafeInfo(byte *buf, int len)
+/* Action 0x08 (GLS_FILESCAN) */
+static void ScanInfo(byte *buf, int len)
 {
 	uint8 version;
 	uint32 grfid;
@@ -2518,12 +2542,6 @@ static void SafeInfo(byte *buf, int len)
 			_cur_grfconfig->info  = TranslateTTDPatchCodes(info);
 		}
 	}
-}
-
-/* Action 0x08 (GLS_INFOSCAN) */
-static void ScanInfo(byte *buf, int len)
-{
-	SafeInfo(buf, len);

 	/* GLS_INFOSCAN only looks for the action 8, so we can skip the rest of the file */
 	_skip_sprites = -1;
@@ -2652,6 +2670,29 @@ static void GRFComment(byte *buf, int len)
 	grfmsg(GMS_NOTICE, "GRFComment: %s", comment);
 }

+/* Action 0x0D (GLS_SAFETYSCAN) */
+static void SafeParamSet(byte *buf, int len)
+{
+	uint8 target;
+
+	check_length(len, 5, "SafeParamSet");
+	buf++;
+	target = grf_load_byte(&buf);
+
+	/* Only writing GRF parameters is considered safe */
+	if (target < 0x80) return;
+
+	/* GRM could be unsafe, but as here it can only happen after other GRFs
+	 * are loaded, it should be okay. If the GRF tried to use the slots it
+	 * reserved, it would be marked unsafe anyway. GRM for (e.g. bridge)
+	 * sprites  is considered safe. */
+
+	SETBIT(_cur_grfconfig->flags, GCF_UNSAFE);
+
+	/* Skip remainder of GRF */
+	_skip_sprites = -1;
+}
+
 /* Action 0x0D */
 static void ParamSet(byte *buf, int len)
 {
@@ -2945,6 +2986,37 @@ static void ParamSet(byte *buf, int len)
 	}
 }

+/* Action 0x0E (GLS_SAFETYSCAN) */
+static void SafeGRFInhibit(byte *buf, int len)
+{
+	/* <0E> <num> <grfids...>
+	 *
+	 * B num           Number of GRFIDs that follow
+	 * D grfids        GRFIDs of the files to deactivate */
+
+	byte num;
+	int i;
+
+	check_length(len, 1, "GRFInhibit");
+	buf++, len--;
+	num = grf_load_byte(&buf); len--;
+	check_length(len, 4 * num, "GRFInhibit");
+
+	for (i = 0; i < num; i++) {
+		uint32 grfid = grf_load_dword(&buf);
+
+		/* GRF is unsafe it if tries to deactivate other GRFs */
+		if (grfid != _cur_grfconfig->grfid) {
+			SETBIT(_cur_grfconfig->flags, GCF_UNSAFE);
+
+			/* Skip remainder of GRF */
+			_skip_sprites = -1;
+
+			return;
+		}
+	}
+}
+
 /* Action 0x0E */
 static void GRFInhibit(byte *buf, int len)
 {
@@ -2966,13 +3038,10 @@ static void GRFInhibit(byte *buf, int len)
 		GRFConfig *file = GetGRFConfig(grfid);

 		/* Unset activation flag */
-		if (file != NULL) {
+		if (file != NULL && file != _cur_grfconfig) {
 			grfmsg(GMS_NOTICE, "GRFInhibit: Deactivating file ``%s''", file->filename);
 			SETBIT(file->flags, GCF_DISABLED);
 			CLRBIT(file->flags, GCF_ACTIVATED);
-
-			/* Skip processing if the GRF deactivated itself */
-			if (file == _cur_grfconfig) _skip_sprites = -1;
 		}
 	}
 }
@@ -3209,8 +3278,8 @@ static void GRFUnsafe(byte *buf, int len)
 {
 	SETBIT(_cur_grfconfig->flags, GCF_UNSAFE);

-	/* Skip remainder of GRF if GRF ID is set */
-	if (_cur_grfconfig->grfid != 0) _skip_sprites = -1;
+	/* Skip remainder of GRF */
+	_skip_sprites = -1;
 }


@@ -3232,7 +3301,7 @@ static void InitializeGRFSpecial(void)
 	                   |        ((_patches.mammoth_trains ? 1 : 0) << 0x08)  // mammothtrains
 	                   |                                        (1 << 0x09)  // trainrefit
 	                   |                                        (0 << 0x0B)  // subsidiaries
-	                   |       ((_patches.gradual_loading ? 1 : 0) << 0x1C)  // gradualloading
+	                   |       ((_patches.gradual_loading ? 1 : 0) << 0x0C)  // gradualloading
 	                   |                                        (1 << 0x12)  // unifiedmaglevmode - set bit 0 mode. Not revelant to OTTD
 	                   |                                        (1 << 0x13)  // unifiedmaglevmode - set bit 1 mode
 	                   |                                        (1 << 0x14)  // bridgespeedlimits
@@ -3554,7 +3623,7 @@ static void DecodeSpecialSprite(uint num, GrfLoadingStage stage)
 	 * is not in memory and scanning the file every time would be too expensive.
 	 * In other stages we skip action 0x10 since it's already dealt with. */
 	static const SpecialSpriteHandler handlers[][GLS_END] = {
-		/* 0x00 */ { NULL,     GRFUnsafe, NULL,            NULL,       FeatureChangeInfo, },
+		/* 0x00 */ { NULL,     SafeChangeInfo, NULL,       NULL,       FeatureChangeInfo, },
 		/* 0x01 */ { NULL,     GRFUnsafe, NULL,            NULL,       NewSpriteSet, },
 		/* 0x02 */ { NULL,     GRFUnsafe, NULL,            NULL,       NewSpriteGroup, },
 		/* 0x03 */ { NULL,     GRFUnsafe, NULL,            NULL,       FeatureMapSpriteGroup, },
@@ -3562,13 +3631,13 @@ static void DecodeSpecialSprite(uint num, GrfLoadingStage stage)
 		/* 0x05 */ { NULL,     NULL,      NULL,            NULL,       GraphicsNew, },
 		/* 0x06 */ { NULL,     NULL,      NULL,            CfgApply,   CfgApply, },
 		/* 0x07 */ { NULL,     NULL,      NULL,            NULL,       SkipIf, },
-		/* 0x08 */ { ScanInfo, SafeInfo,  NULL,            GRFInfo,    GRFInfo, },
+		/* 0x08 */ { ScanInfo, NULL,      NULL,            GRFInfo,    GRFInfo, },
 		/* 0x09 */ { NULL,     NULL,      NULL,            SkipIf,     SkipIf, },
 		/* 0x0A */ { NULL,     NULL,      NULL,            NULL,       SpriteReplace, },
 		/* 0x0B */ { NULL,     NULL,      NULL,            GRFError,   GRFError, },
 		/* 0x0C */ { NULL,     NULL,      NULL,            GRFComment, GRFComment, },
-		/* 0x0D */ { NULL,     GRFUnsafe, NULL,            ParamSet,   ParamSet, },
-		/* 0x0E */ { NULL,     GRFUnsafe, NULL,            GRFInhibit, GRFInhibit, },
+		/* 0x0D */ { NULL,     SafeParamSet, NULL,         ParamSet,   ParamSet, },
+		/* 0x0E */ { NULL,     SafeGRFInhibit, NULL,       GRFInhibit, GRFInhibit, },
 		/* 0x0F */ { NULL,     NULL,      NULL,            NULL,       NULL, },
 		/* 0x10 */ { NULL,     NULL,      DefineGotoLabel, NULL,       NULL, },
 		/* 0x11 */ { NULL,     GRFUnsafe, NULL,            NULL,       GRFSound, },
@@ -3724,8 +3793,11 @@ void LoadNewGRF(uint load_index, uint file_index)

 			if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
 			LoadNewGRFFile(c, slot++, stage);
-			if (stage == GLS_ACTIVATION) ClearTemporaryNewGRFData();
-			DEBUG(spritecache, 2) ("Currently %i sprites are loaded", load_index);
+
+			if (stage == GLS_ACTIVATION) {
+				ClearTemporaryNewGRFData();
+				DEBUG(spritecache, 2) ("Currently %i sprites are loaded", _cur_spriteid);
+			}
 		}
 	}

--- a/newgrf_config.c
+++ b/newgrf_config.c
@@ -70,14 +70,19 @@ bool FillGRFDetails(GRFConfig *config, bool is_static)
 	/* Find and load the Action 8 information */
 	/* 62 is the last file slot before sample.cat.
 	 * Should perhaps be some "don't care" value */
-	LoadNewGRFFile(config, 62, is_static ? GLS_SAFETYSCAN : GLS_FILESCAN);
-
-	/* GCF_UNSAFE is set if GLS_SAFETYSCAN finds unsafe actions */
-	if (HASBIT(config->flags, GCF_UNSAFE)) return false;
+	LoadNewGRFFile(config, 62, GLS_FILESCAN);

 	/* Skip if the grfid is 0 (not read) or 0xFFFFFFFF (ttdp system grf) */
 	if (config->grfid == 0 || config->grfid == 0xFFFFFFFF) return false;

+	if (is_static) {
+		/* Perform a 'safety scan' for static GRFs */
+		LoadNewGRFFile(config, 62, GLS_SAFETYSCAN);
+
+		/* GCF_UNSAFE is set if GLS_SAFETYSCAN finds unsafe actions */
+		if (HASBIT(config->flags, GCF_UNSAFE)) return false;
+	}
+
 	return CalcGRFMD5Sum(config);
 }

@@ -120,9 +125,9 @@ GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src)
 	for (; src != NULL; src = src->next) {
 		c = calloc(1, sizeof(*c));
 		*c = *src;
-		c->filename = strdup(src->filename);
-		if (src->name != NULL) c->name = strdup(src->name);
-		if (src->info != NULL) c->info = strdup(src->info);
+		if (src->filename != NULL) c->filename = strdup(src->filename);
+		if (src->name     != NULL) c->name     = strdup(src->name);
+		if (src->info     != NULL) c->info     = strdup(src->info);

 		*dst = c;
 		dst = &c->next;
@@ -131,38 +136,106 @@ GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src)
 	return dst;
 }

+/**
+ * Removes duplicates from lists of GRFConfigs. These duplicates
+ * are introduced when the _grfconfig_static GRFs are appended
+ * to the _grfconfig on a newgame or savegame. As the parameters
+ * of the static GRFs could be different that the parameters of
+ * the ones used non-statically. This can result in desyncs in
+ * multiplayers, so the duplicate static GRFs have to be removed.
+ *
+ * This function _assumes_ that all static GRFs are placed after
+ * the non-static GRFs.
+ *
+ * @param list the list to remove the duplicates from
+ */
+static void RemoveDuplicatesFromGRFConfigList(GRFConfig *list)
+{
+	GRFConfig *prev;
+	GRFConfig *cur;
+
+	if (list == NULL) return;
+
+	for (prev = list, cur = list->next; cur != NULL; prev = cur, cur = cur->next) {
+		if (cur->grfid != list->grfid) continue;
+
+		prev->next = cur->next;
+		ClearGRFConfig(&cur);
+		cur = prev; // Just go back one so it continues as normal later on
+	}
+
+	RemoveDuplicatesFromGRFConfigList(list->next);
+}
+
+/**
+ * Appends the static GRFs to a list of GRFs
+ * @param dst the head of the list to add to
+ */
+void AppendStaticGRFConfigs(GRFConfig **dst)
+{
+	GRFConfig **tail = dst;
+	while (*tail != NULL) tail = &(*tail)->next;
+
+	CopyGRFConfigList(tail, _grfconfig_static);
+	RemoveDuplicatesFromGRFConfigList(*dst);
+}
+

 /* Reset the current GRF Config to either blank or newgame settings */
 void ResetGRFConfig(bool defaults)
 {
 	GRFConfig **c = &_grfconfig;

-	if (defaults) c = CopyGRFConfigList(c, _grfconfig_newgame);
-	CopyGRFConfigList(c, _grfconfig_static);
+	if (defaults) {
+		c = CopyGRFConfigList(c, _grfconfig_newgame);
+	} else {
+		ClearGRFConfigList(c);
+	}
+
+	AppendStaticGRFConfigs(&_grfconfig);
 }


-/* Check if all GRFs in the GRF Config can be loaded */
-bool IsGoodGRFConfigList(void)
+/** Check if all GRFs in the GRF config from a savegame can be loaded.
+ * @return will return any of the following 3 values:<br>
+ * <ul>
+ * <li> GCF_ACTIVATED: No problems occured, all GRF files were found and loaded
+ * <li> GCF_COMPATIBLE: For one or more GRF's no exact match was found, but a
+ *     compatible GRF with the same grfid was found and used instead
+ * <li> GCF_NOT_FOUND: For one or more GRF's no match was found at all
+ * </ul> */
+GCF_Flags IsGoodGRFConfigList(void)
 {
-	bool res = true;
+	GCF_Flags res = GCF_ACTIVATED;
 	GRFConfig *c;

 	for (c = _grfconfig; c != NULL; c = c->next) {
 		const GRFConfig *f = FindGRFConfig(c->grfid, c->md5sum);
 		if (f == NULL) {
-			char buf[512], *p = buf;
-			uint i;
+			char buf[256];

-			p += snprintf(p, lastof(buf) - p, "Couldn't find NewGRF %08X (%s) checksum ", BSWAP32(c->grfid), c->filename);
-			for (i = 0; i < lengthof(c->md5sum); i++) {
-				p += snprintf(p, lastof(buf) - p, "%02X", c->md5sum[i]);
+			/* If we have not found the exactly matching GRF try to find one with the
+			 * same grfid, as it most likely is compatible */
+			f = FindGRFConfig(c->grfid, NULL);
+			if (f != NULL) {
+				md5sumToString(buf, lastof(buf), c->md5sum);
+				DEBUG(grf, 1) ("[GRF] NewGRF %08X (%s) not found; checksum %s. Compatibility mode on", BSWAP32(c->grfid), c->filename, buf);
+				SETBIT(c->flags, GCF_COMPATIBLE);
+
+				/* Non-found has precedence over compatibility load */
+				if (res != GCF_NOT_FOUND) res = GCF_COMPATIBLE;
+				goto compatible_grf;
 			}
-			ShowInfo(buf);

-			res = false;
+			/* No compatible grf was found, mark it as disabled */
+			md5sumToString(buf, lastof(buf), c->md5sum);
+			DEBUG(grf, 0) ("[GRF] NewGRF %08X (%s) not found; checksum %s", BSWAP32(c->grfid), c->filename, buf);
+
+			SETBIT(c->flags, GCF_NOT_FOUND);
+			res = GCF_NOT_FOUND;
 		} else {
-			DEBUG(grf, 1) ("[GRF] Loading GRF %08X from %s", BSWAP32(c->grfid), f->filename);
+compatible_grf:
+			DEBUG(grf, 1) ("[GRF] Loading GRF %08X from %s", BSWAP32(f->grfid), f->filename);
 			/* The filename could be the filename as in the savegame. As we need
 			 * to load the GRF here, we need the correct filename, so overwrite that
 			 * in any case and set the name and info when it is not set already.
@@ -171,6 +244,7 @@ bool IsGoodGRFConfigList(void)
 			if (!HASBIT(c->flags, GCF_COPY)) {
 				free(c->filename);
 				c->filename = strdup(f->filename);
+				memcpy(c->md5sum, f->md5sum, sizeof(c->md5sum));
 				if (c->name == NULL) c->name = strdup(f->name);
 				if (c->info == NULL) c->info = strdup(f->info);
 			}
@@ -263,15 +337,14 @@ void ScanNewGRFFiles(void)
 }


-/* Find a NewGRF in the scanned list */
-const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum)
+/* Find a NewGRF in the scanned list, if md5sum is NULL, we don't care about it*/
+const GRFConfig *FindGRFConfig(uint32 grfid, const uint8 *md5sum)
 {
-	GRFConfig *c;
-	static const uint8 blanksum[sizeof(c->md5sum)] = { 0 };
-
+	const GRFConfig *c;
 	for (c = _all_grfs; c != NULL; c = c->next) {
 		if (c->grfid == grfid) {
-			if (memcmp(blanksum, c->md5sum, sizeof(c->md5sum)) == 0) CalcGRFMD5Sum(c);
+			if (md5sum == NULL) return c;
+
 			if (memcmp(md5sum, c->md5sum, sizeof(c->md5sum)) == 0) return c;
 		}
 	}
@@ -279,6 +352,8 @@ const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum)
 	return NULL;
 }

+#ifdef ENABLE_NETWORK
+
 /** Structure for UnknownGRFs; this is a lightweight variant of GRFConfig */
 typedef struct UnknownGRF UnknownGRF;
 struct UnknownGRF {
@@ -328,6 +403,8 @@ char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create)
 	return grf->name;
 }

+#endif /* ENABLE_NETWORK */
+

 /* Retrieve a NewGRF from the current config by its grfid */
 GRFConfig *GetGRFConfig(uint32 grfid)
@@ -400,6 +477,7 @@ static void Load_NGRF(void)

 	ClearGRFConfigList(&_grfconfig);
 	_grfconfig = first;
+	AppendStaticGRFConfigs(&_grfconfig);
 }

 const ChunkHandler _newgrf_chunk_handlers[] = {
--- a/newgrf_config.h
+++ b/newgrf_config.h
@@ -4,15 +4,16 @@
 #define NEWGRF_CONFIG_H

 /* GRF config bit flags */
-enum {
-	GCF_DISABLED,
-	GCF_NOT_FOUND,
-	GCF_ACTIVATED,
-	GCF_SYSTEM,
-	GCF_UNSAFE,
-	GCF_STATIC,
+typedef enum {
+	GCF_DISABLED,  ///< GRF file is disabled
+	GCF_NOT_FOUND, ///< GRF file was not found in the local cache
+	GCF_ACTIVATED, ///< GRF file is active
+	GCF_SYSTEM,    ///< GRF file is an openttd-internal system grf
+	GCF_UNSAFE,    ///< GRF file is unsafe for static usage
+	GCF_STATIC,    ///< GRF file is used statically (can be used in any MP game)
+	GCF_COMPATIBLE,///< GRF file does not exactly match the requested GRF (different MD5SUM), but grfid matches)
 	GCF_COPY,      ///< The data is copied from a grf in _all_grfs
-};
+} GCF_Flags;

 typedef struct GRFConfig {
 	char *filename;
@@ -41,21 +42,24 @@ extern GRFConfig *_grfconfig_newgame;
 extern GRFConfig *_grfconfig_static;

 void ScanNewGRFFiles(void);
-const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum);
+const GRFConfig *FindGRFConfig(uint32 grfid, const uint8 *md5sum);
 GRFConfig *GetGRFConfig(uint32 grfid);
 GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src);
+void AppendStaticGRFConfigs(GRFConfig **dst);
 void ClearGRFConfig(GRFConfig **config);
 void ClearGRFConfigList(GRFConfig **config);
 void ResetGRFConfig(bool defaults);
-bool IsGoodGRFConfigList(void);
+GCF_Flags IsGoodGRFConfigList(void);
 bool FillGRFDetails(GRFConfig *config, bool is_static);
 char *GRFBuildParamList(char *dst, const GRFConfig *c, const char *last);

 /* In newgrf_gui.c */
 void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config);

+#ifdef ENABLE_NETWORK
 /* For communication about GRFs over the network */
 #define UNKNOWN_GRF_NAME_PLACEHOLDER "<Unknown>"
 char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
+#endif /* ENABLE_NETWORK */

 #endif /* NEWGRF_CONFIG_H */
--- a/newgrf_gui.c
+++ b/newgrf_gui.c
@@ -40,9 +40,7 @@ static int parse_intlist(const char *p, int *items, int maxitems)

 static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint w, bool show_params)
 {
-	char buff[512];
-	char *s;
-	uint i;
+	char buff[256];

 	/* Draw filename or not if it is not known (GRF sent over internet) */
 	if (c->filename != NULL) {
@@ -56,10 +54,7 @@ static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint w, bool show
 	y += DrawStringMultiLine(x, y, STR_NEWGRF_GRF_ID, w);

 	/* Prepare and draw MD5 sum */
-	s = buff;
-	for (i = 0; i < lengthof(c->md5sum); i++) {
-		s += snprintf(s, lastof(buff) - s, "%02X", c->md5sum[i]);
-	}
+	md5sumToString(buff, lastof(buff), c->md5sum);
 	SetDParamStr(0, buff);
 	y += DrawStringMultiLine(x, y, STR_NEWGRF_MD5SUM, w);

@@ -75,8 +70,9 @@ static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint w, bool show
 	}

 	/* Show flags */
-	if (HASBIT(c->flags, GCF_NOT_FOUND)) y += DrawStringMultiLine(x, y, STR_NEWGRF_NOT_FOUND, w);
-	if (HASBIT(c->flags, GCF_DISABLED))  y += DrawStringMultiLine(x, y, STR_NEWGRF_DISABLED, w);
+	if (HASBIT(c->flags, GCF_NOT_FOUND))  y += DrawStringMultiLine(x, y, STR_NEWGRF_NOT_FOUND, w);
+	if (HASBIT(c->flags, GCF_DISABLED))   y += DrawStringMultiLine(x, y, STR_NEWGRF_DISABLED, w);
+	if (HASBIT(c->flags, GCF_COMPATIBLE)) y += DrawStringMultiLine(x, y, STR_NEWGRF_COMPATIBLE_LOADED, w);

 	/* Draw GRF info if it exists */
 	if (c->info != NULL && strlen(c->info) != 0) {
@@ -200,17 +196,17 @@ static const Widget _newgrf_add_dlg_widgets[] = {
 {  WWT_SCROLLBAR,     RESIZE_LRB, 14, 295, 306,  14, 221, 0x0,                     STR_NULL },

 /* NewGRF file info */
-{      WWT_PANEL,     RESIZE_RTB, 14,   0, 306, 222, 311, 0x0,                     STR_NULL },
+{      WWT_PANEL,     RESIZE_RTB, 14,   0, 306, 222, 324, 0x0,                     STR_NULL },

-{ WWT_PUSHTXTBTN,     RESIZE_RTB, 14,   0, 146, 312, 323, STR_NEWGRF_ADD_FILE,     STR_NEWGRF_ADD_FILE_TIP },
-{ WWT_PUSHTXTBTN,    RESIZE_LRTB, 14, 147, 294, 312, 323, STR_NEWGRF_RESCAN_FILES, STR_NEWGRF_RESCAN_FILES_TIP },
-{  WWT_RESIZEBOX,    RESIZE_LRTB, 14, 295, 306, 312, 323, 0x0,                     STR_RESIZE_BUTTON },
+{ WWT_PUSHTXTBTN,     RESIZE_RTB, 14,   0, 146, 325, 336, STR_NEWGRF_ADD_FILE,     STR_NEWGRF_ADD_FILE_TIP },
+{ WWT_PUSHTXTBTN,    RESIZE_LRTB, 14, 147, 294, 325, 336, STR_NEWGRF_RESCAN_FILES, STR_NEWGRF_RESCAN_FILES_TIP },
+{  WWT_RESIZEBOX,    RESIZE_LRTB, 14, 295, 306, 325, 336, 0x0,                     STR_RESIZE_BUTTON },
 {   WIDGETS_END },
 };


 static const WindowDesc _newgrf_add_dlg_desc = {
-	WDP_CENTER, WDP_CENTER, 307, 324,
+	WDP_CENTER, WDP_CENTER, 307, 337,
 	WC_SAVELOAD, 0,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
 	_newgrf_add_dlg_widgets,
@@ -283,9 +279,19 @@ static void NewGRFConfirmationCallback(bool yes_clicked)
 	if (yes_clicked) {
 		Window *w = FindWindowById(WC_GAME_OPTIONS, 0);
 		newgrf_d *nd = &WP(w, newgrf_d);
+		GRFConfig *c;
+		int i = 0;

 		CopyGRFConfigList(nd->orig_list, *nd->list);
 		ReloadNewGRFData();
+
+		/* Show new, updated list */
+		for (c = *nd->list; c != NULL && c != nd->sel; c = c->next, i++);
+		CopyGRFConfigList(nd->list, *nd->orig_list);
+		for (c = *nd->list; c != NULL && i > 0; c = c->next, i--);
+		nd->sel = c;
+
+		SetWindowDirty(w);
 	}
 }

@@ -312,7 +318,9 @@ static void NewGRFWndProc(Window *w, WindowEvent *e)
 					if (HASBIT(c->flags, GCF_NOT_FOUND) || HASBIT(c->flags, GCF_DISABLED)) {
 						pal = PALETTE_TO_RED;
 					} else if (HASBIT(c->flags, GCF_STATIC)) {
-						pal = PALETTE_TO_YELLOW;
+						pal = PALETTE_TO_GREY;
+					} else if (HASBIT(c->flags, GCF_COMPATIBLE)) {
+						pal = PALETTE_TO_ORANGE;
 					} else if (HASBIT(c->flags, GCF_ACTIVATED)) {
 						pal = PALETTE_TO_GREEN;
 					} else {
@@ -485,20 +493,20 @@ static const Widget _newgrf_widgets[] = {
 {  WWT_SCROLLBAR,   RESIZE_LRB, 10, 288, 299,  30,  99, 0x0,                         STR_0190_SCROLL_BAR_SCROLLS_LIST },

 /* NewGRF file info */
-{      WWT_PANEL,   RESIZE_RTB, 10,   0, 299, 100, 199, STR_NULL,                    STR_NULL },
+{      WWT_PANEL,   RESIZE_RTB, 10,   0, 299, 100, 212, STR_NULL,                    STR_NULL },

 /* Edit parameter and apply changes button... */
-{ WWT_PUSHTXTBTN,    RESIZE_TB, 10,   0, 143, 200, 211, STR_NEWGRF_SET_PARAMETERS,   STR_NULL },
-{ WWT_PUSHTXTBTN,   RESIZE_RTB, 10, 144, 287, 200, 211, STR_NEWGRF_APPLY_CHANGES,    STR_NULL },
+{ WWT_PUSHTXTBTN,    RESIZE_TB, 10,   0, 143, 213, 224, STR_NEWGRF_SET_PARAMETERS,   STR_NULL },
+{ WWT_PUSHTXTBTN,   RESIZE_RTB, 10, 144, 287, 213, 224, STR_NEWGRF_APPLY_CHANGES,    STR_NULL },

-{  WWT_RESIZEBOX,  RESIZE_LRTB, 10, 288, 299, 200, 211, 0x0,                         STR_RESIZE_BUTTON },
+{  WWT_RESIZEBOX,  RESIZE_LRTB, 10, 288, 299, 213, 224, 0x0,                         STR_RESIZE_BUTTON },

 { WIDGETS_END },
 };


 static const WindowDesc _newgrf_desc = {
-	WDP_CENTER, WDP_CENTER, 300, 212,
+	WDP_CENTER, WDP_CENTER, 300, 225,
 	WC_GAME_OPTIONS, 0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
 	_newgrf_widgets,
--- a/newgrf_station.c
+++ b/newgrf_station.c
@@ -285,6 +285,40 @@ static uint32 GetPlatformInfoHelper(TileIndex tile, bool check_type, bool check_
 }


+static uint32 GetRailContinuationInfo(TileIndex tile)
+{
+	/* Tile offsets and exit dirs for X axis */
+	static Direction x_dir[8] = { DIR_SW, DIR_NE, DIR_SE, DIR_NW, DIR_S, DIR_E, DIR_W, DIR_N };
+	static DiagDirection x_exits[8] = { DIAGDIR_SW, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NE, DIAGDIR_SW, DIAGDIR_NE };
+
+	/* Tile offsets and exit dirs for Y axis */
+	static Direction y_dir[8] = { DIR_SE, DIR_NW, DIR_SW, DIR_NE, DIR_S, DIR_W, DIR_E, DIR_N };
+	static DiagDirection y_exits[8] = { DIAGDIR_SE, DIAGDIR_NW, DIAGDIR_SW, DIAGDIR_NE, DIAGDIR_SE, DIAGDIR_NW, DIAGDIR_SE, DIAGDIR_NW };
+
+	Axis axis = IsTileType(tile, MP_RAILWAY) ? GetWaypointAxis(tile) : GetRailStationAxis(tile);
+
+	/* Choose appropriate lookup table to use */
+	Direction *dir = axis == AXIS_X ? x_dir : y_dir;
+	DiagDirection *diagdir = axis == AXIS_X ? x_exits : y_exits;
+
+	uint32 res = 0;
+	uint i;
+
+	for (i = 0; i < lengthof(x_dir); i++, dir++, diagdir++) {
+		uint32 ts = GetTileTrackStatus(tile + TileOffsByDir(*dir), TRANSPORT_RAIL);
+		if (ts != 0) {
+			/* If there is any track on the tile, set the bit in the second byte */
+			SETBIT(res, i + 8);
+
+			/* If any track reaches our exit direction, set the bit in the lower byte */
+			if (ts & DiagdirReachesTracks(*diagdir)) SETBIT(res, i);
+		}
+	}
+
+	return res;
+}
+
+
 /* Station Resolver Functions */
 static uint32 StationGetRandomBits(const ResolverObject *object)
 {
@@ -341,6 +375,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by
 			       (GetRailType(tile) << 8);
 		case 0x43: return st->owner; /* Station owner */
 		case 0x44: return 2;         /* PBS status */
+		case 0x45: return GetRailContinuationInfo(tile);
 		case 0x46: return GetPlatformInfoHelper(tile, false, false, true);
 		case 0x47: return GetPlatformInfoHelper(tile, true,  false, true);
 		case 0x48: { /* Accepted cargo types */
@@ -360,6 +395,7 @@ static uint32 StationGetVariable(const ResolverObject *object, byte variable, by
 		case 0x62: return st->goods[parameter].rating;
 		case 0x63: return st->goods[parameter].enroute_time;
 		case 0x64: return st->goods[parameter].last_speed | (st->goods[parameter].last_age << 8);
+		case 0x65: return GB(st->goods[parameter].waiting_acceptance, 12, 4);

 		/* General station properties */
 		case 0x82: return 50;
--- a/news_gui.c
+++ b/news_gui.c
@@ -272,7 +272,6 @@ void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b)
 	if (_total_news == MAX_NEWS && (_oldest_news == _current_news || _oldest_news == _forced_news))
 		MoveToNextItem();

-	_forced_news = INVALID_NEWS;
 	if (_total_news < MAX_NEWS) _total_news++;

 	/* Increase _latest_news. If we have no news yet, use _oldest news as an
@@ -287,6 +286,9 @@ void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b)
 		_oldest_news = increaseIndex(_oldest_news);
 	}

+	/*DEBUG(misc, 0) ("+cur %3d, old %2d, lat %3d, for %3d, tot %2d",
+	  _current_news, _oldest_news, _latest_news, _forced_news, _total_news); */
+
 	{ /* Add news to _latest_news */
 		Window *w;
 		NewsItem *ni = &_news_items[_latest_news];
@@ -314,7 +316,7 @@ void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b)
 }


-// don't show item if it's older than x days
+/* Don't show item if it's older than x days, corresponds with NewsType in news.h */
 static const byte _news_items_age[] = {60, 60, 90, 60, 90, 30, 150, 30, 90, 180};

 static const Widget _news_type13_widgets[] = {
@@ -438,6 +440,10 @@ static void ShowNewspaper(NewsItem *ni)
 			break;
 		}
 	}
+
+	/*DEBUG(misc, 0) (" cur %3d, old %2d, lat %3d, for %3d, tot %2d",
+	  _current_news, _oldest_news, _latest_news, _forced_news, _total_news); */
+
 	WP(w, news_d).ni = &_news_items[_forced_news == INVALID_NEWS ? _current_news : _forced_news];
 	w->flags4 |= WF_DISABLE_VP_SCROLL;
 }
@@ -548,16 +554,17 @@ static void ShowNewsMessage(NewsID i)

 void ShowLastNewsMessage(void)
 {
-	switch (_forced_news) {
-		case INVALID_NEWS: // Not forced any news yet, show the current one
-			ShowNewsMessage(_current_news);
-			break;
-		case 0: //
-			ShowNewsMessage(_total_news != MAX_NEWS ? _latest_news : MAX_NEWS - 1);
-			break;
-		default: // 'Scrolling' through news history show each one in turn
-			ShowNewsMessage(_forced_news - 1);
-			break;
+	if (_forced_news == INVALID_NEWS) {
+		/* Not forced any news yet, show the current one, unless a news window is
+		 * open (which can only be the current one), then show the previous item */
+		const Window *w = FindWindowById(WC_NEWS_WINDOW, 0);
+		ShowNewsMessage((w == NULL || (_current_news == _oldest_news)) ? _current_news : decreaseIndex(_current_news));
+	} else if (_forced_news == _oldest_news) {
+		/* We have reached the oldest news, start anew with the latest */
+		ShowNewsMessage(_latest_news);
+	} else {
+		/* 'Scrolling' through news history show each one in turn */
+		ShowNewsMessage(decreaseIndex(_forced_news));
 	}
 }

@@ -882,12 +889,15 @@ void DeleteVehicleNews(VehicleID vid, StringID news)
 				(news == INVALID_STRING_ID || ni->string_id == news)) {
 			Window *w;

-			if (_forced_news == n || _current_news == n) MoveToNextItem();
+			/* If we delete a forced news and it is just before the current news
+			 * then we need to advance to the next news (if any) */
+			if (_forced_news == n) MoveToNextItem();
+			if (_forced_news == INVALID_NEWS && _current_news == n) MoveToNextItem();
 			_total_news--;

-			// If this is the last news item, invalidate _latest_news
-			if (_latest_news == _oldest_news) {
-				assert(_total_news == 0);
+			/* If this is the last news item, invalidate _latest_news */
+			if (_total_news == 0) {
+				assert(_latest_news == _oldest_news);
 				_latest_news = INVALID_NEWS;
 			}

@@ -898,18 +908,30 @@ void DeleteVehicleNews(VehicleID vid, StringID news)
 			 * [------O--------n-----L--]
 			 * will become (change dramatized to make clear)
 			 * [---------O-----------L--]
-			 * Also update the current news item in case it was pointing to the
-			 * oldest, now shifted item */
+			 * We also need an update of the current, forced and visible (open window)
+			 * news's as this shifting could change the items they were pointing to */
 			if (_total_news != 0) {
-				NewsID i;
-				for (i = n; i != _oldest_news; i = decreaseIndex(i)) {
-					_news_items[i] = _news_items[decreaseIndex(i)];
-				}
+				NewsID visible_news, i;
+				w = FindWindowById(WC_NEWS_WINDOW, 0);
+				visible_news = (w != NULL) ? (NewsID)(WP(w, news_d).ni - _news_items) : INVALID_NEWS;

-				if (_current_news == _oldest_news) _current_news = increaseIndex(_current_news);
+				for (i = n;; i = decreaseIndex(i)) {
+					_news_items[i] = _news_items[decreaseIndex(i)];
+
+					if (i != _latest_news) {
+						if (i == _current_news) _current_news = increaseIndex(_current_news);
+						if (i == _forced_news) _forced_news = increaseIndex(_forced_news);
+						if (i == visible_news) WP(w, news_d).ni = &_news_items[increaseIndex(visible_news)];
+					}
+
+					if (i == _oldest_news) break;
+				}
 				_oldest_news = increaseIndex(_oldest_news);
 			}

+			/*DEBUG(misc, 0) ("-cur %3d, old %2d, lat %3d, for %3d, tot %2d",
+			  _current_news, _oldest_news, _latest_news, _forced_news, _total_news); */
+
 			w = FindWindowById(WC_MESSAGE_HISTORY, 0);
 			if (w != NULL) {
 				SetWindowDirty(w);
--- a/oldloader.c
+++ b/oldloader.c
@@ -723,7 +723,6 @@ static bool LoadOldIndustry(LoadgameState *ls, int num)
 }

 static PlayerID _current_player_id;
-static uint16 _old_inaugurated_year;
 static int32 _old_yearly;

 static const OldChunks player_yearly_chunk[] = {
@@ -938,9 +937,9 @@ static const OldChunks player_chunk[] = {
 	OCL_CHUNK( 3, OldPlayerYearly ),
 	OCL_CHUNK( 1, OldPlayerEconomy ),

-	OCL_VAR ( OC_UINT16,   1,    &_old_inaugurated_year ),
-	OCL_SVAR(   OC_TILE, Player, last_build_coordinate ),
-	OCL_SVAR(  OC_UINT8, Player, num_valid_stat_ent ),
+	OCL_SVAR( OC_FILE_U16 | OC_VAR_I32, Player, inaugurated_year),
+	OCL_SVAR(                  OC_TILE, Player, last_build_coordinate ),
+	OCL_SVAR(                 OC_UINT8, Player, num_valid_stat_ent ),

 	OCL_CHUNK( 1, OldPlayerAI ),

@@ -989,7 +988,7 @@ static bool LoadOldPlayer(LoadgameState *ls, int num)
 		p->money64 = p->player_money = p->current_loan = 100000;

 	_player_colors[num] = p->player_color;
-	p->inaugurated_year = _old_inaugurated_year;
+	p->inaugurated_year -= ORIGINAL_BASE_YEAR;
 	if (p->location_of_house == 0xFFFF)
 		p->location_of_house = 0;

--- a/openttd.c
+++ b/openttd.c
@@ -141,7 +141,7 @@ static void showhelp(void)
 		"\n"
 		"Command line options:\n"
 		"  -v drv              = Set video driver (see below)\n"
-		"  -s drv              = Set sound driver (see below)\n"
+		"  -s drv              = Set sound driver (see below) (param bufsize,hz)\n"
 		"  -m drv              = Set music driver (see below)\n"
 		"  -r res              = Set resolution (for instance 800x600)\n"
 		"  -h                  = Display this help text\n"
@@ -150,21 +150,26 @@ static void showhelp(void)
 		"  -e                  = Start Editor\n"
 		"  -g [savegame]       = Start new/save game immediately\n"
 		"  -G seed             = Set random seed\n"
-		"  -n [ip#player:port] = Start networkgame\n"
+		"  -n [ip:port#player] = Start networkgame\n"
 		"  -D                  = Start dedicated server\n"
 #if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32)
 		"  -f                  = Fork into the background (dedicated only)\n"
 #endif
 		"  -i                  = Force to use the DOS palette\n"
 		"                          (use this if you see a lot of pink)\n"
-		"  -c config_file      = Use 'config_file' instead of 'openttd.cfg'\n"
-		"\n",
+		"  -c config_file      = Use 'config_file' instead of 'openttd.cfg'\n",
 		lastof(buf)
 	);

 	p = GetDriverList(p, lastof(buf));

+	/* ShowInfo put output to stderr, but version information should go
+	 * to stdout; this is the only exception */
+#if !defined(WIN32) && !defined(WIN64)
+	printf("%s\n", buf);
+#else
 	ShowInfo(buf);
+#endif
 }


@@ -254,9 +259,15 @@ static void InitializeDynamicVariables(void)
 	_industry_sort = NULL;
 }

-static void UnInitializeDynamicVariables(void)
+
+static void UnInitializeGame(void)
 {
-	/* Dynamic stuff needs to be free'd somewhere... */
+	UnInitWindowSystem();
+
+	/* Uninitialize airport state machines */
+	UnInitializeAirports();
+
+	/* Uninitialize variables that are allocated dynamically */
 	CleanPool(&_Town_pool);
 	CleanPool(&_Industry_pool);
 	CleanPool(&_Station_pool);
@@ -266,11 +277,6 @@ static void UnInitializeDynamicVariables(void)

 	free((void*)_town_sort);
 	free((void*)_industry_sort);
-}
-
-static void UnInitializeGame(void)
-{
-	UnInitWindowSystem();

 	free(_config_file);
 }
@@ -301,7 +307,7 @@ static void LoadIntroGame(void)
 	}

 	_pause = 0;
-	_local_player = 0;
+	SetLocalPlayer(0);
 	/* Make sure you can't scroll in the menu */
 	_scrolling_viewport = 0;
 	_cursor.fix_at = false;
@@ -320,7 +326,7 @@ int ttd_main(int argc, char *argv[])
 	MyGetOptData mgo;
 	int i;
 	const char *optformat;
-	char musicdriver[16], sounddriver[16], videodriver[16];
+	char musicdriver[32], sounddriver[32], videodriver[32];
 	int resolution[2] = {0,0};
 	Year startyear = INVALID_YEAR;
 	uint generation_seed = GENERATE_NEW_SEED;
@@ -328,7 +334,7 @@ int ttd_main(int argc, char *argv[])
 	bool network   = false;
 	char *network_conn = NULL;

-	musicdriver[0] = sounddriver[0] = videodriver[0] = 0;
+	musicdriver[0] = sounddriver[0] = videodriver[0] = '\0';

 	_game_mode = GM_MENU;
 	_switch_mode = SM_MENU;
@@ -404,10 +410,10 @@ int ttd_main(int argc, char *argv[])
 	LoadFromHighScore();

 	// override config?
-	if (musicdriver[0]) ttd_strlcpy(_ini_musicdriver, musicdriver, sizeof(_ini_musicdriver));
-	if (sounddriver[0]) ttd_strlcpy(_ini_sounddriver, sounddriver, sizeof(_ini_sounddriver));
-	if (videodriver[0]) ttd_strlcpy(_ini_videodriver, videodriver, sizeof(_ini_videodriver));
-	if (resolution[0]) { _cur_resolution[0] = resolution[0]; _cur_resolution[1] = resolution[1]; }
+	if (musicdriver[0] != '\0') ttd_strlcpy(_ini_musicdriver, musicdriver, sizeof(_ini_musicdriver));
+	if (sounddriver[0] != '\0') ttd_strlcpy(_ini_sounddriver, sounddriver, sizeof(_ini_sounddriver));
+	if (videodriver[0] != '\0') ttd_strlcpy(_ini_videodriver, videodriver, sizeof(_ini_videodriver));
+	if (resolution[0] != 0) { _cur_resolution[0] = resolution[0]; _cur_resolution[1] = resolution[1]; }
 	if (startyear != INVALID_YEAR) _patches_newgame.starting_year = startyear;
 	if (generation_seed != GENERATE_NEW_SEED) _patches_newgame.generation_seed = generation_seed;

@@ -519,18 +525,14 @@ int ttd_main(int argc, char *argv[])
 	SaveToConfig();
 	SaveToHighScore();

-	// uninitialize airport state machines
-	UnInitializeAirports();
-
-	/* uninitialize variables that are allocated dynamic */
-	UnInitializeDynamicVariables();
+	/* Reset windowing system and free config file */
+	UnInitializeGame();

 	/* stop the AI */
 	AI_Uninitialize();

 	/* Close all and any open filehandles */
 	FioCloseAll();
-	UnInitializeGame();

 	return 0;
 }
@@ -595,14 +597,14 @@ static void MakeNewGameDone(void)
 {
 	/* In a dedicated server, the server does not play */
 	if (_network_dedicated) {
-		_local_player = PLAYER_SPECTATOR;
+		SetLocalPlayer(PLAYER_SPECTATOR);
 		return;
 	}

 	/* Create a single player */
 	DoStartupNewPlayer(false);

-	_local_player = 0;
+	SetLocalPlayer(0);
 	_current_player = _local_player;
 	DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_SET_AUTOREPLACE);

@@ -623,7 +625,7 @@ static void MakeNewGame(bool from_heightmap)

 static void MakeNewEditorWorldDone(void)
 {
-	_local_player = OWNER_NONE;
+	SetLocalPlayer(OWNER_NONE);

 	MarkWholeScreenDirty();
 }
@@ -682,7 +684,7 @@ static void StartScenario(void)
 	StartupEngines();
 	StartupDisasters();

-	_local_player = 0;
+	SetLocalPlayer(0);
 	_current_player = _local_player;
 	DoCommandP(0, (_patches.autorenew << 15 ) | (_patches.autorenew_months << 16) | 4, _patches.autorenew_money, NULL, CMD_SET_AUTOREPLACE);

@@ -773,7 +775,7 @@ void SwitchMode(int new_mode)
 		} else {
 			/* Update the local player for a loaded game. It is either always
 			 * player #1 (eg 0) or in the case of a dedicated server a spectator */
-			_local_player = _network_dedicated ? PLAYER_SPECTATOR : 0;
+			SetLocalPlayer(_network_dedicated ? PLAYER_SPECTATOR : 0);
 			DoCommandP(0, 0, 0, NULL, CMD_PAUSE); // decrease pause counter (was increased from opening load dialog)
 #ifdef ENABLE_NETWORK
 			if (_network_server) {
@@ -794,7 +796,7 @@ void SwitchMode(int new_mode)
 		break;

 	case SM_LOAD_HEIGHTMAP: /* Load heightmap from scenario editor */
-		_local_player = OWNER_NONE;
+		SetLocalPlayer(OWNER_NONE);

 		GenerateWorld(GW_HEIGHTMAP, 1 << _patches.map_x, 1 << _patches.map_y);
 		MarkWholeScreenDirty();
@@ -806,7 +808,7 @@ void SwitchMode(int new_mode)

 			_opt_ptr = &_opt;

-			_local_player = OWNER_NONE;
+			SetLocalPlayer(OWNER_NONE);
 			_generating_world = true;
 			/* Delete all players */
 			FOR_ALL_PLAYERS(p) {
@@ -838,7 +840,7 @@ void SwitchMode(int new_mode)
 		break;

 	case SM_GENRANDLAND: /* Generate random land within scenario editor */
-		_local_player = OWNER_NONE;
+		SetLocalPlayer(OWNER_NONE);
 		GenerateWorld(GW_RANDOM, 1 << _patches.map_x, 1 << _patches.map_y);
 		// XXX: set date
 		MarkWholeScreenDirty();
@@ -1161,8 +1163,17 @@ bool AfterLoadGame(void)
 	// convert road side to my format.
 	if (_opt.road_side) _opt.road_side = 1;

-	/* Check all NewGRFs are present */
-	if (!IsGoodGRFConfigList()) return false;
+	{
+		/* Check if all NewGRFs are present, we are very strict in MP mode */
+		GCF_Flags gcf_res = IsGoodGRFConfigList();
+		if (_networking && gcf_res != GCF_ACTIVATED) return false;
+
+		switch (gcf_res) {
+			case GCF_COMPATIBLE: _switch_mode_errorstr = STR_NEWGRF_COMPATIBLE_LOAD_WARNING; break;
+			case GCF_NOT_FOUND: return false; /*_switch_mode_errorstr = STR_NEWGRF_DISABLED_WARNING; break; */
+			default: break;
+		}
+	}

 	/* Update current year
 	 * must be done before loading sprites as some newgrfs check it */
@@ -1275,18 +1286,23 @@ bool AfterLoadGame(void)
 	 *  of course, we do need to initialize them for older savegames. */
 	if (CheckSavegameVersion(16)) {
 		FOR_ALL_PLAYERS(p) {
-			p->engine_renew_list = NULL;
-			p->engine_renew = false;
+			p->engine_renew_list   = NULL;
+			p->engine_renew        = false;
 			p->engine_renew_months = -6;
-			p->engine_renew_money = 100000;
+			p->engine_renew_money  = 100000;
 		}
-		if (IsValidPlayer(_local_player)) {
-			// Set the human controlled player to the patch settings
-			// Scenario editor do not have any companies
-			p = GetPlayer(_local_player);
-			p->engine_renew = _patches.autorenew;
+
+		/* When loading a game, _local_player is not yet set to the correct value.
+		 * However, in a dedicated server we are a spectator, so nothing needs to
+		 * happen. In case we are not a dedicated server, the local player always
+		 * becomes player 0, unless we are in the scenario editor where all the
+		 * players are 'invalid'.
+		 */
+		if (!_network_dedicated && IsValidPlayer(0)) {
+			p = GetPlayer(0);
+			p->engine_renew        = _patches.autorenew;
 			p->engine_renew_months = _patches.autorenew_months;
-			p->engine_renew_money = _patches.autorenew_money;
+			p->engine_renew_money  = _patches.autorenew_money;
 		}
 	}

@@ -1452,6 +1468,11 @@ bool AfterLoadGame(void)
 				v->u.road.slot_age = 0;
 			}
 		}
+	} else {
+		Vehicle *v;
+		FOR_ALL_VEHICLES(v) {
+			if (v->type == VEH_Road && v->u.road.slot != NULL) v->u.road.slot->num_vehicles++;
+		}
 	}

 	if (CheckSavegameVersion(26)) {
--- a/openttd.h
+++ b/openttd.h
@@ -83,6 +83,9 @@ typedef byte WindowClass;
 enum {
 	INVALID_YEAR = -1,
 	INVALID_DATE = -1,
+
+	PLAYER_FIRST    = 0x00,
+	INVALID_PLAYER  = 0xFF,
 };

 typedef int32 Year;
--- a/openttd.sln
+++ b/openttd.sln
@@ -1,14 +1,14 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen\strgen.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openttd", "openttd.vcproj", "{668328A0-B40E-4CDB-BD72-D0064424414A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0F066B23-18DF-4284-8265-F4A5E7E3B966} = {0F066B23-18DF-4284-8265-F4A5E7E3B966}
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "strgen", "strgen\strgen.vcproj", "{A133A442-BD0A-4ADE-B117-AD7545E4BDD1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs.vcproj", "{0F066B23-18DF-4284-8265-F4A5E7E3B966}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A133A442-BD0A-4ADE-B117-AD7545E4BDD1} = {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}
--- a/openttd.vcproj
+++ b/openttd.vcproj
@@ -28,7 +28,7 @@
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				StringPooling="TRUE"
 				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
@@ -101,7 +101,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="2"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
rubidium	95e386569b	(svn r8640) -Release: 0.5.0-RC5.	2007-02-08 16:25:17 +00:00
rubidium	bbbe65e1e5	(svn r8639) [0.5] -Update readme's, bugs, installers, changelogs etc. to prepare for 0.5.0-RC5.	2007-02-08 16:18:11 +00:00
rubidium	e3c71534e1	(svn r8638) [0.5] -Backport from trunk (8637): -Fix: CTRL-clicking on a hangar in the order list segfaulted as hangars are part of a station instead of real depots	2007-02-08 16:17:15 +00:00
rubidium	f8b2fb4484	(svn r8636) [0.5] -Backport from trunk (8634, 8635): -Fix: draw canal edges under buoys that are in a canal -Codechange: replace missing sprites with a red question mark	2007-02-08 14:10:14 +00:00
rubidium	87bbb7a413	(svn r8630) [0.5] -Backport lots of language updates from trunk	2007-02-08 11:26:09 +00:00
rubidium	61b95ff1fc	(svn r8627) [0.5] -Backport from trunk (8409, 8420 + 8421, 8533, 8612): -Regression: When the latest news was deleted, the news queue wrapped back to the oldest item, showing all news again. -Regression [FS#573]: ShowLastNewsMessage could show an out-of-bounds news item because it did not checked if a previous item actually existed the first time it is called (forced news is INVALID_NEWS). -Codechange: Rename the 'New <vehtype>' button of the global vehicle lists to 'Available <vehtype>' as it is a view-only list, not one from which you can purchase (rolling) stock. -Fix: segmentation fault when the toolbar gets removed and you have selected one of the items in a submenu of the toolbar. -Fix [FS#582]: When the currently selected player in the performance details window is no longer active, choose the first active player instead of the first player as that may also be inactive.	2007-02-08 11:03:00 +00:00
rubidium	0543461f5e	(svn r8626) [0.5] -Backport from trunk (8294, 8296, 8536, 8540, 8609): -Fix: deleting a vehicle with shared orders, but no orders would fail to reset prev_shared and next_shared -Fix: GenerateVehicleSortList()/CmdMassStartStopVehicle() tried to put a TileIndex into an uint16 -Fix (FS#577): Road Vehicles now can obtain a slot even if the station is very spread out -Fix[YAPF]: Assert when buoy is placed on NE or NW map edge (Dan) -Fix: a road vehicle that is very close after another (slower) road vehicle gets its speed reset to 0 when entering a tunnel, which causes a traffic jam outside of the tunnel.	2007-02-08 10:41:45 +00:00
rubidium	4e3652f337	(svn r8625) [0.5] -Backport from trunk (8253, 8273, 8497, 8520 + 8542): -Codechange: Be more strict about language generation and fail any languages not having the mandatory ##name, ##ownname and ##isocode pragma's. -Fix: return value from clamp was ignored -Codechange: Increase the size of the sound/video/music-drivers to 32 bytes (instead of 16) so their actual parameters can be passed. Sound has for example 'bufsize' and 'hz'. -Fix/Feature: requery gameservers that did not respond to their first query.	2007-02-08 10:19:03 +00:00
rubidium	1584e061eb	(svn r8624) [0.5] -Backport from trunk (8239, 8240, 8315): -Regression (r7278): Help window was empty for UNICODE builds -Fix (r8013): Put the output of -h to stdout and not to stderr (through ShowInfo) -Fix: use ShowInfo over fprintf(stderr, as Windows doesn't always have a stderr visible/available	2007-02-08 10:04:57 +00:00
rubidium	03bfa6e525	(svn r8623) [0.5] -Backport from trunk (8593, 8608, 8619, 8620) -Fix (FS#564): bridges do not get destroyed when the bridge head gets flooded and there is a vehicle on the bridge. -Fix: you were unable to build roads in the scenario editor when there is no town 0, even though there are other towns. -Fix: store the ownership of a water tile in the buoy tile and set the ownership of the water tile when the buoy is removed. This solves the issue of removing ownership from canal tiles thus making is possible for other players to remove the canal tile. -Fix: buoys on canal tiles do not flood anymore.	2007-02-08 10:00:22 +00:00
bjarni	5467635bf9	(svn r8500) [0.5] -Fix: [OSX] freetype failed to be detected (now it's always enabled because Xcode installs it) -Fix: [OSX] fontconfig is disabled even if it's found because the default one in OSX is 2.1.0 and OpenTTD needs at least 2.3.0 -Fix: FREETYPE_CONFIG is only set when it's undefined. This makes it possible to add it as argument to make	2007-01-31 22:08:23 +00:00
rubidium	47c158bbc5	(svn r8490) [0.5] -Add: logging of the IP address and port of invalid/illegal UDP packets.	2007-01-31 12:47:35 +00:00
rubidium	4e1c7b8197	(svn r8489) [0.5] -Backport from trunk (8459, 8461): check for NewGRF compatability before actually downloading the map from a game server when connecting from the command prompt and internal console.	2007-01-31 12:39:41 +00:00
Darkvater	1ec915e1c8	(svn r8228) [0.5] -Revert win32 changes	2007-01-18 00:52:33 +00:00
Darkvater	b30c56d15a	(svn r8227) [0.5] -Fix:? - Prepare 0.5 branch for release. Update readme's, bugs, installers, changelog, etc. to 0.5.0-RC4	2007-01-18 00:50:56 +00:00
Darkvater	c3fcb2ef2a	(svn r8222) [0.5] -Backport from trunk (lang, r8171, r8186, r8218): - last missed chunk of danish language changes (lang) - (FS#556) return SL_ERROR when unthreaded saves failed (r8171) - (FS#557) apply railtype offset to station graphics if no custom station is in use (r8186) - Increase spritecache size to 2MB (r8218).	2007-01-17 23:39:13 +00:00
Darkvater	1a5957ef7f	(svn r8217) [0.5] -Backport some mixed changes for WT2, remove wrong norwegian languages: - Untranslated strings: Polish (4), Icelandic (221!), Galician (144)	2007-01-17 23:13:19 +00:00
Darkvater	0867ed49a3	(svn r8213) [0.5] -Backport from trunk (r7975, r7983, r7986, r7987, r8012, r8039, r8051, r8053, r8068, r8069, r8073, r8082, r8084, r8085, r8086, r8087, r8088, r8108, r8121, r8122, r8148, r8162, r8163, r8193, r8206): - Language file updates. - Untranslated strings: Polish (4), Icelandic (221!), Galician (144), Brazilian-Portugese (4). - Add Japanese, Norwegian bokmal/nynorsk, Slovenian as finished.	2007-01-17 22:37:14 +00:00
Darkvater	6c3b245d88	(svn r8182) -Backport from trunk (r8137, r8147, r8157): - (FS#551) roadstop->num_vehicles was wrong for old savegames loaded for MP (r8137) - v->leave_depot_instantly was not always reset correctly (r8147) - moving cargo during auto replaces did not update the cached vehicle weight for trains properly (r8157) NOTE This fixes several desync issues. Big props to Rubidium for finding, debugging and fixing them!	2007-01-17 01:23:50 +00:00
Darkvater	a74b15af79	(svn r8181) -Backport from trunk (r8133): - (FS#535) "out of sprite memory" warning messages (smatz)	2007-01-17 01:19:09 +00:00
Darkvater	ac3b1883ed	(svn r8180) -Backport from trunk (r8093, r8094, r8105, r8106, (r8107), r8111, r8165): - Show the activated status of the GRF after pressing apply in window (r8094) - Add the ability to load savegames without matching grf's. NOTE: currently this feature is different from trunk in behaviour as it does NOT allow you to load savegames with MISSING grfs only compatible (matching GRFID, non- matching MD5SUM).	2007-01-17 01:17:44 +00:00
Darkvater	40245ce496	(svn r8179) -Backport from trunk (r8065, r8101, r8119, r8123, r8140, r8150): - The station list does now remember the sort settings (r8065) - Uninitializing windows calls WE_DESTROY to free dynamic memory used (r8101, r8119) - (FS#538) Findfirstbit returns first bit (bouys now numbered 1..9) (r8123) - FS#54) Combat helicopter shoots from right position, (r8140) - Submarine disaster did not move around (r8158)	2007-01-17 01:02:51 +00:00
Darkvater	c73bbe531e	(svn r8178) -Backport from turnk (r8049, r8079, r8080, r8135): - oe more news-window fix and fix up ShowLastNewsMessage (r8049) - float division by 0 in YAPF code on Win9x (r8079, r8080) - do not assert when removing duplicates would remove non-static grf (r8135)	2007-01-17 00:51:04 +00:00
matthijs	8576c2cc40	(svn r8177) - [Debian] Prepare debian packaging files for 0.5.0-rc4	2007-01-17 00:38:51 +00:00
Darkvater	1778566ab8	(svn r8176) -Backport from trunk (r8042, r8089, r8090, r8112): - OS/2 compilation with GCC (thanks to Paul Smedley and TrueBrain for help) (r8042) - [win32] *nprintf functions are broken, 'len = count' wasn't handled (r8089, r8090) - MSVC solution files will make openttd THE startup project (r8112)	2007-01-17 00:38:27 +00:00
Darkvater	a4bab5f17f	(svn r8175) -Backport from trunk (r8030, r8070, r8071, r8074): - crash when removing a town in the scenario editor and the query tool is open for a town's tile (r8030) - (FS#537) heightmap crashes when rescaling, or using 24bpp bitmaps (r8070, r8074) - (FS#536) inauguration date of companies from TTDP games was wrong (r8071)	2007-01-17 00:29:16 +00:00
Darkvater	06367834c6	(svn r8174) -Backport from trunk (r8027, r8028, r8043, r8132): - (FS#486) pause command issues with shift-pressed did not pause the game, interference with pause_on_join (r8027) - overflow of ticks was not handled properly, possibly resulting a non-reacting gameserver/gameclient (r8028, r8043) - The game could crash when the chat key (<ENTER>) is pressed too quickly during join (r8132)	2007-01-17 00:20:23 +00:00
Darkvater	f08141ae48	(svn r8173) -Backport from trunk (r8026): - picking up transferring cargo, trains will now also have the virtual profit deducted	2007-01-17 00:08:49 +00:00
Darkvater	25059d28df	(svn r8172) -Backport from trunk (r8013, r8134): - Show error messages about our own data files as ShowInfo(F) and output console error to stderr and not stdout.	2007-01-17 00:05:51 +00:00
Darkvater	b57b2224e9	(svn r8170) -Backport from trunk (r7984, r8118, r8167, r8168): - out-of-bounds read access on _clients array (Quark) (r7984) - change the ordering of the network list (r8118) - (FS#556): a network client crashes, due to a division by zero (r8167) - ParseConnectionstring didn't use the port parameter if a player was also specified (r8168)	2007-01-16 23:59:03 +00:00
celestar	70920944d8	(svn r7979) [0.5] - Fix: Segfault in the newgrf loading code (grfmsg => DEBUG). Do it in the right directory this time. Sorry for da mess :S	2007-01-08 14:01:05 +00:00
Darkvater	06b5d32983	(svn r7970) -Backport from trunk (r7968, r7969): - Update year throughout the program to 2007 - Minor update to changelog, known-bugs file (Bjarni)	2007-01-07 17:38:58 +00:00
Darkvater	34f8ab2f81	(svn r7967) - Prepare 0.5 branch for release. Update readme's, bugs, installers, changelog, etc. to 0.5.0-RC3	2007-01-07 16:43:46 +00:00
Darkvater	315ec78344	(svn r7963) -Backport from trunk (r7716, r7717, r7718): - Bad signal propagation through tunnel-ends, incompatible railtype signal propagation still possible (not fixed).	2007-01-07 14:10:56 +00:00
Darkvater	0bf1d6c49d	(svn r7962) -Backport from trunk (r7689, r7696, r7699, r7701, r7704, r7706, r7707, r7713, r7715, r7723, r7732, r7738, r7742, r7743, r7746, r7754, r7756, r7787, r7800, r7803, r7806, r7807, r7819, r7828, r7857, r7884, r7896, r7905): - Language file updates. - Untranslated strings: Icelandic (217!), Hungarian (2), Galician (140), Finnish (3), Brazilian-Portugese (3). - Moved Lithuanian from unfinished to finished.	2007-01-07 13:49:54 +00:00
matthijs	6f291a7e6d	(svn r7958) - [Debian] Prepare debian packing files for 0.5.0-rc3	2007-01-07 12:44:45 +00:00
Darkvater	04d77258c5	(svn r7957) -Backport from trunk (r7936): - Only update the signals and YAPF cache on a DC_EXEC action for bridge-building	2007-01-07 12:20:48 +00:00
Darkvater	fbfa0b8009	(svn r7956) -Backport from trunk (r7930): - wrong TTDPatch GRF flag was set for gradual loading	2007-01-07 12:19:56 +00:00
Darkvater	8960b5740f	(svn r7955) -Backport from trunk (r7886): - [osx] control+enter no longer fullscreens, interfered with team-chat.	2007-01-07 12:19:08 +00:00
Darkvater	30fadfb54b	(svn r7954) -Backport from trunk (r7864): - offset engines/wagons by half width in details window; fixes overflowing for display	2007-01-07 12:18:05 +00:00
Darkvater	b342991853	(svn r7953) -Backport from trunk (r7840, r7843): - [win32] Update crash window text (+crash.dmp -submit)	2007-01-07 12:16:53 +00:00
Darkvater	0a635c692e	(svn r7952) -Backport from trunk (r7823, r7861): - News windows could still crash due to moving news items around while a news window was still open.	2007-01-07 12:15:36 +00:00
Darkvater	0a211097ac	(svn r7951) -Backport from trunk (r7810, r7812): - Building airport whose size exceeds max station spread-out caused assert. (r7810) - rail station build window was not correctly updated after station_spread change (r7812)	2007-01-07 12:13:57 +00:00
Darkvater	1277599c30	(svn r7950) -Backport from trunk (r7760, r7766): - Sprite usage debug message showed the starting sprite, not current sprite, and only do this during activation (r7760). - [OSX] Remove incorrect debug message about missing grf files.	2007-01-07 12:11:54 +00:00
Darkvater	bae0695ac9	(svn r7949) -Backport from trunk (r7733): - do not use WP(w, querystr_d) and WP(w, def_d) for the same window	2007-01-07 12:07:07 +00:00
Darkvater	630f81c382	(svn r7948) -Backport from trunk (r7731): - off-by-one error in the date to YMD calculation for first 4 years of a century that was not divisable by 400	2007-01-07 12:06:34 +00:00
Darkvater	2684cb2525	(svn r7947) -Backport from trunk (r7727): - [sdl] sometimes ALT-TAB could trigger the fast forward	2007-01-07 12:05:47 +00:00
Darkvater	610b6e3953	(svn r7946) -Backport from trunk (r7711, r7795, r7831): - NewGRF Action 7, GRF check condition 10 didn't ignore unknown GRF IDs (r7354) - NewGRF safety scan fixes action E (allow unifont.grf) and Action 0 prop D (bridge) (r7795, r7831)	2007-01-07 11:53:12 +00:00
Darkvater	563857d5bd	(svn r7945) -Backport from trunk (r7700): - Caret randomly jumping back&forth for new randomseed (r7182)	2007-01-07 11:37:23 +00:00
Darkvater	58d18a3ef3	(svn r7944) -Backport from trunk (r7692): - -OpenTTD didn't compile without network enabled (newgrf sync code)	2007-01-07 11:34:20 +00:00
rubidium	0b7ab719f3	(svn r7893) [0.5] -Fix (FS#485): the configure script did not work work for dash, a sh compatible shell.	2007-01-05 23:43:20 +00:00
Darkvater	f5439821c1	(svn r7694) -Update known-bugs file.	2006-12-31 11:28:42 +00:00
Darkvater	d11a6a439a	(svn r7685) - Prepare 0.5 branch for release. Update readme's, bugs, installers, changelog, etc. to 0.5.0-RC2	2006-12-31 01:21:00 +00:00
Darkvater	99096b83bd	(svn r7684) -Backport from trunk (r7620): - Bad signal update through incompatible rail types, bridge.	2006-12-31 00:52:33 +00:00
Darkvater	75c538962d	(svn r7683) -Backport from trunk (r7552, r7553, r7574, r7581, r7601, r7611, r7654, r7658): - Language file updates. - Untranslated strings: Turkish (2), Swedish (1), Romanian (3), Norwegian (2), Icelandic (217!), Hungarian (2), German (1), Galician (173), Finnish (26), Danish (23), Czech (34), Bulgarian (39), Brazilian-Portugese (3)	2006-12-31 00:01:07 +00:00
Darkvater	51cd7bd43b	(svn r7682) -Backport from trunk (r7539, r7541, r7603): - Added esperanto language files to MS projects (r7539). - Polish townname generator uses proper UNICODE characters (r7603).	2006-12-30 23:38:41 +00:00
Darkvater	0b67caa8ad	(svn r7681) -Backport from trunk (r7585, r7590, r7599): - Drastically reduce CheckStationSpreadOut CPU usage which got called way too much by the AI.	2006-12-30 23:35:01 +00:00
Darkvater	4ec96ba2d0	(svn r7680) -Backport from trunk (r7586): - Remove landscaping toolbar from road-toolbar in scenario editor	2006-12-30 23:32:22 +00:00
Darkvater	b93e8d6c71	(svn r7679) -Backport from trunk (r7628): - [YAPF] suppress 'Train is lost' message if pathfinding ended on the first two-way red signal	2006-12-30 23:30:21 +00:00
Darkvater	ac945ced7e	(svn r7678) -Fix (r7674): DEBUG macro has been changed	2006-12-30 23:29:33 +00:00
Darkvater	5c190a0c33	(svn r7677) -Backport from trunk (r7657): - 'Goto Depot' did not work for helicopters going to an airport without depot	2006-12-30 23:26:47 +00:00
Darkvater	b5715acaf8	(svn r7676) -Backport from trunk (r7630, r7631): - cur/old economy memmove magic (r7630). - wrong pointer arithmetic that totally corrupted animated_tiles table, desyncing between different endiannes-machines in multiplayer (r7631).	2006-12-30 23:25:57 +00:00
Darkvater	0e7701fbe6	(svn r7675) -Backport from trunk (r7606): - [NewStations] Add support for variables 45 and 65.	2006-12-30 23:23:43 +00:00
Darkvater	59167f686e	(svn r7674) -Backport from trunk (r7580): - Wrong bounding boxes were computed for certain strings.	2006-12-30 23:22:55 +00:00
Darkvater	0adf61e7fa	(svn r7673) -Backport from trunk (r7563): - [FS#468] Removing towns in scenario editor didn't remove their subsidies.	2006-12-30 23:21:55 +00:00
Darkvater	6fa93f4a7a	(svn r7672) -Backport from trunk (r7562): - [win32] OpenTTD didn't always remember its maximized state on restart.	2006-12-30 23:21:02 +00:00
Darkvater	f3424f51bc	(svn r7671) -Backport from trunk (r7560, r7561, r7566): - No new company could join if 8 clients were connected in less than 8 companies (r7560). - [FS#431] internal and visible settings of autorenew could go out of sync (r8561). - Server told clients to start syncing from a bad position, causing asserts/crashes (r7566).	2006-12-30 23:20:00 +00:00
Darkvater	6c8f12de78	(svn r7670) -Backport from trunk (r7558, r7559): - [FS#464] do not wait till a crashed vehicle is removed before starting to load other vehicles (r7558). - [FS#456] clicking 'full load' can change depot order under certain circumstances (r7559).	2006-12-30 23:14:39 +00:00
Darkvater	953fc9e196	(svn r7669) -Backport from trunk (r7556): - screenshot no_con didn't remove console from screenshot.	2006-12-30 23:12:05 +00:00
Darkvater	737220f39c	(svn r7668) -Backport from trunk (r7555): - off-by-one error due do truncation on division by 2 in heightmap code.	2006-12-30 23:11:14 +00:00
Darkvater	e00a47d47d	(svn r7667) -Backport from trunk (r7549, r7551, r7554, r7582, r7594): - change size of newgrf GUI to same size as TTDP (no overflows) (r7549). - segmentation fault on showing NewGRF settings of a network game (r7551). - in Action 0xE, don't deactivate the current GRF (r7554). - appending static GRF's could cause duplicate GRF's in the list (r7582). - GRF config not cleared when no GRF's are used (r7594).	2006-12-30 23:09:27 +00:00
Darkvater	cf52f00f46	(svn r7666) -Backport from trunk (r7548): - Some MorphOS changes to get OpenTTD compiled, packaged.	2006-12-30 23:04:14 +00:00
Darkvater	d4b335fffb	(svn r7665) -Backport from trunk (r7547): - When removing a rail station, the cost was added for the full rectangle not for only the removed tiles themselves.	2006-12-30 23:03:15 +00:00
Darkvater	652e834ee7	(svn r7664) -Backport from trunk (r7587, r7588, r7600, r7605, r7626, r7629): - [OSX] universal binary docs, makefile (r7587, r7588, r7626). - General documentation update (r7600, r7605). - openttd -h showed outdated help for '-n' switch (r7629).	2006-12-30 23:00:52 +00:00
Darkvater	dfab8c779b	(svn r7662) -Backport from trunk (r7557, r7624): - [OSX] makefile fixes (static libfontconfig) (r7557). - [FS#470] Install openttd.32.bmp on install so that SDL window has icon (r76240.	2006-12-30 22:55:31 +00:00
Darkvater	bbdbdf3818	(svn r7661) -Backport from trunk (r7550): - [win32] x64 compile fixed.	2006-12-30 22:53:05 +00:00
Darkvater	0264283116	(svn r7660) -Backport from trunk (r7537, r7539): - Changelog updates	2006-12-30 22:50:49 +00:00
matthijs	6f97748c80	(svn r7659) - [Debian] Prepare debian packing files for 0.5.0-rc2	2006-12-30 22:36:22 +00:00
Darkvater	65d6403497	(svn r7536) -Branch: add 0.5 branch	2006-12-21 20:56:57 +00:00