(svn r7978) [0.5] - Fix: Revert the previous commit. it WAS in the wrong dir

(svn r7977) [0.5] - Fix: Segfault in newgrf loading code. grfmsg changed to DEBUG
(svn r7971) Release 0.5.0-RC3
2025-08-14 01:59:09 +00:00 · 2007-01-08 14:00:14 +00:00 · 2007-01-08 13:57:40 +00:00 · 2007-01-07 17:53:34 +00:00 · 2007-01-07 17:38:58 +00:00 · 2007-01-07 16:43:46 +00:00
103 changed files with 9761 additions and 4657 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-RC3

 # 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,35 @@
+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 +78,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 +119,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/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/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/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_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 January 07, 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;
--- 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];
--- a/heightmap.c
+++ b/heightmap.c
@@ -318,8 +318,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 >= (img_height + row_pad)) ||
+					(col < col_pad) || (col >= (img_width  + col_pad))) {
 				SetTileHeight(tile, 0);
 			} else {
 				/* Use nearest neighbor resizing to scale map data.
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -19,30 +19,39 @@ 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
+-524	OSX sometimes (not always) fails to find free disk space
+-523	Aircraft too cheap
+-522	overflow on vehicle costs
+-521	Mythical train
+-519	Bridge building results in 'missing' pieces
+-518	Vehicle at final leg of transfer chain gets negative profit on load
+-513	Client Crash - Server running saved game
+-508	Destroying trees and replanting => raised rating
+-503	Load game failed: inflate() failed.
+-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.
+-489	[0.5.0rc1] Sound choppy on Vista
+-483	!invalid string id 0 in GetString when trying to host a game after upgrade to 0.5.0-RC1 - workaround
+-474	Overtaking car doesn't hit the against-riding car.
+-465	Crash in Linux (Debian)
+-460	vehicles not avaible - unable to build
+-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,9 +60,7 @@ 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
@@ -69,24 +76,17 @@ 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
 ------------------------------------------------------------------------
@@ -97,7 +97,6 @@ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse
 -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 +107,9 @@ 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
+- 941694	Clipping problems stations/vehicles on slopes
--- a/lang/american.txt
+++ b/lang/american.txt
@@ -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}
@@ -1308,6 +1309,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

@@ -2888,6 +2890,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
--- a/lang/brazilian_portuguese.txt
+++ b/lang/brazilian_portuguese.txt
@@ -158,7 +158,7 @@ STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Não é
 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 equipe do OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 A equipe do OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Tradutor(es) -

 STR_00C5                                                        :{BLACK}{CROSS}
--- a/lang/bulgarian.txt
+++ b/lang/bulgarian.txt
@@ -154,11 +154,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 +287,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}Сам играч
@@ -391,7 +394,15 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Товарен
 STR_NO_WAITING_CARGO                                            :{BLACK}Няма чакащ товар
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Избор на всички съоръжения
 STR_SELECT_ALL_TYPES                                            :{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                                                    :Ян
@@ -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}

@@ -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}Присъединяване към игра

@@ -1999,7 +2013,7 @@ STR_16816_CITY_APPROVAL                                         :{LTBLUE}Отн
 STR_26816_NONE                                                  :Николко
 STR_6816_LOW                                                    :Ниско/Малко
 STR_6817_NORMAL                                                 :Нормално
-STR_6818_HIGH                                                   :Високо/Много
+STR_6818_HIGH                                                   :Много
 STR_6819                                                        :{BLACK}{SMALLLEFTARROW}
 STR_681A                                                        :{BLACK}{SMALLRIGHTARROW}
 STR_681B_VERY_SLOW                                              :Много бавно
@@ -2499,16 +2513,20 @@ STR_INVALID_ORDER                                               :{RED} (Нева
 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,6 +2889,31 @@ 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_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_CURRENCY_WINDOW                                             :{WHITE}Поръчкова валута
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Обменен курс: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/catalan.txt
+++ b/lang/catalan.txt
@@ -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,7 +292,7 @@ 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

@@ -358,7 +359,7 @@ 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ó
@@ -422,7 +423,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
@@ -623,7 +624,7 @@ STR_022B_RESET_LANDSCAPE                                        :{BLACK}Restable
 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_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Estàs segur que vols 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 +738,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
@@ -1096,7 +1097,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 +1186,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
@@ -1795,7 +1796,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}
@@ -2889,6 +2890,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
--- a/lang/czech.txt
+++ b/lang/czech.txt
@@ -1,8 +1,9 @@
 ##name Czech
-##ownname Cesky
+##ownname Česky
 ##isocode cs_CS.UTF-8
 ##plural 6
-##case big gen news subs
+##case nom gen acc dat voc loc ins big
+##gender m m_a m_i f n

 ##id 0x0000
 STR_NULL                                                        :
@@ -21,148 +22,92 @@ STR_000C_ACCEPTS                                                :{BLACK}Přijím
 STR_000D_ACCEPTS                                                :{BLACK}Přijímá: {GOLD}
 STR_000E                                                        :
 STR_000F_PASSENGERS                                             :cestující
-STR_000F_PASSENGERS.big                                         :Cestující
 STR_000F_PASSENGERS.gen                                         :cestujících
-STR_000F_PASSENGERS.news                                        :cestujících
-STR_000F_PASSENGERS.subs                                        :Cestující
+STR_000F_PASSENGERS.big                                         :Cestující
 STR_0010_COAL                                                   :uhlí
 STR_0010_COAL.big                                               :Uhlí
-STR_0010_COAL.subs                                              :Uhlí
 STR_0011_MAIL                                                   :pošta
-STR_0011_MAIL.big                                               :Pošta
 STR_0011_MAIL.gen                                               :pošty
-STR_0011_MAIL.news                                              :pošty
-STR_0011_MAIL.subs                                              :Pošta
+STR_0011_MAIL.big                                               :Pošta
 STR_0012_OIL                                                    :ropa
-STR_0012_OIL.big                                                :Ropa
 STR_0012_OIL.gen                                                :ropy
-STR_0012_OIL.news                                               :ropy
-STR_0012_OIL.subs                                               :Ropa
+STR_0012_OIL.big                                                :Ropa
 STR_0013_LIVESTOCK                                              :dobytek
-STR_0013_LIVESTOCK.big                                          :Dobytek
 STR_0013_LIVESTOCK.gen                                          :dobytka
-STR_0013_LIVESTOCK.news                                         :dobytka
-STR_0013_LIVESTOCK.subs                                         :Dobytek
+STR_0013_LIVESTOCK.big                                          :Dobytek
 STR_0014_GOODS                                                  :zboží
 STR_0014_GOODS.big                                              :Zboží
-STR_0014_GOODS.subs                                             :Zboží
 STR_0015_GRAIN                                                  :zrní
 STR_0015_GRAIN.big                                              :Zrní
-STR_0015_GRAIN.subs                                             :Zrní
 STR_0016_WOOD                                                   :dřevo
-STR_0016_WOOD.big                                               :Dřevo
 STR_0016_WOOD.gen                                               :dřeva
-STR_0016_WOOD.news                                              :dreva
-STR_0016_WOOD.subs                                              :Drevo
+STR_0016_WOOD.big                                               :Dřevo
 STR_0017_IRON_ORE                                               :železná ruda
-STR_0017_IRON_ORE.big                                           :Železná ruda
 STR_0017_IRON_ORE.gen                                           :železné rudy
-STR_0017_IRON_ORE.news                                          :železné rudy
-STR_0017_IRON_ORE.subs                                          :Železná ruda
+STR_0017_IRON_ORE.big                                           :Železná ruda
 STR_0018_STEEL                                                  :ocel
-STR_0018_STEEL.big                                              :Ocel
 STR_0018_STEEL.gen                                              :oceli
-STR_0018_STEEL.news                                             :oceli
-STR_0018_STEEL.subs                                             :Ocel
+STR_0018_STEEL.big                                              :Ocel
 STR_0019_VALUABLES                                              :ceniny
-STR_0019_VALUABLES.big                                          :Ceniny
 STR_0019_VALUABLES.gen                                          :cenin
-STR_0019_VALUABLES.news                                         :cenin
-STR_0019_VALUABLES.subs                                         :Ceniny
+STR_0019_VALUABLES.big                                          :Ceniny
 STR_001A_COPPER_ORE                                             :měděná ruda
-STR_001A_COPPER_ORE.big                                         :Měděná ruda
 STR_001A_COPPER_ORE.gen                                         :měděné rudy
-STR_001A_COPPER_ORE.news                                        :medene rudy
-STR_001A_COPPER_ORE.subs                                        :Medena ruda
+STR_001A_COPPER_ORE.big                                         :Měděná ruda
 STR_001B_MAIZE                                                  :kukuřice
 STR_001B_MAIZE.big                                              :Kukuřice
-STR_001B_MAIZE.subs                                             :Kukurice
 STR_001C_FRUIT                                                  :ovoce
 STR_001C_FRUIT.big                                              :Ovoce
-STR_001C_FRUIT.subs                                             :Ovoce
 STR_001D_DIAMONDS                                               :diamanty
-STR_001D_DIAMONDS.big                                           :Diamanty
 STR_001D_DIAMONDS.gen                                           :diamantů
-STR_001D_DIAMONDS.news                                          :diamantu
-STR_001D_DIAMONDS.subs                                          :Diamanty
+STR_001D_DIAMONDS.big                                           :Diamanty
 STR_001E_FOOD                                                   :jídlo
-STR_001E_FOOD.big                                               :Jídlo
 STR_001E_FOOD.gen                                               :jídlo
-STR_001E_FOOD.news                                              :jídlo
-STR_001E_FOOD.subs                                              :Jídlo
+STR_001E_FOOD.big                                               :Jídlo
 STR_001F_PAPER                                                  :papír
-STR_001F_PAPER.big                                              :Papír
 STR_001F_PAPER.gen                                              :papíru
-STR_001F_PAPER.news                                             :papíru
-STR_001F_PAPER.subs                                             :Papír
+STR_001F_PAPER.big                                              :Papír
 STR_0020_GOLD                                                   :zlato
-STR_0020_GOLD.big                                               :Zlato
 STR_0020_GOLD.gen                                               :zlata
-STR_0020_GOLD.news                                              :zlata
-STR_0020_GOLD.subs                                              :Zlato
+STR_0020_GOLD.big                                               :Zlato
 STR_0021_WATER                                                  :voda
-STR_0021_WATER.big                                              :Voda
 STR_0021_WATER.gen                                              :vody
-STR_0021_WATER.news                                             :vody
-STR_0021_WATER.subs                                             :Voda
+STR_0021_WATER.big                                              :Voda
 STR_0022_WHEAT                                                  :pšenice
 STR_0022_WHEAT.big                                              :Pšenice
-STR_0022_WHEAT.subs                                             :Pšenice
 STR_0023_RUBBER                                                 :kaučuk
-STR_0023_RUBBER.big                                             :Kaučuk
 STR_0023_RUBBER.gen                                             :kaučuku
-STR_0023_RUBBER.news                                            :kaucuku
-STR_0023_RUBBER.subs                                            :Kaucuk
+STR_0023_RUBBER.big                                             :Kaučuk
 STR_0024_SUGAR                                                  :cukr
-STR_0024_SUGAR.big                                              :Cukr
 STR_0024_SUGAR.gen                                              :cukru
-STR_0024_SUGAR.news                                             :cukru
-STR_0024_SUGAR.subs                                             :Cukr
+STR_0024_SUGAR.big                                              :Cukr
 STR_0025_TOYS                                                   :hračky
-STR_0025_TOYS.big                                               :Hračky
 STR_0025_TOYS.gen                                               :hraček
-STR_0025_TOYS.news                                              :hracek
-STR_0025_TOYS.subs                                              :Hracky
+STR_0025_TOYS.big                                               :Hračky
 STR_0026_CANDY                                                  :bonbony
-STR_0026_CANDY.big                                              :Bonbony
 STR_0026_CANDY.gen                                              :bonbonů
-STR_0026_CANDY.news                                             :bonbonu
-STR_0026_CANDY.subs                                             :Bonbony
+STR_0026_CANDY.big                                              :Bonbony
 STR_0027_COLA                                                   :kola
-STR_0027_COLA.big                                               :Kola
 STR_0027_COLA.gen                                               :koly
-STR_0027_COLA.news                                              :coly
-STR_0027_COLA.subs                                              :Cola
+STR_0027_COLA.big                                               :Kola
 STR_0028_COTTON_CANDY                                           :cukrová vata
-STR_0028_COTTON_CANDY.big                                       :Cukrová vata
 STR_0028_COTTON_CANDY.gen                                       :cukrové vaty
-STR_0028_COTTON_CANDY.news                                      :cukrové vaty
-STR_0028_COTTON_CANDY.subs                                      :Cukrová vata
+STR_0028_COTTON_CANDY.big                                       :Cukrová vata
 STR_0029_BUBBLES                                                :bubliny
-STR_0029_BUBBLES.big                                            :Bubliny
 STR_0029_BUBBLES.gen                                            :bublin
-STR_0029_BUBBLES.news                                           :bublin
-STR_0029_BUBBLES.subs                                           :Bubliny
+STR_0029_BUBBLES.big                                            :Bubliny
 STR_002A_TOFFEE                                                 :karamel
-STR_002A_TOFFEE.big                                             :Karamel
 STR_002A_TOFFEE.gen                                             :karamelu
-STR_002A_TOFFEE.news                                            :karamelu
-STR_002A_TOFFEE.subs                                            :Karamel
+STR_002A_TOFFEE.big                                             :Karamel
 STR_002B_BATTERIES                                              :baterie
-STR_002B_BATTERIES.big                                          :Baterie
 STR_002B_BATTERIES.gen                                          :baterií
-STR_002B_BATTERIES.news                                         :baterií
-STR_002B_BATTERIES.subs                                         :Baterie
+STR_002B_BATTERIES.big                                          :Baterie
 STR_002C_PLASTIC                                                :plast
-STR_002C_PLASTIC.big                                            :Plast
 STR_002C_PLASTIC.gen                                            :plastu
-STR_002C_PLASTIC.news                                           :plastu
-STR_002C_PLASTIC.subs                                           :Plast
+STR_002C_PLASTIC.big                                            :Plast
 STR_002D_FIZZY_DRINKS                                           :limonáda
-STR_002D_FIZZY_DRINKS.big                                       :Limonáda
 STR_002D_FIZZY_DRINKS.gen                                       :limonád
-STR_002D_FIZZY_DRINKS.news                                      :limonád
-STR_002D_FIZZY_DRINKS.subs                                      :Limonáda
+STR_002D_FIZZY_DRINKS.big                                       :Limonáda
 STR_002E                                                        :
 STR_002F_PASSENGER                                              :cestujících
 STR_0030_COAL                                                   :uhlí
@@ -267,11 +212,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}
@@ -506,7 +452,15 @@ 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_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
@@ -1125,6 +1079,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}
@@ -1412,6 +1367,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

@@ -2983,13 +2939,39 @@ 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_CURRENCY_WINDOW                                             :{WHITE}Vlastní měna
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz měny: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/danish.txt
+++ b/lang/danish.txt
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Kort - {
 STR_00B1_GAME_OPTIONS                                           :{WHITE}Spilindstillinger
 STR_00B2_MESSAGE                                                :{YELLOW}Besked
 STR_00B3_MESSAGE_FROM                                           :{YELLOW}Besked fra {STRING}
+STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Advarsel!
 STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Det kan du ikke....
 STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kan ikke rydde området....
 STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheder reserveret
 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}  Oversætter(e) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -1308,6 +1309,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Beskytt
 STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVEREN ER OFFLINE
 STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVEREN ER FULD
 STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}Din og serverens version passer ikke sammen
+STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MATCHER IKKE

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Tilslut dig et spil

@@ -2888,9 +2890,30 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}Der er i
 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 ved at lave ændringer i et igangværende spil; dette kan få OpenTTD til at gå ned.{}Er du helt sikker på at du vil fortsætte?

+STR_NEWGRF_ADD                                                  :{BLACK}Tilføj
+STR_NEWGRF_ADD_TIP                                              :{BLACK}Tilføj et NewGRF-arkiv til listen
+STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
+STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Fjern det valgte NewGRF-arkiv fra listen
+STR_NEWGRF_MOVEUP                                               :{BLACK}Flyt op
+STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Flyt det valgte NewGRF-arkiv op i listen
+STR_NEWGRF_MOVEDOWN                                             :{BLACK}Flyt ned
+STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Flyt det valgte NewGRF-arkiv ned i listen
+STR_NEWGRF_FILE_TIP                                             :{BLACK}En liste over de NewGRF-arkiver der er installeret. Klik på et arkiv for at ændre dets indstillinger.
+STR_NEWGRF_PARAMETER                                            :{BLACK}Indstillinger: {SILVER}{STRING}
+STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Indtast NewGRF-indstillinger
+STR_NEWGRF_NO_INFO                                              :{BLACK}Ingen information tilgængelig

+STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tilgængelige NewGRF-arkiver
+STR_NEWGRF_ADD_FILE                                             :{BLACK}Tilføj til udvalg
+STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Tilføj det valgte NewGRF-arkiv til din konfiguration
+STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Genindlæs arkiver
+STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Opdater listen over tilgængelige NewGRF-arkiver
+STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan ikke tilføje arkiv: dobbelt GRF ID

+STR_NEWGRF_NOT_FOUND                                            :{RED}Tilsvarende arkiv blev ikke fundet
+STR_NEWGRF_DISABLED                                             :{RED}Deaktiveret

 STR_CURRENCY_WINDOW                                             :{WHITE}Brugerdefineret møntfod
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurs: {ORANGE}{CURRENCY} = £ {COMMA}
--- a/lang/dutch.txt
+++ b/lang/dutch.txt
@@ -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}
@@ -1308,6 +1309,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

@@ -2888,6 +2890,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
--- a/lang/english.txt
+++ b/lang/english.txt
@@ -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}
--- a/lang/esperanto.txt
+++ b/lang/esperanto.txt
@@ -14,7 +14,7 @@ STR_0005                                                        :{RED}{CURRENCY6
 STR_EMPTY                                                       :
 STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Necesas ebena lando
 STR_0008_WAITING                                                :{BLACK}Atendas: {WHITE}{STRING}
-STR_0009                                                        :{WHITE}{CARGO}
+STR_0009                                                        :{WHITE} {CARGO}
 STR_000A_EN_ROUTE_FROM                                          :{WHITE}{CARGO}{YELLOW}  (survoje de
 STR_000B                                                        :{YELLOW}{STATION})
 STR_000C_ACCEPTS                                                :{BLACK}Akceptas: {WHITE}
@@ -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}
@@ -327,12 +328,16 @@ 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
@@ -1019,6 +1024,7 @@ STR_CONFIG_PATCHES_FULLLOADANY                                  :{LTBLUE}Ĉe 'pl
 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}
@@ -1304,6 +1310,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

@@ -1497,6 +1504,8 @@ STR_0807_ESTIMATED_INCOME                                       :{WHITE}Atendata
 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
@@ -1574,6 +1583,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 +1660,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 +1668,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,7 +1679,9 @@ 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
@@ -1729,6 +1746,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 +1764,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 +1779,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 +1801,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
@@ -1912,7 +1936,46 @@ STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...vi ja
 ############ 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                                                  :Sennome
+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!

@@ -1959,6 +2022,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 +2054,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 +2107,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 +2163,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 +2347,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 +2419,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 +2500,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 +2511,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 +2520,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
@@ -2437,14 +2542,19 @@ STR_8825_NON_STOP                                               :{BLACK}Senhalte
 STR_8826_GO_TO                                                  :{BLACK}Iru al
 STR_8827_FULL_LOAD                                              :{BLACK}Plene ŝarĝu
 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 +2562,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 +2598,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 +2621,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 +2685,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 +2699,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 +2823,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 +2857,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 +2891,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_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}
@@ -2786,11 +2926,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 +2975,30 @@ 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_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 +3013,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}Signolisto - {COMMA} Signo{P "" j}

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

@@ -2854,35 +3027,81 @@ 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ĝo 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_TREE_PLACER                                                 :{BLACK}Arba algoritmo:
 STR_HEIGHTMAP_ROTATION                                          :{BLACK}Altecmapa turniĝo:
+STR_TERRAIN_TYPE                                                :{BLACK}Terentipo:
+STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Marnivelo:
+STR_SMOOTHNESS                                                  :{BLACK}Ebeneco:
+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_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
 STR_HEIGHTMAP_NAME                                              :{BLACK}Altecmapa 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_SMALL_AIRPORT                                               :{BLACK}Malgranda
 STR_CITY_AIRPORT                                                :{BLACK}Urbo
 STR_METRO_AIRPORT                                               :{BLACK}Ĉefurba Flughaveno
 STR_INTERNATIONAL_AIRPORT                                       :{BLACK}Internacia flughaveno
@@ -2892,6 +3111,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
@@ -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}
@@ -308,7 +309,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
@@ -343,17 +344,17 @@ 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
+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

-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 +394,14 @@ 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_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 +425,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 +446,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 +476,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}
@@ -521,7 +529,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 +543,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 +551,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
@@ -603,14 +611,14 @@ 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
@@ -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
@@ -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}

@@ -2177,7 +2186,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 +2208,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 +2887,30 @@ 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_CURRENCY_WINDOW                                             :{WHITE}Oma valuutta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vaihtokurssi: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2997,7 +3020,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
@@ -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}
@@ -1076,7 +1077,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}
@@ -1973,7 +1974,7 @@ STR_SV_STNAME_SIDINGS                                           :{STRING} Voies
 STR_SV_STNAME_BRANCH                                            :{STRING} Embranchement
 STR_SV_STNAME_UPPER                                             :Haut {STRING}
 STR_SV_STNAME_LOWER                                             :Bas {STRING}
-STR_SV_STNAME_HELIPORT                                          :{STRING} Héli-port
+STR_SV_STNAME_HELIPORT                                          :{STRING} Héliport
 STR_SV_STNAME_FOREST                                            :{STRING} Forêt

 ############ end of	savegame specific region!
@@ -2467,9 +2468,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 +2891,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
@@ -2944,7 +2946,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 +3108,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
@@ -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
@@ -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
@@ -894,6 +902,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 +1182,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 +1419,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
@@ -2129,6 +2140,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 +2453,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 +2814,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 +2858,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 +2931,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 +2978,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
@@ -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}
@@ -1309,6 +1310,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

@@ -2889,6 +2891,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
--- a/lang/hungarian.txt
+++ b/lang/hungarian.txt
@@ -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}
@@ -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

@@ -2613,6 +2615,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}-
@@ -2988,6 +2991,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
@@ -3042,7 +3046,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
@@ -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}
--- a/lang/italian.txt
+++ b/lang/italian.txt
--- a/lang/unfinished/lithuanian.txt
+++ b/lang/unfinished/lithuanian.txt
--- a/lang/norwegian.txt
+++ b/lang/norwegian.txt
@@ -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
@@ -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
@@ -907,6 +919,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 +1021,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 +1038,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 +1079,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 +1109,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 +1309,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

@@ -2492,16 +2513,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 +2690,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 +2881,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 +2889,31 @@ 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_CURRENCY_WINDOW                                             :{WHITE}Vanlig valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Valutakurs: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2893,7 +2945,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delte or
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle kjøretøy som har samme ruteplan

 ### 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?
@@ -2965,6 +3016,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 +3041,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 +3118,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/polish.txt
+++ b/lang/polish.txt
--- a/lang/portuguese.txt
+++ b/lang/portuguese.txt
@@ -154,11 +154,12 @@ STR_00B0_MAP                                                    :{WHITE}Mapa - {
 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}
@@ -1078,7 +1079,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
@@ -2889,6 +2890,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
@@ -2943,7 +2945,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?
--- a/lang/romanian.txt
+++ b/lang/romanian.txt
@@ -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}
@@ -1308,6 +1309,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

@@ -2888,6 +2890,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
--- a/lang/russian.txt
+++ b/lang/russian.txt
@@ -153,11 +153,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 v{REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 Команда разработчиков OpenTTD
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 Команда разработчиков OpenTTD
 STR_TRANSLATED_BY                                               :{BLACK}  Переводчики - Назаров Дмитрий (aka Smoky555), Олег Попков (aka Oleg)  - http://forums.ttdrussia.net

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -2888,6 +2889,7 @@ STR_NEWGRF_NO_FILES_INSTALLED                                   :{BLACK}В на
 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}Вы хотите сделать изменения в уже запущенной игре - это может привести к ошибке игры, и ее вылету.{}Вы абсолютно уверены в том, что хотите сделать?

 STR_NEWGRF_ADD                                                  :{BLACK}Добавить
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Добавить NewGRF файл в список
@@ -2942,7 +2944,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Общи
 STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Показать весь транспорт с этим расписанием

 ### depot strings
-
 STR_SELL                                                        :{BLACK}Продать
 STR_DEPOT_SELL_ALL_VEHICLE_CONFIRM                              :{BLACK}Продать весь транспорт в депо
 STR_ARE_YOU_SURE                                                :{BLACK}Вы уверены?
--- a/lang/slovak.txt
+++ b/lang/slovak.txt
@@ -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}
@@ -1372,6 +1373,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

@@ -1934,15 +1936,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
@@ -2952,6 +2954,7 @@ 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
--- a/lang/spanish.txt
+++ b/lang/spanish.txt
@@ -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,8 +288,10 @@ 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
@@ -392,7 +395,15 @@ 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_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
@@ -1011,6 +1022,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 +1039,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}

@@ -1072,6 +1085,7 @@ STR_CONFIG_PATCHES_LIVERIES                                     :{LTBLUE}Ver est
 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 +1110,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 +1310,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

@@ -2498,16 +2514,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 +2882,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 +2890,31 @@ 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_CURRENCY_WINDOW                                             :{WHITE}Moneda personalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Tasa de cambio: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2900,7 +2946,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?
--- a/lang/swedish.txt
+++ b/lang/swedish.txt
@@ -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
@@ -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
@@ -383,7 +384,7 @@ STR_SORT_BY_VALUE                                               :
 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_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,15 @@ 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_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
@@ -732,8 +741,8 @@ STR_PLAY_HEIGHTMAP_HINT                                         :{BLACK}Starta e
 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
@@ -760,7 +769,7 @@ STR_CHECKMARK                                                   :{CHECKMARK}
 ############ range for menu	starts
 STR_02C3_GAME_OPTIONS                                           :Spelinställningar
 STR_02C5_DIFFICULTY_SETTINGS                                    :Svårighetsgrad
-STR_02C7_CONFIG_PATCHES                                         :Konfigurera patchar
+STR_02C7_CONFIG_PATCHES                                         :Ändra Patchar
 STR_NEWGRF_SETTINGS                                             :Newgrf inställningar
 STR_GAMEOPTMENU_0A                                              :
 STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Stadsnamn visas
@@ -777,8 +786,8 @@ STR_TRANSPARENT_SIGNS                                           :{SETX 12}Genoms
 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

@@ -789,7 +798,7 @@ STR_02DD_SUBSIDIES                                              :Subventioner
 STR_02DE_MAP_OF_WORLD                                           :Världskarta
 STR_EXTRA_VIEW_PORT                                             :Nytt vy fö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_MOVE_VIEW_TO_MAIN                                :{BLACK}Kopiera till vy
@@ -819,10 +828,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,7 +844,7 @@ 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
 STR_INDUSTRY_DIR                                                :Industriförteckning
@@ -849,8 +858,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
@@ -882,7 +891,7 @@ STR_TOWNNAME_SWISS                                              :Schweiziska
 STR_TOWNNAME_DANISH                                             :Danska
 STR_TOWNNAME_TURKISH                                            :Turkiska
 STR_TOWNNAME_ITALIAN                                            :Italienska
-STR_TOWNNAME_CATALAN                                            :Katalanska
+STR_TOWNNAME_CATALAN                                            :Katalan
 ############ end of	townname region

 STR_CURR_GBP                                                    :Pund (£)
@@ -910,8 +919,8 @@ STR_CURR_RUR                                                    :Ryska rubel (RU
 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...

@@ -1012,6 +1021,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 +1113,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,12 +1148,12 @@ 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}
@@ -1299,6 +1309,7 @@ STR_NETWORK_PASSWORD                                            :{SILVER}Löseno
 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_GRF_MISMATCH                                        :{SILVER}NewGRF Matchar Ej

 STR_NETWORK_JOIN_GAME                                           :{BLACK}Gå med i spelet

@@ -1492,7 +1503,7 @@ STR_0807_ESTIMATED_INCOME                                       :{WHITE}Uppskatt
 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 +1522,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 +1534,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
@@ -1553,12 +1564,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 +1610,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 +1639,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 +1711,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 +1726,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 +1788,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}
@@ -1908,7 +1919,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
@@ -2173,25 +2184,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_STEAM                                :Passagerarvagn (Ånga)
 STR_LIVERY_PASSENGER_WAGON_DIESEL                               :Passagerarvagn (Disel)
-STR_LIVERY_PASSENGER_WAGON_ELECTRIC                             :Passagerarvagn (Elektrisk)
-STR_LIVERY_FREIGHT_WAGON                                        :Godsvagn
+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 +2542,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 - -
@@ -2612,7 +2623,7 @@ 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_NO_POWER                                              :{RED}Ingen Kraft
 STR_TRAIN_START_NO_CATENARY                                     :Loket kan inte starta för att detta spår saknar elledningar

 ##id 0x9000
@@ -2675,10 +2686,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
@@ -2879,6 +2890,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
@@ -2900,6 +2912,8 @@ STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Läs om
 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_CURRENCY_WINDOW                                             :{WHITE}Egen valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Växlingskurs: {ORANGE}{CURRENCY} = £ {COMMA}
@@ -2927,8 +2941,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 +2961,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 +2970,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
@@ -3037,15 +3051,15 @@ STR_PURCHASE_INFO_ALL_BUT                                       :Alla utom {GOLD
 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:
@@ -3054,7 +3068,7 @@ STR_GENERATE_DATE                                               :{BLACK}{DATE_LO
 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_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,7 +3080,7 @@ 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_WORLD_GENERATION                                            :{BLACK}Generera Värld
 STR_TREE_GENERATION                                             :{BLACK}Träd generering
 STR_UNMOVABLE_GENERATION                                        :{BLACK}Icke flyttbar generering
 STR_CLEARING_TILES                                              :{BLACK}Svår och stenig markgenerering
@@ -3079,10 +3093,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 +3104,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_INTERCONTINENTAL_AIRPORT                                    :{BLACK}Jättestor flygplats
 STR_HELIPORT                                                    :{BLACK}Helikopterplatta
 STR_HELIDEPOT                                                   :{BLACK}Helikopterhangar
 STR_HELISTATION                                                 :{BLACK}Helikopterplatta

 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/turkish.txt
+++ b/lang/turkish.txt
@@ -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}
@@ -393,8 +394,9 @@ 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_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
@@ -548,7 +550,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
@@ -739,8 +741,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
@@ -1010,7 +1012,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 +1021,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 +1080,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}
@@ -1304,6 +1309,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 +1350,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)
@@ -2050,7 +2056,7 @@ STR_7000                                                        :
 STR_7001                                                        :{WHITE}{COMPANY} {BLACK}{PLAYERNAME}
 STR_7002_PLAYER                                                 :(Oyuncu {COMMA})
 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,7 +2106,7 @@ 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_7038_INAUGURATED                                            :{GOLD}Kuruluş: {WHITE}{NUM}
@@ -2150,9 +2156,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 +2184,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 +2211,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 +2542,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 +2590,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 +2655,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 +2841,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 +2890,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
@@ -2926,16 +2936,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 +2980,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 +3016,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 +3041,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 +3067,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
@@ -155,11 +155,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 Кріс Сойєр, Всі права захищені
 STR_00B7_VERSION                                                :{BLACK}OpenTTD версія {REV}
-STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD-група
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2007 OpenTTD-група
 STR_TRANSLATED_BY                                               :{BLACK} Перекладач(і) -

 STR_00C5                                                        :{BLACK}{CROSS}
@@ -394,6 +395,9 @@ STR_ENGINE_SORT_CARGO_CAPACITY                                  :Місткіс
 STR_NO_WAITING_CARGO                                            :{BLACK}Звідси поки-що нічого перевозити
 STR_SELECT_ALL_FACILITIES                                       :{BLACK}Вибрати весь транспорт
 STR_SELECT_ALL_TYPES                                            :{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                                  :Відправити до депо
@@ -1008,7 +1012,7 @@ STR_CONFIG_PATCHES_CAPTION                                      :{WHITE}Розш

 STR_CONFIG_PATCHES_OFF                                          :Викл.
 STR_CONFIG_PATCHES_ON                                           :Вкл.
-STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Показувати швидкість у строкі стану: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_VEHICLESPEED                                 :{LTBLUE}Показувати швидкість у рядку стану: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_BUILDONSLOPES                                :{LTBLUE}Будувати на схилах та узбережжях: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_CATCHMENT                                    :{LTBLUE}Великий району обслуговування: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_EXTRADYNAMITE                                :{LTBLUE}Переміщувати дороги, мости та іншу власність міста: {ORANGE}{STRING}
@@ -1026,7 +1030,7 @@ STR_CONFIG_PATCHES_GOTODEPOT                                    :{LTBLUE}Нак
 STR_CONFIG_PATCHES_BUILDXTRAIND                                 :{LTBLUE}Будувати виробництво сировини: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_MULTIPINDTOWN                                :{LTBLUE}Подібна промисловість в одному місті: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SAMEINDCLOSE                                 :{LTBLUE}Будувати промисловість однакового типу поруч: {ORANGE}{STRING}
-STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Завжди показувати повну дату в строкі стану: {ORANGE}{STRING}
+STR_CONFIG_PATCHES_LONGDATE                                     :{LTBLUE}Завжди показувати повну дату в рядку стану: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SIGNALSIDE                                   :{LTBLUE}Показувати сигнали за напрямом руху: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_SHOWFINANCES                                 :{LTBLUE}Показувати вікно фінансів в кінці року: {ORANGE}{STRING}
 STR_CONFIG_PATCHES_NEW_NONSTOP                                  :{LTBLUE}TTDPatch compatible nonstop handling: {ORANGE}{STRING}
@@ -1306,6 +1310,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}Приєднатися до гри

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

 STR_NEWGRF_ADD                                                  :{BLACK}Додати
 STR_NEWGRF_ADD_TIP                                              :{BLACK}Додатифайли NewGRF до списку
@@ -2985,10 +2991,12 @@ STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Вибе
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Натисніть для припинення процесу оновлення потягів що вибрані ліворуч
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Натисніть для запуску оновлення потягів, що вибрані праворуч на потяги що вибрані праворуч
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Виберіть тип колії, для якої Ви хочете оновити потяг
+STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Показує на який потяг буде замінено потяг, зображелий ліворуч
 STR_REPLACE_HELP                                                :{BLACK}Це дозволить Вам оновити одні види потягів іншими, коли потяг прибуде в депо
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Продаж вагонів!!!: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Дозволити автооновленню видаляти вагони зберігаючи довжину потягу(починаючи спереду), якщо оновлення робить поїзд довшим.
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Оновлення: {ORANGE}{SKIP}{SKIP}{STRING}
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} ЕКСПЕРИМЕНТАЛЬНО {}Переключення між вікнами заміни потягів та вагонів.{}Автозаміна потягів відбудеться лише в тому випадку, якщо співпаде тип вантажу що перевозиться. Ця перевірка проводиться для кожного вагону під час автозаміни.
 STR_ENGINE_NOT_BUILDABLE                                        :{WHITE}потяг неможна будувати

 STR_ENGINES                                                     :Потяги
@@ -3037,24 +3045,35 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Міст
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Потужність: {GOLD}+{POWER}{BLACK} Вага: {GOLD}+{WEIGHT_S}
 STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Переобладнати на: {GOLD}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Всі типи вантажів
+STR_PURCHASE_INFO_ALL_BUT                                       :Всі крім {GOLD}

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

 STR_GENERATE                                                    :{WHITE}Генерувати
+STR_RANDOM                                                      :{BLACK}Випадково
 STR_RANDOM_HELP                                                 :{BLACK}Змінити початкове значення для генератора
 STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Створеня світу
 STR_RANDOM_SEED                                                 :{BLACK}Початкове значення:
 STR_RANDOM_SEED_HELP                                            :{BLACK}Клік для вводу значення
 STR_LAND_GENERATOR                                              :{BLACK}Генерація ландшафту:
 STR_TREE_PLACER                                                 :{BLACK}Насадження дерев:
+STR_HEIGHTMAP_ROTATION                                          :{BLACK}Поворот рельєфу
+STR_TERRAIN_TYPE                                                :{BLACK}Тип ландшафту:
 STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Рівень моря:
+STR_SMOOTHNESS                                                  :{BLACK}Згладжений:
+STR_SNOW_LINE_HEIGHT                                            :{BLACK}Лінія снігу:
 STR_DATE                                                        :{BLACK}Дата:
 STR_NUMBER_OF_TOWNS                                             :{BLACK}К-ть міст:
 STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}К-ть промисловостей:
 STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_SNOW_LINE_UP                                                :{BLACK}Підвищити лінію снігу
+STR_SNOW_LINE_DOWN                                              :{BLACK}Понизити лінію снігу
+STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Змінити висоту лінії снігу
 STR_START_DATE_QUERY_CAPT                                       :{WHITE}Змінити рік початку гри
+STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Завелике значення
 STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Розміри дуже великі. Продовжити генерацію?
 STR_SNOW_LINE_HEIGHT_NUM                                        :{NUM}
+STR_HEIGHTMAP_NAME                                              :{BLACK}Ім'я рельєфа:
 STR_HEIGHTMAP_SIZE                                              :{BLACK}Розмір: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Генерація світу...
 STR_GENERATION_ABORT                                            :{BLACK}Перервати
@@ -3064,15 +3083,24 @@ STR_PROGRESS                                                    :{WHITE}{NUM}%
 STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
 STR_WORLD_GENERATION                                            :{BLACK}Створеня світу
 STR_TREE_GENERATION                                             :{BLACK}Насадження дерев
+STR_UNMOVABLE_GENERATION                                        :{BLACK}Генерація нерухомості
+STR_CLEARING_TILES                                              :{BLACK}Розкидати каміня
 STR_SETTINGUP_GAME                                              :{BLACK}Налаштування гри
+STR_PREPARING_TILELOOP                                          :{BLACK}Виконуємо цикл
 STR_PREPARING_GAME                                              :{BLACK}Генерується гра
+STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Змінити рівень складності
 STR_SE_FLAT_WORLD                                               :{WHITE}Рівнина
 STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Генерувати рівнину
 STR_SE_RANDOM_LAND                                              :{WHITE}Випадково
 STR_SE_NEW_WORLD                                                :{BLACK}Створити новий сценарій
 STR_SE_CAPTION                                                  :{WHITE}Тип сценарію
+STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Підняти рівень рівної землі на 1
+STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Опустити рівень рівної землі на 1
+STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Змінити висоту рівня рівної землі
+STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Висота рівня моря
 STR_FLAT_WORLD_HEIGHT_NUM                                       :{NUM}

+STR_SMALLMAP_CENTER                                             :{BLACK}Центрувати мінікарту сюди

 ########### String for new airports
 STR_SMALL_AIRPORT                                               :{BLACK}Малий
--- a/lang/unfinished/croatian.txt
+++ b/lang/unfinished/croatian.txt
@@ -309,7 +309,6 @@ STR_015C_SAVE_GAME                                              :Spremi igru
 STR_015D_LOAD_GAME                                              :Učitaj igru
 STR_015E_QUIT_GAME                                              :Napusti igru
 STR_015F_QUIT                                                   :Izlaz
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Sigurno želiš napustiti ovu igru?
 STR_0161_QUIT_GAME                                              :{WHITE}Napusti igru
 STR_SORT_ORDER_TIP                                              :{BLACK}Izaberi način sortiranja (silazno/uzlazno)
 STR_SORT_CRITERIA_TIP                                           :{BLACK}Izaberi kriterij za sortiranje
@@ -558,7 +557,6 @@ STR_0296_QUIT                                                   :Završi
 STR_0298_LOAD_SCENARIO                                          :{WHITE}Učitaj scenarij
 STR_0299_SAVE_SCENARIO                                          :{WHITE}Spremi scenarij
 STR_029A_PLAY_SCENARIO                                          :{BLACK}Igraj scenarij
-STR_029B_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Jesi li siguran da želiš odustati od ovog scenarija?
 STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Pomakni početni datum 1 godinu unatrag
 STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Pomakni početni datum 1 godinu unaprijed
 STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...oba kraja mosta moraju biti na zemlji
@@ -1017,6 +1015,7 @@ STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Moraš u
 STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Željeznička konstrukcija
 STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Jednotračna konstrukcija
 STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}MagLev konstrukcija
+STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Ne možeš postaviti znakove ovdje...
 STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Ne možeš graditi tračnice ovdje...
 STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Ne možeš ukloniti tračnice odavdje...
 STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Ne možeš maknuti signale odavdje...
@@ -1027,21 +1026,87 @@ STR_1016_MONORAIL_CONSTRUCTION                                  :Izgradnja Monor
 STR_1017_MAGLEV_CONSTRUCTION                                    :Izgradnja MagLeva
 STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Izgradi željezničke tračnice
 STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}Izgradi spremište vlakova (za gradnju i servisiranje vlakova)
+STR_101D_BUILD_RAILROAD_TUNNEL                                  :{BLACK}Izgradi željeznički tunel
+STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Odaberi smjer željezničkog spremišta
+STR_1021_RAILROAD_TRACK                                         :Željezničke tračnice
+STR_1023_RAILROAD_TRAIN_DEPOT                                   :Spremište vlakova
 STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...područje je u vlasništvu druge tvrke
+STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Željezničke tračnice s normalnim znakovima
+STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Željezničke tračnice s prethodno postavljenim znakovima
+STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Željezničke tračnice s izlaznim znakovima
+STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Željezničke tračnice s kombo znakovima



 ##id 0x1800
 STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Moraš prvo ukloniti cestu
+STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Cestovni radovi u tijeku
+STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Rekonstrukcija ceste
+STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Izaberi cestovni most
 STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Ne možeš graditi cestu ovdje...
 STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Ne možep maknuti cestu odavdje...
+STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Smjer cestovnog spremišta
+STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Ne možeš izgraditi spremište cestovnih vozila ovdje...
+STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Nije moguće izgraditi autobusnu stanicu...
+STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Nije moguće izgraditi kamionski terminal...
+STR_180A_ROAD_CONSTRUCTION                                      :Rekonstrukcija ceste
+STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Izgradi dio ceste
+STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Izgradi spremište cestovnih vozila (za izgradnju i servisiranje vozila)
+STR_180D_BUILD_BUS_STATION                                      :{BLACK}Izgradi autobusnu stanicu
+STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Izgradi pretovarni kamionski terminal
 STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Izgradi cestovni most
 STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Izgradi cestovni tunel
+STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Izaberi smjer spremišta cestovnih vozila
 STR_1814_ROAD                                                   :Cesta
 STR_1815_ROAD_WITH_STREETLIGHTS                                 :Cesta sa semaforima
+STR_1817_ROAD_VEHICLE_DEPOT                                     :Spremište cestovnih vozila

 ##id 0x2000
 STR_2000_TOWNS                                                  :{WHITE}Gradovi
+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}Građevina mora prvo biti srušena
+STR_2005                                                        :{WHITE}{TOWN}
+STR_2006_POPULATION                                             :{BLACK}Stanovništvo: {ORANGE}{COMMA}{BLACK}  Kuće: {ORANGE}{COMMA}
+STR_2007_RENAME_TOWN                                            :Preimenuj grad
+STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Grad se ne može preimenovati...
+STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} lokalna samouprava odbija dozvoliti ovo
+STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Imena gradova - klikni na ime kako bi centrirao pogled na ekran
+STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Centriraj glavni pogled na lokaciju grada
+STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Promijeni ime grada
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Putnika prošli mjesec: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Pošte prošli mjesec: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_200F_TALL_OFFICE_BLOCK                                      :Visoki uredski blok
+STR_2010_OFFICE_BLOCK                                           :Uredski blok
+STR_2011_SMALL_BLOCK_OF_FLATS                                   :Mali stambeni blok
+STR_2012_CHURCH                                                 :Crkva
+STR_2013_LARGE_OFFICE_BLOCK                                     :Veliki uredski blok
+STR_2014_TOWN_HOUSES                                            :Gradske kuće
+STR_2015_HOTEL                                                  :Hotel
+STR_2016_STATUE                                                 :Kip
+STR_2017_FOUNTAIN                                               :Fontana
+STR_2018_PARK                                                   :Park
+STR_2019_OFFICE_BLOCK                                           :Uredski blok
+STR_201A_SHOPS_AND_OFFICES                                      :Trgovine i uredi
+STR_201B_MODERN_OFFICE_BUILDING                                 :Moderne uredske zgrade
+STR_201C_WAREHOUSE                                              :Skladište
+STR_201D_OFFICE_BLOCK                                           :Uredski blok
+STR_201E_STADIUM                                                :Stadion
+STR_201F_OLD_HOUSES                                             :Stare kuće
+STR_2020_LOCAL_AUTHORITY                                        :{BLACK}Lokalna samouprava
+STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Prikaži informacije o lokalnoj samoupravi
+STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} lokalna samouprava
+STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Ocjene prijevoznih tvrtki:
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2025_SUBSIDIES                                              :{WHITE}Subvencije
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Ponuđene subvencije za pružanje usluga:
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} od {STRING} do {STRING}
+STR_2028_BY                                                     :{YELLOW} (do {DATE_SHORT})
+STR_202A_NONE                                                   :{ORANGE}Ništa
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Usluge već subvencionirane:
 STR_202C_FROM_TO                                                :{ORANGE}{STRING} iz {STATION} prema {STATION}{YELLOW} ({COMPANY}
 STR_202D_UNTIL                                                  :{YELLOW}, do {DATE_SHORT})
 STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} lokalne vlasti odbijaju dozvoliti izgradnju još jedne zračne luke u ovom gradu
@@ -1068,15 +1133,24 @@ STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :Financiraj reko
 STR_204A_BUILD_STATUE_OF_COMPANY                                :Izgradi kip vlasnika tvrke
 STR_204B_FUND_NEW_BUILDINGS                                     :Financiraj nove građevine
 STR_204C_BUY_EXCLUSIVE_TRANSPORT                                :Kupi ekskluzivna prijevozna prava
+STR_TOWN_BRIBE_THE_LOCAL_AUTHORITY                              :Podmiti lokalnu samoupravu
 STR_204D_INITIATE_A_SMALL_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniciraj malu oglasnu kampanju, kako bi privukao više putnika i tereta za svoje prijevozne usluge.{}  Trošak: {CURRENCY}
 STR_204E_INITIATE_A_MEDIUM_LOCAL                                :{WHITE}{STRING}{}{YELLOW} Iniciraj srednju oglasnu kampanju, kako bi privukao više putnika i tereta za svoje prijevozne usluge.{} Trošak: {CURRENCY}
 STR_204F_INITIATE_A_LARGE_LOCAL                                 :{WHITE}{STRING}{}{YELLOW} Iniciraj veliku oglasnu kampanju, kako bi privukao više putnika i tereta za svoje prijevozne usluge.{} Trošak: {CURRENCY}
 STR_2050_FUND_THE_RECONSTRUCTION                                :{WHITE}{STRING}{}{YELLOW} Financiraj rekonstrukciju urbane mreže prometnica. Uzrokuje značajne poremećaje u cestovnom prometu do 6 mjeseci.{}  Trošak: {CURRENCY}
 STR_2051_BUILD_A_STATUE_IN_HONOR                                :{WHITE}{STRING}{}{YELLOW} Izgradi kip u čast svoje tvrke.{} Trošak: {CURRENCY}
 STR_2052_FUND_THE_CONSTRUCTION_OF                               :{WHITE}{STRING}{}{YELLOW} Financiraj izgradnju novih poslovnih prostora u gradu.{}  Trošak: {CURRENCY}
+STR_2053_BUY_1_YEAR_S_EXCLUSIVE                                 :{WHITE}{STRING}{}{YELLOW} Kupi jednogodišnje ekskluzivno prijevozno pravo u gradu. Gradska vlast će dopustiti putnicima i teretu da koriste samo stanice tvoje tvrtke.{} Trošak: {CURRENCY}
 STR_2056                                                        :{TINYFONT}{WHITE}{TOWN}
 STR_2057                                                        :{ORANGE}{TOWN}{BLACK} ({COMMA})
+STR_2058_UNDER_CONSTRUCTION                                     :{STRING} (pod rekonstrukcijom)
+STR_2059_IGLOO                                                  :Iglu
+STR_205A_TEPEES                                                 :Indijanski šator

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

 ##id 0x2800
 STR_2800_PLANT_TREES                                            :Posadi drveće
@@ -1151,6 +1225,7 @@ STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO                            :{BLACK}Prikaži
 STR_3057_STATION_NAMES_CLICK_ON                                 :{BLACK}Imena stanica - klikni na ime kako bi centrirao glavni pogled na stanicu
 STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT                            :{BLACK}Izaberi veličinu/tip zračne luke
 STR_305C_0                                                      :{STATION} {STATIONFEATURES}
+STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
 STR_305E_RAILROAD_STATION                                       :Željeznička stanica
 STR_305F_AIRCRAFT_HANGAR                                        :Zrakoplovni hangar
 STR_3060_AIRPORT                                                :Zračna luka
@@ -1162,6 +1237,7 @@ STR_3069_BUOY                                                   :Plutača
 STR_306A_BUOY_IN_THE_WAY                                        :{WHITE}...plutača na putu
 STR_306C_STATION_TOO_SPREAD_OUT                                 :{WHITE}...stanica previše proširena
 STR_306D_NONUNIFORM_STATIONS_DISALLOWED                         :{WHITE}...neuniformne stanice zabranjene
+STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Drži CTRL kako bi izabrao više od jednog itema


 ##id 0x3800
@@ -1278,6 +1354,7 @@ STR_5011_SUSPENSION_CONCRETE                                    :Viseći, betons
 STR_5012_WOODEN                                                 :Drveni
 STR_5013_CONCRETE                                               :Betonski
 STR_5014_TUBULAR_STEEL                                          :Cijevni, čelični
+STR_BRIDGE_TUBULAR_SILICON                                      :Cjevni, silikonski
 STR_5015_CAN_T_BUILD_BRIDGE_HERE                                :{WHITE}Ovdje se ne može graditi most...
 STR_5016_CAN_T_BUILD_TUNNEL_HERE                                :{WHITE}Ovdje se ne može graditi tunel...
 STR_5017_RAILROAD_TUNNEL                                        :Željeznički tunel
@@ -1311,12 +1388,52 @@ STR_5807_YOU_ALREADY_OWN_IT                                     :{WHITE}...već
 ############ 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                                                  :Neimenovan
+STR_SV_TRAIN_NAME                                               :Vlak {COMMA}
+STR_SV_ROADVEH_NAME                                             :Cestovno vozilo {COMMA}
+STR_SV_SHIP_NAME                                                :Brod {COMMA}
+STR_SV_AIRCRAFT_NAME                                            :Zrakoplov {COMMA}

+STR_SV_STNAME                                                   :{STRING}
+STR_SV_STNAME_NORTH                                             :{STRING} Sjever
+STR_SV_STNAME_SOUTH                                             :{STRING} Jug
+STR_SV_STNAME_EAST                                              :{STRING} Istok
+STR_SV_STNAME_WEST                                              :{STRING} Zapad
+STR_SV_STNAME_CENTRAL                                           :{STRING} Centrala
+STR_SV_STNAME_TRANSFER                                          :{STRING} Transfer
+STR_SV_STNAME_HALT                                              :{STRING} Zaustav
+STR_SV_STNAME_VALLEY                                            :{STRING} Dolina
+STR_SV_STNAME_HEIGHTS                                           :{STRING} Visine
+STR_SV_STNAME_WOODS                                             :{STRING} Šume
+STR_SV_STNAME_LAKESIDE                                          :{STRING} Jezero
+STR_SV_STNAME_EXCHANGE                                          :{STRING} Burza
+STR_SV_STNAME_AIRPORT                                           :{STRING} Zračna luka
+STR_SV_STNAME_OILFIELD                                          :{STRING} Naftno polje
+STR_SV_STNAME_MINES                                             :{STRING} Rudnici
+STR_SV_STNAME_DOCKS                                             :{STRING} Pristaništa
+STR_SV_STNAME_BUOY_1                                            :{STRING} Plutača 1
+STR_SV_STNAME_BUOY_2                                            :{STRING} Plutača 2
+STR_SV_STNAME_BUOY_3                                            :{STRING} Plutača 3
+STR_SV_STNAME_BUOY_4                                            :{STRING} Plutača 4
+STR_SV_STNAME_BUOY_5                                            :{STRING} Plutača 5
+STR_SV_STNAME_BUOY_6                                            :{STRING} Plutača 6
+STR_SV_STNAME_BUOY_7                                            :{STRING} Plutača 7
+STR_SV_STNAME_BUOY_8                                            :{STRING} Plutača 8
+STR_SV_STNAME_BUOY_9                                            :{STRING} Plutača 9
+STR_SV_STNAME_ANNEXE                                            :{STRING} Aneks
+STR_SV_STNAME_SIDINGS                                           :{STRING} Krak
+STR_SV_STNAME_BRANCH                                            :{STRING} Ogranak
+STR_SV_STNAME_UPPER                                             :Gornji {STRING}
+STR_SV_STNAME_LOWER                                             :Donji {STRING}
+STR_SV_STNAME_HELIPORT                                          :{STRING} Heliodrom
+STR_SV_STNAME_FOREST                                            :{STRING} Šuma

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

 ##id 0x6800
 STR_6800_DIFFICULTY_LEVEL                                       :{WHITE}Težina igre
+STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Spremi

 ############ range for difficulty levels starts
 STR_6801_EASY                                                   :{BLACK}Lagano
@@ -1343,8 +1460,10 @@ STR_6812_QUANTITY_OF_SEA_LAKES                                  :{LTBLUE}Količi
 STR_6813_ECONOMY                                                :{LTBLUE}Ekonomija: {ORANGE}{STRING}
 STR_6814_TRAIN_REVERSING                                        :{LTBLUE}Promjena smjera vlakova: {ORANGE}{STRING}
 STR_6815_DISASTERS                                              :{LTBLUE}Prirodne katastrofe: {ORANGE}{STRING}
+STR_16816_CITY_APPROVAL                                         :{LTBLUE}Stav gradsko vijeća prema restrukturiranju područja: {ORANGE}{STRING}
 ############ range for difficulty settings ends

+STR_26816_NONE                                                  :Ništa
 STR_6816_LOW                                                    :Nisko
 STR_6817_NORMAL                                                 :Normalno
 STR_6818_HIGH                                                   :Visoko
@@ -1355,6 +1474,7 @@ STR_681C_SLOW                                                   :Sporo
 STR_681D_MEDIUM                                                 :Umjereno
 STR_681E_FAST                                                   :Brzo
 STR_681F_VERY_FAST                                              :Vrlo brzo
+STR_VERY_LOW                                                    :Vrlo nisko
 STR_6820_LOW                                                    :Nisko
 STR_6821_MEDIUM                                                 :Umjereno
 STR_6822_HIGH                                                   :Visoko
@@ -1419,10 +1539,12 @@ STR_701F                                                        :{BLACK}+{CURREN
 STR_7020_TOTAL                                                  :{WHITE}Ukupno:
 STR_7021                                                        :{COMPANY}{PLAYERNAME}
 STR_7022_INCOME_GRAPH                                           :{WHITE}Graf prihoda
+STR_CURRCOMPACT                                                 :{CURRCOMPACT64}
 STR_7024                                                        :{COMMA}
 STR_7025_OPERATING_PROFIT_GRAPH                                 :{WHITE}Graf operativnih prihoda
 STR_7026_BANK_BALANCE                                           :{WHITE}Bankovna bilanca
 STR_7027_LOAN                                                   :{WHITE}Kredit
+STR_MAX_LOAN                                                    :{WHITE}Maks zajam:  {BLACK}{CURRENCY64}
 STR_7028                                                        :{BLACK}{CURRENCY64}
 STR_7029_BORROW                                                 :{BLACK}Pozajmi {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
 STR_702A_REPAY                                                  :{BLACK}Otplati {SKIP}{SKIP}{SKIP}{SKIP}{CURRENCY}
@@ -1431,6 +1553,7 @@ STR_702C_CAN_T_BORROW_ANY_MORE_MONEY                            :{WHITE}Ne može
 STR_702D_LOAN_ALREADY_REPAYED                                   :{WHITE}...nemaš kredita za otplatu
 STR_702E_REQUIRED                                               :{WHITE}...{CURRENCY} potrebno
 STR_702F_CAN_T_REPAY_LOAN                                       :{WHITE}Ne možeš otplatiti kredit...
+STR_INSUFFICIENT_FUNDS                                          :{WHITE}Ne možeš dati novac koji je pozajmljen od banke...
 STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT                          :{BLACK}Odaberi novo lice za direktora
 STR_7031_CHANGE_THE_COMPANY_VEHICLE                             :{BLACK}Promijeni izgled vozila tvrtke
 STR_7032_CHANGE_THE_PRESIDENT_S                                 :{BLACK}Promjeni ime direktora
@@ -1441,6 +1564,7 @@ STR_7036_REPAY_PART_OF_LOAN                                     :{BLACK}Otplati
 STR_7037_PRESIDENT                                              :{WHITE}{PLAYERNAME}{}{GOLD}(Direktor)
 STR_7038_INAUGURATED                                            :{GOLD}Na poziciji od: {WHITE}{NUM}
 STR_7039_VEHICLES                                               :{GOLD}Vozila:
+STR_AIRCRAFT                                                    :{WHITE}{COMMA} zrakoplov
 STR_7042_NONE                                                   :{WHITE}Ništa
 STR_7043_FACE_SELECTION                                         :{WHITE}Odabir lica
 STR_7044_MALE                                                   :{BLACK}Muško
@@ -1472,7 +1596,9 @@ STR_705D_HAS_BEEN_CLOSED_DOWN_BY                                :{BLACK}{BIGFONT
 STR_705E_NEW_TRANSPORT_COMPANY_LAUNCHED                         :{BLACK}{BIGFONT}Osnovana je nova prijevozna tvrtka!
 STR_705F_STARTS_CONSTRUCTION_NEAR                               :{BLACK}{BIGFONT}{COMPANY} započinje gradnju blizu grada {TOWN}!
 STR_7060_CAN_T_BUY_COMPANY                                      :{WHITE}Ne možeš kupiti tvrtku...
+STR_7061_CARGO_PAYMENT_RATES                                    :{WHITE}Isplatne rate tereta
 STR_7062_DAYS_IN_TRANSIT                                        :{BLACK}{TINYFONT}Dana u tranzitu
+STR_7064_TOGGLE_GRAPH_FOR_CARGO                                 :{BLACK}Aktiviraj/deaktiviraj graf za vrstu tereta
 STR_7065                                                        :{BLACK}{TINYFONT}{STRING}
 STR_7066_ENGINEER                                               :Inženjer
 STR_7067_TRAFFIC_MANAGER                                        :Prijevozni upravitelj
@@ -1503,34 +1629,265 @@ STR_7080_PROTECTED                                              :{WHITE}Ova tvrk


 ##id 0x8000
+STR_8018_SH_40_ELECTRIC                                         :SH '40' (Električni)
+STR_8019_T_I_M_ELECTRIC                                         :'T.I.M.' (Električni)
+STR_801A_ASIASTAR_ELECTRIC                                      :'AsiaStar' (Električni)
+STR_801B_PASSENGER_CAR                                          :Putnički prijevoz
+STR_8036_X2001_ELECTRIC                                         :'X2001' (Električni)
+STR_8037_MILLENNIUM_Z1_ELECTRIC                                 :'Millennium Z1' (Električni)
+STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99
+STR_8039_PASSENGER_CAR                                          :Putnički prijevoz
+STR_803C_OIL_TANKER                                             :Naftni tanker
+STR_8043_ARMORED_VAN                                            :Oklopno vozilo
+STR_8054_LEV1_LEVIATHAN_ELECTRIC                                :Lev1 'Leviathan' (Električni)
+STR_8055_LEV2_CYCLOPS_ELECTRIC                                  :Lev2 'Cyclops' (Električni)
+STR_8056_LEV3_PEGASUS_ELECTRIC                                  :Lev3 'Pegasus' (Električni)
+STR_8057_LEV4_CHIMAERA_ELECTRIC                                 :Lev4 'Chimaera' (Električni)
+STR_8058_WIZZOWOW_ROCKETEER                                     :Wizzowow Rocketeer
+STR_8063_ARMORED_VAN                                            :Oklopno vozilo
+STR_8074_MPS_REGAL_BUS                                          :MPS Regal Bus
+STR_8075_HEREFORD_LEOPARD_BUS                                   :Hereford Leopard Bus
+STR_8076_FOSTER_BUS                                             :Foster Bus
+STR_8077_FOSTER_MKII_SUPERBUS                                   :Foster MkII Superbus
+STR_8078_PLODDYPHUT_MKI_BUS                                     :Ploddyphut MkI Bus
+STR_8079_PLODDYPHUT_MKII_BUS                                    :Ploddyphut MkII Bus
+STR_807A_PLODDYPHUT_MKIII_BUS                                   :Ploddyphut MkIII Bus
+STR_80D7_SAMPSON_U52                                            :Sampson U52
+STR_80D8_COLEMAN_COUNT                                          :Coleman Count
+STR_80D9_FFP_DART                                               :FFP Dart
+STR_80DA_YATE_HAUGAN                                            :Yate Haugan
+STR_80DB_BAKEWELL_COTSWALD_LB_3                                 :Bakewell Cotswald LB-3
+STR_80DC_BAKEWELL_LUCKETT_LB_8                                  :Bakewell Luckett LB-8
+STR_80DD_BAKEWELL_LUCKETT_LB_9                                  :Bakewell Luckett LB-9
+STR_80DE_BAKEWELL_LUCKETT_LB80                                  :Bakewell Luckett LB80
+STR_80DF_BAKEWELL_LUCKETT_LB_10                                 :Bakewell Luckett LB-10
+STR_80E0_BAKEWELL_LUCKETT_LB_11                                 :Bakewell Luckett LB-11
+STR_80E1_YATE_AEROSPACE_YAC_1_11                                :Yate Aerospace YAC 1-11
+STR_80E2_DARWIN_100                                             :Darwin 100
+STR_80E3_DARWIN_200                                             :Darwin 200
+STR_80E4_DARWIN_300                                             :Darwin 300
+STR_80E5_DARWIN_400                                             :Darwin 400
+STR_80E6_DARWIN_500                                             :Darwin 500
+STR_80E7_DARWIN_600                                             :Darwin 600
+STR_80E8_GURU_GALAXY                                            :Guru Galaxy
+STR_80E9_AIRTAXI_A21                                            :Airtaxi A21
+STR_80EA_AIRTAXI_A31                                            :Airtaxi A31
+STR_80EB_AIRTAXI_A32                                            :Airtaxi A32
+STR_80EC_AIRTAXI_A33                                            :Airtaxi A33
+STR_80ED_YATE_AEROSPACE_YAE46                                   :Yate Aerospace YAe46
+STR_80EE_DINGER_100                                             :Dinger 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                                    :Tricario Helicopter
+STR_80FE_GURU_X2_HELICOPTER                                     :Guru X2 Helicopter
+STR_80FF_POWERNAUT_HELICOPTER                                   :Powernaut Helicopter
+STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE                       :{WHITE}Poruka od proizvođača vozila
+STR_8101_WE_HAVE_JUST_DESIGNED_A                                :{GOLD}Upravo smo dizajnirani novi {STRING} - jeste li zainteresirani za jednogodišnje isključivo pravo uporabe ovog vozila, tako da vidimo kako se vozilo ponaša prije nego što postane univerzalno dostupno?
+STR_8102_RAILROAD_LOCOMOTIVE                                    :željeznička lokomotiva
+STR_8103_ROAD_VEHICLE                                           :cestovno vozilo
+STR_8104_AIRCRAFT                                               :zrakoplov
+STR_8105_SHIP                                                   :brod
+STR_8106_MONORAIL_LOCOMOTIVE                                    :monorail lokomotiva
+STR_8107_MAGLEV_LOCOMOTIVE                                      :maglev lokomotiva

 ##id 0x8800
+STR_8800_TRAIN_DEPOT                                            :{WHITE}{TOWN} Spremište vlakova
+STR_8801_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi vlak stiže na {STATION}!
+STR_8802_DETAILS                                                :{WHITE}{STRING} (Detalji)
+STR_8803_TRAIN_IN_THE_WAY                                       :{WHITE}Vlak na putu
+STR_8804                                                        :{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8805                                                        :{RIGHTARROW}{SETX 10}{COMMA}: {STRING} {STRING}
+STR_8806_GO_TO                                                  :Idi do {STATION}
+STR_8807_GO_TO_TRANSFER                                         :Idi do {STATION} (Transferiraj i preuzmi teret)
+STR_8808_GO_TO_UNLOAD                                           :Idi do {STATION} (Istovar)
+STR_8809_GO_TO_TRANSFER_UNLOAD                                  :Go to {STATION} (Transferiraj i otiđi prazan)
+STR_880A_GO_TO_LOAD                                             :Idi do{STATION} (Utovar)
+STR_880B_GO_TO_TRANSFER_LOAD                                    :Idi do {STATION} (Transferiraj i pričekaj puni utovar)
+STR_880C_GO_NON_STOP_TO                                         :Idi non-stop do {STATION}
+STR_880D_GO_TO_NON_STOP_TRANSFER                                :Idi non-stop do {STATION} (Transferiraj i preuzmi teret)
+STR_880E_GO_NON_STOP_TO_UNLOAD                                  :Idi non-stop do {STATION} (Istovar)
+STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD                         :Idi non-stop do {STATION} (Transferiraj i otiđi prazan)
+STR_8810_GO_NON_STOP_TO_LOAD                                    :Idi non-stop do{STATION} (Utovar)
+STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD                           :Idi non-stop do {STATION} (Transferiraj i pričekaj puni utovar)
+STR_GO_TO_TRAIN_DEPOT                                           :Idi do {TOWN} spremište vlakova
+STR_SERVICE_AT_TRAIN_DEPOT                                      :Servisiraj u {TOWN} spremištu vlakova
+STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT                             :Idi non-stop do {TOWN} spremišta vlakova



+STR_UNKNOWN_DESTINATION                                         :nepoznato odredište
+STR_8812_EMPTY                                                  :{LTBLUE}Prazan
+STR_8813_FROM                                                   :{LTBLUE}{CARGO} iz {STATION}
+STR_8814_TRAIN_IS_WAITING_IN_DEPOT                              :{WHITE}Vlak {COMMA} čeka u spremištu
+STR_8815_NEW_VEHICLES                                           :{BLACK}Nova vozila
+STR_8816                                                        :{BLACK}-
+STR_8819_TRAIN_TOO_LONG                                         :{WHITE}Vlak predugačak
+STR_881A_TRAINS_CAN_ONLY_BE_ALTERED                             :{WHITE}Vlakovi mogu biti izmjenjeni jedino kad su zaustavljeni u spremištu

+STR_881C_NEW_RAIL_VEHICLES                                      :{WHITE}Nova željeznička vozila
+STR_881D_NEW_MONORAIL_VEHICLES                                  :{WHITE}Nova monorail vozila
+STR_881E_NEW_MAGLEV_VEHICLES                                    :{WHITE}Nova maglev vozila

+STR_881F_BUILD_VEHICLE                                          :{BLACK}Izgradi vozilo
+STR_CLONE_TRAIN                                                 :{BLACK}Kloniraj vlak
+STR_8820_RENAME                                                 :{BLACK}Preimenuj
+STR_8823_SKIP                                                   :{BLACK}Preskoči
+STR_8824_DELETE                                                 :{BLACK}Obriši
+STR_8825_NON_STOP                                               :{BLACK}Non-stop
+STR_8826_GO_TO                                                  :{BLACK}Idi do
+STR_8827_FULL_LOAD                                              :{BLACK}Puni utovar
+STR_8828_UNLOAD                                                 :{BLACK}Istovar
+STR_REFIT                                                       :{BLACK}Prenamijeni
+STR_8829_ORDERS                                                 :{WHITE}{VEHICLE} (Naredbe)
+STR_882A_END_OF_ORDERS                                          :{SETX 10}- - Kraj naredbi - -
+STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE                           :{WHITE}Ne mogu izgraditi željezničko vozilo...
+STR_882C_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
+STR_882D_VALUE                                                  :{LTBLUE}{STRING}{BLACK}   Vrijednost: {LTBLUE}{CURRENCY}
+STR_882E                                                        :{WHITE}{VEHICLE}
+STR_882F_LOADING_UNLOADING                                      :{LTBLUE}Utovar / Istovar
+STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT                              :{WHITE}Ne mogu poslati vlak u spremište...
 STR_8831_NO_MORE_SPACE_FOR_ORDERS                               :{WHITE}Nema mjesta za nove naredbe
 STR_8832_TOO_MANY_ORDERS                                        :{WHITE}Previše naredbi
 STR_8833_CAN_T_INSERT_NEW_ORDER                                 :{WHITE}Ne možeš ubaciti novu naredbu...
 STR_8834_CAN_T_DELETE_THIS_ORDER                                :{WHITE}Ne možeš obrisati ovu naredbu...
-STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Can't modify this order...
-STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Ne možeš micati vozilo...
+STR_8835_CAN_T_MODIFY_THIS_ORDER                                :{WHITE}Ne možeš izmjeniti ovu naredbu...
+STR_8837_CAN_T_MOVE_VEHICLE                                     :{WHITE}Ne možeš pomaknuti vozilo...
 STR_8838_N_A                                                    :N/A{SKIP}
 STR_8839_CAN_T_SELL_RAILROAD_VEHICLE                            :{WHITE}Ne možeš prodati željezničko vozilo
-STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Ne može pronaći put do lokalnog servisa
+STR_883A_UNABLE_TO_FIND_ROUTE_TO                                :{WHITE}Ne može pronaći put do lokalnog spremišta
 STR_883B_CAN_T_STOP_START_TRAIN                                 :{WHITE}Ne možeš zaustaviti/pokrenuti vlak...
-STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Interval servisiranja: {LTBLUE}{COMMA}dana{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
+STR_883C_SERVICING_INTERVAL_DAYS                                :{BLACK}Servisni interval: {LTBLUE}{COMMA}dana{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
 STR_883D_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vlakovi - klikni na vlak za informacije
-STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Izgradi/kupi nove vlakove (potreban servis)
+STR_883E_BUILD_NEW_TRAINS_REQUIRES                              :{BLACK}Izgradi/kupi nove vlakove (zahtijeva spremište vlakova)
+STR_883F_TRAINS_CLICK_ON_TRAIN_FOR                              :{BLACK}Vlakovi - klikni na vlak za informacije., vuci vozilo kako bi dodao/oduzeo od vlaka
+STR_884C_SHOW_TRAIN_DETAILS                                     :{BLACK}Prikaži detalje vlaka
+STR_884D_INCREASE_SERVICING_INTERVAL                            :{BLACK}Povećaj servisni interval
+STR_884E_DECREASE_SERVICING_INTERVAL                            :{BLACK}Smanji servisni interval
+STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED                          :{BLACK}Pokaži detalje prevoženog tereta
+STR_8853_SKIP_THE_CURRENT_ORDER                                 :{BLACK}Preskoči trenutnu naredbu i počni sa sljedećom
+STR_8854_DELETE_THE_HIGHLIGHTED                                 :{BLACK}Obriši označenu naredbu
+STR_8859_NEW_NOW_AVAILABLE                                      :{BLACK}{BIGFONT}Novi {STRING} od sada dostupan!
+STR_885A                                                        :{BLACK}{BIGFONT}{STRING}
+STR_885C_BROKEN_DOWN                                            :{RED}Pokvaren
+STR_885D_AGE_RUNNING_COST_YR                                    :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Troškovi uporabe: {LTBLUE}{CURRENCY}/god



 ##id 0x9000
+STR_9007_BUILD_VEHICLE                                          :{BLACK}Izgradi vozilo
+STR_9009_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Ne mogu izgraditi cestovno vozilo...
+STR_900C_DETAILS                                                :{WHITE}{VEHICLE} (Detalji)
+STR_900D_AGE_RUNNING_COST_YR                                    :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Trošak uporabe {LTBLUE}{CURRENCY}/god
+STR_900E_MAX_SPEED                                              :{BLACK}Maks brzina: {LTBLUE}{VELOCITY}
+STR_900F_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY}  (prošle godine: {CURRENCY})
+STR_9010_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pouzdanost: {LTBLUE}{COMMA}%  {BLACK}Kvarovi od posljednjeg servisa: {LTBLUE}{COMMA}
+STR_9011_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
+STR_9012_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}
+STR_9013_MUST_BE_STOPPED_INSIDE                                 :{WHITE}...mora biti zaustavljen unutar spremišta cestovnih vozila
+STR_9014_CAN_T_SELL_ROAD_VEHICLE                                :{WHITE}Ne mogu prodati cestovno vozilo...
+STR_9015_CAN_T_STOP_START_ROAD_VEHICLE                          :{WHITE}Ne mogu zaustaviti/pokrenuti cestovno vozilo...
+STR_9016_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Cestovno vozilo {COMMA} čeka u spremištu
+STR_HEADING_FOR_ROAD_DEPOT                                      :{ORANGE}Kreće se prema {TOWN} cestovnom spremištu
+STR_HEADING_FOR_ROAD_DEPOT_VEL                                  :{ORANGE}Kreće se prema {TOWN} cestovnom spremištu, {VELOCITY}
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u {TOWN} cestovnom spremištu
+STR_HEADING_FOR_ROAD_DEPOT_SERVICE_VEL                          :{LTBLUE}Seervisiranje u {TOWN} cestovnom spremištu, {VELOCITY}
+STR_9018_CAN_T_SEND_VEHICLE_TO_DEPOT                            :{WHITE}Ne mogu poslati vozilo u spremište...
+STR_9019_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Ne mogu pronaći lokalno spremište
+STR_901A_ROAD_VEHICLES_CLICK_ON                                 :{BLACK}Cestovna vozila - klikni na vozilo za informacije
+STR_901B_BUILD_NEW_ROAD_VEHICLES                                :{BLACK}Izgradi nova cestovna vozila (zahtijeva spremište cestovnih vozila)
+STR_901C_CURRENT_VEHICLE_ACTION                                 :{BLACK}Trenutna radnja vozila - klikni ovdje kako bi zaustavio/pokrenuo vozilo
+STR_901D_SHOW_VEHICLE_S_ORDERS                                  :{BLACK}Prikaži naredbe vozila
+STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE                            :{BLACK}Centriraj glavni pogled na lokaciju vozila
+STR_901F_SEND_VEHICLE_TO_DEPOT                                  :{BLACK}Pošalji vozilo u spremište. CTRL+klik će samo servisirati
+STR_9020_FORCE_VEHICLE_TO_TURN_AROUND                           :{BLACK}Natjeraj vozila da se okrene natrag
+STR_9021_SHOW_ROAD_VEHICLE_DETAILS                              :{BLACK}Prikaži detalje cestovnog vozila
+STR_9022_VEHICLES_CLICK_ON_VEHICLE                              :{BLACK}Vozila - klikni na vozilo za informaciju
+STR_9023_BUILD_NEW_ROAD_VEHICLE                                 :{BLACK}Izgradi novo cestovno vozilo
+STR_9024_DRAG_ROAD_VEHICLE_TO_HERE                              :{BLACK}Povuci cestovno vozilo ovdje kako bi ga prodao
+STR_9025_CENTER_MAIN_VIEW_ON_ROAD                               :{BLACK}Centriraj glavni pogled na lokaciju spremišta cestovnih vozila
+STR_9026_ROAD_VEHICLE_SELECTION                                 :{BLACK}Popis cestovnih vozila - klikni na vozilo za informacije
+STR_9027_BUILD_THE_HIGHLIGHTED_ROAD                             :{BLACK}Izgradi označeno cestovno vozilo
+STR_9028_NEW_ROAD_VEHICLE_NOW_AVAILABLE                         :{BLACK}{BIGFONT}Novo cestovno vozilo od sada dostupno!
+STR_9029                                                        :{BLACK}{BIGFONT}{STRING}
+STR_902A_COST_SPEED_RUNNING_COST                                :{BLACK}Trošak: {CURRENCY}{}Brzina: {VELOCITY}{}Trošak uporabe: {CURRENCY}/god{}Kapacitet: {CARGO}

+STR_902C_NAME_ROAD_VEHICLE                                      :{WHITE}Imenuj cestovno vozilo
+STR_902D_CAN_T_NAME_ROAD_VEHICLE                                :{WHITE}Ne mogu preimenovati cestovno vozilo...
+STR_902E_NAME_ROAD_VEHICLE                                      :{BLACK}Imenuj cestovno vozilo
+STR_902F_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi bus stiže na {STATION}!
+STR_9030_CITIZENS_CELEBRATE_FIRST                               :{BLACK}{BIGFONT}Građani slave . . .{}Prvi kamion stiže na {STATION}!
+STR_9031_ROAD_VEHICLE_CRASH_DRIVER                              :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}Vozač poginuo u eksploziji nakon sudara s vlakom
+STR_9032_ROAD_VEHICLE_CRASH_DIE                                 :{BLACK}{BIGFONT}Sudar cestovnog vozila!{}{COMMA} poginulih u eksploziji nakon sudara s vlakom
+STR_9033_CAN_T_MAKE_VEHICLE_TURN                                :{WHITE}Ne mogu natjerati vozilo da se okrene...
+STR_ONLY_TURN_SINGLE_UNIT                                       :{WHITE}Ne mogu okreniti vozila koja se sastoje od više jedinica
+STR_9034_RENAME                                                 :{BLACK}Preimenuj
+STR_9035_RENAME_ROAD_VEHICLE_TYPE                               :{BLACK}Preimenuj vrstu cestovnog vozila
+STR_9036_RENAME_ROAD_VEHICLE_TYPE                               :{WHITE}Preimenuj vrstu cestovnog vozila
+STR_9037_CAN_T_RENAME_ROAD_VEHICLE                              :{WHITE}Ne mogu preimenovati vrstu cestovnog vozila...
+STR_9038_GO_TO_ROADVEH_DEPOT                                    :Idi prema {TOWN} spremištu cestovnih vozila
+STR_SERVICE_AT_ROADVEH_DEPOT                                    :Servisiranje pri {TOWN} spremištu cestovnih vozila

+STR_REFIT_ROAD_VEHICLE_TO_CARRY                                 :{BLACK}Prenamijeni cestovno vozilo za prijevoz druge vrste tereta
+STR_REFIT_ROAD_VEHICLE                                          :{BLACK}Prenamijeni cestovno vozilo
+STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED                     :{BLACK}Prenamijeni cestovno vozilo za prijevoz druge vrste tereta
+STR_REFIT_ROAD_VEHICLE_CAN_T                                    :{WHITE}Ne mogu prenamijeniti cestovno vozilo...
+STR_ROAD_SELECT_TYPE_OF_CARGO_FOR                               :{BLACK}Izaberi vrstu tereta koje će cestovno vozilo prevoziti

 ##id 0x9800
+STR_9800_DOCK_CONSTRUCTION                                      :Izgradnja pristaništa
+STR_9801_DOCK_CONSTRUCTION                                      :{WHITE}Izgradnja pristaništa
+STR_9802_CAN_T_BUILD_DOCK_HERE                                  :{WHITE}Ne mogu izgraditi pristanište ovdje...
+STR_9803_SHIP_DEPOT                                             :{WHITE}{TOWN} Spremište brodova
+STR_9804_NEW_SHIPS                                              :{BLACK}Novi brodovi
+STR_9808_NEW_SHIPS                                              :{WHITE}Novi brodovi
+STR_9809_BUILD_SHIP                                             :{BLACK}Izgradi brod
+STR_CLONE_SHIP                                                  :{BLACK}Kloniraj brod
+STR_CLONE_SHIP_INFO                                             :{BLACK}Ovo će izgradi kopiju broda. Control-klik će doprinijeti dijeljenju naredbi
+STR_980B_SHIP_MUST_BE_STOPPED_IN                                :{WHITE}Brod mora biti zaustavljen u spremištu
+STR_980C_CAN_T_SELL_SHIP                                        :{WHITE}Ne mogu prodati brod...
+STR_980D_CAN_T_BUILD_SHIP                                       :{WHITE}Ne mogu izgraditi brod...
+STR_980E_SHIP_IN_THE_WAY                                        :{WHITE}Brod smeta
+STR_980F                                                        :{WHITE}{VEHICLE}
+STR_9811_DETAILS                                                :{WHITE}{VEHICLE} (Detalji)
+STR_9812_AGE_RUNNING_COST_YR                                    :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Trošak uporabe: {LTBLUE}{CURRENCY}/god
+STR_9813_MAX_SPEED                                              :{BLACK}Maks brzina: {LTBLUE}{VELOCITY}
+STR_9814_PROFIT_THIS_YEAR_LAST_YEAR                             :{BLACK}Zarada ove godine: {LTBLUE}{CURRENCY}  (prošle godine: {CURRENCY})
+STR_9815_RELIABILITY_BREAKDOWNS                                 :{BLACK}Pouzdanost: {LTBLUE}{COMMA}%  {BLACK}Kvarova od posljednjeg servisa: {LTBLUE}{COMMA}
+STR_9816_BUILT_VALUE                                            :{LTBLUE}{STRING}{BLACK}   Izgrađeno: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
+STR_9817_CAPACITY                                               :{BLACK}Kapacitet: {LTBLUE}{CARGO}
+STR_9818_CAN_T_STOP_START_SHIP                                  :{WHITE}Ne mogu pokrenuti/zaustaviti brod...
+STR_9819_CAN_T_SEND_SHIP_TO_DEPOT                               :{WHITE}Ne mogu poslati brod u skladište...
+STR_981A_UNABLE_TO_FIND_LOCAL_DEPOT                             :{WHITE}Ne mogu naći lokalno spremište
+STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Kreće se prema {TOWN} spremištu brodova
+STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Kreće se prema {TOWN} spremištu brodova, {VELOCITY}
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u {TOWN} spremištu brodova
+STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u {TOWN} spremištu brodova, {VELOCITY}
+STR_981C_SHIP_IS_WAITING_IN_DEPOT                               :{WHITE}Brod {COMMA} čeka u spremištu
+STR_981D_BUILD_SHIP_DOCK                                        :{BLACK}Izgradi brodsko pristanište
+STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING                          :{BLACK}Izgradi spremište brodova (za gradnu i servisiranje brodova)
+STR_981F_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Brodovi - klikni na brod za informacije
+STR_9820_BUILD_NEW_SHIP                                         :{BLACK}Izgradi novi brod
+STR_9821_DRAG_SHIP_TO_HERE_TO_SELL                              :{BLACK}Povuci brod ovdje kako bi ga prodao
+STR_9822_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centriraj glavni pogled na lokaciju spremišta brodova
+STR_9823_SHIPS_CLICK_ON_SHIP_FOR                                :{BLACK}Brodovi - klikni na brod za informacije
+STR_9824_BUILD_NEW_SHIPS_REQUIRES                               :{BLACK}Izgradi nove brodove (zahtijeva spremište brodova)
+STR_9825_SHIP_SELECTION_LIST_CLICK                              :{BLACK}Popis brodova - klikni na brod za informacije
+STR_9826_BUILD_THE_HIGHLIGHTED_SHIP                             :{BLACK}Izgradi označeni brod
+STR_9827_CURRENT_SHIP_ACTION_CLICK                              :{BLACK}Trenutna radnja broda - klikni ovdje za zaustavljanje/pokretanje broda
+STR_9828_SHOW_SHIP_S_ORDERS                                     :{BLACK}Prikaži naredbe broda
+STR_9829_CENTER_MAIN_VIEW_ON_SHIP                               :{BLACK}Centriraj glavni pogled na lokaciju broda

 SERVICE_AT_SHIP_DEPOT                                           :Servis u brodskom spremištu grada {TOWN}

@@ -1567,9 +1924,6 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}



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


--- a/lang/unfinished/frisian.txt
+++ b/lang/unfinished/frisian.txt
@@ -1,27 +1,36 @@
-##name Frisian
 ##ownname Frysk
-##isocode fy_NL.UTF-8
-##plural 0
+##isocode fy.UTF-8

 ##id 0x0000
 STR_NULL                                                        :
+STR_0001_OFF_EDGE_OF_MAP                                        :{WHITE}Bûten de map
+STR_0002_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}Te ticht by de râne fan 'e map
+STR_0003_NOT_ENOUGH_CASH_REQUIRES                               :{WHITE}Net genôch jild - {CURRENCY} nedich
 STR_0004                                                        :{WHITE}{CURRENCY64}
 STR_0005                                                        :{RED}{CURRENCY64}
 STR_EMPTY                                                       :
+STR_0007_FLAT_LAND_REQUIRED                                     :{WHITE}Flak lân nedich
+STR_0008_WAITING                                                :{BLACK}Wachtsjend: {WHITE}{STRING}
 STR_0009                                                        :{WHITE}{CARGO}
 STR_000B                                                        :{YELLOW}{STATION})
+STR_000C_ACCEPTS                                                :{BLACK}Aksepteart: {WHITE}
+STR_000D_ACCEPTS                                                :{BLACK}Aksepteart: {GOLD}
 STR_000E                                                        :
+STR_000F_PASSENGERS                                             :Passazjiers
+STR_0010_COAL                                                   :Stienkoal
 STR_0011_MAIL                                                   :Post
 STR_0012_OIL                                                    :Oalje
+STR_0013_LIVESTOCK                                              :Fee
 STR_0014_GOODS                                                  :Guod
-STR_0015_GRAIN                                                  :Graan
+STR_0015_GRAIN                                                  :Nôt
 STR_0016_WOOD                                                   :Hout
+STR_0017_IRON_ORE                                               :Iizererts
 STR_0018_STEEL                                                  :Stiel
-STR_0019_VALUABLES                                              :Kostbere spullen
-STR_001A_COPPER_ORE                                             :Koper erts
+STR_0019_VALUABLES                                              :Kostber guod
+STR_001A_COPPER_ORE                                             :Kopererts
 STR_001B_MAIZE                                                  :Mais
 STR_001C_FRUIT                                                  :Fruit
-STR_001D_DIAMONDS                                               :Diamant
+STR_001D_DIAMONDS                                               :Diamanten
 STR_001E_FOOD                                                   :Iten
 STR_001F_PAPER                                                  :Papier
 STR_0020_GOLD                                                   :Goud
@@ -31,24 +40,26 @@ STR_0023_RUBBER                                                 :Rubber
 STR_0024_SUGAR                                                  :Sûker
 STR_0025_TOYS                                                   :Boartersguod
 STR_0026_CANDY                                                  :Snobbersguod
-STR_0027_COLA                                                   :Cola
+STR_0027_COLA                                                   :Kola
 STR_0028_COTTON_CANDY                                           :Sûkerspin
 STR_0029_BUBBLES                                                :Bubbels
 STR_002A_TOFFEE                                                 :Toffee
 STR_002B_BATTERIES                                              :Batterijen
-STR_002C_PLASTIC                                                :Plestik
+STR_002C_PLASTIC                                                :Plastic
+STR_002D_FIZZY_DRINKS                                           :Frisdrank
 STR_002E                                                        :
 STR_002F_PASSENGER                                              :Passazjier
+STR_0030_COAL                                                   :Stienkoal
 STR_0031_MAIL                                                   :Post
 STR_0032_OIL                                                    :Oalje
 STR_0033_LIVESTOCK                                              :Fee
 STR_0034_GOODS                                                  :Guod
 STR_0035_GRAIN                                                  :Nôt
 STR_0036_WOOD                                                   :Hout
-STR_0037_IRON_ORE                                               :Izer Erts
+STR_0037_IRON_ORE                                               :Iizererts
 STR_0038_STEEL                                                  :Stiel
 STR_0039_VALUABLES                                              :Kostber guod
-STR_003A_COPPER_ORE                                             :Koper Erts
+STR_003A_COPPER_ORE                                             :Kopererts
 STR_003B_MAIZE                                                  :Mais
 STR_003C_FRUIT                                                  :Fruit
 STR_003D_DIAMOND                                                :Diamant
@@ -56,67 +67,290 @@ STR_003E_FOOD                                                   :Iten
 STR_003F_PAPER                                                  :Papier
 STR_0040_GOLD                                                   :Goud
 STR_0041_WATER                                                  :Wetter
+STR_0042_WHEAT                                                  :Weet
 STR_0043_RUBBER                                                 :Rubber
 STR_0044_SUGAR                                                  :Sûker
-STR_0045_TOY                                                    :Boartesguod
+STR_0045_TOY                                                    :Boartersguod
 STR_0046_CANDY                                                  :Snobbersguod
-STR_0047_COLA                                                   :Cola
+STR_0047_COLA                                                   :Kola
+STR_0048_COTTON_CANDY                                           :Sûkerspin
+STR_0049_BUBBLE                                                 :Bubbel
 STR_004A_TOFFEE                                                 :Toffee
 STR_004B_BATTERY                                                :Batterij
-STR_004C_PLASTIC                                                :Plestik
+STR_004C_PLASTIC                                                :Plastic
+STR_004D_FIZZY_DRINK                                            :Frisdrank
 STR_QUANTITY_NOTHING                                            :
-STR_QUANTITY_PASSENGERS                                         :{COMMA} passazjier
+STR_QUANTITY_PASSENGERS                                         :{COMMA} passazjiers
 STR_QUANTITY_COAL                                               :{WEIGHT} ton coal
 STR_QUANTITY_MAIL                                               :{COMMA} tassen mei post
 STR_QUANTITY_OIL                                                :{VOLUME} oalje
 STR_QUANTITY_GRAIN                                              :{WEIGHT} ton graan
 STR_QUANTITY_WOOD                                               :{WEIGHT} ton hout
 STR_QUANTITY_STEEL                                              :{WEIGHT} ton stiel
-STR_QUANTITY_VALUABLES                                          :{COMMA} tas kostber guod
+STR_QUANTITY_VALUABLES                                          :{COMMA} sekken kostber guod
 STR_QUANTITY_MAIZE                                              :{WEIGHT} ton mais
 STR_QUANTITY_FRUIT                                              :{WEIGHT} ton fruit
 STR_QUANTITY_FOOD                                               :{WEIGHT} ton iten
 STR_QUANTITY_PAPER                                              :{WEIGHT} ton papier
-STR_QUANTITY_GOLD                                               :{COMMA} tas goud
+STR_QUANTITY_GOLD                                               :{COMMA} sekken goud
 STR_QUANTITY_WATER                                              :{VOLUME} wetter
-STR_00B2_MESSAGE                                                :{YELLOW}Bericht
-STR_00B3_MESSAGE_FROM                                           :{YELLOW}Bericht fan {STRING}
+STR_00AE                                                        :{WHITE}{DATE_SHORT}
+STR_00AF                                                        :{WHITE}{DATE_LONG}
+STR_00B0_MAP                                                    :{WHITE}Map - {STRING}
+STR_00B1_GAME_OPTIONS                                           :{WHITE}Spul Opsjes
+STR_00B2_MESSAGE                                                :{YELLOW}Berjocht
+STR_00B3_MESSAGE_FROM                                           :{YELLOW}Berjocht fan {STRING}
+STR_00B4_CAN_T_DO_THIS                                          :{WHITE}Kin dit net dwaan....
+STR_00B5_CAN_T_CLEAR_THIS_AREA                                  :{WHITE}Kin dit gebied net leech meitsje....
+STR_00B6_ORIGINAL_COPYRIGHT                                     :{BLACK}Orizjineel copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
 STR_00B7_VERSION                                                :{BLACK}OpenTTD fersje {REV}
+STR_00BA_COPYRIGHT_OPENTTD                                      :{BLACK}OpenTTD {COPYRIGHT}2002-2006 It OpenTTD team

+STR_00C5                                                        :{BLACK}{CROSS}
+STR_00C6                                                        :{SILVER}{CROSS}
+STR_00C7_QUIT                                                   :{WHITE}Ofslúte
 STR_00C8_YES                                                    :{BLACK}Ja
 STR_00C9_NO                                                     :{BLACK}Nee
+STR_00CA_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Witte jo seker dat jo dit spul ôfslúte wolle en werom gean wolle nei {STRING}?
+STR_00CB_1                                                      :{BLACK}1
+STR_00CC_2                                                      :{BLACK}2
+STR_00CD_3                                                      :{BLACK}3
+STR_00CE_4                                                      :{BLACK}4
+STR_00CF_5                                                      :{BLACK}5
+STR_00D0_NOTHING                                                :Neat
 STR_00D1_DARK_BLUE                                              :Tsjuster Blauw
-STR_00D3_PINK                                                   :Roze
+STR_00D2_PALE_GREEN                                             :Fel Grien
+STR_00D3_PINK                                                   :Rôze
 STR_00D4_YELLOW                                                 :Giel
 STR_00D5_RED                                                    :Read
 STR_00D6_LIGHT_BLUE                                             :Ljocht Blauw
 STR_00D7_GREEN                                                  :Grien
 STR_00D8_DARK_GREEN                                             :Tsjuster Grien
 STR_00D9_BLUE                                                   :Blauw
+STR_00DA_CREAM                                                  :Krêm
+STR_00DB_MAUVE                                                  :Griis Rôze
 STR_00DC_PURPLE                                                 :Pears
 STR_00DD_ORANGE                                                 :Oranje
 STR_00DE_BROWN                                                  :Brún
 STR_00DF_GREY                                                   :Griis
 STR_00E0_WHITE                                                  :Wyt
+STR_00E1_TOO_MANY_VEHICLES_IN_GAME                              :{WHITE}Te folle fiertúgen yn it spul
+STR_00E2                                                        :{BLACK}{COMMA}
+STR_00E3                                                        :{RED}{COMMA}
+STR_00E4_LOCATION                                               :{BLACK}Lokaasje
+STR_00E5_CONTOURS                                               :Kontoeren
+STR_00E6_VEHICLES                                               :Fiertúgen
+STR_00E7_INDUSTRIES                                             :Yndustrieen
+STR_00E8_ROUTES                                                 :Rûtes
+STR_00E9_VEGETATION                                             :Fegetaasje
+STR_00EA_OWNERS                                                 :Eigners
+STR_00EB_ROADS                                                  :{BLACK}{TINYFONT}Wegen
+STR_00EC_RAILROADS                                              :{BLACK}{TINYFONT}Treinspoaren
+STR_00ED_STATIONS_AIRPORTS_DOCKS                                :{BLACK}{TINYFONT}Stasjons/Fleanfjilden/Surken
+STR_00EE_BUILDINGS_INDUSTRIES                                   :{BLACK}{TINYFONT}Gebouen/Yndustrieen
+STR_00EF_VEHICLES                                               :{BLACK}{TINYFONT}Fiertúgen
+STR_00F0_100M                                                   :{BLACK}{TINYFONT}100m
+STR_00F1_200M                                                   :{BLACK}{TINYFONT}200m
+STR_00F2_300M                                                   :{BLACK}{TINYFONT}300m
+STR_00F3_400M                                                   :{BLACK}{TINYFONT}400m
+STR_00F4_500M                                                   :{BLACK}{TINYFONT}500m
+STR_00F5_TRAINS                                                 :{BLACK}{TINYFONT}Treinen
+STR_00F6_ROAD_VEHICLES                                          :{BLACK}{TINYFONT}Auto's
+STR_00F7_SHIPS                                                  :{BLACK}{TINYFONT}Skepen
+STR_00F8_AIRCRAFT                                               :{BLACK}{TINYFONT}Fleantúgen
+STR_00F9_TRANSPORT_ROUTES                                       :{BLACK}{TINYFONT}Transport Rûtes
+STR_00FA_COAL_MINE                                              :{BLACK}{TINYFONT}Stienkoalmyn
+STR_00FB_POWER_STATION                                          :{BLACK}{TINYFONT}Stroomsintrale
+STR_00FC_FOREST                                                 :{BLACK}{TINYFONT}Bosk
+STR_00FD_SAWMILL                                                :{BLACK}{TINYFONT}Houtsagerij
+STR_00FE_OIL_REFINERY                                           :{BLACK}{TINYFONT}Oaljeraffinaderij
+STR_00FF_FARM                                                   :{BLACK}{TINYFONT}Buorkerij
+STR_0100_FACTORY                                                :{BLACK}{TINYFONT}Fabryk
+STR_0101_PRINTING_WORKS                                         :{BLACK}{TINYFONT}Drukkerij
+STR_0102_OIL_WELLS                                              :{BLACK}{TINYFONT}Oaljebron
+STR_0103_IRON_ORE_MINE                                          :{BLACK}{TINYFONT}Iizerertsmyn
+STR_0104_STEEL_MILL                                             :{BLACK}{TINYFONT}Stielfabryk
+STR_0105_BANK                                                   :{BLACK}{TINYFONT}Bank
+STR_0106_PAPER_MILL                                             :{BLACK}{TINYFONT}Paperfabryk
+STR_0107_GOLD_MINE                                              :{BLACK}{TINYFONT}Goudmyn
+STR_0108_FOOD_PROCESSING_PLANT                                  :{BLACK}{TINYFONT}Itensfabryk
+STR_0109_DIAMOND_MINE                                           :{BLACK}{TINYFONT}Diamantmyn
+STR_010A_COPPER_ORE_MINE                                        :{BLACK}{TINYFONT}Koperertsmyn
+STR_010B_FRUIT_PLANTATION                                       :{BLACK}{TINYFONT}Fruitplantaazje
+STR_010C_RUBBER_PLANTATION                                      :{BLACK}{TINYFONT}Rubberplantaazje
+STR_010D_WATER_SUPPLY                                           :{BLACK}{TINYFONT}Wetteroanfier
+STR_010E_WATER_TOWER                                            :{BLACK}{TINYFONT}Wettertoer
+STR_010F_LUMBER_MILL                                            :{BLACK}{TINYFONT}Houtsagerij
+STR_0110_COTTON_CANDY_FOREST                                    :{BLACK}{TINYFONT}Sûkerspinnebosk
+STR_0111_CANDY_FACTORY                                          :{BLACK}{TINYFONT}Snobbersguodfabryk
+STR_0112_BATTERY_FARM                                           :{BLACK}{TINYFONT}Batterijebuorkerij
+STR_0113_COLA_WELLS                                             :{BLACK}{TINYFONT}Colabron
+STR_0114_TOY_SHOP                                               :{BLACK}{TINYFONT}Boartersguodwinkel
+STR_0115_TOY_FACTORY                                            :{BLACK}{TINYFONT}Boartersguodfabryk
+STR_0116_PLASTIC_FOUNTAINS                                      :{BLACK}{TINYFONT}Plestikfonteinen
+STR_0117_FIZZY_DRINK_FACTORY                                    :{BLACK}{TINYFONT}Frisdankfabryk
+STR_0118_BUBBLE_GENERATOR                                       :{BLACK}{TINYFONT}Bubbelgenerator
+STR_0119_TOFFEE_QUARRY                                          :{BLACK}{TINYFONT}Toffeemyn
+STR_011A_SUGAR_MINE                                             :{BLACK}{TINYFONT}Sûkermyn
+STR_011B_RAILROAD_STATION                                       :{BLACK}{TINYFONT}Treinstasjon
+STR_011C_TRUCK_LOADING_BAY                                      :{BLACK}{TINYFONT}Frachtweinstasjon
+STR_011D_BUS_STATION                                            :{BLACK}{TINYFONT}Busstasjon
+STR_011E_AIRPORT_HELIPORT                                       :{BLACK}{TINYFONT}Fleanfjild/Helipoart
+STR_011F_DOCK                                                   :{BLACK}{TINYFONT}Dok
+STR_0120_ROUGH_LAND                                             :{BLACK}{TINYFONT}Rûch Lân
+STR_0121_GRASS_LAND                                             :{BLACK}{TINYFONT}Gêrslân
+STR_0122_BARE_LAND                                              :{BLACK}{TINYFONT}Skraal Lân
+STR_0123_FIELDS                                                 :{BLACK}{TINYFONT}Fjilden
+STR_0124_TREES                                                  :{BLACK}{TINYFONT}Beamen
+STR_0125_ROCKS                                                  :{BLACK}{TINYFONT}Stienen
+STR_0126_WATER                                                  :{BLACK}{TINYFONT}Wetter
+STR_0127_NO_OWNER                                               :{BLACK}{TINYFONT}Gjin eigner
+STR_0128_TOWNS                                                  :{BLACK}{TINYFONT}Stêden
+STR_0129_INDUSTRIES                                             :{BLACK}{TINYFONT}Yndustrieen
+STR_012A_DESERT                                                 :{BLACK}{TINYFONT}Woastine
+STR_012B_SNOW                                                   :{BLACK}{TINYFONT}Snie
+STR_012C_MESSAGE                                                :{WHITE}Berjocht
+STR_012D                                                        :{WHITE}{STRING}
+STR_012E_CANCEL                                                 :{BLACK}Annulearje
+STR_012F_OK                                                     :{BLACK}OK
+STR_0130_RENAME                                                 :{BLACK}Omneame
+STR_0131_TOO_MANY_NAMES_DEFINED                                 :{WHITE}Te folle nammen definearre
+STR_0132_CHOSEN_NAME_IN_USE_ALREADY                             :{WHITE}Dizze namme is al brûkt
+
+STR_0133_WINDOWS                                                :Windows
+STR_0134_UNIX                                                   :Unix
+STR_0135_OSX                                                    :OS X
+
+STR_013B_OWNED_BY                                               :{WHITE}...is fan {STRING}
+STR_013C_CARGO                                                  :{BLACK}Fracht
+STR_013D_INFORMATION                                            :{BLACK}Ynformaasje
+STR_013E_CAPACITIES                                             :{BLACK}Kapasiteit
+STR_013E_TOTAL_CARGO                                            :{BLACK}Totale Fracht
+STR_013F_TOTAL_CAPACITY_TEXT                                    :{BLACK}Totale kapasiteit fan dizze trein:
+STR_013F_TOTAL_CAPACITY                                         :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_0140_NEW_GAME                                               :{BLACK}Nei Spul
+STR_0141_LOAD_GAME                                              :{BLACK}Laad Spul
+
+STR_128                                                         :128
+STR_1024                                                        :1024
+STR_2048                                                        :2048
+STR_0148_GAME_OPTIONS                                           :{BLACK}Spul Opsjes
+
+STR_0150_SOMEONE                                                :ien{SKIP}{SKIP}
+STR_0151_MAP_OF_WORLD                                           :Kaart fan 'e wrâld
+STR_0152_TOWN_DIRECTORY                                         :List fan stêden
+STR_0153_SUBSIDIES                                              :Subsidjes
+
+
+
+





 ############ range for menu	starts
+STR_0154_OPERATING_PROFIT_GRAPH                                 :Fertsjinst grafyk
+STR_0155_INCOME_GRAPH                                           :Ynkomsten grafyk
+STR_0156_DELIVERED_CARGO_GRAPH                                  :Oflevere fracht grafyk
+STR_0157_PERFORMANCE_HISTORY_GRAPH                              :Prestaasje skiednis grafyk
+STR_0158_COMPANY_VALUE_GRAPH                                    :Bedriuwswearde grafyk
+STR_0159_CARGO_PAYMENT_RATES                                    :Fracht ôfbetelling grafyk
+STR_015A_COMPANY_LEAGUE_TABLE                                   :Bedriuwskompetysje tabel
 ############ range for menu	ends

+STR_015B_OPENTTD                                                :{WHITE}Oer OpenTTD
+STR_015C_SAVE_GAME                                              :Spul opslaan
+STR_015D_LOAD_GAME                                              :Spul lade
+STR_015E_QUIT_GAME                                              :Spul ferlitte
+STR_015F_QUIT                                                   :Ofslúte
+STR_0161_QUIT_GAME                                              :{WHITE}Ferlit Spul


 ############ range for months starts
+STR_0162_JAN                                                    :Jan
+STR_0163_FEB                                                    :Feb
+STR_0164_MAR                                                    :Mrt
+STR_0165_APR                                                    :Apr
+STR_0166_MAY                                                    :Mai
+STR_0167_JUN                                                    :Jun
+STR_0168_JUL                                                    :Jul
+STR_0169_AUG                                                    :Aug
+STR_016A_SEP                                                    :Sep
+STR_016B_OCT                                                    :Okt
+STR_016C_NOV                                                    :Nov
+STR_016D_DEC                                                    :Des
 ############ range for months ends

+STR_016E                                                        :{TINYFONT}{STRING}{} {STRING}
+STR_016F                                                        :{TINYFONT}{STRING}{} {STRING}{}{NUM}
+STR_0170                                                        :{TINYFONT}{STRING}-
+STR_0171_PAUSE_GAME                                             :{BLACK}Pausear spul
+STR_0172_SAVE_GAME_ABANDON_GAME                                 :{BLACK}Opslaan, ferlitte, ôfslúte
+STR_0173_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Lit list fan stasjons sjen
+STR_0174_DISPLAY_MAP                                            :{BLACK}Lit de kaart sjen
+STR_0175_DISPLAY_MAP_TOWN_DIRECTORY                             :{BLACK}Lit de kaart en de stêdenlist sjen
+STR_0176_DISPLAY_TOWN_DIRECTORY                                 :{BLACK}Lit in list fan alle stêden sjen
+STR_0177_DISPLAY_COMPANY_FINANCES                               :{BLACK}Lit finansjele ynformaasje sjen oer it bedriuw
+STR_0178_DISPLAY_COMPANY_GENERAL                                :{BLACK}Lit algemiene bedriuwsynformaasje sjen
+STR_0179_DISPLAY_GRAPHS                                         :{BLACK}Lit grafyken sjen
+STR_017A_DISPLAY_COMPANY_LEAGUE                                 :{BLACK}Lit de bedriuwskompetysjetabel sjen
+STR_017B_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Lit in list sjen fan de treinen fan dit bedriuw
+STR_017C_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Lit in list sjen fan de auto's fan dit bedriuw
+STR_017D_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Lit in list sjen fan de skepen fan dit bedriuw
+STR_017E_DISPLAY_LIST_OF_COMPANY                                :{BLACK}Lit in list sjen fan de fleantúgen fan dit bedriuw
+STR_017F_ZOOM_THE_VIEW_IN                                       :{BLACK}Zoom it byld yn
+STR_0180_ZOOM_THE_VIEW_OUT                                      :{BLACK}Zoom it byld út
+STR_0181_BUILD_RAILROAD_TRACK                                   :{BLACK}Bou in spoarwei
+STR_0182_BUILD_ROADS                                            :{BLACK}Bou in autodyk
+STR_0183_BUILD_SHIP_DOCKS                                       :{BLACK}Bou surken
+STR_0184_BUILD_AIRPORTS                                         :{BLACK}Bou fleanfjilden
+STR_0185_PLANT_TREES_PLACE_SIGNS                                :{BLACK}Plantsje beamen, set buordsjes del, ensfh.
+STR_0186_LAND_BLOCK_INFORMATION                                 :{BLACK}Lân ynformaasje
+STR_0187_OPTIONS                                                :{BLACK}Opsjes
+STR_0188                                                        :{BLACK}{SMALLUPARROW}
+STR_0189                                                        :{BLACK}{SMALLDOWNARROW}
+STR_018A_CAN_T_CHANGE_SERVICING                                 :{WHITE}Kin tiid tusken ûnderhâlden net feroarje...
+STR_018B_CLOSE_WINDOW                                           :{BLACK}Slút finster
+STR_018C_WINDOW_TITLE_DRAG_THIS                                 :{BLACK}Finstertitel - hjirmei kinst it finster ferslepe
+STR_018D_DEMOLISH_BUILDINGS_ETC                                 :{BLACK}Brek gebouen ensfh. ôf op in stikje lân
+STR_018E_LOWER_A_CORNER_OF_LAND                                 :{BLACK}Ferleech in hoekje lân
+STR_018F_RAISE_A_CORNER_OF_LAND                                 :{BLACK}Ferheech in hoekje lân
+STR_0190_SCROLL_BAR_SCROLLS_LIST                                :{BLACK}Rolbalke - rollet de list op/del
+STR_0191_SHOW_LAND_CONTOURS_ON_MAP                              :{BLACK}Lit de lân kontoeren sjen op de kaart
+STR_0192_SHOW_VEHICLES_ON_MAP                                   :{BLACK}Lit fiertúgen sjen op 'e kaart
+STR_0193_SHOW_INDUSTRIES_ON_MAP                                 :{BLACK}Lit yndustrieen sjen op 'e kaart
+STR_0194_SHOW_TRANSPORT_ROUTES_ON                               :{BLACK}Lit transportrûtes sjen op 'e kaart
+STR_0195_SHOW_VEGETATION_ON_MAP                                 :{BLACK}Lit fegetaasje sjen op 'e kaart
+STR_0196_SHOW_LAND_OWNERS_ON_MAP                                :{BLACK}Lit lân eigners sjen op 'e kaart
+STR_0197_TOGGLE_TOWN_NAMES_ON_OFF                               :{BLACK}Set doarpsnammen oan/út op 'e map
+STR_0198_PROFIT_THIS_YEAR_LAST_YEAR                             :{TINYFONT}{BLACK}Winst dit jier: {CURRENCY} (ferline jier: {CURRENCY})

 ############ range for service numbers starts
 ############ range for service numbers ends

+STR_019C_ROAD_VEHICLE                                           :Auto
+STR_019D_AIRCRAFT                                               :Fleantúg
+STR_019E_SHIP                                                   :Skip
+STR_019F_TRAIN                                                  :Trein
+STR_01A0_IS_GETTING_OLD                                         :{WHITE}{STRING} {COMMA} begjint âld te wurden
+STR_01A1_IS_GETTING_VERY_OLD                                    :{WHITE}{STRING} {COMMA} begjint hiel âld te wurden
+STR_01A2_IS_GETTING_VERY_OLD_AND                                :{WHITE}{STRING} {COMMA} begjint hiel âld te wurden en mat sa snel mooglik ferfong wurde
+STR_01A3_LAND_AREA_INFORMATION                                  :{WHITE}lân Gebied Ynformaasje
+STR_01A4_COST_TO_CLEAR_N_A                                      :{BLACK}Kosten om leech te meitsjen: {LTBLUE}N/B
+STR_01A5_COST_TO_CLEAR                                          :{BLACK}Kosten om leech te meitsjen: {LTBLUE}{CURRENCY}
+STR_01A6_N_A                                                    :N/B
+STR_01A7_OWNER                                                  :{BLACK}Eigner: {LTBLUE}{STRING}
+STR_01A8_LOCAL_AUTHORITY                                        :{BLACK}Gemiente: {LTBLUE}{STRING}
+STR_01A9_NONE                                                   :Neat
+STR_01AA_NAME                                                   :{BLACK}Namme
+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
@@ -142,27 +376,318 @@ STR_01C5_26TH                                                   :26
 STR_01C6_27TH                                                   :27
 STR_01C7_28TH                                                   :28
 STR_01C8_29TH                                                   :29
+STR_01C9_30TH                                                   :30
+STR_01CA_31ST                                                   :31
 ############ range for days	ends

+STR_01CB                                                        :{TINYFONT}{COMMA}

+STR_01CE_CARGO_ACCEPTED                                         :{BLACK}Akseptearre fracht: {LTBLUE}

+STR_01D1_8                                                      :({COMMA}/8 {STRING})
+STR_01D2_JAZZ_JUKEBOX                                           :{WHITE}Jazz Jukebox
+STR_01D3_SOUND_MUSIC                                            :Lûd/musyk
+STR_01D4_SHOW_SOUND_MUSIC_WINDOW                                :{BLACK}Lit lûd/musyk finster sjen
+STR_01D5_ALL                                                    :{TINYFONT}Alles
+STR_01D6_OLD_STYLE                                              :{TINYFONT}Alde Stijl
+STR_01D7_NEW_STYLE                                              :{TINYFONT}Neie Stijl
+STR_01D8_EZY_STREET                                             :{TINYFONT}Ezy Street
+STR_01D9_CUSTOM_1                                               :{TINYFONT}Eigen 1
+STR_01DA_CUSTOM_2                                               :{TINYFONT}Eigen 2
+STR_01DB_MUSIC_VOLUME                                           :{BLACK}{TINYFONT}Musyk Folume
+STR_01DC_EFFECTS_VOLUME                                         :{BLACK}{TINYFONT}Effekten Folume
+STR_01DD_MIN_MAX                                                :{BLACK}{TINYFONT}MIN  '  '  ' '  '  '  MAKS
+STR_01DE_SKIP_TO_PREVIOUS_TRACK                                 :{BLACK}Werom nei foargeand nûmer yn seleksje
+STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION                        :{BLACK}Foarút nei folgjend nûmer yn seleksje
+STR_01E0_STOP_PLAYING_MUSIC                                     :{BLACK}Stopje musyk ôf te spyljen
+STR_01E1_START_PLAYING_MUSIC                                    :{BLACK}Begjin musyk ôf te spyljen
+STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC                              :{BLACK}Fersleep de balkjes om de lûdssterkte te feroarjen
+STR_01E3                                                        :{DKGREEN}{TINYFONT}--
+STR_01E4_0                                                      :{DKGREEN}{TINYFONT}0{COMMA}
+STR_01E5                                                        :{DKGREEN}{TINYFONT}{COMMA}
+STR_01E6                                                        :{DKGREEN}{TINYFONT}------
+STR_01E7                                                        :{DKGREEN}{TINYFONT}"{STRING}"
+STR_01E8_TRACK_XTITLE                                           :{BLACK}{TINYFONT}Nûmer{SETX 88}Titel
+STR_01E9_SHUFFLE                                                :{TINYFONT}Wikselje
+STR_01EA_PROGRAM                                                :{TINYFONT}{BLACK}Programma
+STR_01EB_MUSIC_PROGRAM_SELECTION                                :{WHITE}Musyk Programma Seleksje
+STR_01EC_0                                                      :{TINYFONT}{LTBLUE}0{COMMA} "{STRING}"
+STR_01ED                                                        :{TINYFONT}{LTBLUE}{COMMA} "{STRING}"
+STR_01EE_TRACK_INDEX                                            :{TINYFONT}{BLACK}Musyk Yndex
+STR_01EF_PROGRAM                                                :{TINYFONT}{BLACK}Programma - '{STRING}'
+STR_01F0_CLEAR                                                  :{TINYFONT}{BLACK}Leech
+STR_01F1_SAVE                                                   :{TINYFONT}{BLACK}Opslaan
+STR_01F2_CURRENT_PROGRAM_OF_MUSIC                               :{BLACK}Hjoeddeiske musykprogramma
+STR_01F3_SELECT_ALL_TRACKS_PROGRAM                              :{BLACK}Selektear programma: 'alle nûmers'
+STR_01F4_SELECT_OLD_STYLE_MUSIC                                 :{BLACK}Selektear programma: 'âlde stijl'
+STR_01F5_SELECT_NEW_STYLE_MUSIC                                 :{BLACK}Selektear programma: 'neie stijl'
+STR_01F6_SELECT_CUSTOM_1_USER_DEFINED                           :{BLACK}Selektear programma: 'Eigen 1 (selsmakke)'
+STR_01F7_SELECT_CUSTOM_2_USER_DEFINED                           :{BLACK}Selektear programma: 'Eigen 2 (selsmakke)'
+STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1                          :{BLACK}Leechje dit programma (allinnich Eigen 1 of Eigen 2)
+STR_01F9_SAVE_MUSIC_SETTINGS                                    :{BLACK}Sla musyk ynstellings op
+STR_01FA_CLICK_ON_MUSIC_TRACK_TO                                :{BLACK}Klik op musyk nûmer om te te foegjen oan dit programma (allinnich Eigen 1 of Eigen 2)
+STR_01FB_TOGGLE_PROGRAM_SHUFFLE                                 :{BLACK}Set musyk wikseljen oan/út
+STR_01FC_SHOW_MUSIC_TRACK_SELECTION                             :{BLACK}Lit musyk seleksje skerm sjen.
+STR_01FD_CLICK_ON_SERVICE_TO_CENTER                             :{BLACK}Klik om te sentrearen op yndusty/stêd
+STR_01FE_DIFFICULTY                                             :{BLACK}Moeilikhyd ({STRING})
+STR_01FF                                                        :{TINYFONT}{BLACK}{DATE_LONG}
+STR_0200_LAST_MESSAGE_NEWS_REPORT                               :Lêste (neis)berjocht
+STR_0201_MESSAGE_SETTINGS                                       :Berjocht ynstellings
+STR_0203_SHOW_LAST_MESSAGE_NEWS                                 :{BLACK}Lit lêste (neis)berjocht sjen / lit berjocht ynstellings sjen
+STR_0204_MESSAGE_OPTIONS                                        :{WHITE}Berjocht Opsjes
+STR_0205_MESSAGE_TYPES                                          :{BLACK}Berjochttypes:
+STR_0206_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Oankomst fan earste fiertúg op stasjon fan spyler
+STR_0207_ARRIVAL_OF_FIRST_VEHICLE                               :{YELLOW}Oankomst fan earste fiertúg op stasjon fan tsjinstander
+STR_0208_ACCIDENTS_DISASTERS                                    :{YELLOW}Ungemakken / rampen
+STR_0209_COMPANY_INFORMATION                                    :{YELLOW}Bedriuwsynformaasje
+STR_020A_ECONOMY_CHANGES                                        :{YELLOW}Feroarings yn 'e ekonomie
+STR_020B_ADVICE_INFORMATION_ON_PLAYER                           :{YELLOW}Advys / ynformaasje foar fiertúgen
+STR_020C_NEW_VEHICLES                                           :{YELLOW}Neie fiertúgen
+STR_020D_CHANGES_OF_CARGO_ACCEPTANCE                            :{YELLOW}Feroarings yn akseptearen fan fracht
+STR_020E_SUBSIDIES                                              :{YELLOW}Subsydjes
+STR_020F_GENERAL_INFORMATION                                    :{YELLOW}Algemiene ynformaasje
+STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO                       :{WHITE}...te fier fan lêste eindpunt
+STR_0211_TOP_COMPANIES_WHO_REACHED                              :{BIGFONT}{BLACK}Top bedriuwen dy 't {NUM}{}({STRING} helle ha)
+STR_0212                                                        :{BIGFONT}{COMMA}.
+STR_0213_BUSINESSMAN                                            :Sakeman
+STR_0214_ENTREPRENEUR                                           :Undernimmer
+STR_0215_INDUSTRIALIST                                          :Yndustrialist
+STR_0216_CAPITALIST                                             :Kapitalist
+STR_0217_MAGNATE                                                :Magnaat
+STR_0218_MOGUL                                                  :Mongoal
+STR_0219_TYCOON_OF_THE_CENTURY                                  :Tycoon fan 'e Ieuw
+STR_021B_ACHIEVES_STATUS                                        :{BLACK}{BIGFONT}{COMPANY} behellet '{STRING}' status!
+STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT}{PLAYERNAME} fan {COMPANY} behellet '{STRING}' status!
+STR_021F                                                        :{BLUE}{COMMA}
+STR_0220_CREATE_SCENARIO                                        :{BLACK}Meitsje Lânskip
+STR_0221_OPENTTD                                                :{YELLOW}OpenTTD
+STR_0222_SCENARIO_EDITOR                                        :{YELLOW}Lânskip Ferbouer
+STR_0223_LAND_GENERATION                                        :{WHITE}Lân Generaasje
+STR_0224                                                        :{BLACK}{UPARROW}
+STR_0225                                                        :{BLACK}{DOWNARROW}
+STR_0226_RANDOM_LAND                                            :{BLACK}Samar wat lân
+STR_0227_RESET_LAND                                             :{BLACK}Set lân werom
+STR_0228_INCREASE_SIZE_OF_LAND_AREA                             :{BLACK}Fergrutsje gebiet om te ferheegjen/ferleegjen
+STR_0229_DECREASE_SIZE_OF_LAND_AREA                             :{BLACK}Ferlyts gebiet om te ferheegjen/ferleegjen
+STR_022A_GENERATE_RANDOM_LAND                                   :{BLACK}Meitsje samar wat lân
+STR_022B_RESET_LANDSCAPE                                        :{BLACK}Set it lânskip werom
+STR_022C_RESET_LANDSCAPE                                        :{WHITE}Lânskip weromsette
+STR_022D_ARE_YOU_SURE_YOU_WANT_TO                               :{WHITE}Bist der wis fan dast it lânskip weromsette wolst?
+STR_022E_LANDSCAPE_GENERATION                                   :{BLACK}Lânskip generaasje
+STR_022F_TOWN_GENERATION                                        :{BLACK}Stêd generaasje
+STR_0230_INDUSTRY_GENERATION                                    :{BLACK}Yndustry generaasje
+STR_0231_ROAD_CONSTRUCTION                                      :{BLACK}Wegenbou
+STR_0233_TOWN_GENERATION                                        :{WHITE}Stêd Generaasje
+STR_0234_NEW_TOWN                                               :{BLACK}Neie Stêd
+STR_0235_CONSTRUCT_NEW_TOWN                                     :{BLACK}Bou neie stêd
+STR_0236_CAN_T_BUILD_TOWN_HERE                                  :{WHITE}Kin hjir gjin stêd boue...
+STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP                               :{WHITE}...te ticht by de râne fan 'e map
+STR_0238_TOO_CLOSE_TO_ANOTHER_TOWN                              :{WHITE}...te ticht by in oare stêd
+STR_0239_SITE_UNSUITABLE                                        :{WHITE}...terrein net geskikt
+STR_023A_TOO_MANY_TOWNS                                         :{WHITE}...te folle stêden
+STR_023B_INCREASE_SIZE_OF_TOWN                                  :{BLACK}Fergrutsje stêd
+STR_023C_EXPAND                                                 :{BLACK}Grutter
+STR_023D_RANDOM_TOWN                                            :{BLACK}Samar in stêd
+STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION                          :{BLACK}Bou samar ergens in stêd
+STR_023F_INDUSTRY_GENERATION                                    :{WHITE}Yndustry Generaasje
+STR_0240_COAL_MINE                                              :{BLACK}Stienkoalmyn
+STR_0241_POWER_STATION                                          :{BLACK}Stroomsintrale
+STR_0242_SAWMILL                                                :{BLACK}Houtsagerij
+STR_0243_FOREST                                                 :{BLACK}Bosk
+STR_0244_OIL_REFINERY                                           :{BLACK}Oalje raffinaderij
+STR_0245_OIL_RIG                                                :{BLACK}Oalje boarplatform
+STR_0246_FACTORY                                                :{BLACK}Fabryk
+STR_0247_STEEL_MILL                                             :{BLACK}Stielfabryk
+STR_0248_FARM                                                   :{BLACK}Buorkerij
+STR_0249_IRON_ORE_MINE                                          :{BLACK}IIzerertsmyn
+STR_024A_OIL_WELLS                                              :{BLACK}Oaljebron
+STR_024B_BANK                                                   :{BLACK}Bank
+STR_024C_PAPER_MILL                                             :{BLACK}Papierfabryk
+STR_024D_FOOD_PROCESSING_PLANT                                  :{BLACK}Itensfabryk
+STR_024E_PRINTING_WORKS                                         :{BLACK}Drukkerij
+STR_024F_GOLD_MINE                                              :{BLACK}Goudmyn
+STR_0250_LUMBER_MILL                                            :{BLACK}Houtsagerij
+STR_0251_FRUIT_PLANTATION                                       :{BLACK}Fruitplantaazje
+STR_0252_RUBBER_PLANTATION                                      :{BLACK}Rubberplantaazje
+STR_0253_WATER_SUPPLY                                           :{BLACK}Wetterbron
+STR_0254_WATER_TOWER                                            :{BLACK}Wettertoer
+STR_0255_DIAMOND_MINE                                           :{BLACK}Diamantmyn
+STR_0256_COPPER_ORE_MINE                                        :{BLACK}Koperertsmyn
+STR_0257_COTTON_CANDY_FOREST                                    :{BLACK}Sûkerspinnebosk
+STR_0258_CANDY_FACTORY                                          :{BLACK}Snobbersguodfabryk
+STR_0259_BATTERY_FARM                                           :{BLACK}Batterijebuorkerij
+STR_025A_COLA_WELLS                                             :{BLACK}Colabron
+STR_025B_TOY_SHOP                                               :{BLACK}Boartersguodwinkel
+STR_025C_TOY_FACTORY                                            :{BLACK}Boartersguodfabryk
+STR_025D_PLASTIC_FOUNTAINS                                      :{BLACK}Plasticfonteinen
+STR_025E_FIZZY_DRINK_FACTORY                                    :{BLACK}Frisdrinkenfabryk
+STR_025F_BUBBLE_GENERATOR                                       :{BLACK}Bubbelgenerator
+STR_0260_TOFFEE_QUARRY                                          :{BLACK}Toffeemyn
+STR_0261_SUGAR_MINE                                             :{BLACK}Sûkermyn
+STR_0262_CONSTRUCT_COAL_MINE                                    :{BLACK}Bou in Stienkoalmyn
+STR_0263_CONSTRUCT_POWER_STATION                                :{BLACK}Bou in Enerzjybedrieuw
+STR_0264_CONSTRUCT_SAWMILL                                      :{BLACK}Bou in Houtseachmole
+STR_0265_PLANT_FOREST                                           :{BLACK}Plantsje in Bosk
+STR_0266_CONSTRUCT_OIL_REFINERY                                 :{BLACK}Bou in Oaljeraffinaderij
+STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY                             :{BLACK}Bou in Oalje Boarplatform (Kin allinnich bout wurde by de râne fan 'e map)
+STR_0268_CONSTRUCT_FACTORY                                      :{BLACK}Bou in Fabryk
+STR_0269_CONSTRUCT_STEEL_MILL                                   :{BLACK}Bou in Stielfabryk
+STR_026A_CONSTRUCT_FARM                                         :{BLACK}Bou in Buorkerij
+STR_026B_CONSTRUCT_IRON_ORE_MINE                                :{BLACK}Bou in IIzerertsmyn
+STR_026C_CONSTRUCT_OIL_WELLS                                    :{BLACK}Bou in Oaljebron
+STR_026D_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Bou in Bank (Kin allinnich bout wurde yn stêden mei mear as 1200 ynwenners)
+STR_026E_CONSTRUCT_PAPER_MILL                                   :{BLACK}Bou in Papierfabryk
+STR_026F_CONSTRUCT_FOOD_PROCESSING                              :{BLACK}Bou in Itensfabryk
+STR_0270_CONSTRUCT_PRINTING_WORKS                               :{BLACK}Bou in Drukkerij
+STR_0271_CONSTRUCT_GOLD_MINE                                    :{BLACK}Bou in Goudmyn
+STR_0272_CONSTRUCT_BANK_CAN_ONLY                                :{BLACK}Bou in Bank (Allinnich yn stêden)
+STR_0273_CONSTRUCT_LUMBER_MILL_TO                               :{BLACK}Bou in Houtsagerij
+STR_0274_PLANT_FRUIT_PLANTATION                                 :{BLACK}Plantsje in Fruitplantaazje
+STR_0275_PLANT_RUBBER_PLANTATION                                :{BLACK}Plantsje in Fruitplantaazje
+STR_0276_CONSTRUCT_WATER_SUPPLY                                 :{BLACK}Bou in Wetterbron
+STR_0277_CONSTRUCT_WATER_TOWER_CAN                              :{BLACK}Bou in Wettertoer (Allinnich yn stêden)
+STR_0278_CONSTRUCT_DIAMOND_MINE                                 :{BLACK}Bou in Diamantmyn
+STR_0279_CONSTRUCT_COPPER_ORE_MINE                              :{BLACK}Bou in Koperertsmyn
+STR_027A_PLANT_COTTON_CANDY_FOREST                              :{BLACK}Plantsje in Sûkerspinnebosk
+STR_027B_CONSTRUCT_CANDY_FACTORY                                :{BLACK}Bou in Snobbersguodfabryk
+STR_027C_CONSTRUCT_BATTERY_FARM                                 :{BLACK}Bou in Batterijebuorkerij
+STR_027D_CONSTRUCT_COLA_WELLS                                   :{BLACK}Bou in Colabron
+STR_027E_CONSTRUCT_TOY_SHOP                                     :{BLACK}Bou in Boartersguodwinkel
+STR_027F_CONSTRUCT_TOY_FACTORY                                  :{BLACK}Bouin Boartersguodfabryk
+STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS                            :{BLACK}Bou in Plestikfontein
+STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY                          :{BLACK}Bou in Frisdrankfabryk
+STR_0282_CONSTRUCT_BUBBLE_GENERATOR                             :{BLACK}Bou in Bubbelgenerator
+STR_0283_CONSTRUCT_TOFFEE_QUARRY                                :{BLACK}Bou in Toffeemyn
+STR_0284_CONSTRUCT_SUGAR_MINE                                   :{BLACK}Bou in Sûkermyn
+STR_0285_CAN_T_BUILD_HERE                                       :{WHITE}Kin hjir gjin {STRING} boue...
+STR_0286_MUST_BUILD_TOWN_FIRST                                  :{WHITE}...stêd moat earst bout wurde
+STR_0287_ONLY_ONE_ALLOWED_PER_TOWN                              :{WHITE}..mei mar ien per stêd wêze
+STR_0288_PLANT_TREES                                            :{BLACK}Plantsje beamen
+STR_0289_PLACE_SIGN                                             :{BLACK}Set in buordsje del
+STR_028A_RANDOM_TREES                                           :{BLACK}Samar wat beamen
+STR_028B_PLANT_TREES_RANDOMLY_OVER                              :{BLACK}Plantsje samar wat beamen yn it lânskip
+STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE                         :{BLACK}Set rotsen yn it lânskip
+STR_028D_PLACE_LIGHTHOUSE                                       :{BLACK}Bou in fjoertoer
+STR_028E_PLACE_TRANSMITTER                                      :{BLACK}Bou in sendmast
+STR_028F_DEFINE_DESERT_AREA                                     :{BLACK}
+STR_0290_DELETE                                                 :{BLACK}Fuort
+STR_0291_DELETE_THIS_TOWN_COMPLETELY                            :{BLACK}Helje dizze hiele stêd fuort
+STR_0292_SAVE_SCENARIO                                          :Sla scenario op
+STR_0293_LOAD_SCENARIO                                          :Laad scenario
+STR_0294_QUIT_EDITOR                                            :Slút de lânskipsbouer
+STR_0295                                                        :
+STR_0296_QUIT                                                   :Ofslúte
+STR_0297_SAVE_SCENARIO_LOAD_SCENARIO                            :{BLACK}Sla scenario op, laad scenario, slût ôf
+STR_0298_LOAD_SCENARIO                                          :{WHITE}Laad Scenario
+STR_0299_SAVE_SCENARIO                                          :{WHITE}Sla Scenario op
+STR_029A_PLAY_SCENARIO                                          :{BLACK}Spylje Scenario
+STR_029C_QUIT_EDITOR                                            :{WHITE}Slút Scenariobouer
+STR_029D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kin allinnich bout wurde yn stêden mei 1200 ynwenners of mear
+STR_029E_MOVE_THE_STARTING_DATE                                 :{BLACK}Set it startjier 1 jier efterrút
+STR_029F_MOVE_THE_STARTING_DATE                                 :{BLACK}Set it startjier 1 jier foarút
+STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH                               :{WHITE}...beide úteinden fan'e brêge moatte oan lân lizze
+STR_02A1_SMALL                                                  :{BLACK}Lyts
+STR_02A2_MEDIUM                                                 :{BLACK}Middel
+STR_02A3_LARGE                                                  :{BLACK}Grut
+STR_02A4_SELECT_TOWN_SIZE                                       :{BLACK}Selektear de grutte fan 'e stêd
+STR_02A5_TOWN_SIZE                                              :{YELLOW}Grutte fan 'e stêd:

+STR_02B6                                                        :{STRING}  -  {STRING}
+STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS                              :{BLACK}Lit lêste (neis)berjocht sjen
+STR_02BA                                                        :{SILVER}- -  {COMPANY}  - -
+STR_02BB_TOWN_DIRECTORY                                         :Stêden list
+STR_02BC_VEHICLE_DESIGN_NAMES                                   :{BLACK}Fiertúg ûntwerp nammen
+STR_02BD                                                        :{BLACK}{STRING}
+STR_02BE_DEFAULT                                                :Standert
+STR_02BF_CUSTOM                                                 :Oars
+STR_02C0_SAVE_CUSTOM_NAMES                                      :{BLACK}Sla eigen nammen op
+STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION                         :{BLACK}Fiertúg ûntwerp nammen seleksje
+STR_02C2_SAVE_CUSTOMIZED_VEHICLE                                :{BLACK}Sla eigen fiertúg ûntwerp nammen op

 ############ range for menu	starts
+STR_02C3_GAME_OPTIONS                                           :Spul Opsjes
+STR_02C5_DIFFICULTY_SETTINGS                                    :Moeilikhyd ynstellings
+STR_02C7_CONFIG_PATCHES                                         :Patches Ynstellings
+STR_02CA_TOWN_NAMES_DISPLAYED                                   :{SETX 12}Stêd nammen sjen litte
+STR_02CC_STATION_NAMES_DISPLAYED                                :{SETX 12}Stasjon nammen sjen litte
+STR_02CE_SIGNS_DISPLAYED                                        :{SETX 12}Buordsjes sjen litte
+STR_02D0_FULL_ANIMATION                                         :{SETX 12}Folle animaasje
+STR_02D2_FULL_DETAIL                                            :{SETX 12}Folle detail
+STR_02D4_TRANSPARENT_BUILDINGS                                  :{SETX 12}Trochsichtige gebouen
 ############ range ends	here

 ############ range for menu	starts
+STR_02D5_LAND_BLOCK_INFO                                        :Giebiet Ynformaasje
+STR_02D6                                                        :
+STR_02D7_SCREENSHOT_CTRL_S                                      :Skermfoto (Ctrl-S)
+STR_02D8_GIANT_SCREENSHOT_CTRL_G                                :Grutte Skermfoto (Ctrl-G)
+STR_02D9_ABOUT_OPENTTD                                          :Oer 'OpenTTD'
 ############ range ends	here

+STR_02DB_OFF                                                    :{BLACK}Ut
+STR_02DA_ON                                                     :{BLACK}Oan
+STR_02DC_DISPLAY_SUBSIDIES                                      :{BLACK}Lit Subsidjes sjen
+STR_02DD_SUBSIDIES                                              :Subsydjes
+STR_02DE_MAP_OF_WORLD                                           :Map fan 'e wrâld
+STR_02DF_TOWN_DIRECTORY                                         :Stêden list

+STR_02E0_CURRENCY_UNITS                                         :{BLACK}Muntienhyd
+STR_02E1                                                        :{BLACK}{SKIP}{STRING}
+STR_02E2_CURRENCY_UNITS_SELECTION                               :{BLACK}Muntienhyd seleksje
+STR_02E4                                                        :{BLACK}{SKIP}{SKIP}{STRING}
+STR_02E6_ROAD_VEHICLES                                          :{BLACK}Auto's
+STR_02E7                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
+STR_02E8_SELECT_SIDE_OF_ROAD_FOR                                :{BLACK}Selektear hokker side fan 'e dyk de auto's op ryde moatte
+STR_02E9_DRIVE_ON_LEFT                                          :Ryde links
+STR_02EA_DRIVE_ON_RIGHT                                         :Ryde rjochts
+STR_02EB_TOWN_NAMES                                             :{BLACK}Stêd nammen
+STR_02EC                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_02ED_SELECT_STYLE_OF_TOWN_NAMES                             :{BLACK}Selektear stijl fan 'e nammen

+STR_02F4_AUTOSAVE                                               :{BLACK}Automatysk opslaan
+STR_02F5                                                        :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_02F6_SELECT_INTERVAL_BETWEEN                                :{BLACK}Selektear tiid tusken automatyske ûnderhaldsbar
+STR_02F7_OFF                                                    :Ut
+STR_02F8_EVERY_3_MONTHS                                         :Eltse 3 moannen
+STR_02F9_EVERY_6_MONTHS                                         :Eltse 6 moannen
+STR_02FA_EVERY_12_MONTHS                                        :Eltse 12 moannen
+STR_02FB_START_A_NEW_GAME                                       :{BLACK}Begjin in nei spul
+STR_02FC_LOAD_A_SAVED_GAME                                      :{BLACK}Laad in opslein spul
+STR_02FE_CREATE_A_CUSTOMIZED_GAME                               :{BLACK}Meitsje in selsmakke lânskip
+STR_02FF_SELECT_SINGLE_PLAYER_GAME                              :{BLACK}Selektear ien-spyler spul
+STR_0300_SELECT_MULTIPLAYER_GAME                                :{BLACK}Selektear mear-spyler spul fan 2 oant 8 spylers
+STR_0301_DISPLAY_GAME_OPTIONS                                   :{BLACK}Lit spul opsjes sjen
+STR_0302_DISPLAY_DIFFICULTY_OPTIONS                             :{BLACK}Lit moeilikhyds opsjes sjen
+STR_0303_START_A_NEW_GAME_USING                                 :{BLACK}Start in nei spul, mei in selsmakke lânskip
+STR_0304_QUIT                                                   :{BLACK}Ofslúte
+STR_0305_QUIT_OPENTTD                                           :{BLACK}Slút 'OpenTTD' ôf
+STR_0307_OPENTTD                                                :{WHITE}OpenTTD {REV}
+STR_030D_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kin allinnich yn in stêd bout wurde
+STR_030E_SELECT_TEMPERATE_LANDSCAPE                             :{BLACK}Selektear 'normaal' lânskip
+STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE                            :{BLACK}Selektear 'iis' lânskip
+STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE                          :{BLACK}Selektear 'subtropysk' lânskip
+STR_0311_SELECT_TOYLAND_LANDSCAPE                               :{BLACK}Selektear 'boartersguodlân' lânskip
+STR_0312_FUND_CONSTRUCTION_OF_NEW                               :{BLACK}Betelje de bou fan in neie yndustry

 ############ range for menu	starts
+STR_0313_FUND_NEW_INDUSTRY                                      :Betelje neie yndustry
 ############ range ends here

+STR_0314_FUND_NEW_INDUSTRY                                      :{WHITE}Betelje neie yndustry
+STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS                             :{WHITE}...kin allinnich yn stêden bout wurde
+STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST                        :{WHITE}...kin allinnich yn in reinwâld bout wurde
+STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT                            :{WHITE}...kin allinnich yn in woastine bout wurde
+STR_0319_PAUSED                                                 :{YELLOW}* *  PAUSEARRE  *  *

+STR_031B_SCREENSHOT_SUCCESSFULLY                                :{WHITE}Skermfoto opslein as '{STRING}'
+STR_031C_SCREENSHOT_FAILED                                      :{WHITE}Koe gjin skermfoto meitsje!

+STR_0329_PURCHASE_LAND_FOR_FUTURE                               :{BLACK}Keapje lân om letter te brûken
+STR_032F_AUTOSAVE                                               :{RED}AUTOSAVE
+STR_0330_SELECT_EZY_STREET_STYLE                                :{BLACK}Selektear 'Ezy Street' musyk programma

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

 ############ start of townname region
 ############ end of	townname region
@@ -179,6 +704,7 @@ STR_01C8_29TH                                                   :29



+
 # Start of order review system.
 # DON'T ADD OR REMOVE LINES HERE
 # end of order system
@@ -220,6 +746,8 @@ STR_01C8_29TH                                                   :29



+
+



@@ -262,15 +790,164 @@ STR_01C8_29TH                                                   :29



+
+##### PNG-MAP-Loader
+
+
+
 ##id 0x0800
+STR_0800_COST                                                   :{TINYFONT}{RED}Kostet: {CURRENCY}
+STR_0801_COST                                                   :{RED}Kostet: {CURRENCY}
+STR_0802_INCOME                                                 :{TINYFONT}{GREEN}Opbringst: {CURRENCY}
+STR_0803_INCOME                                                 :{GREEN}Opbringst: {CURRENCY}
+STR_0805_ESTIMATED_COST                                         :{WHITE}Dit gjit {CURRENCY} kosten.
+STR_0807_ESTIMATED_INCOME                                       :{WHITE}Dit gjit {CURRENCY} opbringen.
+STR_0808_CAN_T_RAISE_LAND_HERE                                  :{WHITE}Kin it lân hjir net ferheegje...
+STR_0809_CAN_T_LOWER_LAND_HERE                                  :{WHITE}Kin it lân hjir net ferleegje...
+STR_080A_ROCKS                                                  :Rotsen
+STR_080B_ROUGH_LAND                                             :Rûch lân
+STR_080C_BARE_LAND                                              :Leech lân
+STR_080D_GRASS                                                  :Gêrs
+STR_080E_FIELDS                                                 :Fjild
+STR_080F_SNOW_COVERED_LAND                                      :Snie
+STR_0810_DESERT                                                 :Woastine

 ##id 0x1000
+STR_1000_LAND_SLOPED_IN_WRONG_DIRECTION                         :{WHITE}Lân rint ferkeard ôf
+STR_1001_IMPOSSIBLE_TRACK_COMBINATION                           :{WHITE}Spoar kombinaasje net mooglik
+STR_1002_EXCAVATION_WOULD_DAMAGE                                :{WHITE}Utgraven soe tunnel beskeadigje
+STR_1003_ALREADY_AT_SEA_LEVEL                                   :{WHITE}Lân is al op seenivo
+STR_1004_TOO_HIGH                                               :{WHITE}Te heech
+STR_1005_NO_SUITABLE_RAILROAD_TRACK                             :{WHITE}Spoar is net geskikt
+STR_1007_ALREADY_BUILT                                          :{WHITE}...is al bout
+STR_1008_MUST_REMOVE_RAILROAD_TRACK                             :{WHITE}Spoar moat der earst wei
+STR_100A_RAILROAD_CONSTRUCTION                                  :{WHITE}Spoarwei Konstruksje
+STR_100B_MONORAIL_CONSTRUCTION                                  :{WHITE}Monorail Konstruksje
+STR_100C_MAGLEV_CONSTRUCTION                                    :{WHITE}MagLev Konstruksje
+STR_100D_SELECT_RAIL_BRIDGE                                     :{WHITE}Selektear Spoar Brêge
+STR_100E_CAN_T_BUILD_TRAIN_DEPOT                                :{WHITE}Kin hjir gjin trein depot boue...
+STR_100F_CAN_T_BUILD_RAILROAD_STATION                           :{WHITE}Kin hjir gjin treinstasjon boue...
+STR_1010_CAN_T_BUILD_SIGNALS_HERE                               :{WHITE}Kin hjir gjin stopljochten boue...
+STR_1011_CAN_T_BUILD_RAILROAD_TRACK                             :{WHITE}Kin hjir gjin spoarwei boue
+STR_1012_CAN_T_REMOVE_RAILROAD_TRACK                            :{WHITE}Kin hjir gjin spoar fuorthelje...
+STR_1013_CAN_T_REMOVE_SIGNALS_FROM                              :{WHITE}Kin hjir gjin stopljochten fuorthelje
+STR_1014_TRAIN_DEPOT_ORIENTATION                                :{WHITE}Treindepot Rjochting
+STR_1015_RAILROAD_CONSTRUCTION                                  :Spoarwei konstruksje
+STR_1016_MONORAIL_CONSTRUCTION                                  :Monorail konstruksje
+STR_1017_MAGLEV_CONSTRUCTION                                    :MagLev konstruksje
+STR_1018_BUILD_RAILROAD_TRACK                                   :{BLACK}Bou spoarwei
+STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING                         :{BLACK}Bou trein depot (foar bou en ûnderhâld fan treinen)
+STR_101A_BUILD_RAILROAD_STATION                                 :{BLACK}Bou treinstasjon
+STR_101B_BUILD_RAILROAD_SIGNALS                                 :{BLACK}Bou stopljochten foar oan it spoar
+STR_101C_BUILD_RAILROAD_BRIDGE                                  :{BLACK}Bou in spoar brêge
+STR_101D_BUILD_RAILROAD_TUNNEL                                  :{BLACK}Bou in spoar tunnel
+STR_101E_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Set bouen/fuortheljen foar spoaren en stopljochten oan/út
+STR_101F_BRIDGE_SELECTION_CLICK                                 :{BLACK}Brêge seleksje - klik op de brêge dyst boue wolst
+STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO                       :{BLACK}Selektearje treindepot rjochting
+STR_1021_RAILROAD_TRACK                                         :Spoarwei
+STR_1023_RAILROAD_TRAIN_DEPOT                                   :Trein depot
+STR_1024_AREA_IS_OWNED_BY_ANOTHER                               :{WHITE}...gebiet is fan in oar bedriuw



 ##id 0x1800
+STR_1801_MUST_REMOVE_ROAD_FIRST                                 :{WHITE}Wei moat earst fuorthelle wurde
+STR_1802_ROAD_CONSTRUCTION                                      :{WHITE}Wegenbou
+STR_1803_SELECT_ROAD_BRIDGE                                     :{WHITE}Selektear brêge
+STR_1804_CAN_T_BUILD_ROAD_HERE                                  :{WHITE}Kin hjir gjin wei boue...
+STR_1805_CAN_T_REMOVE_ROAD_FROM                                 :{WHITE}Kin hjir gjin wei fuorthelje...
+STR_1806_ROAD_DEPOT_ORIENTATION                                 :{WHITE}Autodepot rjochting
+STR_1807_CAN_T_BUILD_ROAD_VEHICLE                               :{WHITE}Kin hjir gjin auto depot boue...
+STR_1808_CAN_T_BUILD_BUS_STATION                                :{WHITE}Kin hjir gjin busstasjon boue...
+STR_1809_CAN_T_BUILD_TRUCK_STATION                              :{WHITE}Kin hjir gjin frachtweinstasjon boue...
+STR_180A_ROAD_CONSTRUCTION                                      :Wegenbou
+STR_180B_BUILD_ROAD_SECTION                                     :{BLACK}Bou wei
+STR_180C_BUILD_ROAD_VEHICLE_DEPOT                               :{BLACK}Bou autodepot (om auto's te bouen en te únderhâlden
+STR_180D_BUILD_BUS_STATION                                      :{BLACK}Bou busstasjon
+STR_180E_BUILD_TRUCK_LOADING_BAY                                :{BLACK}Bou laadstasjon foar frachtauto's
+STR_180F_BUILD_ROAD_BRIDGE                                      :{BLACK}Bou autobrêge
+STR_1810_BUILD_ROAD_TUNNEL                                      :{BLACK}Bou autotunnel
+STR_1811_TOGGLE_BUILD_REMOVE_FOR                                :{BLACK}Wikselje tusken bou en fuortheljen fan dyken
+STR_1813_SELECT_ROAD_VEHICLE_DEPOT                              :{BLACK}Kies rjochting foar autodepot
+STR_1814_ROAD                                                   :Wei
+STR_1815_ROAD_WITH_STREETLIGHTS                                 :Wei mei strjitteljochten
+STR_1816_TREE_LINED_ROAD                                        :Wei mei beammen oan 'e siden
+STR_1817_ROAD_VEHICLE_DEPOT                                     :Autodepot
+STR_1818_ROAD_RAIL_LEVEL_CROSSING                               :Dyk/spoar krusing

 ##id 0x2000
+STR_2000_TOWNS                                                  :{WHITE}Stêden
+STR_2002                                                        :{TINYFONT}{BLACK}{STRING}
+STR_2004_BUILDING_MUST_BE_DEMOLISHED                            :{WHITE}Gebou moat earst fuorthelle wurde
+STR_2005                                                        :{WHITE}{TOWN}
+STR_2006_POPULATION                                             :{BLACK}Ynwenners: {ORANGE}{COMMA}{BLACK}  Hûzen: {ORANGE}{COMMA}
+STR_2007_RENAME_TOWN                                            :Stêdsnamme Feroarje
+STR_2008_CAN_T_RENAME_TOWN                                      :{WHITE}Kin de namme net feroarje...
+STR_2009_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} gemiente stiet dit net ta
+STR_200A_TOWN_NAMES_CLICK_ON_NAME                               :{BLACK}Stêdsnammen - klik op de namme om it byld op dy stêd te sintrearen
+STR_200B_CENTER_THE_MAIN_VIEW_ON                                :{BLACK}Sintrearje it byld op de lokaasje fan dizze stêd
+STR_200C_CHANGE_TOWN_NAME                                       :{BLACK}Feroarje stêdsnamme
+STR_200D_PASSENGERS_LAST_MONTH_MAX                              :{BLACK}Passazjiers lêste moanne: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_200E_MAIL_LAST_MONTH_MAX                                    :{BLACK}Post lêste moanne: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_200F_TALL_OFFICE_BLOCK                                      :Heech kantoargebou
+STR_2010_OFFICE_BLOCK                                           :Kantoargebou
+STR_2011_SMALL_BLOCK_OF_FLATS                                   :Lyts flatgebou
+STR_2012_CHURCH                                                 :Tsjerke
+STR_2013_LARGE_OFFICE_BLOCK                                     :Grut kantoargebou
+STR_2014_TOWN_HOUSES                                            :Doarpshûzen
+STR_2015_HOTEL                                                  :Hotel
+STR_2016_STATUE                                                 :Stânbyld
+STR_2017_FOUNTAIN                                               :Fontein
+STR_2018_PARK                                                   :Park
+STR_2019_OFFICE_BLOCK                                           :Kantoargebou
+STR_201A_SHOPS_AND_OFFICES                                      :Winkels en kantoaren
+STR_201B_MODERN_OFFICE_BUILDING                                 :Modern kantoargebou
+STR_201C_WAREHOUSE                                              :Warehûs
+STR_201D_OFFICE_BLOCK                                           :Kantoargebou
+STR_201E_STADIUM                                                :Stadion
+STR_201F_OLD_HOUSES                                             :Alde hûzen
+STR_2020_LOCAL_AUTHORITY                                        :{BLACK}Gemeente
+STR_2021_SHOW_INFORMATION_ON_LOCAL                              :{BLACK}Lit ynformaasje sjen oer de gemeente
+STR_2022_LOCAL_AUTHORITY                                        :{WHITE}{TOWN} gemeente
+STR_2023_TRANSPORT_COMPANY_RATINGS                              :{BLACK}Transportbedrieuw rang:
+STR_2024                                                        :{YELLOW}{COMPANY}{PLAYERNAME}: {ORANGE}{STRING}
+STR_2025_SUBSIDIES                                              :{WHITE}Subsydzjes
+STR_2026_SUBSIDIES_ON_OFFER_FOR                                 :{BLACK}Subsydzjes dy't oanbean wurde:
+STR_2027_FROM_TO                                                :{ORANGE}{STRING} fan {STRING} nei {STRING}
+STR_2028_BY                                                     :{YELLOW} (foar {DATE_SHORT})
+STR_202A_NONE                                                   :{ORANGE}Gjin
+STR_202B_SERVICES_ALREADY_SUBSIDISED                            :{BLACK}Tsjinsten dy't al subsydzje krije:
+STR_202C_FROM_TO                                                :{ORANGE}{STRING} fan {STATION} nei {STATION}{YELLOW} ({COMPANY}
+STR_202D_UNTIL                                                  :{YELLOW}, oant {DATE_SHORT})
+STR_202E_OFFER_OF_SUBSIDY_EXPIRED                               :{BLACK}{BIGFONT}Subsydzje oanbieding ferrûn:{}{}{STRING} fan {STRING} nei {STRING} sil no net in subsydzje krije.
+STR_202F_SUBSIDY_WITHDRAWN_SERVICE                              :{BLACK}{BIGFONT}Subsydzje ôfrûn:{}{}{STRING} tsjinst fan {STATION} nei {STATION} krijt gjin subsydzje mear.
+STR_2030_SERVICE_SUBSIDY_OFFERED                                :{BLACK}{BIGFONT}Subsydzje oanbean:{}{}Earste{STRING} tsjinst fan {STRING} nei {STRING} krijt in jier subsydzje fan 'e gemeente!
+STR_2031_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsydzje tawezen oan {COMPANY}!{}{}{STRING} tsjinst fan {STATION} nei {STATION} krijt 50% ekstra betelle foar it kommende jier!
+STR_2032_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsydzje tawezen oan {COMPANY}!{}{}{STRING} tsjinst fan {STATION} nei {STATION} krijt dûbel betelle foar it kommende jier!
+STR_2033_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsydzje tawezen oan {COMPANY}!{}{}{STRING} tsjinst fan {STATION} nei {STATION} krijt trijedûbel betelle foar it kommende jier!
+STR_2034_SERVICE_SUBSIDY_AWARDED                                :{BLACK}{BIGFONT}Subsydzje tawezen oan {COMPANY}!{}{}{STRING} tsjinst fan {STATION} nei {STATION} krijt fjouwerdûbel betelle foar it kommende jier!
+STR_2035_LOCAL_AUTHORITY_REFUSES                                :{WHITE}{TOWN} gemeente lit it net ta dat der noch in fleanfjild bout wurd yn dizze stêd
+STR_2036_COTTAGES                                               :Húskes
+STR_2037_HOUSES                                                 :Hûzen
+STR_2038_FLATS                                                  :Flatgebouwen
+STR_2039_TALL_OFFICE_BLOCK                                      :Grut kantoargebou
+STR_203A_SHOPS_AND_OFFICES                                      :Winkels en kantoaren
+STR_203B_SHOPS_AND_OFFICES                                      :Winkels en kantoaren
+STR_203C_THEATER                                                :Teater
+STR_203D_STADIUM                                                :Stadion
+STR_203E_OFFICES                                                :Kantoargebouwen
+STR_203F_HOUSES                                                 :Hûzen
+STR_2040_CINEMA                                                 :Bioskoop
+STR_2041_SHOPPING_MALL                                          :Winkelsintrum
+STR_2042_DO_IT                                                  :{BLACK}Doch it
+STR_2043_LIST_OF_THINGS_TO_DO_AT                                :{BLACK}List fan dingen dy'st yn dizze stêd dwaan kinst - klik op in aksje om mear details te besjen
+STR_2044_CARRY_OUT_THE_HIGHLIGHTED                              :{BLACK}Fier de opljochte aksje út
+STR_2045_ACTIONS_AVAILABLE                                      :{BLACK}Mooglike aksjes:
+STR_2046_SMALL_ADVERTISING_CAMPAIGN                             :Lytse promoasjekampanje
+STR_2047_MEDIUM_ADVERTISING_CAMPAIGN                            :Middelgrutte promoasjekampanje
+STR_2048_LARGE_ADVERTISING_CAMPAIGN                             :Grutte promoasjekampanje
+STR_2049_FUND_LOCAL_ROAD_RECONSTRUCTION                         :Subsidiearje lokale weiferbouwing
+STR_204A_BUILD_STATUE_OF_COMPANY                                :Bou stânbyld fan bedrieuwseigner


 ##id 0x2800
@@ -282,6 +959,7 @@ STR_01C8_29TH                                                   :29
 ############ range for rating ends


+
 ##id 0x3800

 ##id 0x4000
@@ -315,6 +993,8 @@ STR_01C8_29TH                                                   :29

 ##id 0x7000

+
+
 ##id 0x8000

 ##id 0x8800
@@ -324,18 +1004,24 @@ STR_01C8_29TH                                                   :29



+
+
 ##id 0x9000


+
 ##id 0x9800

+SERVICE_AT_SHIP_DEPOT                                           :Underhâld yn {TOWN} Skipswerf

 ##id 0xA000

+SERVICE_AT_AIRPORT_HANGAR                                       :Underhâld yn {STATION} Hangar

 ##id 0xB000


+SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 ############ Those following lines need to be in this order!!
 ############ End of order list

@@ -346,9 +1032,36 @@ STR_01C8_29TH                                                   :29



+
+
+### depot strings
+
+
+
+
+
+
+
+
+
+
+
+
 ############ Lists rail types


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


+
+########### String for New Landscape Generator
+
+
+
+########### String for new airports
+
+
+############ Tooltip measurment
+
+
+########
--- a/lang/unfinished/greek.txt
+++ b/lang/unfinished/greek.txt
@@ -255,7 +255,6 @@ STR_015C_SAVE_GAME                                              :Αποθήκε
 STR_015D_LOAD_GAME                                              :Φόρτωση παιχνιδιού
 STR_015E_QUIT_GAME                                              :Παραίτηση από το παιχνίδι
 STR_015F_QUIT                                                   :Έξοδος
-STR_0160_ARE_YOU_SURE_YOU_WANT_TO                               :{YELLOW}Είστε βέβαιοι ότι θέλετε να παραιτηθείτε από το παιχνίδι;
 STR_0161_QUIT_GAME                                              :{WHITE}Παραίτηση από το Παιχνίδι


@@ -325,9 +324,9 @@ 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,41 +334,41 @@ 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ος
+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 +387,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 +399,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,15 +412,15 @@ 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                                       :Ρυθμίσεις μηνυμάτων
@@ -439,7 +438,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                                           :Επιχειρηματίας
@@ -453,8 +452,8 @@ STR_021C_OF_ACHIEVES_STATUS                                     :{WHITE}{BIGFONT
 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}Τυχαία Γη
@@ -482,20 +481,20 @@ 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 +550,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 +565,14 @@ 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_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,8 +589,8 @@ 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}Αποθήκευση προσαρμοσμένων ονομάτων σχεδίασης οχημάτων
@@ -1468,6 +1466,8 @@ STR_8038_WIZZOWOW_Z99                                           :Wizzowow Z99



+
+
 ##id 0x9000


@@ -1493,9 +1493,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 +1509,6 @@ SET_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.



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


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

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

+
+############ Tooltip measurment
+
+
 ########
--- a/lang/unfinished/japanese.txt
+++ b/lang/unfinished/japanese.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
@@ -232,8 +244,7 @@
 		<File
 			RelativePath=".\lang\lithuanian.txt">
 			<FileConfiguration
-				Name="Debug|Win32"
-				ExcludedFromBuild="TRUE">
+				Name="Debug|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating lithuanian language file"
--- 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"
 			>
@@ -274,7 +288,6 @@
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
-				ExcludedFromBuild="true"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -942,12 +942,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 +1648,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;
 		}
--- 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-RC3";
 #else
 	const char _openttd_revision[] = NOREV_STRING;
 #endif
--- a/network_client.c
+++ b/network_client.c
@@ -509,7 +509,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 +521,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);
 		}
 	}
--- a/network_server.c
+++ b/network_server.c
@@ -862,7 +862,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;
--- 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) {
+			grfmsg(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,14 +136,63 @@ 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;
+		assert(HASBIT(cur->flags, GCF_STATIC));
+		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);
 }


@@ -279,6 +333,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 +384,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 +458,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
@@ -44,6 +44,7 @@ void ScanNewGRFFiles(void);
 const GRFConfig *FindGRFConfig(uint32 grfid, 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);
@@ -54,8 +55,10 @@ 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
@@ -200,17 +200,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,
@@ -485,20 +485,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
@@ -287,6 +287,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 +317,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 +441,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;
 }
@@ -885,9 +892,9 @@ void DeleteVehicleNews(VehicleID vid, StringID news)
 			if (_forced_news == n || _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 +905,28 @@ 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 i, visible_news;
+				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 == _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/openttd.c
+++ b/openttd.c
@@ -150,7 +150,7 @@ 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"
@@ -301,7 +301,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;
@@ -595,14 +595,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 +623,7 @@ static void MakeNewGame(bool from_heightmap)

 static void MakeNewEditorWorldDone(void)
 {
-	_local_player = OWNER_NONE;
+	SetLocalPlayer(OWNER_NONE);

 	MarkWholeScreenDirty();
 }
@@ -682,7 +682,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 +773,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 +794,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 +806,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 +838,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();
@@ -1275,18 +1275,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;
 		}
 	}

--- 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/openttd_vs80.vcproj
+++ b/openttd_vs80.vcproj
@@ -58,7 +58,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -170,7 +170,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
 				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				StringPooling="true"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
@@ -276,7 +276,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -375,7 +375,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_REV_HACK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -591,6 +591,14 @@
 						CompileAs="2"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
 					>
@@ -599,6 +607,14 @@
 						CompileAs="2"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						CompileAs="2"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\landscape.c"
--- a/order_cmd.c
+++ b/order_cmd.c
@@ -611,8 +611,17 @@ int32 CmdModifyOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 			u = GetFirstVehicleFromSharedList(v);
 			DeleteOrderWarnings(u);
 			for (; u != NULL; u = u->next_shared) {
-				/* toggle u->current_order "Full load" flag if it changed */
+				/* Toggle u->current_order "Full load" flag if it changed.
+				 * However, as the same flag is used for depot orders, check
+				 * whether we are not going to a depot as there are three
+				 * cases where the full load flag can be active and only
+				 * one case where the flag is used for depot orders. In the
+				 * other cases for the OrderType the flags are not used,
+				 * so do not care and those orders should not be active
+				 * when this function is called.
+				 */
 				if (sel_ord == u->cur_order_index &&
+						u->current_order.type != OT_GOTO_DEPOT &&
 						HASBIT(u->current_order.flags, OFB_FULL_LOAD) != HASBIT(order->flags, OFB_FULL_LOAD)) {
 					TOGGLEBIT(u->current_order.flags, OFB_FULL_LOAD);
 				}
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,8 +1,14 @@
-openttd (0.4.8svn) unstable; urgency=low
+openttd (0.5.0~rc3-1) unstable; urgency=low

-  * Unreleased SVN version. Versioned to allow normal upgrades to released versions.
+  * New upstream release

- -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Thu, 21 Dec 2006 14:54:35 +0100
+ -- Matthijs Kooijman <matthijs@xanthe>  Sun,  7 Jan 2007 13:43:45 +0100
+
+openttd (0.5.0~rc2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <m.kooijman@student.utwente.nl>  Fri, 22 Dec 2006 11:03:46 +0100

 openttd (0.4.8-1) unstable; urgency=low

--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -106,9 +106,6 @@ endif
 $(OSX_STRIP): $(TTD)
 	$(Q)$(STRIP) openttd

-ifdef JAGUAR
-JAGUAR_POSTFIX := -jaguar
-endif

 # build the bundle. OSX wants to keep apps in bundles, so we will give it one
 # the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
@@ -136,15 +133,12 @@ release: all
 	$(Q)mkdir -p "OpenTTD $(REV)/scenario"
 	$(Q)cp -R $(OSXAPP) "OpenTTD $(REV)/"
 	$(Q)cp docs/OSX_install_instructions.txt "OpenTTD $(REV)/How to install (please read).txt"
-	$(Q)cp docs/OSX_why_multiple_applications.txt "OpenTTD $(REV)/why a special Jaguar download.txt"
 	$(Q)cp readme.txt "OpenTTD $(REV)/docs/"
-	$(Q)cp docs/console.txt "OpenTTD $(REV)/docs/"
 	$(Q)cp COPYING "OpenTTD $(REV)/docs/"
 	$(Q)cp changelog.txt "OpenTTD $(REV)/docs/"
-	$(Q)cp os/macosx/*.webloc "OpenTTD $(REV)"
 	$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
 	$(Q)cp -R scenario/* "OpenTTD $(REV)/scenario/"
-	$(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
+	$(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx.dmg
 	$(Q)rm -fr "OpenTTD $(REV)"

 $(OSX): $(TTD) $(OSX_STRIP) BUILD_OSX_BUNDLE
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@@ -38,6 +38,10 @@ endif

 ifeq ($(shell uname), Darwin)
 	# it's a hardware mac, not crosscompiling
+	ifeq ($(shell uname -r), 6.8)
+	# OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later
+$(error OpenTTD can not run or compile on MacOS X 10.2. 10.3.9 or newer is needed)
+	endif
 	NATIVE_OSX:=1
 endif

@@ -85,26 +89,13 @@ ifdef OTTD_PPC970
 	endif
 endif

-ifdef JAGUAR
-	CFLAGS  += -isysroot /Developer/SDKs/MacOSX10.2.8.sdk
-	LDFLAGS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk
-	OTTD_PPC:=1
-endif
-
 # setting up flags to make a binary, that fits the system it builds on
 ifdef NATIVE_OSX
 	ifndef UNIVERSAL_BINARY
 		# we are not crosscompiling for other macs
-		ifndef JAGUAR
-			# the next line fails if it got whitespace in front of it
+		# the next line fails if it got whitespace in front of it
 $(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector)
-			IS_G5:=$(shell os/macosx/G5_detector)
-			ifeq ($(shell uname -r), 6.8)
-			# OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later
-				JAGUAR:=1
-				OTTD_PPC:=1
-			endif
-		endif
+		IS_G5:=$(shell os/macosx/G5_detector)
 	endif
 endif

--- a/os/macosx/Open_Transport_Tycoon_Forum.webloc
+++ b/os/macosx/Open_Transport_Tycoon_Forum.webloc
--- a/os/macosx/Open_Transport_Tycoon_Homepage.webloc
+++ b/os/macosx/Open_Transport_Tycoon_Homepage.webloc
--- a/os/macosx/SourceForge_OpenTTD_project_homepage.webloc
+++ b/os/macosx/SourceForge_OpenTTD_project_homepage.webloc
--- a/os/win32/installer/install.nsi
+++ b/os/win32/installer/install.nsi
@@ -2,7 +2,7 @@
 !define APPNAME "OpenTTD"
 !define APPNAMEANDVERSION "OpenTTD 0.5.0.0"
 !define APPVERSION "0.5.0.0"
-!define INSTALLERVERSION 23 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
+!define INSTALLERVERSION 25 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!!
 !define MUI_ICON "..\..\..\openttd.ico"
 !define MUI_UNICON "..\..\..\openttd.ico"
 !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp"
--- a/os_timer.c
+++ b/os_timer.c
@@ -40,7 +40,7 @@ uint64 _rdtsc(void)
 #endif

 /* rdtsc for PPC which has this not */
-#if defined(__POWERPC__) && !defined(RDTSC_AVAILABLE)
+#if (defined(__POWERPC__) || defined(__powerpc__)) && !defined(RDTSC_AVAILABLE)
 uint64 _rdtsc(void)
 {
 	uint32 high = 0, high2 = 0, low;
--- a/ottdres.rc
+++ b/ottdres.rc
@@ -42,18 +42,18 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 // Dialog
 //

-100 DIALOG DISCARDABLE  0, 0, 305, 70
+100 DIALOG DISCARDABLE  0, 0, 305, 77
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Fatal Application Failure"
 FONT 8, "MS Sans Serif"
 BEGIN
-    PUSHBUTTON      "&Close",12,7,49,50,14
-    PUSHBUTTON      "&Submit report",14,81,49,68,14,WS_DISABLED
-    PUSHBUTTON      "&Emergency save",13,155,49,68,14
-    PUSHBUTTON      "",15,243,49,55,14
-    EDITTEXT        11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL |
+    PUSHBUTTON      "&Close",12,7,58,50,14
+    PUSHBUTTON      "&Submit report",14,81,58,68,14,WS_DISABLED
+    PUSHBUTTON      "&Emergency save",13,155,58,68,14
+    PUSHBUTTON      "",15,243,58,55,14
+    EDITTEXT        11,7,79,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL |
                    WS_HSCROLL | NOT WS_TABSTOP
-    LTEXT           "",10,36,7,262,34
+    LTEXT           "",10,36,7,262,43
    ICON            100,IDC_STATIC,9,9,20,20
 END

@@ -84,9 +84,9 @@ BEGIN
            VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
            VALUE "CompanyName", "OpenTTD Development Team\0"
            VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "Development Version\0"
+            VALUE "FileVersion", "0.5.0-RC3 (r7971)\0"
            VALUE "InternalName", "openttd\0"
-            VALUE "LegalCopyright", "Copyright <20> OpenTTD Developers 2002-2006. All Rights Reserved.\0"
+            VALUE "LegalCopyright", "Copyright <20> OpenTTD Developers 2002-2007. All Rights Reserved.\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "openttd.exe\0"
            VALUE "PrivateBuild", "\0"
--- a/pathfind.c
+++ b/pathfind.c
@@ -299,6 +299,15 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
 		if (IsTileDepotType(tile, TRANSPORT_ROAD) && ReverseDiagDir(GetRoadDepotDirection(tile)) != direction) return;
 	}

+	/* Check if the new tile is a tunnel or bridge head and that the direction
+	 * and transport type match */
+	if (IsTileType(tile, MP_TUNNELBRIDGE) && IsTunnel(tile)) {
+		if (GetTunnelDirection(tile) != direction ||
+				GetTunnelTransportType(tile) != tpf->tracktype) {
+			return;
+		}
+	}
+
 	tpf->rd.cur_length++;

 	bits = GetTileTrackStatus(tile, tpf->tracktype);
@@ -339,8 +348,8 @@ static void TPFMode1(TrackPathFinder* tpf, TileIndex tile, DiagDirection directi
 	if (tpf->hasbit_13)
 		return;

-	tile = tile_org;
 	direction = ReverseDiagDir(direction);
+	tile += TileOffsByDiagDir(direction);

 	bits = GetTileTrackStatus(tile, tpf->tracktype);
 	bits |= (bits >> 8);
--- a/player.h
+++ b/player.h
@@ -206,6 +206,7 @@ void GetNameOfOwner(Owner owner, TileIndex tile);
 int64 CalculateCompanyValue(const Player* p);
 void InvalidatePlayerWindows(const Player* p);
 void UpdatePlayerMoney32(Player *p);
+void SetLocalPlayer(PlayerID new_player);
 #define FOR_ALL_PLAYERS(p) for (p = _players; p != endof(_players); p++)

 VARDEF PlayerID _local_player;
--- a/players.c
+++ b/players.c
@@ -28,6 +28,29 @@
 #include "date.h"
 #include "window.h"

+/**
+ * Sets the local player and updates the patch settings that are set on a
+ * per-company (player) basis to reflect the core's state in the GUI.
+ * @param new_player the new player
+ * @pre IsValidPlayer(new_player) || new_player == PLAYER_SPECTATOR || new_player == OWNER_NONE
+ */
+void SetLocalPlayer(PlayerID new_player)
+{
+	/* Player could also be PLAYER_SPECTATOR or OWNER_NONE */
+	assert(IsValidPlayer(new_player) || new_player == PLAYER_SPECTATOR || new_player == OWNER_NONE);
+
+	_local_player = new_player;
+
+	/* Do not update the patches if we are in the intro GUI */
+	if (IsValidPlayer(new_player) && _game_mode != GM_MENU) {
+		const Player *p = GetPlayer(new_player);
+		_patches.autorenew        = p->engine_renew;
+		_patches.autorenew_months = p->engine_renew_months;
+		_patches.autorenew_money  = p->engine_renew_money;
+		InvalidateWindow(WC_GAME_OPTIONS, 0);
+	}
+}
+

 uint16 GetDrawStringPlayerColor(PlayerID player)
 {
@@ -820,9 +843,11 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 		/* This command is only executed in a multiplayer game */
 		if (!_networking) return CMD_ERROR;

-		/* ClientID would be valid up to MAX_CLIENT_INFO, but as it has to be a
-		 * new player, its valid range is restricted to that of players */
-		if (!(flags & DC_EXEC) || !IsValidPlayer((PlayerID)cid)) return 0;
+		/* Has the network client a correct ClientID? */
+		if (!(flags & DC_EXEC)) return 0;
+#ifdef ENABLE_NETWORK
+		if (cid >= MAX_CLIENT_INFO) return 0;
+#endif /* ENABLE_NETWORK */

 		/* Delete multiplayer progress bar */
 		DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
@@ -839,7 +864,8 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 			} else
 #endif /* ENABLE_NETWORK */
 			{
-				_local_player = _network_playas = PLAYER_SPECTATOR;
+				_network_playas = PLAYER_SPECTATOR;
+				SetLocalPlayer(PLAYER_SPECTATOR);
 			}
 			break;
 		}
@@ -847,7 +873,7 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 		/* This is the joining client who wants a new company */
 		if (_local_player != _network_playas) {
 			assert(_local_player == PLAYER_SPECTATOR && _network_playas == p->index);
-			_local_player = p->index;
+			SetLocalPlayer(p->index);
 			MarkWholeScreenDirty();
 		}

--- a/rail_gui.c
+++ b/rail_gui.c
@@ -694,6 +694,7 @@ static void StationBuildWndProc(Window *w, WindowEvent *e)
 		bool newstations = _railstation.newstations;
 		int y_offset;
 		DrawPixelInfo tmp_dpi, *old_dpi;
+		const StationSpec *statspec = newstations ? GetCustomStationSpec(_railstation.station_class, _railstation.station_type) : NULL;

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

@@ -712,23 +713,14 @@ static void StationBuildWndProc(Window *w, WindowEvent *e)
 		if (_station_show_coverage)
 			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);

-		/* Update buttons for correct spread value */
-		for (bits = _patches.station_spread; bits < 7; bits++) {
-			DisableWindowWidget(w, bits + 5);
-			DisableWindowWidget(w, bits + 12);
-		}
-
-		if (newstations) {
-			const StationSpec *statspec = GetCustomStationSpec(_railstation.station_class, _railstation.station_type);
-
-			for (bits = 0; bits < 7; bits++) {
-				if (statspec == NULL) {
-					EnableWindowWidget(w, bits +  5);
-					EnableWindowWidget(w, bits + 12);
-				} else {
-					SetWindowWidgetDisabledState(w, bits +  5, HASBIT(statspec->disallowed_platforms, bits));
-					SetWindowWidgetDisabledState(w, bits + 12, HASBIT(statspec->disallowed_lengths,   bits));
-				}
+		for (bits = 0; bits < 7; bits++) {
+			bool disable = bits >= _patches.station_spread;
+			if (statspec == NULL) {
+				SetWindowWidgetDisabledState(w, bits +  5, disable);
+				SetWindowWidgetDisabledState(w, bits + 12, disable);
+			} else {
+				SetWindowWidgetDisabledState(w, bits +  5, HASBIT(statspec->disallowed_platforms, bits) || disable);
+				SetWindowWidgetDisabledState(w, bits + 12, HASBIT(statspec->disallowed_lengths,   bits) || disable);
 			}
 		}

--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2006-12-21
-Release version: 0.5.0-RC1
+Last updated:    2007-01-07
+Release version: 0.5.0-RC3
 ------------------------------------------------------------------------


@@ -35,7 +35,7 @@ more information, see the file 'COPYING'.
 ---- ----------
 The easiest way to contact the OpenTTD team is by submitting bug reports or
 posting comments in our forums. You can also chat with us on IRC (#openttd
-on irc.freenode.net).
+on irc.oftc.net).

 The OpenTTD homepage is http://www.openttd.org/.

@@ -54,7 +54,7 @@ is not already known.
 The Flyspray project page URL is: http://bugs.openttd.org/

 Please include the following information in your bug report:
-        - OpenTTD version (PLEASE test the latest SVN/daily build)
+        - OpenTTD version (PLEASE test the latest SVN/nightly build)
        - Bug details, including instructions how to reproduce it
        - Platform and compiler (Win32, Linux, FreeBSD, ...)
        - Attach a saved game or a screenshot if possible
@@ -70,13 +70,13 @@ OpenTTD has been ported to several platforms and operating systems. It shouldn't
 be very difficult to port it to a new platform. The currently working platforms
 are:

-	BeOS                 - SDL
-	FreeBSD              - SDL
-	Linux                - SDL
-	MacOS X (universal)  - Cocoa video and sound drivers (SDL works too, but not 100% and not as a universal binary)
-	MorphOS              - SDL
-	OS/2                 - SDL
-	Windows              - Win32 GDI (faster) or SDL
+  BeOS                 - SDL
+  FreeBSD              - SDL
+  Linux                - SDL
+  MacOS X (universal)  - Cocoa video and sound drivers (SDL works too, but not 100% and not as a universal binary)
+  MorphOS              - SDL
+  OS/2                 - SDL
+  Windows              - Win32 GDI (faster) or SDL


 4.0) Running OpenTTD:
@@ -120,7 +120,7 @@ Several important non-standard controls:
 * Use Ctrl to place semaphore signals
 * Ctrl-D toggles double mode in the Windows version
 * Ingame console. More information at
-  http://wiki.openttd.org/index.php/OpenTTDDevBlackBook
+  http://wiki.openttd.org/index.php/Console


 6.0) Configuration File:
@@ -149,12 +149,11 @@ Windows:
 Unix:
  OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
  Note that you need SDL-devel 1.2.5 (or higher) to compile OpenTTD.
-  (see also docs/Readme_Mandrake_Linux.txt)

 MacOS X:
  Use "make" or Xcode (which will then call make for you)
-	This will give you a binary for your CPU type (PPC/Intel)
-	To make an universal binary type "make FAT_BINARY:=1"
+  This will give you a binary for your CPU type (PPC/Intel)
+  To make a universal binary type "make UNIVERSAL_BINARY:=1"

 BeOS:
  Use "make".
@@ -167,7 +166,7 @@ FreeBSD:
 MorphOS:
  Use "make". Note that you need the MorphOS SDK, latest libnix updates (else
  C++ parts of OpenTTD will not build) and the powersdl.library SDK. Optionally
-  libz and libpng developer files.
+  libz, libpng and freetype2 developer files.

 OS/2:
  Open Watcom C/C++ 1.3 or later is required to build the OS/2 version. See the
@@ -272,13 +271,13 @@ The OpenTTD team (in alphabetical order):
  Bjarni Corfitzen (Bjarni)      - Mac OS X port, coder
  Matthijs Kooijman (blathijs)   - Pathfinder-guru
  Victor Fischer (Celestar)      - Programming everywhere you need him to
-  Tam<EFBFBD>s Farag<EFBFBD> (Darkvater)       - Lead programmer
-  Lo<EFBFBD>c Guilloux (glx)            - In training, not yet specialized
+  Tamás Faragó (Darkvater)       - Lead programmer
+  Loïc Guilloux (glx)            - In training, not yet specialized
  Jaroslav Mazanec (KUDr)        - YAPG (Yet Another Pathfinder God) ;)
  Kerekes Miham (MiHaMiX)        - Maintainer of translator service, and host of nightlies

  Peter Nelson (peter1138)       - Spiritual descendant from newgrf gods
-  Remko Bijker (Rubidium)        - Belugas code scrutinizer",
+  Remko Bijker (Rubidium)        - Programmer
  Christoph Mallon (Tron)        - Programmer, code correctness police
  Patric Stout (TrueLight)       - Programmer, network guru, SVN-repository and website host

@@ -289,18 +288,18 @@ Retired Developers:
  Serge Paquet (vurlix)          - Assistant project manager, coder (0.1 - 0.3.3)

 Thanks to:
-  Josef Drexler - For his great work on TTDPatch.
-  Marcin Grzegorczyk - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
-  Matthijs Kooijman (blathijs) - For his many patches, suggestions and major work on maprewrite
-  Petr Baudis (pasky) - Many patches, newgrf support, etc.
-  Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with (and future PBS)
-  Stefan Mei<EFBFBD>ner (sign_de) - For his work on the console
-  Mike Ragsdale - OpenTTD installer
-  Cian Duffy (MYOB) - BeOS port / manual writing
-  Christian Rosentreter (tokai) - MorphOS / AmigaOS port
-  Richard Kempton (richK) - additional airports, initial TGP implementation
-  Michael Blunck - For revolutionizing TTD with awesome graphics
-  George - Canal graphics
-  All Translators - For their support to make OpenTTD a truly international game
-  Bug Reporters - Thanks for all bug reports
-  Chris Sawyer - For an amazing game!
+  Josef Drexler                  - For his great work on TTDPatch.
+  Marcin Grzegorczyk             - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
+  Matthijs Kooijman (blathijs)   - For his many patches, suggestions and major work on maprewrite
+  Petr Baudis (pasky)            - Many patches, newgrf support, etc.
+  Simon Sasburg (HackyKid)       - For the many bugfixes he has blessed us with (and future PBS)
+  Stefan Meißner (sign_de)       - For his work on the console
+  Mike Ragsdale                  - OpenTTD installer
+  Cian Duffy (MYOB)              - BeOS port / manual writing
+  Christian Rosentreter (tokai)  - MorphOS / AmigaOS port
+  Richard Kempton (RichK67)      - Additional airports, initial TGP implementation
+  Michael Blunck                 - For revolutionizing TTD with awesome graphics
+  George                         - Canal graphics
+  All Translators                - For their support to make OpenTTD a truly international game
+  Bug Reporters                  - Thanks for all bug reports
+  Chris Sawyer                   - For an amazing game!
--- a/road_gui.c
+++ b/road_gui.c
@@ -342,8 +342,8 @@ void ShowBuildRoadToolbar(void)

 static const Widget _build_road_scen_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                   STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   161,     0,    13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,   RESIZE_NONE,     7,   162,   173,     0,    13, 0x0,                        STR_STICKY_BUTTON},
+{    WWT_CAPTION,   RESIZE_NONE,     7,    11,   140,     0,    13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{  WWT_STICKYBOX,   RESIZE_NONE,     7,   141,   152,     0,    13, 0x0,                        STR_STICKY_BUTTON},

 {     WWT_IMGBTN,   RESIZE_NONE,     7,     0,    21,    14,    35, SPR_IMG_ROAD_NW,            STR_180B_BUILD_ROAD_SECTION},
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    22,    43,    14,    35, SPR_IMG_ROAD_NE,            STR_180B_BUILD_ROAD_SECTION},
@@ -354,13 +354,12 @@ static const Widget _build_road_scen_widgets[] = {
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    66,   107,    14,    35, SPR_IMG_BRIDGE,             STR_180F_BUILD_ROAD_BRIDGE},
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   108,   129,    14,    35, SPR_IMG_ROAD_TUNNEL,        STR_1810_BUILD_ROAD_TUNNEL},
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   130,   151,    14,    35, SPR_IMG_REMOVE,             STR_1811_TOGGLE_BUILD_REMOVE_FOR},
-{     WWT_IMGBTN,   RESIZE_NONE,     7,   152,   173,    14,    35, SPR_IMG_LANDSCAPING,        STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };

 static const WindowDesc _build_road_scen_desc = {
-	WDP_AUTO, WDP_AUTO, 174, 36,
-	WC_SCEN_BUILD_ROAD,0,
+	WDP_AUTO, WDP_AUTO, 152, 36,
+	WC_SCEN_BUILD_ROAD, 0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_build_road_scen_widgets,
 	BuildRoadToolbWndProc
--- a/screenshot.c
+++ b/screenshot.c
@@ -561,6 +561,7 @@ bool MakeScreenshot(void)
 	switch (current_screenshot_type) {
 		case SC_VIEWPORT:
 			UndrawMouseCursor();
+			DrawDirtyBlocks();
 			current_screenshot_type = SC_NONE;
 			return MakeSmallScreenshot();
 		case SC_WORLD:
--- a/station.h
+++ b/station.h
@@ -94,6 +94,8 @@ struct Station {
 	byte truck_stop_status_obsolete;
 	byte bus_stop_status_obsolete;
 	byte blocked_months_obsolete;
+
+	Rect rect; ///< Station spread out rectangle (not saved) maintained by StationRect_xxx() functions
 };

 enum {
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -33,6 +33,21 @@
 #include "yapf/yapf.h"
 #include "date.h"

+typedef enum StationRectModes
+{
+	RECT_MODE_TEST = 0,
+	RECT_MODE_TRY,
+	RECT_MODE_FORCE
+} StationRectMode;
+
+static void StationRect_Init(Station *st);
+static bool StationRect_IsEmpty(Station *st);
+static bool StationRect_BeforeAddTile(Station *st, TileIndex tile, StationRectMode mode);
+static bool StationRect_BeforeAddRect(Station *st, TileIndex tile, int w, int h, StationRectMode mode);
+static bool StationRect_AfterRemoveTile(Station *st, TileIndex tile);
+static bool StationRect_AfterRemoveRect(Station *st, TileIndex tile, int w, int h);
+
+
 /**
 * Called if a new block is added to the station-pool
 */
@@ -467,6 +482,7 @@ static void StationInitialize(Station *st, TileIndex tile)
 	st->random_bits = Random();
 	st->waiting_triggers = 0;

+	StationRect_Init(st);
 }

 // Update the virtual coords needed to draw the station sign.
@@ -732,38 +748,14 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
 	InvalidateWindowWidget(WC_STATION_VIEW, st->index, 4);
 }

-static bool CheckStationSpreadOut(Station *st, TileIndex tile, int w, int h)
-{
-	StationID station_index = st->index;
-	uint x1 = TileX(tile);
-	uint y1 = TileY(tile);
-	ottd_Rectangle r = {x1, y1, x1 + w - 1, y1 + h - 1};
-	// get station bounding rect
-	for (tile = 0; tile < MapSize(); tile++) {
-		if (IsTileType(tile, MP_STATION) && GetStationIndex(tile) == station_index) MergePoint(&r, tile);
-	}
-	// check if bounding rect doesn't exceed the maximum station spread
-	if (r.max_x - r.min_x >= _patches.station_spread || r.max_y - r.min_y >= _patches.station_spread) {
-		_error_message = STR_306C_STATION_TOO_SPREAD_OUT;
-		return false;
-	}
-	return true;
-}
-
 static void UpdateStationSignCoord(Station *st)
 {
-	ottd_Rectangle r = {MapSizeX(), MapSizeY(), 0, 0};
-	TileIndex tile;
+	Rect *r = &st->rect;

-	// get station bounding rect
-	for (tile = 0; tile < MapSize(); tile++) {
-		if (IsTileType(tile, MP_STATION) && GetStationIndex(tile) == st->index) MergePoint(&r, tile);
-	}
+	if (StationRect_IsEmpty(st)) return; // no tiles belong to this station

-	if (r.max_x < r.min_x) return; // no tiles belong to this station
-
-	// clamp sign coord to be inside the rect
-	st->xy = TileXY(clampu(TileX(st->xy), r.min_x, r.max_x), clampu(TileY(st->xy), r.min_y, r.max_y));
+	// clamp sign coord to be inside the station rect
+	st->xy = TileXY(clampu(TileX(st->xy), r->left, r->right), clampu(TileY(st->xy), r->top, r->bottom));
 	UpdateStationVirtCoordDirty(st);
 }

@@ -1036,7 +1028,7 @@ int32 CmdBuildRailroadStation(TileIndex tile_org, uint32 flags, uint32 p1, uint3
 		}

 		//XXX can't we pack this in the "else" part of the if above?
-		if (!CheckStationSpreadOut(st, tile_org, w_org, h_org)) return CMD_ERROR;
+		if (!StationRect_BeforeAddRect(st, tile_org, w_org, h_org, RECT_MODE_TEST)) return CMD_ERROR;
 	} else {
 		// Create a new station
 		st = AllocateStation();
@@ -1095,6 +1087,8 @@ int32 CmdBuildRailroadStation(TileIndex tile_org, uint32 flags, uint32 p1, uint3

 		st->build_date = _date;

+		StationRect_BeforeAddRect(st, tile_org, w_org, h_org, RECT_MODE_TRY);
+
 		tile_delta = (axis == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
 		track = AxisToTrack(axis);

@@ -1215,6 +1209,7 @@ int32 CmdRemoveFromRailroadStation(TileIndex tile, uint32 flags, uint32 p1, uint
 		uint specindex = GetCustomStationSpecIndex(tile);
 		Track track = GetRailStationTrack(tile);
 		DoClearSquare(tile);
+		StationRect_AfterRemoveTile(st, tile);
 		SetSignalsOnBothDir(tile, track);
 		YapfNotifyTrackLayoutChange(tile, track);

@@ -1291,7 +1286,7 @@ uint GetPlatformLength(TileIndex tile, DiagDirection dir)
 static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
 {
 	int w,h;
-	int32 cost;
+	int32 cost = 0;

 	/* if there is flooding and non-uniform stations are enabled, remove platforms tile by tile */
 	if (_current_player == OWNER_WATER && _patches.nonuniform_stations)
@@ -1308,9 +1303,6 @@ static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)

 	assert(w != 0 && h != 0);

-	/* cost is area * constant */
-	cost = w*h*_price.remove_rail_station;
-
 	/* clear all areas of the station */
 	do {
 		int w_bak = w;
@@ -1319,6 +1311,7 @@ static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
 			if (TileBelongsToRailStation(st, tile)) {
 				if (!EnsureNoVehicle(tile))
 					return CMD_ERROR;
+				cost += _price.remove_rail_station;
 				if (flags & DC_EXEC) {
 					Track track = GetRailStationTrack(tile);
 					DoClearSquare(tile);
@@ -1333,7 +1326,10 @@ static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
 	} while (--h);

 	if (flags & DC_EXEC) {
+		StationRect_AfterRemoveRect(st, st->train_tile, st->trainst_w, st->trainst_h);
+
 		st->train_tile = 0;
+		st->trainst_w = st->trainst_h = 0;
 		st->facilities &= ~FACIL_TRAIN;

 		free(st->speclist);
@@ -1459,7 +1455,7 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 			return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);
 		}

-		if (!CheckStationSpreadOut(st, tile, 1, 1)) return CMD_ERROR;
+		if (!StationRect_BeforeAddTile(st, tile, RECT_MODE_TEST)) return CMD_ERROR;

 		FindRoadStopSpot(type, st, &currstop, &prev);
 	} else {
@@ -1497,6 +1493,8 @@ int32 CmdBuildRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 		st->build_date = _date;

+		StationRect_BeforeAddTile(st, tile, RECT_MODE_TRY);
+
 		MakeRoadStop(tile, st->owner, st->index, type, p1);

 		UpdateStationVirtCoordDirty(st);
@@ -1544,6 +1542,7 @@ static int32 RemoveRoadStop(Station *st, uint32 flags, TileIndex tile)

 		DeleteRoadStop(cur_stop);
 		DoClearSquare(tile);
+		StationRect_AfterRemoveTile(st, tile);

 		UpdateStationVirtCoordDirty(st);
 		DeleteStationIfEmpty(st);
@@ -1701,12 +1700,16 @@ int32 CmdBuildAirport(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 		if (st != NULL && st->facilities) st = NULL;
 	}

+	if (w > _patches.station_spread || h > _patches.station_spread) {
+		_error_message = STR_306C_STATION_TOO_SPREAD_OUT;
+		return CMD_ERROR;
+	}
+
 	if (st != NULL) {
 		if (st->owner != OWNER_NONE && st->owner != _current_player)
 			return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);

-		if (!CheckStationSpreadOut(st, tile, 1, 1))
-			return CMD_ERROR;
+		if (!StationRect_BeforeAddRect(st, tile, w, h, RECT_MODE_TEST)) return CMD_ERROR;

 		if (st->airport_tile != 0)
 			return_cmd_error(STR_300D_TOO_CLOSE_TO_ANOTHER_AIRPORT);
@@ -1743,6 +1746,8 @@ int32 CmdBuildAirport(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 		st->build_date = _date;

+		StationRect_BeforeAddRect(st, tile, w, h, RECT_MODE_TRY);
+
 		/* if airport was demolished while planes were en-route to it, the
 		 * positions can no longer be the same (v->u.air.pos), since different
 		 * airports have different indexes. So update all planes en-route to this
@@ -1805,6 +1810,8 @@ static int32 RemoveAirport(Station *st, uint32 flags)
 			);
 		}

+		StationRect_AfterRemoveRect(st, tile, w, h);
+
 		st->airport_tile = 0;
 		st->facilities &= ~FACIL_AIRPORT;

@@ -1974,7 +1981,7 @@ int32 CmdBuildDock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 		if (st->owner != OWNER_NONE && st->owner != _current_player)
 			return_cmd_error(STR_3009_TOO_CLOSE_TO_ANOTHER_STATION);

-		if (!CheckStationSpreadOut(st, tile, 1, 1)) return CMD_ERROR;
+		if (!StationRect_BeforeAddRect(st, tile, _dock_w_chk[direction], _dock_h_chk[direction], RECT_MODE_TEST)) return CMD_ERROR;

 		if (st->dock_tile != 0) return_cmd_error(STR_304C_TOO_CLOSE_TO_ANOTHER_DOCK);
 	} else {
@@ -2003,6 +2010,8 @@ int32 CmdBuildDock(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)

 		st->build_date = _date;

+		StationRect_BeforeAddRect(st, tile, _dock_w_chk[direction], _dock_h_chk[direction], RECT_MODE_TRY);
+
 		MakeDock(tile, st->owner, st->index, direction);

 		UpdateStationVirtCoordDirty(st);
@@ -2028,8 +2037,11 @@ static int32 RemoveDock(Station *st, uint32 flags)

 	if (flags & DC_EXEC) {
 		DoClearSquare(tile1);
-
 		MakeWater(tile2);
+
+		StationRect_AfterRemoveTile(st, tile1);
+		StationRect_AfterRemoveTile(st, tile2);
+
 		MarkTileDirtyByTile(tile2);

 		st->dock_tile = 0;
@@ -2896,6 +2908,7 @@ void AfterLoadStations(void)
 {
 	Station *st;
 	uint i;
+	TileIndex tile;

 	/* Update the speclists of all stations to point to the currently loaded custom stations. */
 	FOR_ALL_STATIONS(st) {
@@ -2905,6 +2918,12 @@ void AfterLoadStations(void)
 			st->speclist[i].spec = GetCustomStationSpecByGrf(st->speclist[i].grfid, st->speclist[i].localidx);
 		}
 	}
+
+	for (tile = 0; tile < MapSize(); tile++) {
+		if (GetTileType(tile) != MP_STATION) continue;
+		st = GetStationByTile(tile);
+		StationRect_BeforeAddTile(st, tile, RECT_MODE_FORCE);
+	}
 }


@@ -3135,3 +3154,127 @@ const ChunkHandler _station_chunk_handlers[] = {
 	{ 'STNS', Save_STNS,      Load_STNS,      CH_ARRAY },
 	{ 'ROAD', Save_ROADSTOP,  Load_ROADSTOP,  CH_ARRAY | CH_LAST},
 };
+
+
+static inline bool PtInRectXY(Rect *r, int x, int y)
+{
+	return (r->left <= x && x <= r->right && r->top <= y && y <= r->bottom);
+}
+
+static void StationRect_Init(Station *st)
+{
+	Rect *r = &st->rect;
+	r->left = r->top = r->right = r->bottom = 0;
+}
+
+static bool StationRect_IsEmpty(Station *st)
+{
+	return (st->rect.left == 0 || st->rect.left > st->rect.right || st->rect.top > st->rect.bottom);
+}
+
+static bool StationRect_BeforeAddTile(Station *st, TileIndex tile, StationRectMode mode)
+{
+	Rect *r = &st->rect;
+	int x = TileX(tile);
+	int y = TileY(tile);
+	if (StationRect_IsEmpty(st)) {
+		// we are adding the first station tile
+		r->left = r->right = x;
+		r->top = r->bottom = y;
+	} else if (!PtInRectXY(r, x, y)) {
+		// current rect is not empty and new point is outside this rect
+		// make new spread-out rectangle
+		Rect new_rect = {min(x, r->left), min(y, r->top), max(x, r->right), max(y, r->bottom)};
+		// check new rect dimensions against preset max
+		int w = new_rect.right - new_rect.left + 1;
+		int h = new_rect.bottom - new_rect.top + 1;
+		if (mode != RECT_MODE_FORCE && (w > _patches.station_spread || h > _patches.station_spread)) {
+			assert(mode != RECT_MODE_TRY);
+			_error_message = STR_306C_STATION_TOO_SPREAD_OUT;
+			return false;
+		}
+		// spread-out ok, return true
+		if (mode != RECT_MODE_TEST) {
+			// we should update the station rect
+			*r = new_rect;
+		}
+	} else {
+		; // new point is inside the rect, we don't need to do anything
+	}
+	return true;
+}
+
+static bool StationRect_BeforeAddRect(Station *st, TileIndex tile, int w, int h, StationRectMode mode)
+{
+	return StationRect_BeforeAddTile(st, tile, mode) && StationRect_BeforeAddTile(st, TILE_ADDXY(tile, w - 1, h - 1), mode);
+}
+
+static inline bool ScanRectForStationTiles(StationID st_id, int left, int top, int right, int bottom)
+{
+	TileIndex top_left = TileXY(left, top);
+	int width = right - left + 1;
+	int height = bottom - top + 1;
+	BEGIN_TILE_LOOP(tile, width, height, top_left)
+		if (IsTileType(tile, MP_STATION) && GetStationIndex(tile) == st_id) return true;
+	END_TILE_LOOP(tile, width, height, top_left);
+	return false;
+}
+
+static bool StationRect_AfterRemoveTile(Station *st, TileIndex tile)
+{
+	Rect *r = &st->rect;
+	int x = TileX(tile);
+	int y = TileY(tile);
+	bool reduce_x, reduce_y;
+
+	// look if removed tile was on the bounding rect edge
+	// and try to reduce the rect by this edge
+	// do it until we have empty rect or nothing to do
+	for (;;) {
+		// check if removed tile is on rect edge
+		bool left_edge = (x == r->left);
+		bool right_edge = (x == r->right);
+		bool top_edge = (y == r->top);
+		bool bottom_edge = (y == r->bottom);
+		// can we reduce the rect in either direction?
+		reduce_x = ((left_edge || right_edge) && !ScanRectForStationTiles(st->index, x, r->top, x, r->bottom));
+		reduce_y = ((top_edge || bottom_edge) && !ScanRectForStationTiles(st->index, r->left, y, r->right, y));
+		if (!(reduce_x || reduce_y)) break; // nothing to do (can't reduce)
+		if (reduce_x) {
+			// reduce horizontally
+			if (left_edge) {
+				// move left edge right
+				r->left = x = x + 1;
+			} else {
+				// move right edge left
+				r->right = x = x - 1;
+			}
+		}
+		if (reduce_y) {
+			// reduce vertically
+			if (top_edge) {
+				// move top edge down
+				r->top = y = y + 1;
+			} else {
+				// move bottom edge up
+				r->bottom = y = y - 1;
+			}
+		}
+		if (r->left > r->right || r->top > r->bottom) {
+		// can't continue, if the remaining rectangle is empty
+			StationRect_Init(st);
+			return true; // empty remaining rect
+		}
+	}
+	return false; // non-empty remaining rect
+}
+
+static bool StationRect_AfterRemoveRect(Station *st, TileIndex tile, int w, int h)
+{
+	bool empty;
+	assert(PtInRectXY(&st->rect, TileX(tile), TileY(tile)));
+	assert(PtInRectXY(&st->rect, TileX(tile) + w - 1, TileY(tile) + h - 1));
+	empty = StationRect_AfterRemoveTile(st, tile);
+	if (w != 1 || h != 1) empty = empty || StationRect_AfterRemoveTile(st, TILE_ADDXY(tile, w - 1, h - 1));
+	return empty;
+}
--- a/stdafx.h
+++ b/stdafx.h
@@ -196,7 +196,7 @@ typedef unsigned char byte;
 #endif

 // This is already defined in unix
-#if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__)
+#if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__) && !defined(__MORPHOS__)
  typedef unsigned int uint;
 #endif
 // Not defined in QNX Neutrino (6.x)
--- a/table/namegen.h
+++ b/table/namegen.h
@@ -1310,56 +1310,56 @@ static const char *name_finnish_3[] = {

 static const char *name_polish_1_m[] = {
 	"Wielki ",
-	"Maly ",
-	"Zly ",
+	"Mały ",
+	"Zły ",
 	"Dobry ",
 	"Nowy ",
 	"Stary ",
-	"Zloty ",
+	"Złoty ",
 	"Zielony ",
-	"Bialy ",
+	"Biały ",
 	"Modry ",
-	"Debowy "
+	"Dębowy "
 };

 static const char *name_polish_1_f[] = {
 	"Wielka ",
-	"Mala ",
-	"Zla ",
+	"Mała ",
+	"Zła ",
 	"Dobra ",
 	"Nowa ",
 	"Stara ",
-	"Zlota ",
+	"Złota ",
 	"Zielona ",
-	"Biala ",
+	"Biała ",
 	"Modra ",
-	"Debowa "
+	"Dębowa "
 };

 static const char *name_polish_1_n[] = {
 	"Wielkie ",
-	"Male ",
-	"Zle ",
+	"Małe ",
+	"Złe ",
 	"Dobre ",
 	"Nowe ",
 	"Stare ",
-	"Zlote ",
+	"Złote ",
 	"Zielone ",
-	"Biale ",
+	"Białe ",
 	"Modre ",
-	"Debowe "
+	"Dębowe "
 };

 static const char *name_polish_2_o[] = {
 	"Frombork",
 	"Gniezno",
 	"Olsztyn",
-	"Torun",
+	"Toruń",
 	"Bydgoszcz",
 	"Terespol",
-	"Krakow",
-	"Poznan",
-	"Wroclaw",
+	"Kraków",
+	"Poznań",
+	"Wrocław",
 	"Katowice",
 	"Cieszyn",
 	"Bytom",
@@ -1370,7 +1370,7 @@ static const char *name_polish_2_o[] = {
 	"Malbork",
 	"Sopot",
 	"Sosnowiec",
-	"Gdansk",
+	"Gdańsk",
 	"Gdynia",
 	"Sieradz",
 	"Sandomierz",
@@ -1378,7 +1378,7 @@ static const char *name_polish_2_o[] = {
 	"Szczytno",
 	"Szczecin",
 	"Zakopane",
-	"Szklarska Poreba",
+	"Szklarska Poręba",
 	"Bochnia",
 	"Golub-Dobrzyn",
 	"Chojnice",
@@ -1390,13 +1390,13 @@ static const char *name_polish_2_o[] = {
 static const char *name_polish_2_m[] = {
 	"Jarocin",
 	"Gogolin",
-	"Tomaszow",
-	"Piotrkow",
+	"Tomaszów",
+	"Piotrków",
 	"Lidzbark",
 	"Rypin",
 	"Radzymin",
-	"Wolomin",
-	"Pruszkow",
+	"Wołomin",
+	"Pruszków",
 	"Olsztynek",
 	"Rypin",
 	"Cisek",
@@ -1406,7 +1406,7 @@ static const char *name_polish_2_m[] = {
 	"Lubicz",
 	"Milicz",
 	"Targ",
-	"Ostrow",
+	"Ostrów",
 	"Ozimek",
 	"Puck",
 	"Rzepin",
@@ -1419,7 +1419,7 @@ static const char *name_polish_2_m[] = {
 	"Strzepcz",
 	"Strzebielin",
 	"Sochaczew",
-	"Grebocin",
+	"Grębocin",
 	"Gniew",
 	"Lubliniec",
 	"Lubasz",
@@ -1441,7 +1441,7 @@ static const char *name_polish_2_m[] = {
 static const char *name_polish_2_f[] = {
 	"Szprotawa",
 	"Pogorzelica",
-	"Motlawa",
+	"Motława",
 	"Lubawa",
 	"Nidzica",
 	"Kruszwica",
@@ -1495,7 +1495,7 @@ static const char *name_polish_2_n[] = {
 	"Braniewo",
 	"Sulinowo",
 	"Chmielno",
-	"Jastrzebie",
+	"Jastrzębie",
 	"Gryfino",
 	"Koronowo",
 	"Lubichowo",
@@ -1504,98 +1504,98 @@ static const char *name_polish_2_n[] = {

 static const char *name_polish_3_m[] = {
 	" Wybudowanie",
-	" Swietokrzyski",
-	" Gorski",
+	" Świętokrzyski",
+	" Górski",
 	" Morski",
-	" Zdroj",
+	" Zdrój",
 	" Wody",
 	" Bajoro",
-	" Krajenski",
-	" Slaski",
+	" Krajeński",
+	" Śląski",
 	" Mazowiecki",
 	" Pomorski",
 	" Wielki",
 	" Maly",
-	" Warminski",
+	" Warmiński",
 	" Mazurski",
 	" Mniejszy",
-	" Wiekszy",
-	" Gorny",
+	" Większy",
+	" Górny",
 	" Dolny",
 	" Wielki",
 	" Stary",
 	" Nowy",
 	" Wielkopolski",
-	" Wzgorze",
+	" Wzgórze",
 	" Mosty",
 	" Kujawski",
-	" Malopolski",
+	" Małopolski",
 	" Podlaski",
 	" Lesny"
 };

 static const char *name_polish_3_f[] = {
 	" Wybudowanie",
-	" Swietokrzyska",
-	" Gorska",
+	" Świętokrzyska",
+	" Górska",
 	" Morska",
-	" Zdroj",
+	" Zdrój",
 	" Woda",
 	" Bajoro",
-	" Krajenska",
-	" Slaska",
+	" Krajeńska",
+	" Śląska",
 	" Mazowiecka",
 	" Pomorska",
 	" Wielka",
-	" Mala",
-	" Warminska",
+	" Mała",
+	" Warmińska",
 	" Mazurska",
 	" Mniejsza",
-	" Wieksza",
-	" Gorna",
+	" Większa",
+	" Górna",
 	" Dolna",
 	" Wielka",
 	" Stara",
 	" Nowa",
 	" Wielkopolska",
-	" Wzgorza",
+	" Wzgórza",
 	" Mosty",
 	" Kujawska",
 	" Malopolska",
 	" Podlaska",
-	" Lesna"
+	" Leśna"
 };

 static const char *name_polish_3_n[] = {
 	" Wybudowanie",
-	" Swietokrzyskie",
-	" Gorskie",
+	" Świetokrzyskie",
+	" Górskie",
 	" Morskie",
-	" Zdroj",
+	" Zdrój",
 	" Wody",
 	" Bajoro",
-	" Krajenskie",
-	" Slaskie",
+	" Krajeńskie",
+	" Śląskie",
 	" Mazowieckie",
 	" Pomorskie",
 	" Wielkie",
-	" Male",
-	" Warminskie ",
+	" Małe",
+	" Warmińskie ",
 	" Mazurskie ",
 	" Mniejsze",
-	" Wieksze",
-	" Gorne",
+	" Większe",
+	" Górne",
 	" Dolne",
 	" Wielkie",
 	" Stare",
 	" Nowe",
 	" Wielkopolskie",
-	" Wzgorze",
+	" Wzgórze",
 	" Mosty",
 	" Kujawskie",
-	" Malopolskie",
+	" Małopolskie",
 	" Podlaskie",
-	" Lesne"
+	" Leśne"
 };

 static const char *name_czech_real[] = {
--- a/texteff.c
+++ b/texteff.c
@@ -324,7 +324,7 @@ void DeleteAnimatedTile(TileIndex tile)
 	for (ti = _animated_tile_list; ti != endof(_animated_tile_list); ti++) {
 		if (tile == *ti) {
 			/* remove the hole */
-			memmove(ti, ti + 1, endof(_animated_tile_list) - 1 - ti);
+			memmove(ti, ti + 1, (lastof(_animated_tile_list) - ti) * sizeof(_animated_tile_list[0]));
 			/* and clear last item */
 			endof(_animated_tile_list)[-1] = 0;
 			MarkTileDirtyByTile(tile);
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -79,6 +79,7 @@ void DestroyTown(Town *t)
 	}

 	DeleteName(t->townnametype);
+	DeleteSubsidyWithTown(t->index);

 	MarkWholeScreenDirty();
 }
--- a/train_gui.c
+++ b/train_gui.c
@@ -968,7 +968,7 @@ static void DrawTrainDetailsWindow(Window *w)
 				u = v;
 				do {
 					PalSpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
-					DrawSprite(GetTrainImage(u, DIR_W) | pal, x + 14 + WagonLengthToPixels(dx), y + 6 + (is_custom_sprite(RailVehInfo(u->engine_type)->image_index) ? _traininfo_vehicle_pitch : 0));
+					DrawSprite(GetTrainImage(u, DIR_W) | pal, x + WagonLengthToPixels(4 + dx), y + 6 + (is_custom_sprite(RailVehInfo(u->engine_type)->image_index) ? _traininfo_vehicle_pitch : 0));
 					dx += u->u.rail.cached_veh_length;
 					u = u->next;
 				} while (u != NULL && IsArticulatedPart(u) && u->cargo_cap == 0);
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -411,8 +411,11 @@ not_valid_below:;
 		}
 	}

-	SetSignalsOnBothDir(tile_start, AxisToTrack(direction));
-	YapfNotifyTrackLayoutChange(tile_start, AxisToTrack(direction));
+	if (flags & DC_EXEC) {
+		Axis axis = AxisToTrack(direction);
+		SetSignalsOnBothDir(tile_start, axis);
+		YapfNotifyTrackLayoutChange(tile_start, axis);
+	}

 	/* for human player that builds the bridge he gets a selection to choose from bridges (DC_QUERY_COST)
 	 * It's unnecessary to execute this command every time for every bridge. So it is done only
--- a/video/cocoa_v.m
+++ b/video/cocoa_v.m
@@ -337,10 +337,7 @@ static void QZ_KeyEvent(unsigned short keycode, unsigned short unicode, BOOL dow

 		case QZ_RETURN:
 		case QZ_f:
-			if (down && (
-						(_cocoa_video_data.current_mods & NSControlKeyMask) ||
-						(_cocoa_video_data.current_mods & NSCommandKeyMask)
-					)) {
+			if (down && (_cocoa_video_data.current_mods & NSCommandKeyMask)) {
 				CocoaVideoFullScreen(!_fullscreen);
 			}
 			break;
--- a/video/sdl_v.c
+++ b/video/sdl_v.c
@@ -440,7 +440,9 @@ static void SdlVideoMainLoop(void)
 #if defined(_DEBUG)
 		if (_shift_pressed)
 #else
-		if (keys[SDLK_TAB])
+		/* Speedup when pressing tab, except when using ALT+TAB
+		 * to switch to another application */
+		if (keys[SDLK_TAB] && (mod & KMOD_ALT) == 0)
 #endif
 		{
 			if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2;
--- a/video/win32_v.c
+++ b/video/win32_v.c
@@ -564,17 +564,18 @@ static void MakeWindow(bool full_screen)

 	{
 		RECT r;
-		uint style;
+		DWORD style, showstyle;
 		int x, y, w, h;

+		showstyle = SW_SHOWNORMAL;
 		_wnd.fullscreen = full_screen;
 		if (_wnd.fullscreen) {
-			style = WS_POPUP | WS_VISIBLE;
+			style = WS_POPUP;
 			SetRect(&r, 0, 0, _wnd.width_org, _wnd.height_org);
 		} else {
-			style = WS_OVERLAPPEDWINDOW | WS_VISIBLE;
+			style = WS_OVERLAPPEDWINDOW;
 			/* On window creation, check if we were in maximize mode before */
-			if (_window_maximize) style |= WS_MAXIMIZE;
+			if (_window_maximize) showstyle = SW_SHOWMAXIMIZED;
 			SetRect(&r, 0, 0, _wnd.width, _wnd.height);
 		}

@@ -595,6 +596,7 @@ static void MakeWindow(bool full_screen)

 			_wnd.main_wnd = CreateWindow(_T("OTTD"), Windowtitle, style, x, y, w, h, 0, 0, GetModuleHandle(NULL), 0);
 			if (_wnd.main_wnd == NULL) error("CreateWindow failed");
+			ShowWindow(_wnd.main_wnd, showstyle);
 		}
 	}
 	GameSizeChanged(); // invalidate all windows, force redraw
--- a/win32.c
+++ b/win32.c
@@ -207,8 +207,8 @@ static char *PrintModuleList(char *output)

 static const TCHAR _crash_desc[] =
 	_T("A serious fault condition occured in the game. The game will shut down.\n")
-	_T("Press \"Submit report\" to send crash information to the developers. ")
-	_T("This will greatly help debugging. ")
+	_T("Please send the crash information and the crash.dmp file (if any) to the developers.\n")
+	_T("This will greatly help debugging. The correct place to do this is http://bugs.openttd.org. ")
 	_T("The information contained in the report is displayed below.\n")
 	_T("Press \"Emergency save\" to attempt saving the game.");

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
celestar	acafa8007b	(svn r7978) [0.5] - Fix: Revert the previous commit. it WAS in the wrong dir	2007-01-08 14:00:14 +00:00
celestar	297707d2ab	(svn r7977) [0.5] - Fix: Segfault in newgrf loading code. grfmsg changed to DEBUG	2007-01-08 13:57:40 +00:00
Darkvater	20f4c7f489	(svn r7971) Release 0.5.0-RC3	2007-01-07 17:53:34 +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